diff --git a/build.gradle b/build.gradle index 515d16d4..fefd87e3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,9 @@ -//version: 1655755555 +//version: 1658080040 /* -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 @@ -21,6 +20,8 @@ import java.util.zip.ZipOutputStream buildscript { repositories { + mavenCentral() + maven { name 'forge' url 'https://maven.minecraftforge.net' @@ -57,8 +58,15 @@ plugins { 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" } +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' } @@ -82,6 +90,7 @@ idea { downloadSources = true } } +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()) @@ -110,6 +119,7 @@ checkPropertyExists("developmentEnvironmentUserName") boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() +boolean forceEnableMixins = project.findProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false String channel = project.findProperty('channel') ? project.channel : 'stable' String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12' String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' @@ -196,10 +206,10 @@ 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' + - 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)' - ) + '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' + + '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' identifiedVersion = versionOverride } @@ -223,7 +233,7 @@ else { def arguments = [] def jvmArguments = [] -if (usesMixins.toBoolean()) { +if (usesMixins.toBoolean() || forceEnableMixins) { arguments += [ "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] @@ -288,7 +298,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' @@ -305,6 +315,8 @@ dependencies { 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 @@ -362,7 +374,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) } @@ -393,12 +408,12 @@ afterEvaluate { 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" ] } } @@ -407,8 +422,8 @@ afterEvaluate { runClient { if(developmentEnvironmentUserName) { arguments += [ - "--username", - developmentEnvironmentUserName + "--username", + developmentEnvironmentUserName ] } @@ -426,13 +441,14 @@ tasks.withType(JavaExec).configureEach { javaToolchains.launcherFor { languageVersion = projectJavaVersion } - ) + ) } 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) { @@ -440,9 +456,9 @@ processResources { // replace modVersion and minecraftVersion expand "minecraftVersion": project.minecraft.version, - "modVersion": modVersion, - "modId": modId, - "modName": modName + "modVersion": modVersion, + "modId": modId, + "modName": modName } if(usesMixins.toBoolean()) { @@ -452,6 +468,7 @@ processResources { // copy everything else that's not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' + exclude 'spotless.gradle' } } @@ -471,9 +488,9 @@ def getManifestAttributes() { 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 @@ -500,7 +517,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) { @@ -592,7 +612,10 @@ publishing { // remove extra garbage from minecraft and minecraftDeps configuration pom.withXml { def badArtifacts = [:].withDefault {[] as Set} - for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) { + for (configuration in [ + projectConfigs.minecraft, + projectConfigs.minecraftDeps + ]) { for (dependency in configuration.allDependencies) { badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name } @@ -626,7 +649,7 @@ task updateBuildScript { doLast { if (performBuildScriptUpdate(projectDir.toString())) return - print("Build script already up-to-date!") + print("Build script already up-to-date!") } } @@ -699,7 +722,7 @@ task deobfParams { println("Parsing params.csv ...") Map params = new HashMap<>() - Files.lines(Paths.get(paramsCSV)).forEach{line -> + 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]) @@ -707,194 +730,194 @@ task deobfParams { } 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.") - } + 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 +int fileCount = 0 - if(file.isDirectory()) { - for(File f : file.listFiles()) { - fileCount += replaceParams(f, params) - } - return fileCount +if(file.isDirectory()) { + for(File f : file.listFiles()) { + fileCount += replaceParams(f, params) } - 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 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) } - return 0 + 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() +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' +group = 'forgegradle' +description = 'Rename all obfuscated parameter names inherited from Minecraft classes' } // Dependency Deobfuscation def deobf(String sourceURL) { - try { - URL url = new URL(sourceURL) - String fileName = url.getFile() +try { + URL url = new URL(sourceURL) + String fileName = url.getFile() - //get rid of directories: - int lastSlash = fileName.lastIndexOf("/") - if(lastSlash > 0) { - fileName = fileName.substring(lastSlash + 1) - } - //get rid of extension: - if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) { - fileName = fileName.substring(0, fileName.lastIndexOf(".")) - } - - String hostName = url.getHost() - 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/${sourceURL.hashCode()}") + //get rid of directories: + int lastSlash = fileName.lastIndexOf("/") + if(lastSlash > 0) { + fileName = fileName.substring(lastSlash + 1) } + //get rid of extension: + if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) { + fileName = fileName.substring(0, fileName.lastIndexOf(".")) + } + + String hostName = url.getHost() + 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/${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 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 - if(remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } - - download.run { - src sourceURL - dest obfFile - quiet true - overwrite false - } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } +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 +if(remoteMappings) { + String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" + String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" + + zipMappings(mappingsZIP, remoteMappings, bon2Dir) + + mappingsVer = "snapshot_$id" +} else { + mappingsVer = "${channel}_$mappingsVersion" +} + +download.run { + src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" + dest bon2File + quiet true + overwrite false +} + +download.run { + src sourceURL + dest obfFile + quiet true + overwrite false +} + +exec { + commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' + workingDir bon2Dir + standardOutput = new FileOutputStream("${deobfFile}.log") +} + +return files(deobfFile) +} + def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if(zipFile.exists()) { - return - } +File zipFile = new File(zipPath) +if(zipFile.exists()) { + return +} - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" +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 - } +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)) +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("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.putNextEntry(new ZipEntry("methods.csv")) +Files.copy(Paths.get(methodsCache), zos) +zos.closeEntry() - zos.close() +zos.close() } // Helper methods def checkPropertyExists(String propertyName) { - if (!project.hasProperty(propertyName)) { - throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties") - } +if (!project.hasProperty(propertyName)) { + throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties") +} } def getFile(String relativePath) { - return new File(projectDir, relativePath) +return new File(projectDir, relativePath) } diff --git a/gradle.properties b/gradle.properties index fdf9d2b2..2f494a59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,13 @@ autoUpdateBuildScript = false minecraftVersion = 1.7.10 forgeVersion = 10.13.4.1614 +# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task. +channel = stable +mappingsVersion = 12 + +# Define other MCP mappings for dependency deobfuscation +remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ + # Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you # restart Minecraft in development. Choose this dependent on your mod: # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..97d8f71c --- /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.4') + //devLocal '.' // Use this when testing config updates locally +} diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index c1d26472..dccc74d5 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -1,46 +1,48 @@ package crazypants.enderio; +import com.enderio.core.common.BlockEnder; +import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.tool.ToolUtil; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.BlockEnder; - -import crazypants.enderio.api.tool.ITool; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.tool.ToolUtil; - public abstract class BlockEio extends BlockEnder { - protected BlockEio(String name, Class teClass) { - super(name, teClass); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - protected BlockEio(String name, Class teClass, Material mat) { - super(name, teClass, mat); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - if(shouldWrench(world, x, y, z, entityPlayer, side) && ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; + protected BlockEio(String name, Class teClass) { + super(name, teClass); + setCreativeTab(EnderIOTab.tabEnderIO); } - TileEntity te = world.getTileEntity(x, y, z); - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && !entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(te instanceof AbstractMachineEntity) { - ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); - world.markBlockForUpdate(x, y, z); - return true; - } + protected BlockEio(String name, Class teClass, Material mat) { + super(name, teClass, mat); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + + if (shouldWrench(world, x, y, z, entityPlayer, side) + && ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { + return true; + } + TileEntity te = world.getTileEntity(x, y, z); + + ITool tool = ToolUtil.getEquippedTool(entityPlayer); + if (tool != null + && !entityPlayer.isSneaking() + && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { + if (te instanceof AbstractMachineEntity) { + ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); + world.markBlockForUpdate(x, y, z); + return true; + } + } + + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); } - - return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); - } } diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 385dc8b9..4df47b3a 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -1,26 +1,7 @@ package crazypants.enderio; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; - import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.client.render.IconUtil; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -151,359 +132,378 @@ import crazypants.enderio.teleport.telepad.TelePadRenderer; import crazypants.enderio.teleport.telepad.TelePadSpecialRenderer; import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler; import crazypants.enderio.teleport.telepad.TileTelePad; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { - // @formatter:off - public static int[][] sideAndFacingToSpriteOffset = new int[][] { - { 3, 2, 0, 0, 0, 0 }, - { 2, 3, 1, 1, 1, 1 }, - { 1, 1, 3, 2, 5, 4 }, - { 0, 0, 2, 3, 4, 5 }, - { 4, 5, 4, 5, 3, 2 }, - { 5, 4, 5, 4, 2, 3 } - }; - // @formatter:on + // @formatter:off + public static int[][] sideAndFacingToSpriteOffset = new int[][] { + {3, 2, 0, 0, 0, 0}, + {2, 3, 1, 1, 1, 1}, + {1, 1, 3, 2, 5, 4}, + {0, 0, 2, 3, 4, 5}, + {4, 5, 4, 5, 3, 2}, + {5, 4, 5, 4, 2, 3} + }; + // @formatter:on - private final List conduitRenderers = new ArrayList(); + private final List conduitRenderers = new ArrayList(); - private final DefaultConduitRenderer dcr = new DefaultConduitRenderer(); + private final DefaultConduitRenderer dcr = new DefaultConduitRenderer(); - private ConduitBundleRenderer cbr; + private ConduitBundleRenderer cbr; - private boolean checkedNei = false; - private boolean neiInstalled = false; + private boolean checkedNei = false; + private boolean neiInstalled = false; - @Override - public World getClientWorld() { - return FMLClientHandler.instance().getClient().theWorld; - } - - @Override - public boolean isNeiInstalled() { - if(checkedNei) { - return neiInstalled; - } - try { - Class.forName("crazypants.enderio.nei.EnchanterRecipeHandler"); - neiInstalled = true; - } catch (Exception e) { - neiInstalled = false; - } - checkedNei = true; - return false; - } - - @Override - public EntityPlayer getClientPlayer() { - return Minecraft.getMinecraft().thePlayer; - } - - public ConduitBundleRenderer getConduitBundleRenderer() { - return cbr; - } - - public void setCbr(ConduitBundleRenderer cbr) { - this.cbr = cbr; - } - - @Override - public void loadIcons() { - RedstoneConduit.initIcons(); - InsulatedRedstoneConduit.initIcons(); - RedstoneSwitch.initIcons(); - PowerConduit.initIcons(); - PowerConduitEndergy.initIcons(); - LiquidConduit.initIcons(); - AdvancedLiquidConduit.initIcons(); - AbstractEnderLiquidConduit.initIcons(); - EnderLiquidConduit.initIcons(); - CrystallineEnderLiquidConduit.initIcons(); - CrystallinePinkSlimeEnderLiquidConduit.initIcons(); - MelodicEnderLiquidConduit.initIcons(); - StellarEnderLiquidConduit.initIcons(); - ItemConduit.initIcons(); - if(GasUtil.isGasConduitEnabled()) { - GasConduit.initIcons(); - } - if(MEUtil.isMEEnabled()) { - MEConduit.initIcons(); - } - if (OCUtil.isOCEnabled()) { - OCConduit.initIcons(); - } - } - - @Override - public void load() { - super.load(); - - SpecialTooltipHandler tt = SpecialTooltipHandler.INSTANCE; - tt.addCallback(new TooltipHandlerGrinding()); - tt.addCallback(new TooltipHandlerBurnTime()); - if (Config.addFuelTooltipsToAllFluidContainers) { - tt.addCallback(new TooltipHandlerFluid()); + @Override + public World getClientWorld() { + return FMLClientHandler.instance().getClient().theWorld; } - // Renderers - - AbstractMachineBlock.renderId = RenderingRegistry.getNextAvailableRenderId(); - AbstractMachineRenderer machRen = new AbstractMachineRenderer(); - RenderingRegistry.registerBlockHandler(machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockStirlingGenerator), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrusher), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAlloySmelter), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPowerMonitor), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockBuffer), machRen); - - MinecraftForgeClient.registerItemRenderer(EnderIO.itemBrokenSpawner, new BrokenSpawnerRenderer()); - - BlockSolarPanel.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new SolarPanelRenderer()); - - EnchanterModelRenderer emr = new EnchanterModelRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, emr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnchanter), emr); - - BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); - - BlockFarmStation.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new FarmingStationRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileFarmStation.class, new FarmingStationSpecialRenderer()); - - BlockSoulBinder.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new SoulBinderRenderer()); - - ObeliskRenderer defaultObeliskRenderer = new ObeliskRenderer(); - BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(defaultObeliskRenderer); - - ObeliskSpecialRenderer attRen = new ObeliskSpecialRenderer(new ItemStack(EnderIO.itemMaterial, 1, - Material.ATTRACTOR_CRYSTAL.ordinal()), defaultObeliskRenderer); - ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen); - - AversionObeliskRenderer sgr = new AversionObeliskRenderer(defaultObeliskRenderer); - ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr); - - ObeliskSpecialRenderer eor = new ObeliskSpecialRenderer(new ItemStack(EnderIO.itemXpTransfer), - defaultObeliskRenderer); - ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceObelisk.class, eor); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockExperianceOblisk), eor); - - ObeliskSpecialRenderer twr = new WeatherObeliskSpecialRenderer(new ItemStack(Items.fireworks), defaultObeliskRenderer); - ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr); - - BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); - TechneMachineRenderer cr = new TechneMachineRenderer(EnderIO.blockCombustionGenerator, "models/combustionGen"); - RenderingRegistry.registerBlockHandler(cr); - - ZombieGeneratorRenderer zgr = new ZombieGeneratorRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileZombieGenerator.class, zgr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockZombieGenerator), zgr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockFrankenZombieGenerator), zgr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderGenerator), zgr); - - KillerJoeRenderer kjr = new KillerJoeRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileKillerJoe.class, kjr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockKillerJoe), kjr); - - BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId(); - TechneMachineRenderer vr = new TechneMachineRenderer(EnderIO.blockVat, "models/vat"); - RenderingRegistry.registerBlockHandler(vr); - - FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); - - BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); - - if(EnderIO.blockCapBank != null) { - BlockCapBank.renderId = RenderingRegistry.getNextAvailableRenderId(); - CapBankRenderer newCbr = new CapBankRenderer(); - RenderingRegistry.registerBlockHandler(newCbr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapBank), newCbr); - ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr); + @Override + public boolean isNeiInstalled() { + if (checkedNei) { + return neiInstalled; + } + try { + Class.forName("crazypants.enderio.nei.EnchanterRecipeHandler"); + neiInstalled = true; + } catch (Exception e) { + neiInstalled = false; + } + checkedNei = true; + return false; } - CapacitorBankRenderer capr = new CapacitorBankRenderer(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); - - BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); - CapBankRenderer2 cbr2 = new CapBankRenderer2(); - RenderingRegistry.registerBlockHandler(cbr2); - - BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId(); - VacuumChestRenderer vcr = new VacuumChestRenderer(); - RenderingRegistry.registerBlockHandler(vcr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockVacuumChest), vcr); - - ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduitEndergy, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemGasConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemMEConduit, itemConRenderer); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemOCConduit, itemConRenderer); - - BlockPaintedFenceGateRenderer bcfgr = new BlockPaintedFenceGateRenderer(); - BlockPaintedFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(bcfgr); - - PaintedItemRenderer pir = new PaintedItemRenderer(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFence), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFenceGate), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedWall), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedStair), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedSlab), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedGlowstone), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedCarpet), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockDarkSteelPressurePlate), pir); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTravelPlatform), pir); - - BlockPaintedGlowstone.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new PaintedBlockRenderer(BlockPaintedGlowstone.renderId, Blocks.glowstone)); - - BlockTravelAnchor.renderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new PaintedBlockRenderer(BlockTravelAnchor.renderId, EnderIO.blockTravelPlatform)); - - BlockTelePad.renderId = RenderingRegistry.getNextAvailableRenderId(); - TelePadRenderer telePadRenderer = new TelePadRenderer(); - RenderingRegistry.registerBlockHandler(telePadRenderer); - ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer)); - - MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); - - cbr = new ConduitBundleRenderer((float) Config.conduitScale); - BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(cbr); - ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr); - - ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer()); - - BlockEndermanSkull.renderId = RenderingRegistry.getNextAvailableRenderId(); - EndermanSkullRenderer esk = new EndermanSkullRenderer(); - RenderingRegistry.registerBlockHandler(esk); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEndermanSkull), esk); - - conduitRenderers.add(RedstoneSwitchRenderer.getInstance()); - conduitRenderers.add(new AdvancedLiquidConduitRenderer()); - conduitRenderers.add(LiquidConduitRenderer.create()); - conduitRenderers.add(new PowerConduitRenderer()); - conduitRenderers.add(new InsulatedRedstoneConduitRenderer()); - conduitRenderers.add(new EnderLiquidConduitRenderer()); - conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer()); - if(GasUtil.isGasConduitEnabled()) { - conduitRenderers.add(new GasConduitRenderer()); - } - if (OCUtil.isOCEnabled()) { - conduitRenderers.add(new OCConduitRenderer()); + @Override + public EntityPlayer getClientPlayer() { + return Minecraft.getMinecraft().thePlayer; } - EnderIoRenderer eior = new EnderIoRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); - - ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); - ClientRegistry.bindTileEntitySpecialRenderer(TileTank.class, new TankFluidRenderer()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTank), new TankItemRenderer()); - - HyperCubeRenderer hcr = new HyperCubeRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); - - if(Config.transceiverEnabled) { - TransceiverRenderer tr = new TransceiverRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileTransceiver.class, tr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTransceiver), tr); + public ConduitBundleRenderer getConduitBundleRenderer() { + return cbr; } - new YetaWrenchOverlayRenderer(); - new ConduitProbeOverlayRenderer(); - if(Config.useSneakMouseWheelYetaWrench) { - ToolTickHandler th = new ToolTickHandler(); - MinecraftForge.EVENT_BUS.register(th); - FMLCommonHandler.instance().bus().register(th); + public void setCbr(ConduitBundleRenderer cbr) { + this.cbr = cbr; } - MinecraftForge.EVENT_BUS.register(TravelController.instance); - FMLCommonHandler.instance().bus().register(TravelController.instance); - DarkSteelItems.registerItemRenderer(); + @Override + public void loadIcons() { + RedstoneConduit.initIcons(); + InsulatedRedstoneConduit.initIcons(); + RedstoneSwitch.initIcons(); + PowerConduit.initIcons(); + PowerConduitEndergy.initIcons(); + LiquidConduit.initIcons(); + AdvancedLiquidConduit.initIcons(); + AbstractEnderLiquidConduit.initIcons(); + EnderLiquidConduit.initIcons(); + CrystallineEnderLiquidConduit.initIcons(); + CrystallinePinkSlimeEnderLiquidConduit.initIcons(); + MelodicEnderLiquidConduit.initIcons(); + StellarEnderLiquidConduit.initIcons(); + ItemConduit.initIcons(); + if (GasUtil.isGasConduitEnabled()) { + GasConduit.initIcons(); + } + if (MEUtil.isMEEnabled()) { + MEConduit.initIcons(); + } + if (OCUtil.isOCEnabled()) { + OCConduit.initIcons(); + } + } - FMLCommonHandler.instance().bus().register(KeyTracker.instance); + @Override + public void load() { + super.load(); - RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer()); - RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer()); - - MinecraftForge.EVENT_BUS.register(SoundDetector.instance); - FMLCommonHandler.instance().bus().register(SoundDetector.instance); - - if(!Loader.isModLoaded("OpenBlocks")) { - //We have registered liquid XP so we need to give it textures - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - //NB: textures re-used with permission from OpenBlocks to maintain look - IIcon flowing = register.registerIcon("enderio:xpjuiceflowing"); - IIcon still = register.registerIcon("enderio:xpjuicestill"); - EnderIO.fluidXpJuice.setIcons(still, flowing); + SpecialTooltipHandler tt = SpecialTooltipHandler.INSTANCE; + tt.addCallback(new TooltipHandlerGrinding()); + tt.addCallback(new TooltipHandlerBurnTime()); + if (Config.addFuelTooltipsToAllFluidContainers) { + tt.addCallback(new TooltipHandlerFluid()); } - @Override - public int getTextureType() { - return 0; + // Renderers + + AbstractMachineBlock.renderId = RenderingRegistry.getNextAvailableRenderId(); + AbstractMachineRenderer machRen = new AbstractMachineRenderer(); + RenderingRegistry.registerBlockHandler(machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockStirlingGenerator), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrusher), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAlloySmelter), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPowerMonitor), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockBuffer), machRen); + + MinecraftForgeClient.registerItemRenderer(EnderIO.itemBrokenSpawner, new BrokenSpawnerRenderer()); + + BlockSolarPanel.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new SolarPanelRenderer()); + + EnchanterModelRenderer emr = new EnchanterModelRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileEnchanter.class, emr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnchanter), emr); + + BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); + + BlockFarmStation.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new FarmingStationRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileFarmStation.class, new FarmingStationSpecialRenderer()); + + BlockSoulBinder.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new SoulBinderRenderer()); + + ObeliskRenderer defaultObeliskRenderer = new ObeliskRenderer(); + BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(defaultObeliskRenderer); + + ObeliskSpecialRenderer attRen = new ObeliskSpecialRenderer( + new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()), defaultObeliskRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileAttractor.class, attRen); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAttractor), attRen); + + AversionObeliskRenderer sgr = new AversionObeliskRenderer(defaultObeliskRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileAversionObelisk.class, sgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSpawnGuard), sgr); + + ObeliskSpecialRenderer eor = new ObeliskSpecialRenderer( + new ItemStack(EnderIO.itemXpTransfer), defaultObeliskRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceObelisk.class, eor); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockExperianceOblisk), eor); + + ObeliskSpecialRenderer twr = + new WeatherObeliskSpecialRenderer(new ItemStack(Items.fireworks), defaultObeliskRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr); + + BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); + TechneMachineRenderer cr = new TechneMachineRenderer( + EnderIO.blockCombustionGenerator, "models/combustionGen"); + RenderingRegistry.registerBlockHandler(cr); + + ZombieGeneratorRenderer zgr = new ZombieGeneratorRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileZombieGenerator.class, zgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockZombieGenerator), zgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockFrankenZombieGenerator), zgr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderGenerator), zgr); + + KillerJoeRenderer kjr = new KillerJoeRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileKillerJoe.class, kjr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockKillerJoe), kjr); + + BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId(); + TechneMachineRenderer vr = new TechneMachineRenderer(EnderIO.blockVat, "models/vat"); + RenderingRegistry.registerBlockHandler(vr); + + FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); + + BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); + + if (EnderIO.blockCapBank != null) { + BlockCapBank.renderId = RenderingRegistry.getNextAvailableRenderId(); + CapBankRenderer newCbr = new CapBankRenderer(); + RenderingRegistry.registerBlockHandler(newCbr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapBank), newCbr); + ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr); } - }); + CapacitorBankRenderer capr = new CapacitorBankRenderer(); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); + + BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); + CapBankRenderer2 cbr2 = new CapBankRenderer2(); + RenderingRegistry.registerBlockHandler(cbr2); + + BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId(); + VacuumChestRenderer vcr = new VacuumChestRenderer(); + RenderingRegistry.registerBlockHandler(vcr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockVacuumChest), vcr); + + ItemConduitRenderer itemConRenderer = new ItemConduitRenderer(); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduitEndergy, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemGasConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemMEConduit, itemConRenderer); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemOCConduit, itemConRenderer); + + BlockPaintedFenceGateRenderer bcfgr = new BlockPaintedFenceGateRenderer(); + BlockPaintedFenceGate.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(bcfgr); + + PaintedItemRenderer pir = new PaintedItemRenderer(); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFence), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFenceGate), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedWall), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedStair), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedSlab), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedGlowstone), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedCarpet), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockDarkSteelPressurePlate), pir); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTravelPlatform), pir); + + BlockPaintedGlowstone.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler( + new PaintedBlockRenderer(BlockPaintedGlowstone.renderId, Blocks.glowstone)); + + BlockTravelAnchor.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler( + new PaintedBlockRenderer(BlockTravelAnchor.renderId, EnderIO.blockTravelPlatform)); + + BlockTelePad.renderId = RenderingRegistry.getNextAvailableRenderId(); + TelePadRenderer telePadRenderer = new TelePadRenderer(); + RenderingRegistry.registerBlockHandler(telePadRenderer); + ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer)); + + MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer()); + MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer()); + + cbr = new ConduitBundleRenderer((float) Config.conduitScale); + BlockConduitBundle.rendererId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(cbr); + ClientRegistry.bindTileEntitySpecialRenderer(TileConduitBundle.class, cbr); + + ClientRegistry.bindTileEntitySpecialRenderer(TileTravelAnchor.class, new TravelEntitySpecialRenderer()); + + BlockEndermanSkull.renderId = RenderingRegistry.getNextAvailableRenderId(); + EndermanSkullRenderer esk = new EndermanSkullRenderer(); + RenderingRegistry.registerBlockHandler(esk); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEndermanSkull), esk); + + conduitRenderers.add(RedstoneSwitchRenderer.getInstance()); + conduitRenderers.add(new AdvancedLiquidConduitRenderer()); + conduitRenderers.add(LiquidConduitRenderer.create()); + conduitRenderers.add(new PowerConduitRenderer()); + conduitRenderers.add(new InsulatedRedstoneConduitRenderer()); + conduitRenderers.add(new EnderLiquidConduitRenderer()); + conduitRenderers.add(new crazypants.enderio.conduit.item.ItemConduitRenderer()); + if (GasUtil.isGasConduitEnabled()) { + conduitRenderers.add(new GasConduitRenderer()); + } + if (OCUtil.isOCEnabled()) { + conduitRenderers.add(new OCConduitRenderer()); + } + + EnderIoRenderer eior = new EnderIoRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); + + ClientRegistry.bindTileEntitySpecialRenderer( + TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); + ClientRegistry.bindTileEntitySpecialRenderer(TileTank.class, new TankFluidRenderer()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTank), new TankItemRenderer()); + + HyperCubeRenderer hcr = new HyperCubeRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockHyperCube), hcr); + + if (Config.transceiverEnabled) { + TransceiverRenderer tr = new TransceiverRenderer(); + ClientRegistry.bindTileEntitySpecialRenderer(TileTransceiver.class, tr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTransceiver), tr); + } + + new YetaWrenchOverlayRenderer(); + new ConduitProbeOverlayRenderer(); + if (Config.useSneakMouseWheelYetaWrench) { + ToolTickHandler th = new ToolTickHandler(); + MinecraftForge.EVENT_BUS.register(th); + FMLCommonHandler.instance().bus().register(th); + } + MinecraftForge.EVENT_BUS.register(TravelController.instance); + FMLCommonHandler.instance().bus().register(TravelController.instance); + + DarkSteelItems.registerItemRenderer(); + + FMLCommonHandler.instance().bus().register(KeyTracker.instance); + + RenderingRegistry.registerEntityRenderingHandler(SoundEntity.class, new SoundRenderer()); + RenderingRegistry.registerEntityRenderingHandler(RangeEntity.class, new RangeRenerer()); + + MinecraftForge.EVENT_BUS.register(SoundDetector.instance); + FMLCommonHandler.instance().bus().register(SoundDetector.instance); + + if (!Loader.isModLoaded("OpenBlocks")) { + // We have registered liquid XP so we need to give it textures + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + + @Override + public void registerIcons(IIconRegister register) { + // NB: textures re-used with permission from OpenBlocks to maintain look + IIcon flowing = register.registerIcon("enderio:xpjuiceflowing"); + IIcon still = register.registerIcon("enderio:xpjuicestill"); + EnderIO.fluidXpJuice.setIcons(still, flowing); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + MinecraftForge.EVENT_BUS.register(new TeleportEntityRenderHandler()); } - MinecraftForge.EVENT_BUS.register(new TeleportEntityRenderHandler()); - } - - @Override - public ConduitRenderer getRendererForConduit(IConduit conduit) { - for (ConduitRenderer renderer : conduitRenderers) { - if(renderer.isRendererForConduit(conduit)) { - return renderer; - } + @Override + public ConduitRenderer getRendererForConduit(IConduit conduit) { + for (ConduitRenderer renderer : conduitRenderers) { + if (renderer.isRendererForConduit(conduit)) { + return renderer; + } + } + return dcr; } - return dcr; - } - @Override - public double getReachDistanceForPlayer(EntityPlayer entityPlayer) { - if(entityPlayer instanceof EntityPlayerMP) { - return ((EntityPlayerMP) entityPlayer).theItemInWorldManager.getBlockReachDistance(); + @Override + public double getReachDistanceForPlayer(EntityPlayer entityPlayer) { + if (entityPlayer instanceof EntityPlayerMP) { + return ((EntityPlayerMP) entityPlayer).theItemInWorldManager.getBlockReachDistance(); + } + return super.getReachDistanceForPlayer(entityPlayer); } - return super.getReachDistanceForPlayer(entityPlayer); - } - @Override - public void setInstantConfusionOnPlayer(EntityPlayer ent, int duration) { - ent.addPotionEffect(new PotionEffect(Potion.confusion.getId(), duration, 1, true)); - Minecraft.getMinecraft().thePlayer.timeInPortal = 1; - } - - @Override - public long getTickCount() { - return clientTickCount; - } - - @Override - protected void onClientTick() { - if(!Minecraft.getMinecraft().isGamePaused() && Minecraft.getMinecraft().theWorld != null) { - ++clientTickCount; + @Override + public void setInstantConfusionOnPlayer(EntityPlayer ent, int duration) { + ent.addPotionEffect(new PotionEffect(Potion.confusion.getId(), duration, 1, true)); + Minecraft.getMinecraft().thePlayer.timeInPortal = 1; } - } + @Override + public long getTickCount() { + return clientTickCount; + } + + @Override + protected void onClientTick() { + if (!Minecraft.getMinecraft().isGamePaused() && Minecraft.getMinecraft().theWorld != null) { + ++clientTickCount; + } + } } diff --git a/src/main/java/crazypants/enderio/CommonProxy.java b/src/main/java/crazypants/enderio/CommonProxy.java index 6ff26a2f..619af33f 100644 --- a/src/main/java/crazypants/enderio/CommonProxy.java +++ b/src/main/java/crazypants/enderio/CommonProxy.java @@ -1,12 +1,5 @@ package crazypants.enderio; -import java.text.DecimalFormat; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; @@ -14,82 +7,86 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.render.ConduitRenderer; +import java.text.DecimalFormat; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; public class CommonProxy { - private static final DecimalFormat FORMAT = new DecimalFormat("########0.000"); + private static final DecimalFormat FORMAT = new DecimalFormat("########0.000"); - protected long serverTickCount = 0; - protected long clientTickCount = 0; - protected final TickTimer tickTimer = new TickTimer(); + protected long serverTickCount = 0; + protected long clientTickCount = 0; + protected final TickTimer tickTimer = new TickTimer(); - public CommonProxy() { - } + public CommonProxy() {} - public World getClientWorld() { - return null; - } - - public EntityPlayer getClientPlayer() { - return null; - } - - public ConduitRenderer getRendererForConduit(IConduit conduit) { - return null; - } - - public double getReachDistanceForPlayer(EntityPlayer entityPlayer) { - return 5; - } - - public void loadIcons() { - ; - } - - public void load() { - FMLCommonHandler.instance().bus().register(tickTimer); - } - - public long getTickCount() { - return serverTickCount; - } - - public boolean isNeiInstalled() { - return false; - } - - public void setInstantConfusionOnPlayer(EntityPlayer ent, int duration) { - ent.addPotionEffect(new PotionEffect(Potion.confusion.getId(), duration, 1, true)); - } - - protected void onServerTick() { - ++serverTickCount; - } - - protected void onClientTick() { - } - - private static final String TEXTURE_PATH = ":textures/gui/23/"; - private static final String TEXTURE_EXT = ".png"; - - public ResourceLocation getGuiTexture(String name) { - return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT); - } - - public final class TickTimer { - - @SubscribeEvent - public void onTick(ServerTickEvent evt) { - if(evt.phase == Phase.END) { - onServerTick(); - } + public World getClientWorld() { + return null; } - @SubscribeEvent - public void onTick(ClientTickEvent evt) { - if(evt.phase == Phase.END) { - onClientTick(); - } + public EntityPlayer getClientPlayer() { + return null; + } + + public ConduitRenderer getRendererForConduit(IConduit conduit) { + return null; + } + + public double getReachDistanceForPlayer(EntityPlayer entityPlayer) { + return 5; + } + + public void loadIcons() { + ; + } + + public void load() { + FMLCommonHandler.instance().bus().register(tickTimer); + } + + public long getTickCount() { + return serverTickCount; + } + + public boolean isNeiInstalled() { + return false; + } + + public void setInstantConfusionOnPlayer(EntityPlayer ent, int duration) { + ent.addPotionEffect(new PotionEffect(Potion.confusion.getId(), duration, 1, true)); + } + + protected void onServerTick() { + ++serverTickCount; + } + + protected void onClientTick() {} + + private static final String TEXTURE_PATH = ":textures/gui/23/"; + private static final String TEXTURE_EXT = ".png"; + + public ResourceLocation getGuiTexture(String name) { + return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT); + } + + public final class TickTimer { + + @SubscribeEvent + public void onTick(ServerTickEvent evt) { + if (evt.phase == Phase.END) { + onServerTick(); + } + } + + @SubscribeEvent + public void onTick(ClientTickEvent evt) { + if (evt.phase == Phase.END) { + onClientTick(); + } + } } - } } diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 90adf81d..95e0d54c 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -4,17 +4,9 @@ import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.lang.reflect.Field; -import java.util.List; -import java.util.Locale; - import com.enderio.core.common.Lang; import com.enderio.core.common.util.EntityUtil; import com.google.common.collect.ImmutableList; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -167,6 +159,12 @@ import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; import crazypants.enderio.tool.EnderIOCrashCallable; import crazypants.util.EE3Util; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.lang.reflect.Field; +import java.util.List; +import java.util.Locale; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -177,669 +175,709 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod( + modid = MODID, + name = MOD_NAME, + version = VERSION, + dependencies = + "after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel", + guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { - public static final String MODID = "EnderIO"; - public static final String DOMAIN = MODID.toLowerCase(Locale.US); - public static final String MOD_NAME = "Ender IO"; - public static final String VERSION = "GRADLETOKEN_VERSION"; - - @Instance(MODID) - public static EnderIO instance; - - @SidedProxy(clientSide = "crazypants.enderio.ClientProxy", serverSide = "crazypants.enderio.CommonProxy") - public static CommonProxy proxy; - - public static final PacketHandler packetPipeline = new PacketHandler(); - - public static GuiHandler guiHandler = new GuiHandler(); - - public static final Lang lang = new Lang("enderio"); - - // Materials - public static ItemCapacitor itemBasicCapacitor; - public static ItemAlloy itemAlloy; - public static ItemGrindingBall itemGrindingBall; - public static ItemAlloyEndergy itemAlloyEndergy; - public static ItemGrindingBallEndergy itemGrindingBallEndergy; - public static BlockFusedQuartz blockFusedQuartz; - public static ItemFusedQuartzFrame itemFusedQuartzFrame; - public static ItemMachinePart itemMachinePart; - public static ItemPowderIngot itemPowderIngot; - public static ItemMaterial itemMaterial; - public static BlockIngotStorage blockIngotStorage; - public static BlockIngotStorageEndergy blockIngotStorageEndergy; - public static BlockDarkSteelBars blockDarkIronBars; - public static BlockSoulariumBars blockSoulariumBars; - public static BlockEndSteelBars blockEndSteelBars; - public static ItemEnderFood itemEnderFood; - - // Enderface - public static BlockEnderIO blockEnderIo; - public static ItemEnderface itemEnderface; - - //Teleporting - public static BlockTravelAnchor blockTravelPlatform; - public static BlockTelePad blockTelePad; - public static ItemCoordSelector itemCoordSelector; - public static ItemTravelStaff itemTravelStaff; - - // Painter - public static BlockPainter blockPainter; - public static BlockPaintedFence blockPaintedFence; - public static BlockPaintedFenceGate blockPaintedFenceGate; - public static BlockPaintedWall blockPaintedWall; - public static BlockPaintedStair blockPaintedStair; - public static BlockPaintedSlab blockPaintedSlab; - public static BlockPaintedSlab blockPaintedDoubleSlab; - public static BlockPaintedGlowstone blockPaintedGlowstone; - public static BlockPaintedCarpet blockPaintedCarpet; - - // Conduits - public static BlockConduitBundle blockConduitBundle; - public static BlockConduitFacade blockConduitFacade; - public static ItemConduitFacade itemConduitFacade; - public static ItemRedstoneConduit itemRedstoneConduit; - public static ItemPowerConduit itemPowerConduit; - public static ItemPowerConduitEndergy itemPowerConduitEndergy; - public static ItemLiquidConduit itemLiquidConduit; - public static ItemItemConduit itemItemConduit; - public static ItemGasConduit itemGasConduit; - public static ItemMEConduit itemMEConduit; - public static ItemOCConduit itemOCConduit; - public static ItemBasicItemFilter itemBasicFilterUpgrade; - public static ItemBigItemFilter itemBigFilterUpgrade; - public static ItemExistingItemFilter itemExistingItemFilter; - public static ItemModItemFilter itemModItemFilter; - public static ItemPowerItemFilter itemPowerItemFilter; - public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade; - public static ItemFunctionUpgrade itemFunctionUpgrade; - - // Machines - public static BlockStirlingGenerator blockStirlingGenerator; - public static BlockCombustionGenerator blockCombustionGenerator; - public static BlockZombieGenerator blockZombieGenerator; - public static BlockFrankenZombieGenerator blockFrankenZombieGenerator; - public static BlockEnderGenerator blockEnderGenerator; - public static BlockSolarPanel blockSolarPanel; - public static BlockReservoir blockReservoir; - public static BlockAlloySmelter blockAlloySmelter; - public static BlockCapacitorBank blockCapacitorBank; - public static BlockCapBank blockCapBank; - public static BlockWirelessCharger blockWirelessCharger; - public static BlockCrusher blockCrusher; - public static BlockHyperCube blockHyperCube; - public static BlockPowerMonitor blockPowerMonitor; - public static BlockVat blockVat; - public static BlockFarmStation blockFarmStation; - public static BlockTank blockTank; - public static BlockCrafter blockCrafter; - public static BlockPoweredSpawner blockPoweredSpawner; - public static ItemBrokenSpawner itemBrokenSpawner; - public static BlockSliceAndSplice blockSliceAndSplice; - public static BlockSoulBinder blockSoulFuser; - public static BlockAttractor blockAttractor; - public static BlockAversionObelisk blockSpawnGuard; - public static BlockExperienceObelisk blockExperianceOblisk; - public static BlockWeatherObelisk blockWeatherObelisk; - public static BlockInhibitorObelisk blockInhibitorObelisk; - public static BlockTransceiver blockTransceiver; - public static BlockBuffer blockBuffer; - public static BlockInventoryPanel blockInventoryPanel; - - public static BlockKillerJoe blockKillerJoe; - - public static BlockEnchanter blockEnchanter; - - public static BlockElectricLight blockElectricLight; - public static BlockLightNode blockLightNode; - - //Blocks - public static BlockDarkSteelPressurePlate blockDarkSteelPressurePlate; - public static BlockDarkSteelAnvil blockDarkSteelAnvil; - public static BlockDarkSteelLadder blockDarkSteelLadder; - public static BlockEndermanSkull blockEndermanSkull; - public static BlockReinforcedObsidian blockReinforcedObsidian; - - public static BlockEnderRail blockEnderRail; - - //Fluids - public static Fluid fluidNutrientDistillation; - public static BlockFluidEio blockNutrientDistillation; - public static ItemBucketEio itemBucketNutrientDistillation; - - public static Fluid fluidHootch; - public static BlockFluidEio blockHootch; - public static ItemBucketEio itemBucketHootch; - - public static Fluid fluidRocketFuel; - public static BlockFluidEio blockRocketFuel; - public static ItemBucketEio itemBucketRocketFuel; - - public static Fluid fluidFireWater; - public static BlockFluidEio blockFireWater; - public static ItemBucketEio itemBucketFireWater; - - public static Fluid fluidLiquidSunshine; - public static BlockFluidEio blockLiquidSunshine; - public static ItemBucketEio itemBucketLiquidSunshine; - - public static Fluid fluidCloudSeed; - public static BlockFluidEio blockCloudSeed; - public static ItemBucketEio itemBucketCloudSeed; - - public static Fluid fluidCloudSeedConcentrated; - public static BlockFluidEio blockCloudSeedConcentrated; - public static ItemBucketEio itemBucketCloudSeedConcentrated; - - public static Fluid fluidEnderDistillation; - public static BlockFluidEio blockEnderDistillation; - public static ItemBucketEio itemBucketEnderDistillation; - - public static Fluid fluidVapourOfLevity; - public static BlockFluidEio blockVapourOfLevity; - public static ItemBucketEio itemBucketVapourOfLevity; - - //Open block compatable liquid XP - public static Fluid fluidXpJuice; - public static ItemBucketEio itemBucketXpJuice; - - // Items - public static ItemYetaWrench itemYetaWench; - public static ItemConduitProbe itemConduitProbe; - public static ItemXpTransfer itemXpTransfer; - - public static ItemSoulVessel itemSoulVessel; - public static ItemFrankenSkull itemFrankenSkull; - - public static BlockVacuumChest blockVacuumChest; - - @EventHandler - public void preInit(FMLPreInitializationEvent event) { - - EnderIOCrashCallable.create(); - - Config.load(event); - - proxy.loadIcons(); - - ConduitGeometryUtil.setupBounds((float) Config.conduitScale); - - blockStirlingGenerator = BlockStirlingGenerator.create(); - blockCombustionGenerator = BlockCombustionGenerator.create(); - blockZombieGenerator = BlockZombieGenerator.create(); - blockFrankenZombieGenerator = BlockFrankenZombieGenerator.create(); - blockEnderGenerator = BlockEnderGenerator.create(); - blockSolarPanel = BlockSolarPanel.create(); - - blockCrusher = BlockCrusher.create(); - blockAlloySmelter = BlockAlloySmelter.create(); - blockCapacitorBank = BlockCapacitorBank.create(); - blockCapBank = BlockCapBank.create(); - - blockPainter = BlockPainter.create(); - blockPaintedFence = BlockPaintedFence.create(); - blockPaintedFenceGate = BlockPaintedFenceGate.create(); - blockPaintedWall = BlockPaintedWall.create(); - blockPaintedStair = BlockPaintedStair.create(); - blockPaintedSlab = new BlockPaintedSlab(false); - blockPaintedDoubleSlab = new BlockPaintedSlab(true); - blockPaintedSlab.init(); - blockPaintedDoubleSlab.init(); - blockCrafter = BlockCrafter.create(); - blockPaintedGlowstone = BlockPaintedGlowstone.create(); - blockPaintedCarpet = BlockPaintedCarpet.create(); - - blockVat = BlockVat.create(); - blockPowerMonitor = BlockPowerMonitor.create(); - blockFarmStation = BlockFarmStation.create(); - - blockWirelessCharger = BlockWirelessCharger.create(); - blockHyperCube = BlockHyperCube.create(); - blockTank = BlockTank.create(); - blockReservoir = BlockReservoir.create(); - blockVacuumChest = BlockVacuumChest.create(); + public static final String MODID = "EnderIO"; + public static final String DOMAIN = MODID.toLowerCase(Locale.US); + public static final String MOD_NAME = "Ender IO"; + public static final String VERSION = "GRADLETOKEN_VERSION"; + + @Instance(MODID) + public static EnderIO instance; + + @SidedProxy(clientSide = "crazypants.enderio.ClientProxy", serverSide = "crazypants.enderio.CommonProxy") + public static CommonProxy proxy; + + public static final PacketHandler packetPipeline = new PacketHandler(); + + public static GuiHandler guiHandler = new GuiHandler(); + + public static final Lang lang = new Lang("enderio"); + + // Materials + public static ItemCapacitor itemBasicCapacitor; + public static ItemAlloy itemAlloy; + public static ItemGrindingBall itemGrindingBall; + public static ItemAlloyEndergy itemAlloyEndergy; + public static ItemGrindingBallEndergy itemGrindingBallEndergy; + public static BlockFusedQuartz blockFusedQuartz; + public static ItemFusedQuartzFrame itemFusedQuartzFrame; + public static ItemMachinePart itemMachinePart; + public static ItemPowderIngot itemPowderIngot; + public static ItemMaterial itemMaterial; + public static BlockIngotStorage blockIngotStorage; + public static BlockIngotStorageEndergy blockIngotStorageEndergy; + public static BlockDarkSteelBars blockDarkIronBars; + public static BlockSoulariumBars blockSoulariumBars; + public static BlockEndSteelBars blockEndSteelBars; + public static ItemEnderFood itemEnderFood; + + // Enderface + public static BlockEnderIO blockEnderIo; + public static ItemEnderface itemEnderface; + + // Teleporting + public static BlockTravelAnchor blockTravelPlatform; + public static BlockTelePad blockTelePad; + public static ItemCoordSelector itemCoordSelector; + public static ItemTravelStaff itemTravelStaff; + + // Painter + public static BlockPainter blockPainter; + public static BlockPaintedFence blockPaintedFence; + public static BlockPaintedFenceGate blockPaintedFenceGate; + public static BlockPaintedWall blockPaintedWall; + public static BlockPaintedStair blockPaintedStair; + public static BlockPaintedSlab blockPaintedSlab; + public static BlockPaintedSlab blockPaintedDoubleSlab; + public static BlockPaintedGlowstone blockPaintedGlowstone; + public static BlockPaintedCarpet blockPaintedCarpet; + + // Conduits + public static BlockConduitBundle blockConduitBundle; + public static BlockConduitFacade blockConduitFacade; + public static ItemConduitFacade itemConduitFacade; + public static ItemRedstoneConduit itemRedstoneConduit; + public static ItemPowerConduit itemPowerConduit; + public static ItemPowerConduitEndergy itemPowerConduitEndergy; + public static ItemLiquidConduit itemLiquidConduit; + public static ItemItemConduit itemItemConduit; + public static ItemGasConduit itemGasConduit; + public static ItemMEConduit itemMEConduit; + public static ItemOCConduit itemOCConduit; + public static ItemBasicItemFilter itemBasicFilterUpgrade; + public static ItemBigItemFilter itemBigFilterUpgrade; + public static ItemExistingItemFilter itemExistingItemFilter; + public static ItemModItemFilter itemModItemFilter; + public static ItemPowerItemFilter itemPowerItemFilter; + public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade; + public static ItemFunctionUpgrade itemFunctionUpgrade; + + // Machines + public static BlockStirlingGenerator blockStirlingGenerator; + public static BlockCombustionGenerator blockCombustionGenerator; + public static BlockZombieGenerator blockZombieGenerator; + public static BlockFrankenZombieGenerator blockFrankenZombieGenerator; + public static BlockEnderGenerator blockEnderGenerator; + public static BlockSolarPanel blockSolarPanel; + public static BlockReservoir blockReservoir; + public static BlockAlloySmelter blockAlloySmelter; + public static BlockCapacitorBank blockCapacitorBank; + public static BlockCapBank blockCapBank; + public static BlockWirelessCharger blockWirelessCharger; + public static BlockCrusher blockCrusher; + public static BlockHyperCube blockHyperCube; + public static BlockPowerMonitor blockPowerMonitor; + public static BlockVat blockVat; + public static BlockFarmStation blockFarmStation; + public static BlockTank blockTank; + public static BlockCrafter blockCrafter; + public static BlockPoweredSpawner blockPoweredSpawner; + public static ItemBrokenSpawner itemBrokenSpawner; + public static BlockSliceAndSplice blockSliceAndSplice; + public static BlockSoulBinder blockSoulFuser; + public static BlockAttractor blockAttractor; + public static BlockAversionObelisk blockSpawnGuard; + public static BlockExperienceObelisk blockExperianceOblisk; + public static BlockWeatherObelisk blockWeatherObelisk; + public static BlockInhibitorObelisk blockInhibitorObelisk; + public static BlockTransceiver blockTransceiver; + public static BlockBuffer blockBuffer; + public static BlockInventoryPanel blockInventoryPanel; + + public static BlockKillerJoe blockKillerJoe; + + public static BlockEnchanter blockEnchanter; + + public static BlockElectricLight blockElectricLight; + public static BlockLightNode blockLightNode; + + // Blocks + public static BlockDarkSteelPressurePlate blockDarkSteelPressurePlate; + public static BlockDarkSteelAnvil blockDarkSteelAnvil; + public static BlockDarkSteelLadder blockDarkSteelLadder; + public static BlockEndermanSkull blockEndermanSkull; + public static BlockReinforcedObsidian blockReinforcedObsidian; + + public static BlockEnderRail blockEnderRail; + + // Fluids + public static Fluid fluidNutrientDistillation; + public static BlockFluidEio blockNutrientDistillation; + public static ItemBucketEio itemBucketNutrientDistillation; + + public static Fluid fluidHootch; + public static BlockFluidEio blockHootch; + public static ItemBucketEio itemBucketHootch; + + public static Fluid fluidRocketFuel; + public static BlockFluidEio blockRocketFuel; + public static ItemBucketEio itemBucketRocketFuel; + + public static Fluid fluidFireWater; + public static BlockFluidEio blockFireWater; + public static ItemBucketEio itemBucketFireWater; + + public static Fluid fluidLiquidSunshine; + public static BlockFluidEio blockLiquidSunshine; + public static ItemBucketEio itemBucketLiquidSunshine; + + public static Fluid fluidCloudSeed; + public static BlockFluidEio blockCloudSeed; + public static ItemBucketEio itemBucketCloudSeed; + + public static Fluid fluidCloudSeedConcentrated; + public static BlockFluidEio blockCloudSeedConcentrated; + public static ItemBucketEio itemBucketCloudSeedConcentrated; + + public static Fluid fluidEnderDistillation; + public static BlockFluidEio blockEnderDistillation; + public static ItemBucketEio itemBucketEnderDistillation; + + public static Fluid fluidVapourOfLevity; + public static BlockFluidEio blockVapourOfLevity; + public static ItemBucketEio itemBucketVapourOfLevity; + + // Open block compatable liquid XP + public static Fluid fluidXpJuice; + public static ItemBucketEio itemBucketXpJuice; + + // Items + public static ItemYetaWrench itemYetaWench; + public static ItemConduitProbe itemConduitProbe; + public static ItemXpTransfer itemXpTransfer; + + public static ItemSoulVessel itemSoulVessel; + public static ItemFrankenSkull itemFrankenSkull; + + public static BlockVacuumChest blockVacuumChest; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) { + + EnderIOCrashCallable.create(); + + Config.load(event); + + proxy.loadIcons(); + + ConduitGeometryUtil.setupBounds((float) Config.conduitScale); + + blockStirlingGenerator = BlockStirlingGenerator.create(); + blockCombustionGenerator = BlockCombustionGenerator.create(); + blockZombieGenerator = BlockZombieGenerator.create(); + blockFrankenZombieGenerator = BlockFrankenZombieGenerator.create(); + blockEnderGenerator = BlockEnderGenerator.create(); + blockSolarPanel = BlockSolarPanel.create(); + + blockCrusher = BlockCrusher.create(); + blockAlloySmelter = BlockAlloySmelter.create(); + blockCapacitorBank = BlockCapacitorBank.create(); + blockCapBank = BlockCapBank.create(); + + blockPainter = BlockPainter.create(); + blockPaintedFence = BlockPaintedFence.create(); + blockPaintedFenceGate = BlockPaintedFenceGate.create(); + blockPaintedWall = BlockPaintedWall.create(); + blockPaintedStair = BlockPaintedStair.create(); + blockPaintedSlab = new BlockPaintedSlab(false); + blockPaintedDoubleSlab = new BlockPaintedSlab(true); + blockPaintedSlab.init(); + blockPaintedDoubleSlab.init(); + blockCrafter = BlockCrafter.create(); + blockPaintedGlowstone = BlockPaintedGlowstone.create(); + blockPaintedCarpet = BlockPaintedCarpet.create(); + + blockVat = BlockVat.create(); + blockPowerMonitor = BlockPowerMonitor.create(); + blockFarmStation = BlockFarmStation.create(); + + blockWirelessCharger = BlockWirelessCharger.create(); + blockHyperCube = BlockHyperCube.create(); + blockTank = BlockTank.create(); + blockReservoir = BlockReservoir.create(); + blockVacuumChest = BlockVacuumChest.create(); + + blockTransceiver = BlockTransceiver.create(); + + blockBuffer = BlockBuffer.create(); + blockInventoryPanel = BlockInventoryPanel.create(); + + blockEnderIo = BlockEnderIO.create(); + blockTravelPlatform = BlockTravelAnchor.create(); + blockTelePad = BlockTelePad.create(); + itemCoordSelector = ItemCoordSelector.create(); + + blockSliceAndSplice = BlockSliceAndSplice.create(); + blockSoulFuser = BlockSoulBinder.create(); + blockPoweredSpawner = BlockPoweredSpawner.create(); + blockKillerJoe = BlockKillerJoe.create(); + blockAttractor = BlockAttractor.create(); + blockSpawnGuard = BlockAversionObelisk.create(); + blockExperianceOblisk = BlockExperienceObelisk.create(); + blockWeatherObelisk = BlockWeatherObelisk.create(); + blockInhibitorObelisk = BlockInhibitorObelisk.create(); + blockEnchanter = BlockEnchanter.create(); + + blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create(); + blockDarkSteelAnvil = BlockDarkSteelAnvil.create(); + blockDarkSteelLadder = BlockDarkSteelLadder.create(); + blockElectricLight = BlockElectricLight.create(); + blockLightNode = BlockLightNode.create(); + + blockReinforcedObsidian = BlockReinforcedObsidian.create(); + + blockFusedQuartz = BlockFusedQuartz.create(); + itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); - blockTransceiver = BlockTransceiver.create(); + blockEnderRail = BlockEnderRail.create(); + + blockConduitBundle = BlockConduitBundle.create(); + blockConduitFacade = BlockConduitFacade.create(); + itemConduitFacade = ItemConduitFacade.create(); + + itemBrokenSpawner = ItemBrokenSpawner.create(); - blockBuffer = BlockBuffer.create(); - blockInventoryPanel = BlockInventoryPanel.create(); + blockEndermanSkull = BlockEndermanSkull.create(); + itemFrankenSkull = ItemFrankenSkull.create(); + + itemRedstoneConduit = ItemRedstoneConduit.create(); + itemPowerConduit = ItemPowerConduit.create(); + itemPowerConduitEndergy = ItemPowerConduitEndergy.create(); + itemLiquidConduit = ItemLiquidConduit.create(); + itemItemConduit = ItemItemConduit.create(); + itemGasConduit = ItemGasConduit.create(); + itemMEConduit = ItemMEConduit.create(); + itemOCConduit = ItemOCConduit.create(); - blockEnderIo = BlockEnderIO.create(); - blockTravelPlatform = BlockTravelAnchor.create(); - blockTelePad = BlockTelePad.create(); - itemCoordSelector = ItemCoordSelector.create(); - - blockSliceAndSplice = BlockSliceAndSplice.create(); - blockSoulFuser = BlockSoulBinder.create(); - blockPoweredSpawner = BlockPoweredSpawner.create(); - blockKillerJoe = BlockKillerJoe.create(); - blockAttractor = BlockAttractor.create(); - blockSpawnGuard = BlockAversionObelisk.create(); - blockExperianceOblisk = BlockExperienceObelisk.create(); - blockWeatherObelisk = BlockWeatherObelisk.create(); - blockInhibitorObelisk = BlockInhibitorObelisk.create(); - blockEnchanter = BlockEnchanter.create(); - - blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create(); - blockDarkSteelAnvil = BlockDarkSteelAnvil.create(); - blockDarkSteelLadder = BlockDarkSteelLadder.create(); - blockElectricLight = BlockElectricLight.create(); - blockLightNode = BlockLightNode.create(); - - blockReinforcedObsidian = BlockReinforcedObsidian.create(); - - blockFusedQuartz = BlockFusedQuartz.create(); - itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); - - blockEnderRail = BlockEnderRail.create(); - - blockConduitBundle = BlockConduitBundle.create(); - blockConduitFacade = BlockConduitFacade.create(); - itemConduitFacade = ItemConduitFacade.create(); - - itemBrokenSpawner = ItemBrokenSpawner.create(); - - blockEndermanSkull = BlockEndermanSkull.create(); - itemFrankenSkull = ItemFrankenSkull.create(); - - itemRedstoneConduit = ItemRedstoneConduit.create(); - itemPowerConduit = ItemPowerConduit.create(); - itemPowerConduitEndergy = ItemPowerConduitEndergy.create(); - itemLiquidConduit = ItemLiquidConduit.create(); - itemItemConduit = ItemItemConduit.create(); - itemGasConduit = ItemGasConduit.create(); - itemMEConduit = ItemMEConduit.create(); - itemOCConduit = ItemOCConduit.create(); - - itemBasicFilterUpgrade = ItemBasicItemFilter.create(); - itemBigFilterUpgrade = ItemBigItemFilter.create(); - itemExistingItemFilter = ItemExistingItemFilter.create(); - itemModItemFilter = ItemModItemFilter.create(); - itemPowerItemFilter = ItemPowerItemFilter.create(); - itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create(); - itemFunctionUpgrade = ItemFunctionUpgrade.create(); - - itemBasicCapacitor = ItemCapacitor.create(); - itemMachinePart = ItemMachinePart.create(); - itemMaterial = ItemMaterial.create(); - itemAlloy = ItemAlloy.create(); - itemGrindingBall = ItemGrindingBall.create(); - itemAlloyEndergy = ItemAlloyEndergy.create(); - itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); - itemPowderIngot = ItemPowderIngot.create(); - - registerFluids(); - - itemYetaWench = ItemYetaWrench.create(); - itemEnderface = ItemEnderface.create(); - itemTravelStaff = ItemTravelStaff.create(); - itemConduitProbe = ItemConduitProbe.create(); - - itemXpTransfer = ItemXpTransfer.create(); - - itemSoulVessel = ItemSoulVessel.create(); - - blockIngotStorage = BlockIngotStorage.create(); - blockIngotStorageEndergy = BlockIngotStorageEndergy.create(); - - blockDarkIronBars = BlockDarkSteelBars.create(); - blockSoulariumBars = BlockSoulariumBars.create(); - blockEndSteelBars = BlockEndSteelBars.create(); - - - itemEnderFood = ItemEnderFood.create(); - - DarkSteelItems.createDarkSteelArmorItems(); - - int entityID = EntityRegistry.findGlobalUniqueEntityId(); - EntityRegistry.registerGlobalEntityID(SoundEntity.class, "soundEntity", entityID); - EntityRegistry.registerModEntity(SoundEntity.class, "soundEntity", entityID, this, 0, 0, false); - - entityID = EntityRegistry.findGlobalUniqueEntityId(); - EntityRegistry.registerGlobalEntityID(RangeEntity.class, "rangeEntity", entityID); - EntityRegistry.registerModEntity(RangeEntity.class, "rangeEntity", entityID, this, 0, 0, false); - - FMLInterModComms.sendMessage("Waila", "register", "crazypants.enderio.waila.WailaCompat.load"); - - MaterialRecipes.registerOresInDictionary(); - } - - private void registerFluids() { - Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000); - FluidRegistry.registerFluid(f); - fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); - blockNutrientDistillation = BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water); - - PacketHandler.INSTANCE.registerMessage(PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT); - - f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000); - FluidRegistry.registerFluid(f); - fluidHootch = FluidRegistry.getFluid(f.getName()); - blockHootch = BlockFluidEio.Hootch.create(fluidHootch, Material.water); - FluidFuelRegister.instance.addFuel(f, Config.hootchPowerPerCycleRF, Config.hootchPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.HOOTCH + "@" - + (Config.hootchPowerPerCycleRF / 10 * Config.hootchPowerTotalBurnTime)); - - f = new Fluid(Fluids.ROCKET_FUEL).setDensity(900).setViscosity(1000); - FluidRegistry.registerFluid(f); - fluidRocketFuel = FluidRegistry.getFluid(f.getName()); - blockRocketFuel = BlockFluidEio.RocketFuel.create(fluidRocketFuel, Material.water); - FluidFuelRegister.instance.addFuel(f, Config.rocketFuelPowerPerCycleRF, Config.rocketFuelPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.ROCKET_FUEL + "@" - + (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime)); - - f = new Fluid(Fluids.FIRE_WATER).setDensity(900).setViscosity(1000).setTemperature(FluidRegistry.LAVA.getTemperature() * 2); - FluidRegistry.registerFluid(f); - fluidFireWater = FluidRegistry.getFluid(f.getName()); - blockFireWater = BlockFluidEio.FireWater.create(fluidFireWater, Material.lava); - FluidFuelRegister.instance.addFuel(f, Config.fireWaterPowerPerCycleRF, Config.fireWaterPowerTotalBurnTime); - FMLInterModComms.sendMessage("Railcraft", "boiler-fuel-liquid", Fluids.FIRE_WATER + "@" - + (Config.fireWaterPowerPerCycleRF / 10 * Config.fireWaterPowerTotalBurnTime)); - - f = new Fluid(Fluids.LIQUID_SUNSHINE).setDensity(200).setViscosity(400); - FluidRegistry.registerFluid(f); - fluidLiquidSunshine = FluidRegistry.getFluid(f.getName()); - blockLiquidSunshine = BlockFluidEio.create(fluidLiquidSunshine, Material.water); - - f = new Fluid(Fluids.CLOUD_SEED).setDensity(500).setViscosity(800); - FluidRegistry.registerFluid(f); - fluidCloudSeed = FluidRegistry.getFluid(f.getName()); - blockCloudSeed = BlockFluidEio.create(fluidCloudSeed, Material.water); - - f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200); - FluidRegistry.registerFluid(f); - fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName()); - blockCloudSeedConcentrated = BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water); - - f = new Fluid(Fluids.ENDER_DISTILLATION).setDensity(200).setViscosity(1000).setTemperature(175); - FluidRegistry.registerFluid(f); - fluidEnderDistillation = FluidRegistry.getFluid(f.getName()); - blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water); - - f = new Fluid(Fluids.VAPOR_OF_LEVITY).setDensity(-10).setViscosity(100).setTemperature(5).setGaseous(true); - FluidRegistry.registerFluid(f); - fluidVapourOfLevity = FluidRegistry.getFluid(f.getName()); - blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water); - FluidFuelRegister.instance.addCoolant(f, 0.0314f); - - if (!Loader.isModLoaded("OpenBlocks")) { - Log.info("XP Juice registered by Ender IO."); - fluidXpJuice = new Fluid(Config.xpJuiceName).setLuminosity(10).setDensity(800).setViscosity(1500).setUnlocalizedName("eio.xpjuice"); - FluidRegistry.registerFluid(fluidXpJuice); - itemBucketXpJuice = ItemBucketEio.create(fluidXpJuice); - } else { - Log.info("XP Juice regististration left to Open Blocks."); + itemBasicFilterUpgrade = ItemBasicItemFilter.create(); + itemBigFilterUpgrade = ItemBigItemFilter.create(); + itemExistingItemFilter = ItemExistingItemFilter.create(); + itemModItemFilter = ItemModItemFilter.create(); + itemPowerItemFilter = ItemPowerItemFilter.create(); + itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create(); + itemFunctionUpgrade = ItemFunctionUpgrade.create(); + + itemBasicCapacitor = ItemCapacitor.create(); + itemMachinePart = ItemMachinePart.create(); + itemMaterial = ItemMaterial.create(); + itemAlloy = ItemAlloy.create(); + itemGrindingBall = ItemGrindingBall.create(); + itemAlloyEndergy = ItemAlloyEndergy.create(); + itemGrindingBallEndergy = ItemGrindingBallEndergy.create(); + itemPowderIngot = ItemPowderIngot.create(); + + registerFluids(); + + itemYetaWench = ItemYetaWrench.create(); + itemEnderface = ItemEnderface.create(); + itemTravelStaff = ItemTravelStaff.create(); + itemConduitProbe = ItemConduitProbe.create(); + + itemXpTransfer = ItemXpTransfer.create(); + + itemSoulVessel = ItemSoulVessel.create(); + + blockIngotStorage = BlockIngotStorage.create(); + blockIngotStorageEndergy = BlockIngotStorageEndergy.create(); + + blockDarkIronBars = BlockDarkSteelBars.create(); + blockSoulariumBars = BlockSoulariumBars.create(); + blockEndSteelBars = BlockEndSteelBars.create(); + + itemEnderFood = ItemEnderFood.create(); + + DarkSteelItems.createDarkSteelArmorItems(); + + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(SoundEntity.class, "soundEntity", entityID); + EntityRegistry.registerModEntity(SoundEntity.class, "soundEntity", entityID, this, 0, 0, false); + + entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(RangeEntity.class, "rangeEntity", entityID); + EntityRegistry.registerModEntity(RangeEntity.class, "rangeEntity", entityID, this, 0, 0, false); + + FMLInterModComms.sendMessage("Waila", "register", "crazypants.enderio.waila.WailaCompat.load"); + + MaterialRecipes.registerOresInDictionary(); } - itemBucketNutrientDistillation = ItemBucketEio.create(fluidNutrientDistillation); - itemBucketHootch = ItemBucketEio.create(fluidHootch); - itemBucketRocketFuel = ItemBucketEio.create(fluidRocketFuel); - itemBucketFireWater = ItemBucketEio.create(fluidFireWater); - itemBucketLiquidSunshine = ItemBucketEio.create(fluidLiquidSunshine); - itemBucketCloudSeed = ItemBucketEio.create(fluidCloudSeed); - itemBucketCloudSeedConcentrated = ItemBucketEio.create(fluidCloudSeedConcentrated); - itemBucketEnderDistillation = ItemBucketEio.create(fluidEnderDistillation); - itemBucketVapourOfLevity = ItemBucketEio.create(fluidVapourOfLevity); + private void registerFluids() { + Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION).setDensity(1500).setViscosity(3000); + FluidRegistry.registerFluid(f); + fluidNutrientDistillation = FluidRegistry.getFluid(f.getName()); + blockNutrientDistillation = + BlockFluidEio.NutrientDistillation.create(fluidNutrientDistillation, Material.water); - } + PacketHandler.INSTANCE.registerMessage( + PacketNutrientTank.class, PacketNutrientTank.class, PacketHandler.nextID(), Side.CLIENT); - @EventHandler - public void load(FMLInitializationEvent event) { + f = new Fluid(Fluids.HOOTCH).setDensity(900).setViscosity(1000); + FluidRegistry.registerFluid(f); + fluidHootch = FluidRegistry.getFluid(f.getName()); + blockHootch = BlockFluidEio.Hootch.create(fluidHootch, Material.water); + FluidFuelRegister.instance.addFuel(f, Config.hootchPowerPerCycleRF, Config.hootchPowerTotalBurnTime); + FMLInterModComms.sendMessage( + "Railcraft", + "boiler-fuel-liquid", + Fluids.HOOTCH + "@" + (Config.hootchPowerPerCycleRF / 10 * Config.hootchPowerTotalBurnTime)); - Config.init(); + f = new Fluid(Fluids.ROCKET_FUEL).setDensity(900).setViscosity(1000); + FluidRegistry.registerFluid(f); + fluidRocketFuel = FluidRegistry.getFluid(f.getName()); + blockRocketFuel = BlockFluidEio.RocketFuel.create(fluidRocketFuel, Material.water); + FluidFuelRegister.instance.addFuel(f, Config.rocketFuelPowerPerCycleRF, Config.rocketFuelPowerTotalBurnTime); + FMLInterModComms.sendMessage( + "Railcraft", + "boiler-fuel-liquid", + Fluids.ROCKET_FUEL + "@" + + (Config.rocketFuelPowerPerCycleRF / 10 * Config.rocketFuelPowerTotalBurnTime)); - instance = this; + f = new Fluid(Fluids.FIRE_WATER) + .setDensity(900) + .setViscosity(1000) + .setTemperature(FluidRegistry.LAVA.getTemperature() * 2); + FluidRegistry.registerFluid(f); + fluidFireWater = FluidRegistry.getFluid(f.getName()); + blockFireWater = BlockFluidEio.FireWater.create(fluidFireWater, Material.lava); + FluidFuelRegister.instance.addFuel(f, Config.fireWaterPowerPerCycleRF, Config.fireWaterPowerTotalBurnTime); + FMLInterModComms.sendMessage( + "Railcraft", + "boiler-fuel-liquid", + Fluids.FIRE_WATER + "@" + (Config.fireWaterPowerPerCycleRF / 10 * Config.fireWaterPowerTotalBurnTime)); - PacketHandler.INSTANCE.registerMessage(PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER); + f = new Fluid(Fluids.LIQUID_SUNSHINE).setDensity(200).setViscosity(400); + FluidRegistry.registerFluid(f); + fluidLiquidSunshine = FluidRegistry.getFluid(f.getName()); + blockLiquidSunshine = BlockFluidEio.create(fluidLiquidSunshine, Material.water); - NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler); - MinecraftForge.EVENT_BUS.register(this); + f = new Fluid(Fluids.CLOUD_SEED).setDensity(500).setViscosity(800); + FluidRegistry.registerFluid(f); + fluidCloudSeed = FluidRegistry.getFluid(f.getName()); + blockCloudSeed = BlockFluidEio.create(fluidCloudSeed, Material.water); - //Register Custom Dungeon Loot here - if(Config.lootDarkSteel) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 1, 3, 15)); - } + f = new Fluid(Fluids.CLOUD_SEED_CONCENTRATED).setDensity(1000).setViscosity(1200); + FluidRegistry.registerFluid(f); + fluidCloudSeedConcentrated = FluidRegistry.getFluid(f.getName()); + blockCloudSeedConcentrated = + BlockFluidEio.CloudSeedConcentrated.create(fluidCloudSeedConcentrated, Material.water); - if(Config.lootItemConduitProbe) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemConduitProbe, 1, 0), 1, 1, 10)); - } + f = new Fluid(Fluids.ENDER_DISTILLATION) + .setDensity(200) + .setViscosity(1000) + .setTemperature(175); + FluidRegistry.registerFluid(f); + fluidEnderDistillation = FluidRegistry.getFluid(f.getName()); + blockEnderDistillation = BlockFluidEio.create(fluidEnderDistillation, Material.water); - if(Config.lootQuartz) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.quartz), 3, 16, 20)); - } + f = new Fluid(Fluids.VAPOR_OF_LEVITY) + .setDensity(-10) + .setViscosity(100) + .setTemperature(5) + .setGaseous(true); + FluidRegistry.registerFluid(f); + fluidVapourOfLevity = FluidRegistry.getFluid(f.getName()); + blockVapourOfLevity = BlockFluidEio.VapourOfLevity.create(fluidVapourOfLevity, Material.water); + FluidFuelRegister.instance.addCoolant(f, 0.0314f); - if(Config.lootNetherWart) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.nether_wart), 1, 4, 10)); - } - - if(Config.lootEnderPearl) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Items.ender_pearl), 1, 2, 30)); - } - - if(Config.lootElectricSteel) { - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 2, 6, 20)); - } - - if(Config.lootRedstoneAlloy) { - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 6, 35)); - } - - if(Config.lootDarkSteel) { - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 3, 6, 35)); - } - - if(Config.lootPhasedIron) { - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 1, 2, 10)); - } - - if(Config.lootPhasedGold) { - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 1, 2, 5)); - } - - if(Config.lootTravelStaff) { - ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 3)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 3)); - } - - DarkSteelItems.addLoot(); - - if(Loader.isModLoaded("ComputerCraft")) { - ConduitBundledRedstoneProvider.register(); - } - - if(Config.replaceWitherSkeletons) - { - SkeletonHandler.registerSkeleton(this); - } - - MaterialRecipes.registerDependantOresInDictionary(); - - EnderfaceRecipes.addRecipes(); - MaterialRecipes.addRecipes(); - ConduitRecipes.addRecipes(); - MachineRecipes.addRecipes(); - ItemRecipes.addRecipes(); - TeleportRecipes.addRecipes(); - EE3Util.registerMiscRecipes(); - - proxy.load(); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent event) { - - Config.postInit(); - - //Regsiter the enchants - Enchantments.getInstance(); - - //This must be loaded before parsing the recipes so we get the preferred outputs - OreDictionaryPreferences.loadConfig(); - - CrusherRecipeManager.getInstance().loadRecipesFromConfig(); - AlloyRecipeManager.getInstance().loadRecipesFromConfig(); - SliceAndSpliceRecipeManager.getInstance().loadRecipesFromConfig(); - VatRecipeManager.getInstance().loadRecipesFromConfig(); - EnchanterRecipeManager.getInstance().loadRecipesFromConfig(); - FarmersRegistry.addFarmers(); - SoulBinderRecipeManager.getInstance().addDefaultRecipes(); - PaintSourceValidator.instance.loadConfig(); - - if(fluidXpJuice == null) { //should have been registered by open blocks - fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName()); - if(fluidXpJuice == null) { - Log.error("Liquid XP Juice registration left to open blocks but could not be found."); - } - } - - if(Config.dumpMobNames) { - File dumpFile = new File(Config.configDirectory, "mobTypes.txt"); - List names = EntityUtil.getAllRegisteredMobNames(false); - - try { - BufferedWriter br = new BufferedWriter(new FileWriter(dumpFile, false)); - for (String name : names) { - br.append(name); - br.newLine(); + if (!Loader.isModLoaded("OpenBlocks")) { + Log.info("XP Juice registered by Ender IO."); + fluidXpJuice = new Fluid(Config.xpJuiceName) + .setLuminosity(10) + .setDensity(800) + .setViscosity(1500) + .setUnlocalizedName("eio.xpjuice"); + FluidRegistry.registerFluid(fluidXpJuice); + itemBucketXpJuice = ItemBucketEio.create(fluidXpJuice); + } else { + Log.info("XP Juice regististration left to Open Blocks."); } - br.flush(); - br.close(); - } catch (Exception e) { - Log.error("Could not write mob types file: " + e); - } + itemBucketNutrientDistillation = ItemBucketEio.create(fluidNutrientDistillation); + itemBucketHootch = ItemBucketEio.create(fluidHootch); + itemBucketRocketFuel = ItemBucketEio.create(fluidRocketFuel); + itemBucketFireWater = ItemBucketEio.create(fluidFireWater); + itemBucketLiquidSunshine = ItemBucketEio.create(fluidLiquidSunshine); + itemBucketCloudSeed = ItemBucketEio.create(fluidCloudSeed); + itemBucketCloudSeedConcentrated = ItemBucketEio.create(fluidCloudSeedConcentrated); + itemBucketEnderDistillation = ItemBucketEio.create(fluidEnderDistillation); + itemBucketVapourOfLevity = ItemBucketEio.create(fluidVapourOfLevity); } - addModIntegration(); + @EventHandler + public void load(FMLInitializationEvent event) { - //Register villagers - FMLInterModComms.sendMessage("EnderStructures", "addResourcePath", "/assets/enderio/villagers"); - FMLInterModComms.sendMessage("EnderStructures", "registerVillageGenerator", "enderioMobDropVillager"); - } + Config.init(); - @EventHandler - public void loadComplete(FMLLoadCompleteEvent event) { - processImc(FMLInterModComms.fetchRuntimeMessages(this)); //Some mods send IMCs during PostInit, so we catch them here. - } + instance = this; - private static String getXPJuiceName() { - String openBlocksXPJuiceName = null; + PacketHandler.INSTANCE.registerMessage( + PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER); - try { - Field getField = Class.forName("openblocks.Config").getField("xpFluidId"); - openBlocksXPJuiceName = (String) getField.get(null); - } catch (Exception e) { - } + NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler); + MinecraftForge.EVENT_BUS.register(this); - if(openBlocksXPJuiceName != null && !Config.xpJuiceName.equals(openBlocksXPJuiceName)) { - Log.info("Overwriting XP Juice name with '" + openBlocksXPJuiceName + "' taken from OpenBlocks' config"); - return openBlocksXPJuiceName; - } - - return Config.xpJuiceName; - } - - @SuppressWarnings("unchecked") - private void addModIntegration() { - - if(Loader.isModLoaded("TConstruct")) { - try { - Class ttClass = Class.forName("tconstruct.tools.TinkerTools"); - Field modFluxF = ttClass.getField("modFlux"); - Object modFluxInst = modFluxF.get(null); - - Class modFluxClass = Class.forName("tconstruct.modifiers.tools.ModFlux"); - Field batteriesField = modFluxClass.getField("batteries"); - List batteries = (List) batteriesField.get(modFluxInst); - batteries.add(new ItemStack(blockCapBank)); - Log.info("Registered Capacitor Banks as Tinkers Construct Flux Upgrades"); - } catch (Exception e) { - //Doesn't matter if it didnt work - Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades"); - } - } - - ThaumcraftCompat.load(); - } - - @EventHandler - public void onImc(IMCEvent evt) { - processImc(evt.getMessages()); - } - - private void processImc(ImmutableList messages) { - for (IMCMessage msg : messages) { - String key = msg.key; - try { - if(msg.isStringMessage()) { - String value = msg.getStringValue(); - if(IMC.VAT_RECIPE.equals(key)) { - VatRecipeManager.getInstance().addCustomRecipes(value); - } else if(IMC.SAG_RECIPE.equals(key)) { - CrusherRecipeManager.getInstance().addCustomRecipes(value); - } else if(IMC.ALLOY_RECIPE.equals(key)) { - AlloyRecipeManager.getInstance().addCustomRecipes(value); - } else if(IMC.POWERED_SPAWNER_BLACKLIST_ADD.equals(key)) { - PoweredSpawnerConfig.getInstance().addToBlacklist(value); - } else if(IMC.TELEPORT_BLACKLIST_ADD.equals(key)) { - TravelController.instance.addBlockToBlinkBlackList(value); - } else if(IMC.SOUL_VIAL_BLACKLIST.equals(key) && itemSoulVessel != null) { - itemSoulVessel.addEntityToBlackList(value); - } else if(IMC.ENCHANTER_RECIPE.equals(key)) { - EnchanterRecipeManager.getInstance().addCustomRecipes(value); - } else if(IMC.SLINE_N_SPLICE_RECIPE.equals(key)) { - SliceAndSpliceRecipeManager.getInstance().addCustomRecipes(key); - } - } else if(msg.isNBTMessage()) { - if(IMC.SOUL_BINDER_RECIPE.equals(key)) { - SoulBinderRecipeManager.getInstance().addRecipeFromNBT(msg.getNBTValue()); - } else if(IMC.POWERED_SPAWNER_COST_MULTIPLIER.equals(key)) { - PoweredSpawnerConfig.getInstance().addEntityCostFromNBT(msg.getNBTValue()); - } else if(IMC.FLUID_FUEL_ADD.equals(key)) { - FluidFuelRegister.instance.addFuel(msg.getNBTValue()); - } else if(IMC.FLUID_COOLANT_ADD.equals(key)) { - FluidFuelRegister.instance.addCoolant(msg.getNBTValue()); - } else if(IMC.REDSTONE_CONNECTABLE_ADD.equals(key)) { - InsulatedRedstoneConduit.addConnectableBlock(msg.getNBTValue()); - } - } else if(msg.isItemStackMessage()) { - if(IMC.PAINTER_WHITELIST_ADD.equals(key)) { - PaintSourceValidator.instance.addToWhitelist(msg.getItemStackValue()); - } else if(IMC.PAINTER_BLACKLIST_ADD.equals(key)) { - PaintSourceValidator.instance.addToBlacklist(msg.getItemStackValue()); - } + // Register Custom Dungeon Loot here + if (Config.lootDarkSteel) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 1, 3, 15)); } - } catch (Exception e) { - Log.error("Error occured handling IMC message " + key + " from " + msg.getSender()); - } + + if (Config.lootItemConduitProbe) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemConduitProbe, 1, 0), 1, 1, 10)); + } + + if (Config.lootQuartz) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(Items.quartz), 3, 16, 20)); + } + + if (Config.lootNetherWart) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(Items.nether_wart), 1, 4, 10)); + } + + if (Config.lootEnderPearl) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) + .addItem(new WeightedRandomChestContent(new ItemStack(Items.ender_pearl), 1, 2, 30)); + } + + if (Config.lootElectricSteel) { + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 2, 6, 20)); + } + + if (Config.lootRedstoneAlloy) { + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 6, 35)); + } + + if (Config.lootDarkSteel) { + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()), 3, 6, 35)); + } + + if (Config.lootPhasedIron) { + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 1, 2, 10)); + } + + if (Config.lootPhasedGold) { + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent( + new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 1, 2, 5)); + } + + if (Config.lootTravelStaff) { + ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST) + .addItem(new WeightedRandomChestContent(staff, 1, 1, 3)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST) + .addItem(new WeightedRandomChestContent(staff, 1, 1, 3)); + } + + DarkSteelItems.addLoot(); + + if (Loader.isModLoaded("ComputerCraft")) { + ConduitBundledRedstoneProvider.register(); + } + + if (Config.replaceWitherSkeletons) { + SkeletonHandler.registerSkeleton(this); + } + + MaterialRecipes.registerDependantOresInDictionary(); + + EnderfaceRecipes.addRecipes(); + MaterialRecipes.addRecipes(); + ConduitRecipes.addRecipes(); + MachineRecipes.addRecipes(); + ItemRecipes.addRecipes(); + TeleportRecipes.addRecipes(); + EE3Util.registerMiscRecipes(); + + proxy.load(); } - } - @EventHandler - public void serverStarted(FMLServerStartedEvent event) { - HyperCubeRegister.load(); - ServerChannelRegister.load(); - } + @EventHandler + public void postInit(FMLPostInitializationEvent event) { - @SubscribeEvent - public void worldSaved(WorldEvent.Save event) { - // Only save together with the overworld, because this gets called for every dimension separately - if (event.world.provider != null && event.world.provider.dimensionId == 0) { - ServerChannelRegister.store(); + Config.postInit(); + + // Regsiter the enchants + Enchantments.getInstance(); + + // This must be loaded before parsing the recipes so we get the preferred outputs + OreDictionaryPreferences.loadConfig(); + + CrusherRecipeManager.getInstance().loadRecipesFromConfig(); + AlloyRecipeManager.getInstance().loadRecipesFromConfig(); + SliceAndSpliceRecipeManager.getInstance().loadRecipesFromConfig(); + VatRecipeManager.getInstance().loadRecipesFromConfig(); + EnchanterRecipeManager.getInstance().loadRecipesFromConfig(); + FarmersRegistry.addFarmers(); + SoulBinderRecipeManager.getInstance().addDefaultRecipes(); + PaintSourceValidator.instance.loadConfig(); + + if (fluidXpJuice == null) { // should have been registered by open blocks + fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName()); + if (fluidXpJuice == null) { + Log.error("Liquid XP Juice registration left to open blocks but could not be found."); + } + } + + if (Config.dumpMobNames) { + File dumpFile = new File(Config.configDirectory, "mobTypes.txt"); + List names = EntityUtil.getAllRegisteredMobNames(false); + + try { + BufferedWriter br = new BufferedWriter(new FileWriter(dumpFile, false)); + for (String name : names) { + br.append(name); + br.newLine(); + } + br.flush(); + br.close(); + } catch (Exception e) { + Log.error("Could not write mob types file: " + e); + } + } + + addModIntegration(); + + // Register villagers + FMLInterModComms.sendMessage("EnderStructures", "addResourcePath", "/assets/enderio/villagers"); + FMLInterModComms.sendMessage("EnderStructures", "registerVillageGenerator", "enderioMobDropVillager"); } - } - @EventHandler - public void serverStopped(FMLServerStoppedEvent event) { - HyperCubeRegister.unload(); - } + @EventHandler + public void loadComplete(FMLLoadCompleteEvent event) { + processImc(FMLInterModComms.fetchRuntimeMessages( + this)); // Some mods send IMCs during PostInit, so we catch them here. + } + + private static String getXPJuiceName() { + String openBlocksXPJuiceName = null; + + try { + Field getField = Class.forName("openblocks.Config").getField("xpFluidId"); + openBlocksXPJuiceName = (String) getField.get(null); + } catch (Exception e) { + } + + if (openBlocksXPJuiceName != null && !Config.xpJuiceName.equals(openBlocksXPJuiceName)) { + Log.info("Overwriting XP Juice name with '" + openBlocksXPJuiceName + "' taken from OpenBlocks' config"); + return openBlocksXPJuiceName; + } + + return Config.xpJuiceName; + } + + @SuppressWarnings("unchecked") + private void addModIntegration() { + + if (Loader.isModLoaded("TConstruct")) { + try { + Class ttClass = Class.forName("tconstruct.tools.TinkerTools"); + Field modFluxF = ttClass.getField("modFlux"); + Object modFluxInst = modFluxF.get(null); + + Class modFluxClass = Class.forName("tconstruct.modifiers.tools.ModFlux"); + Field batteriesField = modFluxClass.getField("batteries"); + List batteries = (List) batteriesField.get(modFluxInst); + batteries.add(new ItemStack(blockCapBank)); + Log.info("Registered Capacitor Banks as Tinkers Construct Flux Upgrades"); + } catch (Exception e) { + // Doesn't matter if it didnt work + Log.info("Failed to registered Capacitor Banks as Tinkers Construct Flux Upgrades"); + } + } + + ThaumcraftCompat.load(); + } + + @EventHandler + public void onImc(IMCEvent evt) { + processImc(evt.getMessages()); + } + + private void processImc(ImmutableList messages) { + for (IMCMessage msg : messages) { + String key = msg.key; + try { + if (msg.isStringMessage()) { + String value = msg.getStringValue(); + if (IMC.VAT_RECIPE.equals(key)) { + VatRecipeManager.getInstance().addCustomRecipes(value); + } else if (IMC.SAG_RECIPE.equals(key)) { + CrusherRecipeManager.getInstance().addCustomRecipes(value); + } else if (IMC.ALLOY_RECIPE.equals(key)) { + AlloyRecipeManager.getInstance().addCustomRecipes(value); + } else if (IMC.POWERED_SPAWNER_BLACKLIST_ADD.equals(key)) { + PoweredSpawnerConfig.getInstance().addToBlacklist(value); + } else if (IMC.TELEPORT_BLACKLIST_ADD.equals(key)) { + TravelController.instance.addBlockToBlinkBlackList(value); + } else if (IMC.SOUL_VIAL_BLACKLIST.equals(key) && itemSoulVessel != null) { + itemSoulVessel.addEntityToBlackList(value); + } else if (IMC.ENCHANTER_RECIPE.equals(key)) { + EnchanterRecipeManager.getInstance().addCustomRecipes(value); + } else if (IMC.SLINE_N_SPLICE_RECIPE.equals(key)) { + SliceAndSpliceRecipeManager.getInstance().addCustomRecipes(key); + } + } else if (msg.isNBTMessage()) { + if (IMC.SOUL_BINDER_RECIPE.equals(key)) { + SoulBinderRecipeManager.getInstance().addRecipeFromNBT(msg.getNBTValue()); + } else if (IMC.POWERED_SPAWNER_COST_MULTIPLIER.equals(key)) { + PoweredSpawnerConfig.getInstance().addEntityCostFromNBT(msg.getNBTValue()); + } else if (IMC.FLUID_FUEL_ADD.equals(key)) { + FluidFuelRegister.instance.addFuel(msg.getNBTValue()); + } else if (IMC.FLUID_COOLANT_ADD.equals(key)) { + FluidFuelRegister.instance.addCoolant(msg.getNBTValue()); + } else if (IMC.REDSTONE_CONNECTABLE_ADD.equals(key)) { + InsulatedRedstoneConduit.addConnectableBlock(msg.getNBTValue()); + } + } else if (msg.isItemStackMessage()) { + if (IMC.PAINTER_WHITELIST_ADD.equals(key)) { + PaintSourceValidator.instance.addToWhitelist(msg.getItemStackValue()); + } else if (IMC.PAINTER_BLACKLIST_ADD.equals(key)) { + PaintSourceValidator.instance.addToBlacklist(msg.getItemStackValue()); + } + } + } catch (Exception e) { + Log.error("Error occured handling IMC message " + key + " from " + msg.getSender()); + } + } + } + + @EventHandler + public void serverStarted(FMLServerStartedEvent event) { + HyperCubeRegister.load(); + ServerChannelRegister.load(); + } + + @SubscribeEvent + public void worldSaved(WorldEvent.Save event) { + // Only save together with the overworld, because this gets called for every dimension separately + if (event.world.provider != null && event.world.provider.dimensionId == 0) { + ServerChannelRegister.store(); + } + } + + @EventHandler + public void serverStopped(FMLServerStoppedEvent event) { + HyperCubeRegister.unload(); + } } diff --git a/src/main/java/crazypants/enderio/EnderIOTab.java b/src/main/java/crazypants/enderio/EnderIOTab.java index 7fc2ec87..4b46a975 100644 --- a/src/main/java/crazypants/enderio/EnderIOTab.java +++ b/src/main/java/crazypants/enderio/EnderIOTab.java @@ -1,36 +1,35 @@ package crazypants.enderio; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import static crazypants.enderio.EnderIO.MODID; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + public class EnderIOTab extends CreativeTabs { - public static final CreativeTabs tabEnderIO = new EnderIOTab(); + public static final CreativeTabs tabEnderIO = new EnderIOTab(); - public EnderIOTab() { - super(MODID); - } + public EnderIOTab() { + super(MODID); + } - @Override - @SideOnly(Side.CLIENT) - public String getTabLabel() { - return MODID; - } + @Override + @SideOnly(Side.CLIENT) + public String getTabLabel() { + return MODID; + } - @Override - @SideOnly(Side.CLIENT) - public String getTranslatedTabLabel() { - return MODID; - } - - @Override - @SideOnly(Side.CLIENT) - public Item getTabIconItem() { - return EnderIO.itemEnderface; - } + @Override + @SideOnly(Side.CLIENT) + public String getTranslatedTabLabel() { + return MODID; + } + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem() { + return EnderIO.itemEnderface; + } } diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index d2dcf858..6fd50d86 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -1,86 +1,84 @@ package crazypants.enderio; +import cpw.mods.fml.common.network.IGuiHandler; import java.util.HashMap; import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { - public static final int GUI_ID_ENDERFACE = 1; - public static final int GUI_ID_PAINTER = 2; - public static final int GUI_ID_STIRLING_GEN = 3; - public static final int GUI_ID_ALLOY_SMELTER = 4; - public static final int GUI_ID_CAPACITOR_BANK = 5; - public static final int GUI_ID_CRUSHER = 6; - public static final int GUI_ID_HYPER_CUBE = 7; - public static final int GUI_ID_POWER_MONITOR = 8; + public static final int GUI_ID_ENDERFACE = 1; + public static final int GUI_ID_PAINTER = 2; + public static final int GUI_ID_STIRLING_GEN = 3; + public static final int GUI_ID_ALLOY_SMELTER = 4; + public static final int GUI_ID_CAPACITOR_BANK = 5; + public static final int GUI_ID_CRUSHER = 6; + public static final int GUI_ID_HYPER_CUBE = 7; + public static final int GUI_ID_POWER_MONITOR = 8; - public static final int GUI_ID_EXTERNAL_CONNECTION_BASE = 9; - public static final int GUI_ID_EXTERNAL_CONNECTION_UP = 9 + ForgeDirection.UP.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_DOWN = 9 + ForgeDirection.DOWN.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_NORTH = 9 + ForgeDirection.NORTH.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_SOUTH = 9 + ForgeDirection.SOUTH.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_EAST = 9 + ForgeDirection.EAST.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_WEST = 9 + ForgeDirection.WEST.ordinal(); - public static final int GUI_ID_EXTERNAL_CONNECTION_SELECTOR = 16; + public static final int GUI_ID_EXTERNAL_CONNECTION_BASE = 9; + public static final int GUI_ID_EXTERNAL_CONNECTION_UP = 9 + ForgeDirection.UP.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_DOWN = 9 + ForgeDirection.DOWN.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_NORTH = 9 + ForgeDirection.NORTH.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_SOUTH = 9 + ForgeDirection.SOUTH.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_EAST = 9 + ForgeDirection.EAST.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_WEST = 9 + ForgeDirection.WEST.ordinal(); + public static final int GUI_ID_EXTERNAL_CONNECTION_SELECTOR = 16; - public static final int GUI_ID_ME_ACCESS_TERMINAL = 17; + public static final int GUI_ID_ME_ACCESS_TERMINAL = 17; - public static final int GUI_ID_TRAVEL_ACCESSABLE = 18; - public static final int GUI_ID_TRAVEL_AUTH = 19; - public static final int GUI_ID_STILL = 20; - public static final int GUI_ID_COMBUSTION_GEN = 21; - public static final int GUI_ID_FARM_STATATION = 22; - public static final int GUI_ID_TANK = 86; - public static final int GUI_ID_CRAFTER = 87; - public static final int GUI_ID_ZOMBIE_GEN = 71; - public static final int GUI_ID_POWERED_SPAWNER = 88; - public static final int GUI_ID_VACUUM_CHEST = 89; - public static final int GUI_ID_WIRELESS_CHARGER = 90; - public static final int GUI_ID_ENCHANTER = 91; - public static final int GUI_ID_KILLER_JOE = 92; - public static final int GUI_ID_SOUL_BINDER = 93; - public static final int GUI_ID_SLICE_N_SPLICE = 94; - public static final int GUI_ID_ATTRACTOR = 95; - public static final int GUI_ID_SPAWN_GUARD = 96; - public static final int GUI_ID_TRANSCEIVER = 97; - public static final int GUI_ID_XP_OBELISK = 98; - public static final int GUI_ID_ANVIL = 99; - public static final int GUI_ID_BUFFER = 100; - public static final int GUI_ID_WEATHER_OBELISK = 101; - public static final int GUI_ID_TELEPAD = 102; - public static final int GUI_ID_TELEPAD_TRAVEL = 103; - public static final int GUI_ID_INHIBITOR = 104; - public static final int GUI_ID_INVENTORY_PANEL = 105; + public static final int GUI_ID_TRAVEL_ACCESSABLE = 18; + public static final int GUI_ID_TRAVEL_AUTH = 19; + public static final int GUI_ID_STILL = 20; + public static final int GUI_ID_COMBUSTION_GEN = 21; + public static final int GUI_ID_FARM_STATATION = 22; + public static final int GUI_ID_TANK = 86; + public static final int GUI_ID_CRAFTER = 87; + public static final int GUI_ID_ZOMBIE_GEN = 71; + public static final int GUI_ID_POWERED_SPAWNER = 88; + public static final int GUI_ID_VACUUM_CHEST = 89; + public static final int GUI_ID_WIRELESS_CHARGER = 90; + public static final int GUI_ID_ENCHANTER = 91; + public static final int GUI_ID_KILLER_JOE = 92; + public static final int GUI_ID_SOUL_BINDER = 93; + public static final int GUI_ID_SLICE_N_SPLICE = 94; + public static final int GUI_ID_ATTRACTOR = 95; + public static final int GUI_ID_SPAWN_GUARD = 96; + public static final int GUI_ID_TRANSCEIVER = 97; + public static final int GUI_ID_XP_OBELISK = 98; + public static final int GUI_ID_ANVIL = 99; + public static final int GUI_ID_BUFFER = 100; + public static final int GUI_ID_WEATHER_OBELISK = 101; + public static final int GUI_ID_TELEPAD = 102; + public static final int GUI_ID_TELEPAD_TRAVEL = 103; + public static final int GUI_ID_INHIBITOR = 104; + public static final int GUI_ID_INVENTORY_PANEL = 105; - public static final int GUI_ID_CAP_BANK = 142; // leave room for more machines + public static final int GUI_ID_CAP_BANK = 142; // leave room for more machines - protected final Map guiHandlers = new HashMap(); + protected final Map guiHandlers = new HashMap(); - public void registerGuiHandler(int id, IGuiHandler handler) { - guiHandlers.put(id, handler); - } - - @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - IGuiHandler handler = guiHandlers.get(id); - if(handler != null) { - return handler.getServerGuiElement(id, player, world, x, y, z); + public void registerGuiHandler(int id, IGuiHandler handler) { + guiHandlers.put(id, handler); } - return null; - } - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - IGuiHandler handler = guiHandlers.get(id); - if(handler != null) { - return handler.getClientGuiElement(id, player, world, x, y, z); + @Override + public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + IGuiHandler handler = guiHandlers.get(id); + if (handler != null) { + return handler.getServerGuiElement(id, player, world, x, y, z); + } + return null; } - return null; - } + @Override + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + IGuiHandler handler = guiHandlers.get(id); + if (handler != null) { + return handler.getClientGuiElement(id, player, world, x, y, z); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/Log.java b/src/main/java/crazypants/enderio/Log.java index 7fa9bd1d..5df7260c 100644 --- a/src/main/java/crazypants/enderio/Log.java +++ b/src/main/java/crazypants/enderio/Log.java @@ -3,28 +3,25 @@ package crazypants.enderio; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - public final class Log { - public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID); + public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID); - public static void warn(String msg) { - LOGGER.warn(msg); - } + public static void warn(String msg) { + LOGGER.warn(msg); + } - public static void error(String msg) { - LOGGER.error(msg); - } + public static void error(String msg) { + LOGGER.error(msg); + } - public static void info(String msg) { - LOGGER.info(msg); - } + public static void info(String msg) { + LOGGER.info(msg); + } - public static void debug(String msg) { - LOGGER.debug(msg); - } - - private Log() { - } + public static void debug(String msg) { + LOGGER.debug(msg); + } + private Log() {} } diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index a2871a5d..711cf7db 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -1,131 +1,130 @@ package crazypants.enderio; public enum ModObject { - // Enderface - blockEnderIo, - itemEnderface, + // Enderface + blockEnderIo, + itemEnderface, - // Conduits - blockConduitBundle, - blockConduitFacade, - itemConduitFacade, - itemRedstoneConduit, - itemItemConduit, - itemGasConduit, - itemMEConduit, - itemOCConduit, - itemBasicFilterUpgrade, - itemBigFilterUpgrade, - itemExistingItemFilter, - itemModItemFilter, - itemPowerItemFilter, - itemExtractSpeedUpgrade, - itemFunctionUpgrade, + // Conduits + blockConduitBundle, + blockConduitFacade, + itemConduitFacade, + itemRedstoneConduit, + itemItemConduit, + itemGasConduit, + itemMEConduit, + itemOCConduit, + itemBasicFilterUpgrade, + itemBigFilterUpgrade, + itemExistingItemFilter, + itemModItemFilter, + itemPowerItemFilter, + itemExtractSpeedUpgrade, + itemFunctionUpgrade, - // Power - itemPowerConduit, - itemPowerConduitEndergy, + // Power + itemPowerConduit, + itemPowerConduitEndergy, - // Liquid - itemLiquidConduit, + // Liquid + itemLiquidConduit, - // Materials - itemBasicCapacitor, - itemAlloy, - itemAlloyEndergy, - itemGrindingBall, - itemGrindingBallEndergy, - itemMaterial, - itemMachinePart, - itemPowderIngot, - blockFusedQuartz, - itemFusedQuartzFrame, - blockDarkIronBars, - blockSoulariumBars, - blockEndSteelBars, + // Materials + itemBasicCapacitor, + itemAlloy, + itemAlloyEndergy, + itemGrindingBall, + itemGrindingBallEndergy, + itemMaterial, + itemMachinePart, + itemPowderIngot, + blockFusedQuartz, + itemFusedQuartzFrame, + blockDarkIronBars, + blockSoulariumBars, + blockEndSteelBars, - // Machines - blockStirlingGenerator, - blockCombustionGenerator, - blockZombieGenerator, - blockFrankenzombieGenerator, - blockEnderGenerator, - blockReservoir, - blockAlloySmelter, - blockSolarPanel, - blockCapacitorBank, - blockCapBank, - blockSagMill, - blockHyperCube, - blockPowerMonitor, - blockVat, - blockFarmStation, - blockTank, - blockCrafter, - blockVacuumChest, - blockWirelessCharger, - blockEnchanter, - blockSoulBinder, - blockSliceAndSplice, - blockAttractor, - blockSpawnGuard, - blockExperienceObelisk, - blockWeatherObelisk, - blockInhibitorObelisk, - blockTransceiver, - blockBuffer, - blockInventoryPanel, + // Machines + blockStirlingGenerator, + blockCombustionGenerator, + blockZombieGenerator, + blockFrankenzombieGenerator, + blockEnderGenerator, + blockReservoir, + blockAlloySmelter, + blockSolarPanel, + blockCapacitorBank, + blockCapBank, + blockSagMill, + blockHyperCube, + blockPowerMonitor, + blockVat, + blockFarmStation, + blockTank, + blockCrafter, + blockVacuumChest, + blockWirelessCharger, + blockEnchanter, + blockSoulBinder, + blockSliceAndSplice, + blockAttractor, + blockSpawnGuard, + blockExperienceObelisk, + blockWeatherObelisk, + blockInhibitorObelisk, + blockTransceiver, + blockBuffer, + blockInventoryPanel, - blockPoweredSpawner, - itemBrokenSpawner, + blockPoweredSpawner, + itemBrokenSpawner, - blockKillerJoe, + blockKillerJoe, - blockElectricLight, - blockLightNode, - blockLight, + blockElectricLight, + blockLightNode, + blockLight, - //Blocks - blockDarkSteelPressurePlate, - blockDarkSteelAnvil, - blockDarkSteelLadder, - blockReinforcedObsidian, - blockIngotStorage, - blockIngotStorageEndergy, + // Blocks + blockDarkSteelPressurePlate, + blockDarkSteelAnvil, + blockDarkSteelLadder, + blockReinforcedObsidian, + blockIngotStorage, + blockIngotStorageEndergy, - // Painter - blockPainter, - blockPaintedFence, - blockPaintedFenceGate, - blockPaintedWall, - blockPaintedStair, - blockPaintedSlab, - blockPaintedDoubleSlab, - blockPaintedGlowstone, - blockPaintedCarpet, + // Painter + blockPainter, + blockPaintedFence, + blockPaintedFenceGate, + blockPaintedWall, + blockPaintedStair, + blockPaintedSlab, + blockPaintedDoubleSlab, + blockPaintedGlowstone, + blockPaintedCarpet, - itemConduitProbe, - itemYetaWrench, - itemXpTransfer, + itemConduitProbe, + itemYetaWrench, + itemXpTransfer, - blockTravelAnchor, - blockTelePad, - itemCoordSelector, - itemTravelStaff, - itemMagnet, - itemGliderWing, - blockEndermanSkull, - itemSoulVessel, - itemFrankenSkull, + blockTravelAnchor, + blockTelePad, + itemCoordSelector, + itemTravelStaff, + itemMagnet, + itemGliderWing, + blockEndermanSkull, + itemSoulVessel, + itemFrankenSkull, - blockEnderRail, + blockEnderRail, - itemEnderFood; + itemEnderFood; - public final String unlocalisedName; - - private ModObject() { - unlocalisedName = name(); - } + public final String unlocalisedName; + private ModObject() { + unlocalisedName = name(); + } } diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index f02b05f0..00eea910 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -3,5 +3,5 @@ package crazypants.enderio; import com.enderio.core.common.TileEntityEnder; public abstract class TileEntityEio extends TileEntityEnder { - // Nothing yet ;D + // Nothing yet ;D } diff --git a/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java b/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java index 6d4e4275..577789ed 100644 --- a/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java +++ b/src/main/java/crazypants/enderio/api/EnderIOAPIProps.java @@ -1,9 +1,8 @@ package crazypants.enderio.api; public final class EnderIOAPIProps { - - private EnderIOAPIProps() {} - - public static final String VERSION = "0.0.2"; + private EnderIOAPIProps() {} + + public static final String VERSION = "0.0.2"; } diff --git a/src/main/java/crazypants/enderio/api/IMC.java b/src/main/java/crazypants/enderio/api/IMC.java index 2abc339e..c8801bb9 100644 --- a/src/main/java/crazypants/enderio/api/IMC.java +++ b/src/main/java/crazypants/enderio/api/IMC.java @@ -20,118 +20,115 @@ import crazypants.enderio.teleport.TravelController; */ public final class IMC { - /** - * Key for a string message to add Vat recipes. Calls - * {@link VatRecipeManager#addCustomRecipes(String)} with the string value of - * the message. - */ - public static final String VAT_RECIPE = "recipe:vat"; + /** + * Key for a string message to add Vat recipes. Calls + * {@link VatRecipeManager#addCustomRecipes(String)} with the string value of + * the message. + */ + public static final String VAT_RECIPE = "recipe:vat"; - /** - * Key for a string message to add SAGMill recipes. Calls - * {@link CrusherRecipeManager#addCustomRecipes(String)} with the string value - * of the message. - */ - public static final String SAG_RECIPE = "recipe:sagmill"; + /** + * Key for a string message to add SAGMill recipes. Calls + * {@link CrusherRecipeManager#addCustomRecipes(String)} with the string value + * of the message. + */ + public static final String SAG_RECIPE = "recipe:sagmill"; - /** - * Key for a string message to add Alloy Smelter recipes. Calls - * {@link AlloyRecipeManager#addCustomRecipes(String)} with the string value - * of the message. - */ - public static final String ALLOY_RECIPE = "recipe:alloysmelter"; + /** + * Key for a string message to add Alloy Smelter recipes. Calls + * {@link AlloyRecipeManager#addCustomRecipes(String)} with the string value + * of the message. + */ + public static final String ALLOY_RECIPE = "recipe:alloysmelter"; - /** - * Key for a string message to add Enchanter recipes. Calls - * {@link EnchanterRecipeManager#addCustomRecipes(String)} with the string - * value of the message. The supplied xml is treated as if it was loaded from - * EnchanterRecipes_User.xm. - */ - public static final String ENCHANTER_RECIPE = "recipe:enchanter"; + /** + * Key for a string message to add Enchanter recipes. Calls + * {@link EnchanterRecipeManager#addCustomRecipes(String)} with the string + * value of the message. The supplied xml is treated as if it was loaded from + * EnchanterRecipes_User.xm. + */ + public static final String ENCHANTER_RECIPE = "recipe:enchanter"; - /** - * Key for a string message to add Slice'N'Splice recipes. Calls - * {@link SliceAndSpliceRecipeManager#addCustomRecipes(String)} with the - * string value of the message. - */ - public static final String SLINE_N_SPLICE_RECIPE = "recipe:slicensplice"; + /** + * Key for a string message to add Slice'N'Splice recipes. Calls + * {@link SliceAndSpliceRecipeManager#addCustomRecipes(String)} with the + * string value of the message. + */ + public static final String SLINE_N_SPLICE_RECIPE = "recipe:slicensplice"; - /** - * Key for an NBT message to add Soul Binder recipes. Calls - * {@link SoulBinderRecipeManager#addRecipeFromNBT(net.minecraft.nbt.NBTTagCompound)} - * with the NBT value of the message. - */ - public static final String SOUL_BINDER_RECIPE = "recipe:soulbinder"; + /** + * Key for an NBT message to add Soul Binder recipes. Calls + * {@link SoulBinderRecipeManager#addRecipeFromNBT(net.minecraft.nbt.NBTTagCompound)} + * with the NBT value of the message. + */ + public static final String SOUL_BINDER_RECIPE = "recipe:soulbinder"; - /** - * Key for an ItemStack message to add an item to the Painters paint source - * whitelist. Calls - * {@link PaintSourceValidator#addToWhitelist(net.minecraft.item.ItemStack)} - */ - public static final String PAINTER_WHITELIST_ADD = "painter:whitelist:add"; + /** + * Key for an ItemStack message to add an item to the Painters paint source + * whitelist. Calls + * {@link PaintSourceValidator#addToWhitelist(net.minecraft.item.ItemStack)} + */ + public static final String PAINTER_WHITELIST_ADD = "painter:whitelist:add"; - /** - * Key for an ItemStack message to add an item to the Painters paint source - * blacklist. Calls - * {@link PaintSourceValidator#addToBlacklist(net.minecraft.item.ItemStack)} - */ - public static final String PAINTER_BLACKLIST_ADD = "painter:blacklist:add"; + /** + * Key for an ItemStack message to add an item to the Painters paint source + * blacklist. Calls + * {@link PaintSourceValidator#addToBlacklist(net.minecraft.item.ItemStack)} + */ + public static final String PAINTER_BLACKLIST_ADD = "painter:blacklist:add"; - /** - * Key for a string message to add an entity to the Powered Spawner blacklist. - * Calls {@link PoweredSpawnerConfig#addToBlacklist(String)} with the string - * value of the message. - */ - public static final String POWERED_SPAWNER_BLACKLIST_ADD = "poweredSpawner:blacklist:add"; + /** + * Key for a string message to add an entity to the Powered Spawner blacklist. + * Calls {@link PoweredSpawnerConfig#addToBlacklist(String)} with the string + * value of the message. + */ + public static final String POWERED_SPAWNER_BLACKLIST_ADD = "poweredSpawner:blacklist:add"; - /** - * Key for an NBT message to specify a cost multiplier for spawning an entity - * in the Powered Spawner. Calls - * {@link PoweredSpawnerConfig#addEntityCostFromNBT(net.minecraft.nbt.NBTTagCompound)} - * with the NBT value of the message. - */ - public static final String POWERED_SPAWNER_COST_MULTIPLIER = "poweredSpawner:costMultiplier"; + /** + * Key for an NBT message to specify a cost multiplier for spawning an entity + * in the Powered Spawner. Calls + * {@link PoweredSpawnerConfig#addEntityCostFromNBT(net.minecraft.nbt.NBTTagCompound)} + * with the NBT value of the message. + */ + public static final String POWERED_SPAWNER_COST_MULTIPLIER = "poweredSpawner:costMultiplier"; - /** - * Key for a string message to add an entity to the Soul Vial blacklist. Calls - * {@link ItemSoulVessel#addEntityToBlackList(String)} with the string value - * of the message. - */ - public static final String SOUL_VIAL_BLACKLIST = "soulVial:blacklist:add"; + /** + * Key for a string message to add an entity to the Soul Vial blacklist. Calls + * {@link ItemSoulVessel#addEntityToBlackList(String)} with the string value + * of the message. + */ + public static final String SOUL_VIAL_BLACKLIST = "soulVial:blacklist:add"; - /** - * Key for an NBT message to register a fluid fuel. Calls - * {@link FluidFuelRegister#addFuel(net.minecraft.nbt.NBTTagCompound)} with - * the NBT value of the message. - */ - public static final String FLUID_FUEL_ADD = "fluidFuel:add"; + /** + * Key for an NBT message to register a fluid fuel. Calls + * {@link FluidFuelRegister#addFuel(net.minecraft.nbt.NBTTagCompound)} with + * the NBT value of the message. + */ + public static final String FLUID_FUEL_ADD = "fluidFuel:add"; - /** - * Key for an NBT message to register a fluid coolant. Calls - * {@link FluidFuelRegister#addCoolant(net.minecraft.nbt.NBTTagCompound)} with - * the NBT value of the message. - */ - public static final String FLUID_COOLANT_ADD = "fluidCoolant:add"; + /** + * Key for an NBT message to register a fluid coolant. Calls + * {@link FluidFuelRegister#addCoolant(net.minecraft.nbt.NBTTagCompound)} with + * the NBT value of the message. + */ + public static final String FLUID_COOLANT_ADD = "fluidCoolant:add"; - /** - * Key for a string message to add a block to the list of blocks that cannot - * be teleported through using the Staff of Travel or Dark Steel Travel - * Upgrade. Value must be in the form: 'modid:blockName' Calls - * {@link TravelController#addBlockToBlinkBlackList(String)} with the string - * value of the message. - */ - public static final String TELEPORT_BLACKLIST_ADD = "teleport:blacklist:add"; + /** + * Key for a string message to add a block to the list of blocks that cannot + * be teleported through using the Staff of Travel or Dark Steel Travel + * Upgrade. Value must be in the form: 'modid:blockName' Calls + * {@link TravelController#addBlockToBlinkBlackList(String)} with the string + * value of the message. + */ + public static final String TELEPORT_BLACKLIST_ADD = "teleport:blacklist:add"; - /** - * Key for an NBT message to register a block or tile entity as connectable to - * insulated redstone conduits. Calls - * {@link InsulatedRedstoneConduit#addConnectableBlock(net.minecraft.nbt.NBTTagCompound)} - * with the NBT value of the message. - */ - public static final String REDSTONE_CONNECTABLE_ADD = "redstone:connectable:add"; - - - private IMC() { - } + /** + * Key for an NBT message to register a block or tile entity as connectable to + * insulated redstone conduits. Calls + * {@link InsulatedRedstoneConduit#addConnectableBlock(net.minecraft.nbt.NBTTagCompound)} + * with the NBT value of the message. + */ + public static final String REDSTONE_CONNECTABLE_ADD = "redstone:connectable:add"; + private IMC() {} } diff --git a/src/main/java/crazypants/enderio/api/package-info.java b/src/main/java/crazypants/enderio/api/package-info.java index 62f11ff3..c58746c5 100644 --- a/src/main/java/crazypants/enderio/api/package-info.java +++ b/src/main/java/crazypants/enderio/api/package-info.java @@ -2,4 +2,3 @@ package crazypants.enderio.api; import cpw.mods.fml.common.API; - diff --git a/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java b/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java index d64b9c0d..8c6706fb 100644 --- a/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java +++ b/src/main/java/crazypants/enderio/api/redstone/IRedstoneConnectable.java @@ -11,6 +11,5 @@ import net.minecraftforge.common.util.ForgeDirection; */ public interface IRedstoneConnectable { - boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from); - + boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from); } diff --git a/src/main/java/crazypants/enderio/api/redstone/package-info.java b/src/main/java/crazypants/enderio/api/redstone/package-info.java index 3511e2b5..586bfa08 100644 --- a/src/main/java/crazypants/enderio/api/redstone/package-info.java +++ b/src/main/java/crazypants/enderio/api/redstone/package-info.java @@ -3,4 +3,3 @@ package crazypants.enderio.api.redstone; import cpw.mods.fml.common.API; import crazypants.enderio.api.EnderIOAPIProps; - diff --git a/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java index b2440b18..42b778af 100644 --- a/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java +++ b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java @@ -1,13 +1,12 @@ package crazypants.enderio.api.teleport; +import cofh.api.energy.IEnergyContainerItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cofh.api.energy.IEnergyContainerItem; public interface IItemOfTravel extends IEnergyContainerItem { - boolean isActive(EntityPlayer ep, ItemStack equipped); - - void extractInternal(ItemStack equipped, int power); + boolean isActive(EntityPlayer ep, ItemStack equipped); + void extractInternal(ItemStack equipped, int power); } diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index 36af0fe1..cd377b2e 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -1,136 +1,135 @@ package crazypants.enderio.api.teleport; -import javax.annotation.Nullable; - -import net.minecraft.entity.Entity; import com.enderio.core.common.util.BlockCoord; +import javax.annotation.Nullable; +import net.minecraft.entity.Entity; public interface ITelePad extends ITravelAccessable { - /** - * If this piece of the telepad is the master, meaning it is connected on all - * 4 sides. This does not guarantee that it is in a connected state. - * - * @return True if this TE is the master TE, false otherwise. - */ - boolean isMaster(); + /** + * If this piece of the telepad is the master, meaning it is connected on all + * 4 sides. This does not guarantee that it is in a connected state. + * + * @return True if this TE is the master TE, false otherwise. + */ + boolean isMaster(); - /** - * Gets the master telepad that this one is connected to. - * - * @return The master telepad TE. {@code null} if not in a network. Itself if - * it is the master. - */ - @Nullable - ITelePad getMaster(); + /** + * Gets the master telepad that this one is connected to. + * + * @return The master telepad TE. {@code null} if not in a network. Itself if + * it is the master. + */ + @Nullable + ITelePad getMaster(); - /** - * If this telepad piece is in a network, meaning it is connected and in a - * valid configuration. - * - * @return True if this TE is in a network, false otherwise. - */ - boolean inNetwork(); + /** + * If this telepad piece is in a network, meaning it is connected and in a + * valid configuration. + * + * @return True if this TE is in a network, false otherwise. + */ + boolean inNetwork(); - /** - * The X coordinate stored in this telepad network. Always 0 if this is - * {@link #inNetwork()} returns false. - * - * @return The target X coordinate. - */ - int getX(); + /** + * The X coordinate stored in this telepad network. Always 0 if this is + * {@link #inNetwork()} returns false. + * + * @return The target X coordinate. + */ + int getX(); - /** - * The Y coordinate stored in this telepad network. Always 0 if this is - * {@link #inNetwork()} returns false. - * - * @return The target Y coordinate. - */ - int getY(); + /** + * The Y coordinate stored in this telepad network. Always 0 if this is + * {@link #inNetwork()} returns false. + * + * @return The target Y coordinate. + */ + int getY(); - /** - * The Z coordinate stored in this telepad network. Always 0 if this is - * {@link #inNetwork()} returns false. - * - * @return The target Z coordinate. - */ - int getZ(); + /** + * The Z coordinate stored in this telepad network. Always 0 if this is + * {@link #inNetwork()} returns false. + * + * @return The target Z coordinate. + */ + int getZ(); - /** - * The target dimension ID for the telepad. Defaults to the dimension the - * block is placed in. - * - * @return An int dimension ID. - */ - int getTargetDim(); + /** + * The target dimension ID for the telepad. Defaults to the dimension the + * block is placed in. + * + * @return An int dimension ID. + */ + int getTargetDim(); - /** - * Sets the target X coordinate of the network. Has no effect if - * {@link #inNetwork()} returns false. - * - * @param x - * The X coord. - * @return The master telepad TE. DOES NOT ALWAYS return itself. - */ - ITelePad setX(int x); + /** + * Sets the target X coordinate of the network. Has no effect if + * {@link #inNetwork()} returns false. + * + * @param x + * The X coord. + * @return The master telepad TE. DOES NOT ALWAYS return itself. + */ + ITelePad setX(int x); - /** - * Sets the target Y coordinate of the network. Has no effect if - * {@link #inNetwork()} returns false. - * - * @param y - * The Y coord. - * @return The master telepad TE. DOES NOT ALWAYS return itself. - */ - ITelePad setY(int y); + /** + * Sets the target Y coordinate of the network. Has no effect if + * {@link #inNetwork()} returns false. + * + * @param y + * The Y coord. + * @return The master telepad TE. DOES NOT ALWAYS return itself. + */ + ITelePad setY(int y); - /** - * Sets the target Z coordinate of the network. Has no effect if - * {@link #inNetwork()} returns false. - * - * @param z - * The Z coord. - * @return The master telepad TE. DOES NOT ALWAYS return itself. - */ - ITelePad setZ(int z); + /** + * Sets the target Z coordinate of the network. Has no effect if + * {@link #inNetwork()} returns false. + * + * @param z + * The Z coord. + * @return The master telepad TE. DOES NOT ALWAYS return itself. + */ + ITelePad setZ(int z); - /** - * Sets the target dimension of the network. Has no effect if - * {@link #inNetwork()} returns false. - * - * @param dimID - * The dimension ID. - * @return The master telepad TE. DOES NOT ALWAYS return itself. - */ - ITelePad setTargetDim(int dimID); + /** + * Sets the target dimension of the network. Has no effect if + * {@link #inNetwork()} returns false. + * + * @param dimID + * The dimension ID. + * @return The master telepad TE. DOES NOT ALWAYS return itself. + */ + ITelePad setTargetDim(int dimID); - /** - * Util method to set all coords using a {@link BlockCoord} object. - * - * @see #setX(int) - * @see #setY(int) - * @see #setZ(int) - * - * @param coords - * The coords to set this telepad to. - */ - void setCoords(BlockCoord coords); + /** + * Util method to set all coords using a {@link BlockCoord} object. + * + * @see #setX(int) + * @see #setY(int) + * @see #setZ(int) + * + * @param coords + * The coords to set this telepad to. + */ + void setCoords(BlockCoord coords); - /** - * Teleports a specific entity to the destination if: - *
    - *
  • The entity is in range (standing on top)
  • - *
  • There is sufficient power to perform the operation
  • - *
- * - * @param entity - * The entity to teleport - */ - void teleportSpecific(Entity entity); + /** + * Teleports a specific entity to the destination if: + *
    + *
  • The entity is in range (standing on top)
  • + *
  • There is sufficient power to perform the operation
  • + *
+ * + * @param entity + * The entity to teleport + */ + void teleportSpecific(Entity entity); - /** - * Teleports all entities in range (in no particular order) until either there - * are none left or the power runs out. - */ - void teleportAll(); + /** + * Teleports all entities in range (in no particular order) until either there + * are none left or the power runs out. + */ + void teleportAll(); } diff --git a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java index 8866cfa6..20868501 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java @@ -1,74 +1,68 @@ package crazypants.enderio.api.teleport; +import com.enderio.core.common.util.BlockCoord; +import crazypants.util.UserIdent; import java.util.UUID; - import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.util.UserIdent; - public interface ITravelAccessable { - enum AccessMode { - PUBLIC, - PRIVATE, - PROTECTED - } + enum AccessMode { + PUBLIC, + PRIVATE, + PROTECTED + } - boolean canBlockBeAccessed(EntityPlayer playerName); + boolean canBlockBeAccessed(EntityPlayer playerName); - boolean canSeeBlock(EntityPlayer playerName); + boolean canSeeBlock(EntityPlayer playerName); - boolean canUiBeAccessed(EntityPlayer username); + boolean canUiBeAccessed(EntityPlayer username); - boolean getRequiresPassword(EntityPlayer username); + boolean getRequiresPassword(EntityPlayer username); - boolean authoriseUser(EntityPlayer username, ItemStack[] password); + boolean authoriseUser(EntityPlayer username, ItemStack[] password); - AccessMode getAccessMode(); + AccessMode getAccessMode(); - void setAccessMode(AccessMode accessMode); + void setAccessMode(AccessMode accessMode); - ItemStack[] getPassword(); + ItemStack[] getPassword(); - void setPassword(ItemStack[] password); - - ItemStack getItemLabel(); - - void setItemLabel(ItemStack lableIcon); - - String getLabel(); - - void setLabel(String label); + void setPassword(ItemStack[] password); - @Deprecated - UUID getPlacedBy(); + ItemStack getItemLabel(); - @Nonnull - UserIdent getOwner(); + void setItemLabel(ItemStack lableIcon); - void setPlacedBy(EntityPlayer player); + String getLabel(); - void clearAuthorisedUsers(); + void setLabel(String label); - BlockCoord getLocation(); + @Deprecated + UUID getPlacedBy(); - /** - * Is this block a travel target for the staff or a travel anchor? - */ - default boolean isTravelSource() { - return true; - } + @Nonnull + UserIdent getOwner(); - default boolean isVisible() { - return true; - } + void setPlacedBy(EntityPlayer player); - default void setVisible(boolean visible) { - } + void clearAuthorisedUsers(); + BlockCoord getLocation(); + + /** + * Is this block a travel target for the staff or a travel anchor? + */ + default boolean isTravelSource() { + return true; + } + + default boolean isVisible() { + return true; + } + + default void setVisible(boolean visible) {} } diff --git a/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java b/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java index 9a1e3117..02c418e2 100644 --- a/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java +++ b/src/main/java/crazypants/enderio/api/teleport/TeleportEntityEvent.java @@ -1,8 +1,8 @@ package crazypants.enderio.api.teleport; +import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.Entity; import net.minecraftforge.event.entity.EntityEvent; -import cpw.mods.fml.common.eventhandler.Cancelable; /** * An event that can be used to respond to, edit, and prevent entity teleports. @@ -13,38 +13,38 @@ import cpw.mods.fml.common.eventhandler.Cancelable; *
  • Staff of travelling
  • *
  • Telepad
  • * - * + * * As well as any externally added teleports, assuming they fire this event * manually. - * + * */ @Cancelable public class TeleportEntityEvent extends EntityEvent { - /** - * The target coords. These can be edited by event handlers. - */ - public int targetX, targetY, targetZ; + /** + * The target coords. These can be edited by event handlers. + */ + public int targetX, targetY, targetZ; - public final TravelSource source; + public final TravelSource source; - /** - * Fired before an entity teleports to the given location. - * - * @param entity - * The entity teleporting - * @param x - * The target X coord - * @param y - * The target Y coord - * @param z - * The target Z coord - */ - public TeleportEntityEvent(Entity entity, TravelSource source, int x, int y, int z) { - super(entity); - this.targetX = x; - this.targetY = y; - this.targetZ = z; - this.source = source; - } + /** + * Fired before an entity teleports to the given location. + * + * @param entity + * The entity teleporting + * @param x + * The target X coord + * @param y + * The target Y coord + * @param z + * The target Z coord + */ + public TeleportEntityEvent(Entity entity, TravelSource source, int x, int y, int z) { + super(entity); + this.targetX = x; + this.targetY = y; + this.targetZ = z; + this.source = source; + } } diff --git a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java index f5240f9a..a651f19c 100644 --- a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java +++ b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java @@ -4,69 +4,67 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public enum TravelSource { + BLOCK() { + @Override + public int getMaxDistanceTravelled() { + return Config.travelAnchorMaxDistance; + } + }, + STAFF() { + @Override + public int getMaxDistanceTravelled() { + return Config.travelStaffMaxDistance; + } - BLOCK() { - @Override - public int getMaxDistanceTravelled() { - return Config.travelAnchorMaxDistance; - } - }, - STAFF() { - @Override - public int getMaxDistanceTravelled() { - return Config.travelStaffMaxDistance; + @Override + public float getPowerCostPerBlockTraveledRF() { + return Config.travelStaffPowerPerBlockRF; + } + }, + STAFF_BLINK() { + @Override + public int getMaxDistanceTravelled() { + return Config.travelStaffMaxBlinkDistance; + } + + @Override + public float getPowerCostPerBlockTraveledRF() { + return Config.travelStaffPowerPerBlockRF; + } + }, + TELEPAD(EnderIO.DOMAIN + ":telepad.teleport"); + + public static int getMaxDistance() { + return STAFF.getMaxDistanceTravelledSq(); + } + + public static int getMaxDistanceSq() { + return STAFF.getMaxDistanceTravelledSq(); + } + + public final String sound; + + private TravelSource() { + this("mob.endermen.portal"); + } + + private TravelSource(String sound) { + this.sound = sound; + } + + public boolean getConserveMomentum() { + return this == STAFF_BLINK; + } + + public int getMaxDistanceTravelled() { + return 0; + } + + public int getMaxDistanceTravelledSq() { + return getMaxDistanceTravelled() * getMaxDistanceTravelled(); } - @Override public float getPowerCostPerBlockTraveledRF() { - return Config.travelStaffPowerPerBlockRF; + return 0; } - }, - STAFF_BLINK() { - @Override - public int getMaxDistanceTravelled() { - return Config.travelStaffMaxBlinkDistance; - } - - @Override - public float getPowerCostPerBlockTraveledRF() { - return Config.travelStaffPowerPerBlockRF; - } - }, - TELEPAD(EnderIO.DOMAIN + ":telepad.teleport"); - - public static int getMaxDistance() { - return STAFF.getMaxDistanceTravelledSq(); - } - - public static int getMaxDistanceSq() { - return STAFF.getMaxDistanceTravelledSq(); - } - - public final String sound; - - private TravelSource() { - this("mob.endermen.portal"); - } - - private TravelSource(String sound) { - this.sound = sound; - } - - public boolean getConserveMomentum() { - return this == STAFF_BLINK; - } - - public int getMaxDistanceTravelled() { - return 0; - } - - public int getMaxDistanceTravelledSq() { - return getMaxDistanceTravelled() * getMaxDistanceTravelled(); - } - - public float getPowerCostPerBlockTraveledRF() { - return 0; - } - -} \ No newline at end of file +} diff --git a/src/main/java/crazypants/enderio/api/teleport/package-info.java b/src/main/java/crazypants/enderio/api/teleport/package-info.java index 054afef1..d4c75cdd 100644 --- a/src/main/java/crazypants/enderio/api/teleport/package-info.java +++ b/src/main/java/crazypants/enderio/api/teleport/package-info.java @@ -3,4 +3,3 @@ package crazypants.enderio.api.teleport; import cpw.mods.fml.common.API; import crazypants.enderio.api.EnderIOAPIProps; - diff --git a/src/main/java/crazypants/enderio/api/tool/IConduitControl.java b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java index fbbb8a09..0b6ed25b 100644 --- a/src/main/java/crazypants/enderio/api/tool/IConduitControl.java +++ b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java @@ -8,16 +8,16 @@ import net.minecraft.item.ItemStack; */ public interface IConduitControl extends IHideFacades { - /** - * Controls whether the overlay is shown and the player can change the display - * mode. - * - * @param stack - * The itemstack - * @param player - * The player holding the itemstack - * @return True if the overlay should be rendered and the player should be - * able to change modes. False otherwise. - */ - boolean showOverlay(ItemStack stack, EntityPlayer player); + /** + * Controls whether the overlay is shown and the player can change the display + * mode. + * + * @param stack + * The itemstack + * @param player + * The player holding the itemstack + * @return True if the overlay should be rendered and the player should be + * able to change modes. False otherwise. + */ + boolean showOverlay(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/api/tool/IHideFacades.java b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java index 8641c53d..599180a8 100644 --- a/src/main/java/crazypants/enderio/api/tool/IHideFacades.java +++ b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public interface IHideFacades { - - boolean shouldHideFacades(ItemStack stack, EntityPlayer player); + boolean shouldHideFacades(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/api/tool/ITool.java b/src/main/java/crazypants/enderio/api/tool/ITool.java index 084551c5..34e0c68f 100644 --- a/src/main/java/crazypants/enderio/api/tool/ITool.java +++ b/src/main/java/crazypants/enderio/api/tool/ITool.java @@ -3,11 +3,9 @@ package crazypants.enderio.api.tool; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - public interface ITool extends IHideFacades { - boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z); - - void used(ItemStack stack, EntityPlayer player, int x, int y, int z); + boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z); + void used(ItemStack stack, EntityPlayer player, int x, int y, int z); } diff --git a/src/main/java/crazypants/enderio/api/tool/package-info.java b/src/main/java/crazypants/enderio/api/tool/package-info.java index 062784e9..07c39873 100644 --- a/src/main/java/crazypants/enderio/api/tool/package-info.java +++ b/src/main/java/crazypants/enderio/api/tool/package-info.java @@ -3,4 +3,3 @@ package crazypants.enderio.api.tool; import cpw.mods.fml.common.API; import crazypants.enderio.api.EnderIOAPIProps; - diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java index ed6c5d1c..d9cdeef9 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java @@ -1,7 +1,14 @@ package crazypants.enderio.block; import com.enderio.core.api.client.gui.IResourceTooltipProvider; - +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; import net.minecraft.block.BlockAnvil; import net.minecraft.client.gui.GuiRepair; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,94 +18,81 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; public class BlockDarkSteelAnvil extends BlockAnvil implements IResourceTooltipProvider { - private static final String[] anvilIconNames = new String[] { "anvil_0", "anvil_1", "anvil_2" }; + private static final String[] anvilIconNames = new String[] {"anvil_0", "anvil_1", "anvil_2"}; - @SideOnly(Side.CLIENT) - private IIcon[] anvilIcons; + @SideOnly(Side.CLIENT) + private IIcon[] anvilIcons; - public static BlockDarkSteelAnvil create() { - BlockDarkSteelAnvil res = new BlockDarkSteelAnvil(); - res.init(); - return res; - } - - private BlockDarkSteelAnvil() { - super(); - - setHardness(5.0F); - setStepSound(soundTypeAnvil); - setResistance(2000.0F); - - setBlockName(ModObject.blockDarkSteelAnvil.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - protected void init() { - GameRegistry.registerBlock(this, ItemAnvilBlock.class, ModObject.blockDarkSteelAnvil.unlocalisedName); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ANVIL, new IGuiHandler() { - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new ContainerDarkSteelAnvil(player.inventory, world, x, y, z, player); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiRepair(player.inventory, world, x, y, z); - } - }); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return this.getUnlocalizedName(); - } - - @Override - public boolean onBlockActivated(World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ) { - p.openGui(EnderIO.instance, GuiHandler.GUI_ID_ANVIL, w, x, y, z); - return true; - } - - @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_) - { - if(this.anvilRenderSide == 3 && p_149691_1_ == 1) - { - int k = (p_149691_2_ >> 2) % this.anvilIcons.length; - return this.anvilIcons[k]; + public static BlockDarkSteelAnvil create() { + BlockDarkSteelAnvil res = new BlockDarkSteelAnvil(); + res.init(); + return res; } - else - { - return this.blockIcon; + + private BlockDarkSteelAnvil() { + super(); + + setHardness(5.0F); + setStepSound(soundTypeAnvil); + setResistance(2000.0F); + + setBlockName(ModObject.blockDarkSteelAnvil.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); } - } - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) - { - this.blockIcon = register.registerIcon(EnderIO.DOMAIN + ":anvil_base"); - this.anvilIcons = new IIcon[anvilIconNames.length]; + protected void init() { + GameRegistry.registerBlock(this, ItemAnvilBlock.class, ModObject.blockDarkSteelAnvil.unlocalisedName); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ANVIL, new IGuiHandler() { - for (int i = 0; i < this.anvilIcons.length; ++i) - { - this.anvilIcons[i] = register.registerIcon(EnderIO.DOMAIN + ":" + anvilIconNames[i]); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerDarkSteelAnvil(player.inventory, world, x, y, z, player); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiRepair(player.inventory, world, x, y, z); + } + }); } - } - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return new ItemStack(this, 1, world.getBlockMetadata(x, y, z) >> 2); - } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return this.getUnlocalizedName(); + } + + @Override + public boolean onBlockActivated( + World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ) { + p.openGui(EnderIO.instance, GuiHandler.GUI_ID_ANVIL, w, x, y, z); + return true; + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + if (this.anvilRenderSide == 3 && p_149691_1_ == 1) { + int k = (p_149691_2_ >> 2) % this.anvilIcons.length; + return this.anvilIcons[k]; + } else { + return this.blockIcon; + } + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + this.blockIcon = register.registerIcon(EnderIO.DOMAIN + ":anvil_base"); + this.anvilIcons = new IIcon[anvilIconNames.length]; + + for (int i = 0; i < this.anvilIcons.length; ++i) { + this.anvilIcons[i] = register.registerIcon(EnderIO.DOMAIN + ":" + anvilIconNames[i]); + } + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + return new ItemStack(this, 1, world.getBlockMetadata(x, y, z) >> 2); + } } diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java index 09c25b35..598dcd2b 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java @@ -1,7 +1,11 @@ package crazypants.enderio.block; import com.enderio.core.api.client.gui.IResourceTooltipProvider; - +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import net.minecraft.block.Block; import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; @@ -9,57 +13,55 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; public class BlockDarkSteelLadder extends BlockLadder implements IResourceTooltipProvider { - - public static BlockDarkSteelLadder create() { - BlockDarkSteelLadder res = new BlockDarkSteelLadder(); - res.init(); - return res; - } - protected BlockDarkSteelLadder() { - super(); - - setBlockName(ModObject.blockDarkSteelLadder.unlocalisedName); - setBlockTextureName(EnderIO.DOMAIN + ":" + ModObject.blockDarkSteelLadder.unlocalisedName); - setStepSound(Block.soundTypeMetal); - setCreativeTab(EnderIOTab.tabEnderIO); - setHardness(0.4F); - } - - protected void init() { - GameRegistry.registerBlock(this, ModObject.blockDarkSteelLadder.unlocalisedName); - } - - @Override - public Material getMaterial() { - return Material.iron; - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (entity.onGround || entity.isCollidedVertically) { - return; + public static BlockDarkSteelLadder create() { + BlockDarkSteelLadder res = new BlockDarkSteelLadder(); + res.init(); + return res; } - - if(entity.motionY >= 0.1) { - entity.setPosition(entity.posX, entity.posY + Config.darkSteelLadderSpeedBoost, entity.posZ); - } else if(entity.motionY <= -0.1) { - Block blockUnder = entity.worldObj.getBlock(MathHelper.floor_double(entity.posX), MathHelper.floor_double(entity.posY) - 3, MathHelper.floor_double(entity.posZ)); - if (blockUnder == null || blockUnder == this) { // prevent clipping into block - entity.setPosition(entity.posX, entity.posY - Config.darkSteelLadderSpeedBoost, entity.posZ); - } - } - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } + protected BlockDarkSteelLadder() { + super(); + + setBlockName(ModObject.blockDarkSteelLadder.unlocalisedName); + setBlockTextureName(EnderIO.DOMAIN + ":" + ModObject.blockDarkSteelLadder.unlocalisedName); + setStepSound(Block.soundTypeMetal); + setCreativeTab(EnderIOTab.tabEnderIO); + setHardness(0.4F); + } + + protected void init() { + GameRegistry.registerBlock(this, ModObject.blockDarkSteelLadder.unlocalisedName); + } + + @Override + public Material getMaterial() { + return Material.iron; + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity.onGround || entity.isCollidedVertically) { + return; + } + + if (entity.motionY >= 0.1) { + entity.setPosition(entity.posX, entity.posY + Config.darkSteelLadderSpeedBoost, entity.posZ); + } else if (entity.motionY <= -0.1) { + Block blockUnder = entity.worldObj.getBlock( + MathHelper.floor_double(entity.posX), + MathHelper.floor_double(entity.posY) - 3, + MathHelper.floor_double(entity.posZ)); + if (blockUnder == null || blockUnder == this) { // prevent clipping into block + entity.setPosition(entity.posX, entity.posY - Config.darkSteelLadderSpeedBoost, entity.posZ); + } + } + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java index 45456ba5..f0385c81 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelPressurePlate.java @@ -1,8 +1,23 @@ package crazypants.enderio.block; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.Util; +import com.google.common.collect.Lists; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.painter.BasicPainterTemplate; +import crazypants.enderio.machine.painter.IPaintedBlock; +import crazypants.enderio.machine.painter.PaintSourceValidator; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockPressurePlate; import net.minecraft.block.ITileEntityProvider; @@ -18,206 +33,192 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.google.common.collect.Lists; +public class BlockDarkSteelPressurePlate extends BlockPressurePlate + implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock { -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.painter.BasicPainterTemplate; -import crazypants.enderio.machine.painter.IPaintedBlock; -import crazypants.enderio.machine.painter.PaintSourceValidator; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.machine.painter.TileEntityPaintedBlock; - -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.Util; - -public class BlockDarkSteelPressurePlate extends BlockPressurePlate implements IResourceTooltipProvider, ITileEntityProvider, IPaintedBlock { - - public static BlockDarkSteelPressurePlate create() { - BlockDarkSteelPressurePlate res = new BlockDarkSteelPressurePlate(); - res.init(); - return res; - } - - public BlockDarkSteelPressurePlate() { - super(ModObject.blockDarkSteelPressurePlate.unlocalisedName, Material.iron, Sensitivity.players); - setBlockName(ModObject.blockDarkSteelPressurePlate.unlocalisedName); - setStepSound(Block.soundTypeMetal); - setCreativeTab(EnderIOTab.tabEnderIO); - setHardness(2.0f); - } - - protected void init() { - GameRegistry.registerBlock(this, BlockItemDarkSteelPressurePlate.class, ModObject.blockDarkSteelPressurePlate.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityDarkSteelPressurePlate.class, ModObject.blockDarkSteelPressurePlate.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate(this)); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - blockIcon = iIconRegister.registerIcon("enderio:" + ModObject.blockDarkSteelPressurePlate.unlocalisedName); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - if(itemStack != null && itemStack.getItemDamage() == 1) { - return getUnlocalizedName() + ".silent"; - } - return getUnlocalizedName(); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return super.getIcon(world, x, y, z, blockSide); - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(willHarvest) { - return true; - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - - @Override - public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { - super.harvestBlock(world, player, x, y, z, meta); - world.setBlockToAir(x, y, z); - } - - @Override - public final ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - TileEntityDarkSteelPressurePlate tepb = (TileEntityDarkSteelPressurePlate) world.getTileEntity(x, y, z); - ItemStack stack = new ItemStack(this, 1, tepb.isSilent() ? 1 : 0); - if(tepb.getSourceBlock() != null) { - PainterUtil.setSourceBlock(stack, tepb.getSourceBlock(), tepb.getSourceBlockMetadata()); - } - return Lists.newArrayList(stack); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - Block b = PainterUtil.getSourceBlock(stack); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityDarkSteelPressurePlate) { - TileEntityDarkSteelPressurePlate tef = (TileEntityDarkSteelPressurePlate) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - tef.setSilent(stack.getItemDamage() == 1); - } - world.markBlockForUpdate(x, y, z); - super.onBlockPlacedBy(world, x, y, z, player, stack); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityDarkSteelPressurePlate(); - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().colorMultiplier(world, x, y, z); - } - } - return super.colorMultiplier(world, x, y, z); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) { - items.add(new ItemStack(this, 1, 0)); - items.add(new ItemStack(this, 1, 1)); - } - - @Override - protected void func_150062_a(World world, int x, int y, int z, int p_150062_5_) { - int i1 = func_150065_e(world, x, y, z); - boolean flag = p_150062_5_ > 0; - boolean flag1 = i1 > 0; - - if(p_150062_5_ != i1) { - world.setBlockMetadataWithNotify(x, y, z, func_150066_d(i1), 2); - func_150064_a_(world, x, y, z); - world.markBlockRangeForRenderUpdate(x, y, z, x, y, z); + public static BlockDarkSteelPressurePlate create() { + BlockDarkSteelPressurePlate res = new BlockDarkSteelPressurePlate(); + res.init(); + return res; } - boolean playSound = true; - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityDarkSteelPressurePlate && ((TileEntityDarkSteelPressurePlate)te).isSilent()) { - playSound = false; - } - if(playSound) { - if(!flag1 && flag) { - world.playSoundEffect(x + 0.5D, y + 0.1D, z + 0.5D, "random.click", 0.3F, 0.5F); - } else if(flag1 && !flag) { - world.playSoundEffect(x + 0.5D, y + 0.1D, z + 0.5D, "random.click", 0.3F, 0.6F); - } + public BlockDarkSteelPressurePlate() { + super(ModObject.blockDarkSteelPressurePlate.unlocalisedName, Material.iron, Sensitivity.players); + setBlockName(ModObject.blockDarkSteelPressurePlate.unlocalisedName); + setStepSound(Block.soundTypeMetal); + setCreativeTab(EnderIOTab.tabEnderIO); + setHardness(2.0f); } - if(flag1) { - world.scheduleBlockUpdate(x, y, z, this, tickRate(world)); - } - } - - public static final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate(Block dspp) { - super(dspp); + protected void init() { + GameRegistry.registerBlock( + this, BlockItemDarkSteelPressurePlate.class, ModObject.blockDarkSteelPressurePlate.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityDarkSteelPressurePlate.class, + ModObject.blockDarkSteelPressurePlate.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockPainter.unlocalisedName, new PainterTemplate(this)); } @Override - public boolean isValidPaintSource(ItemStack paintSource) { - if(PaintSourceValidator.instance.isValidSourceDefault(paintSource)) { - return true; - } - if(paintSource == null) { - return false; - } - Block block = Util.getBlockFromItemId(paintSource); - if(block == null) { - return false; - } - return Block.getBlockFromItem(paintSource.getItem()) == EnderIO.blockFusedQuartz; + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:" + ModObject.blockDarkSteelPressurePlate.unlocalisedName); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs); - ItemStack resultStack = createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage()); - resultStack.setItemDamage(target.getItemDamage()); - return new ResultStack[] { new ResultStack(resultStack) }; + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + if (itemStack != null && itemStack.getItemDamage() == 1) { + return getUnlocalizedName() + ".silent"; + } + return getUnlocalizedName(); } - public static ItemStack createItemStackForSourceBlock(Block block, int damage) { - ItemStack result = new ItemStack(EnderIO.blockDarkSteelPressurePlate, 1, damage); - PainterUtil.setSourceBlock(result, block, damage); - return result; + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return super.getIcon(world, x, y, z, blockSide); } - } + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + if (willHarvest) { + return true; + } + return super.removedByPlayer(world, player, x, y, z, willHarvest); + } + + @Override + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { + super.harvestBlock(world, player, x, y, z, meta); + world.setBlockToAir(x, y, z); + } + + @Override + public final ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + TileEntityDarkSteelPressurePlate tepb = (TileEntityDarkSteelPressurePlate) world.getTileEntity(x, y, z); + ItemStack stack = new ItemStack(this, 1, tepb.isSilent() ? 1 : 0); + if (tepb.getSourceBlock() != null) { + PainterUtil.setSourceBlock(stack, tepb.getSourceBlock(), tepb.getSourceBlockMetadata()); + } + return Lists.newArrayList(stack); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityDarkSteelPressurePlate) { + TileEntityDarkSteelPressurePlate tef = (TileEntityDarkSteelPressurePlate) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + tef.setSilent(stack.getItemDamage() == 1); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityDarkSteelPressurePlate(); + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item arg0, CreativeTabs arg1, List items) { + items.add(new ItemStack(this, 1, 0)); + items.add(new ItemStack(this, 1, 1)); + } + + @Override + protected void func_150062_a(World world, int x, int y, int z, int p_150062_5_) { + int i1 = func_150065_e(world, x, y, z); + boolean flag = p_150062_5_ > 0; + boolean flag1 = i1 > 0; + + if (p_150062_5_ != i1) { + world.setBlockMetadataWithNotify(x, y, z, func_150066_d(i1), 2); + func_150064_a_(world, x, y, z); + world.markBlockRangeForRenderUpdate(x, y, z, x, y, z); + } + + boolean playSound = true; + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityDarkSteelPressurePlate && ((TileEntityDarkSteelPressurePlate) te).isSilent()) { + playSound = false; + } + if (playSound) { + if (!flag1 && flag) { + world.playSoundEffect(x + 0.5D, y + 0.1D, z + 0.5D, "random.click", 0.3F, 0.5F); + } else if (flag1 && !flag) { + world.playSoundEffect(x + 0.5D, y + 0.1D, z + 0.5D, "random.click", 0.3F, 0.6F); + } + } + + if (flag1) { + world.scheduleBlockUpdate(x, y, z, this, tickRate(world)); + } + } + + public static final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate(Block dspp) { + super(dspp); + } + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + if (PaintSourceValidator.instance.isValidSourceDefault(paintSource)) { + return true; + } + if (paintSource == null) { + return false; + } + Block block = Util.getBlockFromItemId(paintSource); + if (block == null) { + return false; + } + return Block.getBlockFromItem(paintSource.getItem()) == EnderIO.blockFusedQuartz; + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs); + ItemStack resultStack = createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage()); + resultStack.setItemDamage(target.getItemDamage()); + return new ResultStack[] {new ResultStack(resultStack)}; + } + + public static ItemStack createItemStackForSourceBlock(Block block, int damage) { + ItemStack result = new ItemStack(EnderIO.blockDarkSteelPressurePlate, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; + } + } } diff --git a/src/main/java/crazypants/enderio/block/BlockItemDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/BlockItemDarkSteelPressurePlate.java index 59fdbecc..59c7a57f 100644 --- a/src/main/java/crazypants/enderio/block/BlockItemDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/BlockItemDarkSteelPressurePlate.java @@ -5,13 +5,12 @@ import net.minecraft.item.ItemBlockWithMetadata; public class BlockItemDarkSteelPressurePlate extends ItemBlockWithMetadata { - public BlockItemDarkSteelPressurePlate(Block block) { - super(block, block); - } - - @Override - public int getMetadata(int p_77647_1_) { - return 0; - } + public BlockItemDarkSteelPressurePlate(Block block) { + super(block, block); + } + @Override + public int getMetadata(int p_77647_1_) { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java index 0434574d..3f04f0bb 100644 --- a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -1,9 +1,11 @@ package crazypants.enderio.block; -import java.util.List; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; - +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.waila.IWailaInfoProvider; +import java.util.List; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -12,63 +14,59 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.waila.IWailaInfoProvider; public class BlockReinforcedObsidian extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider { - public static BlockReinforcedObsidian create() { - BlockReinforcedObsidian result = new BlockReinforcedObsidian(); - result.init(); - return result; - } - - private BlockReinforcedObsidian() { - super(ModObject.blockReinforcedObsidian.unlocalisedName, null, Material.rock); - setHardness(50.0F); - setResistance(2000.0F); - setStepSound(soundTypePiston); - - if(!Config.reinforcedObsidianEnabled) { - setCreativeTab(null); + public static BlockReinforcedObsidian create() { + BlockReinforcedObsidian result = new BlockReinforcedObsidian(); + result.init(); + return result; } - } - - public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { - return false; - } - - @Override - public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { - ; - } - - @Override - public boolean canDropFromExplosion(Explosion p_149659_1_) { - return false; - } - - public MapColor getMapColor(int p_149728_1_) { - return MapColor.obsidianColor; - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return false; - } + private BlockReinforcedObsidian() { + super(ModObject.blockReinforcedObsidian.unlocalisedName, null, Material.rock); + setHardness(50.0F); + setResistance(2000.0F); + setStepSound(soundTypePiston); - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} + if (!Config.reinforcedObsidianEnabled) { + setCreativeTab(null); + } + } - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.BIT_BASIC; - } + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + return false; + } + + @Override + public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { + ; + } + + @Override + public boolean canDropFromExplosion(Explosion p_149659_1_) { + return false; + } + + public MapColor getMapColor(int p_149728_1_) { + return MapColor.obsidianColor; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.BIT_BASIC; + } } diff --git a/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java b/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java index bdd351b9..bc7f798c 100644 --- a/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java +++ b/src/main/java/crazypants/enderio/block/ContainerDarkSteelAnvil.java @@ -1,7 +1,9 @@ package crazypants.enderio.block; +import cpw.mods.fml.relauncher.ReflectionHelper; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; import java.lang.reflect.Field; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerRepair; @@ -9,93 +11,96 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.ReflectionHelper; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; public class ContainerDarkSteelAnvil extends ContainerRepair { - private int x, y, z; + private int x, y, z; - private final Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f"); - private final Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g"); - private final Field _materialCost = ReflectionHelper.findField(ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l"); + private final Field _outputSlot = ReflectionHelper.findField(ContainerRepair.class, "outputSlot", "field_82852_f"); + private final Field _inputSlots = ReflectionHelper.findField(ContainerRepair.class, "inputSlots", "field_82853_g"); + private final Field _materialCost = ReflectionHelper.findField( + ContainerRepair.class, "materialCost", "stackSizeToBeUsedInRepair", "field_82856_l"); - @SuppressWarnings("unchecked") - public ContainerDarkSteelAnvil(InventoryPlayer playerInv, final World world, final int x, final int y, final int z, EntityPlayer player) { - super(playerInv, world, x, y, z, player); + @SuppressWarnings("unchecked") + public ContainerDarkSteelAnvil( + InventoryPlayer playerInv, final World world, final int x, final int y, final int z, EntityPlayer player) { + super(playerInv, world, x, y, z, player); - final IInventory outputSlot, inputSlots; - final int materialCost; + final IInventory outputSlot, inputSlots; + final int materialCost; - try { - outputSlot = (IInventory) _outputSlot.get(this); - inputSlots = (IInventory) _inputSlots.get(this); - materialCost = _materialCost.getInt(this); - } catch (Exception e) { - throw new RuntimeException(e); + try { + outputSlot = (IInventory) _outputSlot.get(this); + inputSlots = (IInventory) _inputSlots.get(this); + materialCost = _materialCost.getInt(this); + } catch (Exception e) { + throw new RuntimeException(e); + } + + this.x = x; + this.y = y; + this.z = z; + + this.inventorySlots.set(2, new Slot(outputSlot, 2, 134, 47) { + + public boolean isItemValid(ItemStack stack) { + return false; + } + + public boolean canTakeStack(EntityPlayer stack) { + return (stack.capabilities.isCreativeMode + || stack.experienceLevel >= ContainerDarkSteelAnvil.this.maximumCost) + && ContainerDarkSteelAnvil.this.maximumCost > 0 + && this.getHasStack(); + } + + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!player.capabilities.isCreativeMode) { + player.addExperienceLevel(-ContainerDarkSteelAnvil.this.maximumCost); + } + + inputSlots.setInventorySlotContents(0, (ItemStack) null); + + if (materialCost > 0) { + ItemStack itemstack1 = inputSlots.getStackInSlot(1); + + if (itemstack1 != null && itemstack1.stackSize > materialCost) { + itemstack1.stackSize -= materialCost; + inputSlots.setInventorySlotContents(1, itemstack1); + } else { + inputSlots.setInventorySlotContents(1, (ItemStack) null); + } + } else { + inputSlots.setInventorySlotContents(1, (ItemStack) null); + } + + ContainerDarkSteelAnvil.this.maximumCost = 0; + + if (!player.capabilities.isCreativeMode + && !world.isRemote + && world.getBlock(x, y, z) == EnderIO.blockDarkSteelAnvil + && player.getRNG().nextFloat() < Config.darkSteelAnvilDamageChance) { + int i1 = world.getBlockMetadata(x, y, z); + int k = i1 & 3; + int l = i1 >> 2; + ++l; + + if (l > 2) { + world.setBlockToAir(x, y, z); + world.playAuxSFX(1020, x, y, z, 0); + } else { + world.setBlockMetadataWithNotify(x, y, z, k | l << 2, 2); + world.playAuxSFX(1021, x, y, z, 0); + } + } else if (!world.isRemote) { + world.playAuxSFX(1021, x, y, z, 0); + } + } + }); } - this.x = x; - this.y = y; - this.z = z; - - this.inventorySlots.set(2, new Slot(outputSlot, 2, 134, 47) { - - public boolean isItemValid(ItemStack stack) { - return false; - } - - public boolean canTakeStack(EntityPlayer stack) { - return (stack.capabilities.isCreativeMode || stack.experienceLevel >= ContainerDarkSteelAnvil.this.maximumCost) - && ContainerDarkSteelAnvil.this.maximumCost > 0 && this.getHasStack(); - } - - public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - if(!player.capabilities.isCreativeMode) { - player.addExperienceLevel(-ContainerDarkSteelAnvil.this.maximumCost); - } - - inputSlots.setInventorySlotContents(0, (ItemStack) null); - - if(materialCost > 0) { - ItemStack itemstack1 = inputSlots.getStackInSlot(1); - - if(itemstack1 != null && itemstack1.stackSize > materialCost) { - itemstack1.stackSize -= materialCost; - inputSlots.setInventorySlotContents(1, itemstack1); - } else { - inputSlots.setInventorySlotContents(1, (ItemStack) null); - } - } else { - inputSlots.setInventorySlotContents(1, (ItemStack) null); - } - - ContainerDarkSteelAnvil.this.maximumCost = 0; - - if(!player.capabilities.isCreativeMode && !world.isRemote && world.getBlock(x, y, z) == EnderIO.blockDarkSteelAnvil - && player.getRNG().nextFloat() < Config.darkSteelAnvilDamageChance) { - int i1 = world.getBlockMetadata(x, y, z); - int k = i1 & 3; - int l = i1 >> 2; - ++l; - - if(l > 2) { - world.setBlockToAir(x, y, z); - world.playAuxSFX(1020, x, y, z, 0); - } else { - world.setBlockMetadataWithNotify(x, y, z, k | l << 2, 2); - world.playAuxSFX(1021, x, y, z, 0); - } - } else if(!world.isRemote) { - world.playAuxSFX(1021, x, y, z, 0); - } - } - }); - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return player.worldObj.getBlock(this.x, this.y, this.z) == EnderIO.blockDarkSteelAnvil; - } + @Override + public boolean canInteractWith(EntityPlayer player) { + return player.worldObj.getBlock(this.x, this.y, this.z) == EnderIO.blockDarkSteelAnvil; + } } diff --git a/src/main/java/crazypants/enderio/block/TileEntityDarkSteelPressurePlate.java b/src/main/java/crazypants/enderio/block/TileEntityDarkSteelPressurePlate.java index bbf697e9..5fe26654 100644 --- a/src/main/java/crazypants/enderio/block/TileEntityDarkSteelPressurePlate.java +++ b/src/main/java/crazypants/enderio/block/TileEntityDarkSteelPressurePlate.java @@ -1,32 +1,29 @@ package crazypants.enderio.block; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; +import net.minecraft.nbt.NBTTagCompound; public class TileEntityDarkSteelPressurePlate extends TileEntityPaintedBlock { - private boolean silent; + private boolean silent; - public boolean isSilent() { - return silent; - } + public boolean isSilent() { + return silent; + } - public void setSilent(boolean silent) { - this.silent = silent; - } + public void setSilent(boolean silent) { + this.silent = silent; + } - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - silent = nbtRoot.getBoolean("silent"); - } + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + silent = nbtRoot.getBoolean("silent"); + } - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("silent", silent); - } - - - + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("silent", silent); + } } diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 650d0981..fa769a4d 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -1,29 +1,6 @@ package crazypants.enderio.conduit; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import mods.immibis.microblocks.api.EnumPartClass; -import mods.immibis.microblocks.api.EnumPosition; -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.Part; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gas.GasConduitNetwork; import crazypants.enderio.conduit.gas.IGasConduit; @@ -51,621 +28,642 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import mods.immibis.microblocks.api.EnumPartClass; +import mods.immibis.microblocks.api.EnumPosition; +import mods.immibis.microblocks.api.IMicroblockCoverSystem; +import mods.immibis.microblocks.api.Part; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public abstract class AbstractConduit implements IConduit { - protected final Set conduitConnections = EnumSet.noneOf(ForgeDirection.class); + protected final Set conduitConnections = EnumSet.noneOf(ForgeDirection.class); - protected final Set externalConnections = EnumSet.noneOf(ForgeDirection.class); + protected final Set externalConnections = EnumSet.noneOf(ForgeDirection.class); - public static final float STUB_WIDTH = 0.2f; + public static final float STUB_WIDTH = 0.2f; - public static final float STUB_HEIGHT = 0.2f; + public static final float STUB_HEIGHT = 0.2f; - public static final float TRANSMISSION_SCALE = 0.3f; + public static final float TRANSMISSION_SCALE = 0.3f; - // NB: This is a transient field controlled by the owning bundle. It is not - // written to the NBT etc - protected IConduitBundle bundle; + // NB: This is a transient field controlled by the owning bundle. It is not + // written to the NBT etc + protected IConduitBundle bundle; - protected boolean active; + protected boolean active; - protected List collidables; + protected List collidables; - protected final EnumMap conectionModes = new EnumMap( - ForgeDirection.class); + protected final EnumMap conectionModes = + new EnumMap(ForgeDirection.class); - protected boolean collidablesDirty = true; + protected boolean collidablesDirty = true; - private boolean clientStateDirty = true; + private boolean clientStateDirty = true; - private boolean dodgyChangeSinceLastCallFlagForBundle = true; + private boolean dodgyChangeSinceLastCallFlagForBundle = true; - protected boolean connectionsDirty = true; + protected boolean connectionsDirty = true; - protected AbstractConduit() { - } + protected AbstractConduit() {} - @Override - public boolean writeConnectionSettingsToNBT(ForgeDirection dir, NBTTagCompound nbt) { - if (!getExternalConnections().contains(dir)) { - return false; - } - NBTTagCompound dataRoot = getNbtRootForType(nbt, true); - dataRoot.setShort("connectionMode", (short) getConnectionMode(dir).ordinal()); - writeTypeSettingsToNbt(dir, dataRoot); - return true; - } - - @Override - public boolean readConduitSettingsFromNBT(ForgeDirection dir, NBTTagCompound nbt) { - if (!getExternalConnections().contains(dir)) { - return false; - } - NBTTagCompound dataRoot = getNbtRootForType(nbt, false); - if (dataRoot == null) { - return false; - } - if (dataRoot.hasKey("connectionMode")) { - ConnectionMode mode = ConnectionMode.values()[dataRoot.getShort("connectionMode")]; - setConnectionMode(dir, mode); - } - readTypeSettings(dir, dataRoot); - return true; - } - - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - } - - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - } - - protected NBTTagCompound getNbtRootForType(NBTTagCompound nbt, boolean createIfNull) { - Class bt = getBaseConduitType(); - String dataRootName = bt.getSimpleName(); - NBTTagCompound dataRoot = null; - if (nbt.hasKey(dataRootName)) { - dataRoot = nbt.getCompoundTag(dataRootName); - } - if (dataRoot == null && createIfNull) { - dataRoot = new NBTTagCompound(); - nbt.setTag(dataRootName, dataRoot); - } - return dataRoot; - } - - @Override - public ConnectionMode getConnectionMode(ForgeDirection dir) { - ConnectionMode res = conectionModes.get(dir); - if (res == null) { - return getDefaultConnectionMode(); - } - return res; - } - - protected ConnectionMode getDefaultConnectionMode() { - return ConnectionMode.IN_OUT; - } - - @Override - public List getDrops() { - return Collections.singletonList(createItem()); - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - ConnectionMode oldVal = conectionModes.get(dir); - if (oldVal == mode) { - return; - } - - if (mode == null) { - conectionModes.remove(dir); - } else { - conectionModes.put(dir, mode); - } - clientStateDirty = true; - collidablesDirty = true; - - connectionsChanged(); - } - - @Override - public boolean hasConnectionMode(ConnectionMode mode) { - if (mode == null) { - return false; - } - if (mode == getDefaultConnectionMode() && conectionModes.size() != 6) { - return true; - } - for (ConnectionMode cm : conectionModes.values()) { - if (cm == mode) { - return true; - } - } - return false; - } - - @Override - public ConnectionMode getNextConnectionMode(ForgeDirection dir) { - ConnectionMode curMode = getConnectionMode(dir); - ConnectionMode next = ConnectionMode.getNext(curMode); - if (next == ConnectionMode.NOT_SET) { - next = ConnectionMode.IN_OUT; - } - return next; - } - - @Override - public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { - ConnectionMode curMode = getConnectionMode(dir); - ConnectionMode prev = ConnectionMode.getPrevious(curMode); - if (prev == ConnectionMode.NOT_SET) { - prev = ConnectionMode.DISABLED; - } - return prev; - } - - @Override - public boolean haveCollidablesChangedSinceLastCall() { - if (dodgyChangeSinceLastCallFlagForBundle) { - dodgyChangeSinceLastCallFlagForBundle = false; - return true; - } - return false; - } - - @Override - public BlockCoord getLocation() { - if (bundle == null) { - return null; - } - return bundle.getLocation(); - } - - @Override - public void setBundle(IConduitBundle tileConduitBundle) { - bundle = tileConduitBundle; - } - - @Override - public IConduitBundle getBundle() { - return bundle; - } - - // Connections - @Override - public Set getConduitConnections() { - return conduitConnections; - } - - @Override - public boolean containsConduitConnection(ForgeDirection dir) { - return conduitConnections.contains(dir); - } - - @Override - public void conduitConnectionAdded(ForgeDirection fromDirection) { - conduitConnections.add(fromDirection); - } - - @Override - public void conduitConnectionRemoved(ForgeDirection fromDirection) { - conduitConnections.remove(fromDirection); - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - if (conduit == null) { - return false; - } - if (MicroblocksUtil.supportMicroblocks() && isBlockedByMicroblocks(direction, conduit)) { - return false; - } - return getConnectionMode(direction) != ConnectionMode.DISABLED - && conduit.getConnectionMode(direction.getOpposite()) != ConnectionMode.DISABLED; - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) { - return false; - } - - protected boolean isBlockedByMicroblocks(ForgeDirection direction, IConduit conduit) { - IMicroblockCoverSystem covers = getBundle().getCoverSystem(); - for (Part part : covers.getAllParts()) { - if (part.type.getPartClass() == EnumPartClass.Panel) { - return part.pos == EnumPosition.getFacePosition(direction.ordinal()); - } - } - covers = conduit.getBundle().getCoverSystem(); - for (Part part : covers.getAllParts()) { - if (part.type.getPartClass() == EnumPartClass.Panel) { - return part.pos == EnumPosition.getFacePosition(direction.getOpposite().ordinal()); - } - } - return false; - } - - @Override - public Set getExternalConnections() { - return externalConnections; - } - - @Override - public boolean hasExternalConnections() { - return !externalConnections.isEmpty(); - } - - @Override - public boolean hasConnections() { - return hasConduitConnections() || hasExternalConnections(); - } - - @Override - public boolean hasConduitConnections() { - return !conduitConnections.isEmpty(); - } - - @Override - public boolean containsExternalConnection(ForgeDirection dir) { - return externalConnections.contains(dir); - } - - @Override - public void externalConnectionAdded(ForgeDirection fromDirection) { - externalConnections.add(fromDirection); - } - - @Override - public void externalConnectionRemoved(ForgeDirection fromDirection) { - externalConnections.remove(fromDirection); - } - - @Override - public boolean isConnectedTo(ForgeDirection dir) { - return containsConduitConnection(dir) || containsExternalConnection(dir); - } - - @Override - public boolean isActive() { - return active; - } - - @Override - public void setActive(boolean active) { - if (active != this.active) { - clientStateDirty = true; - } - this.active = active; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - int[] dirs = new int[conduitConnections.size()]; - Iterator cons = conduitConnections.iterator(); - for (int i = 0; i < dirs.length; i++) { - dirs[i] = cons.next().ordinal(); - } - nbtRoot.setIntArray("connections", dirs); - - dirs = new int[externalConnections.size()]; - cons = externalConnections.iterator(); - for (int i = 0; i < dirs.length; i++) { - dirs[i] = cons.next().ordinal(); - } - nbtRoot.setIntArray("externalConnections", dirs); - nbtRoot.setBoolean("signalActive", active); - - if (conectionModes.size() > 0) { - byte[] modes = new byte[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - modes[i] = (byte) getConnectionMode(dir).ordinal(); - i++; - } - nbtRoot.setByteArray("conModes", modes); - } - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - conduitConnections.clear(); - int[] dirs = nbtRoot.getIntArray("connections"); - for (int i = 0; i < dirs.length; i++) { - conduitConnections.add(ForgeDirection.values()[dirs[i]]); - } - - externalConnections.clear(); - dirs = nbtRoot.getIntArray("externalConnections"); - for (int i = 0; i < dirs.length; i++) { - externalConnections.add(ForgeDirection.values()[dirs[i]]); - } - active = nbtRoot.getBoolean("signalActive"); - - conectionModes.clear(); - byte[] modes = nbtRoot.getByteArray("conModes"); - if (modes != null && modes.length == 6) { - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - conectionModes.put(dir, ConnectionMode.values()[modes[i]]); - i++; - } - } - } - - @Override - public int getLightValue() { - return 0; - } - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - return false; - } - - @Override - public float getSelfIlluminationForState(CollidableComponent component) { - return isActive() ? 1 : 0; - } - - @Override - public float getTransmitionGeometryScale() { - return TRANSMISSION_SCALE; - } - - @Override - public void onChunkUnload(World worldObj) { - AbstractConduitNetwork network = getNetwork(); - if (network != null) { - network.destroyNetwork(); - } - } - - @Override - public void updateEntity(World world) { - if (world.isRemote) { - return; - } - updateNetwork(world); - updateConnections(); - if (clientStateDirty && getBundle() != null) { - getBundle().dirty(); - clientStateDirty = false; - } - } - - private void updateConnections() { - if (!connectionsDirty) { - return; - } - - boolean externalConnectionsChanged = false; - List copy = new ArrayList(externalConnections); - // remove any no longer valid connections - for (ForgeDirection dir : copy) { - if (!canConnectToExternal(dir, false)) { - externalConnectionRemoved(dir); - externalConnectionsChanged = true; - } - } - - // then check for new ones - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!conduitConnections.contains(dir) && !externalConnections.contains(dir)) { - if (canConnectToExternal(dir, false)) { - externalConnectionAdded(dir); - externalConnectionsChanged = true; + @Override + public boolean writeConnectionSettingsToNBT(ForgeDirection dir, NBTTagCompound nbt) { + if (!getExternalConnections().contains(dir)) { + return false; } - } - } - if (externalConnectionsChanged) { - connectionsChanged(); - } - - connectionsDirty = false; - } - - @Override - public void connectionsChanged() { - collidablesDirty = true; - clientStateDirty = true; - dodgyChangeSinceLastCallFlagForBundle = true; - } - - protected void setClientStateDirty() { - clientStateDirty = true; - } - - protected void updateNetwork(World world) { - BlockCoord pos = getLocation(); - if (getNetwork() == null && world.blockExists(pos.x, pos.y, pos.z)) { - ConduitUtil.ensureValidNetwork(this); - // TODO figure out if removing this causes anything horrible to happen. - // Initial testing shows no difference. - // if(getNetwork() != null && !world.isRemote && bundle != null) { - // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, - // bundle.getEntity().yCoord, bundle.getEntity().zCoord, - // bundle.getEntity().getBlockType()); - // } - } - } - - @Override - public void onAddedToBundle() { - - TileEntity te = bundle.getEntity(); - World world = te.getWorldObj(); - - conduitConnections.clear(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); - if (neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { - conduitConnections.add(dir); - neighbour.conduitConnectionAdded(dir.getOpposite()); - neighbour.connectionsChanged(); - } - } - - externalConnections.clear(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { - externalConnectionAdded(dir); - } - } - - connectionsChanged(); - } - - @Override - public void onRemovedFromBundle() { - TileEntity te = bundle.getEntity(); - World world = te.getWorldObj(); - - for (ForgeDirection dir : conduitConnections) { - IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); - if (neighbour != null) { - neighbour.conduitConnectionRemoved(dir.getOpposite()); - neighbour.connectionsChanged(); - } - } - conduitConnections.clear(); - - if (!externalConnections.isEmpty()) { - world.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); - } - externalConnections.clear(); - - AbstractConduitNetwork network = getNetwork(); - if (network != null) { - network.destroyNetwork(); - } - connectionsChanged(); - } - - @Override - public boolean onNeighborBlockChange(Block block) { - - // NB: No need to check externals if the neighbour that changed was a - // conduit bundle as this - // can't effect external connections. - if (block == EnderIO.blockConduitBundle) { - return false; - } - - // Check for changes to external connections, connections to conduits are - // handled by the bundle - Set newCons = EnumSet.noneOf(ForgeDirection.class); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { - newCons.add(dir); - } - } - if (newCons.size() != externalConnections.size()) { - connectionsDirty = true; - return true; - } - for (ForgeDirection dir : externalConnections) { - if (!newCons.remove(dir)) { - connectionsDirty = true; + NBTTagCompound dataRoot = getNbtRootForType(nbt, true); + dataRoot.setShort("connectionMode", (short) getConnectionMode(dir).ordinal()); + writeTypeSettingsToNbt(dir, dataRoot); return true; - } - } - if (!newCons.isEmpty()) { - connectionsDirty = true; - return true; - } - return false; - } - - @Override - public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - return onNeighborBlockChange(world.getBlock(tileX, tileY, tileZ)); - } - - @Override - public Collection createCollidables(CacheKey key) { - return Collections.singletonList(new CollidableComponent(getCollidableType(), ConduitGeometryUtil.instance.getBoundingBox( - getBaseConduitType(), key.dir, key.isStub, key.offset), key.dir, null)); - } - - @Override - public Class getCollidableType() { - return getBaseConduitType(); - } - - @Override - public List getCollidableComponents() { - - if (collidables != null && !collidablesDirty) { - return collidables; } - List result = new ArrayList(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Collection col = getCollidables(dir); - if (col != null) { - result.addAll(col); - } + @Override + public boolean readConduitSettingsFromNBT(ForgeDirection dir, NBTTagCompound nbt) { + if (!getExternalConnections().contains(dir)) { + return false; + } + NBTTagCompound dataRoot = getNbtRootForType(nbt, false); + if (dataRoot == null) { + return false; + } + if (dataRoot.hasKey("connectionMode")) { + ConnectionMode mode = ConnectionMode.values()[dataRoot.getShort("connectionMode")]; + setConnectionMode(dir, mode); + } + readTypeSettings(dir, dataRoot); + return true; } - collidables = result; - collidablesDirty = false; + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) {} - return result; - } + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) {} - protected boolean renderStub(ForgeDirection dir) { - // return getConectionMode(dir) == ConnectionMode.DISABLED; - return false; - } - - private Collection getCollidables(ForgeDirection dir) { - CollidableCache cc = CollidableCache.instance; - Class type = getCollidableType(); - if (isConnectedTo(dir) && getConnectionMode(dir) != ConnectionMode.DISABLED) { - return cc.getCollidables(cc.createKey(type, getBundle().getOffset(getBaseConduitType(), dir), dir, renderStub(dir)), this); + protected NBTTagCompound getNbtRootForType(NBTTagCompound nbt, boolean createIfNull) { + Class bt = getBaseConduitType(); + String dataRootName = bt.getSimpleName(); + NBTTagCompound dataRoot = null; + if (nbt.hasKey(dataRootName)) { + dataRoot = nbt.getCompoundTag(dataRootName); + } + if (dataRoot == null && createIfNull) { + dataRoot = new NBTTagCompound(); + nbt.setTag(dataRootName, dataRoot); + } + return dataRoot; } - return null; - } - @Override - public AbstractConduitNetwork createNetworkForType() { - Class type = this.getClass(); - if (IRedstoneConduit.class.isAssignableFrom(type)) { - return new RedstoneConduitNetwork(); - } else if (IPowerConduit.class.isAssignableFrom(type)) { - return new PowerConduitNetwork(); - } else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.TYPE); - } else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE); - } else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(CrystallinePinkSlimeEnderLiquidConduit.TYPE); - } else if (CrystallineEnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(CrystallineEnderLiquidConduit.TYPE); - } else if (EnderLiquidConduit.class.isAssignableFrom(type)) { - return new EnderLiquidConduitNetwork(EnderLiquidConduit.TYPE); - } else if (AdvancedLiquidConduit.class.isAssignableFrom(type)) { - return new AdvancedLiquidConduitNetwork(); - } else if (ILiquidConduit.class.isAssignableFrom(type)) { - return new LiquidConduitNetwork(); - } else if (IItemConduit.class.isAssignableFrom(type)) { - return new ItemConduitNetwork(); - } else if (IGasConduit.class.isAssignableFrom(type)) { - return new GasConduitNetwork(); - } else if (IMEConduit.class.isAssignableFrom(type)) { - return new MEConduitNetwork(); - } else if (IOCConduit.class.isAssignableFrom(type)) { - return new OCConduitNetwork(); - } else { - return null; + @Override + public ConnectionMode getConnectionMode(ForgeDirection dir) { + ConnectionMode res = conectionModes.get(dir); + if (res == null) { + return getDefaultConnectionMode(); + } + return res; } - } - @Override - public boolean shouldMirrorTexture() { - return true; - } + protected ConnectionMode getDefaultConnectionMode() { + return ConnectionMode.IN_OUT; + } + @Override + public List getDrops() { + return Collections.singletonList(createItem()); + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + ConnectionMode oldVal = conectionModes.get(dir); + if (oldVal == mode) { + return; + } + + if (mode == null) { + conectionModes.remove(dir); + } else { + conectionModes.put(dir, mode); + } + clientStateDirty = true; + collidablesDirty = true; + + connectionsChanged(); + } + + @Override + public boolean hasConnectionMode(ConnectionMode mode) { + if (mode == null) { + return false; + } + if (mode == getDefaultConnectionMode() && conectionModes.size() != 6) { + return true; + } + for (ConnectionMode cm : conectionModes.values()) { + if (cm == mode) { + return true; + } + } + return false; + } + + @Override + public ConnectionMode getNextConnectionMode(ForgeDirection dir) { + ConnectionMode curMode = getConnectionMode(dir); + ConnectionMode next = ConnectionMode.getNext(curMode); + if (next == ConnectionMode.NOT_SET) { + next = ConnectionMode.IN_OUT; + } + return next; + } + + @Override + public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { + ConnectionMode curMode = getConnectionMode(dir); + ConnectionMode prev = ConnectionMode.getPrevious(curMode); + if (prev == ConnectionMode.NOT_SET) { + prev = ConnectionMode.DISABLED; + } + return prev; + } + + @Override + public boolean haveCollidablesChangedSinceLastCall() { + if (dodgyChangeSinceLastCallFlagForBundle) { + dodgyChangeSinceLastCallFlagForBundle = false; + return true; + } + return false; + } + + @Override + public BlockCoord getLocation() { + if (bundle == null) { + return null; + } + return bundle.getLocation(); + } + + @Override + public void setBundle(IConduitBundle tileConduitBundle) { + bundle = tileConduitBundle; + } + + @Override + public IConduitBundle getBundle() { + return bundle; + } + + // Connections + @Override + public Set getConduitConnections() { + return conduitConnections; + } + + @Override + public boolean containsConduitConnection(ForgeDirection dir) { + return conduitConnections.contains(dir); + } + + @Override + public void conduitConnectionAdded(ForgeDirection fromDirection) { + conduitConnections.add(fromDirection); + } + + @Override + public void conduitConnectionRemoved(ForgeDirection fromDirection) { + conduitConnections.remove(fromDirection); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + if (conduit == null) { + return false; + } + if (MicroblocksUtil.supportMicroblocks() && isBlockedByMicroblocks(direction, conduit)) { + return false; + } + return getConnectionMode(direction) != ConnectionMode.DISABLED + && conduit.getConnectionMode(direction.getOpposite()) != ConnectionMode.DISABLED; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) { + return false; + } + + protected boolean isBlockedByMicroblocks(ForgeDirection direction, IConduit conduit) { + IMicroblockCoverSystem covers = getBundle().getCoverSystem(); + for (Part part : covers.getAllParts()) { + if (part.type.getPartClass() == EnumPartClass.Panel) { + return part.pos == EnumPosition.getFacePosition(direction.ordinal()); + } + } + covers = conduit.getBundle().getCoverSystem(); + for (Part part : covers.getAllParts()) { + if (part.type.getPartClass() == EnumPartClass.Panel) { + return part.pos + == EnumPosition.getFacePosition(direction.getOpposite().ordinal()); + } + } + return false; + } + + @Override + public Set getExternalConnections() { + return externalConnections; + } + + @Override + public boolean hasExternalConnections() { + return !externalConnections.isEmpty(); + } + + @Override + public boolean hasConnections() { + return hasConduitConnections() || hasExternalConnections(); + } + + @Override + public boolean hasConduitConnections() { + return !conduitConnections.isEmpty(); + } + + @Override + public boolean containsExternalConnection(ForgeDirection dir) { + return externalConnections.contains(dir); + } + + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + externalConnections.add(fromDirection); + } + + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + externalConnections.remove(fromDirection); + } + + @Override + public boolean isConnectedTo(ForgeDirection dir) { + return containsConduitConnection(dir) || containsExternalConnection(dir); + } + + @Override + public boolean isActive() { + return active; + } + + @Override + public void setActive(boolean active) { + if (active != this.active) { + clientStateDirty = true; + } + this.active = active; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + int[] dirs = new int[conduitConnections.size()]; + Iterator cons = conduitConnections.iterator(); + for (int i = 0; i < dirs.length; i++) { + dirs[i] = cons.next().ordinal(); + } + nbtRoot.setIntArray("connections", dirs); + + dirs = new int[externalConnections.size()]; + cons = externalConnections.iterator(); + for (int i = 0; i < dirs.length; i++) { + dirs[i] = cons.next().ordinal(); + } + nbtRoot.setIntArray("externalConnections", dirs); + nbtRoot.setBoolean("signalActive", active); + + if (conectionModes.size() > 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + modes[i] = (byte) getConnectionMode(dir).ordinal(); + i++; + } + nbtRoot.setByteArray("conModes", modes); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + conduitConnections.clear(); + int[] dirs = nbtRoot.getIntArray("connections"); + for (int i = 0; i < dirs.length; i++) { + conduitConnections.add(ForgeDirection.values()[dirs[i]]); + } + + externalConnections.clear(); + dirs = nbtRoot.getIntArray("externalConnections"); + for (int i = 0; i < dirs.length; i++) { + externalConnections.add(ForgeDirection.values()[dirs[i]]); + } + active = nbtRoot.getBoolean("signalActive"); + + conectionModes.clear(); + byte[] modes = nbtRoot.getByteArray("conModes"); + if (modes != null && modes.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + conectionModes.put(dir, ConnectionMode.values()[modes[i]]); + i++; + } + } + } + + @Override + public int getLightValue() { + return 0; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + return false; + } + + @Override + public float getSelfIlluminationForState(CollidableComponent component) { + return isActive() ? 1 : 0; + } + + @Override + public float getTransmitionGeometryScale() { + return TRANSMISSION_SCALE; + } + + @Override + public void onChunkUnload(World worldObj) { + AbstractConduitNetwork network = getNetwork(); + if (network != null) { + network.destroyNetwork(); + } + } + + @Override + public void updateEntity(World world) { + if (world.isRemote) { + return; + } + updateNetwork(world); + updateConnections(); + if (clientStateDirty && getBundle() != null) { + getBundle().dirty(); + clientStateDirty = false; + } + } + + private void updateConnections() { + if (!connectionsDirty) { + return; + } + + boolean externalConnectionsChanged = false; + List copy = new ArrayList(externalConnections); + // remove any no longer valid connections + for (ForgeDirection dir : copy) { + if (!canConnectToExternal(dir, false)) { + externalConnectionRemoved(dir); + externalConnectionsChanged = true; + } + } + + // then check for new ones + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!conduitConnections.contains(dir) && !externalConnections.contains(dir)) { + if (canConnectToExternal(dir, false)) { + externalConnectionAdded(dir); + externalConnectionsChanged = true; + } + } + } + if (externalConnectionsChanged) { + connectionsChanged(); + } + + connectionsDirty = false; + } + + @Override + public void connectionsChanged() { + collidablesDirty = true; + clientStateDirty = true; + dodgyChangeSinceLastCallFlagForBundle = true; + } + + protected void setClientStateDirty() { + clientStateDirty = true; + } + + protected void updateNetwork(World world) { + BlockCoord pos = getLocation(); + if (getNetwork() == null && world.blockExists(pos.x, pos.y, pos.z)) { + ConduitUtil.ensureValidNetwork(this); + // TODO figure out if removing this causes anything horrible to happen. + // Initial testing shows no difference. + // if(getNetwork() != null && !world.isRemote && bundle != null) { + // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, + // bundle.getEntity().yCoord, bundle.getEntity().zCoord, + // bundle.getEntity().getBlockType()); + // } + } + } + + @Override + public void onAddedToBundle() { + + TileEntity te = bundle.getEntity(); + World world = te.getWorldObj(); + + conduitConnections.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); + if (neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { + conduitConnections.add(dir); + neighbour.conduitConnectionAdded(dir.getOpposite()); + neighbour.connectionsChanged(); + } + } + + externalConnections.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { + externalConnectionAdded(dir); + } + } + + connectionsChanged(); + } + + @Override + public void onRemovedFromBundle() { + TileEntity te = bundle.getEntity(); + World world = te.getWorldObj(); + + for (ForgeDirection dir : conduitConnections) { + IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); + if (neighbour != null) { + neighbour.conduitConnectionRemoved(dir.getOpposite()); + neighbour.connectionsChanged(); + } + } + conduitConnections.clear(); + + if (!externalConnections.isEmpty()) { + world.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); + } + externalConnections.clear(); + + AbstractConduitNetwork network = getNetwork(); + if (network != null) { + network.destroyNetwork(); + } + connectionsChanged(); + } + + @Override + public boolean onNeighborBlockChange(Block block) { + + // NB: No need to check externals if the neighbour that changed was a + // conduit bundle as this + // can't effect external connections. + if (block == EnderIO.blockConduitBundle) { + return false; + } + + // Check for changes to external connections, connections to conduits are + // handled by the bundle + Set newCons = EnumSet.noneOf(ForgeDirection.class); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { + newCons.add(dir); + } + } + if (newCons.size() != externalConnections.size()) { + connectionsDirty = true; + return true; + } + for (ForgeDirection dir : externalConnections) { + if (!newCons.remove(dir)) { + connectionsDirty = true; + return true; + } + } + if (!newCons.isEmpty()) { + connectionsDirty = true; + return true; + } + return false; + } + + @Override + public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + return onNeighborBlockChange(world.getBlock(tileX, tileY, tileZ)); + } + + @Override + public Collection createCollidables(CacheKey key) { + return Collections.singletonList(new CollidableComponent( + getCollidableType(), + ConduitGeometryUtil.instance.getBoundingBox(getBaseConduitType(), key.dir, key.isStub, key.offset), + key.dir, + null)); + } + + @Override + public Class getCollidableType() { + return getBaseConduitType(); + } + + @Override + public List getCollidableComponents() { + + if (collidables != null && !collidablesDirty) { + return collidables; + } + + List result = new ArrayList(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + Collection col = getCollidables(dir); + if (col != null) { + result.addAll(col); + } + } + collidables = result; + + collidablesDirty = false; + + return result; + } + + protected boolean renderStub(ForgeDirection dir) { + // return getConectionMode(dir) == ConnectionMode.DISABLED; + return false; + } + + private Collection getCollidables(ForgeDirection dir) { + CollidableCache cc = CollidableCache.instance; + Class type = getCollidableType(); + if (isConnectedTo(dir) && getConnectionMode(dir) != ConnectionMode.DISABLED) { + return cc.getCollidables( + cc.createKey(type, getBundle().getOffset(getBaseConduitType(), dir), dir, renderStub(dir)), this); + } + return null; + } + + @Override + public AbstractConduitNetwork createNetworkForType() { + Class type = this.getClass(); + if (IRedstoneConduit.class.isAssignableFrom(type)) { + return new RedstoneConduitNetwork(); + } else if (IPowerConduit.class.isAssignableFrom(type)) { + return new PowerConduitNetwork(); + } else if (StellarEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(StellarEnderLiquidConduit.TYPE); + } else if (MelodicEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(MelodicEnderLiquidConduit.TYPE); + } else if (CrystallinePinkSlimeEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(CrystallinePinkSlimeEnderLiquidConduit.TYPE); + } else if (CrystallineEnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(CrystallineEnderLiquidConduit.TYPE); + } else if (EnderLiquidConduit.class.isAssignableFrom(type)) { + return new EnderLiquidConduitNetwork(EnderLiquidConduit.TYPE); + } else if (AdvancedLiquidConduit.class.isAssignableFrom(type)) { + return new AdvancedLiquidConduitNetwork(); + } else if (ILiquidConduit.class.isAssignableFrom(type)) { + return new LiquidConduitNetwork(); + } else if (IItemConduit.class.isAssignableFrom(type)) { + return new ItemConduitNetwork(); + } else if (IGasConduit.class.isAssignableFrom(type)) { + return new GasConduitNetwork(); + } else if (IMEConduit.class.isAssignableFrom(type)) { + return new MEConduitNetwork(); + } else if (IOCConduit.class.isAssignableFrom(type)) { + return new OCConduitNetwork(); + } else { + return null; + } + } + + @Override + public boolean shouldMirrorTexture() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java index 6400530a..8c1d61a7 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduitNetwork.java @@ -3,101 +3,100 @@ package crazypants.enderio.conduit; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -//I=base type, I is the base class of the implementations accepted by the network +// I=base type, I is the base class of the implementations accepted by the network public abstract class AbstractConduitNetwork { - protected final List conduits = new ArrayList(); + protected final List conduits = new ArrayList(); - protected final Class implClass; - protected final Class baseConduitClass; + protected final Class implClass; + protected final Class baseConduitClass; - protected AbstractConduitNetwork(Class implClass, Class baseConduitClass) { - this.implClass = implClass; - this.baseConduitClass = baseConduitClass; - } - - public void init(IConduitBundle tile, Collection connections, World world) { - - if(world.isRemote) { - throw new UnsupportedOperationException(); + protected AbstractConduitNetwork(Class implClass, Class baseConduitClass) { + this.implClass = implClass; + this.baseConduitClass = baseConduitClass; } - // Destroy all existing redstone networks around this block - for (I con : connections) { - AbstractConduitNetwork network = con.getNetwork(); - if(network != null) { - network.destroyNetwork(); - } - } - setNetwork(world, tile); - notifyNetworkOfUpdate(); - } + public void init(IConduitBundle tile, Collection connections, World world) { - public final Class getBaseConduitType() { - return baseConduitClass; - } - - protected void setNetwork(World world, IConduitBundle tile) { - - T conduit = tile.getConduit(getBaseConduitType()); - - if(conduit != null && implClass.isAssignableFrom(conduit.getClass()) && conduit.setNetwork(this)) { - addConduit(implClass.cast(conduit)); - TileEntity te = tile.getEntity(); - Collection connections = ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, getBaseConduitType()); - for (T con : connections) { - if(con.getNetwork() == null) { - setNetwork(world, con.getBundle()); - } else if(con.getNetwork() != this) { - con.getNetwork().destroyNetwork(); - setNetwork(world, con.getBundle()); + if (world.isRemote) { + throw new UnsupportedOperationException(); } - } + + // Destroy all existing redstone networks around this block + for (I con : connections) { + AbstractConduitNetwork network = con.getNetwork(); + if (network != null) { + network.destroyNetwork(); + } + } + setNetwork(world, tile); + notifyNetworkOfUpdate(); } - } - public void addConduit(I con) { - if(!conduits.contains(con)) { - if(conduits.isEmpty()) { - ConduitNetworkTickHandler.instance.registerNetwork(this); - } - conduits.add(con); + public final Class getBaseConduitType() { + return baseConduitClass; } - } - public void destroyNetwork() { - for (I con : conduits) { - con.setNetwork(null); + protected void setNetwork(World world, IConduitBundle tile) { + + T conduit = tile.getConduit(getBaseConduitType()); + + if (conduit != null && implClass.isAssignableFrom(conduit.getClass()) && conduit.setNetwork(this)) { + addConduit(implClass.cast(conduit)); + TileEntity te = tile.getEntity(); + Collection connections = + ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, getBaseConduitType()); + for (T con : connections) { + if (con.getNetwork() == null) { + setNetwork(world, con.getBundle()); + } else if (con.getNetwork() != this) { + con.getNetwork().destroyNetwork(); + setNetwork(world, con.getBundle()); + } + } + } } - conduits.clear(); - ConduitNetworkTickHandler.instance.unregisterNetwork(this); - } - public List getConduits() { - return conduits; - } - - public void notifyNetworkOfUpdate() { - for (I con : conduits) { - TileEntity te = con.getBundle().getEntity(); - te.getWorldObj().markBlockForUpdate(te.xCoord, te.yCoord, te.zCoord); + public void addConduit(I con) { + if (!conduits.contains(con)) { + if (conduits.isEmpty()) { + ConduitNetworkTickHandler.instance.registerNetwork(this); + } + conduits.add(con); + } } - } - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - for (IConduit con : conduits) { - sb.append(con.getLocation()); - sb.append(", "); + public void destroyNetwork() { + for (I con : conduits) { + con.setNetwork(null); + } + conduits.clear(); + ConduitNetworkTickHandler.instance.unregisterNetwork(this); } - return "AbstractConduitNetwork [conduits=" + sb.toString() + "]"; - } - public void doNetworkTick() { - } + public List getConduits() { + return conduits; + } + + public void notifyNetworkOfUpdate() { + for (I con : conduits) { + TileEntity te = con.getBundle().getEntity(); + te.getWorldObj().markBlockForUpdate(te.xCoord, te.yCoord, te.zCoord); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (IConduit con : conduits) { + sb.append(con.getLocation()); + sb.append(", "); + } + return "AbstractConduitNetwork [conduits=" + sb.toString() + "]"; + } + + public void doNetworkTick() {} } diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 9d5efb8b..84f29d70 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -1,7 +1,15 @@ package crazypants.enderio.conduit; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; import java.util.List; - import mods.immibis.microblocks.api.IMicroblockCoverSystem; import mods.immibis.microblocks.api.IMicroblockSupporterTile; import mods.immibis.microblocks.api.MicroblockAPIUtils; @@ -18,186 +26,195 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Util; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - public abstract class AbstractItemConduit extends Item implements IConduitItem { - protected ModObject modObj; + protected ModObject modObj; - protected ItemConduitSubtype[] subtypes; + protected ItemConduitSubtype[] subtypes; - protected IIcon[] icons; + protected IIcon[] icons; - protected AbstractItemConduit(ModObject modObj, ItemConduitSubtype... subtypes) { - this.modObj = modObj; - this.subtypes = subtypes; - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(modObj.unlocalisedName); - setMaxStackSize(64); - setHasSubtypes(true); - } - - protected void init() { - GameRegistry.registerItem(this, modObj.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - icons = new IIcon[subtypes.length]; - int index = 0; - for (ItemConduitSubtype subtype : subtypes) { - icons[index] = IIconRegister.registerIcon(subtype.iconKey); - index++; + protected AbstractItemConduit(ModObject modObj, ItemConduitSubtype... subtypes) { + this.modObj = modObj; + this.subtypes = subtypes; + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(modObj.unlocalisedName); + setMaxStackSize(64); + setHasSubtypes(true); } - } - @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 (MicroblocksUtil.supportMicroblocks() && tryAddToMicroblocks(stack, player, world, x, y, z, side)) { - return true; + protected void init() { + GameRegistry.registerItem(this, modObj.unlocalisedName); } - - BlockCoord placeAt = Util.canPlaceItem(stack, EnderIO.blockConduitBundle, player, world, x, y, z, side); - if(placeAt != null) { - if(!world.isRemote) { - if(world.setBlock(placeAt.x, placeAt.y, placeAt.z, EnderIO.blockConduitBundle, 0, 1)) { - TileEntity te = world.getTileEntity(placeAt.x, placeAt.y, placeAt.z); - if(te instanceof IConduitBundle) { - IConduitBundle bundle = (IConduitBundle) te; - bundle.addConduit(createConduit(stack, player)); - ConduitUtil.playBreakSound(Block.soundTypeMetal, world, placeAt.x, placeAt.y, placeAt.z); - } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + icons = new IIcon[subtypes.length]; + int index = 0; + for (ItemConduitSubtype subtype : subtypes) { + icons[index] = IIconRegister.registerIcon(subtype.iconKey); + index++; } - } - if(!player.capabilities.isCreativeMode) { - stack.stackSize--; - } - return true; + } - } else { - - ForgeDirection dir = ForgeDirection.values()[side]; - int placeX = x + dir.offsetX; - int placeY = y + dir.offsetY; - int placeZ = z + dir.offsetZ; - - if(world.getBlock(placeX, placeY, placeZ) == EnderIO.blockConduitBundle) { - - IConduitBundle bundle = (TileConduitBundle) world.getTileEntity(placeX, placeY, placeZ); - if(bundle == null) { - System.out.println("AbstractItemConduit.onItemUse: Bundle null"); - return false; + @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 (MicroblocksUtil.supportMicroblocks() && tryAddToMicroblocks(stack, player, world, x, y, z, side)) { + return true; } - if(!bundle.hasType(getBaseConduitType())) { - if(!world.isRemote) { - IConduit con = createConduit(stack, player); - if(con == null) { - System.out.println("AbstractItemConduit.onItemUse: Conduit null."); - return false; + + BlockCoord placeAt = Util.canPlaceItem(stack, EnderIO.blockConduitBundle, player, world, x, y, z, side); + if (placeAt != null) { + if (!world.isRemote) { + if (world.setBlock(placeAt.x, placeAt.y, placeAt.z, EnderIO.blockConduitBundle, 0, 1)) { + TileEntity te = world.getTileEntity(placeAt.x, placeAt.y, placeAt.z); + if (te instanceof IConduitBundle) { + IConduitBundle bundle = (IConduitBundle) te; + bundle.addConduit(createConduit(stack, player)); + ConduitUtil.playBreakSound(Block.soundTypeMetal, world, placeAt.x, placeAt.y, placeAt.z); + } + } } - bundle.addConduit(con); - ConduitUtil.playBreakSound(Block.soundTypeMetal, world, placeX, placeY, placeZ); - if(!player.capabilities.isCreativeMode) { - stack.stackSize--; + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; } - } - return true; - } - } - } + return true; - return false; - } + } else { - private boolean tryAddToMicroblocks(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te.getClass().getName().equals("mods.immibis.microblocks.TileMicroblockContainer")) { - IMicroblockCoverSystem covers = ((IMicroblockSupporterTile) te).getCoverSystem(); - world.setBlock(x, y, z, EnderIO.blockConduitBundle); - EnderIO.blockConduitBundle.onBlockActivated(world, x, y, z, player, side, 0, 0, 0); - IMicroblockCoverSystem newCovers = MicroblockAPIUtils.createMicroblockCoverSystem((IMicroblockSupporterTile) world.getTileEntity(x, y, z)); - for (Part p : covers.getAllParts()) { - newCovers.addPart(p); - } - ((TileConduitBundle)world.getTileEntity(x, y, z)).covers = newCovers; - return true; - } - return false; - } + ForgeDirection dir = ForgeDirection.values()[side]; + int placeX = x + dir.offsetX; + int placeY = y + dir.offsetY; + int placeZ = z + dir.offsetZ; - @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - // Conduit replacement - if (player.isSneaking()) { - return false; - } - TileEntity te = world.getTileEntity(x, y, z); - if (te == null || !(te instanceof IConduitBundle)) { - return false; - } - IConduitBundle bundle = (IConduitBundle) te; - IConduit existingConduit = bundle.getConduit(getBaseConduitType()); - if (existingConduit == null) { - return false; - } - ItemStack existingConduitAsItemStack = existingConduit.createItem(); - if (!ItemUtil.areStacksEqual(existingConduitAsItemStack, stack)) { - if (!world.isRemote) { - IConduit newConduit = createConduit(stack, player); - if (newConduit == null) { - System.out.println("AbstractItemConduit.onItemUse: Conduit null."); - return false; - } - bundle.removeConduit(existingConduit); - bundle.addConduit(newConduit); - if (!player.capabilities.isCreativeMode) { - stack.stackSize--; - for (ItemStack drop : existingConduit.getDrops()) { - if (!player.inventory.addItemStackToInventory(drop)) { - ItemUtil.spawnItemInWorldWithRandomMotion(world, drop, x, y, z); + if (world.getBlock(placeX, placeY, placeZ) == EnderIO.blockConduitBundle) { + + IConduitBundle bundle = (TileConduitBundle) world.getTileEntity(placeX, placeY, placeZ); + if (bundle == null) { + System.out.println("AbstractItemConduit.onItemUse: Bundle null"); + return false; + } + if (!bundle.hasType(getBaseConduitType())) { + if (!world.isRemote) { + IConduit con = createConduit(stack, player); + if (con == null) { + System.out.println("AbstractItemConduit.onItemUse: Conduit null."); + return false; + } + bundle.addConduit(con); + ConduitUtil.playBreakSound(Block.soundTypeMetal, world, placeX, placeY, placeZ); + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; + } + } + return true; + } } - } - player.inventoryContainer.detectAndSendChanges(); } - return true; - } else { - player.swingItem(); - } + + return false; } - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, subtypes.length - 1); - return icons[damage]; - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, subtypes.length - 1); - return subtypes[i].unlocalisedName; - - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < subtypes.length; ++j) { - par3List.add(new ItemStack(this, 1, j)); + private boolean tryAddToMicroblocks( + ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te != null && te.getClass().getName().equals("mods.immibis.microblocks.TileMicroblockContainer")) { + IMicroblockCoverSystem covers = ((IMicroblockSupporterTile) te).getCoverSystem(); + world.setBlock(x, y, z, EnderIO.blockConduitBundle); + EnderIO.blockConduitBundle.onBlockActivated(world, x, y, z, player, side, 0, 0, 0); + IMicroblockCoverSystem newCovers = MicroblockAPIUtils.createMicroblockCoverSystem( + (IMicroblockSupporterTile) world.getTileEntity(x, y, z)); + for (Part p : covers.getAllParts()) { + newCovers.addPart(p); + } + ((TileConduitBundle) world.getTileEntity(x, y, z)).covers = newCovers; + return true; + } + return false; } - } + @Override + public boolean onItemUseFirst( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + // Conduit replacement + if (player.isSneaking()) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te == null || !(te instanceof IConduitBundle)) { + return false; + } + IConduitBundle bundle = (IConduitBundle) te; + IConduit existingConduit = bundle.getConduit(getBaseConduitType()); + if (existingConduit == null) { + return false; + } + ItemStack existingConduitAsItemStack = existingConduit.createItem(); + if (!ItemUtil.areStacksEqual(existingConduitAsItemStack, stack)) { + if (!world.isRemote) { + IConduit newConduit = createConduit(stack, player); + if (newConduit == null) { + System.out.println("AbstractItemConduit.onItemUse: Conduit null."); + return false; + } + bundle.removeConduit(existingConduit); + bundle.addConduit(newConduit); + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; + for (ItemStack drop : existingConduit.getDrops()) { + if (!player.inventory.addItemStackToInventory(drop)) { + ItemUtil.spawnItemInWorldWithRandomMotion(world, drop, x, y, z); + } + } + player.inventoryContainer.detectAndSendChanges(); + } + return true; + } else { + player.swingItem(); + } + } + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, subtypes.length - 1); + return icons[damage]; + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, subtypes.length - 1); + return subtypes[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < subtypes.length; ++j) { + par3List.add(new ItemStack(this, 1, j)); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index e1d8cf9b..aa2880cc 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -1,12 +1,48 @@ package crazypants.enderio.conduit; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; +import crazypants.enderio.conduit.gui.*; +import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot; +import crazypants.enderio.conduit.gui.item.PacketModItemFilter; +import crazypants.enderio.conduit.liquid.PacketFluidLevel; +import crazypants.enderio.conduit.packet.PacketConnectionMode; +import crazypants.enderio.conduit.packet.PacketExtractMode; +import crazypants.enderio.conduit.packet.PacketItemConduitFilter; +import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor; +import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; +import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; +import crazypants.enderio.conduit.packet.PacketRoundRobinMode; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; +import crazypants.enderio.item.IRotatableFacade; +import crazypants.enderio.item.ItemConduitProbe; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.ToolUtil; +import crazypants.util.IFacade; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Random; - -import crazypants.enderio.conduit.gui.*; import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker; import mods.immibis.core.api.multipart.IMultipartSystem; import net.minecraft.block.Block; @@ -33,1105 +69,1163 @@ import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode; import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Util; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.api.tool.ITool; -import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.conduit.geom.ConduitConnectorType; -import crazypants.enderio.conduit.gui.item.PacketExistingItemFilterSnapshot; -import crazypants.enderio.conduit.gui.item.PacketModItemFilter; -import crazypants.enderio.conduit.liquid.PacketFluidLevel; -import crazypants.enderio.conduit.packet.PacketConnectionMode; -import crazypants.enderio.conduit.packet.PacketExtractMode; -import crazypants.enderio.conduit.packet.PacketItemConduitFilter; -import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor; -import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; -import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; -import crazypants.enderio.conduit.packet.PacketRoundRobinMode; -import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; -import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; -import crazypants.enderio.item.IRotatableFacade; -import crazypants.enderio.item.ItemConduitProbe; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.tool.ToolUtil; -import crazypants.util.IFacade; - @Optional.InterfaceList({ - @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = "MineFactoryReloaded"), - @Interface(iface = "mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker", modid = "ImmibisMicroblocks") + @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = "MineFactoryReloaded"), + @Interface(iface = "mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker", modid = "ImmibisMicroblocks") }) -public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade, IRotatableFacade, IRedNetOmniNode, IMultipartRenderingBlockMarker { +public class BlockConduitBundle extends BlockEio + implements IGuiHandler, IFacade, IRotatableFacade, IRedNetOmniNode, IMultipartRenderingBlockMarker { - private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector"; - private static final String KEY_CONNECTOR_ICON_EXTERNAL = "enderIO:conduitConnectorExternal"; + private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector"; + private static final String KEY_CONNECTOR_ICON_EXTERNAL = "enderIO:conduitConnectorExternal"; - public static BlockConduitBundle create() { + public static BlockConduitBundle create() { - MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance); - FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance); + MinecraftForge.EVENT_BUS.register(ConduitNetworkTickHandler.instance); + FMLCommonHandler.instance().bus().register(ConduitNetworkTickHandler.instance); - PacketHandler.INSTANCE.registerMessage(PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketExtractMode.class, PacketExtractMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketExistingItemFilterSnapshot.class, PacketExistingItemFilterSnapshot.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketModItemFilter.class, PacketModItemFilter.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketFluidChannel.class, PacketFluidChannel.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitSignalColor.class, PacketRedstoneConduitSignalColor.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketRedstoneConduitOutputStrength.class, PacketRedstoneConduitOutputStrength.class, PacketHandler.nextID(), - Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketSlotVisibility.class, PacketSlotVisibility.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketOCConduitSignalColor.class, PacketOCConduitSignalColor.class, - PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketRoundRobinMode.class, PacketRoundRobinMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketFluidLevel.class, PacketFluidLevel.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketExtractMode.class, PacketExtractMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketConnectionMode.class, PacketConnectionMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketItemConduitFilter.class, PacketItemConduitFilter.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketExistingItemFilterSnapshot.class, + PacketExistingItemFilterSnapshot.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketModItemFilter.class, PacketModItemFilter.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketFluidFilter.class, PacketFluidFilter.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketFluidChannel.class, PacketFluidChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketRedstoneConduitSignalColor.class, + PacketRedstoneConduitSignalColor.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketRedstoneConduitOutputStrength.class, + PacketRedstoneConduitOutputStrength.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketOpenConduitUI.class, PacketOpenConduitUI.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketSlotVisibility.class, PacketSlotVisibility.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketOCConduitSignalColor.class, + PacketOCConduitSignalColor.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketRoundRobinMode.class, PacketRoundRobinMode.class, PacketHandler.nextID(), Side.SERVER); - BlockConduitBundle result = new BlockConduitBundle(); - result.init(); - MinecraftForge.EVENT_BUS.register(result); - return result; - } - - public static int rendererId = -1; - - private IIcon connectorIcon, connectorIconExternal; - - private IIcon lastRemovedComponetIcon = null; - - private final Random rand = new Random(); - - protected BlockConduitBundle() { - super(ModObject.blockConduitBundle.unlocalisedName, TileConduitBundle.class); - setBlockBounds(0.334f, 0.334f, 0.334f, 0.667f, 0.667f, 0.667f); - setHardness(1.5f); - setResistance(10.0f); - setCreativeTab(null); - this.stepSound = new SoundType("silence", 0, 0) { - @Override - public String getBreakSound() { - return "EnderIO:" + soundName + ".dig"; - } - - @Override - public String getStepResourcePath() { - return "EnderIO:" + soundName + ".step"; - } - }; - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { - if (MicroblocksUtil.supportMicroblocks() && IM__addHitEffects(world, target, effectRenderer)) { - return true; + BlockConduitBundle result = new BlockConduitBundle(); + result.init(); + MinecraftForge.EVENT_BUS.register(result); + return result; } - IIcon tex = null; + public static int rendererId = -1; - TileConduitBundle cb = (TileConduitBundle) world.getTileEntity(target.blockX, target.blockY, target.blockZ); - if(ConduitUtil.isSolidFacadeRendered(cb, Minecraft.getMinecraft().thePlayer)) { - if(cb.getFacadeId() != null) { - tex = cb.getFacadeId().getIcon(target.sideHit, cb.getFacadeMetadata()); - } - } else if(target.hitInfo instanceof CollidableComponent) { - CollidableComponent cc = (CollidableComponent) target.hitInfo; - IConduit con = cb.getConduit(cc.conduitType); - if(con != null) { - tex = con.getTextureForState(cc); - } - } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); - return true; - } + private IIcon connectorIcon, connectorIconExternal; - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - if (MicroblocksUtil.supportMicroblocks() && IM__addDestroyEffects(world, x, y, z, meta, effectRenderer)) { - return true; + private IIcon lastRemovedComponetIcon = null; + + private final Random rand = new Random(); + + protected BlockConduitBundle() { + super(ModObject.blockConduitBundle.unlocalisedName, TileConduitBundle.class); + setBlockBounds(0.334f, 0.334f, 0.334f, 0.667f, 0.667f, 0.667f); + setHardness(1.5f); + setResistance(10.0f); + setCreativeTab(null); + this.stepSound = new SoundType("silence", 0, 0) { + @Override + public String getBreakSound() { + return "EnderIO:" + soundName + ".dig"; + } + + @Override + public String getStepResourcePath() { + return "EnderIO:" + soundName + ".step"; + } + }; } - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); - } - } - } - return true; - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onPlaySound(PlaySoundSourceEvent event) { - String path = event.sound.getPositionedSoundLocation().getResourcePath(); - if ("silence.step".equals(path)) { - ISound snd = event.sound; - World world = EnderIO.proxy.getClientWorld(); - BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF()); - TileEntity te = bc.getTileEntity(world); - if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { - Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); - ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z); - } else { - ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); - } - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) { - String path = event.name; - World world = event.entity.worldObj; - if ("EnderIO:silence.step".equals(path) && world.isRemote) { - BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ); - TileEntity te = bc.getTileEntity(world); - if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { - Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); - ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z); - } else { - ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); - } - } - } - - @Override - protected void init() { - super.init(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this); - } - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this); - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - return getPickBlock(target, world, x, y, z, null); - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { - ItemStack ret = null; - if (MicroblocksUtil.supportMicroblocks()) { - ret = getMicroblockPickBlock(target, world, x, y, z, player); - } - if(ret == null && target != null && target.hitInfo instanceof CollidableComponent) { - CollidableComponent cc = (CollidableComponent) target.hitInfo; - TileConduitBundle bundle = (TileConduitBundle) world.getTileEntity(x, y, z); - IConduit conduit = bundle.getConduit(cc.conduitType); - if(conduit != null) { - ret = conduit.createItem(); - } else if(cc.conduitType == null && bundle.getFacadeId() != null) { - // use the facde - ret = new ItemStack(EnderIO.itemConduitFacade, 1, 0); - PainterUtil.setSourceBlock(ret, bundle.getFacadeId(), bundle.getFacadeMetadata()); - } - } - return ret; - } - - @Override - public int getDamageValue(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return 0; - } - IConduitBundle bun = (IConduitBundle) te; - return bun.getFacadeId() != null ? bun.getFacadeMetadata() : 0; - } - - @Override - public int quantityDropped(Random r) { - return 0; - } - - public IIcon getConnectorIcon(Object data) { - return data == ConduitConnectorType.EXTERNAL ? connectorIconExternal : connectorIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister IIconRegister) { - connectorIcon = IIconRegister.registerIcon(KEY_CONNECTOR_ICON); - connectorIconExternal = IIconRegister.registerIcon(KEY_CONNECTOR_ICON_EXTERNAL); - blockIcon = connectorIcon; - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - if (MicroblocksUtil.supportMicroblocks() && IM__isSideSolid(world, x, y, z, side)) { - return true; - } - - TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof IConduitBundle)) { - return false; - } - IConduitBundle con = (IConduitBundle) te; - return con.hasFacade(); - } - - @Override - public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getRenderType() { - return rendererId; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return super.getLightOpacity(world, x, y, z); - } - IConduitBundle con = (IConduitBundle) te; - return con.getLightOpacity(); - } - - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return super.getLightValue(world, x, y, z); - } - IConduitBundle con = (IConduitBundle) te; - if(con.getFacadeId() != null && con.getFacadeId().isOpaqueCube()) { - return 0; - } - Collection conduits = con.getConduits(); - int result = 0; - for (IConduit conduit : conduits) { - result += conduit.getLightValue(); - } - return result; - } - - @Override - public float getBlockHardness(World world, int x, int y, int z) { - IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); - return te != null && te.getFacadeType() == FacadeType.HARDENED ? blockHardness * 10 : blockHardness; - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - float resist = getExplosionResistance(par1Entity); - IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); - return te != null && te.getFacadeType() == FacadeType.HARDENED ? resist * 10 : resist; - } - - @SubscribeEvent - public void onBreakSpeed(BreakSpeed event) { - if(event.block == this) { - ItemStack held = event.entityPlayer.getCurrentEquippedItem(); - if(held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { - event.newSpeed += 2; - } - IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); - if(te != null && te.getFacadeType() == FacadeType.HARDENED) { - if(!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { - event.newSpeed *= 6; - } else { - event.newSpeed *= 2; - } - } - } - } - - @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return 1; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean canRenderInPass(int pass) { - return pass == 0 || pass == 1; - } - - @Override - public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int par5) { - IRedstoneConduit con = getRedstoneConduit(world, x, y, z); - if(con == null) { - return 0; - } - return con.isProvidingStrongPower(ForgeDirection.getOrientation(par5)); - } - - @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int par5) { - IRedstoneConduit con = getRedstoneConduit(world, x, y, z); - if(con == null) { - return 0; - } - - return con.isProvidingWeakPower(ForgeDirection.getOrientation(par5)); - } - - @Override - public boolean canProvidePower() { - return true; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); - if(te == null) { - return true; - } - - boolean breakBlock = true; - List drop = new ArrayList(); - if(ConduitUtil.isSolidFacadeRendered(te, player)) { - breakBlock = false; - ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal()); - PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata()); - drop.add(fac); - ConduitUtil.playBreakSound(te.getFacadeId().stepSound, world, x, y, z); - te.setFacadeId(null); - te.setFacadeMetadata(0); - te.setFacadeType(FacadeType.BASIC); - } - - if(breakBlock) { - List results = doRayTraceAll(world, x, y, z, player); - RaytraceResult.sort(Util.getEyePosition(player), results); - for (RaytraceResult rt : results) { - if(breakConduit(te, drop, rt, player)) { - break; - } - } - } - - breakBlock = te.getConduits().isEmpty() && !te.hasFacade(); - - if(!breakBlock) { - world.markBlockForUpdate(x, y, z); - } - - // TODO no microblock sounds...not sure if fixable, need to contact immibis - if (MicroblocksUtil.supportMicroblocks()) { - IM__getDrops(drop, world, x, y, z, te.getEntity().getBlockMetadata(), 0); - } - - if (!world.isRemote && !player.capabilities.isCreativeMode) { - for (ItemStack st : drop) { - Util.dropItems(world, st, x, y, z, false); - } - } - - if (breakBlock) { - world.setBlockToAir(x, y, z); - return true; - } - return false; - } - - private boolean breakConduit(IConduitBundle te, List drop, RaytraceResult rt, EntityPlayer player) { - if(rt == null || rt.component == null) { - return false; - } - Class type = rt.component.conduitType; - if(!ConduitUtil.renderConduit(player, type)) { - return false; - } - - if(type == null) { - // broke a conector so drop any conduits with no connections as there - // is no other way to remove these - List cons = new ArrayList(te.getConduits()); - boolean droppedUnconected = false; - for (IConduit con : cons) { - if(con.getConduitConnections().isEmpty() && con.getExternalConnections().isEmpty() && ConduitUtil.renderConduit(player, con)) { - te.removeConduit(con); - drop.addAll(con.getDrops()); - droppedUnconected = true; - } - } - // If there isn't, then drop em all - if(!droppedUnconected) { - for (IConduit con : cons) { - if(ConduitUtil.renderConduit(player, con)) { - te.removeConduit(con); - drop.addAll(con.getDrops()); - } - } - } - } else { - IConduit con = te.getConduit(type); - if(con != null) { - te.removeConduit(con); - drop.addAll(con.getDrops()); - } - } - - BlockCoord bc = te.getLocation(); - ConduitUtil.playBreakSound(Block.soundTypeMetal, te.getWorld(), bc.x, bc.y, bc.z); - - return true; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - TileEntity tile = world.getTileEntity(x, y, z); - if(!(tile instanceof IConduitBundle)) { - return; - } - IConduitBundle te = (IConduitBundle) tile; - te.onBlockRemoved(); - world.removeTileEntity(x, y, z); - } - - @Override - public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { - ItemStack equipped = player.getCurrentEquippedItem(); - if(!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) { - return; - } - ConduitUtil.openConduitGui(world, x, y, z, player); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { - - IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); - if(bundle == null) { - return false; - } - - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.getItem() == EnderIO.itemConduitFacade) { - // add or replace facade - return handleFacadeClick(world, x, y, z, player, side, bundle, stack); - - } else if(ConduitUtil.isConduitEquipped(player)) { - // Add conduit - if(player.isSneaking()) { - return false; - } - if(handleConduitClick(world, x, y, z, player, bundle, stack)) { - return true; - } - - } else if(ConduitUtil.isProbeEquipped(player)) { - //Handle copy / paste of settings - if(handleConduitProbeClick(world, x, y, z, player, bundle, stack)) { - return true; - } - } else if(ToolUtil.isToolEquipped(player) && player.isSneaking()) { - // Break conduit with tool - if(handleWrenchClick(world, x, y, z, player)) { - return true; - } - } - - // Check conduit defined actions - RaytraceResult closest = doRayTrace(world, x, y, z, player); - List all = null; - if(closest != null) { - all = doRayTraceAll(world, x, y, z, player); - } - - if(closest != null && closest.component != null && closest.component.data instanceof ConduitConnectorType) { - - ConduitConnectorType conType = (ConduitConnectorType) closest.component.data; - if(conType == ConduitConnectorType.INTERNAL) { - boolean result = false; - // if its a connector pass the event on to all conduits - for (IConduit con : bundle.getConduits()) { - if(ConduitUtil.renderConduit(player, con.getCollidableType()) - && con.onBlockActivated(player, getHitForConduitType(all, con.getCollidableType()), all)) { - bundle.getEntity().markDirty(); - result = true; - } - - } - if(result) { - return true; - } - } else { - if(!world.isRemote) { - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + closest.component.dir.ordinal(), world, x, y, z); - } - return true; - } - } - - if(closest == null || closest.component == null || closest.component.conduitType == null && all == null) { - // Nothing of interest hit - return false; - } - - // Conduit specific actions - if(all != null) { - RaytraceResult.sort(Util.getEyePosition(player), all); - for (RaytraceResult rr : all) { - if(ConduitUtil.renderConduit(player, rr.component.conduitType) && !(rr.component.data instanceof ConduitConnectorType)) { - - IConduit con = bundle.getConduit(rr.component.conduitType); - if(con != null && con.onBlockActivated(player, rr, all)) { - bundle.getEntity().markDirty(); + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + if (MicroblocksUtil.supportMicroblocks() && IM__addHitEffects(world, target, effectRenderer)) { return true; - } } - } - } else { - IConduit closestConduit = bundle.getConduit(closest.component.conduitType); - if(closestConduit != null && ConduitUtil.renderConduit(player, closestConduit) && closestConduit.onBlockActivated(player, closest, all)) { + + IIcon tex = null; + + TileConduitBundle cb = (TileConduitBundle) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + if (ConduitUtil.isSolidFacadeRendered(cb, Minecraft.getMinecraft().thePlayer)) { + if (cb.getFacadeId() != null) { + tex = cb.getFacadeId().getIcon(target.sideHit, cb.getFacadeMetadata()); + } + } else if (target.hitInfo instanceof CollidableComponent) { + CollidableComponent cc = (CollidableComponent) target.hitInfo; + IConduit con = cb.getConduit(cc.conduitType); + if (con != null) { + tex = con.getTextureForState(cc); + } + } + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + if (MicroblocksUtil.supportMicroblocks() && IM__addDestroyEffects(world, x, y, z, meta, effectRenderer)) { + return true; + } + + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; + } + + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlaySound(PlaySoundSourceEvent event) { + String path = event.sound.getPositionedSoundLocation().getResourcePath(); + if ("silence.step".equals(path)) { + ISound snd = event.sound; + World world = EnderIO.proxy.getClientWorld(); + BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF()); + TileEntity te = bc.getTileEntity(world); + if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { + Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); + ConduitUtil.playHitSound(facade.stepSound, world, bc.x, bc.y, bc.z); + } else { + ConduitUtil.playHitSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); + } + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlaySoundAtEntity(PlaySoundAtEntityEvent event) { + String path = event.name; + World world = event.entity.worldObj; + if ("EnderIO:silence.step".equals(path) && world.isRemote) { + BlockCoord bc = new BlockCoord(event.entity.posX, event.entity.posY - 2, event.entity.posZ); + TileEntity te = bc.getTileEntity(world); + if (te != null && te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) { + Block facade = getFacade(world, bc.x, bc.y, bc.z, -1); + ConduitUtil.playStepSound(facade.stepSound, world, bc.x, bc.y, bc.z); + } else { + ConduitUtil.playStepSound(Block.soundTypeMetal, world, bc.x, bc.y, bc.z); + } + } + } + + @Override + protected void init() { + super.init(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this); + } + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + return getPickBlock(target, world, x, y, z, null); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + ItemStack ret = null; + if (MicroblocksUtil.supportMicroblocks()) { + ret = getMicroblockPickBlock(target, world, x, y, z, player); + } + if (ret == null && target != null && target.hitInfo instanceof CollidableComponent) { + CollidableComponent cc = (CollidableComponent) target.hitInfo; + TileConduitBundle bundle = (TileConduitBundle) world.getTileEntity(x, y, z); + IConduit conduit = bundle.getConduit(cc.conduitType); + if (conduit != null) { + ret = conduit.createItem(); + } else if (cc.conduitType == null && bundle.getFacadeId() != null) { + // use the facde + ret = new ItemStack(EnderIO.itemConduitFacade, 1, 0); + PainterUtil.setSourceBlock(ret, bundle.getFacadeId(), bundle.getFacadeMetadata()); + } + } + return ret; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return 0; + } + IConduitBundle bun = (IConduitBundle) te; + return bun.getFacadeId() != null ? bun.getFacadeMetadata() : 0; + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + public IIcon getConnectorIcon(Object data) { + return data == ConduitConnectorType.EXTERNAL ? connectorIconExternal : connectorIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister IIconRegister) { + connectorIcon = IIconRegister.registerIcon(KEY_CONNECTOR_ICON); + connectorIconExternal = IIconRegister.registerIcon(KEY_CONNECTOR_ICON_EXTERNAL); + blockIcon = connectorIcon; + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + if (MicroblocksUtil.supportMicroblocks() && IM__isSideSolid(world, x, y, z, side)) { + return true; + } + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return false; + } + IConduitBundle con = (IConduitBundle) te; + return con.hasFacade(); + } + + @Override + public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return rendererId; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return super.getLightOpacity(world, x, y, z); + } + IConduitBundle con = (IConduitBundle) te; + return con.getLightOpacity(); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return super.getLightValue(world, x, y, z); + } + IConduitBundle con = (IConduitBundle) te; + if (con.getFacadeId() != null && con.getFacadeId().isOpaqueCube()) { + return 0; + } + Collection conduits = con.getConduits(); + int result = 0; + for (IConduit conduit : conduits) { + result += conduit.getLightValue(); + } + return result; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? blockHardness * 10 : blockHardness; + } + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + float resist = getExplosionResistance(par1Entity); + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? resist * 10 : resist; + } + + @SubscribeEvent + public void onBreakSpeed(BreakSpeed event) { + if (event.block == this) { + ItemStack held = event.entityPlayer.getCurrentEquippedItem(); + if (held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { + event.newSpeed += 2; + } + IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); + if (te != null && te.getFacadeType() == FacadeType.HARDENED) { + if (!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { + event.newSpeed *= 6; + } else { + event.newSpeed *= 2; + } + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean canRenderInPass(int pass) { + return pass == 0 || pass == 1; + } + + @Override + public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int par5) { + IRedstoneConduit con = getRedstoneConduit(world, x, y, z); + if (con == null) { + return 0; + } + return con.isProvidingStrongPower(ForgeDirection.getOrientation(par5)); + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int par5) { + IRedstoneConduit con = getRedstoneConduit(world, x, y, z); + if (con == null) { + return 0; + } + + return con.isProvidingWeakPower(ForgeDirection.getOrientation(par5)); + } + + @Override + public boolean canProvidePower() { + return true; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + if (te == null) { + return true; + } + + boolean breakBlock = true; + List drop = new ArrayList(); + if (ConduitUtil.isSolidFacadeRendered(te, player)) { + breakBlock = false; + ItemStack fac = new ItemStack( + EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal()); + PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata()); + drop.add(fac); + ConduitUtil.playBreakSound(te.getFacadeId().stepSound, world, x, y, z); + te.setFacadeId(null); + te.setFacadeMetadata(0); + te.setFacadeType(FacadeType.BASIC); + } + + if (breakBlock) { + List results = doRayTraceAll(world, x, y, z, player); + RaytraceResult.sort(Util.getEyePosition(player), results); + for (RaytraceResult rt : results) { + if (breakConduit(te, drop, rt, player)) { + break; + } + } + } + + breakBlock = te.getConduits().isEmpty() && !te.hasFacade(); + + if (!breakBlock) { + world.markBlockForUpdate(x, y, z); + } + + // TODO no microblock sounds...not sure if fixable, need to contact immibis + if (MicroblocksUtil.supportMicroblocks()) { + IM__getDrops(drop, world, x, y, z, te.getEntity().getBlockMetadata(), 0); + } + + if (!world.isRemote && !player.capabilities.isCreativeMode) { + for (ItemStack st : drop) { + Util.dropItems(world, st, x, y, z, false); + } + } + + if (breakBlock) { + world.setBlockToAir(x, y, z); + return true; + } + return false; + } + + private boolean breakConduit(IConduitBundle te, List drop, RaytraceResult rt, EntityPlayer player) { + if (rt == null || rt.component == null) { + return false; + } + Class type = rt.component.conduitType; + if (!ConduitUtil.renderConduit(player, type)) { + return false; + } + + if (type == null) { + // broke a conector so drop any conduits with no connections as there + // is no other way to remove these + List cons = new ArrayList(te.getConduits()); + boolean droppedUnconected = false; + for (IConduit con : cons) { + if (con.getConduitConnections().isEmpty() + && con.getExternalConnections().isEmpty() + && ConduitUtil.renderConduit(player, con)) { + te.removeConduit(con); + drop.addAll(con.getDrops()); + droppedUnconected = true; + } + } + // If there isn't, then drop em all + if (!droppedUnconected) { + for (IConduit con : cons) { + if (ConduitUtil.renderConduit(player, con)) { + te.removeConduit(con); + drop.addAll(con.getDrops()); + } + } + } + } else { + IConduit con = te.getConduit(type); + if (con != null) { + te.removeConduit(con); + drop.addAll(con.getDrops()); + } + } + + BlockCoord bc = te.getLocation(); + ConduitUtil.playBreakSound(Block.soundTypeMetal, te.getWorld(), bc.x, bc.y, bc.z); + + return true; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + TileEntity tile = world.getTileEntity(x, y, z); + if (!(tile instanceof IConduitBundle)) { + return; + } + IConduitBundle te = (IConduitBundle) tile; + te.onBlockRemoved(); + world.removeTileEntity(x, y, z); + } + + @Override + public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { + ItemStack equipped = player.getCurrentEquippedItem(); + if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) { + return; + } + ConduitUtil.openConduitGui(world, x, y, z, player); + } + + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { + + IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); + if (bundle == null) { + return false; + } + + ItemStack stack = player.getCurrentEquippedItem(); + if (stack != null && stack.getItem() == EnderIO.itemConduitFacade) { + // add or replace facade + return handleFacadeClick(world, x, y, z, player, side, bundle, stack); + + } else if (ConduitUtil.isConduitEquipped(player)) { + // Add conduit + if (player.isSneaking()) { + return false; + } + if (handleConduitClick(world, x, y, z, player, bundle, stack)) { + return true; + } + + } else if (ConduitUtil.isProbeEquipped(player)) { + // Handle copy / paste of settings + if (handleConduitProbeClick(world, x, y, z, player, bundle, stack)) { + return true; + } + } else if (ToolUtil.isToolEquipped(player) && player.isSneaking()) { + // Break conduit with tool + if (handleWrenchClick(world, x, y, z, player)) { + return true; + } + } + + // Check conduit defined actions + RaytraceResult closest = doRayTrace(world, x, y, z, player); + List all = null; + if (closest != null) { + all = doRayTraceAll(world, x, y, z, player); + } + + if (closest != null && closest.component != null && closest.component.data instanceof ConduitConnectorType) { + + ConduitConnectorType conType = (ConduitConnectorType) closest.component.data; + if (conType == ConduitConnectorType.INTERNAL) { + boolean result = false; + // if its a connector pass the event on to all conduits + for (IConduit con : bundle.getConduits()) { + if (ConduitUtil.renderConduit(player, con.getCollidableType()) + && con.onBlockActivated(player, getHitForConduitType(all, con.getCollidableType()), all)) { + bundle.getEntity().markDirty(); + result = true; + } + } + if (result) { + return true; + } + } else { + if (!world.isRemote) { + player.openGui( + EnderIO.instance, + GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + closest.component.dir.ordinal(), + world, + x, + y, + z); + } + return true; + } + } + + if (closest == null || closest.component == null || closest.component.conduitType == null && all == null) { + // Nothing of interest hit + return false; + } + + // Conduit specific actions + if (all != null) { + RaytraceResult.sort(Util.getEyePosition(player), all); + for (RaytraceResult rr : all) { + if (ConduitUtil.renderConduit(player, rr.component.conduitType) + && !(rr.component.data instanceof ConduitConnectorType)) { + + IConduit con = bundle.getConduit(rr.component.conduitType); + if (con != null && con.onBlockActivated(player, rr, all)) { + bundle.getEntity().markDirty(); + return true; + } + } + } + } else { + IConduit closestConduit = bundle.getConduit(closest.component.conduitType); + if (closestConduit != null + && ConduitUtil.renderConduit(player, closestConduit) + && closestConduit.onBlockActivated(player, closest, all)) { + bundle.getEntity().markDirty(); + return true; + } + } + return false; + } + + private boolean handleWrenchClick(World world, int x, int y, int z, EntityPlayer player) { + ITool tool = ToolUtil.getEquippedTool(player); + if (tool != null) { + if (tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) { + if (!world.isRemote) { + removedByPlayer(world, player, x, y, z, true); + tool.used(player.getCurrentEquippedItem(), player, x, y, z); + } + return true; + } + } + return false; + } + + private boolean handleConduitProbeClick( + World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { + if (stack.getItemDamage() != 1) { + return false; // not in copy paste mode + } + RaytraceResult rr = doRayTrace(world, x, y, z, player); + if (rr == null || rr.component == null) { + return false; + } + return ItemConduitProbe.copyPasteSettings(player, stack, bundle, rr.component.dir); + } + + private boolean handleConduitClick( + World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { + IConduitItem equipped = (IConduitItem) stack.getItem(); + if (!bundle.hasType(equipped.getBaseConduitType())) { + if (!world.isRemote) { + bundle.addConduit(equipped.createConduit(stack, player)); + ConduitUtil.playBreakSound(soundTypeMetal, world, x, y, z); + if (!player.capabilities.isCreativeMode) { + player.getCurrentEquippedItem().stackSize--; + } + } + return true; + } + return false; + } + + public boolean handleFacadeClick( + World world, int x, int y, int z, EntityPlayer player, int side, IConduitBundle bundle, ItemStack stack) { + if (MicroblocksUtil.supportMicroblocks() && hasMicroblocks(bundle)) { + return false; + } + + // Add facade + if (player.isSneaking()) { + return false; + } + + Block facadeID = PainterUtil.getSourceBlock(player.getCurrentEquippedItem()); + if (facadeID == null) { + return false; + } + + int facadeMeta = PainterUtil.getSourceBlockMetadata(player.getCurrentEquippedItem()); + facadeMeta = PainterUtil.adjustFacadeMetadata(facadeID, facadeMeta, side); + int facadeType = player.getCurrentEquippedItem().getItemDamage(); + + if (bundle.hasFacade()) { + if (!ConduitUtil.isSolidFacadeRendered(bundle, player) + || facadeEquals(bundle, facadeID, facadeMeta, facadeType)) { + return false; + } + if (!world.isRemote && !player.capabilities.isCreativeMode) { + ItemStack fac = new ItemStack( + EnderIO.itemConduitFacade, 1, bundle.getFacadeType().ordinal()); + PainterUtil.setSourceBlock(fac, bundle.getFacadeId(), bundle.getFacadeMetadata()); + Util.dropItems(world, fac, x, y, z, false); + } + } + + bundle.setFacadeId(facadeID); + bundle.setFacadeMetadata(facadeMeta); + bundle.setFacadeType(FacadeType.values()[facadeType]); + if (!world.isRemote) { + ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z); + } + if (!player.capabilities.isCreativeMode) { + stack.stackSize--; + } + world.markBlockForUpdate(x, y, z); bundle.getEntity().markDirty(); return true; - } } - return false; - } + private boolean facadeEquals(IConduitBundle bundle, Block facadeID, int facadeMeta, int facadeType) { + return bundle.getFacadeId().equals(facadeID) + && bundle.getFacadeMetadata() == facadeMeta + && bundle.getFacadeType().ordinal() == facadeType; + } - private boolean handleWrenchClick(World world, int x, int y, int z, EntityPlayer player) { - ITool tool = ToolUtil.getEquippedTool(player); - if(tool != null) { - if(tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) { - if(!world.isRemote) { - removedByPlayer(world, player, x, y, z, true); - tool.used(player.getCurrentEquippedItem(), player, x, y, z); + @Override + public boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis) { + IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); + if (bundle == null) { + return false; } + + int oldMeta = bundle.getFacadeMetadata(); + int newMeta = PainterUtil.rotateFacadeMetadata(bundle.getFacadeId(), oldMeta, axis); + if (newMeta == oldMeta) { + return false; + } + + bundle.setFacadeMetadata(newMeta); + world.markBlockForUpdate(x, y, z); + bundle.getEntity().markDirty(); return true; - } } - return false; - } - private boolean handleConduitProbeClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { - if(stack.getItemDamage() != 1) { - return false; //not in copy paste mode - } - RaytraceResult rr = doRayTrace(world, x, y, z, player); - if(rr == null || rr.component == null) { - return false; - } - return ItemConduitProbe.copyPasteSettings(player, stack, bundle, rr.component.dir); - } - - private boolean handleConduitClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { - IConduitItem equipped = (IConduitItem) stack.getItem(); - if(!bundle.hasType(equipped.getBaseConduitType())) { - if(!world.isRemote) { - bundle.addConduit(equipped.createConduit(stack, player)); - ConduitUtil.playBreakSound(soundTypeMetal, world, x, y, z); - if(!player.capabilities.isCreativeMode) { - player.getCurrentEquippedItem().stackSize--; + @Override + public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + if (id == GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR) { + return null; } - } - return true; - } - return false; - } - - public boolean handleFacadeClick(World world, int x, int y, int z, EntityPlayer player, int side, IConduitBundle bundle, ItemStack stack) { - if (MicroblocksUtil.supportMicroblocks() && hasMicroblocks(bundle)) { - return false; + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IConduitBundle) { + return new ExternalConnectionContainer( + player.inventory, + (IConduitBundle) te, + ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); + } + return null; } - // Add facade - if(player.isSneaking()) { - return false; + @Override + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IConduitBundle) { + if (id == GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR) { + return new GuiExternalConnectionSelector((IConduitBundle) te); + } + return new GuiExternalConnection( + player.inventory, + (IConduitBundle) te, + ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); + } + return null; } - Block facadeID = PainterUtil.getSourceBlock(player.getCurrentEquippedItem()); - if(facadeID == null) { - return false; + private RaytraceResult getHitForConduitType(List all, Class collidableType) { + for (RaytraceResult rr : all) { + if (rr.component != null && rr.component.conduitType == collidableType) { + return rr; + } + } + return null; } - int facadeMeta = PainterUtil.getSourceBlockMetadata(player.getCurrentEquippedItem()); - facadeMeta = PainterUtil.adjustFacadeMetadata(facadeID, facadeMeta, side); - int facadeType = player.getCurrentEquippedItem().getItemDamage(); - - if (bundle.hasFacade()) { - if (!ConduitUtil.isSolidFacadeRendered(bundle, player) || facadeEquals(bundle, facadeID, facadeMeta, facadeType)) { - return false; - } - if (!world.isRemote && !player.capabilities.isCreativeMode) { - ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, bundle.getFacadeType().ordinal()); - PainterUtil.setSourceBlock(fac, bundle.getFacadeId(), bundle.getFacadeMetadata()); - Util.dropItems(world, fac, x, y, z, false); - } + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + TileEntity tile = world.getTileEntity(x, y, z); + if ((tile instanceof IConduitBundle)) { + ((IConduitBundle) tile).onNeighborBlockChange(blockId); + } } - bundle.setFacadeId(facadeID); - bundle.setFacadeMetadata(facadeMeta); - bundle.setFacadeType(FacadeType.values()[facadeType]); - if (!world.isRemote) { - ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z); - } - if (!player.capabilities.isCreativeMode) { - stack.stackSize--; - } - world.markBlockForUpdate(x, y, z); - bundle.getEntity().markDirty(); - return true; - } - - private boolean facadeEquals(IConduitBundle bundle, Block facadeID, int facadeMeta, int facadeType) { - return bundle.getFacadeId().equals(facadeID) && bundle.getFacadeMetadata() == facadeMeta - && bundle.getFacadeType().ordinal() == facadeType; - } - - @Override - public boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis) { - IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); - if(bundle == null) { - return false; + @Override + public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + TileEntity conduit = world.getTileEntity(x, y, z); + if (conduit instanceof IConduitBundle) { + ((IConduitBundle) conduit).onNeighborChange(world, x, y, z, tileX, tileY, tileZ); + } } - int oldMeta = bundle.getFacadeMetadata(); - int newMeta = PainterUtil.rotateFacadeMetadata(bundle.getFacadeId(), oldMeta, axis); - if(newMeta == oldMeta) { - return false; - } + @Override + public void addCollisionBoxesToList( + World world, + int x, + int y, + int z, + AxisAlignedBB axisalignedbb, + @SuppressWarnings("rawtypes") List arraylist, + Entity par7Entity) { - bundle.setFacadeMetadata(newMeta); - world.markBlockForUpdate(x, y, z); - bundle.getEntity().markDirty(); - return true; - } + if (MicroblocksUtil.supportMicroblocks()) { + IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } - @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - if(id == GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR) { - return null; - } - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof IConduitBundle) { - return new ExternalConnectionContainer(player.inventory, (IConduitBundle) te, ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); - } - return null; - } + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return; + } + IConduitBundle con = (IConduitBundle) te; + if (con.getFacadeId() != null) { + setBlockBounds(0, 0, 0, 1, 1, 1); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } else { - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof IConduitBundle) { - if(id == GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR) { - return new GuiExternalConnectionSelector((IConduitBundle) te); - } - return new GuiExternalConnection(player.inventory, (IConduitBundle) te, ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); - } - return null; - } + Collection bounds = con.getCollidableComponents(); + for (CollidableComponent bnd : bounds) { + setBlockBounds( + bnd.bound.minX, bnd.bound.minY, bnd.bound.minZ, bnd.bound.maxX, bnd.bound.maxY, bnd.bound.maxZ); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } - private RaytraceResult getHitForConduitType(List all, Class collidableType) { - for (RaytraceResult rr : all) { - if(rr.component != null && rr.component.conduitType == collidableType) { - return rr; - } - } - return null; - } + if (con.getConduits().isEmpty()) { // just in case + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); + } + } - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - TileEntity tile = world.getTileEntity(x, y, z); - if((tile instanceof IConduitBundle)) { - ((IConduitBundle) tile).onNeighborBlockChange(blockId); - } - } - - @Override - public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - TileEntity conduit = world.getTileEntity(x, y, z); - if(conduit instanceof IConduitBundle) { - ((IConduitBundle) conduit).onNeighborChange(world, x, y, z, tileX, tileY, tileZ); - } - } - - @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, @SuppressWarnings("rawtypes") List arraylist, - Entity par7Entity) { - - if (MicroblocksUtil.supportMicroblocks()) { - IM__addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); - } - - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return; - } - IConduitBundle con = (IConduitBundle) te; - if(con.getFacadeId() != null) { - setBlockBounds(0, 0, 0, 1, 1, 1); - super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); - } else { - - Collection bounds = con.getCollidableComponents(); - for (CollidableComponent bnd : bounds) { - setBlockBounds(bnd.bound.minX, bnd.bound.minY, bnd.bound.minZ, bnd.bound.maxX, bnd.bound.maxY, bnd.bound.maxZ); - super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); - } - - if(con.getConduits().isEmpty()) { // just in case setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, par7Entity); - } } - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - - TileEntity te = world.getTileEntity(x, y, z); - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if(!(te instanceof IConduitBundle)) { - return null; - } - IConduitBundle con = (IConduitBundle) te; - - BoundingBox minBB = new BoundingBox(1, 1, 1, 0, 0, 0); - - if(!ConduitUtil.isSolidFacadeRendered(con, EnderIO.proxy.getClientPlayer())) { - - List results = doRayTraceAll(world, x, y, z, player); - Iterator iter = results.iterator(); - while (iter.hasNext()) { - CollidableComponent component = iter.next().component; - if(component == null || (component.conduitType == null && component.data != ConduitConnectorType.EXTERNAL)) { - iter.remove(); + TileEntity te = world.getTileEntity(x, y, z); + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (!(te instanceof IConduitBundle)) { + return null; } - } + IConduitBundle con = (IConduitBundle) te; - // This is an ugly special case, TODO fix this - for (RaytraceResult hit : results) { - IInsulatedRedstoneConduit cond = con.getConduit(IInsulatedRedstoneConduit.class); - if(cond != null && hit.component != null && cond.getExternalConnections().contains(hit.component.dir) && !cond.isSpecialConnection(hit.component.dir) - && hit.component.data == InsulatedRedstoneConduit.COLOR_CONTROLLER_ID) { - minBB = hit.component.bound; + BoundingBox minBB = new BoundingBox(1, 1, 1, 0, 0, 0); + + if (!ConduitUtil.isSolidFacadeRendered(con, EnderIO.proxy.getClientPlayer())) { + + List results = doRayTraceAll(world, x, y, z, player); + Iterator iter = results.iterator(); + while (iter.hasNext()) { + CollidableComponent component = iter.next().component; + if (component == null + || (component.conduitType == null && component.data != ConduitConnectorType.EXTERNAL)) { + iter.remove(); + } + } + + // This is an ugly special case, TODO fix this + for (RaytraceResult hit : results) { + IInsulatedRedstoneConduit cond = con.getConduit(IInsulatedRedstoneConduit.class); + if (cond != null + && hit.component != null + && cond.getExternalConnections().contains(hit.component.dir) + && !cond.isSpecialConnection(hit.component.dir) + && hit.component.data == InsulatedRedstoneConduit.COLOR_CONTROLLER_ID) { + minBB = hit.component.bound; + } + } + + if (!minBB.isValid()) { + RaytraceResult hit = RaytraceResult.getClosestHit(Util.getEyePosition(player), results); + if (hit != null && hit.component != null && hit.component.bound != null) { + minBB = hit.component.bound; + if (hit.component.conduitType == null) { + ForgeDirection dir = hit.component.dir.getOpposite(); + float trans = 0.0125f; + minBB = minBB.translate(dir.offsetX * trans, dir.offsetY * trans, dir.offsetZ * trans); + float scale = 0.7f; + minBB = minBB.scale( + 1 + Math.abs(dir.offsetX) * scale, + 1 + Math.abs(dir.offsetY) * scale, + 1 + Math.abs(dir.offsetZ) * scale); + } else { + minBB = minBB.scale(1.09, 1.09, 1.09); + } + } + } + } else { + minBB = new BoundingBox(0, 0, 0, 1, 1, 1); } - } - if(!minBB.isValid()) { - RaytraceResult hit = RaytraceResult.getClosestHit(Util.getEyePosition(player), results); - if(hit != null && hit.component != null && hit.component.bound != null) { - minBB = hit.component.bound; - if(hit.component.conduitType == null) { - ForgeDirection dir = hit.component.dir.getOpposite(); - float trans = 0.0125f; - minBB = minBB.translate(dir.offsetX * trans, dir.offsetY * trans, dir.offsetZ * trans); - float scale = 0.7f; - minBB = minBB.scale(1 + Math.abs(dir.offsetX) * scale, 1 + Math.abs(dir.offsetY) * scale, 1 + Math.abs(dir.offsetZ) * scale); - } else { - minBB = minBB.scale(1.09, 1.09, 1.09); - } + if (!minBB.isValid()) { + minBB = new BoundingBox(0, 0, 0, 1, 1, 1); } - } - } else { - minBB = new BoundingBox(0, 0, 0, 1, 1, 1); + + return AxisAlignedBB.getBoundingBox( + x + minBB.minX, y + minBB.minY, z + minBB.minZ, x + minBB.maxX, y + minBB.maxY, z + minBB.maxZ); } - if(!minBB.isValid()) { - minBB = new BoundingBox(0, 0, 0, 1, 1, 1); - } + @Override + public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { - return AxisAlignedBB.getBoundingBox(x + minBB.minX, y + minBB.minY, z + minBB.minZ, x + minBB.maxX, y + minBB.maxY, z + minBB.maxZ); - } - - @Override - public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { - - RaytraceResult raytraceResult = doRayTrace(world, x, y, z, origin, direction, null); - MovingObjectPosition ret = null; - if (raytraceResult != null) { - ret = raytraceResult.movingObjectPosition; - if (ret != null) { - ret.hitInfo = raytraceResult.component; - } - } - - if (MicroblocksUtil.supportMicroblocks()) { - return IM__collisionRayTrace(ret, world, x, y, z, origin, direction); - } - - return ret; - } - - public RaytraceResult doRayTrace(World world, int x, int y, int z, EntityPlayer entityPlayer) { - List allHits = doRayTraceAll(world, x, y, z, entityPlayer); - if(allHits == null) { - return null; - } - Vec3 origin = Util.getEyePosition(entityPlayer); - return RaytraceResult.getClosestHit(origin, allHits); - } - - public List doRayTraceAll(World world, int x, int y, int z, EntityPlayer entityPlayer) { - double pitch = Math.toRadians(entityPlayer.rotationPitch); - double yaw = Math.toRadians(entityPlayer.rotationYaw); - - double dirX = -Math.sin(yaw) * Math.cos(pitch); - double dirY = -Math.sin(pitch); - double dirZ = Math.cos(yaw) * Math.cos(pitch); - - double reachDistance = EnderIO.proxy.getReachDistanceForPlayer(entityPlayer); - - Vec3 origin = Util.getEyePosition(entityPlayer); - Vec3 direction = origin.addVector(dirX * reachDistance, dirY * reachDistance, dirZ * reachDistance); - return doRayTraceAll(world, x, y, z, origin, direction, entityPlayer); - } - - private RaytraceResult doRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer entityPlayer) { - List allHits = doRayTraceAll(world, x, y, z, origin, direction, entityPlayer); - if(allHits == null) { - return null; - } - return RaytraceResult.getClosestHit(origin, allHits); - } - - protected List doRayTraceAll(World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer player) { - - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return null; - } - IConduitBundle bundle = (IConduitBundle) te; - List hits = new ArrayList(); - - if(player == null) { - player = EnderIO.proxy.getClientPlayer(); - } - - if(ConduitUtil.isSolidFacadeRendered(bundle, player)) { - setBlockBounds(0, 0, 0, 1, 1, 1); - MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); - if(hitPos != null) { - hits.add(new RaytraceResult(new CollidableComponent(null, BoundingBox.UNIT_CUBE, ForgeDirection.UNKNOWN, null), hitPos)); - } - } else { - ConduitDisplayMode mode = ConduitUtil.getDisplayMode(player); - Collection components = new ArrayList(bundle.getCollidableComponents()); - for (CollidableComponent component : components) { - if((component.conduitType != null || mode == ConduitDisplayMode.ALL) && ConduitUtil.renderConduit(player, component.conduitType)) { - setBlockBounds(component.bound.minX, component.bound.minY, component.bound.minZ, component.bound.maxX, component.bound.maxY, component.bound.maxZ); - MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); - if(hitPos != null) { - hits.add(new RaytraceResult(component, hitPos)); - } + RaytraceResult raytraceResult = doRayTrace(world, x, y, z, origin, direction, null); + MovingObjectPosition ret = null; + if (raytraceResult != null) { + ret = raytraceResult.movingObjectPosition; + if (ret != null) { + ret.hitInfo = raytraceResult.component; + } + } + + if (MicroblocksUtil.supportMicroblocks()) { + return IM__collisionRayTrace(ret, world, x, y, z, origin, direction); + } + + return ret; + } + + public RaytraceResult doRayTrace(World world, int x, int y, int z, EntityPlayer entityPlayer) { + List allHits = doRayTraceAll(world, x, y, z, entityPlayer); + if (allHits == null) { + return null; + } + Vec3 origin = Util.getEyePosition(entityPlayer); + return RaytraceResult.getClosestHit(origin, allHits); + } + + public List doRayTraceAll(World world, int x, int y, int z, EntityPlayer entityPlayer) { + double pitch = Math.toRadians(entityPlayer.rotationPitch); + double yaw = Math.toRadians(entityPlayer.rotationYaw); + + double dirX = -Math.sin(yaw) * Math.cos(pitch); + double dirY = -Math.sin(pitch); + double dirZ = Math.cos(yaw) * Math.cos(pitch); + + double reachDistance = EnderIO.proxy.getReachDistanceForPlayer(entityPlayer); + + Vec3 origin = Util.getEyePosition(entityPlayer); + Vec3 direction = origin.addVector(dirX * reachDistance, dirY * reachDistance, dirZ * reachDistance); + return doRayTraceAll(world, x, y, z, origin, direction, entityPlayer); + } + + private RaytraceResult doRayTrace( + World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer entityPlayer) { + List allHits = doRayTraceAll(world, x, y, z, origin, direction, entityPlayer); + if (allHits == null) { + return null; + } + return RaytraceResult.getClosestHit(origin, allHits); + } + + protected List doRayTraceAll( + World world, int x, int y, int z, Vec3 origin, Vec3 direction, EntityPlayer player) { + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + IConduitBundle bundle = (IConduitBundle) te; + List hits = new ArrayList(); + + if (player == null) { + player = EnderIO.proxy.getClientPlayer(); + } + + if (ConduitUtil.isSolidFacadeRendered(bundle, player)) { + setBlockBounds(0, 0, 0, 1, 1, 1); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult( + new CollidableComponent(null, BoundingBox.UNIT_CUBE, ForgeDirection.UNKNOWN, null), hitPos)); + } + } else { + ConduitDisplayMode mode = ConduitUtil.getDisplayMode(player); + Collection components = + new ArrayList(bundle.getCollidableComponents()); + for (CollidableComponent component : components) { + if ((component.conduitType != null || mode == ConduitDisplayMode.ALL) + && ConduitUtil.renderConduit(player, component.conduitType)) { + setBlockBounds( + component.bound.minX, + component.bound.minY, + component.bound.minZ, + component.bound.maxX, + component.bound.maxY, + component.bound.maxZ); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult(component, hitPos)); + } + } + } + + // safety to prevent unbreakable empty bundles in case of a bug + if (bundle.getConduits().isEmpty() && !ConduitUtil.isFacadeHidden(bundle, player)) { + setBlockBounds(0, 0, 0, 1, 1, 1); + MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); + if (hitPos != null) { + hits.add(new RaytraceResult(null, hitPos)); + } + } } - } - // safety to prevent unbreakable empty bundles in case of a bug - if(bundle.getConduits().isEmpty() && !ConduitUtil.isFacadeHidden(bundle, player)) { setBlockBounds(0, 0, 0, 1, 1, 1); - MovingObjectPosition hitPos = super.collisionRayTrace(world, x, y, z, origin, direction); - if(hitPos != null) { - hits.add(new RaytraceResult(null, hitPos)); + + return hits; + } + + @Override + public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return 0; } - } + IConduitBundle cb = (IConduitBundle) te; + return cb.getFacadeMetadata(); } - setBlockBounds(0, 0, 0, 1, 1, 1); - - return hits; - } - - @Override - public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return 0; - } - IConduitBundle cb = (IConduitBundle) te; - return cb.getFacadeMetadata(); - } - - @Override - public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return this; - } - IConduitBundle cb = (IConduitBundle) te; - Block res = cb.getFacadeId(); - if(res == null) { - return this; - } - return res; - } - - @Override - public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacade(world, x, y, z, side.ordinal()); - } - - @Override - public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacadeMetadata(world, x, y, z, side.ordinal()); - } - - @Override - public boolean supportsVisualConnections() { - return true; - } - - @Override - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues) { - IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); - if(conduit == null) { - return; + @Override + public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return this; + } + IConduitBundle cb = (IConduitBundle) te; + Block res = cb.getFacadeId(); + if (res == null) { + return this; + } + return res; } - conduit.onInputsChanged(world, x, y, z, side, inputValues); - } - - @Override - public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue) { - // Unused because only called in "Single" mode. - } - - @Override - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side) { - IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); - if(conduit == null) { - return null; + @Override + public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacade(world, x, y, z, side.ordinal()); } - return conduit.getOutputValues(world, x, y, z, side); - } - - @Override - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet) { - IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); - if(conduit == null) { - return 0; + @Override + public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacadeMetadata(world, x, y, z, side.ordinal()); } - return conduit.getOutputValue(world, x, y, z, side, subnet); - } - - @Override - @Optional.Method(modid = "MineFactoryReloaded") - public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side) { - IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); - if(conduit == null) { - return RedNetConnectionType.None; + @Override + public boolean supportsVisualConnections() { + return true; } - return conduit.canConnectToExternal(side, false) ? RedNetConnectionType.CableAll : RedNetConnectionType.None; - } - private static IRedstoneConduit getRedstoneConduit(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return null; + @Override + public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues) { + IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); + if (conduit == null) { + return; + } + + conduit.onInputsChanged(world, x, y, z, side, inputValues); } - IConduitBundle bundle = (IConduitBundle) te; - return bundle.getConduit(IRedstoneConduit.class); - } - public ItemStack getMicroblockPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { - return IMultipartSystem.instance.hook_getPickBlock(target, world, x, y, z, player); - } + @Override + public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue) { + // Unused because only called in "Single" mode. + } - // IM Hooks + @Override + public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side) { + IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); + if (conduit == null) { + return null; + } - private boolean IM__isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return IMultipartSystem.instance.hook_isSideSolid(world, x, y, z, side); - } + return conduit.getOutputValues(world, x, y, z, side); + } - @SideOnly(Side.CLIENT) - private boolean IM__addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - return IMultipartSystem.instance.hook_addDestroyEffects(world, x, y, z, meta, effectRenderer); - } + @Override + public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet) { + IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); + if (conduit == null) { + return 0; + } - @SideOnly(Side.CLIENT) - private boolean IM__addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { - return IMultipartSystem.instance.hook_addHitEffects(worldObj, target, effectRenderer); - } + return conduit.getOutputValue(world, x, y, z, side, subnet); + } - private MovingObjectPosition IM__collisionRayTrace(MovingObjectPosition cur, World world, int x, int y, int z, Vec3 src, Vec3 dst) { - return IMultipartSystem.instance.hook_collisionRayTrace(cur, world, x, y, z, src, dst); - } + @Override + @Optional.Method(modid = "MineFactoryReloaded") + public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side) { + IRedstoneConduit conduit = getRedstoneConduit(world, x, y, z); + if (conduit == null) { + return RedNetConnectionType.None; + } + return conduit.canConnectToExternal(side, false) ? RedNetConnectionType.CableAll : RedNetConnectionType.None; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - private void IM__addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity entity) { - IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity); - } + private static IRedstoneConduit getRedstoneConduit(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + IConduitBundle bundle = (IConduitBundle) te; + return bundle.getConduit(IRedstoneConduit.class); + } - private ArrayList IM__getDrops(List cur, World world, int x, int y, int z, int metadata, int fortune) { - return IMultipartSystem.instance.hook_getDrops(cur, world, x, y, z, metadata, fortune); - } + public ItemStack getMicroblockPickBlock( + MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + return IMultipartSystem.instance.hook_getPickBlock(target, world, x, y, z, player); + } - private boolean hasMicroblocks(IConduitBundle bundle) { - return !bundle.getCoverSystem().getAllParts().isEmpty(); - } + // IM Hooks + + private boolean IM__isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return IMultipartSystem.instance.hook_isSideSolid(world, x, y, z, side); + } + + @SideOnly(Side.CLIENT) + private boolean IM__addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + return IMultipartSystem.instance.hook_addDestroyEffects(world, x, y, z, meta, effectRenderer); + } + + @SideOnly(Side.CLIENT) + private boolean IM__addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { + return IMultipartSystem.instance.hook_addHitEffects(worldObj, target, effectRenderer); + } + + private MovingObjectPosition IM__collisionRayTrace( + MovingObjectPosition cur, World world, int x, int y, int z, Vec3 src, Vec3 dst) { + return IMultipartSystem.instance.hook_collisionRayTrace(cur, world, x, y, z, src, dst); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + private void IM__addCollisionBoxesToList( + World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity entity) { + IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity); + } + + private ArrayList IM__getDrops( + List cur, World world, int x, int y, int z, int metadata, int fortune) { + return IMultipartSystem.instance.hook_getDrops(cur, world, x, y, z, metadata, fortune); + } + + private boolean hasMicroblocks(IConduitBundle bundle) { + return !bundle.getCoverSystem().getAllParts().isEmpty(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index 14b5b6d2..aacf08b9 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -1,243 +1,233 @@ package crazypants.enderio.conduit; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; +import static crazypants.enderio.gui.IconEIO.*; import com.enderio.core.api.client.render.IWidgetIcon; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; - import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import static crazypants.enderio.gui.IconEIO.*; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class ConduitDisplayMode { - public static final ConduitDisplayMode ALL = new ConduitDisplayMode("all", TICK, TICK); - public static final ConduitDisplayMode NONE = new ConduitDisplayMode("none", CROSS, CROSS); - - private static final List registrar; + public static final ConduitDisplayMode ALL = new ConduitDisplayMode("all", TICK, TICK); + public static final ConduitDisplayMode NONE = new ConduitDisplayMode("none", CROSS, CROSS); - // @formatter:off - static { - registrar = Lists.newArrayList( - NONE, - ALL, - new ConduitDisplayMode(IItemConduit.class, WRENCH_OVERLAY_ITEM, WRENCH_OVERLAY_ITEM_OFF), - new ConduitDisplayMode(ILiquidConduit.class, WRENCH_OVERLAY_FLUID, WRENCH_OVERLAY_FLUID_OFF), - new ConduitDisplayMode(IPowerConduit.class, WRENCH_OVERLAY_POWER, WRENCH_OVERLAY_POWER_OFF), - new ConduitDisplayMode(IRedstoneConduit.class, WRENCH_OVERLAY_REDSTONE, WRENCH_OVERLAY_REDSTONE_OFF) - ); - } - // @formatter:on + private static final List registrar; - public static void registerDisplayMode(ConduitDisplayMode mode) { - if (!registrar.contains(mode)) { - registrar.add(mode); + // @formatter:off + static { + registrar = Lists.newArrayList( + NONE, + ALL, + new ConduitDisplayMode(IItemConduit.class, WRENCH_OVERLAY_ITEM, WRENCH_OVERLAY_ITEM_OFF), + new ConduitDisplayMode(ILiquidConduit.class, WRENCH_OVERLAY_FLUID, WRENCH_OVERLAY_FLUID_OFF), + new ConduitDisplayMode(IPowerConduit.class, WRENCH_OVERLAY_POWER, WRENCH_OVERLAY_POWER_OFF), + new ConduitDisplayMode(IRedstoneConduit.class, WRENCH_OVERLAY_REDSTONE, WRENCH_OVERLAY_REDSTONE_OFF)); } - } + // @formatter:on - private final Class conduitType; - private final IWidgetIcon widgetSelected, widgetUnselected; - - private String overrideName = null; - - /** - * Use this constructor if you have custom display logic, it will use - * {@code IConduit.class} as the conduitType, and the passed name as the - * override name. - * - * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon) - * - * @param name - * The override name. - * @param widgetSelected - * The widget to render when this type is selected. - * @param widgetUnselected - * The widget to render when this type is unselected. - */ - public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) { - this(IConduit.class, widgetSelected, widgetUnselected); - setName(name); - } - - /** - * Creates a new display mode for any {@link IConduitControl} wrench. Contains - * data about which conduit type this is for, and the icons to render while - * holding the wrench. wrench. - * - * @param conduitType - * The base class for your conduit type, typically an interface (e.g. - * {@code IPowerConduit}). - * @param widgetSelected - * The widget to render when this type is selected. - * @param widgetUnselected - * The widget to render when this type is unselected. - */ - public ConduitDisplayMode(@Nonnull Class conduitType, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) { - this.conduitType = conduitType; - this.widgetSelected = widgetSelected; - this.widgetUnselected = widgetUnselected; - } - - @Nullable - public Class getConduitType() { - return conduitType; - } - - public boolean renderConduit(Class conduitType) { - if (this == ALL) { - return true; - } else if (this == NONE) { - return false; - } else { - return this.conduitType.isAssignableFrom(conduitType); + public static void registerDisplayMode(ConduitDisplayMode mode) { + if (!registrar.contains(mode)) { + registrar.add(mode); + } } - } - @Nonnull - public String getName() { - return overrideName == null ? conduitType.getSimpleName() : overrideName; - } + private final Class conduitType; + private final IWidgetIcon widgetSelected, widgetUnselected; - /** - * The name is null by default, and will use the simple class name of the - * conduit type. - * - * @param name - * The override name to set. - */ - public void setName(@Nullable String name) { - this.overrideName = name; - } + private String overrideName = null; - public IWidgetIcon getWidgetSelected() { - return widgetSelected; - } - - public IWidgetIcon getWidgetUnselected() { - return widgetUnselected; - } - - public static ConduitDisplayMode next(ConduitDisplayMode mode) { - int index = registrar.indexOf(mode) + 1; - if (index >= registrar.size()) { - index = 0; + /** + * Use this constructor if you have custom display logic, it will use + * {@code IConduit.class} as the conduitType, and the passed name as the + * override name. + * + * @see #ConduitDisplayMode(Class, IWidgetIcon, IWidgetIcon) + * + * @param name + * The override name. + * @param widgetSelected + * The widget to render when this type is selected. + * @param widgetUnselected + * The widget to render when this type is unselected. + */ + public ConduitDisplayMode(String name, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) { + this(IConduit.class, widgetSelected, widgetUnselected); + setName(name); } - return registrar.get(index); - } - public static ConduitDisplayMode previous(ConduitDisplayMode mode) { - int index = registrar.indexOf(mode) - 1; - if (index < 0) { - index = registrar.size() - 1; + /** + * Creates a new display mode for any {@link IConduitControl} wrench. Contains + * data about which conduit type this is for, and the icons to render while + * holding the wrench. wrench. + * + * @param conduitType + * The base class for your conduit type, typically an interface (e.g. + * {@code IPowerConduit}). + * @param widgetSelected + * The widget to render when this type is selected. + * @param widgetUnselected + * The widget to render when this type is unselected. + */ + public ConduitDisplayMode( + @Nonnull Class conduitType, IWidgetIcon widgetSelected, IWidgetIcon widgetUnselected) { + this.conduitType = conduitType; + this.widgetSelected = widgetSelected; + this.widgetUnselected = widgetUnselected; } - return registrar.get(index); - } - public static ConduitDisplayMode fromName(String name) { - for (ConduitDisplayMode mode : registrar) { - if (mode.getName().equals(name)) { + @Nullable + public Class getConduitType() { + return conduitType; + } + + public boolean renderConduit(Class conduitType) { + if (this == ALL) { + return true; + } else if (this == NONE) { + return false; + } else { + return this.conduitType.isAssignableFrom(conduitType); + } + } + + @Nonnull + public String getName() { + return overrideName == null ? conduitType.getSimpleName() : overrideName; + } + + /** + * The name is null by default, and will use the simple class name of the + * conduit type. + * + * @param name + * The override name to set. + */ + public void setName(@Nullable String name) { + this.overrideName = name; + } + + public IWidgetIcon getWidgetSelected() { + return widgetSelected; + } + + public IWidgetIcon getWidgetUnselected() { + return widgetUnselected; + } + + public static ConduitDisplayMode next(ConduitDisplayMode mode) { + int index = registrar.indexOf(mode) + 1; + if (index >= registrar.size()) { + index = 0; + } + return registrar.get(index); + } + + public static ConduitDisplayMode previous(ConduitDisplayMode mode) { + int index = registrar.indexOf(mode) - 1; + if (index < 0) { + index = registrar.size() - 1; + } + return registrar.get(index); + } + + public static ConduitDisplayMode fromName(String name) { + for (ConduitDisplayMode mode : registrar) { + if (mode.getName().equals(name)) { + return mode; + } + } + return null; + } + + private static final String NBT_KEY = "enderio.displaymode"; + + public static ConduitDisplayMode getDisplayMode(ItemStack equipped) { + if (equipped == null || !(equipped.getItem() instanceof IConduitControl)) { + return ALL; + } + initDisplayModeTag(equipped); + String name = equipped.stackTagCompound.getString(NBT_KEY); + ConduitDisplayMode mode = fromName(name); + if (mode == null) { // backwards compat + setDisplayMode(equipped, ALL); + return ALL; + } return mode; - } } - return null; - } - private static final String NBT_KEY = "enderio.displaymode"; - - public static ConduitDisplayMode getDisplayMode(ItemStack equipped) { - if (equipped == null || !(equipped.getItem() instanceof IConduitControl)) { - return ALL; + public static void setDisplayMode(ItemStack equipped, ConduitDisplayMode mode) { + if (mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { + return; + } + initDisplayModeTag(equipped); + equipped.stackTagCompound.setString(NBT_KEY, mode.getName()); } - initDisplayModeTag(equipped); - String name = equipped.stackTagCompound.getString(NBT_KEY); - ConduitDisplayMode mode = fromName(name); - if (mode == null) { // backwards compat - setDisplayMode(equipped, ALL); - return ALL; + + private static void initDisplayModeTag(ItemStack stack) { + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + stack.stackTagCompound.setString(NBT_KEY, ConduitDisplayMode.ALL.getName()); + } } - return mode; - } - public static void setDisplayMode(ItemStack equipped, ConduitDisplayMode mode) { - if (mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { - return; + public ConduitDisplayMode next() { + return next(this); } - initDisplayModeTag(equipped); - equipped.stackTagCompound.setString(NBT_KEY, mode.getName()); - } - private static void initDisplayModeTag(ItemStack stack) { - if (stack.stackTagCompound == null) { - stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setString(NBT_KEY, ConduitDisplayMode.ALL.getName()); + public ConduitDisplayMode previous() { + return previous(this); } - } - public ConduitDisplayMode next() { - return next(this); - } + public static int registrySize() { + return registrar.size() - 2; + } - public ConduitDisplayMode previous() { - return previous(this); - } + public static Iterable getRenderableModes() { + return FluentIterable.from(registrar).filter(new Predicate() { + @Override + public boolean apply(ConduitDisplayMode input) { + return input != ALL && input != NONE; + } + }); + } - public static int registrySize() { - return registrar.size() - 2; - } + @Override + public String toString() { + return getName(); + } - public static Iterable getRenderableModes() { - return FluentIterable.from(registrar).filter(new Predicate() { - @Override - public boolean apply(ConduitDisplayMode input) { - return input != ALL && input != NONE; - } - }); - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conduitType == null) ? 0 : conduitType.hashCode()); + result = prime * result + ((overrideName == null) ? 0 : overrideName.hashCode()); + return result; + } - @Override - public String toString() { - return getName(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conduitType == null) ? 0 : conduitType.hashCode()); - result = prime * result + ((overrideName == null) ? 0 : overrideName.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ConduitDisplayMode other = (ConduitDisplayMode) obj; - if (conduitType == null) { - if (other.conduitType != null) - return false; - } else if (!conduitType.equals(other.conduitType)) - return false; - if (overrideName == null) { - if (other.overrideName != null) - return false; - } else if (!overrideName.equals(other.overrideName)) - return false; - return true; - } -} \ No newline at end of file + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + ConduitDisplayMode other = (ConduitDisplayMode) obj; + if (conduitType == null) { + if (other.conduitType != null) return false; + } else if (!conduitType.equals(other.conduitType)) return false; + if (overrideName == null) { + if (other.overrideName != null) return false; + } else if (!overrideName.equals(other.overrideName)) return false; + return true; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java b/src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java index e846d700..dadcece3 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitNetworkTickHandler.java @@ -1,67 +1,65 @@ package crazypants.enderio.conduit; -import java.util.ArrayList; -import java.util.IdentityHashMap; -import java.util.List; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import java.util.ArrayList; +import java.util.IdentityHashMap; +import java.util.List; public class ConduitNetworkTickHandler { - public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler(); + public static final ConduitNetworkTickHandler instance = new ConduitNetworkTickHandler(); - public static interface TickListener { - public void tickStart(TickEvent.ServerTickEvent evt); + public static interface TickListener { + public void tickStart(TickEvent.ServerTickEvent evt); - public void tickEnd(TickEvent.ServerTickEvent evt); - } - - private final List listeners = new ArrayList(); - - private final IdentityHashMap, Boolean> networks = - new IdentityHashMap, Boolean>(); - - public void addListener(TickListener listener) { - listeners.add(listener); - } - - public void removeListener(TickListener listener) { - listeners.remove(listener); - } - - public void registerNetwork(AbstractConduitNetwork cn) { - networks.put(cn, Boolean.TRUE); - } - - public void unregisterNetwork(AbstractConduitNetwork cn) { - networks.remove(cn); - } - - @SubscribeEvent - public void onServerTick(TickEvent.ServerTickEvent event) { - if(event.phase == Phase.START) { - tickStart(event); - } else { - tickEnd(event); + public void tickEnd(TickEvent.ServerTickEvent evt); } - } - public void tickStart(TickEvent.ServerTickEvent event) { - for (TickListener h : listeners) { - h.tickStart(event); - } - } + private final List listeners = new ArrayList(); - public void tickEnd(TickEvent.ServerTickEvent event) { - for (TickListener h : listeners) { - h.tickEnd(event); - } - listeners.clear(); - for(AbstractConduitNetwork cn : networks.keySet()) { - cn.doNetworkTick(); - } - } + private final IdentityHashMap, Boolean> networks = + new IdentityHashMap, Boolean>(); + public void addListener(TickListener listener) { + listeners.add(listener); + } + + public void removeListener(TickListener listener) { + listeners.remove(listener); + } + + public void registerNetwork(AbstractConduitNetwork cn) { + networks.put(cn, Boolean.TRUE); + } + + public void unregisterNetwork(AbstractConduitNetwork cn) { + networks.remove(cn); + } + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == Phase.START) { + tickStart(event); + } else { + tickEnd(event); + } + } + + public void tickStart(TickEvent.ServerTickEvent event) { + for (TickListener h : listeners) { + h.tickStart(event); + } + } + + public void tickEnd(TickEvent.ServerTickEvent event) { + for (TickListener h : listeners) { + h.tickEnd(event); + } + listeners.clear(); + for (AbstractConduitNetwork cn : networks.keySet()) { + cn.doNetworkTick(); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index b1c0dfec..ab121299 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -1,11 +1,11 @@ package crazypants.enderio.conduit; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; +import static crazypants.enderio.ModObject.blockPainter; +import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.Material.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; +import static crazypants.util.RecipeUtil.addShaped; + import appeng.api.AEApi; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; @@ -26,216 +26,658 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; - -import static crazypants.enderio.ModObject.blockPainter; -import static crazypants.enderio.material.Alloy.*; -import static crazypants.enderio.material.endergy.AlloyEndergy.*; -import static crazypants.enderio.material.Material.*; -import static crazypants.util.RecipeUtil.addShaped; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; public class ConduitRecipes { - public static void addRecipes() { + public static void addRecipes() { - //Crafting Components - ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 0); + // Crafting Components + ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 0); - ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); - ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); + ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); + ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); - String crudeSteel = CRUDE_STEEL.getOreIngot(); - String energeticSilver = ENERGETIC_SILVER.getOreIngot(); - String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); - String crystallinePinkSlime = CRYSTALLINE_PINK_SLIME.getOreIngot(); - String melodicAlloy = MELODIC_ALLOY.getOreIngot(); - String stellarAlloy = STELLAR_ALLOY.getOreIngot(); + String crudeSteel = CRUDE_STEEL.getOreIngot(); + String energeticSilver = ENERGETIC_SILVER.getOreIngot(); + String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); + String crystallinePinkSlime = CRYSTALLINE_PINK_SLIME.getOreIngot(); + String melodicAlloy = MELODIC_ALLOY.getOreIngot(); + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); - String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); - String phasedGold = PHASED_GOLD.getOreIngot(); - String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); - String energeticGold = ENERGETIC_ALLOY.getOreIngot(); - String phasedIronNugget = PHASED_IRON_NUGGET.oreDict; - String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); + String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); + String phasedGold = PHASED_GOLD.getOreIngot(); + String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); + String energeticGold = ENERGETIC_ALLOY.getOreIngot(); + String phasedIronNugget = PHASED_IRON_NUGGET.oreDict; + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); - String binder = CONDUIT_BINDER.oreDict; + String binder = CONDUIT_BINDER.oreDict; - ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); - ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal()); + ItemStack zombieController = + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + ItemStack skeletalContractor = + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal()); - //Recipes - addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()), " o ", "oFo", " o ", 'F', - EnderIO.itemConduitFacade, 'o', "dustObsidian")); + // Recipes + addShaped( + new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), + "bbb", + "b b", + "bbb", + 'b', + binder); + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()), + " o ", + "oFo", + " o ", + 'F', + EnderIO.itemConduitFacade, + 'o', + "dustObsidian")); - int numConduits = Config.numConduitsPerRecipe; - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', fusedGlass); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', fusedQuartz); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, EnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', phasedGold); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallineEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', crystallineAlloy); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallinePinkSlimeEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', crystallinePinkSlime); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, MelodicEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', melodicAlloy); - addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, StellarEnderLiquidConduit.METADATA), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', stellarAlloy); - addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 0), "###", '#', redstoneAlloy); - addShaped(new ItemStack(EnderIO.itemRedstoneConduit, 1, 1), "lbl", "bcb", "lbl", 'b', binder, 'c', redstoneConduit, 'l', Blocks.lever); - addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', redstoneAlloy); + int numConduits = Config.numConduitsPerRecipe; + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + fusedGlass); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, 1), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + fusedQuartz); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, EnderLiquidConduit.METADATA), + "bbb", + "#p#", + "bbb", + 'b', + binder, + '#', + fusedQuartz, + 'p', + phasedGold); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallineEnderLiquidConduit.METADATA), + "bbb", + "#p#", + "bbb", + 'b', + binder, + '#', + fusedQuartz, + 'p', + crystallineAlloy); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, CrystallinePinkSlimeEnderLiquidConduit.METADATA), + "bbb", + "#p#", + "bbb", + 'b', + binder, + '#', + fusedQuartz, + 'p', + crystallinePinkSlime); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, MelodicEnderLiquidConduit.METADATA), + "bbb", + "#p#", + "bbb", + 'b', + binder, + '#', + fusedQuartz, + 'p', + melodicAlloy); + addShaped( + new ItemStack(EnderIO.itemLiquidConduit, numConduits, StellarEnderLiquidConduit.METADATA), + "bbb", + "#p#", + "bbb", + 'b', + binder, + '#', + fusedQuartz, + 'p', + stellarAlloy); + addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 0), "###", '#', redstoneAlloy); + addShaped( + new ItemStack(EnderIO.itemRedstoneConduit, 1, 1), + "lbl", + "bcb", + "lbl", + 'b', + binder, + 'c', + redstoneConduit, + 'l', + Blocks.lever); + addShaped( + new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + redstoneAlloy); - if(Config.useHardRecipes) { + if (Config.useHardRecipes) { - ItemStack lastTier; + ItemStack lastTier; - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 0); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + crudeSteel); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 0); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotIron"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 1); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotIron"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 1); - if(OreDictionary.doesOreNameExist("ingotAluminum")||OreDictionary.doesOreNameExist("ingotAluminium")) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminum"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminium"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 2); + if (OreDictionary.doesOreNameExist("ingotAluminum") || OreDictionary.doesOreNameExist("ingotAluminium")) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotAluminum"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotAluminium"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 2); + } + + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotGold"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 3); + + if (OreDictionary.doesOreNameExist("ingotCopper") + && OreDictionary.getOres("ingotCopper").size() > 0) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotCopper"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 4); + } + + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + conductiveIron); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + + if (OreDictionary.doesOreNameExist("ingotSilver")) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotSilver"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 5); + } + + if (OreDictionary.doesOreNameExist("ingotElectrum")) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + "ingotElectrum"); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 6); + } + + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + energeticGold); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 1); + + if (OreDictionary.doesOreNameExist("ingotSilver")) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + energeticSilver); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 7); + } + + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + phasedGold); + lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 2); + + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + crystallineAlloy); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 8); + + if (OreDictionary.doesOreNameExist("slimeballPink")) { + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + crystallinePinkSlime); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 9); + } + + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + melodicAlloy); + lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 10); + + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), + "b#b", + "ccc", + "b#b", + 'c', + lastTier, + 'b', + binder, + '#', + stellarAlloy); + + } else { + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + conductiveIron); + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + energeticGold); + addShaped( + new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + phasedGold); + + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + crudeSteel); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotIron"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotAluminum"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotGold"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotCopper"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotSilver"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + "ingotElectrum"); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + energeticSilver); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + crystallineAlloy); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + crystallinePinkSlime); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + melodicAlloy); + addShaped( + new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), + "bbb", + "###", + "bbb", + 'b', + binder, + '#', + stellarAlloy); + } + if (GasUtil.isGasConduitEnabled()) { + addShaped( + new ItemStack(EnderIO.itemGasConduit, numConduits, 0), + "bbb", + "#g#", + "bbb", + 'b', + binder, + '#', + electricalSteel, + 'g', + fusedGlass); } - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotGold"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 3); + ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); + addShaped(itemConduit, "bbb", "###", "bbb", 'b', binder, '#', phasedIronNugget); - if(OreDictionary.doesOreNameExist("ingotCopper") && OreDictionary.getOres("ingotCopper").size()>0) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotCopper"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 4); - } + MachineRecipeRegistry.instance.registerRecipe( + blockPainter.unlocalisedName, EnderIO.itemConduitFacade.new FacadePainterRecipe()); - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', conductiveIron); - lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + // Filter Recipes + ItemStack basicFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 0); + addShaped(basicFilter, " p ", "php", " p ", 'p', Items.paper, 'h', Blocks.hopper); - if(OreDictionary.doesOreNameExist("ingotSilver")) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotSilver"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 5); - } + ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); + addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone"); - if(OreDictionary.doesOreNameExist("ingotElectrum")) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotElectrum"); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 6); - } + ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0); + addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian"); - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticGold); - lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 1); + ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1); + addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot()); - if(OreDictionary.doesOreNameExist("ingotSilver")) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticSilver); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 7); - } + ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0); + addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench); - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', phasedGold); - lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 2); + ItemStack exFilt = new ItemStack(EnderIO.itemExistingItemFilter); + addShaped( + exFilt, + " r ", + "rfr", + " c ", + 'c', + new ItemStack(Items.comparator, 1, 0), + 'r', + "dustRedstone", + 'f', + advFilter); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallineAlloy); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 8); + ItemStack powerFilt = new ItemStack(EnderIO.itemPowerItemFilter); + addShaped(powerFilt, " p ", "pcp", " p ", 'p', Items.paper, 'c', EnderIO.itemConduitProbe); - if(OreDictionary.doesOreNameExist("slimeballPink")) { - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallinePinkSlime); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 9); - } + ClearFilterRecipe clearRec = new ClearFilterRecipe(); + MinecraftForge.EVENT_BUS.register(clearRec); + GameRegistry.addRecipe(clearRec); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', melodicAlloy); - lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 10); + CopyFilterRecipe copyRec = new CopyFilterRecipe(); + GameRegistry.addRecipe(copyRec); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', stellarAlloy); + ItemStack speedUpgrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 0); + addShaped( + speedUpgrade, + "iii", + "epe", + "ere", + 'p', + Blocks.piston, + 'e', + electricalSteel, + 'r', + Blocks.redstone_torch, + 'i', + "ingotIron"); + ItemStack speedDowngrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 1); + addShaped( + speedDowngrade, + "iii", + "ese", + "ete", + 's', + "slimeball", + 'e', + electricalSteel, + 't', + "stickWood", + 'i', + "ingotIron"); + addShaped( + speedDowngrade, + "iii", + "ese", + "ete", + 's', + "slimeball", + 'e', + electricalSteel, + 't', + "woodStick", + 'i', + "ingotIron"); + + if (MEUtil.isMEEnabled()) { + addAeRecipes(); + } + if (OCUtil.isOCEnabled()) { + addOCRecipes(); + } } - else { - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', conductiveIron); - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', energeticGold); - addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', phasedGold); + private static void addOCRecipes() { + int numConduits = Config.numConduitsPerRecipe; + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); + String binder = CONDUIT_BINDER.oreDict; - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', "ingotIron"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', "ingotAluminum"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "bbb", "###", "bbb", 'b', binder, '#', "ingotGold"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "bbb", "###", "bbb", 'b', binder, '#', "ingotCopper"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "bbb", "###", "bbb", 'b', binder, '#', "ingotSilver"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "bbb", "###", "bbb", 'b', binder, '#', "ingotElectrum"); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "bbb", "###", "bbb", 'b', binder, '#', energeticSilver); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "bbb", "###", "bbb", 'b', binder, '#', crystallineAlloy); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "bbb", "###", "bbb", 'b', binder, '#', crystallinePinkSlime); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "bbb", "###", "bbb", 'b', binder, '#', melodicAlloy); - addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "bbb", "###", "bbb", 'b', binder, '#', stellarAlloy); - - } - if (GasUtil.isGasConduitEnabled()) { - addShaped(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', binder, '#', electricalSteel, 'g', fusedGlass); + addShaped( + new ItemStack(EnderIO.itemOCConduit, numConduits, 0), + "bbb", + "rir", + "bbb", + 'b', + binder, + 'r', + redstoneAlloy, + 'i', + "ingotIron"); } - ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); - addShaped(itemConduit, "bbb", "###", "bbb", 'b', binder, '#', phasedIronNugget); + @Method(modid = "appliedenergistics2") + private static void addAeRecipes() { + String fluix = "crystalFluix"; + String pureFluix = "crystalPureFluix"; - MachineRecipeRegistry.instance.registerRecipe(blockPainter.unlocalisedName, EnderIO.itemConduitFacade.new FacadePainterRecipe()); + ItemStack quartzFiber = + AEApi.instance().parts().partQuartzFiber.stack(1).copy(); + ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal()); + ItemStack res = new ItemStack(EnderIO.itemMEConduit, Config.numConduitsPerRecipe / 2); - //Filter Recipes - ItemStack basicFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 0); - addShaped(basicFilter, " p ", "php", " p ", 'p', Items.paper, 'h', Blocks.hopper); + addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', fluix, 'q', quartzFiber); + addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber); - ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1); - addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone"); - - ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0); - addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian"); - - ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1); - addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot()); - - ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0); - addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench); - - ItemStack exFilt = new ItemStack(EnderIO.itemExistingItemFilter); - addShaped(exFilt, " r ", "rfr", " c ", 'c', new ItemStack(Items.comparator, 1, 0), 'r', "dustRedstone", 'f', advFilter); - - ItemStack powerFilt = new ItemStack(EnderIO.itemPowerItemFilter); - addShaped(powerFilt, " p ", "pcp", " p ", 'p', Items.paper, 'c', EnderIO.itemConduitProbe); - - ClearFilterRecipe clearRec = new ClearFilterRecipe(); - MinecraftForge.EVENT_BUS.register(clearRec); - GameRegistry.addRecipe(clearRec); - - CopyFilterRecipe copyRec = new CopyFilterRecipe(); - GameRegistry.addRecipe(copyRec); - - ItemStack speedUpgrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 0); - addShaped(speedUpgrade, "iii", "epe", "ere", 'p', Blocks.piston, 'e', electricalSteel, 'r', Blocks.redstone_torch, 'i', "ingotIron"); - - ItemStack speedDowngrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 1); - addShaped(speedDowngrade, "iii", "ese", "ete", 's', "slimeball", 'e', electricalSteel, 't', "stickWood", 'i', "ingotIron"); - addShaped(speedDowngrade, "iii", "ese", "ete", 's', "slimeball", 'e', electricalSteel, 't', "woodStick", 'i', "ingotIron"); - - if (MEUtil.isMEEnabled()) { - addAeRecipes(); + res.stackSize = 1; + addShaped(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res); } - if (OCUtil.isOCEnabled()) { - addOCRecipes(); - } - } - - private static void addOCRecipes() { - int numConduits = Config.numConduitsPerRecipe; - String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); - String binder = CONDUIT_BINDER.oreDict; - - addShaped(new ItemStack(EnderIO.itemOCConduit, numConduits, 0), "bbb", "rir", "bbb", 'b', binder, 'r', redstoneAlloy, 'i', - "ingotIron"); - } - - @Method(modid = "appliedenergistics2") - private static void addAeRecipes() { - String fluix = "crystalFluix"; - String pureFluix = "crystalPureFluix"; - - ItemStack quartzFiber = AEApi.instance().parts().partQuartzFiber.stack(1).copy(); - ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal()); - ItemStack res = new ItemStack(EnderIO.itemMEConduit, Config.numConduitsPerRecipe / 2); - - addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', fluix, 'q', quartzFiber); - addShaped(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber); - - res.stackSize = 1; - addShaped(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res); - } } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index cef1625e..4710ceba 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -1,27 +1,7 @@ package crazypants.enderio.conduit; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; - -import net.minecraft.block.Block.SoundType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -38,383 +18,449 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import net.minecraft.block.Block.SoundType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class ConduitUtil { - public static final Random RANDOM = new Random(); + public static final Random RANDOM = new Random(); - @SuppressWarnings({ "rawtypes", "unchecked" }) - public static void ensureValidNetwork(IConduit conduit) { - TileEntity te = conduit.getBundle().getEntity(); - World world = te.getWorldObj(); - Collection connections = ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, conduit.getBaseConduitType()); + @SuppressWarnings({"rawtypes", "unchecked"}) + public static void ensureValidNetwork(IConduit conduit) { + TileEntity te = conduit.getBundle().getEntity(); + World world = te.getWorldObj(); + Collection connections = + ConduitUtil.getConnectedConduits(world, te.xCoord, te.yCoord, te.zCoord, conduit.getBaseConduitType()); - if(reuseNetwork(conduit, connections, world)) { - return; + if (reuseNetwork(conduit, connections, world)) { + return; + } + + AbstractConduitNetwork res = conduit.createNetworkForType(); + res.init(conduit.getBundle(), connections, world); + return; } - AbstractConduitNetwork res = conduit.createNetworkForType(); - res.init(conduit.getBundle(), connections, world); - return; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - private static boolean reuseNetwork(IConduit con, Collection connections, World world) { - AbstractConduitNetwork network = null; - for (IConduit conduit : connections) { - if(network == null) { - network = conduit.getNetwork(); - } else if(network != conduit.getNetwork()) { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static boolean reuseNetwork(IConduit con, Collection connections, World world) { + AbstractConduitNetwork network = null; + for (IConduit conduit : connections) { + if (network == null) { + network = conduit.getNetwork(); + } else if (network != conduit.getNetwork()) { + return false; + } + } + if (network == null) { + return false; + } + if (con.setNetwork(network)) { + network.addConduit(con); + network.notifyNetworkOfUpdate(); + return true; + } return false; - } } - if(network == null) { - return false; - } - if(con.setNetwork(network)) { - network.addConduit(con); - network.notifyNetworkOfUpdate(); - return true; - } - return false; - } - public static void disconectConduits(T con, ForgeDirection connDir) { - con.conduitConnectionRemoved(connDir); - BlockCoord loc = con.getLocation().getLocation(connDir); - IConduit neighbour = ConduitUtil.getConduit(con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType()); - if(neighbour != null) { - neighbour.conduitConnectionRemoved(connDir.getOpposite()); - if(neighbour.getNetwork() != null) { - neighbour.getNetwork().destroyNetwork(); - } - } - if(con.getNetwork() != null) { //this should have been destroyed when destroying the neighbours network but lets just make sure - con.getNetwork().destroyNetwork(); - } - con.connectionsChanged(); - if(neighbour != null) { - neighbour.connectionsChanged(); - } - } - - public static boolean joinConduits(T con, ForgeDirection faceHit) { - BlockCoord loc = con.getLocation().getLocation(faceHit); - IConduit neighbour = ConduitUtil.getConduit(con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType()); - if(neighbour != null && con.canConnectToConduit(faceHit, neighbour) && neighbour.canConnectToConduit(faceHit.getOpposite(), con)) { - con.conduitConnectionAdded(faceHit); - neighbour.conduitConnectionAdded(faceHit.getOpposite()); - if(con.getNetwork() != null) { - con.getNetwork().destroyNetwork(); - } - if(neighbour.getNetwork() != null) { - neighbour.getNetwork().destroyNetwork(); - } - con.connectionsChanged(); - neighbour.connectionsChanged(); - return true; - } - return false; - } - - public static boolean forceSkylightRecalculation(World worldObj, int xCoord, int yCoord, int zCoord) { - int height = worldObj.getHeightValue(xCoord, zCoord); - if(height <= yCoord) { - for (int i = 1; i < 12; i++) { - if(worldObj.isAirBlock(xCoord, yCoord + i, zCoord)) { - //We need to force the re-lighting of the column due to a change - //in the light reaching bellow the block from the sky. To avoid - //modifying core classes to expose this functionality I am just placing then breaking - //a block above this one to force the check - worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.stone, 0, 3); - worldObj.setBlockToAir(xCoord, yCoord + i, zCoord); - - return true; + public static void disconectConduits(T con, ForgeDirection connDir) { + con.conduitConnectionRemoved(connDir); + BlockCoord loc = con.getLocation().getLocation(connDir); + IConduit neighbour = ConduitUtil.getConduit( + con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType()); + if (neighbour != null) { + neighbour.conduitConnectionRemoved(connDir.getOpposite()); + if (neighbour.getNetwork() != null) { + neighbour.getNetwork().destroyNetwork(); + } + } + if (con.getNetwork() + != null) { // this should have been destroyed when destroying the neighbours network but lets just make + // sure + con.getNetwork().destroyNetwork(); + } + con.connectionsChanged(); + if (neighbour != null) { + neighbour.connectionsChanged(); } - } - } - return false; - } - - @SideOnly(Side.CLIENT) - public static FacadeRenderState getRequiredFacadeRenderState(IConduitBundle bundle, EntityPlayer player) { - if(!bundle.hasFacade()) { - return FacadeRenderState.NONE; - } - if(isFacadeHidden(bundle, player)) { - return FacadeRenderState.WIRE_FRAME; - } - return FacadeRenderState.FULL; - } - - public static boolean isSolidFacadeRendered(IConduitBundle bundle, EntityPlayer player) { - return bundle.getFacadeId() != null && !isFacadeHidden(bundle, player); - } - - public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { - return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player); - } - - public static ConduitDisplayMode getDisplayMode(EntityPlayer player) { - player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if(player == null) { - return ConduitDisplayMode.ALL; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return ConduitDisplayMode.ALL; } - ConduitDisplayMode result = ConduitDisplayMode.getDisplayMode(equipped); - if(result == null) { - return ConduitDisplayMode.ALL; + public static boolean joinConduits(T con, ForgeDirection faceHit) { + BlockCoord loc = con.getLocation().getLocation(faceHit); + IConduit neighbour = ConduitUtil.getConduit( + con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, con.getBaseConduitType()); + if (neighbour != null + && con.canConnectToConduit(faceHit, neighbour) + && neighbour.canConnectToConduit(faceHit.getOpposite(), con)) { + con.conduitConnectionAdded(faceHit); + neighbour.conduitConnectionAdded(faceHit.getOpposite()); + if (con.getNetwork() != null) { + con.getNetwork().destroyNetwork(); + } + if (neighbour.getNetwork() != null) { + neighbour.getNetwork().destroyNetwork(); + } + con.connectionsChanged(); + neighbour.connectionsChanged(); + return true; + } + return false; } - return result; - } - public static boolean renderConduit(EntityPlayer player, IConduit con) { - if(player == null || con == null) { - return true; - } - return renderConduit(player, con.getBaseConduitType()); - } + public static boolean forceSkylightRecalculation(World worldObj, int xCoord, int yCoord, int zCoord) { + int height = worldObj.getHeightValue(xCoord, zCoord); + if (height <= yCoord) { + for (int i = 1; i < 12; i++) { + if (worldObj.isAirBlock(xCoord, yCoord + i, zCoord)) { + // We need to force the re-lighting of the column due to a change + // in the light reaching bellow the block from the sky. To avoid + // modifying core classes to expose this functionality I am just placing then breaking + // a block above this one to force the check + worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.stone, 0, 3); + worldObj.setBlockToAir(xCoord, yCoord + i, zCoord); - public static boolean renderConduit(EntityPlayer player, Class conduitType) { - if(player == null || conduitType == null) { - return true; + return true; + } + } + } + return false; } - ConduitDisplayMode mode = getDisplayMode(player); - return mode.renderConduit(conduitType); - } - public static boolean shouldHeldItemHideFacades(EntityPlayer player) { - player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if(player == null) { - return false; + @SideOnly(Side.CLIENT) + public static FacadeRenderState getRequiredFacadeRenderState(IConduitBundle bundle, EntityPlayer player) { + if (!bundle.hasFacade()) { + return FacadeRenderState.NONE; + } + if (isFacadeHidden(bundle, player)) { + return FacadeRenderState.WIRE_FRAME; + } + return FacadeRenderState.FULL; } - ItemStack held = player.getCurrentEquippedItem(); - if(held != null && held.getItem() instanceof IHideFacades) { - return ((IHideFacades) held.getItem()).shouldHideFacades(held, player); - } - return ToolUtil.isToolEquipped(player); - } - public static boolean isConduitEquipped(EntityPlayer player) { - player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if(player == null) { - return false; + public static boolean isSolidFacadeRendered(IConduitBundle bundle, EntityPlayer player) { + return bundle.getFacadeId() != null && !isFacadeHidden(bundle, player); } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() instanceof IConduitItem; - } - public static boolean isProbeEquipped(EntityPlayer player) { - player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if(player == null) { - return false; + public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { + return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player); } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == EnderIO.itemConduitProbe; - } - public static T getConduit(World world, int x, int y, int z, Class type) { - if(world == null || !world.blockExists(x, y, z)) { - return null; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof IConduitBundle) { - IConduitBundle con = (IConduitBundle) te; - return con.getConduit(type); - } - return null; - } - - public static T getConduit(World world, TileEntity te, ForgeDirection dir, Class type) { - return ConduitUtil.getConduit(world, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, type); - } - - public static Collection getConnectedConduits(World world, int x, int y, int z, Class type) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return Collections.emptyList(); - } - List result = new ArrayList(); - IConduitBundle root = (IConduitBundle) te; - T con = root.getConduit(type); - if(con != null) { - for (ForgeDirection dir : con.getConduitConnections()) { - T connected = getConduit(world, root.getEntity(), dir, type); - if(connected != null) { - result.add(connected); + public static ConduitDisplayMode getDisplayMode(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return ConduitDisplayMode.ALL; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return ConduitDisplayMode.ALL; } - } - } - return result; - } - - public static void writeToNBT(IConduit conduit, NBTTagCompound conduitRoot) { - if(conduit == null) { - return; - } - - NBTTagCompound conduitBody = new NBTTagCompound(); - conduit.writeToNBT(conduitBody); - - conduitRoot.setString("conduitType", conduit.getClass().getCanonicalName()); - conduitRoot.setTag("conduit", conduitBody); - } - - public static IConduit readConduitFromNBT(NBTTagCompound conduitRoot, short nbtVersion) { - String typeName = conduitRoot.getString("conduitType"); - NBTTagCompound conduitBody = conduitRoot.getCompoundTag("conduit"); - if(typeName == null || conduitBody == null) { - return null; - } - if ((typeName.contains("conduit.oc") && !OCUtil.isOCEnabled()) || (typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) - || (typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled())) { - return null; - } - if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { - Log.debug("ConduitUtil.readConduitFromNBT: Converted pre 0.7.3 fluid conduit to advanced fluid conduit."); - typeName = "crazypants.enderio.conduit.liquid.AdvancedLiquidConduit"; - } else if ("crazypants.enderio.conduit.liquid.AdvancedEnderLiquidConduit".equals(typeName)) { - Log.debug("ConduitUtil.readConduitFromNBT: Converted advanced ender fluid conduit to crystalline ender fluid conduit."); - typeName = "crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit"; - } - IConduit result; - try { - result = (IConduit) Class.forName(typeName).newInstance(); - } catch (Exception e) { - throw new RuntimeException("Could not create an instance of the conduit with name: " + typeName, e); - } - result.readFromNBT(conduitBody, nbtVersion); - return result; - - } - - public static boolean isRedstoneControlModeMet(IConduitBundle bundle, RedstoneControlMode mode, DyeColor col) { - - if(mode == RedstoneControlMode.IGNORE) { - return true; - } else if(mode == RedstoneControlMode.NEVER) { - return false; - } else if(mode == null) { - return false; - } - - int signalStrength = getInternalSignalForColor(bundle, col); - if(signalStrength < 15 && DyeColor.RED == col && bundle != null && bundle.getEntity() != null) { - TileEntity te = bundle.getEntity(); - signalStrength = Math.max(signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); - } - return RedstoneControlMode.isConditionMet(mode, signalStrength); - } - - public static int getInternalSignalForColor(IConduitBundle bundle, DyeColor col) { - int signalStrength = 0; - if(bundle == null) { - return 0; - } - IRedstoneConduit rsCon = bundle.getConduit(IRedstoneConduit.class); - if(rsCon != null) { - Set signals = rsCon.getNetworkOutputs(ForgeDirection.UNKNOWN); - for (Signal sig : signals) { - if(sig.color == col) { - if(sig.strength > signalStrength) { - signalStrength = sig.strength; - } + ConduitDisplayMode result = ConduitDisplayMode.getDisplayMode(equipped); + if (result == null) { + return ConduitDisplayMode.ALL; } - } + return result; } - return signalStrength; - } - public static boolean isFluidValid(FluidStack fluidStack) { - if(fluidStack != null) { - String name = FluidRegistry.getFluidName(fluidStack); - if(name != null && !name.trim().isEmpty()) { - return true; - } + public static boolean renderConduit(EntityPlayer player, IConduit con) { + if (player == null || con == null) { + return true; + } + return renderConduit(player, con.getBaseConduitType()); } - return false; - } - - public static void openConduitGui(World world, int x, int y, int z, EntityPlayer player) { - TileEntity te = world.getTileEntity(x, y, z); - if(! (te instanceof TileConduitBundle) ) { - return; - } - IConduitBundle cb = (IConduitBundle) te; - Set cons = new HashSet(); - boolean hasInsulated = false; - for (IConduit con : cb.getConduits()) { - cons.addAll(con.getExternalConnections()); - if(con instanceof IInsulatedRedstoneConduit) { - hasInsulated = true; - } - } - if(cons.isEmpty() && !hasInsulated) { - return; - } - if(cons.size() == 1) { - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + cons.iterator().next().ordinal(), world, x, y, z); - return; - } - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, world, x, y, z); - } - public static void playBreakSound(SoundType snd, World world, int x, int y, int z) { - if (!world.isRemote) { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, snd.getBreakSound(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); - } else { - playClientBreakSound(snd); + public static boolean renderConduit(EntityPlayer player, Class conduitType) { + if (player == null || conduitType == null) { + return true; + } + ConduitDisplayMode mode = getDisplayMode(player); + return mode.renderConduit(conduitType); } - } - private static void playClientBreakSound(SoundType snd) { - FMLClientHandler.instance().getClientPlayerEntity().playSound(snd.getBreakSound(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); - } - - public static void playHitSound(SoundType snd, World world, int x, int y, int z) { - if (!world.isRemote) { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); - } else { - playClientHitSound(snd); + public static boolean shouldHeldItemHideFacades(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return false; + } + ItemStack held = player.getCurrentEquippedItem(); + if (held != null && held.getItem() instanceof IHideFacades) { + return ((IHideFacades) held.getItem()).shouldHideFacades(held, player); + } + return ToolUtil.isToolEquipped(player); } - } - private static void playClientHitSound(SoundType snd) { - FMLClientHandler.instance().getClientPlayerEntity().playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch() * 0.5F); - } - - public static void playStepSound(SoundType snd, World world, int x, int y, int z) { - if (!world.isRemote) { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); - } else { - playClientStepSound(snd); + public static boolean isConduitEquipped(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() instanceof IConduitItem; } - } - private static void playClientStepSound(SoundType snd) { - FMLClientHandler.instance().getClientPlayerEntity().playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch()); - } - - public static void playPlaceSound(SoundType snd, World world, int x, int y, int z) { - if (!world.isRemote) { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, snd.func_150496_b(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); - } else { - playClientPlaceSound(snd); + public static boolean isProbeEquipped(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == EnderIO.itemConduitProbe; } - } - private static void playClientPlaceSound(SoundType snd) { - FMLClientHandler.instance().getClientPlayerEntity().playSound(snd.func_150496_b(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch()); - } + public static T getConduit(World world, int x, int y, int z, Class type) { + if (world == null || !world.blockExists(x, y, z)) { + return null; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IConduitBundle) { + IConduitBundle con = (IConduitBundle) te; + return con.getConduit(type); + } + return null; + } + + public static T getConduit(World world, TileEntity te, ForgeDirection dir, Class type) { + return ConduitUtil.getConduit( + world, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, type); + } + + public static Collection getConnectedConduits( + World world, int x, int y, int z, Class type) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return Collections.emptyList(); + } + List result = new ArrayList(); + IConduitBundle root = (IConduitBundle) te; + T con = root.getConduit(type); + if (con != null) { + for (ForgeDirection dir : con.getConduitConnections()) { + T connected = getConduit(world, root.getEntity(), dir, type); + if (connected != null) { + result.add(connected); + } + } + } + return result; + } + + public static void writeToNBT(IConduit conduit, NBTTagCompound conduitRoot) { + if (conduit == null) { + return; + } + + NBTTagCompound conduitBody = new NBTTagCompound(); + conduit.writeToNBT(conduitBody); + + conduitRoot.setString("conduitType", conduit.getClass().getCanonicalName()); + conduitRoot.setTag("conduit", conduitBody); + } + + public static IConduit readConduitFromNBT(NBTTagCompound conduitRoot, short nbtVersion) { + String typeName = conduitRoot.getString("conduitType"); + NBTTagCompound conduitBody = conduitRoot.getCompoundTag("conduit"); + if (typeName == null || conduitBody == null) { + return null; + } + if ((typeName.contains("conduit.oc") && !OCUtil.isOCEnabled()) + || (typeName.contains("conduit.me") && !MEUtil.isMEEnabled()) + || (typeName.contains("conduit.gas") && !GasUtil.isGasConduitEnabled())) { + return null; + } + if (nbtVersion == 0 && "crazypants.enderio.conduit.liquid.LiquidConduit".equals(typeName)) { + Log.debug("ConduitUtil.readConduitFromNBT: Converted pre 0.7.3 fluid conduit to advanced fluid conduit."); + typeName = "crazypants.enderio.conduit.liquid.AdvancedLiquidConduit"; + } else if ("crazypants.enderio.conduit.liquid.AdvancedEnderLiquidConduit".equals(typeName)) { + Log.debug( + "ConduitUtil.readConduitFromNBT: Converted advanced ender fluid conduit to crystalline ender fluid conduit."); + typeName = "crazypants.enderio.conduit.liquid.CrystallineEnderLiquidConduit"; + } + IConduit result; + try { + result = (IConduit) Class.forName(typeName).newInstance(); + } catch (Exception e) { + throw new RuntimeException("Could not create an instance of the conduit with name: " + typeName, e); + } + result.readFromNBT(conduitBody, nbtVersion); + return result; + } + + public static boolean isRedstoneControlModeMet(IConduitBundle bundle, RedstoneControlMode mode, DyeColor col) { + + if (mode == RedstoneControlMode.IGNORE) { + return true; + } else if (mode == RedstoneControlMode.NEVER) { + return false; + } else if (mode == null) { + return false; + } + + int signalStrength = getInternalSignalForColor(bundle, col); + if (signalStrength < 15 && DyeColor.RED == col && bundle != null && bundle.getEntity() != null) { + TileEntity te = bundle.getEntity(); + signalStrength = Math.max( + signalStrength, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); + } + return RedstoneControlMode.isConditionMet(mode, signalStrength); + } + + public static int getInternalSignalForColor(IConduitBundle bundle, DyeColor col) { + int signalStrength = 0; + if (bundle == null) { + return 0; + } + IRedstoneConduit rsCon = bundle.getConduit(IRedstoneConduit.class); + if (rsCon != null) { + Set signals = rsCon.getNetworkOutputs(ForgeDirection.UNKNOWN); + for (Signal sig : signals) { + if (sig.color == col) { + if (sig.strength > signalStrength) { + signalStrength = sig.strength; + } + } + } + } + return signalStrength; + } + + public static boolean isFluidValid(FluidStack fluidStack) { + if (fluidStack != null) { + String name = FluidRegistry.getFluidName(fluidStack); + if (name != null && !name.trim().isEmpty()) { + return true; + } + } + return false; + } + + public static void openConduitGui(World world, int x, int y, int z, EntityPlayer player) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileConduitBundle)) { + return; + } + IConduitBundle cb = (IConduitBundle) te; + Set cons = new HashSet(); + boolean hasInsulated = false; + for (IConduit con : cb.getConduits()) { + cons.addAll(con.getExternalConnections()); + if (con instanceof IInsulatedRedstoneConduit) { + hasInsulated = true; + } + } + if (cons.isEmpty() && !hasInsulated) { + return; + } + if (cons.size() == 1) { + player.openGui( + EnderIO.instance, + GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + + cons.iterator().next().ordinal(), + world, + x, + y, + z); + return; + } + player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, world, x, y, z); + } + + public static void playBreakSound(SoundType snd, World world, int x, int y, int z) { + if (!world.isRemote) { + world.playSoundEffect( + x + 0.5, + y + 0.5, + z + 0.5, + snd.getBreakSound(), + (snd.getVolume() + 1.0F) / 2.0F, + snd.getPitch() * 0.8F); + } else { + playClientBreakSound(snd); + } + } + + private static void playClientBreakSound(SoundType snd) { + FMLClientHandler.instance() + .getClientPlayerEntity() + .playSound(snd.getBreakSound(), (snd.getVolume() + 1.0F) / 2.0F, snd.getPitch() * 0.8F); + } + + public static void playHitSound(SoundType snd, World world, int x, int y, int z) { + if (!world.isRemote) { + world.playSoundEffect( + x + 0.5, + y + 0.5, + z + 0.5, + snd.getStepResourcePath(), + (snd.getVolume() + 1.0F) / 2.0F, + snd.getPitch() * 0.8F); + } else { + playClientHitSound(snd); + } + } + + private static void playClientHitSound(SoundType snd) { + FMLClientHandler.instance() + .getClientPlayerEntity() + .playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch() * 0.5F); + } + + public static void playStepSound(SoundType snd, World world, int x, int y, int z) { + if (!world.isRemote) { + world.playSoundEffect( + x + 0.5, + y + 0.5, + z + 0.5, + snd.getStepResourcePath(), + (snd.getVolume() + 1.0F) / 2.0F, + snd.getPitch() * 0.8F); + } else { + playClientStepSound(snd); + } + } + + private static void playClientStepSound(SoundType snd) { + FMLClientHandler.instance() + .getClientPlayerEntity() + .playSound(snd.getStepResourcePath(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch()); + } + + public static void playPlaceSound(SoundType snd, World world, int x, int y, int z) { + if (!world.isRemote) { + world.playSoundEffect( + x + 0.5, + y + 0.5, + z + 0.5, + snd.func_150496_b(), + (snd.getVolume() + 1.0F) / 2.0F, + snd.getPitch() * 0.8F); + } else { + playClientPlaceSound(snd); + } + } + + private static void playClientPlaceSound(SoundType snd) { + FMLClientHandler.instance() + .getClientPlayerEntity() + .playSound(snd.func_150496_b(), (snd.getVolume() + 1.0F) / 8.0F, snd.getPitch()); + } } diff --git a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java index 519b06d7..423748c7 100644 --- a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java @@ -2,51 +2,49 @@ package crazypants.enderio.conduit; import crazypants.enderio.EnderIO; - public enum ConnectionMode { + IN_OUT("gui.conduit.ioMode.inOut"), + INPUT("gui.conduit.ioMode.input"), + OUTPUT("gui.conduit.ioMode.output"), + DISABLED("gui.conduit.ioMode.disabled"), + NOT_SET("gui.conduit.ioMode.notSet"); - IN_OUT("gui.conduit.ioMode.inOut"), - INPUT("gui.conduit.ioMode.input"), - OUTPUT("gui.conduit.ioMode.output"), - DISABLED("gui.conduit.ioMode.disabled"), - NOT_SET("gui.conduit.ioMode.notSet"); + private final String unlocalisedName; - private final String unlocalisedName; - - ConnectionMode(String unlocalisedName) { - this.unlocalisedName = unlocalisedName; - } - - public String getUnlocalisedName() { - return unlocalisedName; - } - - public static ConnectionMode getNext(ConnectionMode mode) { - int ord = mode.ordinal() + 1; - if(ord >= ConnectionMode.values().length) { - ord = 0; + ConnectionMode(String unlocalisedName) { + this.unlocalisedName = unlocalisedName; } - return ConnectionMode.values()[ord]; - } - public static ConnectionMode getPrevious(ConnectionMode mode) { - - int ord = mode.ordinal() - 1; - if(ord < 0) { - ord = ConnectionMode.values().length - 1; + public String getUnlocalisedName() { + return unlocalisedName; } - return ConnectionMode.values()[ord]; - } - public boolean acceptsInput() { - return this == IN_OUT || this == INPUT; - } + public static ConnectionMode getNext(ConnectionMode mode) { + int ord = mode.ordinal() + 1; + if (ord >= ConnectionMode.values().length) { + ord = 0; + } + return ConnectionMode.values()[ord]; + } - public boolean acceptsOutput() { - return this == IN_OUT || this == OUTPUT; - } + public static ConnectionMode getPrevious(ConnectionMode mode) { - public String getLocalisedName() { - return EnderIO.lang.localize(unlocalisedName); - } + int ord = mode.ordinal() - 1; + if (ord < 0) { + ord = ConnectionMode.values().length - 1; + } + return ConnectionMode.values()[ord]; + } + + public boolean acceptsInput() { + return this == IN_OUT || this == INPUT; + } + + public boolean acceptsOutput() { + return this == IN_OUT || this == OUTPUT; + } + + public String getLocalisedName() { + return EnderIO.lang.localize(unlocalisedName); + } } diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 504d2dd0..a0fdc8e3 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -1,9 +1,11 @@ package crazypants.enderio.conduit; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.enderio.conduit.geom.CollidableComponent; import java.util.Collection; import java.util.List; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,134 +15,128 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; -import crazypants.enderio.conduit.geom.CollidableComponent; - public interface IConduit { - // Base functionality - Class getBaseConduitType(); + // Base functionality + Class getBaseConduitType(); - ItemStack createItem(); - - List getDrops(); + ItemStack createItem(); - int getLightValue(); + List getDrops(); - boolean isActive(); + int getLightValue(); - void setActive(boolean active); + boolean isActive(); - void writeToNBT(NBTTagCompound conduitBody); + void setActive(boolean active); - void readFromNBT(NBTTagCompound conduitBody, short nbtVersion); + void writeToNBT(NBTTagCompound conduitBody); - // Container + void readFromNBT(NBTTagCompound conduitBody, short nbtVersion); - void setBundle(IConduitBundle tileConduitBundle); + // Container - IConduitBundle getBundle(); + void setBundle(IConduitBundle tileConduitBundle); - void onAddedToBundle(); + IConduitBundle getBundle(); - void onRemovedFromBundle(); + void onAddedToBundle(); - BlockCoord getLocation(); + void onRemovedFromBundle(); - // Conections - boolean hasConnections(); + BlockCoord getLocation(); - boolean hasExternalConnections(); + // Conections + boolean hasConnections(); - boolean hasConduitConnections(); + boolean hasExternalConnections(); - // Conduit Connections + boolean hasConduitConnections(); - boolean canConnectToConduit(ForgeDirection direction, IConduit conduit); + // Conduit Connections - Set getConduitConnections(); + boolean canConnectToConduit(ForgeDirection direction, IConduit conduit); - boolean containsConduitConnection(ForgeDirection dir); + Set getConduitConnections(); - void conduitConnectionAdded(ForgeDirection fromDirection); + boolean containsConduitConnection(ForgeDirection dir); - void conduitConnectionRemoved(ForgeDirection fromDirection); + void conduitConnectionAdded(ForgeDirection fromDirection); - void connectionsChanged(); + void conduitConnectionRemoved(ForgeDirection fromDirection); - AbstractConduitNetwork getNetwork(); + void connectionsChanged(); - boolean setNetwork(AbstractConduitNetwork network); + AbstractConduitNetwork getNetwork(); - // External Connections + boolean setNetwork(AbstractConduitNetwork network); - boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode); + // External Connections - Set getExternalConnections(); + boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode); - boolean containsExternalConnection(ForgeDirection dir); + Set getExternalConnections(); - void externalConnectionAdded(ForgeDirection fromDirection); + boolean containsExternalConnection(ForgeDirection dir); - void externalConnectionRemoved(ForgeDirection fromDirection); + void externalConnectionAdded(ForgeDirection fromDirection); - boolean isConnectedTo(ForgeDirection dir); + void externalConnectionRemoved(ForgeDirection fromDirection); - ConnectionMode getConnectionMode(ForgeDirection dir); + boolean isConnectedTo(ForgeDirection dir); - void setConnectionMode(ForgeDirection dir, ConnectionMode mode); + ConnectionMode getConnectionMode(ForgeDirection dir); - boolean hasConnectionMode(ConnectionMode mode); + void setConnectionMode(ForgeDirection dir, ConnectionMode mode); - ConnectionMode getNextConnectionMode(ForgeDirection dir); + boolean hasConnectionMode(ConnectionMode mode); - ConnectionMode getPreviousConnectionMode(ForgeDirection dir); + ConnectionMode getNextConnectionMode(ForgeDirection dir); - // rendering, only needed us default rendering is used + ConnectionMode getPreviousConnectionMode(ForgeDirection dir); - IIcon getTextureForState(CollidableComponent component); + // rendering, only needed us default rendering is used - IIcon getTransmitionTextureForState(CollidableComponent component); + IIcon getTextureForState(CollidableComponent component); - float getTransmitionGeometryScale(); + IIcon getTransmitionTextureForState(CollidableComponent component); - float getSelfIlluminationForState(CollidableComponent component); + float getTransmitionGeometryScale(); - // geometry + float getSelfIlluminationForState(CollidableComponent component); - boolean haveCollidablesChangedSinceLastCall(); + // geometry - Collection getCollidableComponents(); + boolean haveCollidablesChangedSinceLastCall(); - Collection createCollidables(CacheKey key); + Collection getCollidableComponents(); - Class getCollidableType(); + Collection createCollidables(CacheKey key); - // Actions + Class getCollidableType(); - boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all); + // Actions - void onChunkUnload(World worldObj); + boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all); - void updateEntity(World worldObj); + void onChunkUnload(World worldObj); - boolean onNeighborBlockChange(Block blockId); - - boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); + void updateEntity(World worldObj); - //For Copy/Paste of connection settings - boolean writeConnectionSettingsToNBT(ForgeDirection dir, NBTTagCompound nbt); + boolean onNeighborBlockChange(Block blockId); - boolean readConduitSettingsFromNBT(ForgeDirection dir, NBTTagCompound nbt); - - public AbstractConduitNetwork createNetworkForType(); + boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); - /** - * Should the texture of the conduit connectors be mirrored around the conduit - * node? - */ - boolean shouldMirrorTexture(); + // For Copy/Paste of connection settings + boolean writeConnectionSettingsToNBT(ForgeDirection dir, NBTTagCompound nbt); + boolean readConduitSettingsFromNBT(ForgeDirection dir, NBTTagCompound nbt); + + public AbstractConduitNetwork createNetworkForType(); + + /** + * Should the texture of the conduit connectors be mirrored around the conduit + * node? + */ + boolean shouldMirrorTexture(); } diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 66d0f8d9..e0a245e8 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -1,25 +1,8 @@ package crazypants.enderio.conduit; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import li.cil.oc.api.network.Environment; -import li.cil.oc.api.network.SidedEnvironment; -import li.cil.oc.api.network.Node; -import mekanism.api.gas.IGasHandler; -import mods.immibis.microblocks.api.IMicroblockSupporterTile; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidHandler; import appeng.api.networking.IGridHost; import cofh.api.transport.IItemDuct; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.relauncher.Side; @@ -28,6 +11,19 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; +import mekanism.api.gas.IGasHandler; +import mods.immibis.microblocks.api.IMicroblockSupporterTile; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), @@ -36,89 +32,96 @@ import crazypants.enderio.power.IInternalPowerHandler; @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") }) -public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost, - IMicroblockSupporterTile, Environment, SidedEnvironment { +public interface IConduitBundle + extends IInternalPowerHandler, + IFluidHandler, + IItemDuct, + IGasHandler, + IGridHost, + IMicroblockSupporterTile, + Environment, + SidedEnvironment { - TileEntity getEntity(); + TileEntity getEntity(); - @Override - BlockCoord getLocation(); + @Override + BlockCoord getLocation(); - // conduits + // conduits - boolean hasType(Class type); + boolean hasType(Class type); - T getConduit(Class type); + T getConduit(Class type); - void addConduit(IConduit conduit); + void addConduit(IConduit conduit); - void removeConduit(IConduit conduit); + void removeConduit(IConduit conduit); - Collection getConduits(); + Collection getConduits(); - Offset getOffset(Class type, ForgeDirection dir); + Offset getOffset(Class type, ForgeDirection dir); - // connections + // connections - Set getConnections(Class type); + Set getConnections(Class type); - boolean containsConnection(Class type, ForgeDirection west); + boolean containsConnection(Class type, ForgeDirection west); - Set getAllConnections(); + Set getAllConnections(); - boolean containsConnection(ForgeDirection dir); + boolean containsConnection(ForgeDirection dir); - //geometry + // geometry - List getCollidableComponents(); + List getCollidableComponents(); - List getConnectors(); + List getConnectors(); - // events + // events - void onNeighborBlockChange(Block blockId); - - void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); + void onNeighborBlockChange(Block blockId); - void onBlockRemoved(); + void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ); - void dirty(); + void onBlockRemoved(); - // Facade + void dirty(); - enum FacadeRenderState { - NONE, - FULL, - WIRE_FRAME - } + // Facade - @SideOnly(Side.CLIENT) - FacadeRenderState getFacadeRenderedAs(); + enum FacadeRenderState { + NONE, + FULL, + WIRE_FRAME + } - @SideOnly(Side.CLIENT) - void setFacadeRenderAs(FacadeRenderState state); + @SideOnly(Side.CLIENT) + FacadeRenderState getFacadeRenderedAs(); - int getLightOpacity(); + @SideOnly(Side.CLIENT) + void setFacadeRenderAs(FacadeRenderState state); - void setLightOpacity(int opacity); + int getLightOpacity(); - boolean hasFacade(); + void setLightOpacity(int opacity); - void setFacadeId(Block block); + boolean hasFacade(); - void setFacadeId(Block block, boolean triggerUpdate); + void setFacadeId(Block block); - void setFacadeMetadata(int meta); + void setFacadeId(Block block, boolean triggerUpdate); - void setFacadeType(FacadeType type); + void setFacadeMetadata(int meta); - Block getFacadeId(); + void setFacadeType(FacadeType type); - int getFacadeMetadata(); + Block getFacadeId(); - FacadeType getFacadeType(); + int getFacadeMetadata(); - World getWorld(); + FacadeType getFacadeType(); - void setGridNode(Object node); + World getWorld(); + + void setGridNode(Object node); } diff --git a/src/main/java/crazypants/enderio/conduit/IConduitItem.java b/src/main/java/crazypants/enderio/conduit/IConduitItem.java index 83384254..52b6b328 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitItem.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitItem.java @@ -1,13 +1,12 @@ package crazypants.enderio.conduit; +import crazypants.enderio.api.tool.IHideFacades; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import crazypants.enderio.api.tool.IHideFacades; public interface IConduitItem extends IHideFacades { - Class getBaseConduitType(); - - IConduit createConduit(ItemStack item, EntityPlayer player); + Class getBaseConduitType(); + IConduit createConduit(ItemStack item, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/conduit/IExtractor.java b/src/main/java/crazypants/enderio/conduit/IExtractor.java index 7cca6a84..f6d8863f 100644 --- a/src/main/java/crazypants/enderio/conduit/IExtractor.java +++ b/src/main/java/crazypants/enderio/conduit/IExtractor.java @@ -1,19 +1,16 @@ package crazypants.enderio.conduit; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.machine.RedstoneControlMode; +import net.minecraftforge.common.util.ForgeDirection; public interface IExtractor extends IConduit { - void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir); + void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir); - RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir); + RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir); - void setExtractionSignalColor(ForgeDirection dir, DyeColor col); - - DyeColor getExtractionSignalColor(ForgeDirection dir); + void setExtractionSignalColor(ForgeDirection dir, DyeColor col); + DyeColor getExtractionSignalColor(ForgeDirection dir); } diff --git a/src/main/java/crazypants/enderio/conduit/ItemConduitSubtype.java b/src/main/java/crazypants/enderio/conduit/ItemConduitSubtype.java index 29f4bada..fa48402d 100644 --- a/src/main/java/crazypants/enderio/conduit/ItemConduitSubtype.java +++ b/src/main/java/crazypants/enderio/conduit/ItemConduitSubtype.java @@ -2,13 +2,12 @@ package crazypants.enderio.conduit; public class ItemConduitSubtype { - public final String unlocalisedName; + public final String unlocalisedName; - public final String iconKey; - - public ItemConduitSubtype(String unlocalisedName, String iconKey) { - this.unlocalisedName = "enderio." + unlocalisedName; - this.iconKey = iconKey; - } + public final String iconKey; + public ItemConduitSubtype(String unlocalisedName, String iconKey) { + this.unlocalisedName = "enderio." + unlocalisedName; + this.iconKey = iconKey; + } } diff --git a/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java b/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java index e76b71a1..6bd02d14 100644 --- a/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java +++ b/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java @@ -1,40 +1,40 @@ package crazypants.enderio.conduit; -import mods.immibis.microblocks.api.EnumPosition; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional.Method; +import mods.immibis.microblocks.api.EnumPosition; +import net.minecraftforge.common.util.ForgeDirection; public class MicroblocksUtil { - private static boolean useCheckPerformed = false; - private static boolean supportMicroblocks = false; + private static boolean useCheckPerformed = false; + private static boolean supportMicroblocks = false; - public static boolean supportMicroblocks() { - if (!useCheckPerformed) { - supportMicroblocks = Loader.isModLoaded("ImmibisMicroblocks"); - useCheckPerformed = true; + public static boolean supportMicroblocks() { + if (!useCheckPerformed) { + supportMicroblocks = Loader.isModLoaded("ImmibisMicroblocks"); + useCheckPerformed = true; + } + return supportMicroblocks; } - return supportMicroblocks; - } - - @Method(modid = "ImmibisMicroblocks") - public static ForgeDirection posToDir(EnumPosition pos) { - switch(pos) { - case FaceNX: - return ForgeDirection.WEST; - case FaceNY: - return ForgeDirection.DOWN; - case FaceNZ: - return ForgeDirection.NORTH; - case FacePX: - return ForgeDirection.EAST; - case FacePY: - return ForgeDirection.UP; - case FacePZ: - return ForgeDirection.SOUTH; - default: - return null; + + @Method(modid = "ImmibisMicroblocks") + public static ForgeDirection posToDir(EnumPosition pos) { + switch (pos) { + case FaceNX: + return ForgeDirection.WEST; + case FaceNY: + return ForgeDirection.DOWN; + case FaceNZ: + return ForgeDirection.NORTH; + case FacePX: + return ForgeDirection.EAST; + case FacePY: + return ForgeDirection.UP; + case FacePZ: + return ForgeDirection.SOUTH; + default: + return null; + } } - } } diff --git a/src/main/java/crazypants/enderio/conduit/RaytraceResult.java b/src/main/java/crazypants/enderio/conduit/RaytraceResult.java index d13039d9..12249081 100644 --- a/src/main/java/crazypants/enderio/conduit/RaytraceResult.java +++ b/src/main/java/crazypants/enderio/conduit/RaytraceResult.java @@ -1,58 +1,56 @@ package crazypants.enderio.conduit; +import crazypants.enderio.conduit.geom.CollidableComponent; import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; - import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; -import crazypants.enderio.conduit.geom.CollidableComponent; public class RaytraceResult { - public static RaytraceResult getClosestHit(Vec3 origin, Collection candidates) { - double minLengthSquared = Double.POSITIVE_INFINITY; - RaytraceResult closest = null; + public static RaytraceResult getClosestHit(Vec3 origin, Collection candidates) { + double minLengthSquared = Double.POSITIVE_INFINITY; + RaytraceResult closest = null; - for (RaytraceResult candidate : candidates) { - MovingObjectPosition hit = candidate.movingObjectPosition; - if(hit != null) { - double lengthSquared = hit.hitVec.squareDistanceTo(origin); - if(lengthSquared < minLengthSquared) { - minLengthSquared = lengthSquared; - closest = candidate; + for (RaytraceResult candidate : candidates) { + MovingObjectPosition hit = candidate.movingObjectPosition; + if (hit != null) { + double lengthSquared = hit.hitVec.squareDistanceTo(origin); + if (lengthSquared < minLengthSquared) { + minLengthSquared = lengthSquared; + closest = candidate; + } + } } - } + return closest; } - return closest; - } - public static void sort(final Vec3 origin, List toSort) { - if(origin == null || toSort == null) { - return; + public static void sort(final Vec3 origin, List toSort) { + if (origin == null || toSort == null) { + return; + } + Collections.sort(toSort, new Comparator() { + @Override + public int compare(RaytraceResult o1, RaytraceResult o2) { + return Double.compare(o1.getDistanceTo(origin), o2.getDistanceTo(origin)); + } + }); } - Collections.sort(toSort, new Comparator() { - @Override - public int compare(RaytraceResult o1, RaytraceResult o2) { - return Double.compare(o1.getDistanceTo(origin), o2.getDistanceTo(origin)); - } - }); - } - public final CollidableComponent component; - public final MovingObjectPosition movingObjectPosition; + public final CollidableComponent component; + public final MovingObjectPosition movingObjectPosition; - public RaytraceResult(CollidableComponent component, MovingObjectPosition movingObjectPosition) { - this.component = component; - this.movingObjectPosition = movingObjectPosition; - } - - public double getDistanceTo(Vec3 origin) { - if(movingObjectPosition == null || origin == null) { - return Double.MAX_VALUE; + public RaytraceResult(CollidableComponent component, MovingObjectPosition movingObjectPosition) { + this.component = component; + this.movingObjectPosition = movingObjectPosition; } - return movingObjectPosition.hitVec.squareDistanceTo(origin); - } + public double getDistanceTo(Vec3 origin) { + if (movingObjectPosition == null || origin == null) { + return Double.MAX_VALUE; + } + return movingObjectPosition.hitVec.squareDistanceTo(origin); + } } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index c9fc97d7..ac1b2aeb 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -1,45 +1,8 @@ package crazypants.enderio.conduit; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import li.cil.oc.api.network.Message; -import li.cil.oc.api.network.Node; -import li.cil.oc.api.network.*; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mods.immibis.microblocks.api.EnumPartClass; -import mods.immibis.microblocks.api.EnumPosition; -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.IMicroblockSystem; -import mods.immibis.microblocks.api.MicroblockAPIUtils; -import mods.immibis.microblocks.api.Part; -import mods.immibis.microblocks.api.PartType; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; import appeng.api.networking.IGridNode; import appeng.api.util.AECableType; - import com.enderio.core.client.render.BoundingBox; - import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -54,1106 +17,1153 @@ import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.geom.Offsets; import crazypants.enderio.conduit.item.IItemConduit; -import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.liquid.AbstractTankConduit; -import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import li.cil.oc.api.network.*; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import mods.immibis.microblocks.api.EnumPartClass; +import mods.immibis.microblocks.api.EnumPosition; +import mods.immibis.microblocks.api.IMicroblockCoverSystem; +import mods.immibis.microblocks.api.IMicroblockSystem; +import mods.immibis.microblocks.api.MicroblockAPIUtils; +import mods.immibis.microblocks.api.Part; +import mods.immibis.microblocks.api.PartType; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; public class TileConduitBundle extends TileEntityEio implements IConduitBundle { - public static final short NBT_VERSION = 1; + public static final short NBT_VERSION = 1; - private final List conduits = new ArrayList(); + private final List conduits = new ArrayList(); - private Block facadeId = null; - private int facadeMeta = 0; - private FacadeType facadeType = FacadeType.BASIC; + private Block facadeId = null; + private int facadeMeta = 0; + private FacadeType facadeType = FacadeType.BASIC; - private boolean facadeChanged; + private boolean facadeChanged; - private final List cachedCollidables = new ArrayList(); + private final List cachedCollidables = new ArrayList(); - private final List cachedConnectors = new ArrayList(); + private final List cachedConnectors = new ArrayList(); - private boolean conduitsDirty = true; - private boolean collidablesDirty = true; - private boolean connectorsDirty = true; + private boolean conduitsDirty = true; + private boolean collidablesDirty = true; + private boolean connectorsDirty = true; - private boolean clientUpdated = false; + private boolean clientUpdated = false; - private int lightOpacity = -1; + private int lightOpacity = -1; - @SideOnly(Side.CLIENT) - private FacadeRenderState facadeRenderAs; + @SideOnly(Side.CLIENT) + private FacadeRenderState facadeRenderAs; - private ConduitDisplayMode lastMode = ConduitDisplayMode.ALL; - - Object covers; - - public TileConduitBundle() { - this.blockType = EnderIO.blockConduitBundle; - initMicroblocks(); - } + private ConduitDisplayMode lastMode = ConduitDisplayMode.ALL; - @Override - public void dirty() { - conduitsDirty = true; - collidablesDirty = true; - } + Object covers; - @Override - public boolean shouldRenderInPass(int arg0) { - if(facadeId != null && facadeId.isOpaqueCube() && !ConduitUtil.isFacadeHidden(this, EnderIO.proxy.getClientPlayer())) { - return false; + public TileConduitBundle() { + this.blockType = EnderIO.blockConduitBundle; + initMicroblocks(); } - return super.shouldRenderInPass(arg0); - } - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - NBTTagList conduitTags = new NBTTagList(); - for (IConduit conduit : conduits) { - NBTTagCompound conduitRoot = new NBTTagCompound(); - ConduitUtil.writeToNBT(conduit, conduitRoot); - conduitTags.appendTag(conduitRoot); + @Override + public void dirty() { + conduitsDirty = true; + collidablesDirty = true; } - nbtRoot.setTag("conduits", conduitTags); - if(facadeId != null) { - nbtRoot.setString("facadeId", Block.blockRegistry.getNameForObject(facadeId)); - nbtRoot.setString("facadeType", facadeType.name()); - } else { - nbtRoot.setString("facadeId", "null"); - } - nbtRoot.setInteger("facadeMeta", facadeMeta); - nbtRoot.setShort("nbtVersion", NBT_VERSION); - - if (MicroblocksUtil.supportMicroblocks()) { - writeMicroblocksToNBT(nbtRoot); - } - } - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - short nbtVersion = nbtRoot.getShort("nbtVersion"); - - conduits.clear(); - cachedCollidables.clear(); - NBTTagList conduitTags = (NBTTagList) nbtRoot.getTag("conduits"); - if(conduitTags != null) { - for (int i = 0; i < conduitTags.tagCount(); i++) { - NBTTagCompound conduitTag = conduitTags.getCompoundTagAt(i); - IConduit conduit = ConduitUtil.readConduitFromNBT(conduitTag, nbtVersion); - if(conduit != null) { - conduit.setBundle(this); - conduits.add(conduit); + @Override + public boolean shouldRenderInPass(int arg0) { + if (facadeId != null + && facadeId.isOpaqueCube() + && !ConduitUtil.isFacadeHidden(this, EnderIO.proxy.getClientPlayer())) { + return false; } - } + return super.shouldRenderInPass(arg0); } - String fs = nbtRoot.getString("facadeId"); - if(fs == null || "null".equals(fs)) { - facadeId = null; - facadeType = FacadeType.BASIC; - } else { - facadeId = Block.getBlockFromName(fs); - if(nbtRoot.hasKey("facadeType")) { // backwards compat, never true in freshly placed bundles - facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); - } - } - facadeMeta = nbtRoot.getInteger("facadeMeta"); - if(worldObj != null && worldObj.isRemote) { - boolean stableConduit = true; - for(IConduit iConduit: conduits) { - if ((iConduit instanceof IRedstoneConduit) || (iConduit instanceof AbstractTankConduit)) stableConduit = false; - } - if (stableConduit) { - boolean itemConduitClientUpdated = false; - for (Object o : Minecraft.getMinecraft().theWorld.playerEntities) { - Entity e = ((Entity) o); - if (e.getDistanceSq(this.xCoord, yCoord, zCoord) < 25) { - itemConduitClientUpdated = true; - break; - } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + NBTTagList conduitTags = new NBTTagList(); + for (IConduit conduit : conduits) { + NBTTagCompound conduitRoot = new NBTTagCompound(); + ConduitUtil.writeToNBT(conduit, conduitRoot); + conduitTags.appendTag(conduitRoot); } - if (itemConduitClientUpdated) clientUpdated = true; - } else { - clientUpdated = true; - } - } - - if (MicroblocksUtil.supportMicroblocks()) { - readMicroblocksFromNBT(nbtRoot); - } - } - - @Override - public boolean hasFacade() { - return facadeId != null; - } - - @Override - public void setFacadeId(Block blockID, boolean triggerUpdate) { - this.facadeId = blockID; - if(triggerUpdate) { - facadeChanged = true; - } - } - - @Override - public void setFacadeId(Block blockID) { - setFacadeId(blockID, true); - } - - @Override - public Block getFacadeId() { - return facadeId; - } - - @Override - public void setFacadeMetadata(int meta) { - facadeMeta = meta; - } - - @Override - public void setFacadeType(FacadeType type) { - facadeType = type; - } - - @Override - public int getFacadeMetadata() { - return facadeMeta; - } - - @Override - public FacadeType getFacadeType() { - return facadeType; - } - - @Override - @SideOnly(Side.CLIENT) - public FacadeRenderState getFacadeRenderedAs() { - if(facadeRenderAs == null) { - facadeRenderAs = FacadeRenderState.NONE; - } - return facadeRenderAs; - } - - @Override - @SideOnly(Side.CLIENT) - public void setFacadeRenderAs(FacadeRenderState state) { - this.facadeRenderAs = state; - } - - @Override - public int getLightOpacity() { - if((worldObj != null && !worldObj.isRemote) || lightOpacity == -1) { - return hasFacade() ? facadeId.getLightOpacity() : 0; - } - return lightOpacity; - } - - @Override - public void setLightOpacity(int opacity) { - lightOpacity = opacity; - } - - @Override - public void onChunkUnload() { - for (IConduit conduit : conduits) { - conduit.onChunkUnload(worldObj); - } - } - - @Override - public void doUpdate() { - for (IConduit conduit : conduits) { - conduit.updateEntity(worldObj); - } - - if(conduitsDirty) { - doConduitsDirty(); - } - - if(facadeChanged) { - doFacadeChanged(); - } - - //client side only, check for changes in rendering of the bundle - if(worldObj.isRemote) { - updateEntityClient(); - } - } - - private void doConduitsDirty() { - if(!worldObj.isRemote) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); - } - conduitsDirty = false; - } - - private void doFacadeChanged() { - //force re-calc of lighting for both client and server - ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord); - //worldObj.updateAllLightTypes(xCoord, yCoord, zCoord); - worldObj.func_147451_t(xCoord, yCoord, zCoord); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, EnderIO.blockConduitBundle); - facadeChanged = false; - } - - private void updateEntityClient() { - boolean markForUpdate = false; - if(clientUpdated) { - //TODO: This is not the correct solution here but just marking the block for a render update server side - //seems to get out of sync with the client sometimes so connections are not rendered correctly - markForUpdate = true; - clientUpdated = false; - } - - FacadeRenderState curRS = getFacadeRenderedAs(); - FacadeRenderState rs = ConduitUtil.getRequiredFacadeRenderState(this, EnderIO.proxy.getClientPlayer()); - - if(Config.updateLightingWhenHidingFacades) { - int curLO = getLightOpacity(); - int shouldBeLO = rs == FacadeRenderState.FULL ? 255 : 0; - if(curLO != shouldBeLO) { - setLightOpacity(shouldBeLO); - //worldObj.updateAllLightTypes(xCoord, yCoord, zCoord); - worldObj.func_147451_t(xCoord, yCoord, zCoord); - } - } - - if(curRS != rs) { - setFacadeRenderAs(rs); - if(!ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord)) { - markForUpdate = true; - } - } else { //can do the else as only need to update once - ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(EnderIO.proxy.getClientPlayer().getCurrentEquippedItem()); - if(curMode != lastMode) { - markForUpdate = true; - lastMode = curMode; - } - - } - if(markForUpdate) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - } - - @Override - public void onNeighborBlockChange(Block blockId) { - boolean needsUpdate = false; - for (IConduit conduit : conduits) { - needsUpdate |= conduit.onNeighborBlockChange(blockId); - } - if(needsUpdate) { - dirty(); - } - } - - @Override - public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - boolean needsUpdate = false; - for (IConduit conduit : conduits) { - needsUpdate |= conduit.onNeighborChange(world, x, y, z, tileX, tileY, tileZ); - } - if(needsUpdate) { - dirty(); - } - } - - @Override - public TileConduitBundle getEntity() { - return this; - } - - @Override - public boolean hasType(Class type) { - return getConduit(type) != null; - } - - @SuppressWarnings("unchecked") - @Override - public T getConduit(Class type) { - if(type == null) { - return null; - } - for (IConduit conduit : conduits) { - if(type.isInstance(conduit)) { - return (T) conduit; - } - } - return null; - } - - @Override - public void addConduit(IConduit conduit) { - if(worldObj.isRemote) { - return; - } - conduits.add(conduit); - conduit.setBundle(this); - conduit.onAddedToBundle(); - dirty(); - } - - @Override - public void removeConduit(IConduit conduit) { - if(conduit != null) { - removeConduit(conduit, true); - } - } - - public void removeConduit(IConduit conduit, boolean notify) { - if(worldObj.isRemote) { - return; - } - conduit.onRemovedFromBundle(); - conduits.remove(conduit); - conduit.setBundle(null); - if(notify) { - dirty(); - } - } - - @Override - public void onBlockRemoved() { - if(worldObj.isRemote) { - return; - } - List copy = new ArrayList(conduits); - for (IConduit con : copy) { - removeConduit(con, false); - } - dirty(); - } - - @Override - public Collection getConduits() { - return conduits; - } - - @Override - public Set getConnections(Class type) { - IConduit con = getConduit(type); - if(con != null) { - return con.getConduitConnections(); - } - return null; - } - - @Override - public boolean containsConnection(Class type, ForgeDirection dir) { - IConduit con = getConduit(type); - if(con != null) { - return con.containsConduitConnection(dir); - } - return false; - } - - @Override - public boolean containsConnection(ForgeDirection dir) { - for (IConduit con : conduits) { - if(con.containsConduitConnection(dir)) { - return true; - } - } - return false; - } - - @Override - public Set getAllConnections() { - EnumSet result = EnumSet.noneOf(ForgeDirection.class); - for (IConduit con : conduits) { - result.addAll(con.getConduitConnections()); - } - return result; - } - - // Geometry - - @Override - public Offset getOffset(Class type, ForgeDirection dir) { - if(getConnectionCount(dir) < 2) { - return Offset.NONE; - } - return Offsets.get(type, dir); - } - - @Override - public List getCollidableComponents() { - - for (IConduit con : conduits) { - collidablesDirty = collidablesDirty || con.haveCollidablesChangedSinceLastCall(); - } - if(collidablesDirty) { - connectorsDirty = true; - } - if(!collidablesDirty && !cachedCollidables.isEmpty()) { - return cachedCollidables; - } - cachedCollidables.clear(); - for (IConduit conduit : conduits) { - cachedCollidables.addAll(conduit.getCollidableComponents()); - } - - addConnectors(cachedCollidables); - - collidablesDirty = false; - - return cachedCollidables; - } - - @Override - public List getConnectors() { - List result = new ArrayList(); - addConnectors(result); - return result; - } - - private void addConnectors(List result) { - - if(conduits.isEmpty()) { - return; - } - - for (IConduit con : conduits) { - boolean b = con.haveCollidablesChangedSinceLastCall(); - collidablesDirty = collidablesDirty || b; - connectorsDirty = connectorsDirty || b; - } - - if(!connectorsDirty && !cachedConnectors.isEmpty()) { - result.addAll(cachedConnectors); - return; - } - - cachedConnectors.clear(); - - // TODO: What an unholly mess! (and it doesn't even work correctly...) - List coreBounds = new ArrayList(); - for (IConduit con : conduits) { - addConduitCores(coreBounds, con); - } - cachedConnectors.addAll(coreBounds); - result.addAll(coreBounds); - - // 1st algorithm - List conduitsBounds = new ArrayList(); - for (IConduit con : conduits) { - conduitsBounds.addAll(con.getCollidableComponents()); - addConduitCores(conduitsBounds, con); - } - - Set> collidingTypes = new HashSet>(); - for (CollidableComponent conCC : conduitsBounds) { - for (CollidableComponent innerCC : conduitsBounds) { - if(!InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(innerCC.data) && !InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(conCC.data) - && conCC != innerCC && conCC.bound.intersects(innerCC.bound)) { - collidingTypes.add((Class) conCC.conduitType); - } - } - } - - //TODO: Remove the core geometries covered up by this as no point in rendering these - if(!collidingTypes.isEmpty()) { - List colCores = new ArrayList(); - for (Class c : collidingTypes) { - IConduit con = getConduit(c); - if(con != null) { - addConduitCores(colCores, con); - } - } - - BoundingBox bb = null; - for (CollidableComponent cBB : colCores) { - if(bb == null) { - bb = cBB.bound; + nbtRoot.setTag("conduits", conduitTags); + if (facadeId != null) { + nbtRoot.setString("facadeId", Block.blockRegistry.getNameForObject(facadeId)); + nbtRoot.setString("facadeType", facadeType.name()); } else { - bb = bb.expandBy(cBB.bound); + nbtRoot.setString("facadeId", "null"); + } + nbtRoot.setInteger("facadeMeta", facadeMeta); + nbtRoot.setShort("nbtVersion", NBT_VERSION); + + if (MicroblocksUtil.supportMicroblocks()) { + writeMicroblocksToNBT(nbtRoot); } - } - if(bb != null) { - bb = bb.scale(1.05, 1.05, 1.05); - CollidableComponent cc = new CollidableComponent(null, bb, ForgeDirection.UNKNOWN, - ConduitConnectorType.INTERNAL); - result.add(cc); - cachedConnectors.add(cc); - } } - //2nd algorithm - for (IConduit con : conduits) { + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + short nbtVersion = nbtRoot.getShort("nbtVersion"); - if(con.hasConnections()) { - List cores = new ArrayList(); - addConduitCores(cores, con); - if(cores.size() > 1) { - BoundingBox bb = cores.get(0).bound; - float area = bb.getArea(); - for (CollidableComponent cc : cores) { - bb = bb.expandBy(cc.bound); - } - if(bb.getArea() > area * 1.5f) { - bb = bb.scale(1.05, 1.05, 1.05); - CollidableComponent cc = new CollidableComponent(null, bb, ForgeDirection.UNKNOWN, - ConduitConnectorType.INTERNAL); + conduits.clear(); + cachedCollidables.clear(); + NBTTagList conduitTags = (NBTTagList) nbtRoot.getTag("conduits"); + if (conduitTags != null) { + for (int i = 0; i < conduitTags.tagCount(); i++) { + NBTTagCompound conduitTag = conduitTags.getCompoundTagAt(i); + IConduit conduit = ConduitUtil.readConduitFromNBT(conduitTag, nbtVersion); + if (conduit != null) { + conduit.setBundle(this); + conduits.add(conduit); + } + } + } + String fs = nbtRoot.getString("facadeId"); + if (fs == null || "null".equals(fs)) { + facadeId = null; + facadeType = FacadeType.BASIC; + } else { + facadeId = Block.getBlockFromName(fs); + if (nbtRoot.hasKey("facadeType")) { // backwards compat, never true in freshly placed bundles + facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); + } + } + facadeMeta = nbtRoot.getInteger("facadeMeta"); + + if (worldObj != null && worldObj.isRemote) { + boolean stableConduit = true; + for (IConduit iConduit : conduits) { + if ((iConduit instanceof IRedstoneConduit) || (iConduit instanceof AbstractTankConduit)) + stableConduit = false; + } + if (stableConduit) { + boolean itemConduitClientUpdated = false; + for (Object o : Minecraft.getMinecraft().theWorld.playerEntities) { + Entity e = ((Entity) o); + if (e.getDistanceSq(this.xCoord, yCoord, zCoord) < 25) { + itemConduitClientUpdated = true; + break; + } + } + if (itemConduitClientUpdated) clientUpdated = true; + } else { + clientUpdated = true; + } + } + + if (MicroblocksUtil.supportMicroblocks()) { + readMicroblocksFromNBT(nbtRoot); + } + } + + @Override + public boolean hasFacade() { + return facadeId != null; + } + + @Override + public void setFacadeId(Block blockID, boolean triggerUpdate) { + this.facadeId = blockID; + if (triggerUpdate) { + facadeChanged = true; + } + } + + @Override + public void setFacadeId(Block blockID) { + setFacadeId(blockID, true); + } + + @Override + public Block getFacadeId() { + return facadeId; + } + + @Override + public void setFacadeMetadata(int meta) { + facadeMeta = meta; + } + + @Override + public void setFacadeType(FacadeType type) { + facadeType = type; + } + + @Override + public int getFacadeMetadata() { + return facadeMeta; + } + + @Override + public FacadeType getFacadeType() { + return facadeType; + } + + @Override + @SideOnly(Side.CLIENT) + public FacadeRenderState getFacadeRenderedAs() { + if (facadeRenderAs == null) { + facadeRenderAs = FacadeRenderState.NONE; + } + return facadeRenderAs; + } + + @Override + @SideOnly(Side.CLIENT) + public void setFacadeRenderAs(FacadeRenderState state) { + this.facadeRenderAs = state; + } + + @Override + public int getLightOpacity() { + if ((worldObj != null && !worldObj.isRemote) || lightOpacity == -1) { + return hasFacade() ? facadeId.getLightOpacity() : 0; + } + return lightOpacity; + } + + @Override + public void setLightOpacity(int opacity) { + lightOpacity = opacity; + } + + @Override + public void onChunkUnload() { + for (IConduit conduit : conduits) { + conduit.onChunkUnload(worldObj); + } + } + + @Override + public void doUpdate() { + for (IConduit conduit : conduits) { + conduit.updateEntity(worldObj); + } + + if (conduitsDirty) { + doConduitsDirty(); + } + + if (facadeChanged) { + doFacadeChanged(); + } + + // client side only, check for changes in rendering of the bundle + if (worldObj.isRemote) { + updateEntityClient(); + } + } + + private void doConduitsDirty() { + if (!worldObj.isRemote) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); + } + conduitsDirty = false; + } + + private void doFacadeChanged() { + // force re-calc of lighting for both client and server + ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord); + // worldObj.updateAllLightTypes(xCoord, yCoord, zCoord); + worldObj.func_147451_t(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, EnderIO.blockConduitBundle); + facadeChanged = false; + } + + private void updateEntityClient() { + boolean markForUpdate = false; + if (clientUpdated) { + // TODO: This is not the correct solution here but just marking the block for a render update server side + // seems to get out of sync with the client sometimes so connections are not rendered correctly + markForUpdate = true; + clientUpdated = false; + } + + FacadeRenderState curRS = getFacadeRenderedAs(); + FacadeRenderState rs = ConduitUtil.getRequiredFacadeRenderState(this, EnderIO.proxy.getClientPlayer()); + + if (Config.updateLightingWhenHidingFacades) { + int curLO = getLightOpacity(); + int shouldBeLO = rs == FacadeRenderState.FULL ? 255 : 0; + if (curLO != shouldBeLO) { + setLightOpacity(shouldBeLO); + // worldObj.updateAllLightTypes(xCoord, yCoord, zCoord); + worldObj.func_147451_t(xCoord, yCoord, zCoord); + } + } + + if (curRS != rs) { + setFacadeRenderAs(rs); + if (!ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord)) { + markForUpdate = true; + } + } else { // can do the else as only need to update once + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode( + EnderIO.proxy.getClientPlayer().getCurrentEquippedItem()); + if (curMode != lastMode) { + markForUpdate = true; + lastMode = curMode; + } + } + if (markForUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } + + @Override + public void onNeighborBlockChange(Block blockId) { + boolean needsUpdate = false; + for (IConduit conduit : conduits) { + needsUpdate |= conduit.onNeighborBlockChange(blockId); + } + if (needsUpdate) { + dirty(); + } + } + + @Override + public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + boolean needsUpdate = false; + for (IConduit conduit : conduits) { + needsUpdate |= conduit.onNeighborChange(world, x, y, z, tileX, tileY, tileZ); + } + if (needsUpdate) { + dirty(); + } + } + + @Override + public TileConduitBundle getEntity() { + return this; + } + + @Override + public boolean hasType(Class type) { + return getConduit(type) != null; + } + + @SuppressWarnings("unchecked") + @Override + public T getConduit(Class type) { + if (type == null) { + return null; + } + for (IConduit conduit : conduits) { + if (type.isInstance(conduit)) { + return (T) conduit; + } + } + return null; + } + + @Override + public void addConduit(IConduit conduit) { + if (worldObj.isRemote) { + return; + } + conduits.add(conduit); + conduit.setBundle(this); + conduit.onAddedToBundle(); + dirty(); + } + + @Override + public void removeConduit(IConduit conduit) { + if (conduit != null) { + removeConduit(conduit, true); + } + } + + public void removeConduit(IConduit conduit, boolean notify) { + if (worldObj.isRemote) { + return; + } + conduit.onRemovedFromBundle(); + conduits.remove(conduit); + conduit.setBundle(null); + if (notify) { + dirty(); + } + } + + @Override + public void onBlockRemoved() { + if (worldObj.isRemote) { + return; + } + List copy = new ArrayList(conduits); + for (IConduit con : copy) { + removeConduit(con, false); + } + dirty(); + } + + @Override + public Collection getConduits() { + return conduits; + } + + @Override + public Set getConnections(Class type) { + IConduit con = getConduit(type); + if (con != null) { + return con.getConduitConnections(); + } + return null; + } + + @Override + public boolean containsConnection(Class type, ForgeDirection dir) { + IConduit con = getConduit(type); + if (con != null) { + return con.containsConduitConnection(dir); + } + return false; + } + + @Override + public boolean containsConnection(ForgeDirection dir) { + for (IConduit con : conduits) { + if (con.containsConduitConnection(dir)) { + return true; + } + } + return false; + } + + @Override + public Set getAllConnections() { + EnumSet result = EnumSet.noneOf(ForgeDirection.class); + for (IConduit con : conduits) { + result.addAll(con.getConduitConnections()); + } + return result; + } + + // Geometry + + @Override + public Offset getOffset(Class type, ForgeDirection dir) { + if (getConnectionCount(dir) < 2) { + return Offset.NONE; + } + return Offsets.get(type, dir); + } + + @Override + public List getCollidableComponents() { + + for (IConduit con : conduits) { + collidablesDirty = collidablesDirty || con.haveCollidablesChangedSinceLastCall(); + } + if (collidablesDirty) { + connectorsDirty = true; + } + if (!collidablesDirty && !cachedCollidables.isEmpty()) { + return cachedCollidables; + } + cachedCollidables.clear(); + for (IConduit conduit : conduits) { + cachedCollidables.addAll(conduit.getCollidableComponents()); + } + + addConnectors(cachedCollidables); + + collidablesDirty = false; + + return cachedCollidables; + } + + @Override + public List getConnectors() { + List result = new ArrayList(); + addConnectors(result); + return result; + } + + private void addConnectors(List result) { + + if (conduits.isEmpty()) { + return; + } + + for (IConduit con : conduits) { + boolean b = con.haveCollidablesChangedSinceLastCall(); + collidablesDirty = collidablesDirty || b; + connectorsDirty = connectorsDirty || b; + } + + if (!connectorsDirty && !cachedConnectors.isEmpty()) { + result.addAll(cachedConnectors); + return; + } + + cachedConnectors.clear(); + + // TODO: What an unholly mess! (and it doesn't even work correctly...) + List coreBounds = new ArrayList(); + for (IConduit con : conduits) { + addConduitCores(coreBounds, con); + } + cachedConnectors.addAll(coreBounds); + result.addAll(coreBounds); + + // 1st algorithm + List conduitsBounds = new ArrayList(); + for (IConduit con : conduits) { + conduitsBounds.addAll(con.getCollidableComponents()); + addConduitCores(conduitsBounds, con); + } + + Set> collidingTypes = new HashSet>(); + for (CollidableComponent conCC : conduitsBounds) { + for (CollidableComponent innerCC : conduitsBounds) { + if (!InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(innerCC.data) + && !InsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(conCC.data) + && conCC != innerCC + && conCC.bound.intersects(innerCC.bound)) { + collidingTypes.add((Class) conCC.conduitType); + } + } + } + + // TODO: Remove the core geometries covered up by this as no point in rendering these + if (!collidingTypes.isEmpty()) { + List colCores = new ArrayList(); + for (Class c : collidingTypes) { + IConduit con = getConduit(c); + if (con != null) { + addConduitCores(colCores, con); + } + } + + BoundingBox bb = null; + for (CollidableComponent cBB : colCores) { + if (bb == null) { + bb = cBB.bound; + } else { + bb = bb.expandBy(cBB.bound); + } + } + if (bb != null) { + bb = bb.scale(1.05, 1.05, 1.05); + CollidableComponent cc = + new CollidableComponent(null, bb, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); + result.add(cc); + cachedConnectors.add(cc); + } + } + + // 2nd algorithm + for (IConduit con : conduits) { + + if (con.hasConnections()) { + List cores = new ArrayList(); + addConduitCores(cores, con); + if (cores.size() > 1) { + BoundingBox bb = cores.get(0).bound; + float area = bb.getArea(); + for (CollidableComponent cc : cores) { + bb = bb.expandBy(cc.bound); + } + if (bb.getArea() > area * 1.5f) { + bb = bb.scale(1.05, 1.05, 1.05); + CollidableComponent cc = new CollidableComponent( + null, bb, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); + result.add(cc); + cachedConnectors.add(cc); + } + } + } + } + + // Merge all internal conduit connectors into one box + BoundingBox conBB = null; + for (int i = 0; i < result.size(); i++) { + CollidableComponent cc = result.get(i); + if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) { + conBB = conBB == null ? cc.bound : conBB.expandBy(cc.bound); + result.remove(i); + i--; + cachedConnectors.remove(cc); + } + } + + if (conBB != null) { + CollidableComponent cc = + new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); result.add(cc); cachedConnectors.add(cc); - } } - } - } - - // Merge all internal conduit connectors into one box - BoundingBox conBB = null; - for (int i = 0; i < result.size(); i++) { - CollidableComponent cc = result.get(i); - if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) { - conBB = conBB == null ? cc.bound : conBB.expandBy(cc.bound); - result.remove(i); - i--; - cachedConnectors.remove(cc); - } - } - if(conBB != null) { - CollidableComponent cc = new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); - result.add(cc); - cachedConnectors.add(cc); - } - - // External Connectors - EnumSet externalDirs = EnumSet.noneOf(ForgeDirection.class); - for (IConduit con : conduits) { - Set extCons = con.getExternalConnections(); - if(extCons != null) { - for (ForgeDirection dir : extCons) { - if(con.getConnectionMode(dir) != ConnectionMode.DISABLED) { - externalDirs.add(dir); - } + // External Connectors + EnumSet externalDirs = EnumSet.noneOf(ForgeDirection.class); + for (IConduit con : conduits) { + Set extCons = con.getExternalConnections(); + if (extCons != null) { + for (ForgeDirection dir : extCons) { + if (con.getConnectionMode(dir) != ConnectionMode.DISABLED) { + externalDirs.add(dir); + } + } + } } - } - } - for (ForgeDirection dir : externalDirs) { - BoundingBox bb = ConduitGeometryUtil.instance.getExternalConnectorBoundingBox(dir); - CollidableComponent cc = new CollidableComponent(null, bb, dir, ConduitConnectorType.EXTERNAL); - result.add(cc); - cachedConnectors.add(cc); + for (ForgeDirection dir : externalDirs) { + BoundingBox bb = ConduitGeometryUtil.instance.getExternalConnectorBoundingBox(dir); + CollidableComponent cc = new CollidableComponent(null, bb, dir, ConduitConnectorType.EXTERNAL); + result.add(cc); + cachedConnectors.add(cc); + } + + connectorsDirty = false; } - connectorsDirty = false; - } - - private void addConduitCores(List result, IConduit con) { - CollidableCache cc = CollidableCache.instance; - Class type = con.getCollidableType(); - if(con.hasConnections()) { - for (ForgeDirection dir : con.getExternalConnections()) { - result.addAll(cc.getCollidables(cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false), con)); - } - for (ForgeDirection dir : con.getConduitConnections()) { - result.addAll(cc.getCollidables(cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false), con)); - } - } else { - result.addAll(cc.getCollidables(cc.createKey(type, getOffset(con.getBaseConduitType(), ForgeDirection.UNKNOWN), ForgeDirection.UNKNOWN, false), con)); - } - } - - private int getConnectionCount(ForgeDirection dir) { - if(dir == ForgeDirection.UNKNOWN) { - return conduits.size(); - } - int result = 0; - for (IConduit con : conduits) { - if(con.containsConduitConnection(dir) || con.containsExternalConnection(dir)) { - result++; - } - } - return result; - } - - // ------------ Power ----------------------------- - - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.receiveEnergy(from, maxReceive, simulate); - } - return 0; - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.extractEnergy(from, maxExtract, simulate); - } - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.canConnectEnergy(from); - } - return false; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getEnergyStored(from); - } - return 0; - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getMaxEnergyStored(from); - } - return 0; - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getMaxEnergyRecieved(dir); - } - return 0; - } - - @Override - public int getEnergyStored() { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getEnergyStored(); - } - return 0; - } - - @Override - public int getMaxEnergyStored() { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getMaxEnergyStored(); - } - return 0; - } - - @Override - public void setEnergyStored(int stored) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - pc.setEnergyStored(stored); - } - - } - -//------- Liquids ----------------------------- - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.fill(from, resource, doFill); - } - return 0; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.drain(from, resource, doDrain); - } - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.drain(from, maxDrain, doDrain); - } - return null; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.canFill(from, fluid); - } - return false; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.canDrain(from, fluid); - } - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - ILiquidConduit lc = getConduit(ILiquidConduit.class); - if(lc != null) { - return lc.getTankInfo(from); - } - return null; - } - - // ---- TE Item Conduits - - @Override - public ItemStack insertItem(ForgeDirection from, ItemStack item) { - IItemConduit ic = getConduit(IItemConduit.class); - if(ic != null) { - return ic.insertItem(from, item); - } - return item; - } - - // ---- Mekanism Gas Tubes - - @Override - @Method(modid = "MekanismAPI|gas") - public int receiveGas(ForgeDirection side, GasStack stack) { - return receiveGas(side, stack, true); - } - - @Override - @Method(modid = "MekanismAPI|gas") - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { - IGasConduit gc = getConduit(IGasConduit.class); - if(gc != null) { - return gc.receiveGas(side, stack, doTransfer); - } - return 0; - } - - @Override - @Method(modid = "MekanismAPI|gas") - public GasStack drawGas(ForgeDirection side, int amount) { - return drawGas(side, amount, true); - } - - @Override - @Method(modid = "MekanismAPI|gas") - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { - IGasConduit gc = getConduit(IGasConduit.class); - if(gc != null) { - return gc.drawGas(side, amount, doTransfer); - } - return null; - } - - @Override - @Method(modid = "MekanismAPI|gas") - public boolean canReceiveGas(ForgeDirection side, Gas type) { - IGasConduit gc = getConduit(IGasConduit.class); - if(gc != null) { - return gc.canReceiveGas(side, type); - } - return false; - } - - @Override - @Method(modid = "MekanismAPI|gas") - public boolean canDrawGas(ForgeDirection side, Gas type) { - IGasConduit gc = getConduit(IGasConduit.class); - if(gc != null) { - return gc.canDrawGas(side, type); - } - return false; - } - - @Override - public World getWorld() { - return getWorldObj(); - } - - private Object node; // IGridNode object, untyped to avoid crash w/o AE2 - - @Override - @Method(modid = "appliedenergistics2") - public IGridNode getGridNode(ForgeDirection dir) { - if (dir == null || dir == ForgeDirection.UNKNOWN) { - return (IGridNode) node; - } else { - IMEConduit cond = getConduit(IMEConduit.class); - if (cond != null) { - if (cond.getConnectionMode(dir.getOpposite()) == ConnectionMode.IN_OUT) { - return (IGridNode) node; + private void addConduitCores(List result, IConduit con) { + CollidableCache cc = CollidableCache.instance; + Class type = con.getCollidableType(); + if (con.hasConnections()) { + for (ForgeDirection dir : con.getExternalConnections()) { + result.addAll(cc.getCollidables( + cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false), + con)); + } + for (ForgeDirection dir : con.getConduitConnections()) { + result.addAll(cc.getCollidables( + cc.createKey(type, getOffset(con.getBaseConduitType(), dir), ForgeDirection.UNKNOWN, false), + con)); + } } else { - return null; + result.addAll(cc.getCollidables( + cc.createKey( + type, + getOffset(con.getBaseConduitType(), ForgeDirection.UNKNOWN), + ForgeDirection.UNKNOWN, + false), + con)); } - } } - return (IGridNode) node; - } - - @SuppressWarnings("cast") - @Override - @Method(modid = "appliedenergistics2") - public void setGridNode(Object node) { - this.node = (IGridNode) node; - } - @Override - @Method(modid = "appliedenergistics2") - public AECableType getCableConnectionType(ForgeDirection dir) { - IMEConduit cond = getConduit(IMEConduit.class); - if (cond == null) { - return AECableType.NONE; - } else { - return cond.isConnectedTo(dir) ? AECableType.SMART : AECableType.NONE; + private int getConnectionCount(ForgeDirection dir) { + if (dir == ForgeDirection.UNKNOWN) { + return conduits.size(); + } + int result = 0; + for (IConduit con : conduits) { + if (con.containsConduitConnection(dir) || con.containsExternalConnection(dir)) { + result++; + } + } + return result; } - } - - @Override - @Method(modid = "appliedenergistics2") - public void securityBreak() { - } - @Override - public boolean displayPower() { - return true; - } + // ------------ Power ----------------------------- - // Immibis Microblocks - - private void initMicroblocks() { - if (MicroblocksUtil.supportMicroblocks()) { - createCovers(); + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.receiveEnergy(from, maxReceive, simulate); + } + return 0; } - } - @Method(modid = "ImmibisMicroblocks") - private void createCovers() { - IMicroblockSystem ims = MicroblockAPIUtils.getMicroblockSystem(); - if (ims != null) { - covers = ims.createMicroblockCoverSystem(this); + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.extractEnergy(from, maxExtract, simulate); + } + return 0; } - } - @Override - @Method(modid = "ImmibisMicroblocks") - public boolean isPlacementBlocked(PartType part, EnumPosition pos) { - EnumPartClass type = part.getPartClass(); - // Let's do some cheaper checks first - if (type == EnumPartClass.Strip) { - // No pillars - if (pos == EnumPosition.PostX || pos == EnumPosition.PostY || pos == EnumPosition.PostZ) { + @Override + public boolean canConnectEnergy(ForgeDirection from) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.canConnectEnergy(from); + } + return false; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getEnergyStored(from); + } + return 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getMaxEnergyStored(from); + } + return 0; + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getMaxEnergyRecieved(dir); + } + return 0; + } + + @Override + public int getEnergyStored() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getEnergyStored(); + } + return 0; + } + + @Override + public int getMaxEnergyStored() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + return pc.getMaxEnergyStored(); + } + return 0; + } + + @Override + public void setEnergyStored(int stored) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if (pc != null) { + pc.setEnergyStored(stored); + } + } + + // ------- Liquids ----------------------------- + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.fill(from, resource, doFill); + } + return 0; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.drain(from, resource, doDrain); + } + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.drain(from, maxDrain, doDrain); + } + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.canFill(from, fluid); + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.canDrain(from, fluid); + } + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + ILiquidConduit lc = getConduit(ILiquidConduit.class); + if (lc != null) { + return lc.getTankInfo(from); + } + return null; + } + + // ---- TE Item Conduits + + @Override + public ItemStack insertItem(ForgeDirection from, ItemStack item) { + IItemConduit ic = getConduit(IItemConduit.class); + if (ic != null) { + return ic.insertItem(from, item); + } + return item; + } + + // ---- Mekanism Gas Tubes + + @Override + @Method(modid = "MekanismAPI|gas") + public int receiveGas(ForgeDirection side, GasStack stack) { + return receiveGas(side, stack, true); + } + + @Override + @Method(modid = "MekanismAPI|gas") + public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { + IGasConduit gc = getConduit(IGasConduit.class); + if (gc != null) { + return gc.receiveGas(side, stack, doTransfer); + } + return 0; + } + + @Override + @Method(modid = "MekanismAPI|gas") + public GasStack drawGas(ForgeDirection side, int amount) { + return drawGas(side, amount, true); + } + + @Override + @Method(modid = "MekanismAPI|gas") + public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { + IGasConduit gc = getConduit(IGasConduit.class); + if (gc != null) { + return gc.drawGas(side, amount, doTransfer); + } + return null; + } + + @Override + @Method(modid = "MekanismAPI|gas") + public boolean canReceiveGas(ForgeDirection side, Gas type) { + IGasConduit gc = getConduit(IGasConduit.class); + if (gc != null) { + return gc.canReceiveGas(side, type); + } + return false; + } + + @Override + @Method(modid = "MekanismAPI|gas") + public boolean canDrawGas(ForgeDirection side, Gas type) { + IGasConduit gc = getConduit(IGasConduit.class); + if (gc != null) { + return gc.canDrawGas(side, type); + } + return false; + } + + @Override + public World getWorld() { + return getWorldObj(); + } + + private Object node; // IGridNode object, untyped to avoid crash w/o AE2 + + @Override + @Method(modid = "appliedenergistics2") + public IGridNode getGridNode(ForgeDirection dir) { + if (dir == null || dir == ForgeDirection.UNKNOWN) { + return (IGridNode) node; + } else { + IMEConduit cond = getConduit(IMEConduit.class); + if (cond != null) { + if (cond.getConnectionMode(dir.getOpposite()) == ConnectionMode.IN_OUT) { + return (IGridNode) node; + } else { + return null; + } + } + } + return (IGridNode) node; + } + + @SuppressWarnings("cast") + @Override + @Method(modid = "appliedenergistics2") + public void setGridNode(Object node) { + this.node = (IGridNode) node; + } + + @Override + @Method(modid = "appliedenergistics2") + public AECableType getCableConnectionType(ForgeDirection dir) { + IMEConduit cond = getConduit(IMEConduit.class); + if (cond == null) { + return AECableType.NONE; + } else { + return cond.isConnectedTo(dir) ? AECableType.SMART : AECableType.NONE; + } + } + + @Override + @Method(modid = "appliedenergistics2") + public void securityBreak() {} + + @Override + public boolean displayPower() { return true; - } - } else if (part.getSize() < 0.25) { - // Anything this small can never intersect conduits - return false; } - // Finally just check core BB intersections - // Ignore anything that is not a core to allow blocking of connections - else if (type == EnumPartClass.Panel) { - List boxes = getCollidableComponents(); - BoundingBox bb = new BoundingBox(Part.getBoundingBoxFromPool(pos, part.getSize())); - for (CollidableComponent c : boxes) { - if (c.dir == ForgeDirection.UNKNOWN && c.bound.intersects(bb)) { - return true; + + // Immibis Microblocks + + private void initMicroblocks() { + if (MicroblocksUtil.supportMicroblocks()) { + createCovers(); } - } - } - return false; - } - - @Override - @Method(modid = "ImmibisMicroblocks") - public IMicroblockCoverSystem getCoverSystem() { - return (IMicroblockCoverSystem) covers; - } - - @Method(modid = "ImmibisMicroblocks") - private void writeMicroblocksToNBT(NBTTagCompound tag) { - if (covers != null) { - ((IMicroblockCoverSystem) covers).writeToNBT(tag); - } - } - - @Method(modid = "ImmibisMicroblocks") - private void readMicroblocksFromNBT(NBTTagCompound tag) { - if (covers != null) { - ((IMicroblockCoverSystem) covers).readFromNBT(tag); - } - } - - @Override - @Method(modid = "ImmibisMicroblocks") - public Packet getDescriptionPacket() { - if (covers == null) { - return super.getDescriptionPacket(); } - NBTTagCompound tag = new NBTTagCompound(); - tag.setByteArray("C", ((IMicroblockCoverSystem) covers).writeDescriptionBytes()); - writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); - } - - @Override - @Method(modid = "ImmibisMicroblocks") - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - if (covers != null) { - ((IMicroblockCoverSystem) covers).readDescriptionBytes(pkt.func_148857_g().getByteArray("C"), 0); - } - } - - @Override - @Method(modid = "ImmibisMicroblocks") - public void onMicroblocksChanged() { - Set needUpdates = EnumSet.allOf(ForgeDirection.class); - needUpdates.remove(ForgeDirection.UNKNOWN); - for (Part p : getCoverSystem().getAllParts()) { - if (p.type.getPartClass() == EnumPartClass.Panel) { - ForgeDirection dir = MicroblocksUtil.posToDir(p.pos); - updateConnections(dir, true); - needUpdates.remove(dir); - } - } - for (ForgeDirection dir : needUpdates) { - updateConnections(dir, false); - } - - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - updateBlock(); - } - - @Method(modid = "ImmibisMicroblocks") - private void updateConnections(ForgeDirection dir, boolean remove) { - TileEntity neighbor = getLocation().getLocation(dir).getTileEntity(worldObj); - IConduitBundle neighborBundle = (IConduitBundle) (neighbor instanceof IConduitBundle ? neighbor : null); - for (IConduit c : getConduits()) { - if (remove) { - removeConnection(dir, c); - } else if (neighborBundle != null) { - addConnection(dir, c, neighborBundle.getConduit(c.getBaseConduitType())); - } - c.connectionsChanged(); - } - dir = dir.getOpposite(); - if (neighbor instanceof IConduitBundle) { - for (IConduit c : ((TileConduitBundle) neighbor).getConduits()) { - if (remove) { - removeConnection(dir, c); - } else if (neighborBundle != null) { - addConnection(dir, c, getConduit(c.getBaseConduitType())); + @Method(modid = "ImmibisMicroblocks") + private void createCovers() { + IMicroblockSystem ims = MicroblockAPIUtils.getMicroblockSystem(); + if (ims != null) { + covers = ims.createMicroblockCoverSystem(this); } - c.connectionsChanged(); - } } - } - @Method(modid = "ImmibisMicroblocks") - private void removeConnection(ForgeDirection dir, IConduit c) { - if (c.getConduitConnections().contains(dir)) { - c.conduitConnectionRemoved(dir); + @Override + @Method(modid = "ImmibisMicroblocks") + public boolean isPlacementBlocked(PartType part, EnumPosition pos) { + EnumPartClass type = part.getPartClass(); + // Let's do some cheaper checks first + if (type == EnumPartClass.Strip) { + // No pillars + if (pos == EnumPosition.PostX || pos == EnumPosition.PostY || pos == EnumPosition.PostZ) { + return true; + } + } else if (part.getSize() < 0.25) { + // Anything this small can never intersect conduits + return false; + } + // Finally just check core BB intersections + // Ignore anything that is not a core to allow blocking of connections + else if (type == EnumPartClass.Panel) { + List boxes = getCollidableComponents(); + BoundingBox bb = new BoundingBox(Part.getBoundingBoxFromPool(pos, part.getSize())); + for (CollidableComponent c : boxes) { + if (c.dir == ForgeDirection.UNKNOWN && c.bound.intersects(bb)) { + return true; + } + } + } + return false; } - } - @Method(modid = "ImmibisMicroblocks") - private void addConnection(ForgeDirection dir, IConduit c, IConduit connectingTo) { - if (connectingTo != null) { - if (!c.getConduitConnections().contains(dir) && connectingTo.canConnectToConduit(dir, c)) { - c.conduitConnectionAdded(dir); - } + @Override + @Method(modid = "ImmibisMicroblocks") + public IMicroblockCoverSystem getCoverSystem() { + return (IMicroblockCoverSystem) covers; } - } - // OpenComputers - - @Override - @Method(modid = "OpenComputersAPI|Network") - public Node node() { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - return cond.node(); - } else { - return null; + @Method(modid = "ImmibisMicroblocks") + private void writeMicroblocksToNBT(NBTTagCompound tag) { + if (covers != null) { + ((IMicroblockCoverSystem) covers).writeToNBT(tag); + } } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onConnect(Node node) { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - cond.onConnect(node); + @Method(modid = "ImmibisMicroblocks") + private void readMicroblocksFromNBT(NBTTagCompound tag) { + if (covers != null) { + ((IMicroblockCoverSystem) covers).readFromNBT(tag); + } } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onDisconnect(Node node) { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - cond.onDisconnect(node); + @Override + @Method(modid = "ImmibisMicroblocks") + public Packet getDescriptionPacket() { + if (covers == null) { + return super.getDescriptionPacket(); + } + + NBTTagCompound tag = new NBTTagCompound(); + tag.setByteArray("C", ((IMicroblockCoverSystem) covers).writeDescriptionBytes()); + writeCustomNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onMessage(Message message) { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - cond.onMessage(message); + @Override + @Method(modid = "ImmibisMicroblocks") + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + if (covers != null) { + ((IMicroblockCoverSystem) covers) + .readDescriptionBytes(pkt.func_148857_g().getByteArray("C"), 0); + } } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public Node sidedNode(ForgeDirection side) { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - return cond.sidedNode(side); - } else { - return null; + @Override + @Method(modid = "ImmibisMicroblocks") + public void onMicroblocksChanged() { + Set needUpdates = EnumSet.allOf(ForgeDirection.class); + needUpdates.remove(ForgeDirection.UNKNOWN); + for (Part p : getCoverSystem().getAllParts()) { + if (p.type.getPartClass() == EnumPartClass.Panel) { + ForgeDirection dir = MicroblocksUtil.posToDir(p.pos); + updateConnections(dir, true); + needUpdates.remove(dir); + } + } + for (ForgeDirection dir : needUpdates) { + updateConnections(dir, false); + } + + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + updateBlock(); } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - @SideOnly(Side.CLIENT) - public boolean canConnect(ForgeDirection side) { - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - return cond.canConnect(side); - } else { - return false; + @Method(modid = "ImmibisMicroblocks") + private void updateConnections(ForgeDirection dir, boolean remove) { + TileEntity neighbor = getLocation().getLocation(dir).getTileEntity(worldObj); + IConduitBundle neighborBundle = (IConduitBundle) (neighbor instanceof IConduitBundle ? neighbor : null); + for (IConduit c : getConduits()) { + if (remove) { + removeConnection(dir, c); + } else if (neighborBundle != null) { + addConnection(dir, c, neighborBundle.getConduit(c.getBaseConduitType())); + } + c.connectionsChanged(); + } + dir = dir.getOpposite(); + if (neighbor instanceof IConduitBundle) { + for (IConduit c : ((TileConduitBundle) neighbor).getConduits()) { + if (remove) { + removeConnection(dir, c); + } else if (neighborBundle != null) { + addConnection(dir, c, getConduit(c.getBaseConduitType())); + } + c.connectionsChanged(); + } + } } - } - @Override - public void invalidate() { - super.invalidate(); - IOCConduit cond = getConduit(IOCConduit.class); - if (cond != null) { - cond.invalidate(); + @Method(modid = "ImmibisMicroblocks") + private void removeConnection(ForgeDirection dir, IConduit c) { + if (c.getConduitConnections().contains(dir)) { + c.conduitConnectionRemoved(dir); + } } - } + @Method(modid = "ImmibisMicroblocks") + private void addConnection(ForgeDirection dir, IConduit c, IConduit connectingTo) { + if (connectingTo != null) { + if (!c.getConduitConnections().contains(dir) && connectingTo.canConnectToConduit(dir, c)) { + c.conduitConnectionAdded(dir); + } + } + } + + // OpenComputers + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.node(); + } else { + return null; + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onConnect(node); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onDisconnect(node); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.onMessage(message); + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node sidedNode(ForgeDirection side) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.sidedNode(side); + } else { + return null; + } + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + @SideOnly(Side.CLIENT) + public boolean canConnect(ForgeDirection side) { + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + return cond.canConnect(side); + } else { + return false; + } + } + + @Override + public void invalidate() { + super.invalidate(); + IOCConduit cond = getConduit(IOCConduit.class); + if (cond != null) { + cond.invalidate(); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java index d692ab3c..211c88f5 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -1,5 +1,11 @@ package crazypants.enderio.conduit.facade; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.machine.painter.IPaintedBlock; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -8,145 +14,137 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.machine.painter.IPaintedBlock; public class BlockConduitFacade extends BlockEio implements IPaintedBlock { - public static BlockConduitFacade create() { - BlockConduitFacade result = new BlockConduitFacade(); - result.init(); - return result; - } - - private Block blockOverride; - - private BlockConduitFacade() { - super(ModObject.blockConduitFacade.unlocalisedName, null, new Material(MapColor.stoneColor)); - setStepSound(Block.soundTypeStone); - setCreativeTab(null); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:conduitFacade"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { - TileEntity te = ba.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return blockIcon; - } - IConduitBundle cb = (IConduitBundle) te; - Block block = cb.getFacadeId(); - if(block != null) { - int meta = cb.getFacadeMetadata(); - return block.getIcon(side, meta); - } - return blockIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - if(blockOverride != null) { - return blockOverride.getIcon(par1, par2); - } - return blockIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public int getBlockColor() { - if(blockOverride != null) { - return blockOverride.getBlockColor(); - } else { - return super.getBlockColor(); - } - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - if(blockOverride != null) { - try { //work around for Issue #589 - return blockOverride.colorMultiplier(par1IBlockAccess, par2, par3, par4); - } catch (Exception e) { - } - } - return super.colorMultiplier(par1IBlockAccess, par2, par3, par4); - } - - public Block getIconOverrideBlock() { - return blockOverride; - } - - @Override - @SideOnly(Side.CLIENT) - public int getRenderColor(int par1) { - if(blockOverride != null) { - return blockOverride.getRenderColor(par1); - } else { - return super.getRenderColor(par1); - } - } - - public void setBlockOverride(IConduitBundle cb) { - if(cb == null) { - blockOverride = null; - return; + public static BlockConduitFacade create() { + BlockConduitFacade result = new BlockConduitFacade(); + result.init(); + return result; } - Block block = cb.getFacadeId(); - int meta = cb.getFacadeMetadata(); - if(block == null || block == this) { - return; - } - blockOverride = block; - } + private Block blockOverride; - @Override - public int getDamageValue(World par1World, int x, int y, int z) { - Mimic m = getMimic(par1World, x, y, z); - if(m != null) { - return m.meta; - } - return 0; - } - - private Mimic getMimic(IBlockAccess ba, int x, int y, int z) { - TileEntity te = ba.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return null; - } - IConduitBundle cb = (IConduitBundle) te; - Block id = cb.getFacadeId(); - int meta = cb.getFacadeMetadata(); - - if(id == null) { - return null; + private BlockConduitFacade() { + super(ModObject.blockConduitFacade.unlocalisedName, null, new Material(MapColor.stoneColor)); + setStepSound(Block.soundTypeStone); + setCreativeTab(null); } - return new Mimic(id, meta); - } - - class Mimic { - - int meta; - Block block; - - private Mimic(Block block, int meta) { - this.block = block; - this.meta = meta; + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitFacade"); } - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { + TileEntity te = ba.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return blockIcon; + } + IConduitBundle cb = (IConduitBundle) te; + Block block = cb.getFacadeId(); + if (block != null) { + int meta = cb.getFacadeMetadata(); + return block.getIcon(side, meta); + } + return blockIcon; + } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int par1, int par2) { + if (blockOverride != null) { + return blockOverride.getIcon(par1, par2); + } + return blockIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public int getBlockColor() { + if (blockOverride != null) { + return blockOverride.getBlockColor(); + } else { + return super.getBlockColor(); + } + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + if (blockOverride != null) { + try { // work around for Issue #589 + return blockOverride.colorMultiplier(par1IBlockAccess, par2, par3, par4); + } catch (Exception e) { + } + } + return super.colorMultiplier(par1IBlockAccess, par2, par3, par4); + } + + public Block getIconOverrideBlock() { + return blockOverride; + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderColor(int par1) { + if (blockOverride != null) { + return blockOverride.getRenderColor(par1); + } else { + return super.getRenderColor(par1); + } + } + + public void setBlockOverride(IConduitBundle cb) { + if (cb == null) { + blockOverride = null; + return; + } + + Block block = cb.getFacadeId(); + int meta = cb.getFacadeMetadata(); + if (block == null || block == this) { + return; + } + blockOverride = block; + } + + @Override + public int getDamageValue(World par1World, int x, int y, int z) { + Mimic m = getMimic(par1World, x, y, z); + if (m != null) { + return m.meta; + } + return 0; + } + + private Mimic getMimic(IBlockAccess ba, int x, int y, int z) { + TileEntity te = ba.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + IConduitBundle cb = (IConduitBundle) te; + Block id = cb.getFacadeId(); + int meta = cb.getFacadeMetadata(); + + if (id == null) { + return null; + } + + return new Mimic(id, meta); + } + + class Mimic { + + int meta; + Block block; + + private Mimic(Block block, int meta) { + this.block = block; + this.meta = meta; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index 2a8fd51b..09c20d42 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -1,103 +1,101 @@ package crazypants.enderio.conduit.facade; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.painter.PainterUtil; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.painter.PainterUtil; - public class FacadeRenderer implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(type == ItemRenderType.INVENTORY) { - RenderBlocks renderBlocks = (RenderBlocks) data[0]; - renderToInventory(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - renderEquipped(item, (RenderBlocks) data[0]); - } else if(type == ItemRenderType.ENTITY) { - renderEntity(item, (RenderBlocks) data[0]); - } else { - System.out.println("FacadeRenderer.renderItem: Unsupported render type"); - } - } - - private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { - GL11.glPushMatrix(); - GL11.glScalef(0.5f, 0.5f, 0.5f); - renderToInventory(item, renderBlocks); - GL11.glPopMatrix(); - } - - private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { - renderToInventory(item, renderBlocks); - } - - private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - - Block block = PainterUtil.getSourceBlock(item); - if(block != null) { - // Render the facade block - - RenderUtil.bindBlockTexture(); - if(!block.isOpaqueCube()) { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } - - if("appeng.block.solids.BlockSkyStone".equals(block.getClass().getName())) { - //Yes, this is a horrible hack, but stumped as to why it is rendered invisible if this isn't done. - renderBlocks.setOverrideBlockTexture(block.getIcon(0, PainterUtil.getSourceBlockMetadata(item))); - renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); - } else { - renderBlocks.renderBlockAsItem(block, PainterUtil.getSourceBlockMetadata(item), 1.0F); - } - - // then the 'overlay' that marks it as a facade - GL11.glDepthFunc(GL11.GL_LEQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - RenderUtil.bindItemTexture(); - renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getOverlayIcon()); - renderBlocks.renderBlockAsItem(Blocks.stone, item.getItemDamage(), 1.0F); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - - renderBlocks.clearOverrideBlockTexture(); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - - } else { - renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(item.getItemDamage())); - renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); - renderBlocks.clearOverrideBlockTexture(); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY + || type == ItemRenderType.EQUIPPED + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.EQUIPPED_FIRST_PERSON; } - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (type == ItemRenderType.INVENTORY) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEquipped(item, (RenderBlocks) data[0]); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, (RenderBlocks) data[0]); + } else { + System.out.println("FacadeRenderer.renderItem: Unsupported render type"); + } + } + + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } + + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + + Block block = PainterUtil.getSourceBlock(item); + if (block != null) { + // Render the facade block + + RenderUtil.bindBlockTexture(); + if (!block.isOpaqueCube()) { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + + if ("appeng.block.solids.BlockSkyStone".equals(block.getClass().getName())) { + // Yes, this is a horrible hack, but stumped as to why it is rendered invisible if this isn't done. + renderBlocks.setOverrideBlockTexture(block.getIcon(0, PainterUtil.getSourceBlockMetadata(item))); + renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); + } else { + renderBlocks.renderBlockAsItem(block, PainterUtil.getSourceBlockMetadata(item), 1.0F); + } + + // then the 'overlay' that marks it as a facade + GL11.glDepthFunc(GL11.GL_LEQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + RenderUtil.bindItemTexture(); + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getOverlayIcon()); + renderBlocks.renderBlockAsItem(Blocks.stone, item.getItemDamage(), 1.0F); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + renderBlocks.clearOverrideBlockTexture(); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + + } else { + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(item.getItemDamage())); + renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); + renderBlocks.clearOverrideBlockTexture(); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 74e6992c..17de3ae9 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -1,22 +1,9 @@ package crazypants.enderio.conduit.facade; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.util.Util; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -32,216 +19,241 @@ import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider { - public static enum FacadeType { - BASIC, - HARDENED; + public static enum FacadeType { + BASIC, + HARDENED; - public String getUnlocName(Item me) { - return this == BASIC ? me.getUnlocalizedName() : me.getUnlocalizedName() + ".hardened"; - } - } - - private IIcon[] icons; - - public static ItemConduitFacade create() { - ItemConduitFacade result = new ItemConduitFacade(); - result.init(); - return result; - } - - protected IIcon overlayIcon; - - protected ItemConduitFacade() { - setCreativeTab(EnderIOTab.tabEnderIO); - setMaxStackSize(64); - setHasSubtypes(true); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { - for (FacadeType t : FacadeType.values()) { - list.add(new ItemStack(item, 1, t.ordinal())); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return FacadeType.values()[stack.getItemDamage()].getUnlocName(this); - } - - @Override - public String getUnlocalizedName() { - return "item.enderio." + ModObject.itemConduitFacade.name(); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - icons = new IIcon[FacadeType.values().length]; - icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); - icons[1] = IIconRegister.registerIcon("enderio:conduitFacadeHardened"); - overlayIcon = IIconRegister.registerIcon("enderio:conduitFacadeOverlay"); - } - - public IIcon getOverlayIcon() { - return overlayIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - return icons[damage % icons.length]; - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - return getIconFromDamage(stack.getItemDamage()); - } - - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, - float par9, float par10) { - - if(world.isRemote) { - return true; - } - - ForgeDirection dir = ForgeDirection.values()[side]; - int placeX = x + dir.offsetX; - int placeY = y + dir.offsetY; - int placeZ = z + dir.offsetZ; - - if (player.canPlayerEdit(placeX, placeY, placeZ, side, itemStack) && PainterUtil.getSourceBlock(itemStack) != null) { - if (world.isAirBlock(placeX, placeY, placeZ)) { - world.setBlock(placeX, placeY, placeZ, EnderIO.blockConduitBundle); - IConduitBundle bundle = (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ); - Block facadeID = PainterUtil.getSourceBlock(itemStack); - int facadeMeta = PainterUtil.getSourceBlockMetadata(itemStack); - facadeMeta = PainterUtil.adjustFacadeMetadata(facadeID, facadeMeta, side); - bundle.setFacadeId(facadeID); - bundle.setFacadeMetadata(facadeMeta); - bundle.setFacadeType(FacadeType.values()[itemStack.getItemDamage()]); - ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z); - if (!player.capabilities.isCreativeMode) { - itemStack.stackSize--; + public String getUnlocName(Item me) { + return this == BASIC ? me.getUnlocalizedName() : me.getUnlocalizedName() + ".hardened"; } - return true; - } else { - Block block = world.getBlock(placeX, placeY, placeZ); - if (block == EnderIO.blockConduitBundle) { - ((BlockConduitBundle) block).handleFacadeClick(world, placeX, placeY, placeZ, player, dir.getOpposite().ordinal(), - (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ), itemStack); + } + + private IIcon[] icons; + + public static ItemConduitFacade create() { + ItemConduitFacade result = new ItemConduitFacade(); + result.init(); + return result; + } + + protected IIcon overlayIcon; + + protected ItemConduitFacade() { + setCreativeTab(EnderIOTab.tabEnderIO); + setMaxStackSize(64); + setHasSubtypes(true); + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { + for (FacadeType t : FacadeType.values()) { + list.add(new ItemStack(item, 1, t.ordinal())); } - } - } - - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } - - public ItemStack createItemStackForSourceBlock(Block id, int itemDamage) { - if(id == null) { - id = EnderIO.blockConduitFacade; - } - ItemStack result = new ItemStack(id, 1, 0); - PainterUtil.setSourceBlock(result, id, itemDamage); - return result; - } - - @SuppressWarnings("rawtypes") - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @SuppressWarnings("rawtypes") - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(PainterUtil.getSourceBlock(itemstack) == null) { - list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted")); - } else { - list.add(PainterUtil.getTooltTipText(itemstack)); - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - if(itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { - list.add(""); - list.add(EnderIO.lang.localizeExact(getUnlocalizedName(itemstack) + ".tooltip")); - } - } - - public final class FacadePainterRecipe extends BasicPainterTemplate { - - @Override - public boolean isValidPaintSource(ItemStack paintSource) { - if(paintSource == null) { - return false; - } - if (paintSource.getItem() == ItemConduitFacade.this) { - return true; - } - Block block = Util.getBlockFromItemId(paintSource); - if(block == null || block instanceof IPaintedBlock) { - return false; - } - if(PaintSourceValidator.instance.isBlacklisted(paintSource)) { - return false; - } - if(PaintSourceValidator.instance.isWhitelisted(paintSource)) { - return true; - } - if (!Config.allowTileEntitiesAsPaintSource && block.hasTileEntity(paintSource.getItemDamage())) { - return false; - } - if(block == EnderIO.blockFusedQuartz && paintSource.getItemDamage() < 2) { - return true; - } - return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); } @Override - public boolean isValidTarget(ItemStack target) { - return target != null && target.getItem() == ItemConduitFacade.this; + public String getUnlocalizedName(ItemStack stack) { + return FacadeType.values()[stack.getItemDamage()].getUnlocName(this); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ResultStack[] res = super.getCompletedResult(chance, inputs); - return res; + public String getUnlocalizedName() { + return "item.enderio." + ModObject.itemConduitFacade.name(); } - } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + icons = new IIcon[FacadeType.values().length]; + icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); + icons[1] = IIconRegister.registerIcon("enderio:conduitFacadeHardened"); + overlayIcon = IIconRegister.registerIcon("enderio:conduitFacadeOverlay"); + } + + public IIcon getOverlayIcon() { + return overlayIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + return icons[damage % icons.length]; + } + + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return getIconFromDamage(stack.getItemDamage()); + } + + @Override + public boolean onItemUse( + ItemStack itemStack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + + if (world.isRemote) { + return true; + } + + ForgeDirection dir = ForgeDirection.values()[side]; + int placeX = x + dir.offsetX; + int placeY = y + dir.offsetY; + int placeZ = z + dir.offsetZ; + + if (player.canPlayerEdit(placeX, placeY, placeZ, side, itemStack) + && PainterUtil.getSourceBlock(itemStack) != null) { + if (world.isAirBlock(placeX, placeY, placeZ)) { + world.setBlock(placeX, placeY, placeZ, EnderIO.blockConduitBundle); + IConduitBundle bundle = (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ); + Block facadeID = PainterUtil.getSourceBlock(itemStack); + int facadeMeta = PainterUtil.getSourceBlockMetadata(itemStack); + facadeMeta = PainterUtil.adjustFacadeMetadata(facadeID, facadeMeta, side); + bundle.setFacadeId(facadeID); + bundle.setFacadeMetadata(facadeMeta); + bundle.setFacadeType(FacadeType.values()[itemStack.getItemDamage()]); + ConduitUtil.playPlaceSound(facadeID.stepSound, world, x, y, z); + if (!player.capabilities.isCreativeMode) { + itemStack.stackSize--; + } + return true; + } else { + Block block = world.getBlock(placeX, placeY, placeZ); + if (block == EnderIO.blockConduitBundle) { + ((BlockConduitBundle) block) + .handleFacadeClick( + world, + placeX, + placeY, + placeZ, + player, + dir.getOpposite().ordinal(), + (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ), + itemStack); + } + } + } + + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } + + public ItemStack createItemStackForSourceBlock(Block id, int itemDamage) { + if (id == null) { + id = EnderIO.blockConduitFacade; + } + ItemStack result = new ItemStack(id, 1, 0); + PainterUtil.setSourceBlock(result, id, itemDamage); + return result; + } + + @SuppressWarnings("rawtypes") + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @SuppressWarnings("rawtypes") + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (PainterUtil.getSourceBlock(itemstack) == null) { + list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted")); + } else { + list.add(PainterUtil.getTooltTipText(itemstack)); + } + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); + if (itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { + list.add(""); + list.add(EnderIO.lang.localizeExact(getUnlocalizedName(itemstack) + ".tooltip")); + } + } + + public final class FacadePainterRecipe extends BasicPainterTemplate { + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + if (paintSource == null) { + return false; + } + if (paintSource.getItem() == ItemConduitFacade.this) { + return true; + } + Block block = Util.getBlockFromItemId(paintSource); + if (block == null || block instanceof IPaintedBlock) { + return false; + } + if (PaintSourceValidator.instance.isBlacklisted(paintSource)) { + return false; + } + if (PaintSourceValidator.instance.isWhitelisted(paintSource)) { + return true; + } + if (!Config.allowTileEntitiesAsPaintSource && block.hasTileEntity(paintSource.getItemDamage())) { + return false; + } + if (block == EnderIO.blockFusedQuartz && paintSource.getItemDamage() < 2) { + return true; + } + return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); + } + + @Override + public boolean isValidTarget(ItemStack target) { + return target != null && target.getItem() == ItemConduitFacade.this; + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ResultStack[] res = super.getCompletedResult(chance, inputs); + return res; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 1deec907..be2c586b 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -1,19 +1,7 @@ package crazypants.enderio.conduit.gas; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import mekanism.api.gas.IGasHandler; -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; @@ -22,181 +10,191 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import mekanism.api.gas.IGasHandler; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit { - protected final EnumMap extractionModes = new EnumMap(ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap(ForgeDirection.class); + protected final EnumMap extractionModes = + new EnumMap(ForgeDirection.class); + protected final EnumMap extractionColors = + new EnumMap(ForgeDirection.class); - protected final Map externalRedstoneSignals = new HashMap(); - protected boolean redstoneStateDirty = true; + protected final Map externalRedstoneSignals = new HashMap(); + protected boolean redstoneStateDirty = true; - @Method(modid = GasUtil.API_NAME) - public IGasHandler getExternalHandler(ForgeDirection direction) { - IGasHandler con = GasUtil.getExternalGasHandler(getBundle().getWorld(), getLocation().getLocation(direction)); - return (con != null && !(con instanceof IConduitBundle)) ? con : null; - } - - @Method(modid = GasUtil.API_NAME) - public IGasHandler getTankContainer(BlockCoord bc) { - return GasUtil.getGasHandler(getBundle().getWorld(), bc); - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - IGasHandler h = getExternalHandler(direction); - if(h == null) { - return false; - } - return true; - } - - @Override - public Class getBaseConduitType() { - return IGasConduit.class; - } - - @Override - public boolean onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - return super.onNeighborBlockChange(blockId); - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - extractionModes.put(dir, mode); - redstoneStateDirty = true; - } - - @Override - public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { - RedstoneControlMode res = extractionModes.get(dir); - if(res == null) { - res = RedstoneControlMode.ON; - } - return res; - } - - @Override - public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { - extractionColors.put(dir, col); - } - - @Override - public DyeColor getExtractionSignalColor(ForgeDirection dir) { - DyeColor result = extractionColors.get(dir); - if(result == null) { - return DyeColor.RED; - } - return result; - } - - @Override - public boolean canOutputToDir(ForgeDirection dir) { - if(isExtractingFromDir(dir) || getConnectionMode(dir) == ConnectionMode.DISABLED) { - return false; - } - if(conduitConnections.contains(dir)) { - return true; - } - if(!externalConnections.contains(dir)) { - return false; - } - IGasHandler ext = getExternalHandler(dir); - if(ext instanceof TileReservoir) { // dont push to an auto ejecting - // resevoir or we loop - TileReservoir tr = (TileReservoir) ext; - return !tr.isMultiblock() || !tr.isAutoEject(); - } - return true; - } - - protected boolean autoExtractForDir(ForgeDirection dir) { - if(!isExtractingFromDir(dir)) { - return false; - } - RedstoneControlMode mode = getExtractionRedstoneMode(dir); - if(mode == RedstoneControlMode.IGNORE) { - return true; - } - if(mode == RedstoneControlMode.NEVER) { - return false; - } - if(redstoneStateDirty) { - externalRedstoneSignals.clear(); - redstoneStateDirty = false; + @Method(modid = GasUtil.API_NAME) + public IGasHandler getExternalHandler(ForgeDirection direction) { + IGasHandler con = GasUtil.getExternalGasHandler( + getBundle().getWorld(), getLocation().getLocation(direction)); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; } - DyeColor col = getExtractionSignalColor(dir); - int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - if(RedstoneControlMode.isConditionMet(mode, signal) && mode != RedstoneControlMode.OFF) { - return true; + @Method(modid = GasUtil.API_NAME) + public IGasHandler getTankContainer(BlockCoord bc) { + return GasUtil.getGasHandler(getBundle().getWorld(), bc); } - return isConditionMetByExternalSignal(dir, mode, col); - } - - private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { - int externalSignal = 0; - if(col == DyeColor.RED) { - Integer val = externalRedstoneSignals.get(dir); - if(val == null) { - TileEntity te = getBundle().getEntity(); - externalSignal = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); - externalRedstoneSignals.put(dir, externalSignal); - } else { - externalSignal = val; - } - } - - return RedstoneControlMode.isConditionMet(mode, externalSignal); - } - - @Override - public boolean isExtractingFromDir(ForgeDirection dir) { - return getConnectionMode(dir) == ConnectionMode.INPUT; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - - for (Entry entry : extractionModes.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extRM." + entry.getKey().name(), ord); - } - } - - for (Entry entry : extractionColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extSC." + entry.getKey().name(), ord); - } - } - - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "extRM." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < RedstoneControlMode.values().length) { - extractionModes.put(dir, RedstoneControlMode.values()[ord]); + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IGasHandler h = getExternalHandler(direction); + if (h == null) { + return false; } - } - key = "extSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); - } - } + return true; } - } + @Override + public Class getBaseConduitType() { + return IGasConduit.class; + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + return super.onNeighborBlockChange(blockId); + } + + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + extractionModes.put(dir, mode); + redstoneStateDirty = true; + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = extractionModes.get(dir); + if (res == null) { + res = RedstoneControlMode.ON; + } + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + extractionColors.put(dir, col); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor result = extractionColors.get(dir); + if (result == null) { + return DyeColor.RED; + } + return result; + } + + @Override + public boolean canOutputToDir(ForgeDirection dir) { + if (isExtractingFromDir(dir) || getConnectionMode(dir) == ConnectionMode.DISABLED) { + return false; + } + if (conduitConnections.contains(dir)) { + return true; + } + if (!externalConnections.contains(dir)) { + return false; + } + IGasHandler ext = getExternalHandler(dir); + if (ext instanceof TileReservoir) { // dont push to an auto ejecting + // resevoir or we loop + TileReservoir tr = (TileReservoir) ext; + return !tr.isMultiblock() || !tr.isAutoEject(); + } + return true; + } + + protected boolean autoExtractForDir(ForgeDirection dir) { + if (!isExtractingFromDir(dir)) { + return false; + } + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if (mode == RedstoneControlMode.IGNORE) { + return true; + } + if (mode == RedstoneControlMode.NEVER) { + return false; + } + if (redstoneStateDirty) { + externalRedstoneSignals.clear(); + redstoneStateDirty = false; + } + + DyeColor col = getExtractionSignalColor(dir); + int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); + if (RedstoneControlMode.isConditionMet(mode, signal) && mode != RedstoneControlMode.OFF) { + return true; + } + + return isConditionMetByExternalSignal(dir, mode, col); + } + + private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { + int externalSignal = 0; + if (col == DyeColor.RED) { + Integer val = externalRedstoneSignals.get(dir); + if (val == null) { + TileEntity te = getBundle().getEntity(); + externalSignal = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); + externalRedstoneSignals.put(dir, externalSignal); + } else { + externalSignal = val; + } + } + + return RedstoneControlMode.isConditionMet(mode, externalSignal); + } + + @Override + public boolean isExtractingFromDir(ForgeDirection dir) { + return getConnectionMode(dir) == ConnectionMode.INPUT; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + + for (Entry entry : extractionModes.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extRM." + entry.getKey().name(), ord); + } + } + + for (Entry entry : extractionColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extSC." + entry.getKey().name(), ord); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "extRM." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < RedstoneControlMode.values().length) { + extractionModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "extSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + extractionColors.put(dir, DyeColor.values()[ord]); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java index 4677c9c1..a820d3a2 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java @@ -1,166 +1,160 @@ package crazypants.enderio.conduit.gas; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; +import java.util.List; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public abstract class AbstractGasTankConduit extends AbstractGasConduit { - protected ConduitGasTank tank = new ConduitGasTank(0); - protected boolean stateDirty = false; - protected long lastEmptyTick = 0; - protected int numEmptyEvents = 0; + protected ConduitGasTank tank = new ConduitGasTank(0); + protected boolean stateDirty = false; + protected long lastEmptyTick = 0; + protected int numEmptyEvents = 0; - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(player.getCurrentEquippedItem() == null) { - return false; - } - if(ToolUtil.isToolEquipped(player)) { - - if(!getBundle().getEntity().getWorldObj().isRemote) { - - if(res != null && res.component != null) { - - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; - } - - BlockCoord loc = getLocation().getLocation(faceHit); - IGasConduit n = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IGasConduit.class); - if(n == null) { - return false; - } - if(!canJoinNeighbour(n)) { - return false; - } - if(!(n instanceof AbstractGasTankConduit)) { - return false; - } - AbstractGasTankConduit neighbour = (AbstractGasTankConduit) n; - if(neighbour.getGasType() == null || getGasType() == null) { - GasStack type = getGasType(); - type = type != null ? type : neighbour.getGasType(); - neighbour.setGasTypeOnNetwork(neighbour, type); - setGasTypeOnNetwork(this, type); - } - return ConduitUtil.joinConduits(this, faceHit); - } else if(containsExternalConnection(connDir)) { - // Toggle extraction mode - setConnectionMode(connDir, getNextConnectionMode(connDir)); - } else if(containsConduitConnection(connDir)) { - GasStack curGasType = null; - if(getTankNetwork() != null) { - curGasType = getTankNetwork().getGasType(); - } - ConduitUtil.disconectConduits(this, connDir); - setGasType(curGasType); - - } + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (player.getCurrentEquippedItem() == null) { + return false; } - } - return true; + if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + + if (res != null && res.component != null) { + + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + + BlockCoord loc = getLocation().getLocation(faceHit); + IGasConduit n = ConduitUtil.getConduit( + getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IGasConduit.class); + if (n == null) { + return false; + } + if (!canJoinNeighbour(n)) { + return false; + } + if (!(n instanceof AbstractGasTankConduit)) { + return false; + } + AbstractGasTankConduit neighbour = (AbstractGasTankConduit) n; + if (neighbour.getGasType() == null || getGasType() == null) { + GasStack type = getGasType(); + type = type != null ? type : neighbour.getGasType(); + neighbour.setGasTypeOnNetwork(neighbour, type); + setGasTypeOnNetwork(this, type); + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (containsExternalConnection(connDir)) { + // Toggle extraction mode + setConnectionMode(connDir, getNextConnectionMode(connDir)); + } else if (containsConduitConnection(connDir)) { + GasStack curGasType = null; + if (getTankNetwork() != null) { + curGasType = getTankNetwork().getGasType(); + } + ConduitUtil.disconectConduits(this, connDir); + setGasType(curGasType); + } + } + } + return true; + } + + return false; } - return false; - } - - private void setGasTypeOnNetwork(AbstractGasTankConduit con, GasStack type) { - AbstractConduitNetwork n = con.getNetwork(); - if(n != null) { - AbstractGasTankConduitNetwork network = (AbstractGasTankConduitNetwork) n; - network.setGasType(type); + private void setGasTypeOnNetwork(AbstractGasTankConduit con, GasStack type) { + AbstractConduitNetwork n = con.getNetwork(); + if (n != null) { + AbstractGasTankConduitNetwork network = (AbstractGasTankConduitNetwork) n; + network.setGasType(type); + } } - } + protected abstract boolean canJoinNeighbour(IGasConduit n); - protected abstract boolean canJoinNeighbour(IGasConduit n); + public abstract AbstractGasTankConduitNetwork getTankNetwork(); - public abstract AbstractGasTankConduitNetwork getTankNetwork(); - - @Method(modid = GasUtil.API_NAME) - public void setGasType(GasStack gasType) { - if(tank.getGas() != null && tank.getGas().isGasEqual(gasType)) { - return; + @Method(modid = GasUtil.API_NAME) + public void setGasType(GasStack gasType) { + if (tank.getGas() != null && tank.getGas().isGasEqual(gasType)) { + return; + } + if (gasType != null) { + gasType = gasType.copy(); + } else if (tank.getGas() == null) { + return; + } + tank.setGas(gasType); + stateDirty = true; } - if(gasType != null) { - gasType = gasType.copy(); - } else if(tank.getGas() == null) { - return; - } - tank.setGas(gasType); - stateDirty = true; - } - public ConduitGasTank getTank() { - return tank; - } - - @Method(modid = GasUtil.API_NAME) - public GasStack getGasType() { - GasStack result = null; - if(getTankNetwork() != null) { - result = getTankNetwork().getGasType(); + public ConduitGasTank getTank() { + return tank; } - if(result == null) { - result = tank.getGas(); - } - return result; - } - - @Override - public boolean canOutputToDir(ForgeDirection dir) { - if (super.canOutputToDir(dir)) { - IGasHandler ext = getExternalHandler(dir); - return ext != null && ext.canReceiveGas(dir.getOpposite(), tank.getGasType()); - } - return false; - } - protected abstract void updateTank(); - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - updateTank(); - if(nbtRoot.hasKey("tank")) { - GasStack gas = GasStack.readFromNBT(nbtRoot.getCompoundTag("tank")); - tank.setGas(gas); - } else { - tank.setGas(null); + @Method(modid = GasUtil.API_NAME) + public GasStack getGasType() { + GasStack result = null; + if (getTankNetwork() != null) { + result = getTankNetwork().getGasType(); + } + if (result == null) { + result = tank.getGas(); + } + return result; } - } - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - GasStack gt = getGasType(); - if(GasUtil.isGasValid(gt)) { - updateTank(); - gt = gt.copy(); - gt.amount = tank.getStored(); - nbtRoot.setTag("tank", gt.write(new NBTTagCompound())); + @Override + public boolean canOutputToDir(ForgeDirection dir) { + if (super.canOutputToDir(dir)) { + IGasHandler ext = getExternalHandler(dir); + return ext != null && ext.canReceiveGas(dir.getOpposite(), tank.getGasType()); + } + return false; } - } + protected abstract void updateTank(); + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + updateTank(); + if (nbtRoot.hasKey("tank")) { + GasStack gas = GasStack.readFromNBT(nbtRoot.getCompoundTag("tank")); + tank.setGas(gas); + } else { + tank.setGas(null); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + GasStack gt = getGasType(); + if (GasUtil.isGasValid(gt)) { + updateTank(); + gt = gt.copy(); + gt.amount = tank.getStored(); + nbtRoot.setTag("tank", gt.write(new NBTTagCompound())); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java index 9b3a7503..ebd677bf 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java @@ -1,59 +1,59 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.GasStack; import crazypants.enderio.conduit.AbstractConduitNetwork; +import mekanism.api.gas.GasStack; -public class AbstractGasTankConduitNetwork extends AbstractConduitNetwork { +public class AbstractGasTankConduitNetwork + extends AbstractConduitNetwork { - protected GasStack gasType; + protected GasStack gasType; - protected AbstractGasTankConduitNetwork(Class cl) { - super(cl, IGasConduit.class); - } - - public GasStack getGasType() { - return gasType; - } - - @Override - public void addConduit(T con) { - super.addConduit(con); - con.setGasType(gasType); - } - - public boolean setGasType(GasStack newType) { - if(gasType != null && gasType.isGasEqual(newType)) { - return false; + protected AbstractGasTankConduitNetwork(Class cl) { + super(cl, IGasConduit.class); } - if(newType != null) { - gasType = newType.copy(); - gasType.amount = 0; - } else { - gasType = null; - } - for (AbstractGasTankConduit conduit : conduits) { - conduit.setGasType(gasType); - } - return true; - } - public boolean canAcceptGas(GasStack acceptable) { - return areGassCompatable(gasType, acceptable); - } - - public static boolean areGassCompatable(GasStack a, GasStack b) { - if(a == null || b == null) { - return true; + public GasStack getGasType() { + return gasType; } - return a.isGasEqual(b); - } - public int getTotalVolume() { - int totalVolume = 0; - for (T con : conduits) { - totalVolume += con.getTank().getStored(); + @Override + public void addConduit(T con) { + super.addConduit(con); + con.setGasType(gasType); } - return totalVolume; - } + public boolean setGasType(GasStack newType) { + if (gasType != null && gasType.isGasEqual(newType)) { + return false; + } + if (newType != null) { + gasType = newType.copy(); + gasType.amount = 0; + } else { + gasType = null; + } + for (AbstractGasTankConduit conduit : conduits) { + conduit.setGasType(gasType); + } + return true; + } + + public boolean canAcceptGas(GasStack acceptable) { + return areGassCompatable(gasType, acceptable); + } + + public static boolean areGassCompatable(GasStack a, GasStack b) { + if (a == null || b == null) { + return true; + } + return a.isGasEqual(b); + } + + public int getTotalVolume() { + int totalVolume = 0; + for (T con : conduits) { + totalVolume += con.getTank().getStored(); + } + return totalVolume; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java index c7f49103..19fe8685 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java @@ -1,156 +1,154 @@ package crazypants.enderio.conduit.gas; +import cpw.mods.fml.common.Optional.Method; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.Optional.Method; public class ConduitGasTank extends GasTank { - private int capacity; + private int capacity; - ConduitGasTank(int capacity) { - super(capacity); - this.capacity = capacity; - } - - public float getFilledRatio() { - if(getStored() <= 0) { - return 0; - } - if(getMaxGas() <= 0) { - return -1; - } - float res = (float) getStored() / getMaxGas(); - return res; - } - - public boolean isFull() { - return getStored() >= getMaxGas(); - } - - public void setAmount(int amount) { - if(stored != null) { - stored.amount = amount; - } - } - - public int getAvailableSpace() { - return getMaxGas() - getStored(); - } - - public void addAmount(int amount) { - setAmount(getStored() + amount); - } - - @Override - public int getMaxGas() { - return this.capacity; - } - - public void setCapacity(int capacity) { - this.capacity = capacity; - if(getStored() > capacity) { - setAmount(capacity); - } - } - - @Override - @Method(modid = GasUtil.API_NAME) - public int receive(GasStack resource, boolean doReceive) { - if(resource == null || resource.getGas().getID() < 0) { - return 0; + ConduitGasTank(int capacity) { + super(capacity); + this.capacity = capacity; } - if(stored == null || stored.getGas().getID() < 0) { - if(resource.amount <= capacity) { - if(doReceive) { - setGas(resource.copy()); + public float getFilledRatio() { + if (getStored() <= 0) { + return 0; } - return resource.amount; - } else { - if(doReceive) { - stored = resource.copy(); - stored.amount = capacity; + if (getMaxGas() <= 0) { + return -1; } - return capacity; - } + float res = (float) getStored() / getMaxGas(); + return res; } - if(!stored.isGasEqual(resource)) { - return 0; + public boolean isFull() { + return getStored() >= getMaxGas(); } - int space = capacity - stored.amount; - if(resource.amount <= space) { - if(doReceive) { - addAmount(resource.amount); - } - return resource.amount; - } else { - if(doReceive) { - stored.amount = capacity; - } - return space; + public void setAmount(int amount) { + if (stored != null) { + stored.amount = amount; + } } - } - - @Override - @Method(modid = GasUtil.API_NAME) - public GasStack draw(int maxDrain, boolean doDraw) { - if(stored == null || stored.getGas().getID() < 0) { - return null; - } - if(stored.amount <= 0) { - return null; + public int getAvailableSpace() { + return getMaxGas() - getStored(); } - int used = maxDrain; - if(stored.amount < used) { - used = stored.amount; + public void addAmount(int amount) { + setAmount(getStored() + amount); } - if(doDraw) { - addAmount(-used); + @Override + public int getMaxGas() { + return this.capacity; } - GasStack drained = new GasStack(stored.getGas().getID(), used); - - if(stored.amount < 0) { - stored.amount = 0; + public void setCapacity(int capacity) { + this.capacity = capacity; + if (getStored() > capacity) { + setAmount(capacity); + } } - return drained; - } - public String getGasName() { - return stored != null ? stored.getGas().getLocalizedName() : null; - } + @Override + @Method(modid = GasUtil.API_NAME) + public int receive(GasStack resource, boolean doReceive) { + if (resource == null || resource.getGas().getID() < 0) { + return 0; + } - public boolean containsValidGas() { - return GasUtil.isGasValid(stored); - } + if (stored == null || stored.getGas().getID() < 0) { + if (resource.amount <= capacity) { + if (doReceive) { + setGas(resource.copy()); + } + return resource.amount; + } else { + if (doReceive) { + stored = resource.copy(); + stored.amount = capacity; + } + return capacity; + } + } - public NBTTagCompound write(NBTTagCompound nbt) { - if(containsValidGas()) { - stored.write(nbt); - } else { - nbt.setBoolean("emptyGasTank", true); + if (!stored.isGasEqual(resource)) { + return 0; + } + + int space = capacity - stored.amount; + if (resource.amount <= space) { + if (doReceive) { + addAmount(resource.amount); + } + return resource.amount; + } else { + if (doReceive) { + stored.amount = capacity; + } + return space; + } } - return nbt; - } - public void read(NBTTagCompound nbt) { - if(!nbt.hasKey("emptyGasTank")) { - GasStack gas = GasStack.readFromNBT(nbt); - if(gas != null) { - setGas(gas); - } + @Override + @Method(modid = GasUtil.API_NAME) + public GasStack draw(int maxDrain, boolean doDraw) { + if (stored == null || stored.getGas().getID() < 0) { + return null; + } + if (stored.amount <= 0) { + return null; + } + + int used = maxDrain; + if (stored.amount < used) { + used = stored.amount; + } + + if (doDraw) { + addAmount(-used); + } + + GasStack drained = new GasStack(stored.getGas().getID(), used); + + if (stored.amount < 0) { + stored.amount = 0; + } + return drained; } - } - public boolean isEmpty() { - return stored == null || stored.amount == 0; - } + public String getGasName() { + return stored != null ? stored.getGas().getLocalizedName() : null; + } + public boolean containsValidGas() { + return GasUtil.isGasValid(stored); + } + + public NBTTagCompound write(NBTTagCompound nbt) { + if (containsValidGas()) { + stored.write(nbt); + } else { + nbt.setBoolean("emptyGasTank", true); + } + return nbt; + } + + public void read(NBTTagCompound nbt) { + if (!nbt.hasKey("emptyGasTank")) { + GasStack gas = GasStack.readFromNBT(nbt); + if (gas != null) { + setGas(gas); + } + } + } + + public boolean isEmpty() { + return stored == null || stored.amount == 0; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java index 6a7c7867..3a96c2ab 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java @@ -1,19 +1,7 @@ package crazypants.enderio.conduit.gas; -import java.util.HashMap; -import java.util.Map; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,263 +11,271 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; +import java.util.HashMap; +import java.util.Map; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class GasConduit extends AbstractGasTankConduit { - public static final int CONDUIT_VOLUME = 1000; + public static final int CONDUIT_VOLUME = 1000; - public static final String ICON_KEY = "enderio:gasConduit"; - public static final String ICON_CORE_KEY = "enderio:gasConduitCore"; - public static final String ICON_EXTRACT_KEY = "enderio:gasConduitInput"; - public static final String ICON_INSERT_KEY = "enderio:gasConduitOutput"; - public static final String ICON_EMPTY_EDGE = "enderio:gasConduitEdge"; + public static final String ICON_KEY = "enderio:gasConduit"; + public static final String ICON_CORE_KEY = "enderio:gasConduitCore"; + public static final String ICON_EXTRACT_KEY = "enderio:gasConduitInput"; + public static final String ICON_INSERT_KEY = "enderio:gasConduitOutput"; + public static final String ICON_EMPTY_EDGE = "enderio:gasConduitEdge"; - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); - ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); - ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); - ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); - ICONS.put(ICON_EMPTY_EDGE, register.registerIcon(ICON_EMPTY_EDGE)); - } + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); + ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); + ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); + ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); + ICONS.put(ICON_EMPTY_EDGE, register.registerIcon(ICON_EMPTY_EDGE)); + } - @Override - public int getTextureType() { - return 0; - } - - }); - } - - private GasConduitNetwork network; - - private long ticksSinceFailedExtract = 0; - - public static final int MAX_EXTRACT_PER_TICK = Config.gasConduitExtractRate; - - public static final int MAX_IO_PER_TICK = Config.gasConduitMaxIoRate; - - public GasConduit() { - updateTank(); - } - - @Override - public void updateEntity(World world) { - super.updateEntity(world); - if(world.isRemote) { - return; - } - doExtract(); - if(stateDirty) { - getBundle().dirty(); - stateDirty = false; - } - } - - private void doExtract() { - BlockCoord loc = getLocation(); - if(!hasConnectionMode(ConnectionMode.INPUT)) { - return; - } - if(network == null) { - return; + @Override + public int getTextureType() { + return 0; + } + }); } - // assume failure, reset to 0 if we do extract - ticksSinceFailedExtract++; - if(ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { - // after 25 ticks of failing, only check every 10 ticks - return; + private GasConduitNetwork network; + + private long ticksSinceFailedExtract = 0; + + public static final int MAX_EXTRACT_PER_TICK = Config.gasConduitExtractRate; + + public static final int MAX_IO_PER_TICK = Config.gasConduitMaxIoRate; + + public GasConduit() { + updateTank(); } - Gas f = tank.getGas() == null ? null : tank.getGas().getGas(); - for (ForgeDirection dir : externalConnections) { - if(autoExtractForDir(dir)) { - if(network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) { - ticksSinceFailedExtract = 0; + @Override + public void updateEntity(World world) { + super.updateEntity(world); + if (world.isRemote) { + return; + } + doExtract(); + if (stateDirty) { + getBundle().dirty(); + stateDirty = false; } - } } - } + private void doExtract() { + BlockCoord loc = getLocation(); + if (!hasConnectionMode(ConnectionMode.INPUT)) { + return; + } + if (network == null) { + return; + } - @Override - protected void updateTank() { - tank.setCapacity(CONDUIT_VOLUME); - if(network != null) { - network.updateConduitVolumes(); - } - } + // assume failure, reset to 0 if we do extract + ticksSinceFailedExtract++; + if (ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { + // after 25 ticks of failing, only check every 10 ticks + return; + } - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemGasConduit); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - if(network == null) { - this.network = null; - return true; - } - if(!(network instanceof GasConduitNetwork)) { - return false; + Gas f = tank.getGas() == null ? null : tank.getGas().getGas(); + for (ForgeDirection dir : externalConnections) { + if (autoExtractForDir(dir)) { + if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) { + ticksSinceFailedExtract = 0; + } + } + } } - GasConduitNetwork n = (GasConduitNetwork) network; - if(tank.getGas() == null) { - tank.setGas(n.getGasType() == null ? null : n.getGasType().copy()); - } else if(n.getGasType() == null) { - n.setGasType(tank.getGas()); - } else if(!tank.getGas().isGasEqual(n.getGasType())) { - return false; + @Override + protected void updateTank() { + tank.setCapacity(CONDUIT_VOLUME); + if (network != null) { + network.updateConduitVolumes(); + } } - this.network = n; - return true; - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { - if(!super.canConnectToConduit(direction, con)) { - return false; + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemGasConduit); } - if(!(con instanceof GasConduit)) { - return false; + + @Override + public AbstractConduitNetwork getNetwork() { + return network; } - if(getGasType() != null && ((GasConduit) con).getGasType() == null) { - return false; + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + this.network = null; + return true; + } + if (!(network instanceof GasConduitNetwork)) { + return false; + } + + GasConduitNetwork n = (GasConduitNetwork) network; + if (tank.getGas() == null) { + tank.setGas(n.getGasType() == null ? null : n.getGasType().copy()); + } else if (n.getGasType() == null) { + n.setGasType(tank.getGas()); + } else if (!tank.getGas().isGasEqual(n.getGasType())) { + return false; + } + this.network = n; + return true; } - return GasConduitNetwork.areGassCompatable(getGasType(), ((GasConduit) con).getGasType()); - } - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - refreshInputs(dir); - } - - private void refreshInputs(ForgeDirection dir) { - if(network == null) { - return; + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { + if (!super.canConnectToConduit(direction, con)) { + return false; + } + if (!(con instanceof GasConduit)) { + return false; + } + if (getGasType() != null && ((GasConduit) con).getGasType() == null) { + return false; + } + return GasConduitNetwork.areGassCompatable(getGasType(), ((GasConduit) con).getGasType()); } - GasOutput lo = new GasOutput(getLocation().getLocation(dir), dir.getOpposite()); - network.removeInput(lo); - if(getConnectionMode(dir).acceptsOutput() && containsExternalConnection(dir)) { - network.addInput(lo); + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + refreshInputs(dir); } - } - @Override - public void externalConnectionAdded(ForgeDirection fromDirection) { - super.externalConnectionAdded(fromDirection); - refreshInputs(fromDirection); - } - - @Override - public void externalConnectionRemoved(ForgeDirection fromDirection) { - super.externalConnectionRemoved(fromDirection); - refreshInputs(fromDirection); - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return ICONS.get(ICON_CORE_KEY); + private void refreshInputs(ForgeDirection dir) { + if (network == null) { + return; + } + GasOutput lo = new GasOutput(getLocation().getLocation(dir), dir.getOpposite()); + network.removeInput(lo); + if (getConnectionMode(dir).acceptsOutput() && containsExternalConnection(dir)) { + network.addInput(lo); + } } - return ICONS.get(ICON_KEY); - } - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_EXTRACT_KEY); - } - - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_INSERT_KEY); - } - - public IIcon getNotSetEdgeTexture() { - return ICONS.get(ICON_EMPTY_EDGE); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - if(isActive() && tank.containsValidGas()) { - return tank.getGas().getGas().getIcon(); + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + super.externalConnectionAdded(fromDirection); + refreshInputs(fromDirection); } - return null; - } - // ------------------------------------------- Gas API - - @Override - @Deprecated - @Method(modid = GasUtil.API_NAME) - public int receiveGas(ForgeDirection side, GasStack stack) { - return receiveGas(side, stack, true); - } - - @Override - @Method(modid = GasUtil.API_NAME) - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { - if(network == null || !getConnectionMode(side).acceptsInput()) { - return 0; + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + super.externalConnectionRemoved(fromDirection); + refreshInputs(fromDirection); } - return network.fill(side, stack, doTransfer); - } - @Override - @Deprecated - @Method(modid = GasUtil.API_NAME) - public GasStack drawGas(ForgeDirection side, int amount) { - return drawGas(side, amount, true); - } - - @Override - @Method(modid = GasUtil.API_NAME) - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { - if(network == null || !getConnectionMode(side).acceptsOutput()) { - return null; + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY); + } + return ICONS.get(ICON_KEY); } - return network.drain(side, amount, doTransfer); - } - @Override - @Method(modid = GasUtil.API_NAME) - public boolean canReceiveGas(ForgeDirection from, Gas gas) { - if(network == null) { - return false; + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_EXTRACT_KEY); } - return getConnectionMode(from).acceptsInput() && GasConduitNetwork.areGassCompatable(getGasType(), new GasStack(gas, 0)); - } - @Override - @Method(modid = GasUtil.API_NAME) - public boolean canDrawGas(ForgeDirection from, Gas gas) { - if(network == null) { - return false; + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_INSERT_KEY); } - return getConnectionMode(from).acceptsOutput() && GasConduitNetwork.areGassCompatable(getGasType(), new GasStack(gas, 0)); - } - @Override - protected boolean canJoinNeighbour(IGasConduit n) { - return n instanceof GasConduit; - } + public IIcon getNotSetEdgeTexture() { + return ICONS.get(ICON_EMPTY_EDGE); + } - @Override - public AbstractGasTankConduitNetwork getTankNetwork() { - return network; - } + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + if (isActive() && tank.containsValidGas()) { + return tank.getGas().getGas().getIcon(); + } + return null; + } + + // ------------------------------------------- Gas API + + @Override + @Deprecated + @Method(modid = GasUtil.API_NAME) + public int receiveGas(ForgeDirection side, GasStack stack) { + return receiveGas(side, stack, true); + } + + @Override + @Method(modid = GasUtil.API_NAME) + public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { + if (network == null || !getConnectionMode(side).acceptsInput()) { + return 0; + } + return network.fill(side, stack, doTransfer); + } + + @Override + @Deprecated + @Method(modid = GasUtil.API_NAME) + public GasStack drawGas(ForgeDirection side, int amount) { + return drawGas(side, amount, true); + } + + @Override + @Method(modid = GasUtil.API_NAME) + public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { + if (network == null || !getConnectionMode(side).acceptsOutput()) { + return null; + } + return network.drain(side, amount, doTransfer); + } + + @Override + @Method(modid = GasUtil.API_NAME) + public boolean canReceiveGas(ForgeDirection from, Gas gas) { + if (network == null) { + return false; + } + return getConnectionMode(from).acceptsInput() + && GasConduitNetwork.areGassCompatable(getGasType(), new GasStack(gas, 0)); + } + + @Override + @Method(modid = GasUtil.API_NAME) + public boolean canDrawGas(ForgeDirection from, Gas gas) { + if (network == null) { + return false; + } + return getConnectionMode(from).acceptsOutput() + && GasConduitNetwork.areGassCompatable(getGasType(), new GasStack(gas, 0)); + } + + @Override + protected boolean canJoinNeighbour(IGasConduit n) { + return n instanceof GasConduit; + } + + @Override + public AbstractGasTankConduitNetwork getTankNetwork() { + return network; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index 236573b7..e0a3f258 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -1,270 +1,270 @@ package crazypants.enderio.conduit.gas; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.IConduit; import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.IConduit; - public class GasConduitNetwork extends AbstractGasTankConduitNetwork { - private final ConduitGasTank tank = new ConduitGasTank(0); + private final ConduitGasTank tank = new ConduitGasTank(0); - private final Set outputs = new HashSet(); + private final Set outputs = new HashSet(); - private Iterator outputIterator; + private Iterator outputIterator; - private int ticksActiveUnsynced; + private int ticksActiveUnsynced; - private boolean lastSyncedActive = false; + private boolean lastSyncedActive = false; - private int lastSyncedVolume = -1; + private int lastSyncedVolume = -1; - public GasConduitNetwork() { - super(GasConduit.class); - } - - @Override - public void addConduit(GasConduit con) { - tank.setCapacity(tank.getMaxGas() + GasConduit.CONDUIT_VOLUME); - if(con.getTank().containsValidGas()) { - tank.addAmount(con.getTank().getStored()); + public GasConduitNetwork() { + super(GasConduit.class); } - for (ForgeDirection dir : con.getExternalConnections()) { - if(con.getConnectionMode(dir).acceptsOutput()) { - outputs.add(new GasOutput(con.getLocation().getLocation(dir), dir.getOpposite())); - } - } - outputIterator = null; - super.addConduit(con); - } - @Override - public boolean setGasType(GasStack newType) { - if(super.setGasType(newType)) { - - GasStack ft = getGasType(); - tank.setGas(ft == null ? null : ft.copy()); - return true; - } - return false; - } - - @Override - public void destroyNetwork() { - setConduitVolumes(); - outputs.clear(); - super.destroyNetwork(); - } - - private void setConduitVolumes() { - if(tank.containsValidGas() && !conduits.isEmpty()) { - GasStack gasPerConduit = tank.getGas().copy(); - int numCons = conduits.size(); - int leftOvers = gasPerConduit.amount % numCons; - gasPerConduit.amount = gasPerConduit.amount / numCons; - - for (GasConduit con : conduits) { - GasStack f = gasPerConduit.copy(); - if(leftOvers > 0) { - f.amount += 1; - leftOvers--; + @Override + public void addConduit(GasConduit con) { + tank.setCapacity(tank.getMaxGas() + GasConduit.CONDUIT_VOLUME); + if (con.getTank().containsValidGas()) { + tank.addAmount(con.getTank().getStored()); } - con.getTank().setGas(f); - BlockCoord bc = con.getLocation(); - con.getBundle().getEntity().getWorldObj().markTileEntityChunkModified(bc.x, bc.y, bc.z, con.getBundle().getEntity()); - } - - } - } - - @Override - public void doNetworkTick() { - if(gasType == null || outputs.isEmpty() || !tank.containsValidGas() || tank.isEmpty()) { - updateActiveState(); - return; - } - - if(outputIterator == null || !outputIterator.hasNext()) { - outputIterator = outputs.iterator(); - } - - updateActiveState(); - - int numVisited = 0; - while (!tank.isEmpty() && numVisited < outputs.size()) { - if(!outputIterator.hasNext()) { - outputIterator = outputs.iterator(); - } - GasOutput output = outputIterator.next(); - if(output != null) { - IGasHandler cont = getTankContainer(output.location); - if(cont != null) { - GasStack offer = tank.getGas().copy(); - int filled = cont.receiveGas(output.dir, offer); - if(filled > 0) { - tank.addAmount(-filled); - - } + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.getConnectionMode(dir).acceptsOutput()) { + outputs.add(new GasOutput(con.getLocation().getLocation(dir), dir.getOpposite())); + } } - } - numVisited++; + outputIterator = null; + super.addConduit(con); } - } + @Override + public boolean setGasType(GasStack newType) { + if (super.setGasType(newType)) { - private void updateActiveState() { - boolean isActive = tank.containsValidGas() && !tank.isEmpty(); - if(lastSyncedActive != isActive) { - ticksActiveUnsynced++; - } else { - ticksActiveUnsynced = 0; - } - if(ticksActiveUnsynced >= 10 || ticksActiveUnsynced > 0 && isActive) { - if(!isActive) { - setGasType(null); - } - for (IConduit con : conduits) { - con.setActive(isActive); - } - lastSyncedActive = isActive; - ticksActiveUnsynced = 0; - } - } - - public int fill(ForgeDirection from, GasStack resource, boolean doFill) { - if(resource == null) { - return 0; - } - resource.amount = Math.min(resource.amount, GasConduit.MAX_IO_PER_TICK); - boolean gasWasValid = tank.containsValidGas(); - int res = tank.receive(resource, doFill); - if(doFill && res > 0 && gasWasValid) { - int vol = tank.getStored(); - setGasType(resource); - tank.setAmount(vol); - } - return res; - } - - public GasStack drain(ForgeDirection from, GasStack resource, boolean doDrain) { - if(resource == null || tank.isEmpty() || !tank.containsValidGas() || !GasConduitNetwork.areGassCompatable(getGasType(), resource)) { - return null; - } - int amount = Math.min(resource.amount, tank.getStored()); - amount = Math.min(amount, GasConduit.MAX_IO_PER_TICK); - GasStack result = resource.copy(); - result.amount = amount; - if(doDrain) { - tank.addAmount(-amount); - } - return result; - } - - public GasStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(tank.isEmpty() || !tank.containsValidGas()) { - return null; - } - int amount = Math.min(maxDrain, tank.getStored()); - GasStack result = tank.getGas().copy(); - result.amount = amount; - if(doDrain) { - tank.addAmount(-amount); - } - return result; - } - - public boolean extractFrom(GasConduit advancedGasConduit, ForgeDirection dir, int maxExtractPerTick) { - - if(tank.isFull()) { - return false; - } - - IGasHandler extTank = getTankContainer(advancedGasConduit, dir); - if(extTank != null) { - int maxExtract = Math.min(maxExtractPerTick, tank.getAvailableSpace()); - - if(gasType == null || !tank.containsValidGas()) { - GasStack drained = extTank.drawGas(dir.getOpposite(), maxExtract); - if(drained == null || drained.amount <= 0) { - return false; + GasStack ft = getGasType(); + tank.setGas(ft == null ? null : ft.copy()); + return true; } - setGasType(drained); - tank.setGas(drained.copy()); - return true; - } - - GasStack couldDrain = gasType.copy(); - couldDrain.amount = maxExtract; - - // GasStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); - // if(drained == null || drained.amount <= 0) { - // return false; - // } - // tank.addAmount(drained.amount); - - //Have to use this 'double handle' approach to work around an issue with TiC - GasStack drained = extTank.drawGas(dir.getOpposite(), maxExtract); - if(drained == null || drained.amount == 0) { return false; - } else { - if(drained.isGasEqual(getGasType())) { - tank.addAmount(drained.amount); + } + + @Override + public void destroyNetwork() { + setConduitVolumes(); + outputs.clear(); + super.destroyNetwork(); + } + + private void setConduitVolumes() { + if (tank.containsValidGas() && !conduits.isEmpty()) { + GasStack gasPerConduit = tank.getGas().copy(); + int numCons = conduits.size(); + int leftOvers = gasPerConduit.amount % numCons; + gasPerConduit.amount = gasPerConduit.amount / numCons; + + for (GasConduit con : conduits) { + GasStack f = gasPerConduit.copy(); + if (leftOvers > 0) { + f.amount += 1; + leftOvers--; + } + con.getTank().setGas(f); + BlockCoord bc = con.getLocation(); + con.getBundle() + .getEntity() + .getWorldObj() + .markTileEntityChunkModified( + bc.x, bc.y, bc.z, con.getBundle().getEntity()); + } } - } - return true; } - return false; - } - public IGasHandler getTankContainer(BlockCoord bc) { - World w = getWorld(); - if(w == null) { - return null; + @Override + public void doNetworkTick() { + if (gasType == null || outputs.isEmpty() || !tank.containsValidGas() || tank.isEmpty()) { + updateActiveState(); + return; + } + + if (outputIterator == null || !outputIterator.hasNext()) { + outputIterator = outputs.iterator(); + } + + updateActiveState(); + + int numVisited = 0; + while (!tank.isEmpty() && numVisited < outputs.size()) { + if (!outputIterator.hasNext()) { + outputIterator = outputs.iterator(); + } + GasOutput output = outputIterator.next(); + if (output != null) { + IGasHandler cont = getTankContainer(output.location); + if (cont != null) { + GasStack offer = tank.getGas().copy(); + int filled = cont.receiveGas(output.dir, offer); + if (filled > 0) { + tank.addAmount(-filled); + } + } + } + numVisited++; + } } - TileEntity te = w.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof IGasHandler) { - return (IGasHandler) te; + + private void updateActiveState() { + boolean isActive = tank.containsValidGas() && !tank.isEmpty(); + if (lastSyncedActive != isActive) { + ticksActiveUnsynced++; + } else { + ticksActiveUnsynced = 0; + } + if (ticksActiveUnsynced >= 10 || ticksActiveUnsynced > 0 && isActive) { + if (!isActive) { + setGasType(null); + } + for (IConduit con : conduits) { + con.setActive(isActive); + } + lastSyncedActive = isActive; + ticksActiveUnsynced = 0; + } } - return null; - } - public IGasHandler getTankContainer(GasConduit con, ForgeDirection dir) { - BlockCoord bc = con.getLocation().getLocation(dir); - return getTankContainer(bc); - } - - World getWorld() { - if(conduits.isEmpty()) { - return null; + public int fill(ForgeDirection from, GasStack resource, boolean doFill) { + if (resource == null) { + return 0; + } + resource.amount = Math.min(resource.amount, GasConduit.MAX_IO_PER_TICK); + boolean gasWasValid = tank.containsValidGas(); + int res = tank.receive(resource, doFill); + if (doFill && res > 0 && gasWasValid) { + int vol = tank.getStored(); + setGasType(resource); + tank.setAmount(vol); + } + return res; } - return conduits.get(0).getBundle().getWorld(); - } - public void removeInput(GasOutput lo) { - outputs.remove(lo); - outputIterator = null; - } - - public void addInput(GasOutput lo) { - outputs.add(lo); - outputIterator = null; - } - - public void updateConduitVolumes() { - if(tank.getStored() == lastSyncedVolume) { - return; + public GasStack drain(ForgeDirection from, GasStack resource, boolean doDrain) { + if (resource == null + || tank.isEmpty() + || !tank.containsValidGas() + || !GasConduitNetwork.areGassCompatable(getGasType(), resource)) { + return null; + } + int amount = Math.min(resource.amount, tank.getStored()); + amount = Math.min(amount, GasConduit.MAX_IO_PER_TICK); + GasStack result = resource.copy(); + result.amount = amount; + if (doDrain) { + tank.addAmount(-amount); + } + return result; } - setConduitVolumes(); - lastSyncedVolume = tank.getStored(); - } + public GasStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (tank.isEmpty() || !tank.containsValidGas()) { + return null; + } + int amount = Math.min(maxDrain, tank.getStored()); + GasStack result = tank.getGas().copy(); + result.amount = amount; + if (doDrain) { + tank.addAmount(-amount); + } + return result; + } + + public boolean extractFrom(GasConduit advancedGasConduit, ForgeDirection dir, int maxExtractPerTick) { + + if (tank.isFull()) { + return false; + } + + IGasHandler extTank = getTankContainer(advancedGasConduit, dir); + if (extTank != null) { + int maxExtract = Math.min(maxExtractPerTick, tank.getAvailableSpace()); + + if (gasType == null || !tank.containsValidGas()) { + GasStack drained = extTank.drawGas(dir.getOpposite(), maxExtract); + if (drained == null || drained.amount <= 0) { + return false; + } + setGasType(drained); + tank.setGas(drained.copy()); + return true; + } + + GasStack couldDrain = gasType.copy(); + couldDrain.amount = maxExtract; + + // GasStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); + // if(drained == null || drained.amount <= 0) { + // return false; + // } + // tank.addAmount(drained.amount); + + // Have to use this 'double handle' approach to work around an issue with TiC + GasStack drained = extTank.drawGas(dir.getOpposite(), maxExtract); + if (drained == null || drained.amount == 0) { + return false; + } else { + if (drained.isGasEqual(getGasType())) { + tank.addAmount(drained.amount); + } + } + return true; + } + return false; + } + + public IGasHandler getTankContainer(BlockCoord bc) { + World w = getWorld(); + if (w == null) { + return null; + } + TileEntity te = w.getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof IGasHandler) { + return (IGasHandler) te; + } + return null; + } + + public IGasHandler getTankContainer(GasConduit con, ForgeDirection dir) { + BlockCoord bc = con.getLocation().getLocation(dir); + return getTankContainer(bc); + } + + World getWorld() { + if (conduits.isEmpty()) { + return null; + } + return conduits.get(0).getBundle().getWorld(); + } + + public void removeInput(GasOutput lo) { + outputs.remove(lo); + outputIterator = null; + } + + public void addInput(GasOutput lo) { + outputs.add(lo); + outputIterator = null; + } + + public void updateConduitVolumes() { + if (tank.getStored() == lastSyncedVolume) { + return; + } + setConduitVolumes(); + lastSyncedVolume = tank.getStored(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index 4726d790..42fb396e 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -1,17 +1,11 @@ package crazypants.enderio.conduit.gas; -import java.util.List; -import mekanism.api.gas.GasStack; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; +import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -21,161 +15,171 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; - -import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; +import java.util.List; +import mekanism.api.gas.GasStack; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class GasConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit instanceof GasConduit; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - - if(!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { - return; + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof GasConduit; } - GasConduit pc = (GasConduit) conduit; - for (ForgeDirection dir : conduit.getExternalConnections()) { - IIcon tex = null; - if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { - tex = pc.getTextureForInputMode(); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { - tex = pc.getTextureForOutputMode(); - } - if(tex != null) { - Offset offset = te.getOffset(IGasConduit.class, dir); - ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); - } - } - } - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - super.renderConduit(tex, conduit, component, brightness); - - if(isNSEWUD(component.dir)) { - GasConduit lc = (GasConduit) conduit; - - GasStack gas = lc.getGasType(); - IIcon texture = null; - if(gas != null) { - texture = gas.getGas().getIcon(); - } - - if(texture == null) { - texture = lc.getNotSetEdgeTexture(); - } - - float scaleFactor = 0.75f; - float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; - float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; - float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; - - BoundingBox cube = component.bound; - BoundingBox bb = cube.scale(xLen, yLen, zLen); - - for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - if(d != component.dir && d != component.dir.getOpposite()) { - - ForgeDirection vDir = RenderUtil.getVDirForFace(d); - if(component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { - vDir = RenderUtil.getUDirForFace(d); - } else if((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) && d.offsetY != 0) { - vDir = RenderUtil.getUDirForFace(d); - } - - float minU = texture.getMinU(); - float maxU = texture.getMaxU(); - float minV = texture.getMinV(); - float maxV = texture.getMaxV(); - - float sideScale = Math.max(bb.sizeX(), bb.sizeY()) * 2 / 16f; - sideScale = Math.max(sideScale, bb.sizeZ() * 2 / 16f); - float width = Math.min(bb.sizeX(), bb.sizeY()) * 15f / 16f; - - List corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); - moveEdgeCorners(corners, vDir, width); - moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - - corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); - moveEdgeCorners(corners, vDir.getOpposite(), width); - moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); + if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { + return; } - } - - if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); - Tessellator tessellator = Tessellator.instance; - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); + GasConduit pc = (GasConduit) conduit; + for (ForgeDirection dir : conduit.getExternalConnections()) { + IIcon tex = null; + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + tex = pc.getTextureForInputMode(); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + tex = pc.getTextureForOutputMode(); + } + if (tex != null) { + Offset offset = te.getOffset(IGasConduit.class, dir); + ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); + } } - //back face - for (int i = corners.size() - 1; i >= 0; i--) { - Vertex c = corners.get(i); - addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { + super.renderConduit(tex, conduit, component, brightness); + + if (isNSEWUD(component.dir)) { + GasConduit lc = (GasConduit) conduit; + + GasStack gas = lc.getGasType(); + IIcon texture = null; + if (gas != null) { + texture = gas.getGas().getIcon(); + } + + if (texture == null) { + texture = lc.getNotSetEdgeTexture(); + } + + float scaleFactor = 0.75f; + float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; + float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; + float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; + + BoundingBox cube = component.bound; + BoundingBox bb = cube.scale(xLen, yLen, zLen); + + for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { + if (d != component.dir && d != component.dir.getOpposite()) { + + ForgeDirection vDir = RenderUtil.getVDirForFace(d); + if (component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { + vDir = RenderUtil.getUDirForFace(d); + } else if ((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) + && d.offsetY != 0) { + vDir = RenderUtil.getUDirForFace(d); + } + + float minU = texture.getMinU(); + float maxU = texture.getMaxU(); + float minV = texture.getMinV(); + float maxV = texture.getMaxV(); + + float sideScale = Math.max(bb.sizeX(), bb.sizeY()) * 2 / 16f; + sideScale = Math.max(sideScale, bb.sizeZ() * 2 / 16f); + float width = Math.min(bb.sizeX(), bb.sizeY()) * 15f / 16f; + + List corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); + moveEdgeCorners(corners, vDir, width); + moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + + corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); + moveEdgeCorners(corners, vDir.getOpposite(), width); + moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + } + } + + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + List corners = component.bound.getCornersWithUvForFace( + component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + Tessellator tessellator = Tessellator.instance; + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + // back face + for (int i = corners.size() - 1; i >= 0; i--) { + Vertex c = corners.get(i); + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + } } - } - } - } + @Override + protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { + super.renderTransmission(conduit, tex, component, selfIllum); + } - @Override - protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { - super.renderTransmission(conduit, tex, component, selfIllum); - } + private void moveEdgeCorners(List vertices, ForgeDirection edge, float scaleFactor) { + int[] indices = getClosest(edge, vertices); + vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; + vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; + vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY; + vertices.get(indices[1]).xyz.y -= scaleFactor * edge.offsetY; + vertices.get(indices[0]).xyz.z -= scaleFactor * edge.offsetZ; + vertices.get(indices[1]).xyz.z -= scaleFactor * edge.offsetZ; + } - private void moveEdgeCorners(List vertices, ForgeDirection edge, float scaleFactor) { - int[] indices = getClosest(edge, vertices); - vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[1]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[0]).xyz.z -= scaleFactor * edge.offsetZ; - vertices.get(indices[1]).xyz.z -= scaleFactor * edge.offsetZ; - } - - private int[] getClosest(ForgeDirection edge, List vertices) { - int[] res = new int[] { -1, -1 }; - boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0; - double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE; - int index = 0; - for (Vertex v : vertices) { - double val = get(v.xyz, edge); - if(highest ? val >= minMax : val <= minMax) { - if(val != minMax) { - res[0] = index; - } else { - res[1] = index; + private int[] getClosest(ForgeDirection edge, List vertices) { + int[] res = new int[] {-1, -1}; + boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0; + double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE; + int index = 0; + for (Vertex v : vertices) { + double val = get(v.xyz, edge); + if (highest ? val >= minMax : val <= minMax) { + if (val != minMax) { + res[0] = index; + } else { + res[1] = index; + } + minMax = val; + } + index++; } - minMax = val; - } - index++; + return res; } - return res; - } - private double get(Vector3d xyz, ForgeDirection edge) { - if(edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { - return xyz.x; + private double get(Vector3d xyz, ForgeDirection edge) { + if (edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { + return xyz.x; + } + if (edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { + return xyz.y; + } + return xyz.z; } - if(edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { - return xyz.y; - } - return xyz.z; - } - } diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java index 10565f81..29826b57 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasOutput.java @@ -1,50 +1,42 @@ package crazypants.enderio.conduit.gas; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; +import net.minecraftforge.common.util.ForgeDirection; public class GasOutput { - final ForgeDirection dir; - final BlockCoord location; + final ForgeDirection dir; + final BlockCoord location; - public GasOutput(BlockCoord bc, ForgeDirection dir) { - this.dir = dir; - this.location = bc; - } + public GasOutput(BlockCoord bc, ForgeDirection dir) { + this.dir = dir; + this.location = bc; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((location == null) ? 0 : location.hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - return result; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((location == null) ? 0 : location.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + return result; + } - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - GasOutput other = (GasOutput) obj; - if(location == null) { - if(other.location != null) - return false; - } else if(!location.equals(other.location)) - return false; - if(dir != other.dir) - return false; - return true; - } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + GasOutput other = (GasOutput) obj; + if (location == null) { + if (other.location != null) return false; + } else if (!location.equals(other.location)) return false; + if (dir != other.dir) return false; + return true; + } - @Override - public String toString() { - return "GasOutput [dir=" + dir + ", location=" + location + "]"; - } - -} \ No newline at end of file + @Override + public String toString() { + return "GasOutput [dir=" + dir + ", location=" + location + "]"; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index 03829c7e..feb6955b 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -1,72 +1,69 @@ package crazypants.enderio.conduit.gas; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.ModAPIManager; +import cpw.mods.fml.common.Optional.Method; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.config.Config; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.ModAPIManager; -import cpw.mods.fml.common.Optional.Method; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.config.Config; - public final class GasUtil { - private static boolean useCheckPerformed = false; - private static boolean isGasConduitEnabled = false; - - public static final String API_NAME = "MekanismAPI|gas"; + private static boolean useCheckPerformed = false; + private static boolean isGasConduitEnabled = false; - public static boolean isGasConduitEnabled() { - if(!useCheckPerformed) { - if(Config.isGasConduitEnabled) { - isGasConduitEnabled = ModAPIManager.INSTANCE.hasAPI(API_NAME); - } else { - isGasConduitEnabled = false; - } - useCheckPerformed = true; + public static final String API_NAME = "MekanismAPI|gas"; + + public static boolean isGasConduitEnabled() { + if (!useCheckPerformed) { + if (Config.isGasConduitEnabled) { + isGasConduitEnabled = ModAPIManager.INSTANCE.hasAPI(API_NAME); + } else { + isGasConduitEnabled = false; + } + useCheckPerformed = true; + } + return isGasConduitEnabled; } - return isGasConduitEnabled; - } - @Method(modid = API_NAME) - public static IGasHandler getExternalGasHandler(IBlockAccess world, BlockCoord bc) { - IGasHandler con = getGasHandler(world, bc); - return (con != null && !(con instanceof IConduitBundle)) ? con : null; - } - - @Method(modid = API_NAME) - public static IGasHandler getGasHandler(IBlockAccess world, BlockCoord bc) { - return getGasHandler(world, bc.x, bc.y, bc.z); - } - - @Method(modid = API_NAME) - public static IGasHandler getGasHandler(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - return getGasHandler(te); - } - - @Method(modid = API_NAME) - public static IGasHandler getGasHandler(TileEntity te) { - if(te instanceof IGasHandler) { - return (IGasHandler) te; + @Method(modid = API_NAME) + public static IGasHandler getExternalGasHandler(IBlockAccess world, BlockCoord bc) { + IGasHandler con = getGasHandler(world, bc); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; } - return null; - } - @Method(modid = API_NAME) - public static boolean isGasValid(GasStack gas) { - if(gas != null) { - String name = gas.getGas().getLocalizedName(); - if(name != null && !name.trim().isEmpty()) { - return true; - } + @Method(modid = API_NAME) + public static IGasHandler getGasHandler(IBlockAccess world, BlockCoord bc) { + return getGasHandler(world, bc.x, bc.y, bc.z); } - return false; - } - private GasUtil() { - } + @Method(modid = API_NAME) + public static IGasHandler getGasHandler(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + return getGasHandler(te); + } + + @Method(modid = API_NAME) + public static IGasHandler getGasHandler(TileEntity te) { + if (te instanceof IGasHandler) { + return (IGasHandler) te; + } + return null; + } + + @Method(modid = API_NAME) + public static boolean isGasValid(GasStack gas) { + if (gas != null) { + String name = gas.getGas().getLocalizedName(); + if (name != null && !name.trim().isEmpty()) { + return true; + } + } + return false; + } + + private GasUtil() {} } diff --git a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java index 65b8134a..54d3dda1 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java @@ -1,16 +1,15 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.IGasHandler; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; +import mekanism.api.gas.IGasHandler; +import net.minecraftforge.common.util.ForgeDirection; @Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME) public interface IGasConduit extends IConduit, IGasHandler, IExtractor { - boolean canOutputToDir(ForgeDirection dir); - - boolean isExtractingFromDir(ForgeDirection dir); + boolean canOutputToDir(ForgeDirection dir); + boolean isExtractingFromDir(ForgeDirection dir); } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 0e7e5bdf..b2b4ee84 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -1,13 +1,7 @@ package crazypants.enderio.conduit.gas; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -18,64 +12,64 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"), - }; + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemGasConduit.name(), "enderio:itemGasConduit"), + }; - public static ItemGasConduit create() { - ItemGasConduit result = new ItemGasConduit(); - if (GasUtil.isGasConduitEnabled()) { - result.init(); - ConduitDisplayMode.registerDisplayMode(new ConduitDisplayMode(IGasConduit.class, IconEIO.WRENCH_OVERLAY_GAS, IconEIO.WRENCH_OVERLAY_GAS_OFF)); + public static ItemGasConduit create() { + ItemGasConduit result = new ItemGasConduit(); + if (GasUtil.isGasConduitEnabled()) { + result.init(); + ConduitDisplayMode.registerDisplayMode(new ConduitDisplayMode( + IGasConduit.class, IconEIO.WRENCH_OVERLAY_GAS, IconEIO.WRENCH_OVERLAY_GAS_OFF)); + } + return result; } - return result; - } - protected ItemGasConduit() { - super(ModObject.itemGasConduit, subtypes); - if(!GasUtil.isGasConduitEnabled()) { - setCreativeTab(null); + protected ItemGasConduit() { + super(ModObject.itemGasConduit, subtypes); + if (!GasUtil.isGasConduitEnabled()) { + setCreativeTab(null); + } } - } - @Override - public Class getBaseConduitType() { - return IGasConduit.class; - } + @Override + public Class getBaseConduitType() { + return IGasConduit.class; + } - @Override - public IConduit createConduit(ItemStack stack, EntityPlayer player) { - return new GasConduit(); - } + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + return new GasConduit(); + } - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - String gpt = " " + EnderIO.lang.localize("gas.gasTick"); - int extractRate = Config.gasConduitExtractRate; - int maxIo = Config.gasConduitMaxIoRate; - list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxExtract") + " " + extractRate + gpt); - list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); - SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemGasConduit"); - } - - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + String gpt = " " + EnderIO.lang.localize("gas.gasTick"); + int extractRate = Config.gasConduitExtractRate; + int maxIo = Config.gasConduitMaxIoRate; + list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxExtract") + " " + extractRate + gpt); + list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); + SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemGasConduit"); + } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java index 742e0344..f91c3a70 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java +++ b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java @@ -1,45 +1,42 @@ package crazypants.enderio.conduit.gas; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.util.ClientUtil; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; public class PacketGasLevel extends MessageTileEntity implements IMessageHandler { - public NBTTagCompound tc; + public NBTTagCompound tc; - public PacketGasLevel() { - } + public PacketGasLevel() {} - public PacketGasLevel(IGasConduit conduit) { - super(conduit.getBundle().getEntity()); - tc = new NBTTagCompound(); - conduit.writeToNBT(tc); - } + public PacketGasLevel(IGasConduit conduit) { + super(conduit.getBundle().getEntity()); + tc = new NBTTagCompound(); + conduit.writeToNBT(tc); + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - ByteBufUtils.writeTag(buf, tc); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + ByteBufUtils.writeTag(buf, tc); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - tc = ByteBufUtils.readTag(buf); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + tc = ByteBufUtils.readTag(buf); + } - @Override - public IMessage onMessage(PacketGasLevel message, MessageContext ctx) { - ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message); - return null; - } + @Override + public IMessage onMessage(PacketGasLevel message, MessageContext ctx) { + ClientUtil.doGasLevelUpdate(message.x, message.y, message.z, message); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java b/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java index 83f5e5b8..1ab397d0 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java +++ b/src/main/java/crazypants/enderio/conduit/geom/CollidableCache.java @@ -1,90 +1,88 @@ package crazypants.enderio.conduit.geom; +import crazypants.enderio.conduit.IConduit; import java.util.Collection; import java.util.HashMap; import java.util.Map; - import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.conduit.IConduit; public class CollidableCache { - public static final CollidableCache instance = new CollidableCache(); + public static final CollidableCache instance = new CollidableCache(); - private final Map> cache = new HashMap>(); + private final Map> cache = + new HashMap>(); - public CacheKey createKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { - return new CacheKey(baseType, offset, dir, isStub); - } - - public Collection getCollidables(CacheKey key, IConduit conduit) { - Collection result = cache.get(key); - if(result == null) { - result = conduit.createCollidables(key); - cache.put(key, result); - } - return result; - } - - public static class CacheKey { - - public final Class baseType; - public final String className; // used to generate reliable equals / - // hashcode - public final Offset offset; - public final ForgeDirection dir; - public final boolean isStub; - - public CacheKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { - this.baseType = baseType; - className = baseType.getCanonicalName(); - this.offset = offset; - this.dir = dir; - this.isStub = isStub; + public CacheKey createKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { + return new CacheKey(baseType, offset, dir, isStub); } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((className == null) ? 0 : className.hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - result = prime * result + (isStub ? 1231 : 1237); - result = prime * result + ((offset == null) ? 0 : offset.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - CacheKey other = (CacheKey) obj; - if(className == null) { - if(other.className != null) { - return false; + public Collection getCollidables(CacheKey key, IConduit conduit) { + Collection result = cache.get(key); + if (result == null) { + result = conduit.createCollidables(key); + cache.put(key, result); } - } else if(!className.equals(other.className)) { - return false; - } - if(dir != other.dir) { - return false; - } - if(isStub != other.isStub) { - return false; - } - if(offset != other.offset) { - return false; - } - return true; + return result; } - } + public static class CacheKey { + public final Class baseType; + public final String className; // used to generate reliable equals / + // hashcode + public final Offset offset; + public final ForgeDirection dir; + public final boolean isStub; + + public CacheKey(Class baseType, Offset offset, ForgeDirection dir, boolean isStub) { + this.baseType = baseType; + className = baseType.getCanonicalName(); + this.offset = offset; + this.dir = dir; + this.isStub = isStub; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((className == null) ? 0 : className.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + (isStub ? 1231 : 1237); + result = prime * result + ((offset == null) ? 0 : offset.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + CacheKey other = (CacheKey) obj; + if (className == null) { + if (other.className != null) { + return false; + } + } else if (!className.equals(other.className)) { + return false; + } + if (dir != other.dir) { + return false; + } + if (isStub != other.isStub) { + return false; + } + if (offset != other.offset) { + return false; + } + return true; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java index e967f8e8..98718464 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java +++ b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java @@ -1,46 +1,48 @@ package crazypants.enderio.conduit.geom; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; - import crazypants.enderio.conduit.IConduit; +import net.minecraftforge.common.util.ForgeDirection; public class CollidableComponent { - public final Class conduitType; - public final BoundingBox bound; - public final ForgeDirection dir; - public final Object data; + public final Class conduitType; + public final BoundingBox bound; + public final ForgeDirection dir; + public final Object data; - public CollidableComponent(Class conduitType, BoundingBox bound, ForgeDirection id, Object data) { - this.conduitType = conduitType; - this.bound = bound; - this.dir = id; - this.data = data; - } - - @Override - public String toString() { - return "CollidableComponent [conduitType=" + conduitType + ", bound=" + bound + ", id=" + dir + "]"; - } - - @Override - public boolean equals(Object obj) { - if(obj instanceof CollidableComponent) { - CollidableComponent other = (CollidableComponent) obj; - return conduitType == other.conduitType && bound.equals(((CollidableComponent) obj).bound) && dir == other.dir; + public CollidableComponent( + Class conduitType, BoundingBox bound, ForgeDirection id, Object data) { + this.conduitType = conduitType; + this.bound = bound; + this.dir = id; + this.data = data; } - return false; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((bound == null) ? 0 : bound.hashCode()); - result = prime * result + ((conduitType == null) ? 0 : conduitType.getName().hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - return result; - } + @Override + public String toString() { + return "CollidableComponent [conduitType=" + conduitType + ", bound=" + bound + ", id=" + dir + "]"; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof CollidableComponent) { + CollidableComponent other = (CollidableComponent) obj; + return conduitType == other.conduitType + && bound.equals(((CollidableComponent) obj).bound) + && dir == other.dir; + } + return false; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((bound == null) ? 0 : bound.hashCode()); + result = prime * result + + ((conduitType == null) ? 0 : conduitType.getName().hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + return result; + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitConnectorType.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitConnectorType.java index a44989a5..76aa2086 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitConnectorType.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitConnectorType.java @@ -1,8 +1,6 @@ package crazypants.enderio.conduit.geom; public enum ConduitConnectorType { - - INTERNAL, - EXTERNAL - + INTERNAL, + EXTERNAL } diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java index 76212378..b8dd8036 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -1,208 +1,209 @@ package crazypants.enderio.conduit.geom; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; - -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.conduit.IConduit; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; +import net.minecraftforge.common.util.ForgeDirection; public class ConduitGeometryUtil { - public static final ConduitGeometryUtil instance = new ConduitGeometryUtil(); + public static final ConduitGeometryUtil instance = new ConduitGeometryUtil(); - public static float STUB_WIDTH = 0.2f; - public static float STUB_HEIGHT = 0.2f; + public static float STUB_WIDTH = 0.2f; + public static float STUB_HEIGHT = 0.2f; - public static float WIDTH; - public static float HEIGHT; + public static float WIDTH; + public static float HEIGHT; - public static float HWIDTH; - public static float HHEIGHT; + public static float HWIDTH; + public static float HHEIGHT; - // All values are for a single conduit core - public static Vector3d CORE_MIN; - public static Vector3d CORE_MAX; - public static BoundingBox CORE_BOUNDS; + // All values are for a single conduit core + public static Vector3d CORE_MIN; + public static Vector3d CORE_MAX; + public static BoundingBox CORE_BOUNDS; - public static final float CONNECTOR_DEPTH = 0.05f; + public static final float CONNECTOR_DEPTH = 0.05f; - private static Map EXTERNAL_CONNECTOR_BOUNDS = new HashMap(); + private static Map EXTERNAL_CONNECTOR_BOUNDS = + new HashMap(); - static { - setupBounds(0.5f); - } - - public static void setupBounds(float scale) { - float size = 0.075f + (0.175f * scale); - - WIDTH = size; - HEIGHT = size; - HWIDTH = WIDTH / 2; - HHEIGHT = HEIGHT / 2; - - CORE_MIN = new Vector3d(0.5f - HWIDTH, 0.5 - HHEIGHT, 0.5 - HWIDTH); - CORE_MAX = new Vector3d(CORE_MIN.x + WIDTH, CORE_MIN.y + HEIGHT, CORE_MIN.z + WIDTH); - CORE_BOUNDS = new BoundingBox(CORE_MIN, CORE_MAX); - - float connectorWidth = 0.25f + (scale * 0.5f); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - EXTERNAL_CONNECTOR_BOUNDS.put(dir, createExternalConnector(dir, CONNECTOR_DEPTH, connectorWidth)); - } - } - - private static BoundingBox[] createExternalConnector(ForgeDirection dir, float connectorDepth, float connectorWidth) { - - BoundingBox[] res = new BoundingBox[2]; - - float cMin = 0.5f - connectorWidth / 2; - float cMax = 0.5f + connectorWidth / 2; - float dMin = 1 - connectorDepth / 2; - float dMax = 1; - - res[0] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); - - cMin = 0.5f - connectorWidth / 3; - cMax = 0.5f + connectorWidth / 3; - dMin = 1 - connectorDepth; - dMax = 1 - connectorDepth / 2; - - res[1] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); - - return res; - } - - private static BoundingBox createConnectorComponent(ForgeDirection dir, float cornerMin, float cornerMax, float depthMin, float depthMax) { - float minX = (1 - Math.abs(dir.offsetX)) * cornerMin + dir.offsetX * depthMin; - float minY = (1 - Math.abs(dir.offsetY)) * cornerMin + dir.offsetY * depthMin; - float minZ = (1 - Math.abs(dir.offsetZ)) * cornerMin + dir.offsetZ * depthMin; - - float maxX = (1 - Math.abs(dir.offsetX)) * cornerMax + (dir.offsetX * depthMax); - float maxY = (1 - Math.abs(dir.offsetY)) * cornerMax + (dir.offsetY * depthMax); - float maxZ = (1 - Math.abs(dir.offsetZ)) * cornerMax + (dir.offsetZ * depthMax); - - minX = fix(minX); - minY = fix(minY); - minZ = fix(minZ); - maxX = fix(maxX); - maxY = fix(maxY); - maxZ = fix(maxZ); - - BoundingBox bb = new BoundingBox(minX, minY, minZ, maxX, maxY, maxZ); - bb = bb.fixMinMax(); - - return bb; - } - - private static float fix(float val) { - return val < 0 ? 1 + val : val; - } - - private Map boundsCache = new HashMap(); - - private EnumMap connectorBounds = new EnumMap(ConduitConnectorType.class); - - private ConduitGeometryUtil() { - } - - public BoundingBox getExternalConnectorBoundingBox(ForgeDirection dir) { - return getExternalConnectorBoundingBoxes(dir)[0]; - } - - public BoundingBox[] getExternalConnectorBoundingBoxes(ForgeDirection dir) { - return EXTERNAL_CONNECTOR_BOUNDS.get(dir); - } - - public BoundingBox getBoundingBox(Class type, ForgeDirection dir, boolean isStub, Offset offset) { - GeometryKey key = new GeometryKey(dir, isStub, offset, type); - BoundingBox result = boundsCache.get(key); - if(result == null) { - result = createConduitBounds(type, key); - boundsCache.put(key, result); - } - return result; - } - - public Vector3d getTranslation(ForgeDirection dir, Offset offset) { - Vector3d result = new Vector3d(offset.xOffset, offset.yOffset, offset.zOffset); - result.scale(WIDTH); - return result; - } - - public BoundingBox createBoundsForConnectionController(ForgeDirection dir, Offset offset) { - - Vector3d nonUniformScale = ForgeDirectionOffsets.forDirCopy(dir); - nonUniformScale.scale(0.5); - - nonUniformScale.x = 0.8 * (1 - Math.abs(nonUniformScale.x)); - nonUniformScale.y = 0.8 * (1 - Math.abs(nonUniformScale.y)); - nonUniformScale.z = 0.8 * (1 - Math.abs(nonUniformScale.z)); - - BoundingBox bb = CORE_BOUNDS; - bb = bb.scale(nonUniformScale.x, nonUniformScale.y, nonUniformScale.z); - - double offsetFromEnd = Math.min(bb.sizeX(), bb.sizeY()); - offsetFromEnd = Math.min(offsetFromEnd, bb.sizeZ()); - offsetFromEnd = Math.max(offsetFromEnd, 0.075); - double transMag = 0.5 - (offsetFromEnd * 1.2); - - Vector3d trans = ForgeDirectionOffsets.forDirCopy(dir); - trans.scale(transMag); - bb = bb.translate(trans); - bb = bb.translate(getTranslation(dir, offset)); - return bb; - } - - private BoundingBox createConduitBounds(Class type, GeometryKey key) { - return createConduitBounds(type, key.dir, key.isStub, key.offset); - } - - private BoundingBox createConduitBounds(Class type, ForgeDirection dir, boolean isStub, Offset offset) { - BoundingBox bb = CORE_BOUNDS; - - Vector3d min = bb.getMin(); - Vector3d max = bb.getMax(); - - switch (dir) { - case WEST: - min.x = isStub ? Math.max(0, bb.minX - STUB_WIDTH) : 0; - max.x = bb.minX; - break; - case EAST: - min.x = bb.maxX; - max.x = isStub ? Math.min(1, bb.maxX + STUB_WIDTH) : 1; - break; - case DOWN: - min.y = isStub ? Math.max(0, bb.minY - STUB_HEIGHT) : 0; - max.y = bb.minY; - break; - case UP: - max.y = isStub ? Math.min(1, bb.maxY + STUB_HEIGHT) : 1; - min.y = bb.maxY; - break; - case NORTH: - min.z = isStub ? Math.max(0.0F, bb.minZ - STUB_WIDTH) : 0; - max.z = bb.minZ; - break; - case SOUTH: - max.z = isStub ? Math.min(1F, bb.maxZ + STUB_WIDTH) : 1; - min.z = bb.maxZ; - break; - default: - break; + static { + setupBounds(0.5f); } - Vector3d trans = getTranslation(dir, offset); - min.add(trans); - max.add(trans); - bb = new BoundingBox(VecmathUtil.clamp(min, 0, 1), VecmathUtil.clamp(max, 0, 1)); - return bb; - } + public static void setupBounds(float scale) { + float size = 0.075f + (0.175f * scale); + WIDTH = size; + HEIGHT = size; + HWIDTH = WIDTH / 2; + HHEIGHT = HEIGHT / 2; + + CORE_MIN = new Vector3d(0.5f - HWIDTH, 0.5 - HHEIGHT, 0.5 - HWIDTH); + CORE_MAX = new Vector3d(CORE_MIN.x + WIDTH, CORE_MIN.y + HEIGHT, CORE_MIN.z + WIDTH); + CORE_BOUNDS = new BoundingBox(CORE_MIN, CORE_MAX); + + float connectorWidth = 0.25f + (scale * 0.5f); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + EXTERNAL_CONNECTOR_BOUNDS.put(dir, createExternalConnector(dir, CONNECTOR_DEPTH, connectorWidth)); + } + } + + private static BoundingBox[] createExternalConnector( + ForgeDirection dir, float connectorDepth, float connectorWidth) { + + BoundingBox[] res = new BoundingBox[2]; + + float cMin = 0.5f - connectorWidth / 2; + float cMax = 0.5f + connectorWidth / 2; + float dMin = 1 - connectorDepth / 2; + float dMax = 1; + + res[0] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); + + cMin = 0.5f - connectorWidth / 3; + cMax = 0.5f + connectorWidth / 3; + dMin = 1 - connectorDepth; + dMax = 1 - connectorDepth / 2; + + res[1] = createConnectorComponent(dir, cMin, cMax, dMin, dMax); + + return res; + } + + private static BoundingBox createConnectorComponent( + ForgeDirection dir, float cornerMin, float cornerMax, float depthMin, float depthMax) { + float minX = (1 - Math.abs(dir.offsetX)) * cornerMin + dir.offsetX * depthMin; + float minY = (1 - Math.abs(dir.offsetY)) * cornerMin + dir.offsetY * depthMin; + float minZ = (1 - Math.abs(dir.offsetZ)) * cornerMin + dir.offsetZ * depthMin; + + float maxX = (1 - Math.abs(dir.offsetX)) * cornerMax + (dir.offsetX * depthMax); + float maxY = (1 - Math.abs(dir.offsetY)) * cornerMax + (dir.offsetY * depthMax); + float maxZ = (1 - Math.abs(dir.offsetZ)) * cornerMax + (dir.offsetZ * depthMax); + + minX = fix(minX); + minY = fix(minY); + minZ = fix(minZ); + maxX = fix(maxX); + maxY = fix(maxY); + maxZ = fix(maxZ); + + BoundingBox bb = new BoundingBox(minX, minY, minZ, maxX, maxY, maxZ); + bb = bb.fixMinMax(); + + return bb; + } + + private static float fix(float val) { + return val < 0 ? 1 + val : val; + } + + private Map boundsCache = new HashMap(); + + private EnumMap connectorBounds = + new EnumMap(ConduitConnectorType.class); + + private ConduitGeometryUtil() {} + + public BoundingBox getExternalConnectorBoundingBox(ForgeDirection dir) { + return getExternalConnectorBoundingBoxes(dir)[0]; + } + + public BoundingBox[] getExternalConnectorBoundingBoxes(ForgeDirection dir) { + return EXTERNAL_CONNECTOR_BOUNDS.get(dir); + } + + public BoundingBox getBoundingBox( + Class type, ForgeDirection dir, boolean isStub, Offset offset) { + GeometryKey key = new GeometryKey(dir, isStub, offset, type); + BoundingBox result = boundsCache.get(key); + if (result == null) { + result = createConduitBounds(type, key); + boundsCache.put(key, result); + } + return result; + } + + public Vector3d getTranslation(ForgeDirection dir, Offset offset) { + Vector3d result = new Vector3d(offset.xOffset, offset.yOffset, offset.zOffset); + result.scale(WIDTH); + return result; + } + + public BoundingBox createBoundsForConnectionController(ForgeDirection dir, Offset offset) { + + Vector3d nonUniformScale = ForgeDirectionOffsets.forDirCopy(dir); + nonUniformScale.scale(0.5); + + nonUniformScale.x = 0.8 * (1 - Math.abs(nonUniformScale.x)); + nonUniformScale.y = 0.8 * (1 - Math.abs(nonUniformScale.y)); + nonUniformScale.z = 0.8 * (1 - Math.abs(nonUniformScale.z)); + + BoundingBox bb = CORE_BOUNDS; + bb = bb.scale(nonUniformScale.x, nonUniformScale.y, nonUniformScale.z); + + double offsetFromEnd = Math.min(bb.sizeX(), bb.sizeY()); + offsetFromEnd = Math.min(offsetFromEnd, bb.sizeZ()); + offsetFromEnd = Math.max(offsetFromEnd, 0.075); + double transMag = 0.5 - (offsetFromEnd * 1.2); + + Vector3d trans = ForgeDirectionOffsets.forDirCopy(dir); + trans.scale(transMag); + bb = bb.translate(trans); + bb = bb.translate(getTranslation(dir, offset)); + return bb; + } + + private BoundingBox createConduitBounds(Class type, GeometryKey key) { + return createConduitBounds(type, key.dir, key.isStub, key.offset); + } + + private BoundingBox createConduitBounds( + Class type, ForgeDirection dir, boolean isStub, Offset offset) { + BoundingBox bb = CORE_BOUNDS; + + Vector3d min = bb.getMin(); + Vector3d max = bb.getMax(); + + switch (dir) { + case WEST: + min.x = isStub ? Math.max(0, bb.minX - STUB_WIDTH) : 0; + max.x = bb.minX; + break; + case EAST: + min.x = bb.maxX; + max.x = isStub ? Math.min(1, bb.maxX + STUB_WIDTH) : 1; + break; + case DOWN: + min.y = isStub ? Math.max(0, bb.minY - STUB_HEIGHT) : 0; + max.y = bb.minY; + break; + case UP: + max.y = isStub ? Math.min(1, bb.maxY + STUB_HEIGHT) : 1; + min.y = bb.maxY; + break; + case NORTH: + min.z = isStub ? Math.max(0.0F, bb.minZ - STUB_WIDTH) : 0; + max.z = bb.minZ; + break; + case SOUTH: + max.z = isStub ? Math.min(1F, bb.maxZ + STUB_WIDTH) : 1; + min.z = bb.maxZ; + break; + default: + break; + } + + Vector3d trans = getTranslation(dir, offset); + min.add(trans); + max.add(trans); + bb = new BoundingBox(VecmathUtil.clamp(min, 0, 1), VecmathUtil.clamp(max, 0, 1)); + return bb; + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java index 8efb5dde..fdc8db61 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConnectionModeGeometry.java @@ -1,12 +1,6 @@ package crazypants.enderio.conduit.geom; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; +import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; @@ -16,124 +10,129 @@ import com.enderio.core.client.render.VertexTransformComposite; import com.enderio.core.client.render.VertexTranslation; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; - -import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class ConnectionModeGeometry { - private static final EnumMap> VERTS = new EnumMap>(ForgeDirection.class); + private static final EnumMap> VERTS = + new EnumMap>(ForgeDirection.class); - static { + static { + float scale = 0.9f; + BoundingBox refBB = ConduitGeometryUtil.CORE_BOUNDS; + refBB = refBB.scale(scale, scale, scale); + refBB = refBB.scale(scale, 1, 1); - float scale = 0.9f; - BoundingBox refBB = ConduitGeometryUtil.CORE_BOUNDS; - refBB = refBB.scale(scale, scale, scale); - refBB = refBB.scale(scale, 1, 1); + double offset = (ConduitGeometryUtil.HWIDTH * scale * scale) + ConduitGeometryUtil.CONNECTOR_DEPTH; - double offset = (ConduitGeometryUtil.HWIDTH * scale * scale) + ConduitGeometryUtil.CONNECTOR_DEPTH; + ForgeDirection dir; + Vector3d trans; - ForgeDirection dir; - Vector3d trans; + VertexRotation vrot = new VertexRotation(Math.PI / 2, new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); + VertexTranslation vtrans = new VertexTranslation(0, 0, 0); + VertexTransformComposite xform = new VertexTransformComposite(vrot, vtrans); - VertexRotation vrot = new VertexRotation(Math.PI / 2, new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); - VertexTranslation vtrans = new VertexTranslation(0, 0, 0); - VertexTransformComposite xform = new VertexTransformComposite(vrot, vtrans); + dir = ForgeDirection.SOUTH; + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); - dir = ForgeDirection.SOUTH; - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); + dir = ForgeDirection.NORTH; + vrot.setAngle(Math.PI + Math.PI / 2); + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); - dir = ForgeDirection.NORTH; - vrot.setAngle(Math.PI + Math.PI / 2); - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); + dir = ForgeDirection.EAST; + vrot.setAngle(Math.PI); + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); - dir = ForgeDirection.EAST; - vrot.setAngle(Math.PI); - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); + dir = ForgeDirection.WEST; + vrot.setAngle(0); + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); - dir = ForgeDirection.WEST; - vrot.setAngle(0); - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); + vrot.setAxis(new Vector3d(0, 0, 1)); - vrot.setAxis(new Vector3d(0, 0, 1)); + dir = ForgeDirection.UP; + vrot.setAngle(-Math.PI / 2); + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); - dir = ForgeDirection.UP; - vrot.setAngle(-Math.PI / 2); - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); - - dir = ForgeDirection.DOWN; - vrot.setAngle(Math.PI / 2); - trans = offsetScaled(dir, 0.5); - trans.sub(offsetScaled(dir, offset)); - vtrans.set(trans); - VERTS.put(dir, createVerticesForDir(refBB, xform)); - - } - - private static List createVerticesForDir(BoundingBox refBB, VertexTransform xform) { - List result = new ArrayList(24); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - result.addAll(refBB.getCornersWithUvForFace(face)); - } - for (Vertex v : result) { - xform.apply(v.xyz); - xform.applyToNormal(v.normal); - - } - return result; - } - - public static void renderModeConnector(ForgeDirection dir, Offset offset, IIcon tex, boolean tintSides) { - List verts = VERTS.get(dir); - if (verts == null) { - return; + dir = ForgeDirection.DOWN; + vrot.setAngle(Math.PI / 2); + trans = offsetScaled(dir, 0.5); + trans.sub(offsetScaled(dir, offset)); + vtrans.set(trans); + VERTS.put(dir, createVerticesForDir(refBB, xform)); } - Vector3d trans = ConduitGeometryUtil.instance.getTranslation(dir, offset); - - float uWidth = tex.getMaxU() - tex.getMinU(); - float uScale = uWidth * 0.64f; - float minU = tex.getMinU() + (uWidth - uScale); - float vScale = tex.getMaxV() - tex.getMinV(); - - Tessellator tes = Tessellator.instance; - for (Vertex v : verts) { - if (tintSides) { - float cm = 1; - if (v.ny() > 0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.UP); - } else if (v.ny() < -0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.DOWN); - } else if (v.nx() > 0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.EAST); - } else if (v.nx() < -0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.WEST); - } else if (v.nz() > 0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.SOUTH); - } else if (v.nz() < -0.1) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.NORTH); + private static List createVerticesForDir(BoundingBox refBB, VertexTransform xform) { + List result = new ArrayList(24); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + result.addAll(refBB.getCornersWithUvForFace(face)); } - tes.setColorOpaque_F(cm, cm, cm); - } - - tes.setNormal(v.nx(), v.ny(), v.nz()); - tes.addVertexWithUV(v.x() + trans.x, v.y() + trans.y, v.z() + trans.z, minU + (v.u() * uScale), tex.getMinV() + (v.v() * vScale)); + for (Vertex v : result) { + xform.apply(v.xyz); + xform.applyToNormal(v.normal); + } + return result; } - } + public static void renderModeConnector(ForgeDirection dir, Offset offset, IIcon tex, boolean tintSides) { + List verts = VERTS.get(dir); + if (verts == null) { + return; + } + Vector3d trans = ConduitGeometryUtil.instance.getTranslation(dir, offset); + + float uWidth = tex.getMaxU() - tex.getMinU(); + float uScale = uWidth * 0.64f; + float minU = tex.getMinU() + (uWidth - uScale); + float vScale = tex.getMaxV() - tex.getMinV(); + + Tessellator tes = Tessellator.instance; + for (Vertex v : verts) { + if (tintSides) { + float cm = 1; + if (v.ny() > 0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.UP); + } else if (v.ny() < -0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.DOWN); + } else if (v.nx() > 0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.EAST); + } else if (v.nx() < -0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.WEST); + } else if (v.nz() > 0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.SOUTH); + } else if (v.nz() < -0.1) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.NORTH); + } + tes.setColorOpaque_F(cm, cm, cm); + } + + tes.setNormal(v.nx(), v.ny(), v.nz()); + tes.addVertexWithUV( + v.x() + trans.x, + v.y() + trans.y, + v.z() + trans.z, + minU + (v.u() * uScale), + tex.getMinV() + (v.v() * vScale)); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/GeometryKey.java b/src/main/java/crazypants/enderio/conduit/geom/GeometryKey.java index 751e0140..26af592b 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/GeometryKey.java +++ b/src/main/java/crazypants/enderio/conduit/geom/GeometryKey.java @@ -1,54 +1,45 @@ package crazypants.enderio.conduit.geom; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; +import net.minecraftforge.common.util.ForgeDirection; public final class GeometryKey { - public final ForgeDirection dir; - public final boolean isStub; - public final Offset offset; - public final String className; + public final ForgeDirection dir; + public final boolean isStub; + public final Offset offset; + public final String className; - public GeometryKey(ForgeDirection dir, boolean isStub, Offset offset, Class type) { - this.dir = dir; - this.isStub = isStub; - this.offset = offset; - className = type != null ? type.getName() : null; - } + public GeometryKey(ForgeDirection dir, boolean isStub, Offset offset, Class type) { + this.dir = dir; + this.isStub = isStub; + this.offset = offset; + className = type != null ? type.getName() : null; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((className == null) ? 0 : className.hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - result = prime * result + (isStub ? 1231 : 1237); - result = prime * result + ((offset == null) ? 0 : offset.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - GeometryKey other = (GeometryKey) obj; - if(className == null) { - if(other.className != null) - return false; - } else if(!className.equals(other.className)) - return false; - if(dir != other.dir) - return false; - if(isStub != other.isStub) - return false; - if(offset != other.offset) - return false; - return true; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((className == null) ? 0 : className.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + (isStub ? 1231 : 1237); + result = prime * result + ((offset == null) ? 0 : offset.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + GeometryKey other = (GeometryKey) obj; + if (className == null) { + if (other.className != null) return false; + } else if (!className.equals(other.className)) return false; + if (dir != other.dir) return false; + if (isStub != other.isStub) return false; + if (offset != other.offset) return false; + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offset.java b/src/main/java/crazypants/enderio/conduit/geom/Offset.java index 54938862..3fe1b924 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offset.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offset.java @@ -4,51 +4,49 @@ import net.minecraftforge.common.util.ForgeDirection; /** * Offset vectors are based on Y up. - * + * * @author brad */ public enum Offset { + NONE(0, 0, 0), + UP(ForgeDirection.UP), + DOWN(ForgeDirection.DOWN), + EAST(ForgeDirection.EAST), + WEST(ForgeDirection.WEST), + SOUTH(ForgeDirection.SOUTH), + NORTH(ForgeDirection.NORTH), + EAST_UP(ForgeDirection.EAST, ForgeDirection.UP), + WEST_UP(ForgeDirection.WEST, ForgeDirection.UP), + SOUTH_UP(ForgeDirection.SOUTH, ForgeDirection.UP), + NORTH_UP(ForgeDirection.NORTH, ForgeDirection.UP), + EAST_DOWN(ForgeDirection.EAST, ForgeDirection.DOWN), + WEST_DOWN(ForgeDirection.WEST, ForgeDirection.DOWN), + SOUTH_DOWN(ForgeDirection.SOUTH, ForgeDirection.DOWN), + NORTH_DOWN(ForgeDirection.NORTH, ForgeDirection.DOWN), + NORTH_EAST(ForgeDirection.NORTH, ForgeDirection.EAST), + NORTH_WEST(ForgeDirection.NORTH, ForgeDirection.WEST), + SOUTH_EAST(ForgeDirection.SOUTH, ForgeDirection.EAST), + SOUTH_WEST(ForgeDirection.SOUTH, ForgeDirection.WEST); - NONE(0, 0, 0), - UP(ForgeDirection.UP), - DOWN(ForgeDirection.DOWN), - EAST(ForgeDirection.EAST), - WEST(ForgeDirection.WEST), - SOUTH(ForgeDirection.SOUTH), - NORTH(ForgeDirection.NORTH), - EAST_UP(ForgeDirection.EAST, ForgeDirection.UP), - WEST_UP(ForgeDirection.WEST, ForgeDirection.UP), - SOUTH_UP(ForgeDirection.SOUTH, ForgeDirection.UP), - NORTH_UP(ForgeDirection.NORTH, ForgeDirection.UP), - EAST_DOWN(ForgeDirection.EAST, ForgeDirection.DOWN), - WEST_DOWN(ForgeDirection.WEST, ForgeDirection.DOWN), - SOUTH_DOWN(ForgeDirection.SOUTH, ForgeDirection.DOWN), - NORTH_DOWN(ForgeDirection.NORTH, ForgeDirection.DOWN), - NORTH_EAST(ForgeDirection.NORTH, ForgeDirection.EAST), - NORTH_WEST(ForgeDirection.NORTH, ForgeDirection.WEST), - SOUTH_EAST(ForgeDirection.SOUTH, ForgeDirection.EAST), - SOUTH_WEST(ForgeDirection.SOUTH, ForgeDirection.WEST); + public final int xOffset; + public final int yOffset; + public final int zOffset; - public final int xOffset; - public final int yOffset; - public final int zOffset; + private Offset(ForgeDirection dir) { + xOffset = dir.offsetX; + yOffset = dir.offsetY; + zOffset = dir.offsetZ; + } - private Offset(ForgeDirection dir) { - xOffset = dir.offsetX; - yOffset = dir.offsetY; - zOffset = dir.offsetZ; - } - - private Offset(ForgeDirection dir, ForgeDirection yDir) { - xOffset = dir.offsetX + yDir.offsetX; - yOffset = dir.offsetY + yDir.offsetY; - zOffset = dir.offsetZ + yDir.offsetZ; - } - - private Offset(int xOffset, int yOffset, int zOffset) { - this.xOffset = xOffset; - this.yOffset = yOffset; - this.zOffset = zOffset; - } + private Offset(ForgeDirection dir, ForgeDirection yDir) { + xOffset = dir.offsetX + yDir.offsetX; + yOffset = dir.offsetY + yDir.offsetY; + zOffset = dir.offsetZ + yDir.offsetZ; + } + private Offset(int xOffset, int yOffset, int zOffset) { + this.xOffset = xOffset; + this.yOffset = yOffset; + this.zOffset = zOffset; + } } diff --git a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java index 1b42a5be..4b0ffd64 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/Offsets.java +++ b/src/main/java/crazypants/enderio/conduit/geom/Offsets.java @@ -1,9 +1,5 @@ package crazypants.enderio.conduit.geom; -import java.util.HashMap; -import java.util.Map; - -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.item.IItemConduit; @@ -12,138 +8,139 @@ import crazypants.enderio.conduit.me.IMEConduit; import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; +import java.util.HashMap; +import java.util.Map; +import net.minecraftforge.common.util.ForgeDirection; public class Offsets { - private static Map OFFSETS = new HashMap(); + private static Map OFFSETS = new HashMap(); - static { - OFFSETS.put(key(IRedstoneConduit.class, Axis.NONE), Offset.UP); - OFFSETS.put(key(IRedstoneConduit.class, Axis.X), Offset.UP); - OFFSETS.put(key(IRedstoneConduit.class, Axis.Y), Offset.NORTH); - OFFSETS.put(key(IRedstoneConduit.class, Axis.Z), Offset.UP); + static { + OFFSETS.put(key(IRedstoneConduit.class, Axis.NONE), Offset.UP); + OFFSETS.put(key(IRedstoneConduit.class, Axis.X), Offset.UP); + OFFSETS.put(key(IRedstoneConduit.class, Axis.Y), Offset.NORTH); + OFFSETS.put(key(IRedstoneConduit.class, Axis.Z), Offset.UP); - OFFSETS.put(key(IPowerConduit.class, Axis.NONE), Offset.DOWN); - OFFSETS.put(key(IPowerConduit.class, Axis.X), Offset.DOWN); - OFFSETS.put(key(IPowerConduit.class, Axis.Y), Offset.SOUTH); - OFFSETS.put(key(IPowerConduit.class, Axis.Z), Offset.DOWN); + OFFSETS.put(key(IPowerConduit.class, Axis.NONE), Offset.DOWN); + OFFSETS.put(key(IPowerConduit.class, Axis.X), Offset.DOWN); + OFFSETS.put(key(IPowerConduit.class, Axis.Y), Offset.SOUTH); + OFFSETS.put(key(IPowerConduit.class, Axis.Z), Offset.DOWN); - OFFSETS.put(key(ILiquidConduit.class, Axis.NONE), Offset.WEST); - OFFSETS.put(key(ILiquidConduit.class, Axis.X), Offset.NORTH); - OFFSETS.put(key(ILiquidConduit.class, Axis.Y), Offset.WEST); - OFFSETS.put(key(ILiquidConduit.class, Axis.Z), Offset.WEST); + OFFSETS.put(key(ILiquidConduit.class, Axis.NONE), Offset.WEST); + OFFSETS.put(key(ILiquidConduit.class, Axis.X), Offset.NORTH); + OFFSETS.put(key(ILiquidConduit.class, Axis.Y), Offset.WEST); + OFFSETS.put(key(ILiquidConduit.class, Axis.Z), Offset.WEST); - OFFSETS.put(key(IItemConduit.class, Axis.NONE), Offset.EAST); - OFFSETS.put(key(IItemConduit.class, Axis.X), Offset.SOUTH); - OFFSETS.put(key(IItemConduit.class, Axis.Y), Offset.EAST); - OFFSETS.put(key(IItemConduit.class, Axis.Z), Offset.EAST); + OFFSETS.put(key(IItemConduit.class, Axis.NONE), Offset.EAST); + OFFSETS.put(key(IItemConduit.class, Axis.X), Offset.SOUTH); + OFFSETS.put(key(IItemConduit.class, Axis.Y), Offset.EAST); + OFFSETS.put(key(IItemConduit.class, Axis.Z), Offset.EAST); - OFFSETS.put(key(IGasConduit.class, Axis.NONE), Offset.NORTH_UP); - OFFSETS.put(key(IGasConduit.class, Axis.X), Offset.NORTH_UP); - OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NORTH_WEST); - OFFSETS.put(key(IGasConduit.class, Axis.Z), Offset.WEST_UP); - - OFFSETS.put(key(IMEConduit.class, Axis.NONE), Offset.SOUTH_UP); - OFFSETS.put(key(IMEConduit.class, Axis.X), Offset.SOUTH_UP); - OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NORTH_EAST); - OFFSETS.put(key(IMEConduit.class, Axis.Z), Offset.EAST_UP); + OFFSETS.put(key(IGasConduit.class, Axis.NONE), Offset.NORTH_UP); + OFFSETS.put(key(IGasConduit.class, Axis.X), Offset.NORTH_UP); + OFFSETS.put(key(IGasConduit.class, Axis.Y), Offset.NORTH_WEST); + OFFSETS.put(key(IGasConduit.class, Axis.Z), Offset.WEST_UP); - OFFSETS.put(key(IOCConduit.class, Axis.NONE), Offset.NORTH_DOWN); - OFFSETS.put(key(IOCConduit.class, Axis.X), Offset.NORTH_DOWN); - OFFSETS.put(key(IOCConduit.class, Axis.Y), Offset.SOUTH_WEST); - OFFSETS.put(key(IOCConduit.class, Axis.Z), Offset.WEST_DOWN); + OFFSETS.put(key(IMEConduit.class, Axis.NONE), Offset.SOUTH_UP); + OFFSETS.put(key(IMEConduit.class, Axis.X), Offset.SOUTH_UP); + OFFSETS.put(key(IMEConduit.class, Axis.Y), Offset.NORTH_EAST); + OFFSETS.put(key(IMEConduit.class, Axis.Z), Offset.EAST_UP); - // OFFSETS.put(key(IxConduit.class, Axis.NONE), Offset.SOUTH_DOWN); - // OFFSETS.put(key(IxConduit.class, Axis.X), Offset.SOUTH_DOWN); - // OFFSETS.put(key(IxConduit.class, Axis.Y), Offset.SOUTH_EAST); - // OFFSETS.put(key(IxConduit.class, Axis.Z), Offset.EAST_DOWN); + OFFSETS.put(key(IOCConduit.class, Axis.NONE), Offset.NORTH_DOWN); + OFFSETS.put(key(IOCConduit.class, Axis.X), Offset.NORTH_DOWN); + OFFSETS.put(key(IOCConduit.class, Axis.Y), Offset.SOUTH_WEST); + OFFSETS.put(key(IOCConduit.class, Axis.Z), Offset.WEST_DOWN); - } + // OFFSETS.put(key(IxConduit.class, Axis.NONE), Offset.SOUTH_DOWN); + // OFFSETS.put(key(IxConduit.class, Axis.X), Offset.SOUTH_DOWN); + // OFFSETS.put(key(IxConduit.class, Axis.Y), Offset.SOUTH_EAST); + // OFFSETS.put(key(IxConduit.class, Axis.Z), Offset.EAST_DOWN); - public static Offset get(Class type, ForgeDirection dir) { - Offset res = OFFSETS.get(key(type, getAxisForDir(dir))); - if(res == null) { - res = Offset.NONE; - } - return res; - } - - public static OffsetKey key(Class type, Axis axis) { - return new OffsetKey(type, axis); - } - - public static Axis getAxisForDir(ForgeDirection dir) { - if(dir == ForgeDirection.UNKNOWN) { - return Axis.NONE; - } - if(dir == ForgeDirection.EAST || dir == ForgeDirection.WEST) { - return Axis.X; - } - if(dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) { - return Axis.Y; - } - if(dir == ForgeDirection.NORTH || dir == ForgeDirection.SOUTH) { - return Axis.Z; - } - return Axis.NONE; - } - - public static enum Axis { - NONE, - X, - Y, - Z - } - - public static class OffsetKey { - - String typeName; - Axis axis; - - private OffsetKey(Class type, Axis axis) { - this.typeName = type.getCanonicalName(); - this.axis = axis; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((axis == null) ? 0 : axis.hashCode()); - result = prime * result + ((typeName == null) ? 0 : typeName.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - OffsetKey other = (OffsetKey) obj; - if(axis != other.axis) { - return false; - } - if(typeName == null) { - if(other.typeName != null) { - return false; + public static Offset get(Class type, ForgeDirection dir) { + Offset res = OFFSETS.get(key(type, getAxisForDir(dir))); + if (res == null) { + res = Offset.NONE; } - } else if(!typeName.equals(other.typeName)) { - return false; - } - return true; + return res; } - @Override - public String toString() { - return "OffsetKey [typeName=" + typeName + ", axis=" + axis + "]"; + public static OffsetKey key(Class type, Axis axis) { + return new OffsetKey(type, axis); } - } + public static Axis getAxisForDir(ForgeDirection dir) { + if (dir == ForgeDirection.UNKNOWN) { + return Axis.NONE; + } + if (dir == ForgeDirection.EAST || dir == ForgeDirection.WEST) { + return Axis.X; + } + if (dir == ForgeDirection.UP || dir == ForgeDirection.DOWN) { + return Axis.Y; + } + if (dir == ForgeDirection.NORTH || dir == ForgeDirection.SOUTH) { + return Axis.Z; + } + return Axis.NONE; + } + public static enum Axis { + NONE, + X, + Y, + Z + } + + public static class OffsetKey { + + String typeName; + Axis axis; + + private OffsetKey(Class type, Axis axis) { + this.typeName = type.getCanonicalName(); + this.axis = axis; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((axis == null) ? 0 : axis.hashCode()); + result = prime * result + ((typeName == null) ? 0 : typeName.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + OffsetKey other = (OffsetKey) obj; + if (axis != other.axis) { + return false; + } + if (typeName == null) { + if (other.typeName != null) { + return false; + } + } else if (!typeName.equals(other.typeName)) { + return false; + } + return true; + } + + @Override + public String toString() { + return "OffsetKey [typeName=" + typeName + ", axis=" + axis + "]"; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index c25b97d5..1d29b406 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -1,342 +1,344 @@ package crazypants.enderio.conduit.gui; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - -import com.enderio.core.client.gui.button.CheckBox; -import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.gui.widget.GuiToolTip; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import crazypants.enderio.conduit.item.FunctionUpgrade; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; - -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.api.client.render.IWidgetIcon; +import com.enderio.core.client.gui.button.CheckBox; +import com.enderio.core.client.gui.widget.GuiToolTip; +import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.client.render.ColorUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.item.FunctionUpgrade; import crazypants.enderio.conduit.packet.PacketConnectionMode; -import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; - +import java.awt.*; +import java.util.ArrayList; +import javax.annotation.Nonnull; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.ResourceLocation; public class BaseSettingsPanel implements ITabPanel { - static final int ID_INSERT_ENABLED = 327; - static final int ID_EXTRACT_ENABLED = 328; - protected static final int ID_INSERT_FILTER_OPTIONS = 329; - protected static final int ID_EXTRACT_FILTER_OPTIONS = 330; - protected final int ID_ENABLED = 331; + static final int ID_INSERT_ENABLED = 327; + static final int ID_EXTRACT_ENABLED = 328; + protected static final int ID_INSERT_FILTER_OPTIONS = 329; + protected static final int ID_EXTRACT_FILTER_OPTIONS = 330; + protected final int ID_ENABLED = 331; - protected final @Nonnull IWidgetIcon icon; - protected final @Nonnull GuiExternalConnection gui; - protected @Nonnull IConduit con; - protected final @Nonnull String typeName; - protected final @Nonnull ResourceLocation texture; + protected final @Nonnull IWidgetIcon icon; + protected final @Nonnull GuiExternalConnection gui; + protected @Nonnull IConduit con; + protected final @Nonnull String typeName; + protected final @Nonnull ResourceLocation texture; - protected ConnectionMode oldConnectionMode; + protected ConnectionMode oldConnectionMode; - private @Nonnull String inputHeading; - private @Nonnull String outputHeading; + private @Nonnull String inputHeading; + private @Nonnull String outputHeading; - private boolean insertEnabled = false; - private boolean extractEnabled = false; + private boolean insertEnabled = false; + private boolean extractEnabled = false; - private boolean enabled = false; + private boolean enabled = false; - private final @Nonnull CheckBox extractEnabledB; - private final @Nonnull CheckBox insertEnabledB; + private final @Nonnull CheckBox extractEnabledB; + private final @Nonnull CheckBox insertEnabledB; - private final @Nonnull CheckBox enabledB; + private final @Nonnull CheckBox enabledB; - protected int left = 0; - protected int top = 0; - protected int width = 0; - protected int height = 0; - protected int rightColumn = 112; - protected int leftColumn = 22; + protected int left = 0; + protected int top = 0; + protected int width = 0; + protected int height = 0; + protected int rightColumn = 112; + protected int leftColumn = 22; - protected int gap = 5; + protected int gap = 5; - protected int customTop = 0; + protected int customTop = 0; - protected int textureHeight = 166 + 29; + protected int textureHeight = 166 + 29; - private final @Nonnull GuiToolTip speedUpgradeTooltip; - private final @Nonnull GuiToolTip functionUpgradeTooltip; - protected @Nonnull GuiToolTip filterExtractUpgradeTooltip; - protected @Nonnull GuiToolTip filterInsertUpgradeTooltip; + private final @Nonnull GuiToolTip speedUpgradeTooltip; + private final @Nonnull GuiToolTip functionUpgradeTooltip; + protected @Nonnull GuiToolTip filterExtractUpgradeTooltip; + protected @Nonnull GuiToolTip filterInsertUpgradeTooltip; - protected BaseSettingsPanel(@Nonnull IWidgetIcon icon, @Nonnull String typeName, @Nonnull GuiExternalConnection gui, @Nonnull IConduit con) { - this(icon, typeName, gui, con, "externalConduitConnection"); - } - - protected BaseSettingsPanel(@Nonnull IWidgetIcon icon, @Nonnull String typeName, @Nonnull GuiExternalConnection gui, @Nonnull IConduit con, - @Nonnull String texture) { - this.icon = icon; - this.typeName = typeName; - this.gui = gui; - this.con = con; - this.texture = EnderIO.proxy.getGuiTexture(texture); - - inputHeading = getInputHeading(); - outputHeading = getOutputHeading(); - - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - - customTop = top + gap * 5 + fr.FONT_HEIGHT * 2; - customTop -= 16; - - int x = leftColumn; - int y = 6; - - insertEnabledB = new CheckBox(gui, ID_INSERT_ENABLED, x, y); - - enabledB = new CheckBox(gui, ID_ENABLED, x, y); - - x = rightColumn; - - extractEnabledB = new CheckBox(gui, ID_EXTRACT_ENABLED, x, y); - - x = leftColumn; - y = 92; - - x = rightColumn; - - x = rightColumn + 18 + 1; - - filterExtractUpgradeTooltip = new GuiToolTip(new Rectangle(rightColumn, 70, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { - @Override - public boolean shouldDraw() { - return !gui.getContainer().hasFilterUpgrades(true) && super.shouldDraw(); - } - }; - - filterInsertUpgradeTooltip = new GuiToolTip(new Rectangle(leftColumn, 70, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { - @Override - public boolean shouldDraw() { - return !gui.getContainer().hasFilterUpgrades(false) && super.shouldDraw(); - } - }; - - speedUpgradeTooltip = new GuiToolTip(new Rectangle(rightColumn + 18, customTop + 43, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), - EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) { - @Override - public boolean shouldDraw() { - return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw(); - } - }; - - ArrayList funcUpgradeTips = new ArrayList(); - SpecialTooltipHandler.addTooltipFromResources(funcUpgradeTips, "enderio.gui.conduit.item.functionupgrade.line"); - for(FunctionUpgrade upgrade : FunctionUpgrade.values()) { - funcUpgradeTips.add(EnderIO.lang.localizeExact(upgrade.unlocName.concat(".name"))); - } - functionUpgradeTooltip = new GuiToolTip(new Rectangle(rightColumn + 36, customTop + 43, 18, 18), funcUpgradeTips.toArray(new String[0])) { - @Override - public boolean shouldDraw() { - return !gui.getContainer().hasFunctionUpgrades() && super.shouldDraw(); - } - }; - - gui.getContainer().setInoutSlotsVisible(false, false); - - } - - @Override - public ResourceLocation getTexture() { - return texture; - } - - public int getTextureHeight() { - return textureHeight; - } - - protected void updateFilterButtons() { - } - - protected boolean hasFilterGui(boolean input) { - return true; - } - - public boolean updateConduit(@Nonnull IConduit conduit) { - this.con = conduit; - if (oldConnectionMode != con.getConnectionMode(gui.getDir())) { - connectionModeChanged(con.getConnectionMode(gui.getDir())); - } - return true; - } - - @Override - public void onGuiInit(int leftIn, int topIn, int widthIn, int heightIn) { - this.left = leftIn; - this.top = topIn; - this.width = widthIn; - this.height = heightIn; - - updateConduit(con); - - if (hasInOutModes()) { - insertEnabledB.onGuiInit(); - extractEnabledB.onGuiInit(); - - insertEnabledB.setSelected(insertEnabled); - extractEnabledB.setSelected(extractEnabled); - } else { - enabledB.onGuiInit(); - enabledB.setSelected(enabled); + protected BaseSettingsPanel( + @Nonnull IWidgetIcon icon, + @Nonnull String typeName, + @Nonnull GuiExternalConnection gui, + @Nonnull IConduit con) { + this(icon, typeName, gui, con, "externalConduitConnection"); } - if (hasFilters()) { - gui.addToolTip(filterExtractUpgradeTooltip); - gui.addToolTip(filterInsertUpgradeTooltip); - } - if (hasUpgrades()) { - gui.addToolTip(speedUpgradeTooltip); - gui.addToolTip(functionUpgradeTooltip); + protected BaseSettingsPanel( + @Nonnull IWidgetIcon icon, + @Nonnull String typeName, + @Nonnull GuiExternalConnection gui, + @Nonnull IConduit con, + @Nonnull String texture) { + this.icon = icon; + this.typeName = typeName; + this.gui = gui; + this.con = con; + this.texture = EnderIO.proxy.getGuiTexture(texture); + + inputHeading = getInputHeading(); + outputHeading = getOutputHeading(); + + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + + customTop = top + gap * 5 + fr.FONT_HEIGHT * 2; + customTop -= 16; + + int x = leftColumn; + int y = 6; + + insertEnabledB = new CheckBox(gui, ID_INSERT_ENABLED, x, y); + + enabledB = new CheckBox(gui, ID_ENABLED, x, y); + + x = rightColumn; + + extractEnabledB = new CheckBox(gui, ID_EXTRACT_ENABLED, x, y); + + x = leftColumn; + y = 92; + + x = rightColumn; + + x = rightColumn + 18 + 1; + + filterExtractUpgradeTooltip = + new GuiToolTip( + new Rectangle(rightColumn, 70, 18, 18), + EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { + @Override + public boolean shouldDraw() { + return !gui.getContainer().hasFilterUpgrades(true) && super.shouldDraw(); + } + }; + + filterInsertUpgradeTooltip = + new GuiToolTip( + new Rectangle(leftColumn, 70, 18, 18), + EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { + @Override + public boolean shouldDraw() { + return !gui.getContainer().hasFilterUpgrades(false) && super.shouldDraw(); + } + }; + + speedUpgradeTooltip = + new GuiToolTip( + new Rectangle(rightColumn + 18, customTop + 43, 18, 18), + EnderIO.lang.localize("gui.conduit.item.speedupgrade"), + EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) { + @Override + public boolean shouldDraw() { + return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw(); + } + }; + + ArrayList funcUpgradeTips = new ArrayList(); + SpecialTooltipHandler.addTooltipFromResources(funcUpgradeTips, "enderio.gui.conduit.item.functionupgrade.line"); + for (FunctionUpgrade upgrade : FunctionUpgrade.values()) { + funcUpgradeTips.add(EnderIO.lang.localizeExact(upgrade.unlocName.concat(".name"))); + } + functionUpgradeTooltip = + new GuiToolTip( + new Rectangle(rightColumn + 36, customTop + 43, 18, 18), + funcUpgradeTips.toArray(new String[0])) { + @Override + public boolean shouldDraw() { + return !gui.getContainer().hasFunctionUpgrades() && super.shouldDraw(); + } + }; + + gui.getContainer().setInoutSlotsVisible(false, false); } - initCustomOptions(); - } - - protected boolean hasUpgrades() { - return false; - } - - protected void initCustomOptions() { - } - - @Override - public void deactivate() { - insertEnabledB.detach(); - extractEnabledB.detach(); - - gui.removeToolTip(speedUpgradeTooltip); - gui.removeToolTip(functionUpgradeTooltip); - gui.removeToolTip(filterExtractUpgradeTooltip); - gui.removeToolTip(filterInsertUpgradeTooltip); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void keyTyped(char par1, int par2) { - } - - @Override - public void updateScreen() { - } - - @Override - @Nonnull - public IWidgetIcon getIcon() { - return icon; - } - - private void updateConnectionMode() { - ConnectionMode mode = ConnectionMode.DISABLED; - if (insertEnabled && extractEnabled || enabled) { - mode = ConnectionMode.IN_OUT; - } else if (insertEnabled) { - mode = ConnectionMode.OUTPUT; - } else if (extractEnabled) { - mode = ConnectionMode.INPUT; + @Override + public ResourceLocation getTexture() { + return texture; } - con.setConnectionMode(gui.getDir(), mode); - PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.getDir())); - } - @Override - public void actionPerformed(@Nonnull GuiButton guiButton) { - if (guiButton.id == ID_INSERT_ENABLED) { - insertEnabled = !insertEnabled; - updateConnectionMode(); - } else if (guiButton.id == ID_EXTRACT_ENABLED) { - extractEnabled = !extractEnabled; - updateConnectionMode(); - } else if (guiButton.id == ID_ENABLED) { - enabled = !enabled; - updateConnectionMode(); + public int getTextureHeight() { + return textureHeight; } - } - protected void connectionModeChanged(@Nonnull ConnectionMode mode) { - oldConnectionMode = mode; - if (hasInOutModes()) { - insertEnabled = mode.acceptsOutput(); - extractEnabled = mode.acceptsInput(); - } else { - enabled = mode == ConnectionMode.IN_OUT; + protected void updateFilterButtons() {} + + protected boolean hasFilterGui(boolean input) { + return true; } - } - @Override - public void render(float par1, int par2, int par3) { - updateFilterButtons(); - - FontRenderer fr = gui.getFontRenderer(); - - int rgb = ColorUtil.getRGB(Color.darkGray); - int x = left + 32; - int y = gui.getGuiTop() + 10; - - if (hasInOutModes()) { - fr.drawString(inputHeading, x, y, rgb); - x += 92; - fr.drawString(outputHeading, x, y, rgb); - } else { - String heading = enabled ? getEnabledHeading() : getDisabledHeading(); - fr.drawString(heading, x, y, rgb); + public boolean updateConduit(@Nonnull IConduit conduit) { + this.con = conduit; + if (oldConnectionMode != con.getConnectionMode(gui.getDir())) { + connectionModeChanged(con.getConnectionMode(gui.getDir())); + } + return true; } - renderCustomOptions(y + gap + fr.FONT_HEIGHT + gap, par1, par2, par3); - } - protected void renderCustomOptions(int topIn, float par1, int par2, int par3) { + @Override + public void onGuiInit(int leftIn, int topIn, int widthIn, int heightIn) { + this.left = leftIn; + this.top = topIn; + this.width = widthIn; + this.height = heightIn; - } + updateConduit(con); - protected @Nonnull String getTypeName() { - return typeName; - } + if (hasInOutModes()) { + insertEnabledB.onGuiInit(); + extractEnabledB.onGuiInit(); - protected boolean hasFilters() { - return false; - } + insertEnabledB.setSelected(insertEnabled); + extractEnabledB.setSelected(extractEnabled); + } else { + enabledB.onGuiInit(); + enabledB.setSelected(enabled); + } - @Nonnull - protected String getInputHeading() { - // lang strings are nonintuitive for some reason - return EnderIO.lang.localize("gui.conduit.ioMode.output"); - } + if (hasFilters()) { + gui.addToolTip(filterExtractUpgradeTooltip); + gui.addToolTip(filterInsertUpgradeTooltip); + } + if (hasUpgrades()) { + gui.addToolTip(speedUpgradeTooltip); + gui.addToolTip(functionUpgradeTooltip); + } - @Nonnull - protected String getOutputHeading() { - return EnderIO.lang.localize("gui.conduit.ioMode.input"); - } + initCustomOptions(); + } - @Nonnull - protected String getEnabledHeading() { - return EnderIO.lang.localize("gui.enabled"); - } + protected boolean hasUpgrades() { + return false; + } - @Nonnull - protected String getDisabledHeading() { - return EnderIO.lang.localize("gui.disabled"); - } + protected void initCustomOptions() {} - protected boolean hasInOutModes() { - return true; - } + @Override + public void deactivate() { + insertEnabledB.detach(); + extractEnabledB.detach(); + gui.removeToolTip(speedUpgradeTooltip); + gui.removeToolTip(functionUpgradeTooltip); + gui.removeToolTip(filterExtractUpgradeTooltip); + gui.removeToolTip(filterInsertUpgradeTooltip); + } + + @Override + public void mouseClicked(int x, int y, int par3) {} + + @Override + public void keyTyped(char par1, int par2) {} + + @Override + public void updateScreen() {} + + @Override + @Nonnull + public IWidgetIcon getIcon() { + return icon; + } + + private void updateConnectionMode() { + ConnectionMode mode = ConnectionMode.DISABLED; + if (insertEnabled && extractEnabled || enabled) { + mode = ConnectionMode.IN_OUT; + } else if (insertEnabled) { + mode = ConnectionMode.OUTPUT; + } else if (extractEnabled) { + mode = ConnectionMode.INPUT; + } + con.setConnectionMode(gui.getDir(), mode); + PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.getDir())); + } + + @Override + public void actionPerformed(@Nonnull GuiButton guiButton) { + if (guiButton.id == ID_INSERT_ENABLED) { + insertEnabled = !insertEnabled; + updateConnectionMode(); + } else if (guiButton.id == ID_EXTRACT_ENABLED) { + extractEnabled = !extractEnabled; + updateConnectionMode(); + } else if (guiButton.id == ID_ENABLED) { + enabled = !enabled; + updateConnectionMode(); + } + } + + protected void connectionModeChanged(@Nonnull ConnectionMode mode) { + oldConnectionMode = mode; + if (hasInOutModes()) { + insertEnabled = mode.acceptsOutput(); + extractEnabled = mode.acceptsInput(); + } else { + enabled = mode == ConnectionMode.IN_OUT; + } + } + + @Override + public void render(float par1, int par2, int par3) { + updateFilterButtons(); + + FontRenderer fr = gui.getFontRenderer(); + + int rgb = ColorUtil.getRGB(Color.darkGray); + int x = left + 32; + int y = gui.getGuiTop() + 10; + + if (hasInOutModes()) { + fr.drawString(inputHeading, x, y, rgb); + x += 92; + fr.drawString(outputHeading, x, y, rgb); + } else { + String heading = enabled ? getEnabledHeading() : getDisabledHeading(); + fr.drawString(heading, x, y, rgb); + } + renderCustomOptions(y + gap + fr.FONT_HEIGHT + gap, par1, par2, par3); + } + + protected void renderCustomOptions(int topIn, float par1, int par2, int par3) {} + + protected @Nonnull String getTypeName() { + return typeName; + } + + protected boolean hasFilters() { + return false; + } + + @Nonnull + protected String getInputHeading() { + // lang strings are nonintuitive for some reason + return EnderIO.lang.localize("gui.conduit.ioMode.output"); + } + + @Nonnull + protected String getOutputHeading() { + return EnderIO.lang.localize("gui.conduit.ioMode.input"); + } + + @Nonnull + protected String getEnabledHeading() { + return EnderIO.lang.localize("gui.enabled"); + } + + @Nonnull + protected String getDisabledHeading() { + return EnderIO.lang.localize("gui.disabled"); + } + + protected boolean hasInOutModes() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index fb11dff2..e4e5f4eb 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -1,11 +1,20 @@ package crazypants.enderio.conduit.gui; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.ContainerEnder; +import com.enderio.core.common.util.ItemUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.gui.item.InventoryUpgrades; +import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.SpeedUpgrade; +import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.network.PacketHandler; import java.awt.Point; import java.util.ArrayList; import java.util.Collections; import java.util.List; - -import crazypants.enderio.conduit.item.filter.IItemFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -14,293 +23,281 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; -import com.enderio.core.common.util.ItemUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.gui.item.InventoryUpgrades; -import crazypants.enderio.conduit.item.IItemConduit; -import crazypants.enderio.conduit.item.SpeedUpgrade; -import crazypants.enderio.network.PacketHandler; - public class ExternalConnectionContainer extends ContainerEnder { - private final IItemConduit itemConduit; - private final ForgeDirection direction; + private final IItemConduit itemConduit; + private final ForgeDirection direction; - private int speedUpgradeSlotLimit = 15; + private int speedUpgradeSlotLimit = 15; - private static final int outputFilterUpgradeSlot = 36; - private static final int inputFilterUpgradeSlot = 37; - private static final int speedUpgradeSlot = 38; - private static final int functionUpgradeSlot = 39; + private static final int outputFilterUpgradeSlot = 36; + private static final int inputFilterUpgradeSlot = 37; + private static final int speedUpgradeSlot = 38; + private static final int functionUpgradeSlot = 39; - private Slot slotSpeedUpgrades; - private Slot slotFunctionUpgrades; - private Slot slotInputFilterUpgrades; - private Slot slotOutputFilterUpgrades; + private Slot slotSpeedUpgrades; + private Slot slotFunctionUpgrades; + private Slot slotInputFilterUpgrades; + private Slot slotOutputFilterUpgrades; - private final List slotLocations = new ArrayList<>(); + private final List slotLocations = new ArrayList<>(); - final List filterListeners = new ArrayList<>(); - final List bgSlots = new ArrayList<>(); + final List filterListeners = new ArrayList<>(); + final List bgSlots = new ArrayList<>(); - public ExternalConnectionContainer(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { - super(playerInv, new InventoryUpgrades(bundle.getConduit(IItemConduit.class), dir)); - this.direction = dir; - this.itemConduit = bundle.getConduit(IItemConduit.class); - slotLocations.addAll(playerSlotLocations.values()); + public ExternalConnectionContainer(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { + super(playerInv, new InventoryUpgrades(bundle.getConduit(IItemConduit.class), dir)); + this.direction = dir; + this.itemConduit = bundle.getConduit(IItemConduit.class); + slotLocations.addAll(playerSlotLocations.values()); - int x; - int y; + int x; + int y; - if (itemConduit != null) { - x = 23; - y = 71; - slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(getInv(), 3, x, y)); - slotLocations.add(new Point(x, y)); - bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, slotOutputFilterUpgrades)); + if (itemConduit != null) { + x = 23; + y = 71; + slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(getInv(), 3, x, y)); + slotLocations.add(new Point(x, y)); + bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, slotOutputFilterUpgrades)); - x = 113; - y = 71; - slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(getInv(), 2, x, y)); - slotLocations.add(new Point(x, y)); - bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, slotInputFilterUpgrades)); + x = 113; + y = 71; + slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(getInv(), 2, x, y)); + slotLocations.add(new Point(x, y)); + bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, slotInputFilterUpgrades)); - x = 131; - y = 71; - slotSpeedUpgrades = addSlotToContainer(new Slot(getInv(), 0, x, y) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return getInv().isItemValidForSlot(0, par1ItemStack); + x = 131; + y = 71; + slotSpeedUpgrades = addSlotToContainer(new Slot(getInv(), 0, x, y) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return getInv().isItemValidForSlot(0, par1ItemStack); + } + + @Override + public int getSlotStackLimit() { + return speedUpgradeSlotLimit; + } + }); + slotLocations.add(new Point(x, y)); + bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemExtractSpeedUpgrade, slotSpeedUpgrades)); + + x = 149; + y = 71; + slotFunctionUpgrades = addSlotToContainer(new Slot(getInv(), 1, x, y) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return getInv().isItemValidForSlot(1, par1ItemStack); + } + + @Override + public int getSlotStackLimit() { + return 1; + } + }); + slotLocations.add(new Point(x, y)); + bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemFunctionUpgrade, slotFunctionUpgrades)); + } + + setInventorySlotsVisible(false); + } + + public void createGhostSlots(List slots) { + slots.addAll(bgSlots); + } + + @Override + public Point getPlayerInventoryOffset() { + return new Point(23, 161); + } + + public void addFilterListener(FilterChangeListener list) { + filterListeners.add(list); + } + + protected void filterChanged() { + for (FilterChangeListener list : filterListeners) { + list.onFilterChanged(); + } + } + + public boolean hasSpeedUpgrades() { + return slotSpeedUpgrades != null && slotSpeedUpgrades.getHasStack(); + } + + public boolean hasFunctionUpgrades() { + return slotFunctionUpgrades != null && slotFunctionUpgrades.getHasStack(); + } + + public boolean hasFilterUpgrades(boolean input) { + Slot slot = input ? slotInputFilterUpgrades : slotOutputFilterUpgrades; + return slot != null && slot.getHasStack(); + } + + public ForgeDirection getDirection() { + return direction; + } + + public IItemFilter getFilter(boolean input) { + if (itemConduit == null) { + return null; + } + return input ? itemConduit.getInputFilter(direction) : itemConduit.getOutputFilter(direction); + } + + public void setInoutSlotsVisible(boolean inputVisible, boolean outputVisible) { + if (itemConduit == null) { + return; + } + setSlotsVisible(inputVisible, inputFilterUpgradeSlot, inputFilterUpgradeSlot + 1); + setSlotsVisible(inputVisible, speedUpgradeSlot, speedUpgradeSlot + 1); + setSlotsVisible(outputVisible, outputFilterUpgradeSlot, outputFilterUpgradeSlot + 1); + setSlotsVisible(inputVisible || outputVisible, functionUpgradeSlot, functionUpgradeSlot + 1); + World world = itemConduit.getBundle().getWorld(); + if (world.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketSlotVisibility(inputVisible, outputVisible)); + } + } + + public void setInventorySlotsVisible(boolean visible) { + setSlotsVisible(visible, 0, 36); + } + + private void setSlotsVisible(boolean visible, int startIndex, int endIndex) { + for (int i = startIndex; i < endIndex; i++) { + Slot s = (Slot) inventorySlots.get(i); + if (visible) { + s.xDisplayPosition = slotLocations.get(i).x; + s.yDisplayPosition = slotLocations.get(i).y; + } else { + s.xDisplayPosition = -3000; + s.yDisplayPosition = -3000; + } + } + } + + @Override + public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { + ItemStack st = par4EntityPlayer.inventory.getItemStack(); + setSpeedUpgradeSlotLimit(st); + try { + return super.slotClick(par1, par2, par3, par4EntityPlayer); + } catch (Exception e) { + // Horrible work around for a bug when double clicking on a stack in inventory which matches a filter item + // This does does double clicking to fill a stack from working with this GUI open. + return null; + } + } + + private void setSpeedUpgradeSlotLimit(ItemStack st) { + if (st != null && st.getItem() == EnderIO.itemExtractSpeedUpgrade) { + SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st); + speedUpgradeSlotLimit = speedUpgrade.maxStackSize; + } + } + + private boolean mergeItemStackSpecial(ItemStack origStack, Slot targetSlot) { + if (!targetSlot.isItemValid(origStack)) { + return false; + } + + setSpeedUpgradeSlotLimit(origStack); + ItemStack curStack = targetSlot.getStack(); + int maxStackSize = Math.min(origStack.getMaxStackSize(), targetSlot.getSlotStackLimit()); + + if (curStack == null) { + curStack = origStack.copy(); + curStack.stackSize = Math.min(origStack.stackSize, maxStackSize); + origStack.stackSize -= curStack.stackSize; + targetSlot.putStack(curStack); + targetSlot.onSlotChanged(); + return true; + } else if (ItemUtil.areStackMergable(curStack, origStack)) { + int mergedSize = curStack.stackSize + origStack.stackSize; + if (mergedSize <= maxStackSize) { + origStack.stackSize = 0; + curStack.stackSize = mergedSize; + targetSlot.onSlotChanged(); + return true; + } else if (curStack.stackSize < maxStackSize) { + origStack.stackSize -= maxStackSize - curStack.stackSize; + curStack.stackSize = maxStackSize; + targetSlot.onSlotChanged(); + return true; + } + } + + return false; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + ItemStack copystack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + copystack = origStack.copy(); + + boolean merged = false; + if (slotIndex < outputFilterUpgradeSlot) { + for (int targetSlotIdx = outputFilterUpgradeSlot; + targetSlotIdx <= functionUpgradeSlot; + targetSlotIdx++) { + Slot targetSlot = (Slot) inventorySlots.get(targetSlotIdx); + if (targetSlot.xDisplayPosition >= 0 && mergeItemStackSpecial(origStack, targetSlot)) { + merged = true; + break; + } + } + } else { + merged = mergeItemStack(origStack, 0, outputFilterUpgradeSlot, false); + } + + if (!merged) { + return null; + } + + slot.onSlotChange(origStack, copystack); + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + if (origStack.stackSize == copystack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return copystack; + } + + private class FilterSlot extends Slot { + public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4) { + super(par1iInventory, par2, par3, par4); } @Override public int getSlotStackLimit() { - return speedUpgradeSlotLimit; + return 1; } - }); - slotLocations.add(new Point(x, y)); - bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemExtractSpeedUpgrade, slotSpeedUpgrades)); - x = 149; - y = 71; - slotFunctionUpgrades = addSlotToContainer(new Slot(getInv(), 1, x, y) { @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return getInv().isItemValidForSlot(1, par1ItemStack); + public void onSlotChanged() { + filterChanged(); } @Override - public int getSlotStackLimit() { - return 1; + public boolean isItemValid(ItemStack par1ItemStack) { + return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack); } - }); - slotLocations.add(new Point(x, y)); - bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemFunctionUpgrade, slotFunctionUpgrades)); } - setInventorySlotsVisible(false); - } - - public void createGhostSlots(List slots) { - slots.addAll(bgSlots); - } - - @Override - public Point getPlayerInventoryOffset() { - return new Point(23, 161); - } - - public void addFilterListener(FilterChangeListener list) { - filterListeners.add(list); - } - - protected void filterChanged() { - for (FilterChangeListener list : filterListeners) { - list.onFilterChanged(); + public List getFunctionUpgradeToolTipText() { + return Collections.emptyList(); } - } - - public boolean hasSpeedUpgrades() { - return slotSpeedUpgrades != null && slotSpeedUpgrades.getHasStack(); - } - - public boolean hasFunctionUpgrades() { - return slotFunctionUpgrades != null && slotFunctionUpgrades.getHasStack(); - } - - public boolean hasFilterUpgrades(boolean input) { - Slot slot = input ? slotInputFilterUpgrades : slotOutputFilterUpgrades; - return slot != null && slot.getHasStack(); - } - - public ForgeDirection getDirection() { - return direction; - } - - public IItemFilter getFilter(boolean input) { - if (itemConduit == null) { - return null; - } - return input ? itemConduit.getInputFilter(direction) : itemConduit.getOutputFilter(direction); - } - - public void setInoutSlotsVisible(boolean inputVisible, boolean outputVisible) { - if(itemConduit == null) { - return; - } - setSlotsVisible(inputVisible, inputFilterUpgradeSlot, inputFilterUpgradeSlot + 1); - setSlotsVisible(inputVisible, speedUpgradeSlot, speedUpgradeSlot + 1); - setSlotsVisible(outputVisible, outputFilterUpgradeSlot, outputFilterUpgradeSlot + 1); - setSlotsVisible(inputVisible || outputVisible, functionUpgradeSlot, functionUpgradeSlot + 1); - World world = itemConduit.getBundle().getWorld(); - if(world.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketSlotVisibility(inputVisible, outputVisible)); - } - } - - public void setInventorySlotsVisible(boolean visible) { - setSlotsVisible(visible, 0, 36); - } - - private void setSlotsVisible(boolean visible, int startIndex, int endIndex) { - for (int i = startIndex; i < endIndex; i++) { - Slot s = (Slot) inventorySlots.get(i); - if(visible) { - s.xDisplayPosition = slotLocations.get(i).x; - s.yDisplayPosition = slotLocations.get(i).y; - } else { - s.xDisplayPosition = -3000; - s.yDisplayPosition = -3000; - } - } - } - - @Override - public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { - ItemStack st = par4EntityPlayer.inventory.getItemStack(); - setSpeedUpgradeSlotLimit(st); - try { - return super.slotClick(par1, par2, par3, par4EntityPlayer); - } catch (Exception e) { - //Horrible work around for a bug when double clicking on a stack in inventory which matches a filter item - //This does does double clicking to fill a stack from working with this GUI open. - return null; - } - } - - private void setSpeedUpgradeSlotLimit(ItemStack st) { - if(st != null && st.getItem() == EnderIO.itemExtractSpeedUpgrade) { - SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st); - speedUpgradeSlotLimit = speedUpgrade.maxStackSize; - } - } - - private boolean mergeItemStackSpecial(ItemStack origStack, Slot targetSlot) { - if (!targetSlot.isItemValid(origStack)) { - return false; - } - - setSpeedUpgradeSlotLimit(origStack); - ItemStack curStack = targetSlot.getStack(); - int maxStackSize = Math.min(origStack.getMaxStackSize(), targetSlot.getSlotStackLimit()); - - if(curStack == null) { - curStack = origStack.copy(); - curStack.stackSize = Math.min(origStack.stackSize, maxStackSize); - origStack.stackSize -= curStack.stackSize; - targetSlot.putStack(curStack); - targetSlot.onSlotChanged(); - return true; - } else if(ItemUtil.areStackMergable(curStack, origStack)) { - int mergedSize = curStack.stackSize + origStack.stackSize; - if(mergedSize <= maxStackSize) { - origStack.stackSize = 0; - curStack.stackSize = mergedSize; - targetSlot.onSlotChanged(); - return true; - } else if(curStack.stackSize < maxStackSize) { - origStack.stackSize -= maxStackSize - curStack.stackSize; - curStack.stackSize = maxStackSize; - targetSlot.onSlotChanged(); - return true; - } - } - - return false; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - ItemStack copystack = null; - Slot slot = (Slot) inventorySlots.get(slotIndex); - if(slot != null && slot.getHasStack()) { - ItemStack origStack = slot.getStack(); - copystack = origStack.copy(); - - boolean merged = false; - if (slotIndex < outputFilterUpgradeSlot) { - for (int targetSlotIdx = outputFilterUpgradeSlot; targetSlotIdx <= functionUpgradeSlot; targetSlotIdx++) { - Slot targetSlot = (Slot) inventorySlots.get(targetSlotIdx); - if(targetSlot.xDisplayPosition >= 0 && mergeItemStackSpecial(origStack, targetSlot)) { - merged = true; - break; - } - } - } else { - merged = mergeItemStack(origStack, 0, outputFilterUpgradeSlot, false); - } - - if(!merged) { - return null; - } - - slot.onSlotChange(origStack, copystack); - - if(origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - if(origStack.stackSize == copystack.stackSize) { - return null; - } - - slot.onPickupFromSlot(entityPlayer, origStack); - } - - return copystack; - } - - private class FilterSlot extends Slot { - public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); - } - - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public void onSlotChanged() { - filterChanged(); - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack); - } - - } - - public List getFunctionUpgradeToolTipText() { - return Collections.emptyList(); - } - } diff --git a/src/main/java/crazypants/enderio/conduit/gui/FakeButton.java b/src/main/java/crazypants/enderio/conduit/gui/FakeButton.java index d961d84d..94fae8d2 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/FakeButton.java +++ b/src/main/java/crazypants/enderio/conduit/gui/FakeButton.java @@ -1,72 +1,76 @@ package crazypants.enderio.conduit.gui; -import javax.annotation.Nonnull; - -import com.enderio.core.client.gui.button.TooltipButton; -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.api.client.render.IWidgetIcon; - +import com.enderio.core.client.gui.button.TooltipButton; +import javax.annotation.Nonnull; import net.minecraft.client.Minecraft; +import org.lwjgl.opengl.GL11; public class FakeButton extends TooltipButton { - public static final int DEFAULT_WIDTH = 16; - public static final int DEFAULT_HEIGHT = 16; + public static final int DEFAULT_WIDTH = 16; + public static final int DEFAULT_HEIGHT = 16; - protected @Nonnull IWidgetIcon icon; + protected @Nonnull IWidgetIcon icon; - private int marginY = 0; - private int marginX = 0; + private int marginY = 0; + private int marginX = 0; - public FakeButton(@Nonnull IGuiScreen gui, int x, int y, @Nonnull IWidgetIcon icon) { - super(gui, -1, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); - this.icon = icon; - } - - @Override - public FakeButton setPosition(int x, int y) { - super.setPosition(x, y); - return this; - } - - public FakeButton setIconMargin(int x, int y) { - marginX = x; - marginY = y; - return this; - } - - public @Nonnull IWidgetIcon getIcon() { - return icon; - } - - public void setIcon(@Nonnull IWidgetIcon icon) { - this.icon = icon; - } - - public boolean mousePressedButton(@Nonnull Minecraft mc, int mouseX, int mouseY, int button) { - return false; - } - - protected boolean checkMousePress(@Nonnull Minecraft mc, int mouseX, int mouseY) { - return false; - } - - /** - * Draws this button to the screen. - */ - @Override - public void drawButton(@Nonnull Minecraft mc, int mouseX, int mouseY) { - updateTooltip(mc, mouseX, mouseY); - if (isVisible()) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - icon.getMap().render(icon, xPosition + marginX, yPosition + marginY, width - 2 * marginX, height - 2 * marginY, 0, true); - GL11.glPopAttrib(); + public FakeButton(@Nonnull IGuiScreen gui, int x, int y, @Nonnull IWidgetIcon icon) { + super(gui, -1, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); + this.icon = icon; } - } + @Override + public FakeButton setPosition(int x, int y) { + super.setPosition(x, y); + return this; + } + + public FakeButton setIconMargin(int x, int y) { + marginX = x; + marginY = y; + return this; + } + + public @Nonnull IWidgetIcon getIcon() { + return icon; + } + + public void setIcon(@Nonnull IWidgetIcon icon) { + this.icon = icon; + } + + public boolean mousePressedButton(@Nonnull Minecraft mc, int mouseX, int mouseY, int button) { + return false; + } + + protected boolean checkMousePress(@Nonnull Minecraft mc, int mouseX, int mouseY) { + return false; + } + + /** + * Draws this button to the screen. + */ + @Override + public void drawButton(@Nonnull Minecraft mc, int mouseX, int mouseY) { + updateTooltip(mc, mouseX, mouseY); + if (isVisible()) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + icon.getMap() + .render( + icon, + xPosition + marginX, + yPosition + marginY, + width - 2 * marginX, + height - 2 * marginY, + 0, + true); + GL11.glPopAttrib(); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/FilterChangeListener.java b/src/main/java/crazypants/enderio/conduit/gui/FilterChangeListener.java index 5c834f57..51c7065c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/FilterChangeListener.java +++ b/src/main/java/crazypants/enderio/conduit/gui/FilterChangeListener.java @@ -2,6 +2,5 @@ package crazypants.enderio.conduit.gui; public interface FilterChangeListener { - void onFilterChanged(); - + void onFilterChanged(); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/FilterGuiUtil.java b/src/main/java/crazypants/enderio/conduit/gui/FilterGuiUtil.java index 8c8995c2..5c1807bd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/FilterGuiUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gui/FilterGuiUtil.java @@ -2,20 +2,20 @@ package crazypants.enderio.conduit.gui; public class FilterGuiUtil { - // List of filter indexes for reference in guis - public static final int INDEX_INPUT_ITEM = 1; - public static final int INDEX_OUTPUT_ITEM = 2; - public static final int INDEX_INPUT_FLUID = 3; - public static final int INDEX_OUTPUT_FLUID = 4; - public static final int INDEX_INPUT_REDSTONE = 6; - public static final int INDEX_OUTPUT_REDSTONE = 5; - public static final int INDEX_NONE = 0; + // List of filter indexes for reference in guis + public static final int INDEX_INPUT_ITEM = 1; + public static final int INDEX_OUTPUT_ITEM = 2; + public static final int INDEX_INPUT_FLUID = 3; + public static final int INDEX_OUTPUT_FLUID = 4; + public static final int INDEX_INPUT_REDSTONE = 6; + public static final int INDEX_OUTPUT_REDSTONE = 5; + public static final int INDEX_NONE = 0; - public static final int INDEX_FILTER_HANDHELD = -1; + public static final int INDEX_FILTER_HANDHELD = -1; - private static int nextButtonId = 1; + private static int nextButtonId = 1; - public static int nextButtonId() { - return nextButtonId++; - } + public static int nextButtonId() { + return nextButtonId++; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index 587ac65c..7a438f81 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -1,16 +1,9 @@ package crazypants.enderio.conduit.gui; -import java.awt.Color; - -import mekanism.api.gas.Gas; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.IIcon; - import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -21,108 +14,107 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import mekanism.api.gas.Gas; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.IIcon; public class GasSettings extends BaseSettingsPanel { - static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); + static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private RedstoneModeButton rsB; + private RedstoneModeButton rsB; - private ColorButton colorB; + private ColorButton colorB; - private String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract"); + private String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract"); - private IGasConduit conduit; + private IGasConduit conduit; - protected GasSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_GAS, EnderIO.lang.localize("itemGasConduit.name"), gui, con); + protected GasSettings(final GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_GAS, EnderIO.lang.localize("itemGasConduit.name"), gui, con); - conduit = (IGasConduit) con; - gui.getContainer().setInventorySlotsVisible(false); + conduit = (IGasConduit) con; + gui.getContainer().setInventorySlotsVisible(false); - int x = gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap * 2; - int y = customTop; + int x = gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap * 2; + int y = customTop; - rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { + rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - RedstoneControlMode curMode = getRedstoneControlMode(); - conduit.setExtractionRedstoneMode(mode, gui.getDir()); - if(curMode != mode) { - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + RedstoneControlMode curMode = getRedstoneControlMode(); + conduit.setExtractionRedstoneMode(mode, gui.getDir()); + if (curMode != mode) { + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + } + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + return conduit.getExtractionRedstoneMode(gui.getDir()); + } + }); + + x += rsB.getWidth() + gap; + colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON) { + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); } - - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return conduit.getExtractionRedstoneMode(gui.getDir()); - } - }); - - x += rsB.getWidth() + gap; - colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); - colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - if(guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); - } - } - - @Override - protected void connectionModeChanged(ConnectionMode conectionMode) { - super.connectionModeChanged(conectionMode); - if(conectionMode == ConnectionMode.INPUT) { - rsB.onGuiInit(); - colorB.onGuiInit(); - } else { - rsB.detach(); - colorB.detach(); } - } - - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void deactivate() { - super.deactivate(); - rsB.setToolTip((String[]) null); - colorB.setToolTip((String[]) null); - } - - @Override - protected void renderCustomOptions(int top, float par1, int par2, int par3) { - boolean isInput = isInput(); - if(isInput) { - int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2; - int y = customTop; - gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY)); - } - } - - private void renderGas(Gas f, int x, int y) { - IIcon icon = f.getIcon(); - if(icon != null) { - RenderUtil.bindBlockTexture(); - gui.drawTexturedModelRectFromIcon(x + 1, y + 1, icon, 16, 16); + @Override + protected void connectionModeChanged(ConnectionMode conectionMode) { + super.connectionModeChanged(conectionMode); + if (conectionMode == ConnectionMode.INPUT) { + rsB.onGuiInit(); + colorB.onGuiInit(); + } else { + rsB.detach(); + colorB.detach(); + } } - } + @Override + public void mouseClicked(int x, int y, int par3) {} - private boolean isInput() { - return conduit.getConnectionMode(gui.getDir()) == ConnectionMode.INPUT; - } + @Override + public void deactivate() { + super.deactivate(); + rsB.setToolTip((String[]) null); + colorB.setToolTip((String[]) null); + } + @Override + protected void renderCustomOptions(int top, float par1, int par2, int par3) { + boolean isInput = isInput(); + if (isInput) { + int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2; + int y = customTop; + gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY)); + } + } + + private void renderGas(Gas f, int x, int y) { + IIcon icon = f.getIcon(); + if (icon != null) { + RenderUtil.bindBlockTexture(); + gui.drawTexturedModelRectFromIcon(x + 1, y + 1, icon, 16, 16); + } + } + + private boolean isInput() { + return conduit.getConnectionMode(gui.getDir()) == ConnectionMode.INPUT; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 728598ac..7274de6e 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -1,27 +1,9 @@ package crazypants.enderio.conduit.gui; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.enderio.core.client.gui.GuiContainerBase; -import com.enderio.core.client.gui.widget.GhostSlot; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.api.client.render.IWidgetIcon; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.common.Optional; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -34,287 +16,298 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class GuiExternalConnection extends GuiContainerBaseEIO { - private static final int TAB_HEIGHT = 24; + private static final int TAB_HEIGHT = 24; - private static int nextButtonId = 1; + private static int nextButtonId = 1; - public static int nextButtonId() { - return nextButtonId++; - } + public static int nextButtonId() { + return nextButtonId++; + } - public static int nextButtonIds(int count) { - int id = nextButtonId; - nextButtonId += count; - return id; - } + public static int nextButtonIds(int count) { + int id = nextButtonId; + nextButtonId += count; + return id; + } - private static final Map, Integer> TAB_ORDER = new HashMap, Integer>(); - static { - TAB_ORDER.put(IItemConduit.class, 0); - TAB_ORDER.put(ILiquidConduit.class, 1); - TAB_ORDER.put(IRedstoneConduit.class, 2); - TAB_ORDER.put(IPowerConduit.class, 3); - TAB_ORDER.put(IMEConduit.class, 4); - TAB_ORDER.put(IGasConduit.class, 5); - TAB_ORDER.put(IOCConduit.class, 6); - } + private static final Map, Integer> TAB_ORDER = + new HashMap, Integer>(); - final InventoryPlayer playerInv; - final IConduitBundle bundle; - private final ForgeDirection dir; + static { + TAB_ORDER.put(IItemConduit.class, 0); + TAB_ORDER.put(ILiquidConduit.class, 1); + TAB_ORDER.put(IRedstoneConduit.class, 2); + TAB_ORDER.put(IPowerConduit.class, 3); + TAB_ORDER.put(IMEConduit.class, 4); + TAB_ORDER.put(IGasConduit.class, 5); + TAB_ORDER.put(IOCConduit.class, 6); + } - private final List conduits = new ArrayList(); - private final List tabs = new ArrayList(); - private int activeTab = 0; + final InventoryPlayer playerInv; + final IConduitBundle bundle; + private final ForgeDirection dir; - private int tabYOffset = 4; + private final List conduits = new ArrayList(); + private final List tabs = new ArrayList(); + private int activeTab = 0; - private final ExternalConnectionContainer container; + private int tabYOffset = 4; - public GuiExternalConnection(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { - super(new ExternalConnectionContainer(playerInv, bundle, dir), "externalConduitConnection", "itemFilter"); - container = (ExternalConnectionContainer) inventorySlots; - this.playerInv = playerInv; - this.bundle = bundle; - this.dir = dir; + private final ExternalConnectionContainer container; - ySize = 166 + 29 + 48; - xSize = 206; + public GuiExternalConnection(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) { + super(new ExternalConnectionContainer(playerInv, bundle, dir), "externalConduitConnection", "itemFilter"); + container = (ExternalConnectionContainer) inventorySlots; + this.playerInv = playerInv; + this.bundle = bundle; + this.dir = dir; - container.setInoutSlotsVisible(false, false); + ySize = 166 + 29 + 48; + xSize = 206; - List cons = new ArrayList(bundle.getConduits()); - Collections.sort(cons, new Comparator() { + container.setInoutSlotsVisible(false, false); - @Override - public int compare(IConduit o1, IConduit o2) { - Integer int1 = TAB_ORDER.get(o1.getBaseConduitType()); - if(int1 == null) { - return 1; + List cons = new ArrayList(bundle.getConduits()); + Collections.sort(cons, new Comparator() { + + @Override + public int compare(IConduit o1, IConduit o2) { + Integer int1 = TAB_ORDER.get(o1.getBaseConduitType()); + if (int1 == null) { + return 1; + } + Integer int2 = TAB_ORDER.get(o2.getBaseConduitType()); + if (int2 == null) { + return 1; + } + return Integer.compare(int1, int2); + } + }); + + for (IConduit con : cons) { + if (con.containsExternalConnection(dir) || con.canConnectToExternal(dir, true)) { + @SuppressWarnings("LeakingThisInConstructor") + ITabPanel tab = TabFactory.instance.createPanelForConduit(this, con); + if (tab != null) { + conduits.add(con); + tabs.add(tab); + tab.deactivate(); + } + } } - Integer int2 = TAB_ORDER.get(o2.getBaseConduitType()); - if(int2 == null) { - return 1; + } + + public IConduitBundle getBundle() { + return bundle; + } + + @Override + public void initGui() { + super.initGui(); + buttonList.clear(); + ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); + for (int i = 0; i < tabs.size(); i++) { + if (i == activeTab) { + tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); + } } - return Integer.compare(int1, int2); + } - } - }); + @Override + public boolean doesGuiPauseGame() { + return false; + } - for (IConduit con : cons) { - if(con.containsExternalConnection(dir) || con.canConnectToExternal(dir, true)) { - @SuppressWarnings("LeakingThisInConstructor") - ITabPanel tab = TabFactory.instance.createPanelForConduit(this, con); - if(tab != null) { - conduits.add(con); - tabs.add(tab); - tab.deactivate(); + /** + * Returns true when slots outside of standard gui bounds are clicked to prevent + * setting ghost filters dropping items on the ground. + */ + private boolean handleOobClick(int x, int y, int button) { + boolean outOfBounds = x < guiLeft || y < guiTop || x >= guiLeft + xSize || y >= guiTop + ySize; + boolean hasItem = playerInv.getItemStack() != null; + if (outOfBounds && hasItem && !getGhostSlots().isEmpty()) { + GhostSlot slot = getGhostSlot(x, y); + if (slot != null) { + ghostSlotClicked(slot, x, y, button); + return true; + } } - } + return false; } - } - - public IConduitBundle getBundle() { - return bundle; - } - - @Override - public void initGui() { - super.initGui(); - buttonList.clear(); - ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); - for (int i = 0; i < tabs.size(); i++) { - if(i == activeTab) { - tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); - } - } - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - /** - * Returns true when slots outside of standard gui bounds are clicked to prevent - * setting ghost filters dropping items on the ground. - */ - private boolean handleOobClick(int x, int y, int button) { - boolean outOfBounds = x < guiLeft || y < guiTop || x >= guiLeft + xSize || y >= guiTop + ySize; - boolean hasItem = playerInv.getItemStack() != null; - if (outOfBounds && hasItem && !getGhostSlots().isEmpty()) { - GhostSlot slot = getGhostSlot(x, y); - if (slot != null) { - ghostSlotClicked(slot, x, y, button); - return true; - } - } - return false; - } - - @Override - protected void mouseMovedOrUp(int x, int y, int button) { - if (handleOobClick(x, y, button)) { - return; - } - super.mouseMovedOrUp(x, y, button); - } - - @Override - protected void mouseClicked(int x, int y, int button) { - // handle out-of-bounds ghost slots - if (handleOobClick(x, y, button)) { - return; + @Override + protected void mouseMovedOrUp(int x, int y, int button) { + if (handleOobClick(x, y, button)) { + return; + } + super.mouseMovedOrUp(x, y, button); } - int tabLeftX = xSize; - int tabRightX = tabLeftX + 22; + @Override + protected void mouseClicked(int x, int y, int button) { + // handle out-of-bounds ghost slots + if (handleOobClick(x, y, button)) { + return; + } - int minY = tabYOffset; - int maxY = minY + (conduits.size() * TAB_HEIGHT); + int tabLeftX = xSize; + int tabRightX = tabLeftX + 22; - x = (x - guiLeft); - y = (y - guiTop); + int minY = tabYOffset; + int maxY = minY + (conduits.size() * TAB_HEIGHT); - if(x > tabLeftX && x < tabRightX + 24) { - if(y > minY && y < maxY) { - tabs.get(activeTab).deactivate(); - getGhostSlots().clear(); - activeTab = (y - minY) / 24; - initGui(); - return; - } + x = (x - guiLeft); + y = (y - guiTop); + + if (x > tabLeftX && x < tabRightX + 24) { + if (y > minY && y < maxY) { + tabs.get(activeTab).deactivate(); + getGhostSlots().clear(); + activeTab = (y - minY) / 24; + initGui(); + return; + } + } + tabs.get(activeTab).mouseClicked(x, y, button); + super.mouseClicked(x + guiLeft, y + guiTop, button); } - tabs.get(activeTab).mouseClicked(x, y, button); - super.mouseClicked(x + guiLeft, y + guiTop, button); - } - public void setSize(int x, int y) { - xSize = x; - ySize = y; - } + public void setSize(int x, int y) { + xSize = x; + ySize = y; + } - @Override - protected void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - tabs.get(activeTab).actionPerformed(guiButton); - } + @Override + protected void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + tabs.get(activeTab).actionPerformed(guiButton); + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - int tabX = sx + xSize - 3; + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + for (int i = 0; i < tabs.size(); i++) { + if (i != activeTab) { + RenderUtil.bindTexture(IconEIO.TEXTURE); + IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); + IWidgetIcon icon = tabs.get(i).getIcon(); + icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (i * TAB_HEIGHT) + 4); + } + } + + tes.draw(); + + int textureHeight = 166 + 29; + if (tabs.isEmpty()) { + bindGuiTexture(); + } else { + ITabPanel tab = tabs.get(activeTab); + RenderUtil.bindTexture(tab.getTexture()); + if (tab instanceof BaseSettingsPanel) { + textureHeight = ((BaseSettingsPanel) tab).getTextureHeight(); + } + } + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, textureHeight); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - for (int i = 0; i < tabs.size(); i++) { - if(i != activeTab) { RenderUtil.bindTexture(IconEIO.TEXTURE); - IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); - IWidgetIcon icon = tabs.get(i).getIcon(); - icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (i * TAB_HEIGHT) + 4); - } - } + tes.startDrawingQuads(); + IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); - tes.draw(); - - int textureHeight = 166 + 29; - if (tabs.isEmpty()) { - bindGuiTexture(); - } else { - ITabPanel tab = tabs.get(activeTab); - RenderUtil.bindTexture(tab.getTexture()); - if (tab instanceof BaseSettingsPanel) { - textureHeight = ((BaseSettingsPanel) tab).getTextureHeight(); - } - } - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, textureHeight); - - RenderUtil.bindTexture(IconEIO.TEXTURE); - tes.startDrawingQuads(); - IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); - - if(tabs.size() > 0) { - IWidgetIcon icon = tabs.get(activeTab).getIcon(); - icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); - tes.draw(); - tabs.get(activeTab).render(par1, par2, par3); - } else { - tes.draw(); - } - - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - - public ForgeDirection getDir() { - return dir; - } - - public ExternalConnectionContainer getContainer() { - return container; - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - if(tabs.size() > 0) { - int tabX = sx + xSize - 3; - int tabY = sy + tabYOffset; - - if((x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT)) { - return true; - } - } - List slots = getGhostSlots(); - if (slots != null && !slots.isEmpty()) { - for (GhostSlot slot : slots) { - int slotX = sx + slot.x; - int slotY = sy + slot.y; - if((x+w) >= slotX && x < (slotX + 20) && (y+h) >= slotY && y < (slotY + 20)) { - return true; + if (tabs.size() > 0) { + IWidgetIcon icon = tabs.get(activeTab).getIcon(); + icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); + tes.draw(); + tabs.get(activeTab).render(par1, par2, par3); + } else { + tes.draw(); } - } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - return false; - } - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean handleDragNDrop(GuiContainer gc, int x, int y, ItemStack is, int button) - { - if (super.handleDragNDrop(gc, x, y, is, button)) { - return true; + public ForgeDirection getDir() { + return dir; } - x -= guiLeft; - y -= guiTop; - if (is != null && is.stackSize > 0 && !tabs.isEmpty() && tabs.get(activeTab) instanceof LiquidSettings) { - LiquidSettings settings = (LiquidSettings) tabs.get(activeTab); - if (settings.setFilterFromItem(x, y, is)) { - is.stackSize = 0; - return true; - } + + public ExternalConnectionContainer getContainer() { + return container; } - return false; - } - @Override - protected void drawFakeItemStack(int x, int y, ItemStack stack) { - super.drawFakeItemStack(x, y, stack); - itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, stack, x, y, ""); - } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + if (tabs.size() > 0) { + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; - public void clearGhostSlots() { - getGhostSlots().clear(); - ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); - } + if ((x + w) >= tabX && x < (tabX + 14) && (y + h) >= tabY && y < (tabY + tabs.size() * TAB_HEIGHT)) { + return true; + } + } + List slots = getGhostSlots(); + if (slots != null && !slots.isEmpty()) { + for (GhostSlot slot : slots) { + int slotX = sx + slot.x; + int slotY = sy + slot.y; + if ((x + w) >= slotX && x < (slotX + 20) && (y + h) >= slotY && y < (slotY + 20)) { + return true; + } + } + } + return false; + } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean handleDragNDrop(GuiContainer gc, int x, int y, ItemStack is, int button) { + if (super.handleDragNDrop(gc, x, y, is, button)) { + return true; + } + x -= guiLeft; + y -= guiTop; + if (is != null && is.stackSize > 0 && !tabs.isEmpty() && tabs.get(activeTab) instanceof LiquidSettings) { + LiquidSettings settings = (LiquidSettings) tabs.get(activeTab); + if (settings.setFilterFromItem(x, y, is)) { + is.stackSize = 0; + return true; + } + } + return false; + } + + @Override + protected void drawFakeItemStack(int x, int y, ItemStack stack) { + super.drawFakeItemStack(x, y, stack); + itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, stack, x, y, ""); + } + + public void clearGhostSlots() { + getGhostSlots().clear(); + ((ExternalConnectionContainer) inventorySlots).createGhostSlots(getGhostSlots()); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 67bff134..fc0810e1 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -1,10 +1,17 @@ package crazypants.enderio.conduit.gui; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import crazypants.enderio.network.PacketHandler; import java.awt.Color; import java.awt.Point; import java.util.HashSet; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -14,116 +21,116 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; -import crazypants.enderio.network.PacketHandler; - public class GuiExternalConnectionSelector extends GuiScreen { - Set cons; - IConduitBundle cb; - String adjacentBlockNames[] = new String[6]; - Point textPositions[] = new Point[6]; + Set cons; + IConduitBundle cb; + String adjacentBlockNames[] = new String[6]; + Point textPositions[] = new Point[6]; - public GuiExternalConnectionSelector(IConduitBundle cb) { - this.cb = cb; - cons = new HashSet(); - for (IConduit con : cb.getConduits()) { - if(con instanceof IInsulatedRedstoneConduit) { - Set conCons = con.getConduitConnections(); - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(!conCons.contains(dir)) { - cons.add(dir); - } + public GuiExternalConnectionSelector(IConduitBundle cb) { + this.cb = cb; + cons = new HashSet(); + for (IConduit con : cb.getConduits()) { + if (con instanceof IInsulatedRedstoneConduit) { + Set conCons = con.getConduitConnections(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (!conCons.contains(dir)) { + cons.add(dir); + } + } + + } else { + cons.addAll(con.getExternalConnections()); + } } - - } else { - cons.addAll(con.getExternalConnections()); - } } - } - @Override - protected void actionPerformed(GuiButton b) { - ForgeDirection dir = ForgeDirection.values()[b.id]; - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - BlockCoord loc = cb.getLocation(); - PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, loc.x, loc.y, loc.z); - } - - protected String getBlockNameForDirection(ForgeDirection direction) { - BlockCoord coords = cb.getLocation(); - Block b = cb.getWorld().getBlock(coords.x + direction.offsetX, coords.y + direction.offsetY, coords.z + direction.offsetZ); - if (b != null && b != Blocks.air) { - return b.getLocalizedName(); + @Override + protected void actionPerformed(GuiButton b) { + ForgeDirection dir = ForgeDirection.values()[b.id]; + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + BlockCoord loc = cb.getLocation(); + PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); + player.openGui( + EnderIO.instance, + GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), + player.worldObj, + loc.x, + loc.y, + loc.z); } - return null; - } - @Override - public void initGui() { - GuiButton b; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - Point p = getOffsetForDir(dir); - adjacentBlockNames[dir.ordinal()] = getBlockNameForDirection(dir); - textPositions[dir.ordinal()] = new Point(p.x, p.y + 20); - b = new GuiButton(dir.ordinal(), p.x, p.y, 60, 20, dir.toString()); - buttonList.add(b); - if(!cons.contains(dir)) { - b.enabled = false; - } + protected String getBlockNameForDirection(ForgeDirection direction) { + BlockCoord coords = cb.getLocation(); + Block b = cb.getWorld() + .getBlock(coords.x + direction.offsetX, coords.y + direction.offsetY, coords.z + direction.offsetZ); + if (b != null && b != Blocks.air) { + return b.getLocalizedName(); + } + return null; } - } - @Override - public boolean doesGuiPauseGame() { - return false; - } - - @Override - public void drawScreen(int par1, int par2, float par3) { - - drawDefaultBackground(); - - super.drawScreen(par1, par2, par3); - - int butHeight = 20; - String txt = "Select Connection to Adjust"; - int x = width / 2 - (Minecraft.getMinecraft().fontRenderer.getStringWidth(txt) / 2); - int y = height / 2 - butHeight * 3 - 5; - Tessellator.instance.startDrawingQuads(); - drawString(Minecraft.getMinecraft().fontRenderer, txt, x, y, ColorUtil.getARGB(Color.white)); - for (int i = 0; i < 6; i++) { - String blockName = adjacentBlockNames[i]; - if (blockName == null) { - continue; - } - int textWidth = Minecraft.getMinecraft().fontRenderer.getStringWidth(blockName); - drawString(Minecraft.getMinecraft().fontRenderer, blockName, textPositions[i].x + 60 / 2 - textWidth / 2, textPositions[i].y, ColorUtil.getARGB(Color.gray)); + @Override + public void initGui() { + GuiButton b; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + Point p = getOffsetForDir(dir); + adjacentBlockNames[dir.ordinal()] = getBlockNameForDirection(dir); + textPositions[dir.ordinal()] = new Point(p.x, p.y + 20); + b = new GuiButton(dir.ordinal(), p.x, p.y, 60, 20, dir.toString()); + buttonList.add(b); + if (!cons.contains(dir)) { + b.enabled = false; + } + } } - Tessellator.instance.draw(); - } + @Override + public boolean doesGuiPauseGame() { + return false; + } - private Point getOffsetForDir(ForgeDirection dir) { - int mx = width / 2; - int my = height / 2; - int butWidth = 60; - int butHeight = 20; + @Override + public void drawScreen(int par1, int par2, float par3) { - int x = mx - butWidth / 2 + (dir.offsetX * butWidth); - int y = my - butHeight / 2 + (dir.offsetZ * butHeight * 2); - x += Math.abs(dir.offsetY) * (5 + butWidth * 2); - y -= (dir.offsetY * butHeight * 2); + drawDefaultBackground(); - return new Point(x, y); - } + super.drawScreen(par1, par2, par3); + int butHeight = 20; + String txt = "Select Connection to Adjust"; + int x = width / 2 - (Minecraft.getMinecraft().fontRenderer.getStringWidth(txt) / 2); + int y = height / 2 - butHeight * 3 - 5; + Tessellator.instance.startDrawingQuads(); + drawString(Minecraft.getMinecraft().fontRenderer, txt, x, y, ColorUtil.getARGB(Color.white)); + for (int i = 0; i < 6; i++) { + String blockName = adjacentBlockNames[i]; + if (blockName == null) { + continue; + } + int textWidth = Minecraft.getMinecraft().fontRenderer.getStringWidth(blockName); + drawString( + Minecraft.getMinecraft().fontRenderer, + blockName, + textPositions[i].x + 60 / 2 - textWidth / 2, + textPositions[i].y, + ColorUtil.getARGB(Color.gray)); + } + Tessellator.instance.draw(); + } + + private Point getOffsetForDir(ForgeDirection dir) { + int mx = width / 2; + int my = height / 2; + int butWidth = 60; + int butHeight = 20; + + int x = mx - butWidth / 2 + (dir.offsetX * butWidth); + int y = my - butHeight / 2 + (dir.offsetZ * butHeight * 2); + x += Math.abs(dir.offsetY) * (5 + butWidth * 2); + y -= (dir.offsetY * butHeight * 2); + + return new Point(x, y); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 4a96d13b..4273f19c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -1,30 +1,12 @@ package crazypants.enderio.conduit.gui; -import java.awt.Color; -import java.awt.Rectangle; -import java.util.Collections; -import java.util.List; - -import com.enderio.core.client.gui.button.ToggleButton; -import crazypants.enderio.conduit.packet.PacketRoundRobinMode; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.gui.button.MultiIconButton; +import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -32,404 +14,416 @@ import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit; import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; +import crazypants.enderio.conduit.packet.PacketRoundRobinMode; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import java.util.Collections; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class LiquidSettings extends BaseSettingsPanel { - static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); + static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_ROUND_ROBIN_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_INSERT_WHITELIST = GuiExternalConnection.nextButtonId(); - private static final int ID_EXTRACT_WHITELIST = GuiExternalConnection.nextButtonId(); + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_ROUND_ROBIN_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_INSERT_WHITELIST = GuiExternalConnection.nextButtonId(); + private static final int ID_EXTRACT_WHITELIST = GuiExternalConnection.nextButtonId(); - private static final int NEXT_FILTER_ID = 989322; + private static final int NEXT_FILTER_ID = 989322; - private static final int ID_INSERT_CHANNEL = GuiExternalConnection.nextButtonId(); - private static final int ID_EXTRACT_CHANNEL = GuiExternalConnection.nextButtonId(); + private static final int ID_INSERT_CHANNEL = GuiExternalConnection.nextButtonId(); + private static final int ID_EXTRACT_CHANNEL = GuiExternalConnection.nextButtonId(); - private final RedstoneModeButton rsB; - private final ToggleButton roundRobinB; - private final ColorButton colorB; - private ColorButton insertChannelB; - private ColorButton extractChannelB; + private final RedstoneModeButton rsB; + private final ToggleButton roundRobinB; + private final ColorButton colorB; + private ColorButton insertChannelB; + private ColorButton extractChannelB; - private static final String autoExtractStr = EnderIO.lang.localize("gui.conduit.fluid.autoExtract"); - private static final String filterStr = EnderIO.lang.localize("gui.conduit.fluid.filter"); + private static final String autoExtractStr = EnderIO.lang.localize("gui.conduit.fluid.autoExtract"); + private static final String filterStr = EnderIO.lang.localize("gui.conduit.fluid.filter"); - private final ILiquidConduit conduit; + private final ILiquidConduit conduit; - private AbstractEnderLiquidConduit eConduit; - private boolean isEnder; - private static final int filterIX = 4; - private static final int filterEX = 104; - private static final int filterY = 63; - private static final Rectangle insertFilterBounds = new Rectangle(filterIX, filterY, 90, 18); - private static final Rectangle extractFilterBounds = new Rectangle(filterEX, filterY, 90, 18); - private GuiToolTip[] filterToolTips; + private AbstractEnderLiquidConduit eConduit; + private boolean isEnder; + private static final int filterIX = 4; + private static final int filterEX = 104; + private static final int filterY = 63; + private static final Rectangle insertFilterBounds = new Rectangle(filterIX, filterY, 90, 18); + private static final Rectangle extractFilterBounds = new Rectangle(filterEX, filterY, 90, 18); + private GuiToolTip[] filterToolTips; - private boolean inOutShowIn = true; - private IconButton insertWhiteListB; - private IconButton extractWhiteListB; + private boolean inOutShowIn = true; + private IconButton insertWhiteListB; + private IconButton extractWhiteListB; - protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_FLUID, EnderIO.lang.localize("itemLiquidConduit.name"), gui, con, "in_out_settings"); - this.textureHeight += 48; + protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { + super( + IconEIO.WRENCH_OVERLAY_FLUID, + EnderIO.lang.localize("itemLiquidConduit.name"), + gui, + con, + "in_out_settings"); + this.textureHeight += 48; - conduit = (ILiquidConduit) con; - if(con instanceof AbstractEnderLiquidConduit) { - eConduit = (AbstractEnderLiquidConduit) con; - isEnder = true; + conduit = (ILiquidConduit) con; + if (con instanceof AbstractEnderLiquidConduit) { + eConduit = (AbstractEnderLiquidConduit) con; + isEnder = true; + int x = leftColumn; + int y = customTop; + insertWhiteListB = new IconButton(gui, ID_INSERT_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); + insertWhiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); - int x = leftColumn; - int y = customTop; - insertWhiteListB = new IconButton(gui, ID_INSERT_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); - insertWhiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); - - x = rightColumn; - extractWhiteListB = new IconButton(gui, ID_EXTRACT_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); - extractWhiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); - } else { - isEnder = false; - gui.getContainer().setInventorySlotsVisible(false); - } - - int x = leftColumn + 21; - int y = customTop; - - if(isEnder) - { - insertChannelB = new ColorButton(gui, ID_INSERT_CHANNEL, x, y); - insertChannelB.setColorIndex(0); - insertChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - extractChannelB = new ColorButton(gui, ID_EXTRACT_CHANNEL, x + rightColumn - leftColumn, y); - extractChannelB.setColorIndex(0); - extractChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - x += insertChannelB.getWidth(); - } - - x += rightColumn - leftColumn; - rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - RedstoneControlMode curMode = getRedstoneControlMode(); - conduit.setExtractionRedstoneMode(mode, gui.getDir()); - if(curMode != mode) { - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); - } - - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return conduit.getExtractionRedstoneMode(gui.getDir()); - } - }); - - x += rsB.getWidth(); - colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); - colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); - - if (isEnder) { - x += rsB.getWidth(); - roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN_BUTTON, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); - roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled")); - roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled")); - roundRobinB.setPaintSelectedBorder(false); - } else { - roundRobinB = null; - } - } - - private void addFilterTooltips() { - filterToolTips = new GuiToolTip[5]; - for (int i = 0; i < 5; i++) { - Rectangle bound = new Rectangle(filterIX + (i * 18), filterY, 18, 18); - filterToolTips[i] = new FilterToolTip(bound, i, false); - gui.addToolTip(filterToolTips[i]); - } - for (int i = 0; i < 5; i++) { - Rectangle bound = new Rectangle(filterEX + (i * 18), filterY, 18, 18); - filterToolTips[i] = new FilterToolTip(bound, i, true); - gui.addToolTip(filterToolTips[i]); - } - } - - @Override - public void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - if(guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); - } else if(guiButton.id == ID_INSERT_WHITELIST || guiButton.id == ID_EXTRACT_WHITELIST) { - toggleBlacklist(guiButton.id == ID_EXTRACT_WHITELIST); - }else if(guiButton.id == ID_INSERT_CHANNEL || guiButton.id == ID_EXTRACT_CHANNEL) { - ColorButton btn = (ColorButton) guiButton; - if(isEnder) { - - DyeColor col = DyeColor.values()[btn.getColorIndex()]; - boolean isInput = guiButton.id == ID_EXTRACT_CHANNEL; - - if (isInput) { - eConduit.setInputColor(gui.getDir(), col); + x = rightColumn; + extractWhiteListB = new IconButton(gui, ID_EXTRACT_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); + extractWhiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); } else { - eConduit.setOutputColor(gui.getDir(), col); + isEnder = false; + gui.getContainer().setInventorySlotsVisible(false); } - setConduitChannel(isInput, col); - } - } else if(guiButton.id == ID_ROUND_ROBIN_BUTTON) { - if (isEnder) { - final boolean selected = roundRobinB.isSelected(); - eConduit.setRoundRobin(gui.getDir(), selected); - PacketHandler.INSTANCE.sendToServer(new PacketRoundRobinMode(eConduit, gui.getDir())); - } - } - } - @Override - protected void connectionModeChanged(ConnectionMode conectionMode) { - super.connectionModeChanged(conectionMode); - updateGuiVisibility(); - } + int x = leftColumn + 21; + int y = customTop; - private void toggleBlacklist(boolean isInput) { - if(!isFilterVisible()) { - return; - } - FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput); - if(filter == null) { - filter = new FluidFilter(); - } - filter.setBlacklist(!filter.isBlacklist()); - setConduitFilter(isInput, filter); - updateWhiteListButton(filter, isInput); - } - - @Override - public void mouseClicked(int x, int y, int button) { - if(!isFilterVisible()) { - return; - } - ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); - setFilterFromItem(x, y, st); - } - - public boolean setFilterFromItem(int x, int y, ItemStack st) { - if (insertFilterBounds.contains(x, y)) { - FluidFilter filter = eConduit.getFilter(gui.getDir(), false); - if(filter == null && st == null) { - return false; - } - if(filter == null) { - filter = new FluidFilter(); - } - int slot = (x - filterIX) / 18; - filter.setFluid(slot, st); - setConduitFilter(false, filter); - return true; - } - if (extractFilterBounds.contains(x, y)) { - FluidFilter filter = eConduit.getFilter(gui.getDir(), true); - if(filter == null && st == null) { - return false; - } - if(filter == null) { - filter = new FluidFilter(); - } - int slot = (x - filterEX) / 18; - filter.setFluid(slot, st); - setConduitFilter(true, filter); - return true; - } - return false; - } - - protected void setConduitFilter(boolean isInput, FluidFilter filter) { - eConduit.setFilter(gui.getDir(), filter, isInput); - - PacketHandler.INSTANCE.sendToServer(new PacketFluidFilter(eConduit, gui.getDir(), filter, isInput)); - } - protected void setConduitChannel(boolean isInput, DyeColor channel) { - if(isInput) { - eConduit.setInputColor(gui.getDir(), channel); - } else { - eConduit.setOutputColor(gui.getDir(), channel); - } - - PacketHandler.INSTANCE.sendToServer(new PacketFluidChannel(eConduit, gui.getDir(), isInput, channel)); - } - - @Override - protected void initCustomOptions() { - updateGuiVisibility(); - } - - private void updateGuiVisibility() { - deactivate(); - - rsB.onGuiInit(); - colorB.onGuiInit(); - - if(!isEnder) { - return; - } - - insertChannelB.onGuiInit(); - insertChannelB.setColorIndex(eConduit.getOutputColor(gui.getDir()).ordinal()); - extractChannelB.onGuiInit(); - extractChannelB.setColorIndex(eConduit.getInputColor(gui.getDir()).ordinal()); - roundRobinB.onGuiInit(); - roundRobinB.setSelected(eConduit.isRoundRobin(gui.getDir())); - - gui.getContainer().setInventorySlotsVisible(true); - if(isFilterVisible()) { - addFilterTooltips(); - - insertWhiteListB.onGuiInit(); - extractWhiteListB.onGuiInit(); - updateWhiteListButtons(); - } - } - - private void updateWhiteListButtons() { - updateWhiteListButton(eConduit.getFilter(gui.getDir(), false), false); - updateWhiteListButton(eConduit.getFilter(gui.getDir(), true), true); - } - - private void updateWhiteListButton(FluidFilter filter, boolean isInput) { - IconButton whiteListB = isInput ? extractWhiteListB : insertWhiteListB; - if(filter != null && filter.isBlacklist()) { - whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.blacklist")); - } else { - whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); - } - } - - @Override - public void deactivate() { - - rsB.detach(); - colorB.detach(); - gui.getContainer().setInventorySlotsVisible(false); - if(isEnder) { - roundRobinB.detach(); - if(filterToolTips != null) { - for (GuiToolTip tt : filterToolTips) { - if(tt != null) { - gui.removeToolTip(tt); - } + if (isEnder) { + insertChannelB = new ColorButton(gui, ID_INSERT_CHANNEL, x, y); + insertChannelB.setColorIndex(0); + insertChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); + extractChannelB = new ColorButton(gui, ID_EXTRACT_CHANNEL, x + rightColumn - leftColumn, y); + extractChannelB.setColorIndex(0); + extractChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); + x += insertChannelB.getWidth(); } - } - insertWhiteListB.detach(); - extractWhiteListB.detach(); - insertChannelB.detach(); - extractChannelB.detach(); - } - } - @Override - protected void renderCustomOptions(int top, float par1, int par2, int par3) { - if(isEnder && isFilterVisible()) { - int x = left; - int y = top; + x += rightColumn - leftColumn; + rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(1); - //gui.drawTexturedModalRect(gui.getGuiLeft(), gui.getGuiTop() + 55, 0, 55, gui.getXSize(), 145); + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + RedstoneControlMode curMode = getRedstoneControlMode(); + conduit.setExtractionRedstoneMode(mode, gui.getDir()); + if (curMode != mode) { + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + } + } - FontRenderer fr = gui.getFontRenderer(); - int sw = fr.getStringWidth(filterStr); - x = left + 50 - sw/2; - y = top + 20; - fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); - x = left + 150 - sw/2; - fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); + @Override + public RedstoneControlMode getRedstoneControlMode() { + return conduit.getExtractionRedstoneMode(gui.getDir()); + } + }); - x = gui.getGuiLeft() + filterIX; - y = gui.getGuiTop() + filterY; - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(); - gui.drawTexturedModalRect(x, y, 24, 238, 90, 18); + x += rsB.getWidth(); + colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); - FluidFilter filter = eConduit.getFilter(gui.getDir(), false); - if(filter != null && !filter.isEmpty()) { - for (int i = 0; i < filter.size(); i++) { - FluidStack f = filter.getFluidStackAt(i); - if(f != null) { - renderFluid(f, x + (i * 18), y); - } + if (isEnder) { + x += rsB.getWidth(); + roundRobinB = + new ToggleButton(gui, ID_ROUND_ROBIN_BUTTON, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); + roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled")); + roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled")); + roundRobinB.setPaintSelectedBorder(false); + } else { + roundRobinB = null; } - } + } - x = gui.getGuiLeft() + filterEX; - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(); - gui.drawTexturedModalRect(x, y, 24, 238, 90, 18); - - filter = eConduit.getFilter(gui.getDir(), true); - if(filter != null && !filter.isEmpty()) { - for (int i = 0; i < filter.size(); i++) { - FluidStack f = filter.getFluidStackAt(i); - if(f != null) { - renderFluid(f, x + (i * 18), y); - } + private void addFilterTooltips() { + filterToolTips = new GuiToolTip[5]; + for (int i = 0; i < 5; i++) { + Rectangle bound = new Rectangle(filterIX + (i * 18), filterY, 18, 18); + filterToolTips[i] = new FilterToolTip(bound, i, false); + gui.addToolTip(filterToolTips[i]); + } + for (int i = 0; i < 5; i++) { + Rectangle bound = new Rectangle(filterEX + (i * 18), filterY, 18, 18); + filterToolTips[i] = new FilterToolTip(bound, i, true); + gui.addToolTip(filterToolTips[i]); } - } - - } - } - - private void renderFluid(FluidStack f, int x, int y) { - IIcon icon = f.getFluid().getIcon(); - if(icon != null) { - RenderUtil.bindBlockTexture(); - int color = f.getFluid().getColor(f); - GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); - gui.drawTexturedModelRectFromIcon(x + 1, y + 1, icon, 16, 16); - GL11.glColor3f(1, 1, 1); - } - - } - - private boolean isFilterVisible() { - return isEnder; - } - - private class FilterToolTip extends GuiToolTip { - - int index; - boolean isInput; - - public FilterToolTip(Rectangle bounds, int index, boolean isInput) { - super(bounds, (String[]) null); - this.index = index; - this.isInput = isInput; } @Override - public List getToolTipText() { - if(!isFilterVisible()) { - return null; - } - FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput); - if(filter == null) { - return null; - } - if (filter.getFluidStackAt(index) == null) { - return null; - } - return Collections.singletonList(filter.getFluidStackAt(index).getLocalizedName()); + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON) { + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + } else if (guiButton.id == ID_INSERT_WHITELIST || guiButton.id == ID_EXTRACT_WHITELIST) { + toggleBlacklist(guiButton.id == ID_EXTRACT_WHITELIST); + } else if (guiButton.id == ID_INSERT_CHANNEL || guiButton.id == ID_EXTRACT_CHANNEL) { + ColorButton btn = (ColorButton) guiButton; + if (isEnder) { + + DyeColor col = DyeColor.values()[btn.getColorIndex()]; + boolean isInput = guiButton.id == ID_EXTRACT_CHANNEL; + + if (isInput) { + eConduit.setInputColor(gui.getDir(), col); + } else { + eConduit.setOutputColor(gui.getDir(), col); + } + setConduitChannel(isInput, col); + } + } else if (guiButton.id == ID_ROUND_ROBIN_BUTTON) { + if (isEnder) { + final boolean selected = roundRobinB.isSelected(); + eConduit.setRoundRobin(gui.getDir(), selected); + PacketHandler.INSTANCE.sendToServer(new PacketRoundRobinMode(eConduit, gui.getDir())); + } + } } - } + @Override + protected void connectionModeChanged(ConnectionMode conectionMode) { + super.connectionModeChanged(conectionMode); + updateGuiVisibility(); + } + private void toggleBlacklist(boolean isInput) { + if (!isFilterVisible()) { + return; + } + FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput); + if (filter == null) { + filter = new FluidFilter(); + } + filter.setBlacklist(!filter.isBlacklist()); + setConduitFilter(isInput, filter); + updateWhiteListButton(filter, isInput); + } + + @Override + public void mouseClicked(int x, int y, int button) { + if (!isFilterVisible()) { + return; + } + ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); + setFilterFromItem(x, y, st); + } + + public boolean setFilterFromItem(int x, int y, ItemStack st) { + if (insertFilterBounds.contains(x, y)) { + FluidFilter filter = eConduit.getFilter(gui.getDir(), false); + if (filter == null && st == null) { + return false; + } + if (filter == null) { + filter = new FluidFilter(); + } + int slot = (x - filterIX) / 18; + filter.setFluid(slot, st); + setConduitFilter(false, filter); + return true; + } + if (extractFilterBounds.contains(x, y)) { + FluidFilter filter = eConduit.getFilter(gui.getDir(), true); + if (filter == null && st == null) { + return false; + } + if (filter == null) { + filter = new FluidFilter(); + } + int slot = (x - filterEX) / 18; + filter.setFluid(slot, st); + setConduitFilter(true, filter); + return true; + } + return false; + } + + protected void setConduitFilter(boolean isInput, FluidFilter filter) { + eConduit.setFilter(gui.getDir(), filter, isInput); + + PacketHandler.INSTANCE.sendToServer(new PacketFluidFilter(eConduit, gui.getDir(), filter, isInput)); + } + + protected void setConduitChannel(boolean isInput, DyeColor channel) { + if (isInput) { + eConduit.setInputColor(gui.getDir(), channel); + } else { + eConduit.setOutputColor(gui.getDir(), channel); + } + + PacketHandler.INSTANCE.sendToServer(new PacketFluidChannel(eConduit, gui.getDir(), isInput, channel)); + } + + @Override + protected void initCustomOptions() { + updateGuiVisibility(); + } + + private void updateGuiVisibility() { + deactivate(); + + rsB.onGuiInit(); + colorB.onGuiInit(); + + if (!isEnder) { + return; + } + + insertChannelB.onGuiInit(); + insertChannelB.setColorIndex(eConduit.getOutputColor(gui.getDir()).ordinal()); + extractChannelB.onGuiInit(); + extractChannelB.setColorIndex(eConduit.getInputColor(gui.getDir()).ordinal()); + roundRobinB.onGuiInit(); + roundRobinB.setSelected(eConduit.isRoundRobin(gui.getDir())); + + gui.getContainer().setInventorySlotsVisible(true); + if (isFilterVisible()) { + addFilterTooltips(); + + insertWhiteListB.onGuiInit(); + extractWhiteListB.onGuiInit(); + updateWhiteListButtons(); + } + } + + private void updateWhiteListButtons() { + updateWhiteListButton(eConduit.getFilter(gui.getDir(), false), false); + updateWhiteListButton(eConduit.getFilter(gui.getDir(), true), true); + } + + private void updateWhiteListButton(FluidFilter filter, boolean isInput) { + IconButton whiteListB = isInput ? extractWhiteListB : insertWhiteListB; + if (filter != null && filter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.blacklist")); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); + } + } + + @Override + public void deactivate() { + + rsB.detach(); + colorB.detach(); + gui.getContainer().setInventorySlotsVisible(false); + if (isEnder) { + roundRobinB.detach(); + if (filterToolTips != null) { + for (GuiToolTip tt : filterToolTips) { + if (tt != null) { + gui.removeToolTip(tt); + } + } + } + insertWhiteListB.detach(); + extractWhiteListB.detach(); + insertChannelB.detach(); + extractChannelB.detach(); + } + } + + @Override + protected void renderCustomOptions(int top, float par1, int par2, int par3) { + if (isEnder && isFilterVisible()) { + int x = left; + int y = top; + + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(1); + // gui.drawTexturedModalRect(gui.getGuiLeft(), gui.getGuiTop() + 55, 0, 55, gui.getXSize(), 145); + + FontRenderer fr = gui.getFontRenderer(); + int sw = fr.getStringWidth(filterStr); + x = left + 50 - sw / 2; + y = top + 20; + fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); + x = left + 150 - sw / 2; + fr.drawString(filterStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); + + x = gui.getGuiLeft() + filterIX; + y = gui.getGuiTop() + filterY; + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(); + gui.drawTexturedModalRect(x, y, 24, 238, 90, 18); + + FluidFilter filter = eConduit.getFilter(gui.getDir(), false); + if (filter != null && !filter.isEmpty()) { + for (int i = 0; i < filter.size(); i++) { + FluidStack f = filter.getFluidStackAt(i); + if (f != null) { + renderFluid(f, x + (i * 18), y); + } + } + } + + x = gui.getGuiLeft() + filterEX; + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(); + gui.drawTexturedModalRect(x, y, 24, 238, 90, 18); + + filter = eConduit.getFilter(gui.getDir(), true); + if (filter != null && !filter.isEmpty()) { + for (int i = 0; i < filter.size(); i++) { + FluidStack f = filter.getFluidStackAt(i); + if (f != null) { + renderFluid(f, x + (i * 18), y); + } + } + } + } + } + + private void renderFluid(FluidStack f, int x, int y) { + IIcon icon = f.getFluid().getIcon(); + if (icon != null) { + RenderUtil.bindBlockTexture(); + int color = f.getFluid().getColor(f); + GL11.glColor3ub((byte) (color >> 16 & 0xFF), (byte) (color >> 8 & 0xFF), (byte) (color & 0xFF)); + gui.drawTexturedModelRectFromIcon(x + 1, y + 1, icon, 16, 16); + GL11.glColor3f(1, 1, 1); + } + } + + private boolean isFilterVisible() { + return isEnder; + } + + private class FilterToolTip extends GuiToolTip { + + int index; + boolean isInput; + + public FilterToolTip(Rectangle bounds, int index, boolean isInput) { + super(bounds, (String[]) null); + this.index = index; + this.isInput = isInput; + } + + @Override + public List getToolTipText() { + if (!isFilterVisible()) { + return null; + } + FluidFilter filter = eConduit.getFilter(gui.getDir(), isInput); + if (filter == null) { + return null; + } + if (filter.getFluidStackAt(index) == null) { + return null; + } + return Collections.singletonList(filter.getFluidStackAt(index).getLocalizedName()); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java index 6b0b337b..4f74685f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java @@ -6,10 +6,7 @@ import crazypants.enderio.gui.IconEIO; public class MESettings extends BaseSettingsPanel { - public MESettings(GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_ME, EnderIO.lang.localize("itemMEConduit.name"), gui, con); - } - - - + public MESettings(GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_ME, EnderIO.lang.localize("itemMEConduit.name"), gui, con); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java index a96082da..b84c2a30 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java @@ -1,75 +1,69 @@ package crazypants.enderio.conduit.gui; -import java.awt.Color; - -import net.minecraft.client.gui.GuiButton; - import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.oc.IOCConduit; import crazypants.enderio.conduit.packet.PacketOCConduitSignalColor; -import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; -import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import net.minecraft.client.gui.GuiButton; public class OCSettings extends BaseSettingsPanel { - private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private ColorButton cb; + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private ColorButton cb; - private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); - private final IOCConduit occon; + private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private final IOCConduit occon; - public OCSettings(GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_OC, EnderIO.lang.localize("itemOCConduit.name"), gui, con); - occon = (IOCConduit) con; + public OCSettings(GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_OC, EnderIO.lang.localize("itemOCConduit.name"), gui, con); + occon = (IOCConduit) con; - int x = 0; - int y = customTop; + int x = 0; + int y = customTop; - x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); - cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); - DyeColor sigCol = occon.getSignalColor(gui.getDir()); - cb.setColorIndex(sigCol.ordinal()); - x += cb.getButtonWidth(); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - if (guiButton.id == ID_COLOR_BUTTON && cb != null) { - occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); - PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir())); + x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); + cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + DyeColor sigCol = occon.getSignalColor(gui.getDir()); + cb.setColorIndex(sigCol.ordinal()); + x += cb.getButtonWidth(); } - } - @Override - protected void initCustomOptions() { - if (cb != null) { - cb.setColorIndex(cb.getColorIndex()); - cb.onGuiInit(); + @Override + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON && cb != null) { + occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir())); + } } - } - @Override - public void deactivate() { - super.deactivate(); - if (cb != null) { - cb.detach(); + @Override + protected void initCustomOptions() { + if (cb != null) { + cb.setColorIndex(cb.getColorIndex()); + cb.onGuiInit(); + } } - } - @Override - protected void renderCustomOptions(int top, float par1, int par2, int par3) { - if (cb != null) { - gui.getFontRenderer().drawString(signalColorStr, left, top, ColorUtil.getRGB(Color.darkGray)); + @Override + public void deactivate() { + super.deactivate(); + if (cb != null) { + cb.detach(); + } } - } + @Override + protected void renderCustomOptions(int top, float par1, int par2, int par3) { + if (cb != null) { + gui.getFontRenderer().drawString(signalColorStr, left, top, ColorUtil.getRGB(Color.darkGray)); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java index 78d3da54..44cbb8d6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java @@ -1,67 +1,62 @@ package crazypants.enderio.conduit.gui; import com.enderio.core.common.util.DyeColor; -import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit; -import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class PacketFluidChannel extends AbstractConduitPacket implements IMessageHandler{ +public class PacketFluidChannel extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private boolean isInput; + private ForgeDirection dir; + private boolean isInput; - private DyeColor channel; + private DyeColor channel; - public PacketFluidChannel() { - } + public PacketFluidChannel() {} - public PacketFluidChannel(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, boolean isInput, DyeColor channel) { - super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); - this.dir = dir; - this.isInput = isInput; - this.channel = channel; - } + public PacketFluidChannel( + AbstractEnderLiquidConduit eConduit, ForgeDirection dir, boolean isInput, DyeColor channel) { + super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); + this.dir = dir; + this.isInput = isInput; + this.channel = channel; + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(isInput); - buf.writeShort(channel.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - isInput = buf.readBoolean(); - channel = DyeColor.values()[buf.readShort()]; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isInput); + buf.writeShort(channel.ordinal()); + } - @Override - public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) { - ILiquidConduit conduit = message.getTileCasted(ctx); - if(! (conduit instanceof AbstractEnderLiquidConduit)) { - return null; - } - AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit)conduit; + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isInput = buf.readBoolean(); + channel = DyeColor.values()[buf.readShort()]; + } - if(message.isInput) - eCon.setInputColor(message.dir, message.channel); - else - eCon.setOutputColor(message.dir, message.channel); + @Override + public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) { + ILiquidConduit conduit = message.getTileCasted(ctx); + if (!(conduit instanceof AbstractEnderLiquidConduit)) { + return null; + } + AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit) conduit; - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + if (message.isInput) eCon.setInputColor(message.dir, message.channel); + else eCon.setOutputColor(message.dir, message.channel); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java index 4c591dd2..30a32b4e 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java @@ -1,8 +1,5 @@ package crazypants.enderio.conduit.gui; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -12,53 +9,56 @@ import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketFluidFilter extends AbstractConduitPacket implements IMessageHandler{ +public class PacketFluidFilter extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private boolean isInput; - private FluidFilter filter; - - public PacketFluidFilter() { - } - - public PacketFluidFilter(AbstractEnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) { - super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); - this.dir = dir; - this.filter = filter; - this.isInput = isInput; - } + private ForgeDirection dir; + private boolean isInput; + private FluidFilter filter; - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(isInput); - NBTTagCompound tag = new NBTTagCompound(); - filter.writeToNBT(tag); - ByteBufUtils.writeTag(buf, tag); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - isInput = buf.readBoolean(); - NBTTagCompound tag = ByteBufUtils.readTag(buf); - filter = new FluidFilter(); - filter.readFromNBT(tag); - } + public PacketFluidFilter() {} - @Override - public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) { - ILiquidConduit conduit = message.getTileCasted(ctx); - if(! (conduit instanceof AbstractEnderLiquidConduit)) { - return null; - } - AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit)conduit; - eCon.setFilter(message.dir, message.filter, message.isInput); - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + public PacketFluidFilter( + AbstractEnderLiquidConduit eConduit, ForgeDirection dir, FluidFilter filter, boolean isInput) { + super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); + this.dir = dir; + this.filter = filter; + this.isInput = isInput; + } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isInput); + NBTTagCompound tag = new NBTTagCompound(); + filter.writeToNBT(tag); + ByteBufUtils.writeTag(buf, tag); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isInput = buf.readBoolean(); + NBTTagCompound tag = ByteBufUtils.readTag(buf); + filter = new FluidFilter(); + filter.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) { + ILiquidConduit conduit = message.getTileCasted(ctx); + if (!(conduit instanceof AbstractEnderLiquidConduit)) { + return null; + } + AbstractEnderLiquidConduit eCon = (AbstractEnderLiquidConduit) conduit; + eCon.setFilter(message.dir, message.filter, message.isInput); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java index eab6abb6..570f9bb7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -1,48 +1,50 @@ package crazypants.enderio.conduit.gui; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketOpenConduitUI extends MessageTileEntity implements IMessageHandler { +public class PacketOpenConduitUI extends MessageTileEntity + implements IMessageHandler { - private ForgeDirection dir; + private ForgeDirection dir; - public PacketOpenConduitUI() { - } + public PacketOpenConduitUI() {} - public PacketOpenConduitUI(TileEntity tile, ForgeDirection dir) { - super(tile); - this.dir = dir; - } + public PacketOpenConduitUI(TileEntity tile, ForgeDirection dir) { + super(tile); + this.dir = dir; + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - } - - public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity tile = message.getWorld(ctx).getTileEntity(message.x, message.y, message.z); - player - .openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + message.dir.ordinal(), player.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + } + public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity tile = message.getWorld(ctx).getTileEntity(message.x, message.y, message.z); + player.openGui( + EnderIO.instance, + GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + message.dir.ordinal(), + player.worldObj, + tile.xCoord, + tile.yCoord, + tile.zCoord); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketSlotVisibility.java b/src/main/java/crazypants/enderio/conduit/gui/PacketSlotVisibility.java index 85448768..55e1cc8e 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketSlotVisibility.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketSlotVisibility.java @@ -8,37 +8,36 @@ import net.minecraft.entity.player.EntityPlayerMP; public class PacketSlotVisibility implements IMessage, IMessageHandler { - private boolean inputVisible; - private boolean outputVisible; + private boolean inputVisible; + private boolean outputVisible; - public PacketSlotVisibility() { - } + public PacketSlotVisibility() {} - public PacketSlotVisibility(boolean inputVisible, boolean outputVisible) { - this.inputVisible = inputVisible; - this.outputVisible = outputVisible; - } - - @Override - public void fromBytes(ByteBuf bb) { - int value = bb.readUnsignedByte(); - inputVisible = (value & 1) != 0; - outputVisible = (value & 2) != 0; - } - - @Override - public void toBytes(ByteBuf bb) { - int value = (inputVisible ? 1 : 0) | (outputVisible ? 2 : 0); - bb.writeByte(value); - } - - @Override - public IMessage onMessage(PacketSlotVisibility message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if(player.openContainer instanceof ExternalConnectionContainer) { - ExternalConnectionContainer ecc = (ExternalConnectionContainer) player.openContainer; - ecc.setInoutSlotsVisible(message.inputVisible, message.outputVisible); + public PacketSlotVisibility(boolean inputVisible, boolean outputVisible) { + this.inputVisible = inputVisible; + this.outputVisible = outputVisible; + } + + @Override + public void fromBytes(ByteBuf bb) { + int value = bb.readUnsignedByte(); + inputVisible = (value & 1) != 0; + outputVisible = (value & 2) != 0; + } + + @Override + public void toBytes(ByteBuf bb) { + int value = (inputVisible ? 1 : 0) | (outputVisible ? 2 : 0); + bb.writeByte(value); + } + + @Override + public IMessage onMessage(PacketSlotVisibility message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + if (player.openContainer instanceof ExternalConnectionContainer) { + ExternalConnectionContainer ecc = (ExternalConnectionContainer) player.openContainer; + ecc.setInoutSlotsVisible(message.inputVisible, message.outputVisible); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index 4439eca9..bcaa5d44 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -1,10 +1,7 @@ package crazypants.enderio.conduit.gui; -import net.minecraft.client.gui.GuiButton; - import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; @@ -14,69 +11,68 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; +import net.minecraft.client.gui.GuiButton; public class PowerSettings extends BaseSettingsPanel { - private static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private IPowerConduit conduit; - private RedstoneModeButton rsB; - private ColorButton colorB; + private IPowerConduit conduit; + private RedstoneModeButton rsB; + private ColorButton colorB; - protected PowerSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_POWER, EnderIO.lang.localize("itemPowerConduit.name"), gui, con); - conduit = (IPowerConduit) con; + protected PowerSettings(final GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_POWER, EnderIO.lang.localize("itemPowerConduit.name"), gui, con); + conduit = (IPowerConduit) con; - int x = 38; - int y = customTop; + int x = 38; + int y = customTop; - rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { + rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - RedstoneControlMode curMode = getRedstoneControlMode(); - conduit.setExtractionRedstoneMode(mode, gui.getDir()); - if(curMode != mode) { - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); - } + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + RedstoneControlMode curMode = getRedstoneControlMode(); + conduit.setExtractionRedstoneMode(mode, gui.getDir()); + if (curMode != mode) { + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + } + } - } + @Override + public RedstoneControlMode getRedstoneControlMode() { + return conduit.getExtractionRedstoneMode(gui.getDir()); + } + }); - @Override - public RedstoneControlMode getRedstoneControlMode() { - return conduit.getExtractionRedstoneMode(gui.getDir()); - } - }); - - x += rsB.getWidth() + gap; - colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); - colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); - - } - - @Override - public void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - if(guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + x += rsB.getWidth() + gap; + colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); } - } - @Override - protected void initCustomOptions() { - super.initCustomOptions(); - rsB.onGuiInit(); - colorB.onGuiInit(); - } + @Override + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON) { + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); + } + } - @Override - public void deactivate() { - super.deactivate(); - rsB.detach(); - colorB.detach(); - } + @Override + protected void initCustomOptions() { + super.initCustomOptions(); + rsB.onGuiInit(); + colorB.onGuiInit(); + } + + @Override + public void deactivate() { + super.deactivate(); + rsB.detach(); + colorB.detach(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index 356554f2..d2b4e7bc 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -1,14 +1,9 @@ package crazypants.enderio.conduit.gui; -import java.awt.Color; - -import net.minecraft.client.gui.GuiButton; - import com.enderio.core.client.gui.button.CheckBox; import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; @@ -16,93 +11,94 @@ import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import net.minecraft.client.gui.GuiButton; public class RedstoneSettings extends BaseSettingsPanel { - private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); - private static final int ID_STRONG_BUTTON = GuiExternalConnection.nextButtonId(); - private ColorButton cb; + private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId(); + private static final int ID_STRONG_BUTTON = GuiExternalConnection.nextButtonId(); + private ColorButton cb; - private CheckBox strongCB; + private CheckBox strongCB; - private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); - private String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh"); - private IInsulatedRedstoneConduit insCon; + private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh"); + private IInsulatedRedstoneConduit insCon; - private int stongLabelX; + private int stongLabelX; - public RedstoneSettings(GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_REDSTONE, EnderIO.lang.localize("itemRedstoneConduitInsulated.name"), gui, con); + public RedstoneSettings(GuiExternalConnection gui, IConduit con) { + super(IconEIO.WRENCH_OVERLAY_REDSTONE, EnderIO.lang.localize("itemRedstoneConduitInsulated.name"), gui, con); - int x = 0; - int y = customTop; + int x = 0; + int y = customTop; - if(con instanceof IInsulatedRedstoneConduit) { - insCon = (IInsulatedRedstoneConduit) con; + if (con instanceof IInsulatedRedstoneConduit) { + insCon = (IInsulatedRedstoneConduit) con; + } + + if (insCon != null) { + if (!insCon.isSpecialConnection(gui.getDir())) { + x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); + cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); + cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); + DyeColor sigCol = insCon.getSignalColor(gui.getDir()); + cb.setColorIndex(sigCol.ordinal()); + x += cb.getButtonWidth(); + } + stongLabelX = x; + x += gap + gui.getFontRenderer().getStringWidth(signalStringthStr) + gap + 3; + strongCB = new CheckBox(gui, ID_STRONG_BUTTON, x, y); + strongCB.setToolTip(EnderIO.lang.localize("gui.conduit.redstone.signalStrengh.tooltip")); + } } - if(insCon != null) { - if(!insCon.isSpecialConnection(gui.getDir())) { - x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); - cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); - DyeColor sigCol = insCon.getSignalColor(gui.getDir()); - cb.setColorIndex(sigCol.ordinal()); - x += cb.getButtonWidth(); - - } - stongLabelX = x; - x += gap + gui.getFontRenderer().getStringWidth(signalStringthStr) + gap + 3; - strongCB = new CheckBox(gui, ID_STRONG_BUTTON, x, y); - strongCB.setToolTip(EnderIO.lang.localize("gui.conduit.redstone.signalStrengh.tooltip")); + @Override + public void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON && cb != null) { + insCon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); + PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir())); + } else if (guiButton.id == ID_STRONG_BUTTON && strongCB != null) { + insCon.setOutputStrength(gui.getDir(), strongCB.isSelected()); + PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitOutputStrength(insCon, gui.getDir())); + } } - } - @Override - public void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - if(guiButton.id == ID_COLOR_BUTTON && cb != null) { - insCon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); - PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir())); - } else if(guiButton.id == ID_STRONG_BUTTON && strongCB != null) { - insCon.setOutputStrength(gui.getDir(), strongCB.isSelected()); - PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitOutputStrength(insCon, gui.getDir())); + @Override + protected void initCustomOptions() { + if (insCon != null) { + if (cb != null) { + cb.setColorIndex(cb.getColorIndex()); + cb.onGuiInit(); + } + strongCB.onGuiInit(); + strongCB.setSelected(insCon.isOutputStrong(gui.getDir())); + } } - } - @Override - protected void initCustomOptions() { - if(insCon != null) { - if(cb != null) { - cb.setColorIndex(cb.getColorIndex()); - cb.onGuiInit(); - } - strongCB.onGuiInit(); - strongCB.setSelected(insCon.isOutputStrong(gui.getDir())); + @Override + public void deactivate() { + super.deactivate(); + if (cb != null) { + cb.detach(); + } + if (strongCB != null) { + strongCB.detach(); + } } - } - @Override - public void deactivate() { - super.deactivate(); - if(cb != null) { - cb.detach(); + @Override + protected void renderCustomOptions(int top, float par1, int par2, int par3) { + if (insCon != null) { + if (cb != null) { + gui.getFontRenderer().drawString(signalColorStr, left, top, ColorUtil.getRGB(Color.darkGray)); + } + if (strongCB != null) { + gui.getFontRenderer() + .drawString(signalStringthStr, left + stongLabelX, top, ColorUtil.getRGB(Color.darkGray)); + } + } } - if(strongCB != null) { - strongCB.detach(); - } - } - - @Override - protected void renderCustomOptions(int top, float par1, int par2, int par3) { - if(insCon != null) { - if(cb != null) { - gui.getFontRenderer().drawString(signalColorStr, left, top, ColorUtil.getRGB(Color.darkGray)); - } - if(strongCB != null) { - gui.getFontRenderer().drawString(signalStringthStr, left + stongLabelX, top, ColorUtil.getRGB(Color.darkGray)); - } - } - } - } diff --git a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java index 1812ca8d..389030d7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java +++ b/src/main/java/crazypants/enderio/conduit/gui/TabFactory.java @@ -1,7 +1,6 @@ package crazypants.enderio.conduit.gui; import com.enderio.core.api.client.gui.ITabPanel; - import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.gui.item.ItemSettings; @@ -14,29 +13,27 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit; public class TabFactory { - public static final TabFactory instance = new TabFactory(); + public static final TabFactory instance = new TabFactory(); - private TabFactory() { - } + private TabFactory() {} - public ITabPanel createPanelForConduit(GuiExternalConnection gui, IConduit con) { - Class baseType = con.getBaseConduitType(); - if(baseType.isAssignableFrom(IPowerConduit.class)) { - return new PowerSettings(gui, con); - } else if(baseType.isAssignableFrom(ILiquidConduit.class)) { - return new LiquidSettings(gui, con); - } else if(baseType.isAssignableFrom(IItemConduit.class)) { - return new ItemSettings(gui, con); - } else if(baseType.isAssignableFrom(IRedstoneConduit.class)) { - return new RedstoneSettings(gui, con); - } else if(baseType.isAssignableFrom(IGasConduit.class)) { - return new GasSettings(gui, con); - } else if(baseType.isAssignableFrom(IMEConduit.class)) { - return new MESettings(gui, con); - } else if (baseType.isAssignableFrom(IOCConduit.class)) { - return new OCSettings(gui, con); + public ITabPanel createPanelForConduit(GuiExternalConnection gui, IConduit con) { + Class baseType = con.getBaseConduitType(); + if (baseType.isAssignableFrom(IPowerConduit.class)) { + return new PowerSettings(gui, con); + } else if (baseType.isAssignableFrom(ILiquidConduit.class)) { + return new LiquidSettings(gui, con); + } else if (baseType.isAssignableFrom(IItemConduit.class)) { + return new ItemSettings(gui, con); + } else if (baseType.isAssignableFrom(IRedstoneConduit.class)) { + return new RedstoneSettings(gui, con); + } else if (baseType.isAssignableFrom(IGasConduit.class)) { + return new GasSettings(gui, con); + } else if (baseType.isAssignableFrom(IMEConduit.class)) { + return new MESettings(gui, con); + } else if (baseType.isAssignableFrom(IOCConduit.class)) { + return new OCSettings(gui, con); + } + return null; } - return null; - } - } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index ade44382..5d5b62ce 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -14,195 +14,204 @@ import org.lwjgl.opengl.GL11; public class BasicItemFilterGui implements IItemFilterGui { - private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId(); - private static final int ID_NBT = GuiExternalConnection.nextButtonId(); - private static final int ID_META = GuiExternalConnection.nextButtonId(); - private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); - private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); - private static final int ID_FUZZY = GuiExternalConnection.nextButtonId(); + private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId(); + private static final int ID_NBT = GuiExternalConnection.nextButtonId(); + private static final int ID_META = GuiExternalConnection.nextButtonId(); + private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); + private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); + private static final int ID_FUZZY = GuiExternalConnection.nextButtonId(); - private final GuiContainerBaseEIO gui; + private final GuiContainerBaseEIO gui; - private final ToggleButton useMetaB; - private final ToggleButton useNbtB; - private final IconButton whiteListB; - private final ToggleButton useOreDictB; - private final ToggleButton stickyB; - private final CycleButton fuzzyB; + private final ToggleButton useMetaB; + private final ToggleButton useNbtB; + private final IconButton whiteListB; + private final ToggleButton useOreDictB; + private final ToggleButton stickyB; + private final CycleButton fuzzyB; - final boolean isAdvanced; - final boolean isStickyModeAvailable; + final boolean isAdvanced; + final boolean isStickyModeAvailable; - private final IItemFilterContainer filterContainer; - private final ItemFilter filter; + private final IItemFilterContainer filterContainer; + private final ItemFilter filter; - private int buttonIdOffset; - private int xOffset; - private int yOffset; + private int buttonIdOffset; + private int xOffset; + private int yOffset; - private boolean isInput; + private boolean isInput; - public BasicItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, boolean isInput) { - this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256); - } - - public BasicItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, - boolean isInput, - int xOffset, int yOffset, - int buttonIdOffset) { - this.gui = gui; - this.isStickyModeAvailable = isStickyModeAvailable; - this.filterContainer = filterContainer; - this.xOffset = xOffset; - this.yOffset = yOffset; - this.buttonIdOffset = buttonIdOffset; - this.isInput = isInput; - - filter = filterContainer.getItemFilter(); - - isAdvanced = filter.isAdvanced(); - - int butLeft = xOffset; - int x = butLeft; - int y = yOffset + (isAdvanced ? 40 : 20); - whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(getWhitelistTooltips(false)); - - x += 16; - useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); - useMetaB.setPaintSelectedBorder(false); - - x += 16; - stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled")); - stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); - stickyB.setPaintSelectedBorder(false); - - if(isStickyModeAvailable) x += 16; - useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); - useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); - useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); - useOreDictB.setPaintSelectedBorder(false); - - x += 16; - useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); - useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); - useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); - useNbtB.setPaintSelectedBorder(false); - - x += 16; - fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class); - } - - public void createFilterSlots() { - filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() { - @Override - public void run() { - sendFilterChange(); - } - }); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void updateButtons() { - ItemFilter activeFilter = filter; - - if(isAdvanced) { - useNbtB.onGuiInit(); - useNbtB.setSelected(activeFilter.isMatchNBT()); - - useOreDictB.onGuiInit(); - useOreDictB.setSelected(activeFilter.isUseOreDict()); - - if(isStickyModeAvailable) { - stickyB.onGuiInit(); - stickyB.setSelected(activeFilter.isSticky()); - } - - fuzzyB.onGuiInit(); - fuzzyB.setMode(activeFilter.getFuzzyMode()); + public BasicItemFilterGui( + GuiContainerBaseEIO gui, + IItemFilterContainer filterContainer, + boolean isStickyModeAvailable, + boolean isInput) { + this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256); } - useMetaB.onGuiInit(); - useMetaB.setSelected(activeFilter.isMatchMeta()); + public BasicItemFilterGui( + GuiContainerBaseEIO gui, + IItemFilterContainer filterContainer, + boolean isStickyModeAvailable, + boolean isInput, + int xOffset, + int yOffset, + int buttonIdOffset) { + this.gui = gui; + this.isStickyModeAvailable = isStickyModeAvailable; + this.filterContainer = filterContainer; + this.xOffset = xOffset; + this.yOffset = yOffset; + this.buttonIdOffset = buttonIdOffset; + this.isInput = isInput; - whiteListB.onGuiInit(); - whiteListB.setToolTip(getWhitelistTooltips(activeFilter.isBlacklist())); - if(activeFilter.isBlacklist()) { - whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - } else { - whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + filter = filterContainer.getItemFilter(); + + isAdvanced = filter.isAdvanced(); + + int butLeft = xOffset; + int x = butLeft; + int y = yOffset + (isAdvanced ? 40 : 20); + whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(getWhitelistTooltips(false)); + + x += 16; + useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setPaintSelectedBorder(false); + + x += 16; + stickyB = new ToggleButton( + gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + if (isStickyModeAvailable) x += 16; + useOreDictB = new ToggleButton( + gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setPaintSelectedBorder(false); + + x += 16; + useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setPaintSelectedBorder(false); + + x += 16; + fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class); } - } - @Override - public void actionPerformed(GuiButton guiButton) { - - if(guiButton.id == ID_META + buttonIdOffset) { - filter.setMatchMeta(useMetaB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_NBT + buttonIdOffset) { - filter.setMatchNBT(useNbtB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_STICKY + buttonIdOffset) { - filter.setSticky(stickyB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) { - filter.setUseOreDict(useOreDictB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_FUZZY + buttonIdOffset) { - filter.setFuzzyMode(fuzzyB.getMode()); - sendFilterChange(); - } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) { - filter.setBlacklist(!filter.isBlacklist()); - sendFilterChange(); + public void createFilterSlots() { + filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() { + @Override + public void run() { + sendFilterChange(); + } + }); } - } - private void sendFilterChange() { - updateButtons(); - filterContainer.onFilterChanged(); - } + @Override + public void mouseClicked(int x, int y, int par3) {} - @Override - public void deactivate() { - useNbtB.detach(); - useMetaB.detach(); - useOreDictB.detach(); - whiteListB.detach(); - stickyB.detach(); - fuzzyB.detach(); - } + @Override + public void updateButtons() { + ItemFilter activeFilter = filter; - @Override - public void renderCustomOptions(int top, float par1, int par2, int par3) { - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(1); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); - if(filter.isAdvanced()) { - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18); + if (isAdvanced) { + useNbtB.onGuiInit(); + useNbtB.setSelected(activeFilter.isMatchNBT()); + + useOreDictB.onGuiInit(); + useOreDictB.setSelected(activeFilter.isUseOreDict()); + + if (isStickyModeAvailable) { + stickyB.onGuiInit(); + stickyB.setSelected(activeFilter.isSticky()); + } + + fuzzyB.onGuiInit(); + fuzzyB.setMode(activeFilter.getFuzzyMode()); + } + + useMetaB.onGuiInit(); + useMetaB.setSelected(activeFilter.isMatchMeta()); + + whiteListB.onGuiInit(); + whiteListB.setToolTip(getWhitelistTooltips(activeFilter.isBlacklist())); + if (activeFilter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + } } - } - private String[] getWhitelistTooltips(boolean isBlacklist) { - if(isBlacklist) { - return new String[]{ - EnderIO.lang.localize("gui.conduit.item.blacklist"), - EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"), - EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1") - }; - } else { - return new String[]{ - EnderIO.lang.localize("gui.conduit.item.whitelist"), - EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"), - EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1") - }; + @Override + public void actionPerformed(GuiButton guiButton) { + + if (guiButton.id == ID_META + buttonIdOffset) { + filter.setMatchMeta(useMetaB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_NBT + buttonIdOffset) { + filter.setMatchNBT(useNbtB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_STICKY + buttonIdOffset) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_ORE_DICT + buttonIdOffset) { + filter.setUseOreDict(useOreDictB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_FUZZY + buttonIdOffset) { + filter.setFuzzyMode(fuzzyB.getMode()); + sendFilterChange(); + } else if (guiButton.id == ID_WHITELIST + buttonIdOffset) { + filter.setBlacklist(!filter.isBlacklist()); + sendFilterChange(); + } + } + + private void sendFilterChange() { + updateButtons(); + filterContainer.onFilterChanged(); + } + + @Override + public void deactivate() { + useNbtB.detach(); + useMetaB.detach(); + useOreDictB.detach(); + whiteListB.detach(); + stickyB.detach(); + fuzzyB.detach(); + } + + @Override + public void renderCustomOptions(int top, float par1, int par2, int par3) { + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(1); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); + if (filter.isAdvanced()) { + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18); + } + } + + private String[] getWhitelistTooltips(boolean isBlacklist) { + if (isBlacklist) { + return new String[] { + EnderIO.lang.localize("gui.conduit.item.blacklist"), + EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.0"), + EnderIO.lang.localize("gui.conduit.item.blacklist.tooltip.1") + }; + } else { + return new String[] { + EnderIO.lang.localize("gui.conduit.item.whitelist"), + EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.0"), + EnderIO.lang.localize("gui.conduit.item.whitelist.tooltip.1") + }; + } } - } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java index 99a508c3..71b736df 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BigItemFilterGui.java @@ -1,203 +1,207 @@ package crazypants.enderio.conduit.gui.item; -import net.minecraft.client.gui.GuiButton; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.gui.button.CycleButton; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.filter.FuzzyMode; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; +import net.minecraft.client.gui.GuiButton; +import org.lwjgl.opengl.GL11; public class BigItemFilterGui implements IItemFilterGui { - private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId(); - private static final int ID_NBT = GuiExternalConnection.nextButtonId(); - private static final int ID_META = GuiExternalConnection.nextButtonId(); - private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); - private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); - private static final int ID_FUZZY = GuiExternalConnection.nextButtonId(); + private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId(); + private static final int ID_NBT = GuiExternalConnection.nextButtonId(); + private static final int ID_META = GuiExternalConnection.nextButtonId(); + private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); + private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); + private static final int ID_FUZZY = GuiExternalConnection.nextButtonId(); - private final GuiContainerBaseEIO gui; + private final GuiContainerBaseEIO gui; - private final ToggleButton useMetaB; - private final ToggleButton useNbtB; - private final IconButton whiteListB; - private final ToggleButton useOreDictB; - private final ToggleButton stickyB; - private final CycleButton fuzzyB; + private final ToggleButton useMetaB; + private final ToggleButton useNbtB; + private final IconButton whiteListB; + private final ToggleButton useOreDictB; + private final ToggleButton stickyB; + private final CycleButton fuzzyB; - final boolean isAdvanced; - final boolean isStickyModeAvailable; + final boolean isAdvanced; + final boolean isStickyModeAvailable; - private final IItemFilterContainer filterContainer; - private final ItemFilter filter; + private final IItemFilterContainer filterContainer; + private final ItemFilter filter; - private int buttonIdOffset; - private int xOffset; - private int yOffset; + private int buttonIdOffset; + private int xOffset; + private int yOffset; - public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, boolean isInput) { - this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256); - } - - public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, boolean isInput, - int xOffset, int yOffset, - int buttonIdOffset) { - this.gui = gui; - this.isStickyModeAvailable = isStickyModeAvailable; - this.filterContainer = filterContainer; - this.xOffset = xOffset; - this.yOffset = yOffset; - this.buttonIdOffset = buttonIdOffset; - - filter = filterContainer.getItemFilter(); - - isAdvanced = filter.isAdvanced(); - - int butLeft = xOffset; - int x = butLeft; - int y = yOffset - 8; - whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - - x += 16; - useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); - useMetaB.setPaintSelectedBorder(false); - - x += 16; - useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); - useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); - useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); - useOreDictB.setPaintSelectedBorder(false); - - x += 16; - useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); - useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); - useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); - useNbtB.setPaintSelectedBorder(false); - - x += 16; - fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class); - - x += 16; - stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled")); - stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); - stickyB.setPaintSelectedBorder(false); - - this.yOffset += 8; - if (!isInput) { - this.xOffset -= 50; - } - } - - public void createFilterSlots() { - filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() { - @Override - public void run() { - sendFilterChange(); - } - }); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void updateButtons() { - ItemFilter activeFilter = filter; - - if(isAdvanced) { - useNbtB.onGuiInit(); - useNbtB.setSelected(activeFilter.isMatchNBT()); - - useOreDictB.onGuiInit(); - useOreDictB.setSelected(activeFilter.isUseOreDict()); - - if(isStickyModeAvailable) { - stickyB.onGuiInit(); - stickyB.setSelected(activeFilter.isSticky()); - } - - fuzzyB.onGuiInit(); - fuzzyB.setMode(activeFilter.getFuzzyMode()); + public BigItemFilterGui( + GuiContainerBaseEIO gui, + IItemFilterContainer filterContainer, + boolean isStickyModeAvailable, + boolean isInput) { + this(gui, filterContainer, isStickyModeAvailable, isInput, isInput ? 104 : 6, 96, isInput ? 0 : 256); } - useMetaB.onGuiInit(); - useMetaB.setSelected(activeFilter.isMatchMeta()); + public BigItemFilterGui( + GuiContainerBaseEIO gui, + IItemFilterContainer filterContainer, + boolean isStickyModeAvailable, + boolean isInput, + int xOffset, + int yOffset, + int buttonIdOffset) { + this.gui = gui; + this.isStickyModeAvailable = isStickyModeAvailable; + this.filterContainer = filterContainer; + this.xOffset = xOffset; + this.yOffset = yOffset; + this.buttonIdOffset = buttonIdOffset; - whiteListB.onGuiInit(); - if(activeFilter.isBlacklist()) { - whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); - } else { - whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + filter = filterContainer.getItemFilter(); + + isAdvanced = filter.isAdvanced(); + + int butLeft = xOffset; + int x = butLeft; + int y = yOffset - 8; + whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + + x += 16; + useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setPaintSelectedBorder(false); + + x += 16; + useOreDictB = new ToggleButton( + gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setPaintSelectedBorder(false); + + x += 16; + useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setPaintSelectedBorder(false); + + x += 16; + fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class); + + x += 16; + stickyB = new ToggleButton( + gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + this.yOffset += 8; + if (!isInput) { + this.xOffset -= 50; + } } - } - - @Override - public void actionPerformed(GuiButton guiButton) { - - if(guiButton.id == ID_META + buttonIdOffset) { - filter.setMatchMeta(useMetaB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_NBT + buttonIdOffset) { - filter.setMatchNBT(useNbtB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_STICKY + buttonIdOffset) { - filter.setSticky(stickyB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) { - filter.setUseOreDict(useOreDictB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_FUZZY + buttonIdOffset) { - filter.setFuzzyMode(fuzzyB.getMode()); - sendFilterChange(); - } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) { - filter.setBlacklist(!filter.isBlacklist()); - sendFilterChange(); + public void createFilterSlots() { + filter.createGhostSlots(gui.getGhostSlots(), xOffset + 1, yOffset + 1, new Runnable() { + @Override + public void run() { + sendFilterChange(); + } + }); } - } - private void sendFilterChange() { - updateButtons(); - filterContainer.onFilterChanged(); - } + @Override + public void mouseClicked(int x, int y, int par3) {} - @Override - public void deactivate() { - useNbtB.detach(); - useMetaB.detach(); - useOreDictB.detach(); - whiteListB.detach(); - stickyB.detach(); - fuzzyB.detach(); - } + @Override + public void updateButtons() { + ItemFilter activeFilter = filter; - @Override - public void renderCustomOptions(int top, float par1, int par2, int par3) { - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(1); + if (isAdvanced) { + useNbtB.onGuiInit(); + useNbtB.setSelected(activeFilter.isMatchNBT()); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 18, 0, 238, 18 * 5, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 18, 0, 238, 18 * 5, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 36, 0, 238, 18 * 5, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 36, 0, 238, 18 * 5, 18); - } + useOreDictB.onGuiInit(); + useOreDictB.setSelected(activeFilter.isUseOreDict()); + if (isStickyModeAvailable) { + stickyB.onGuiInit(); + stickyB.setSelected(activeFilter.isSticky()); + } + + fuzzyB.onGuiInit(); + fuzzyB.setMode(activeFilter.getFuzzyMode()); + } + + useMetaB.onGuiInit(); + useMetaB.setSelected(activeFilter.isMatchMeta()); + + whiteListB.onGuiInit(); + if (activeFilter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + } + } + + @Override + public void actionPerformed(GuiButton guiButton) { + + if (guiButton.id == ID_META + buttonIdOffset) { + filter.setMatchMeta(useMetaB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_NBT + buttonIdOffset) { + filter.setMatchNBT(useNbtB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_STICKY + buttonIdOffset) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_ORE_DICT + buttonIdOffset) { + filter.setUseOreDict(useOreDictB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_FUZZY + buttonIdOffset) { + filter.setFuzzyMode(fuzzyB.getMode()); + sendFilterChange(); + } else if (guiButton.id == ID_WHITELIST + buttonIdOffset) { + filter.setBlacklist(!filter.isBlacklist()); + sendFilterChange(); + } + } + + private void sendFilterChange() { + updateButtons(); + filterContainer.onFilterChanged(); + } + + @Override + public void deactivate() { + useNbtB.detach(); + useMetaB.detach(); + useOreDictB.detach(); + whiteListB.detach(); + stickyB.detach(); + fuzzyB.detach(); + } + + @Override + public void renderCustomOptions(int top, float par1, int par2, int par3) { + GL11.glColor3f(1, 1, 1); + gui.bindGuiTexture(1); + + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 18, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 18, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 36, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 36, 0, 238, 18 * 5, 18); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 42605969..3232c9fe 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -1,23 +1,11 @@ package crazypants.enderio.conduit.gui.item; -import java.awt.Rectangle; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; @@ -25,285 +13,295 @@ import crazypants.enderio.conduit.item.filter.ExistingItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class ExistingItemFilterGui implements IItemFilterGui { - private static final int ID_NBT = GuiExternalConnection.nextButtonId(); - private static final int ID_META = GuiExternalConnection.nextButtonId(); - private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); - private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); + private static final int ID_NBT = GuiExternalConnection.nextButtonId(); + private static final int ID_META = GuiExternalConnection.nextButtonId(); + private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); + private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); - private static final int ID_SNAPSHOT = GuiExternalConnection.nextButtonId(); - private static final int ID_CLEAR = GuiExternalConnection.nextButtonId(); - private static final int ID_SHOW = GuiExternalConnection.nextButtonId(); - private static final int ID_MERGE = GuiExternalConnection.nextButtonId(); + private static final int ID_SNAPSHOT = GuiExternalConnection.nextButtonId(); + private static final int ID_CLEAR = GuiExternalConnection.nextButtonId(); + private static final int ID_SHOW = GuiExternalConnection.nextButtonId(); + private static final int ID_MERGE = GuiExternalConnection.nextButtonId(); + private IItemConduit itemConduit; + private GuiExternalConnection gui; - private IItemConduit itemConduit; - private GuiExternalConnection gui; + private ToggleButton useMetaB; + private ToggleButton useNbtB; + private ToggleButton useOreDictB; + private ToggleButton stickyB; - private ToggleButton useMetaB; - private ToggleButton useNbtB; - private ToggleButton useOreDictB; - private ToggleButton stickyB; + private final IconButton whiteListB; - private final IconButton whiteListB; + private GuiButton snapshotB; + private GuiButton clearB; + private GuiButton showB; + private GuiButton mergeB; + private SnapshotOverlay snapshotOverlay; - private GuiButton snapshotB; - private GuiButton clearB; - private GuiButton showB; - private GuiButton mergeB; - private SnapshotOverlay snapshotOverlay; + boolean isInput; + private int buttonIdOffset = 0; - boolean isInput; - private int buttonIdOffset = 0; + private ExistingItemFilter filter; - private ExistingItemFilter filter; + public ExistingItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + this.gui = gui; + this.itemConduit = itemConduit; + this.isInput = isInput; + this.buttonIdOffset = isInput ? 0 : 256; - public ExistingItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - this.gui = gui; - this.itemConduit = itemConduit; - this.isInput = isInput; - this.buttonIdOffset = isInput ? 0 : 256; - - if(isInput) { - filter = (ExistingItemFilter) itemConduit.getInputFilter(gui.getDir()); - } else { - filter = (ExistingItemFilter) itemConduit.getOutputFilter(gui.getDir()); - } - - int butLeft = isInput ? 104 : 6; - int x = butLeft; - int y = 96; - - useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); - useMetaB.setPaintSelectedBorder(false); - - x += 16; - whiteListB = new IconButton(gui, -1, x, y, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - - x += 16; - stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); - stickyB.setSelectedToolTip(lines); - stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); - stickyB.setPaintSelectedBorder(false); - - if(!isInput) x += 16; - useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); - useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); - useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); - useNbtB.setPaintSelectedBorder(false); - - x += 16; - useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); - useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); - useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); - useOreDictB.setPaintSelectedBorder(false); - - snapshotB = new GuiButton(ID_SNAPSHOT + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.snap")); - mergeB = new GuiButton(ID_MERGE + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.merge")); - clearB = new GuiButton(ID_CLEAR + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.clear")); - showB = new GuiButton(ID_SHOW + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.show")); - - snapshotOverlay = new SnapshotOverlay(); - gui.addOverlay(snapshotOverlay); - - - } - - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void updateButtons() { - - ExistingItemFilter activeFilter = filter; - - useNbtB.onGuiInit(); - useNbtB.setSelected(activeFilter.isMatchNBT()); - - useOreDictB.onGuiInit(); - useOreDictB.setSelected(activeFilter.isUseOreDict()); - - if(!isInput) { - stickyB.onGuiInit(); - stickyB.setSelected(activeFilter.isSticky()); - } - - useMetaB.onGuiInit(); - useMetaB.setSelected(activeFilter.isMatchMeta()); - - whiteListB.onGuiInit(); - if (filter.isBlacklist()) { - whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); - } else { - whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - } - - int butLeft = gui.getGuiLeft() + (isInput ? 104 : 5); - int x = butLeft; - int y = gui.getGuiTop() + 96 + 20; - - snapshotB.xPosition = x; - snapshotB.yPosition = y; - - x += 56; - mergeB.xPosition = x; - mergeB.yPosition = y; - - x = butLeft; - y += 20; - clearB.xPosition = x; - clearB.yPosition = y; - - x += 56; - showB.xPosition = x; - showB.yPosition = y; - - clearB.enabled = filter.getSnapshot() != null; - showB.enabled = clearB.enabled; - mergeB.enabled = filter.getSnapshot() != null; - - gui.addButton(snapshotB); - gui.addButton(clearB); - gui.addButton(showB); - gui.addButton(mergeB); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - if(guiButton.id == ID_META + buttonIdOffset) { - filter.setMatchMeta(useMetaB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_NBT + buttonIdOffset) { - filter.setMatchNBT(useNbtB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_STICKY + buttonIdOffset) { - filter.setSticky(stickyB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) { - filter.setUseOreDict(useOreDictB.isSelected()); - sendFilterChange(); - } else if(guiButton.id == ID_SNAPSHOT + buttonIdOffset) { - sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.SET); - } else if(guiButton.id == ID_CLEAR + buttonIdOffset) { - sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.CLEAR); - } else if(guiButton.id == ID_MERGE + buttonIdOffset) { - sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.MERGE); - } else if(guiButton.id == ID_SHOW + buttonIdOffset) { - showSnapshotOverlay(); - } else if (guiButton == whiteListB) { - filter.setBlacklist(!filter.isBlacklist()); - sendSnapshotPacket(filter.isBlacklist() ? PacketExistingItemFilterSnapshot.Opcode.SET_BLACK - : PacketExistingItemFilterSnapshot.Opcode.UNSET_BLACK); - } - } - - private void showSnapshotOverlay() { - snapshotOverlay.setVisible(true); - } - - private void sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode opcode) { - PacketHandler.INSTANCE.sendToServer(new PacketExistingItemFilterSnapshot(itemConduit, gui.getDir(),isInput,opcode)); - } - - private void sendFilterChange() { - updateButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); - } - - @Override - public void deactivate() { - useNbtB.detach(); - useMetaB.detach(); - useOreDictB.detach(); - stickyB.detach(); - whiteListB.detach(); - gui.removeButton(snapshotB); - gui.removeButton(clearB); - gui.removeButton(showB); - gui.removeButton(mergeB); - } - - @Override - public void renderCustomOptions(int top, float par1, int par2, int par3) { -// GL11.glColor3f(1, 1, 1); -// RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); -// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); -// if(filter.isAdvanced()) { -// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); -// } - } - - class SnapshotOverlay implements IGuiOverlay { - - boolean visible; - - @Override - public void init(IGuiScreen screen) { - } - - @Override - public Rectangle getBounds() { - return new Rectangle(0,0,gui.width,gui.height); - } - - @Override - public void draw(int mouseX, int mouseY, float partialTick) { - RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL11.GL_BLEND); - RenderUtil.renderQuad2D(4, 4, 0, gui.getXSize() - 9, gui.getYSize() - 8, new Vector4f(0,0,0,1)); - RenderUtil.renderQuad2D(6, 6, 0, gui.getXSize() - 13, gui.getYSize() - 12, new Vector4f(0.6,0.6,0.6,1)); - - Minecraft mc = Minecraft.getMinecraft(); - RenderItem itemRenderer = new RenderItem(); - - GL11.glEnable(GL11.GL_DEPTH_TEST); - - List snapshot = filter.getSnapshot(); - int x = 15; - int y = 10; - int count = 0; - for(ItemStack st : snapshot) { - if(st != null) { - itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), st, x, y); - //itemRender.renderItemOverlayIntoGUI(mc.fontRenderer, mc.getTextureManager(), st, x, y, s); + if (isInput) { + filter = (ExistingItemFilter) itemConduit.getInputFilter(gui.getDir()); + } else { + filter = (ExistingItemFilter) itemConduit.getOutputFilter(gui.getDir()); } - x += 20; - count++; - if(count % 9 == 0) { - x = 15; - y += 20; + + int butLeft = isInput ? 104 : 6; + int x = butLeft; + int y = 96; + + useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setPaintSelectedBorder(false); + + x += 16; + whiteListB = new IconButton(gui, -1, x, y, IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + + x += 16; + stickyB = new ToggleButton( + gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); + stickyB.setSelectedToolTip(lines); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + if (!isInput) x += 16; + useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setPaintSelectedBorder(false); + + x += 16; + useOreDictB = new ToggleButton( + gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setPaintSelectedBorder(false); + + snapshotB = new GuiButton( + ID_SNAPSHOT + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.snap")); + mergeB = new GuiButton( + ID_MERGE + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.merge")); + clearB = new GuiButton( + ID_CLEAR + buttonIdOffset, 0, 0, 56, 20, EnderIO.lang.localize("gui.conduit.button.clear")); + showB = new GuiButton(ID_SHOW + buttonIdOffset, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.show")); + + snapshotOverlay = new SnapshotOverlay(); + gui.addOverlay(snapshotOverlay); + } + + @Override + public void mouseClicked(int x, int y, int par3) {} + + @Override + public void updateButtons() { + + ExistingItemFilter activeFilter = filter; + + useNbtB.onGuiInit(); + useNbtB.setSelected(activeFilter.isMatchNBT()); + + useOreDictB.onGuiInit(); + useOreDictB.setSelected(activeFilter.isUseOreDict()); + + if (!isInput) { + stickyB.onGuiInit(); + stickyB.setSelected(activeFilter.isSticky()); } - } + + useMetaB.onGuiInit(); + useMetaB.setSelected(activeFilter.isMatchMeta()); + + whiteListB.onGuiInit(); + if (filter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + } + + int butLeft = gui.getGuiLeft() + (isInput ? 104 : 5); + int x = butLeft; + int y = gui.getGuiTop() + 96 + 20; + + snapshotB.xPosition = x; + snapshotB.yPosition = y; + + x += 56; + mergeB.xPosition = x; + mergeB.yPosition = y; + + x = butLeft; + y += 20; + clearB.xPosition = x; + clearB.yPosition = y; + + x += 56; + showB.xPosition = x; + showB.yPosition = y; + + clearB.enabled = filter.getSnapshot() != null; + showB.enabled = clearB.enabled; + mergeB.enabled = filter.getSnapshot() != null; + + gui.addButton(snapshotB); + gui.addButton(clearB); + gui.addButton(showB); + gui.addButton(mergeB); } @Override - public void setVisible(boolean visible) { - this.visible = visible; + public void actionPerformed(GuiButton guiButton) { + if (guiButton.id == ID_META + buttonIdOffset) { + filter.setMatchMeta(useMetaB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_NBT + buttonIdOffset) { + filter.setMatchNBT(useNbtB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_STICKY + buttonIdOffset) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_ORE_DICT + buttonIdOffset) { + filter.setUseOreDict(useOreDictB.isSelected()); + sendFilterChange(); + } else if (guiButton.id == ID_SNAPSHOT + buttonIdOffset) { + sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.SET); + } else if (guiButton.id == ID_CLEAR + buttonIdOffset) { + sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.CLEAR); + } else if (guiButton.id == ID_MERGE + buttonIdOffset) { + sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode.MERGE); + } else if (guiButton.id == ID_SHOW + buttonIdOffset) { + showSnapshotOverlay(); + } else if (guiButton == whiteListB) { + filter.setBlacklist(!filter.isBlacklist()); + sendSnapshotPacket( + filter.isBlacklist() + ? PacketExistingItemFilterSnapshot.Opcode.SET_BLACK + : PacketExistingItemFilterSnapshot.Opcode.UNSET_BLACK); + } + } + + private void showSnapshotOverlay() { + snapshotOverlay.setVisible(true); + } + + private void sendSnapshotPacket(PacketExistingItemFilterSnapshot.Opcode opcode) { + PacketHandler.INSTANCE.sendToServer( + new PacketExistingItemFilterSnapshot(itemConduit, gui.getDir(), isInput, opcode)); + } + + private void sendFilterChange() { + updateButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); } @Override - public boolean isVisible() { - return visible; + public void deactivate() { + useNbtB.detach(); + useMetaB.detach(); + useOreDictB.detach(); + stickyB.detach(); + whiteListB.detach(); + gui.removeButton(snapshotB); + gui.removeButton(clearB); + gui.removeButton(showB); + gui.removeButton(mergeB); } @Override - public boolean handleMouseInput(int x, int y, int b) { - return true; + public void renderCustomOptions(int top, float par1, int par2, int par3) { + // GL11.glColor3f(1, 1, 1); + // RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); + // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); + // if(filter.isAdvanced()) { + // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); + // } } - @Override - public boolean isMouseInBounds(int mouseX, int mouseY) { - return getBounds().contains(mouseX, mouseY); - } + class SnapshotOverlay implements IGuiOverlay { - } + boolean visible; + + @Override + public void init(IGuiScreen screen) {} + + @Override + public Rectangle getBounds() { + return new Rectangle(0, 0, gui.width, gui.height); + } + + @Override + public void draw(int mouseX, int mouseY, float partialTick) { + RenderHelper.enableGUIStandardItemLighting(); + GL11.glEnable(GL11.GL_BLEND); + RenderUtil.renderQuad2D(4, 4, 0, gui.getXSize() - 9, gui.getYSize() - 8, new Vector4f(0, 0, 0, 1)); + RenderUtil.renderQuad2D(6, 6, 0, gui.getXSize() - 13, gui.getYSize() - 12, new Vector4f(0.6, 0.6, 0.6, 1)); + + Minecraft mc = Minecraft.getMinecraft(); + RenderItem itemRenderer = new RenderItem(); + + GL11.glEnable(GL11.GL_DEPTH_TEST); + + List snapshot = filter.getSnapshot(); + int x = 15; + int y = 10; + int count = 0; + for (ItemStack st : snapshot) { + if (st != null) { + itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.getTextureManager(), st, x, y); + // itemRender.renderItemOverlayIntoGUI(mc.fontRenderer, mc.getTextureManager(), st, x, y, s); + } + x += 20; + count++; + if (count % 9 == 0) { + x = 15; + y += 20; + } + } + } + + @Override + public void setVisible(boolean visible) { + this.visible = visible; + } + + @Override + public boolean isVisible() { + return visible; + } + + @Override + public boolean handleMouseInput(int x, int y, int b) { + return true; + } + + @Override + public boolean isMouseInBounds(int mouseX, int mouseY) { + return getBounds().contains(mouseX, mouseY); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java index 285d60cd..d4c44b0e 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java @@ -4,8 +4,7 @@ import crazypants.enderio.conduit.item.filter.ItemFilter; public interface IItemFilterContainer { - ItemFilter getItemFilter(); - - void onFilterChanged(); + ItemFilter getItemFilter(); + void onFilterChanged(); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterGui.java index f5e2c862..8ff8b05f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterGui.java @@ -4,14 +4,13 @@ import net.minecraft.client.gui.GuiButton; public interface IItemFilterGui { - void deactivate(); + void deactivate(); - void updateButtons(); + void updateButtons(); - void actionPerformed(GuiButton guiButton); - - void renderCustomOptions(int top, float par1, int par2, int par3); + void actionPerformed(GuiButton guiButton); - void mouseClicked(int x, int y, int par3); + void renderCustomOptions(int top, float par1, int par2, int par3); + void mouseClicked(int x, int y, int par3); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/InventoryUpgrades.java b/src/main/java/crazypants/enderio/conduit/gui/item/InventoryUpgrades.java index 77899783..58861eb3 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/InventoryUpgrades.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/InventoryUpgrades.java @@ -1,119 +1,131 @@ package crazypants.enderio.conduit.gui.item; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.item.IItemConduit; -import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade; public class InventoryUpgrades implements IInventory { - IItemConduit itemConduit; - ForgeDirection dir; - - public InventoryUpgrades(IItemConduit itemConduit, ForgeDirection dir) { - this.itemConduit = itemConduit; - this.dir = dir; - } - - @Override - public int getSizeInventory() { - return 4; - } + IItemConduit itemConduit; + ForgeDirection dir; - @Override - public ItemStack getStackInSlot(int slot) { - switch (slot) { - case 0: return itemConduit.getSpeedUpgrade(dir); - case 1: return itemConduit.getFunctionUpgrade(dir); - case 2: return itemConduit.getInputFilterUpgrade(dir); - case 3: return itemConduit.getOutputFilterUpgrade(dir); - default: return null; + public InventoryUpgrades(IItemConduit itemConduit, ForgeDirection dir) { + this.itemConduit = itemConduit; + this.dir = dir; } - } - @Override - public ItemStack decrStackSize(int slot, int num) { - ItemStack current = getStackInSlot(slot); - if(current == null) { - return current; + @Override + public int getSizeInventory() { + return 4; } - ItemStack result; - ItemStack remaining; - if(num >= current.stackSize) { - result = current.copy(); - remaining = null; - } else { - result = current.copy(); - result.stackSize = num; - remaining = current.copy(); - remaining.stackSize -= num; + + @Override + public ItemStack getStackInSlot(int slot) { + switch (slot) { + case 0: + return itemConduit.getSpeedUpgrade(dir); + case 1: + return itemConduit.getFunctionUpgrade(dir); + case 2: + return itemConduit.getInputFilterUpgrade(dir); + case 3: + return itemConduit.getOutputFilterUpgrade(dir); + default: + return null; + } } - setInventorySlotContents(slot, remaining); - return result; - } - @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack var2) { - switch (slot) { - case 0: itemConduit.setSpeedUpgrade(dir, var2); break; - case 1: itemConduit.setFunctionUpgrade(dir, var2); break; - case 2: itemConduit.setInputFilterUpgrade(dir, var2); break; - case 3: itemConduit.setOutputFilterUpgrade(dir, var2); break; + @Override + public ItemStack decrStackSize(int slot, int num) { + ItemStack current = getStackInSlot(slot); + if (current == null) { + return current; + } + ItemStack result; + ItemStack remaining; + if (num >= current.stackSize) { + result = current.copy(); + remaining = null; + } else { + result = current.copy(); + result.stackSize = num; + remaining = current.copy(); + remaining.stackSize -= num; + } + setInventorySlotContents(slot, remaining); + return result; } - } - @Override - public String getInventoryName() { - return "Upgrades"; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 15; - } - - @Override - public void markDirty() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer var1) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack item) { - if(item == null) { - return false; + @Override + public ItemStack getStackInSlotOnClosing(int var1) { + return null; } - switch (slot) { - case 0: return item.getItem() == EnderIO.itemExtractSpeedUpgrade; - case 1: return item.getItem() == EnderIO.itemFunctionUpgrade; - case 2: - case 3: return item.getItem() instanceof IItemFilterUpgrade; - } - return false; - } -} \ No newline at end of file + @Override + public void setInventorySlotContents(int slot, ItemStack var2) { + switch (slot) { + case 0: + itemConduit.setSpeedUpgrade(dir, var2); + break; + case 1: + itemConduit.setFunctionUpgrade(dir, var2); + break; + case 2: + itemConduit.setInputFilterUpgrade(dir, var2); + break; + case 3: + itemConduit.setOutputFilterUpgrade(dir, var2); + break; + } + } + + @Override + public String getInventoryName() { + return "Upgrades"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 15; + } + + @Override + public void markDirty() {} + + @Override + public boolean isUseableByPlayer(EntityPlayer var1) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int slot, ItemStack item) { + if (item == null) { + return false; + } + switch (slot) { + case 0: + return item.getItem() == EnderIO.itemExtractSpeedUpgrade; + case 1: + return item.getItem() == EnderIO.itemFunctionUpgrade; + case 2: + case 3: + return item.getItem() instanceof IItemFilterUpgrade; + } + return false; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java index d4c92503..f79e4255 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java @@ -1,35 +1,34 @@ package crazypants.enderio.conduit.gui.item; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.network.PacketHandler; +import net.minecraftforge.common.util.ForgeDirection; public class ItemConduitFilterContainer implements IItemFilterContainer { - private IItemConduit itemConduit; - private ForgeDirection dir; - private boolean isInput; + private IItemConduit itemConduit; + private ForgeDirection dir; + private boolean isInput; - public ItemConduitFilterContainer(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) { - this.itemConduit = itemConduit; - this.dir = dir; - this.isInput = isInput; - } - - @Override - public ItemFilter getItemFilter() { - if(isInput) { - return (ItemFilter) itemConduit.getInputFilter(dir); - } else { - return (ItemFilter) itemConduit.getOutputFilter(dir); + public ItemConduitFilterContainer(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) { + this.itemConduit = itemConduit; + this.dir = dir; + this.isInput = isInput; } - } - @Override - public void onFilterChanged() { - PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, dir)); - } + @Override + public ItemFilter getItemFilter() { + if (isInput) { + return (ItemFilter) itemConduit.getInputFilter(dir); + } else { + return (ItemFilter) itemConduit.getOutputFilter(dir); + } + } + @Override + public void onFilterChanged() { + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, dir)); + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 6f8d568d..1f9769bd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -11,7 +11,6 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gui.BaseSettingsPanel; import crazypants.enderio.conduit.gui.FilterChangeListener; -import crazypants.enderio.conduit.gui.FilterGuiUtil; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; @@ -22,252 +21,252 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; -import net.minecraft.client.Minecraft; +import java.awt.*; +import javax.annotation.Nonnull; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; -import javax.annotation.Nonnull; -import java.awt.*; - public class ItemSettings extends BaseSettingsPanel { - private static final int ID_REDSTONE_BUTTON = 12614; - private static final int ID_COLOR_BUTTON = 179816; - private static final int ID_LOOP = 22; - private static final int ID_ROUND_ROBIN = 24; - private static final int ID_PRIORITY_UP = 25; - private static final int ID_PRIORITY_DOWN = 26; - private static final int ID_INSERT_CHANNEL = 23; - private static final int ID_EXTRACT_CHANNEL = 27; + private static final int ID_REDSTONE_BUTTON = 12614; + private static final int ID_COLOR_BUTTON = 179816; + private static final int ID_LOOP = 22; + private static final int ID_ROUND_ROBIN = 24; + private static final int ID_PRIORITY_UP = 25; + private static final int ID_PRIORITY_DOWN = 26; + private static final int ID_INSERT_CHANNEL = 23; + private static final int ID_EXTRACT_CHANNEL = 27; - private @Nonnull IItemConduit itemConduit; + private @Nonnull IItemConduit itemConduit; - private final ToggleButton loopB; - private final ToggleButton roundRobinB; + private final ToggleButton loopB; + private final ToggleButton roundRobinB; - private final MultiIconButton priUpB; - private final MultiIconButton priDownB; + private final MultiIconButton priUpB; + private final MultiIconButton priDownB; - private final RedstoneModeButton rsB; - private final @Nonnull ColorButton colorB; + private final RedstoneModeButton rsB; + private final @Nonnull ColorButton colorB; - private ColorButton insertChannelB; - private ColorButton extractChannelB; + private ColorButton insertChannelB; + private ColorButton extractChannelB; - private int priLeft = 46; - private int priWidth = 32; + private int priLeft = 46; + private int priWidth = 32; - private IItemFilterGui insertFilterGui; - private IItemFilterGui extractFilterGui; + private IItemFilterGui insertFilterGui; + private IItemFilterGui extractFilterGui; + public ItemSettings(@Nonnull final GuiExternalConnection gui, @Nonnull IConduit con) { + super( + IconEIO.WRENCH_OVERLAY_ITEM, + EnderIO.lang.localize("itemItemConduit.name"), + gui, + con, + "filter_upgrade_settings"); + itemConduit = (IItemConduit) con; + this.textureHeight += 48; - public ItemSettings(@Nonnull final GuiExternalConnection gui, @Nonnull IConduit con) { - super(IconEIO.WRENCH_OVERLAY_ITEM, EnderIO.lang.localize("itemItemConduit.name"), gui, con, "filter_upgrade_settings"); - itemConduit = (IItemConduit) con; - this.textureHeight += 48; + int x = leftColumn; + int y = customTop; - int x = leftColumn; - int y = customTop; + insertChannelB = new ColorButton(gui, ID_INSERT_CHANNEL, x, y); + insertChannelB.setColorIndex(0); + insertChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - insertChannelB = new ColorButton(gui, ID_INSERT_CHANNEL, x, y); - insertChannelB.setColorIndex(0); - insertChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); + x = rightColumn; + extractChannelB = new ColorButton(gui, ID_EXTRACT_CHANNEL, x, y); + extractChannelB.setColorIndex(0); + extractChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - x = rightColumn; - extractChannelB = new ColorButton(gui, ID_EXTRACT_CHANNEL, x, y); - extractChannelB.setColorIndex(0); - extractChannelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); + x += 4 + extractChannelB.getWidth(); + roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); + roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled")); + roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled")); + roundRobinB.setPaintSelectedBorder(false); - x += 4 + extractChannelB.getWidth(); - roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); - roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled")); - roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled")); - roundRobinB.setPaintSelectedBorder(false); + x += 4 + roundRobinB.getWidth(); + loopB = new ToggleButton(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP); + loopB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedEnabled")); + loopB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedDisabled")); + loopB.setPaintSelectedBorder(false); - x += 4 + roundRobinB.getWidth(); - loopB = new ToggleButton(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP); - loopB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedEnabled")); - loopB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedDisabled")); - loopB.setPaintSelectedBorder(false); + y += insertChannelB.getHeight() + 6; + x = rightColumn; - y += insertChannelB.getHeight() + 6; - x = rightColumn; + int x0 = x + 20; + colorB = new ColorButton(gui, ID_COLOR_BUTTON, x0, y); + colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal()); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - int x0 = x + 20; - colorB = new ColorButton(gui, ID_COLOR_BUTTON, x0, y); - colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal()); - colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); + rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + RedstoneControlMode curMode = getRedstoneControlMode(); + itemConduit.setExtractionRedstoneMode(mode, gui.getDir()); + if (curMode != mode) { + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); + } + } - rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() { - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - RedstoneControlMode curMode = getRedstoneControlMode(); - itemConduit.setExtractionRedstoneMode(mode, gui.getDir()); - if(curMode != mode) { - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); - } + @Override + public RedstoneControlMode getRedstoneControlMode() { + return itemConduit.getExtractionRedstoneMode(gui.getDir()); + } + }); - } + x = priLeft + priWidth + 9; + priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y); + priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y + 8); - @Override - public RedstoneControlMode getRedstoneControlMode() { - return itemConduit.getExtractionRedstoneMode(gui.getDir()); - } - }); - - x = priLeft + priWidth + 9; - priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y); - priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y + 8); - - FilterChangeListener fcl = new FilterChangeListener() { - @Override - public void onFilterChanged() { - if (insertFilterGui != null) { - insertFilterGui.deactivate(); - insertFilterGui = null; - } - if (extractFilterGui != null) { - extractFilterGui.deactivate(); - extractFilterGui = null; - } - gui.clearGhostSlots(); - IItemFilter filt = gui.getContainer().getFilter(false); - if (filt != null) { - insertFilterGui = filt.getGui(gui, gui.getContainer().getInv().itemConduit, false); - } - filt = gui.getContainer().getFilter(true); - if (filt != null) { - extractFilterGui = filt.getGui(gui, gui.getContainer().getInv().itemConduit, true); - } - if (insertFilterGui != null) { - insertFilterGui.updateButtons(); - } - if (extractFilterGui != null) { - extractFilterGui.updateButtons(); - } - } - }; - fcl.onFilterChanged(); - gui.getContainer().addFilterListener(fcl); - } - - @Override - protected void initCustomOptions() { - gui.getContainer().setInoutSlotsVisible(true, true); - gui.getContainer().createGhostSlots(gui.getGhostSlots()); - gui.getContainer().setInventorySlotsVisible(true); - updateGuiVisibility(); - } - - private void updateGuiVisibility() { - updateButtons(); - } - - private void updateButtons() { - rsB.onGuiInit(); - rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir())); - - loopB.onGuiInit(); - loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir())); - roundRobinB.onGuiInit(); - roundRobinB.setSelected(itemConduit.isRoundRobinEnabled(gui.getDir())); - - priUpB.onGuiInit(); - priDownB.onGuiInit(); - - insertChannelB.onGuiInit(); - insertChannelB.setColorIndex(itemConduit.getOutputColor(gui.getDir()).ordinal()); - extractChannelB.onGuiInit(); - extractChannelB.setColorIndex(itemConduit.getInputColor(gui.getDir()).ordinal()); - - if (insertFilterGui != null) insertFilterGui.updateButtons(); - if (extractFilterGui != null) extractFilterGui.updateButtons(); - } - - @Override - public void actionPerformed(@Nonnull GuiButton guiButton) { - super.actionPerformed(guiButton); - if(guiButton.id == ID_COLOR_BUTTON) { - itemConduit.setExtractionSignalColor(gui.getDir(), DyeColor.fromIndex(colorB.getColorIndex())); - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); - return; - } else if(guiButton.id == ID_LOOP) { - itemConduit.setSelfFeedEnabled(gui.getDir(), !itemConduit.isSelfFeedEnabled(gui.getDir())); - } else if(guiButton.id == ID_ROUND_ROBIN) { - itemConduit.setRoundRobinEnabled(gui.getDir(), !itemConduit.isRoundRobinEnabled(gui.getDir())); - } else if(guiButton.id == ID_PRIORITY_UP) { - itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) + 1); - } else if(guiButton.id == ID_PRIORITY_DOWN) { - itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) - 1); - } else if(guiButton.id == ID_INSERT_CHANNEL) { - DyeColor col = DyeColor.fromIndex(insertChannelB.getColorIndex()); - itemConduit.setOutputColor(gui.getDir(), col); - } else if(guiButton.id == ID_EXTRACT_CHANNEL) { - DyeColor col = DyeColor.fromIndex(extractChannelB.getColorIndex()); - itemConduit.setInputColor(gui.getDir(), col); + FilterChangeListener fcl = new FilterChangeListener() { + @Override + public void onFilterChanged() { + if (insertFilterGui != null) { + insertFilterGui.deactivate(); + insertFilterGui = null; + } + if (extractFilterGui != null) { + extractFilterGui.deactivate(); + extractFilterGui = null; + } + gui.clearGhostSlots(); + IItemFilter filt = gui.getContainer().getFilter(false); + if (filt != null) { + insertFilterGui = filt.getGui(gui, gui.getContainer().getInv().itemConduit, false); + } + filt = gui.getContainer().getFilter(true); + if (filt != null) { + extractFilterGui = filt.getGui(gui, gui.getContainer().getInv().itemConduit, true); + } + if (insertFilterGui != null) { + insertFilterGui.updateButtons(); + } + if (extractFilterGui != null) { + extractFilterGui.updateButtons(); + } + } + }; + fcl.onFilterChanged(); + gui.getContainer().addFilterListener(fcl); } - if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton); - if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton); - PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); - } - @Override - protected void connectionModeChanged(@Nonnull ConnectionMode mode) { - super.connectionModeChanged(mode); - PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); - updateGuiVisibility(); - } + @Override + protected void initCustomOptions() { + gui.getContainer().setInoutSlotsVisible(true, true); + gui.getContainer().createGhostSlots(gui.getGhostSlots()); + gui.getContainer().setInventorySlotsVisible(true); + updateGuiVisibility(); + } - @Override - protected void renderCustomOptions(int top1, float par1, int par2, int par3) { - FontRenderer fr = gui.getFontRenderer(); + private void updateGuiVisibility() { + updateButtons(); + } - GL11.glColor3f(1, 1, 1); - IconEIO.map.render(EnderWidget.BUTTON_DOWN, left + priLeft, top1 - 5, priWidth, 16, 0, true); - String str = itemConduit.getOutputPriority(gui.getDir()) + ""; - int sw = fr.getStringWidth(str); + private void updateButtons() { + rsB.onGuiInit(); + rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir())); - String priority = EnderIO.lang.localize("gui.conduit.item.priority"); - fr.drawString(priority, left + 12, top1 + 25, ColorUtil.getRGB(Color.black)); - fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtil.getRGB(Color.black)); + loopB.onGuiInit(); + loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir())); + roundRobinB.onGuiInit(); + roundRobinB.setSelected(itemConduit.isRoundRobinEnabled(gui.getDir())); - if (insertFilterGui != null) insertFilterGui.renderCustomOptions(top1, par1, par2, par3); - if (extractFilterGui != null) extractFilterGui.renderCustomOptions(top1, par1, par2, par3); - } + priUpB.onGuiInit(); + priDownB.onGuiInit(); - @Override - public void mouseClicked(int x, int y, int par3) { - super.mouseClicked(x, y, par3); - if (insertFilterGui != null) insertFilterGui.mouseClicked(x, y, par3); - if (extractFilterGui != null) extractFilterGui.mouseClicked(x, y, par3); - } + insertChannelB.onGuiInit(); + insertChannelB.setColorIndex(itemConduit.getOutputColor(gui.getDir()).ordinal()); + extractChannelB.onGuiInit(); + extractChannelB.setColorIndex(itemConduit.getInputColor(gui.getDir()).ordinal()); - @Override - public void deactivate() { - super.deactivate(); - gui.getContainer().setInoutSlotsVisible(false, false); - rsB.detach(); - colorB.detach(); - roundRobinB.detach(); - loopB.detach(); - priUpB.detach(); - priDownB.detach(); - insertChannelB.detach(); - extractChannelB.detach(); - gui.getContainer().setInventorySlotsVisible(false); - if (insertFilterGui != null) insertFilterGui.deactivate(); - if (extractFilterGui != null) extractFilterGui.deactivate(); - } + if (insertFilterGui != null) insertFilterGui.updateButtons(); + if (extractFilterGui != null) extractFilterGui.updateButtons(); + } - @Override - protected boolean hasFilters() { - return true; - } + @Override + public void actionPerformed(@Nonnull GuiButton guiButton) { + super.actionPerformed(guiButton); + if (guiButton.id == ID_COLOR_BUTTON) { + itemConduit.setExtractionSignalColor(gui.getDir(), DyeColor.fromIndex(colorB.getColorIndex())); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); + return; + } else if (guiButton.id == ID_LOOP) { + itemConduit.setSelfFeedEnabled(gui.getDir(), !itemConduit.isSelfFeedEnabled(gui.getDir())); + } else if (guiButton.id == ID_ROUND_ROBIN) { + itemConduit.setRoundRobinEnabled(gui.getDir(), !itemConduit.isRoundRobinEnabled(gui.getDir())); + } else if (guiButton.id == ID_PRIORITY_UP) { + itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) + 1); + } else if (guiButton.id == ID_PRIORITY_DOWN) { + itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) - 1); + } else if (guiButton.id == ID_INSERT_CHANNEL) { + DyeColor col = DyeColor.fromIndex(insertChannelB.getColorIndex()); + itemConduit.setOutputColor(gui.getDir(), col); + } else if (guiButton.id == ID_EXTRACT_CHANNEL) { + DyeColor col = DyeColor.fromIndex(extractChannelB.getColorIndex()); + itemConduit.setInputColor(gui.getDir(), col); + } + if (insertFilterGui != null) insertFilterGui.actionPerformed(guiButton); + if (extractFilterGui != null) extractFilterGui.actionPerformed(guiButton); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); + } - @Override - protected boolean hasUpgrades() { - return true; - } + @Override + protected void connectionModeChanged(@Nonnull ConnectionMode mode) { + super.connectionModeChanged(mode); + PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir())); + updateGuiVisibility(); + } + @Override + protected void renderCustomOptions(int top1, float par1, int par2, int par3) { + FontRenderer fr = gui.getFontRenderer(); + + GL11.glColor3f(1, 1, 1); + IconEIO.map.render(EnderWidget.BUTTON_DOWN, left + priLeft, top1 - 5, priWidth, 16, 0, true); + String str = itemConduit.getOutputPriority(gui.getDir()) + ""; + int sw = fr.getStringWidth(str); + + String priority = EnderIO.lang.localize("gui.conduit.item.priority"); + fr.drawString(priority, left + 12, top1 + 25, ColorUtil.getRGB(Color.black)); + fr.drawString(str, left + priLeft + priWidth - sw - gap, top1 + 25, ColorUtil.getRGB(Color.black)); + + if (insertFilterGui != null) insertFilterGui.renderCustomOptions(top1, par1, par2, par3); + if (extractFilterGui != null) extractFilterGui.renderCustomOptions(top1, par1, par2, par3); + } + + @Override + public void mouseClicked(int x, int y, int par3) { + super.mouseClicked(x, y, par3); + if (insertFilterGui != null) insertFilterGui.mouseClicked(x, y, par3); + if (extractFilterGui != null) extractFilterGui.mouseClicked(x, y, par3); + } + + @Override + public void deactivate() { + super.deactivate(); + gui.getContainer().setInoutSlotsVisible(false, false); + rsB.detach(); + colorB.detach(); + roundRobinB.detach(); + loopB.detach(); + priUpB.detach(); + priDownB.detach(); + insertChannelB.detach(); + extractChannelB.detach(); + gui.getContainer().setInventorySlotsVisible(false); + if (insertFilterGui != null) insertFilterGui.deactivate(); + if (extractFilterGui != null) extractFilterGui.deactivate(); + } + + @Override + protected boolean hasFilters() { + return true; + } + + @Override + protected boolean hasUpgrades() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index cadce4f6..e2540403 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -1,169 +1,163 @@ package crazypants.enderio.conduit.gui.item; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ModItemFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class ModItemFilterGui implements IItemFilterGui { - private static final int MOD_NAME_COLOR = ColorUtil.getRGB(Color.white); + private static final int MOD_NAME_COLOR = ColorUtil.getRGB(Color.white); - private final IItemConduit itemConduit; - private final GuiExternalConnection gui; + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; - boolean isInput; + boolean isInput; - private final ModItemFilter filter; + private final ModItemFilter filter; - private final Rectangle[] inputBounds; + private final Rectangle[] inputBounds; - private final IconButton[] deleteButs; + private final IconButton[] deleteButs; - private final IconButton whiteListB; + private final IconButton whiteListB; - private final int inputOffsetX; - private final int tfWidth; - private final int tfTextureX; - private final int tfTextureY; + private final int inputOffsetX; + private final int tfWidth; + private final int tfTextureX; + private final int tfTextureY; - public ModItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - this.gui = gui; - this.itemConduit = itemConduit; - this.isInput = isInput; + public ModItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + this.gui = gui; + this.itemConduit = itemConduit; + this.isInput = isInput; - int butLeft = isInput ? 106 : 5; - int x = butLeft; - int y = 96; + int butLeft = isInput ? 106 : 5; + int x = butLeft; + int y = 96; - if(isInput) { - filter = (ModItemFilter) itemConduit.getInputFilter(gui.getDir()); - } else { - filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir()); - } - inputOffsetX = x; - tfWidth = 52; - tfTextureX = 120; - tfTextureY = 214; + if (isInput) { + filter = (ModItemFilter) itemConduit.getInputFilter(gui.getDir()); + } else { + filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir()); + } + inputOffsetX = x; + tfWidth = 52; + tfTextureX = 120; + tfTextureY = 214; - inputBounds = new Rectangle[] { - new Rectangle(inputOffsetX,y,16,16), - new Rectangle(inputOffsetX,y + 18,16,16), - new Rectangle(inputOffsetX,y + 36,16,16) - }; + inputBounds = new Rectangle[] { + new Rectangle(inputOffsetX, y, 16, 16), + new Rectangle(inputOffsetX, y + 18, 16, 16), + new Rectangle(inputOffsetX, y + 36, 16, 16) + }; - deleteButs = new IconButton[inputBounds.length]; - for(int i=0; i < deleteButs.length; i++) { - Rectangle r = inputBounds[i]; - IconButton but = new IconButton(gui, GuiExternalConnection.nextButtonId(), r.x + 19, r.y, IconEIO.MINUS); - deleteButs[i] = but; + deleteButs = new IconButton[inputBounds.length]; + for (int i = 0; i < deleteButs.length; i++) { + Rectangle r = inputBounds[i]; + IconButton but = new IconButton(gui, GuiExternalConnection.nextButtonId(), r.x + 19, r.y, IconEIO.MINUS); + deleteButs[i] = but; + } + + whiteListB = new IconButton(gui, -1, x + 64, y - 25, IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); } - whiteListB = new IconButton(gui, -1, x + 64, y - 25, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - } - - @Override - public void deactivate() { - for(IconButton but : deleteButs) { - but.detach(); - } - whiteListB.detach(); - } - - @Override - public void updateButtons() { - for(IconButton but : deleteButs) { - but.onGuiInit(); + @Override + public void deactivate() { + for (IconButton but : deleteButs) { + but.detach(); + } + whiteListB.detach(); } - whiteListB.onGuiInit(); - if (filter.isBlacklist()) { - whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); - } else { - whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - } - } + @Override + public void updateButtons() { + for (IconButton but : deleteButs) { + but.onGuiInit(); + } - @Override - public void actionPerformed(GuiButton guiButton) { - for(int i=0; i < deleteButs.length; i++) { - IconButton but = deleteButs[i]; - if(but == guiButton) { - setMod(i, null); - return; - } - } - if (guiButton == whiteListB) { - toggleBlacklist(); - } - } - - @Override - public void renderCustomOptions(int top, float par1, int par2, int par3) { - GL11.glColor3f(1, 1, 1); - gui.bindGuiTexture(); - for(Rectangle r : inputBounds) { - //slot - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 214, 18, 18); - //text box - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, tfTextureX, tfTextureY, tfWidth, 18); + whiteListB.onGuiInit(); + if (filter.isBlacklist()) { + whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); + } else { + whiteListB.setIcon(IconEIO.FILTER_WHITELIST); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + } } - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - for(int i=0;i implements IMessageHandler { +public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket + implements IMessageHandler { - public static enum Opcode { - CLEAR, - SET, - MERGE, - SET_BLACK, - UNSET_BLACK - } - - private ForgeDirection dir; - private Opcode opcode; - private boolean isInput; - - public PacketExistingItemFilterSnapshot() { - } - - public PacketExistingItemFilterSnapshot(IItemConduit con, ForgeDirection dir, boolean isInput, Opcode opcode) { - super(con.getBundle().getEntity(), ConTypeEnum.ITEM); - this.dir = dir; - this.isInput= isInput; - this.opcode = opcode; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - isInput = buf.readBoolean(); - opcode = Opcode.values()[buf.readByte() & 255]; - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(isInput); - buf.writeByte(opcode.ordinal()); - } - - @Override - public PacketExistingItemFilterSnapshot onMessage(PacketExistingItemFilterSnapshot message, MessageContext ctx) { - IItemConduit conduit = message.getTileCasted(ctx); - if(conduit == null) { - return null; - } - ExistingItemFilter filter; - if(message.isInput) { - filter = (ExistingItemFilter)conduit.getInputFilter(message.dir); - } else { - filter = (ExistingItemFilter)conduit.getOutputFilter(message.dir); - } - - switch (message.opcode) { - case CLEAR: - filter.setSnapshot((List)null); - System.out.println("PacketExistingItemFilterSnapshot.onMessage: Cleared snapshot"); - break; - - case SET: { - ItemConduitNetwork icn = (ItemConduitNetwork)conduit.getNetwork(); - NetworkedInventory inv = icn.getInventory(conduit, message.dir); - inv.updateInventory(); - filter.setSnapshot(inv); - break; - } - - case MERGE: { - ItemConduitNetwork icn = (ItemConduitNetwork)conduit.getNetwork(); - NetworkedInventory inv = icn.getInventory(conduit, message.dir); - filter.mergeSnapshot(inv); - break; - } - - case SET_BLACK: - filter.setBlacklist(true); - break; - case UNSET_BLACK: - filter.setBlacklist(false); - break; - - default: - throw new AssertionError(); + public static enum Opcode { + CLEAR, + SET, + MERGE, + SET_BLACK, + UNSET_BLACK } - if(message.isInput) { - conduit.setInputFilter(message.dir, filter); - } else { - conduit.setOutputFilter(message.dir, filter); - } - - return null; - } + private ForgeDirection dir; + private Opcode opcode; + private boolean isInput; + public PacketExistingItemFilterSnapshot() {} + + public PacketExistingItemFilterSnapshot(IItemConduit con, ForgeDirection dir, boolean isInput, Opcode opcode) { + super(con.getBundle().getEntity(), ConTypeEnum.ITEM); + this.dir = dir; + this.isInput = isInput; + this.opcode = opcode; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isInput = buf.readBoolean(); + opcode = Opcode.values()[buf.readByte() & 255]; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isInput); + buf.writeByte(opcode.ordinal()); + } + + @Override + public PacketExistingItemFilterSnapshot onMessage(PacketExistingItemFilterSnapshot message, MessageContext ctx) { + IItemConduit conduit = message.getTileCasted(ctx); + if (conduit == null) { + return null; + } + ExistingItemFilter filter; + if (message.isInput) { + filter = (ExistingItemFilter) conduit.getInputFilter(message.dir); + } else { + filter = (ExistingItemFilter) conduit.getOutputFilter(message.dir); + } + + switch (message.opcode) { + case CLEAR: + filter.setSnapshot((List) null); + System.out.println("PacketExistingItemFilterSnapshot.onMessage: Cleared snapshot"); + break; + + case SET: { + ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); + NetworkedInventory inv = icn.getInventory(conduit, message.dir); + inv.updateInventory(); + filter.setSnapshot(inv); + break; + } + + case MERGE: { + ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); + NetworkedInventory inv = icn.getInventory(conduit, message.dir); + filter.mergeSnapshot(inv); + break; + } + + case SET_BLACK: + filter.setBlacklist(true); + break; + case UNSET_BLACK: + filter.setBlacklist(false); + break; + + default: + throw new AssertionError(); + } + + if (message.isInput) { + conduit.setInputFilter(message.dir, filter); + } else { + conduit.setOutputFilter(message.dir, filter); + } + + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java index c2475705..a74b44ff 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketModItemFilter.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.gui.item; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -10,76 +8,78 @@ import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ModItemFilter; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketModItemFilter extends AbstractConduitPacket implements IMessageHandler { +public class PacketModItemFilter extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private boolean isInput; - private int index; - private String name; + private ForgeDirection dir; + private boolean isInput; + private int index; + private String name; - public PacketModItemFilter() { - } - - public PacketModItemFilter(IItemConduit con, ForgeDirection dir, boolean isInput, int index, String name) { - super(con.getBundle().getEntity(), ConTypeEnum.ITEM); - this.dir = dir; - this.isInput= isInput; - this.index = index; - this.name = name; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - isInput = buf.readBoolean(); - index = buf.readInt(); - boolean isNull = buf.readBoolean(); - if(isNull) { - name = null; - } else { - name = ByteBufUtils.readUTF8String(buf); - } - } + public PacketModItemFilter() {} - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(isInput); - buf.writeInt(index); - buf.writeBoolean(name == null); - if(name != null) { - ByteBufUtils.writeUTF8String(buf, name); + public PacketModItemFilter(IItemConduit con, ForgeDirection dir, boolean isInput, int index, String name) { + super(con.getBundle().getEntity(), ConTypeEnum.ITEM); + this.dir = dir; + this.isInput = isInput; + this.index = index; + this.name = name; } - } - @Override - public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) { - IItemConduit conduit = message.getTileCasted(ctx); - if(conduit == null) { - return null; + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isInput = buf.readBoolean(); + index = buf.readInt(); + boolean isNull = buf.readBoolean(); + if (isNull) { + name = null; + } else { + name = ByteBufUtils.readUTF8String(buf); + } } - ModItemFilter filter; - if(message.isInput) { - filter = (ModItemFilter)conduit.getInputFilter(message.dir); - } else { - filter = (ModItemFilter)conduit.getOutputFilter(message.dir); + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isInput); + buf.writeInt(index); + buf.writeBoolean(name == null); + if (name != null) { + ByteBufUtils.writeUTF8String(buf, name); + } } - - if (message.index == -1) { - filter.setBlacklist("1".equals(message.name)); - } else { - filter.setMod(message.index, message.name); + + @Override + public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) { + IItemConduit conduit = message.getTileCasted(ctx); + if (conduit == null) { + return null; + } + ModItemFilter filter; + if (message.isInput) { + filter = (ModItemFilter) conduit.getInputFilter(message.dir); + } else { + filter = (ModItemFilter) conduit.getOutputFilter(message.dir); + } + + if (message.index == -1) { + filter.setBlacklist("1".equals(message.name)); + } else { + filter.setMod(message.index, message.name); + } + + if (message.isInput) { + conduit.setInputFilter(message.dir, filter); + } else { + conduit.setOutputFilter(message.dir, filter); + } + + return null; } - - if(message.isInput) { - conduit.setInputFilter(message.dir, filter); - } else { - conduit.setOutputFilter(message.dir, filter); - } - - return null; - } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java index 5bb248f6..778225d4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -1,10 +1,6 @@ package crazypants.enderio.conduit.gui.item; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; - import com.enderio.core.client.gui.button.ToggleButton; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; @@ -12,134 +8,148 @@ import crazypants.enderio.conduit.item.filter.PowerItemFilter; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; public class PowerItemFilterGui implements IItemFilterGui { - private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); + private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); - private static final int ID_MORE = GuiExternalConnection.nextButtonId(); - private static final int ID_LEVEL = GuiExternalConnection.nextButtonId(); + private static final int ID_MORE = GuiExternalConnection.nextButtonId(); + private static final int ID_LEVEL = GuiExternalConnection.nextButtonId(); - private final IItemConduit itemConduit; - private final GuiExternalConnection gui; + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; - private final ToggleButton stickyB; + private final ToggleButton stickyB; - private final GuiButton modeB; - private final GuiButton levelB; + private final GuiButton modeB; + private final GuiButton levelB; - private final boolean isInput; + private final boolean isInput; - private final PowerItemFilter filter; + private final PowerItemFilter filter; - public PowerItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - this.gui = gui; - this.itemConduit = itemConduit; - this.isInput = isInput; + public PowerItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + this.gui = gui; + this.itemConduit = itemConduit; + this.isInput = isInput; - if(isInput) { - filter = (PowerItemFilter) itemConduit.getInputFilter(gui.getDir()); - } else { - filter = (PowerItemFilter) itemConduit.getOutputFilter(gui.getDir()); + if (isInput) { + filter = (PowerItemFilter) itemConduit.getInputFilter(gui.getDir()); + } else { + filter = (PowerItemFilter) itemConduit.getOutputFilter(gui.getDir()); + } + + int butLeft = isInput ? 106 : 5; + int x = butLeft; + int y = 96 + 24; + + stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); + stickyB.setSelectedToolTip(lines); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setPaintSelectedBorder(false); + + modeB = new GuiButton(ID_MORE, 0, 0, 40, 20, ""); + levelB = new GuiButton(ID_LEVEL, 0, 0, 40, 20, ""); } - int butLeft = isInput ? 106 : 5; - int x = butLeft; - int y = 96 + 24; - - stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); - stickyB.setSelectedToolTip(lines); - stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); - stickyB.setPaintSelectedBorder(false); - - modeB = new GuiButton(ID_MORE, 0, 0, 40, 20, ""); - levelB = new GuiButton(ID_LEVEL, 0, 0, 40, 20, ""); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - x += gui.getGuiLeft(); - y += gui.getGuiTop(); - if(par3 == 1) { - Minecraft mc = Minecraft.getMinecraft(); - if (modeB.mousePressed(mc, x, y)) { - modeB.func_146113_a(mc.getSoundHandler()); - filter.setMode(filter.getMode().prev()); - sendFilterChange(); - } else if (levelB.mousePressed(mc, x, y)) { - levelB.func_146113_a(mc.getSoundHandler()); - filter.setLevel((filter.getLevel() + PowerItemFilter.MAX_LEVEL) % (PowerItemFilter.MAX_LEVEL + 1)); - sendFilterChange(); - } - } - } - - @Override - public void updateButtons() { - if(!isInput) { - stickyB.onGuiInit(); - stickyB.setSelected(filter.isSticky()); + @Override + public void mouseClicked(int x, int y, int par3) { + x += gui.getGuiLeft(); + y += gui.getGuiTop(); + if (par3 == 1) { + Minecraft mc = Minecraft.getMinecraft(); + if (modeB.mousePressed(mc, x, y)) { + modeB.func_146113_a(mc.getSoundHandler()); + filter.setMode(filter.getMode().prev()); + sendFilterChange(); + } else if (levelB.mousePressed(mc, x, y)) { + levelB.func_146113_a(mc.getSoundHandler()); + filter.setLevel((filter.getLevel() + PowerItemFilter.MAX_LEVEL) % (PowerItemFilter.MAX_LEVEL + 1)); + sendFilterChange(); + } + } } - int x0 = gui.getGuiLeft() + (isInput ? 106 : 5); - int y0 = gui.getGuiTop() + 96; - int x1 = x0 + 45; + @Override + public void updateButtons() { + if (!isInput) { + stickyB.onGuiInit(); + stickyB.setSelected(filter.isSticky()); + } - modeB.xPosition = x0; - modeB.yPosition = y0; + int x0 = gui.getGuiLeft() + (isInput ? 106 : 5); + int y0 = gui.getGuiTop() + 96; + int x1 = x0 + 45; - levelB.xPosition = x1; - levelB.yPosition = y0; + modeB.xPosition = x0; + modeB.yPosition = y0; - switch(filter.getMode()) { - case LESS: modeB.displayString = "<"; break; - case LESS_EQUAL: modeB.displayString = "<="; break; - case EQUAL: modeB.displayString = "="; break; - case MORE_EQUAL: modeB.displayString = ">="; break; - case MORE: modeB.displayString = ">"; break; - default: modeB.displayString = "??"; break; + levelB.xPosition = x1; + levelB.yPosition = y0; + + switch (filter.getMode()) { + case LESS: + modeB.displayString = "<"; + break; + case LESS_EQUAL: + modeB.displayString = "<="; + break; + case EQUAL: + modeB.displayString = "="; + break; + case MORE_EQUAL: + modeB.displayString = ">="; + break; + case MORE: + modeB.displayString = ">"; + break; + default: + modeB.displayString = "??"; + break; + } + + levelB.displayString = String.format("%d%%", filter.getLevel() * 100 / PowerItemFilter.MAX_LEVEL); + + gui.addButton(modeB); + gui.addButton(levelB); } - levelB.displayString = String.format("%d%%", filter.getLevel() * 100 / PowerItemFilter.MAX_LEVEL); - - gui.addButton(modeB); - gui.addButton(levelB); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - if(guiButton == stickyB) { - filter.setSticky(stickyB.isSelected()); - sendFilterChange(); - } else if(guiButton == modeB) { - filter.setMode(filter.getMode().next()); - sendFilterChange(); - } else if(guiButton == levelB) { - filter.setLevel((filter.getLevel() + 1) % (PowerItemFilter.MAX_LEVEL + 1)); - sendFilterChange(); + @Override + public void actionPerformed(GuiButton guiButton) { + if (guiButton == stickyB) { + filter.setSticky(stickyB.isSelected()); + sendFilterChange(); + } else if (guiButton == modeB) { + filter.setMode(filter.getMode().next()); + sendFilterChange(); + } else if (guiButton == levelB) { + filter.setLevel((filter.getLevel() + 1) % (PowerItemFilter.MAX_LEVEL + 1)); + sendFilterChange(); + } } - } - private void sendFilterChange() { - updateButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); - } + private void sendFilterChange() { + updateButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); + } - @Override - public void deactivate() { - stickyB.detach(); - gui.removeButton(modeB); - gui.removeButton(levelB); - } + @Override + public void deactivate() { + stickyB.detach(); + gui.removeButton(modeB); + gui.removeButton(levelB); + } - @Override - public void renderCustomOptions(int top, float par1, int par2, int par3) { -// GL11.glColor3f(1, 1, 1); -// RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); -// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); -// if(filter.isAdvanced()) { -// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); -// } - } + @Override + public void renderCustomOptions(int top, float par1, int par2, int par3) { + // GL11.glColor3f(1, 1, 1); + // RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); + // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); + // if(filter.isAdvanced()) { + // gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); + // } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java index b218307f..ca3c5c9b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java +++ b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java @@ -1,106 +1,105 @@ package crazypants.enderio.conduit.item; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.ByteBufUtils; import crazypants.enderio.Log; import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class FilterRegister { - public static boolean isItemFilter(ItemStack stack) { - return stack != null && (stack.getItem() instanceof IItemFilterUpgrade); - } - - public static IItemFilter getFilterForUpgrade(ItemStack stack) { - if(!isItemFilter(stack)) { - return null; + public static boolean isItemFilter(ItemStack stack) { + return stack != null && (stack.getItem() instanceof IItemFilterUpgrade); } - IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem(); - IItemFilter res = upgrade.createFilterFromStack(stack); - return res; - } - public static boolean isFilterSet(ItemStack stack) { - return stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter"); - } + public static IItemFilter getFilterForUpgrade(ItemStack stack) { + if (!isItemFilter(stack)) { + return null; + } + IItemFilterUpgrade upgrade = (IItemFilterUpgrade) stack.getItem(); + IItemFilter res = upgrade.createFilterFromStack(stack); + return res; + } - public static void writeFilterToStack(IItemFilter filter, ItemStack stack) { - if(stack == null || filter == null) { - return; + public static boolean isFilterSet(ItemStack stack) { + return stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter"); } - NBTTagCompound filterRoot = new NBTTagCompound(); - writeFilterToNbt(filter, filterRoot); - if(stack.stackTagCompound == null) { - stack.stackTagCompound = new NBTTagCompound(); - } - stack.stackTagCompound.setTag("filter", filterRoot); - } - - public static void writeFilterToNbt(IItemFilter filter, NBTTagCompound filterTag) { - filterTag.setString("filterClass", filter.getClass().getName()); - filter.writeToNBT(filterTag); - } - public static IItemFilter loadFilterFromNbt(NBTTagCompound filterTag) { - if(filterTag == null) { - return null; + public static void writeFilterToStack(IItemFilter filter, ItemStack stack) { + if (stack == null || filter == null) { + return; + } + NBTTagCompound filterRoot = new NBTTagCompound(); + writeFilterToNbt(filter, filterRoot); + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + } + stack.stackTagCompound.setTag("filter", filterRoot); } - IItemFilter filter; - //legacy support for release where class names where not stored - if(!filterTag.hasKey("filterClass")) { - filter = null; - Log.warn("Could not load old version of item filter."); - } else { - String className = filterTag.getString("filterClass"); - filter = loadFilterFromNbt(className, filterTag); - } - return filter; - } - - private static IItemFilter loadFilterFromNbt(String className, NBTTagCompound tag) { - try { - Class clz = Class.forName(className); - IItemFilter filter = (IItemFilter) clz.newInstance(); - filter.readFromNBT(tag); - return filter; - } catch (Exception e) { - Log.error("Could not read item filter with class name: " + className + " from NBT: " + tag + " Error: " + e); - return null; + public static void writeFilterToNbt(IItemFilter filter, NBTTagCompound filterTag) { + filterTag.setString("filterClass", filter.getClass().getName()); + filter.writeToNBT(filterTag); } - } - private static IItemFilter loadFilterFromByteBuf(String className, ByteBuf buf) { - try { - Class clz = Class.forName(className); - IItemFilter filter = (IItemFilter) clz.newInstance(); - filter.readFromByteBuf(buf); - return filter; - } catch (Exception e) { - Log.error("Could not read item filter with class name: " + className + " from ByteBuf Error: " + e); - return null; + public static IItemFilter loadFilterFromNbt(NBTTagCompound filterTag) { + if (filterTag == null) { + return null; + } + IItemFilter filter; + // legacy support for release where class names where not stored + if (!filterTag.hasKey("filterClass")) { + filter = null; + Log.warn("Could not load old version of item filter."); + } else { + String className = filterTag.getString("filterClass"); + filter = loadFilterFromNbt(className, filterTag); + } + return filter; } - } - public static void writeFilter(ByteBuf buf, IItemFilter filter) { - if(filter == null) { - ByteBufUtils.writeUTF8String(buf, "nullFilter"); - return; + private static IItemFilter loadFilterFromNbt(String className, NBTTagCompound tag) { + try { + Class clz = Class.forName(className); + IItemFilter filter = (IItemFilter) clz.newInstance(); + filter.readFromNBT(tag); + return filter; + } catch (Exception e) { + Log.error( + "Could not read item filter with class name: " + className + " from NBT: " + tag + " Error: " + e); + return null; + } } - String name = filter.getClass().getName(); - ByteBufUtils.writeUTF8String(buf, name); - filter.writeToByteBuf(buf); - } - public static IItemFilter readFilter(ByteBuf buf) { - String className = ByteBufUtils.readUTF8String(buf); - if(className.equals("nullFilter")) { - return null; + private static IItemFilter loadFilterFromByteBuf(String className, ByteBuf buf) { + try { + Class clz = Class.forName(className); + IItemFilter filter = (IItemFilter) clz.newInstance(); + filter.readFromByteBuf(buf); + return filter; + } catch (Exception e) { + Log.error("Could not read item filter with class name: " + className + " from ByteBuf Error: " + e); + return null; + } } - return loadFilterFromByteBuf(className, buf); - } + public static void writeFilter(ByteBuf buf, IItemFilter filter) { + if (filter == null) { + ByteBufUtils.writeUTF8String(buf, "nullFilter"); + return; + } + String name = filter.getClass().getName(); + ByteBufUtils.writeUTF8String(buf, name); + filter.writeToByteBuf(buf); + } + + public static IItemFilter readFilter(ByteBuf buf) { + String className = ByteBufUtils.readUTF8String(buf); + if (className.equals("nullFilter")) { + return null; + } + return loadFilterFromByteBuf(className, buf); + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/FunctionUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/FunctionUpgrade.java index d4a8a90e..7e7d4187 100644 --- a/src/main/java/crazypants/enderio/conduit/item/FunctionUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/FunctionUpgrade.java @@ -1,16 +1,15 @@ package crazypants.enderio.conduit.item; public enum FunctionUpgrade { + INVENTORY_PANEL("enderio:inventoryPanelUpgrade", "item.itemInventoryPanelUpgrade", 1); - INVENTORY_PANEL("enderio:inventoryPanelUpgrade", "item.itemInventoryPanelUpgrade", 1); + public final String iconName; + public final String unlocName; + public final int maxStackSize; - public final String iconName; - public final String unlocName; - public final int maxStackSize; - - private FunctionUpgrade(String iconName, String unlocName, int maxStackSize) { - this.iconName = iconName; - this.unlocName = unlocName; - this.maxStackSize = maxStackSize; - } + private FunctionUpgrade(String iconName, String unlocName, int maxStackSize) { + this.iconName = iconName; + this.unlocName = unlocName; + this.maxStackSize = maxStackSize; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java index 21c04049..b08184e0 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -1,85 +1,82 @@ package crazypants.enderio.conduit.item; +import cofh.api.transport.IItemDuct; +import com.enderio.core.common.util.DyeColor; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IExtractor; +import crazypants.enderio.conduit.item.filter.IItemFilter; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.transport.IItemDuct; - -import com.enderio.core.common.util.DyeColor; - -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IExtractor; -import crazypants.enderio.conduit.item.filter.IItemFilter; public interface IItemConduit extends IConduit, IItemDuct, IExtractor { - IIcon getTextureForInputMode(); + IIcon getTextureForInputMode(); - IIcon getTextureForOutputMode(); + IIcon getTextureForOutputMode(); - IIcon getTextureForInOutMode(boolean inputComponent); + IIcon getTextureForInOutMode(boolean inputComponent); - IIcon getTextureForInOutBackground(); + IIcon getTextureForInOutBackground(); - IIcon getEnderIcon(); + IIcon getEnderIcon(); - IInventory getExternalInventory(ForgeDirection direction); + IInventory getExternalInventory(ForgeDirection direction); - int getMaximumExtracted(ForgeDirection direction); + int getMaximumExtracted(ForgeDirection direction); - float getTickTimePerItem(ForgeDirection direction); + float getTickTimePerItem(ForgeDirection direction); - void itemsExtracted(int numInserted, int slot); - - void setInputFilterUpgrade(ForgeDirection dir, ItemStack stack); + void itemsExtracted(int numInserted, int slot); - void setOutputFilterUpgrade(ForgeDirection dir, ItemStack stack); + void setInputFilterUpgrade(ForgeDirection dir, ItemStack stack); - ItemStack getInputFilterUpgrade(ForgeDirection dir); + void setOutputFilterUpgrade(ForgeDirection dir, ItemStack stack); - ItemStack getOutputFilterUpgrade(ForgeDirection dir); + ItemStack getInputFilterUpgrade(ForgeDirection dir); - void setInputFilter(ForgeDirection dir, IItemFilter filter); + ItemStack getOutputFilterUpgrade(ForgeDirection dir); - void setOutputFilter(ForgeDirection dir, IItemFilter filter); + void setInputFilter(ForgeDirection dir, IItemFilter filter); - IItemFilter getInputFilter(ForgeDirection dir); + void setOutputFilter(ForgeDirection dir, IItemFilter filter); - IItemFilter getOutputFilter(ForgeDirection dir); - - void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade); - - ItemStack getSpeedUpgrade(ForgeDirection dir); + IItemFilter getInputFilter(ForgeDirection dir); - void setFunctionUpgrade(ForgeDirection dir, ItemStack upgrade); + IItemFilter getOutputFilter(ForgeDirection dir); - ItemStack getFunctionUpgrade(ForgeDirection dir); + void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade); - boolean hasInventoryPanelUpgrade(ForgeDirection dir); + ItemStack getSpeedUpgrade(ForgeDirection dir); - int getOutputPriority(ForgeDirection dir); - - void setOutputPriority(ForgeDirection dir, int priority); + void setFunctionUpgrade(ForgeDirection dir, ItemStack upgrade); - int getMetaData(); + ItemStack getFunctionUpgrade(ForgeDirection dir); - boolean isExtractionRedstoneConditionMet(ForgeDirection dir); + boolean hasInventoryPanelUpgrade(ForgeDirection dir); - boolean isSelfFeedEnabled(ForgeDirection dir); + int getOutputPriority(ForgeDirection dir); - void setSelfFeedEnabled(ForgeDirection dir, boolean enabled); - - boolean isRoundRobinEnabled(ForgeDirection dir); - - void setRoundRobinEnabled(ForgeDirection dir, boolean enabled); + void setOutputPriority(ForgeDirection dir, int priority); - DyeColor getInputColor(ForgeDirection dir); + int getMetaData(); - DyeColor getOutputColor(ForgeDirection dir); + boolean isExtractionRedstoneConditionMet(ForgeDirection dir); - void setInputColor(ForgeDirection dir, DyeColor col); + boolean isSelfFeedEnabled(ForgeDirection dir); - void setOutputColor(ForgeDirection dir, DyeColor col); + void setSelfFeedEnabled(ForgeDirection dir, boolean enabled); + boolean isRoundRobinEnabled(ForgeDirection dir); + + void setRoundRobinEnabled(ForgeDirection dir, boolean enabled); + + DyeColor getInputColor(ForgeDirection dir); + + DyeColor getOutputColor(ForgeDirection dir); + + void setInputColor(ForgeDirection dir, DyeColor col); + + void setOutputColor(ForgeDirection dir, DyeColor col); } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 65d47e86..895bbf99 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -1,28 +1,9 @@ package crazypants.enderio.conduit.item; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.inventory.IInventoryConnection; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -37,860 +18,893 @@ import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.item.PacketConduitProbe; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class ItemConduit extends AbstractConduit implements IItemConduit { - public static final String EXTERNAL_INTERFACE_GEOM = "ExternalInterface"; + public static final String EXTERNAL_INTERFACE_GEOM = "ExternalInterface"; - public static final String ICON_KEY = "enderio:itemConduit"; + public static final String ICON_KEY = "enderio:itemConduit"; - public static final String ICON_KEY_CORE = "enderio:itemConduitCore"; + public static final String ICON_KEY_CORE = "enderio:itemConduitCore"; - public static final String ICON_KEY_CORE_ADV = "enderio:itemConduitCoreAdvanced"; + public static final String ICON_KEY_CORE_ADV = "enderio:itemConduitCoreAdvanced"; - public static final String ICON_KEY_INPUT = "enderio:itemConduitInput"; + public static final String ICON_KEY_INPUT = "enderio:itemConduitInput"; - public static final String ICON_KEY_OUTPUT = "enderio:itemConduitOutput"; + public static final String ICON_KEY_OUTPUT = "enderio:itemConduitOutput"; - public static final String ICON_KEY_IN_OUT_OUT = "enderio:itemConduitInOut_Out"; + public static final String ICON_KEY_IN_OUT_OUT = "enderio:itemConduitInOut_Out"; - public static final String ICON_KEY_IN_OUT_IN = "enderio:itemConduitInOut_In"; + public static final String ICON_KEY_IN_OUT_IN = "enderio:itemConduitInOut_In"; - public static final String ICON_KEY_IN_OUT_BG = "enderio:itemConduitIoConnector"; + public static final String ICON_KEY_IN_OUT_BG = "enderio:itemConduitIoConnector"; - public static final String ICON_KEY_ENDER = "enderio:ender_still"; + public static final String ICON_KEY_ENDER = "enderio:ender_still"; - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); - ICONS.put(ICON_KEY_CORE, register.registerIcon(ICON_KEY_CORE)); - ICONS.put(ICON_KEY_CORE_ADV, register.registerIcon(ICON_KEY_CORE_ADV)); - ICONS.put(ICON_KEY_INPUT, register.registerIcon(ICON_KEY_INPUT)); - ICONS.put(ICON_KEY_OUTPUT, register.registerIcon(ICON_KEY_OUTPUT)); - ICONS.put(ICON_KEY_IN_OUT_OUT, register.registerIcon(ICON_KEY_IN_OUT_OUT)); - ICONS.put(ICON_KEY_IN_OUT_IN, register.registerIcon(ICON_KEY_IN_OUT_IN)); - ICONS.put(ICON_KEY_IN_OUT_BG, register.registerIcon(ICON_KEY_IN_OUT_BG)); - ICONS.put(ICON_KEY_ENDER, register.registerIcon(ICON_KEY_ENDER)); - } - - @Override - public int getTextureType() { - return 0; - } - - }); - } - - ItemConduitNetwork network; - - protected final EnumMap extractionModes = new EnumMap(ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap(ForgeDirection.class); - - protected final EnumMap outputFilters = new EnumMap(ForgeDirection.class); - protected final EnumMap inputFilters = new EnumMap(ForgeDirection.class); - protected final EnumMap outputFilterUpgrades = new EnumMap(ForgeDirection.class); - protected final EnumMap inputFilterUpgrades = new EnumMap(ForgeDirection.class); - protected final EnumMap speedUpgrades = new EnumMap(ForgeDirection.class); - protected final EnumMap functionUpgrades = new EnumMap(ForgeDirection.class); - - protected final EnumMap selfFeed = new EnumMap(ForgeDirection.class); - - protected final EnumMap roundRobin = new EnumMap(ForgeDirection.class); - - protected final EnumMap priority = new EnumMap(ForgeDirection.class); - - protected final EnumMap outputColors = new EnumMap(ForgeDirection.class); - protected final EnumMap inputColors = new EnumMap(ForgeDirection.class); - - private int metaData; - - public ItemConduit() { - this(0); - } - - public ItemConduit(int itemDamage) { - metaData = itemDamage; - updateFromNonUpgradeableVersion(); - } - - private void updateFromNonUpgradeableVersion() { - int filterMeta = metaData; - if(metaData == 1) { - - for (Entry entry : inputFilters.entrySet()) { - if(entry.getValue() != null) { - IItemFilter f = entry.getValue(); - if(f != null) { - setSpeedUpgrade(entry.getKey(), new ItemStack(EnderIO.itemExtractSpeedUpgrade, 15, 0)); - } - } - } - - metaData = 0; - } - - Map converted = new HashMap(); - - convertToItemUpgrades(filterMeta, converted, inputFilters); - for (Entry entry : converted.entrySet()) { - setInputFilter(entry.getKey(), null); - setInputFilterUpgrade(entry.getKey(), entry.getValue()); - } - - converted.clear(); - convertToItemUpgrades(filterMeta, converted, outputFilters); - for (Entry entry : converted.entrySet()) { - setOutputFilter(entry.getKey(), null); - setOutputFilterUpgrade(entry.getKey(), entry.getValue()); - } - - - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); - setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); - setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); - setSelfFeedEnabled(dir, dataRoot.getBoolean("selfFeed")); - setRoundRobinEnabled(dir, dataRoot.getBoolean("roundRobin")); - setOutputPriority(dir, dataRoot.getInteger("outputPriority")); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); - dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); - dataRoot.setShort("inputColor", (short)getInputColor(dir).ordinal()); - dataRoot.setShort("outputColor", (short)getOutputColor(dir).ordinal()); - dataRoot.setBoolean("selfFeed", isSelfFeedEnabled(dir)); - dataRoot.setBoolean("roundRobin", isRoundRobinEnabled(dir)); - dataRoot.setInteger("outputPriority", getOutputPriority(dir)); - } - - protected void convertToItemUpgrades(int filterMeta, Map converted, EnumMap sourceFilters) { - for (Entry entry : sourceFilters.entrySet()) { - if(entry.getValue() != null) { - IItemFilter f = entry.getValue(); - ItemStack up = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, filterMeta); - FilterRegister.writeFilterToStack(f, up); - converted.put(entry.getKey(), up); - } - } - } - - @Override - public List getDrops() { - List res = new ArrayList(); - res.add(createItem()); - for (ItemStack stack : speedUpgrades.values()) { - res.add(stack); - } - for (ItemStack stack : functionUpgrades.values()) { - res.add(stack); - } - for (ItemStack stack : inputFilterUpgrades.values()) { - res.add(stack); - } - for (ItemStack stack : outputFilterUpgrades.values()) { - res.add(stack); - } - return res; - } - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(ConduitUtil.isProbeEquipped(player)) { - if(!player.worldObj.isRemote) { - PacketConduitProbe.sendInfoMessage(player, this, null); - } - return true; - } else if(ToolUtil.isToolEquipped(player)) { - if(!getBundle().getEntity().getWorldObj().isRemote) { - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); + ICONS.put(ICON_KEY_CORE, register.registerIcon(ICON_KEY_CORE)); + ICONS.put(ICON_KEY_CORE_ADV, register.registerIcon(ICON_KEY_CORE_ADV)); + ICONS.put(ICON_KEY_INPUT, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT, register.registerIcon(ICON_KEY_OUTPUT)); + ICONS.put(ICON_KEY_IN_OUT_OUT, register.registerIcon(ICON_KEY_IN_OUT_OUT)); + ICONS.put(ICON_KEY_IN_OUT_IN, register.registerIcon(ICON_KEY_IN_OUT_IN)); + ICONS.put(ICON_KEY_IN_OUT_BG, register.registerIcon(ICON_KEY_IN_OUT_BG)); + ICONS.put(ICON_KEY_ENDER, register.registerIcon(ICON_KEY_ENDER)); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + ItemConduitNetwork network; + + protected final EnumMap extractionModes = + new EnumMap(ForgeDirection.class); + protected final EnumMap extractionColors = + new EnumMap(ForgeDirection.class); + + protected final EnumMap outputFilters = + new EnumMap(ForgeDirection.class); + protected final EnumMap inputFilters = + new EnumMap(ForgeDirection.class); + protected final EnumMap outputFilterUpgrades = + new EnumMap(ForgeDirection.class); + protected final EnumMap inputFilterUpgrades = + new EnumMap(ForgeDirection.class); + protected final EnumMap speedUpgrades = + new EnumMap(ForgeDirection.class); + protected final EnumMap functionUpgrades = + new EnumMap(ForgeDirection.class); + + protected final EnumMap selfFeed = + new EnumMap(ForgeDirection.class); + + protected final EnumMap roundRobin = + new EnumMap(ForgeDirection.class); + + protected final EnumMap priority = + new EnumMap(ForgeDirection.class); + + protected final EnumMap outputColors = + new EnumMap(ForgeDirection.class); + protected final EnumMap inputColors = + new EnumMap(ForgeDirection.class); + + private int metaData; + + public ItemConduit() { + this(0); + } + + public ItemConduit(int itemDamage) { + metaData = itemDamage; + updateFromNonUpgradeableVersion(); + } + + private void updateFromNonUpgradeableVersion() { + int filterMeta = metaData; + if (metaData == 1) { + + for (Entry entry : inputFilters.entrySet()) { + if (entry.getValue() != null) { + IItemFilter f = entry.getValue(); + if (f != null) { + setSpeedUpgrade(entry.getKey(), new ItemStack(EnderIO.itemExtractSpeedUpgrade, 15, 0)); + } + } + } + + metaData = 0; + } + + Map converted = new HashMap(); + + convertToItemUpgrades(filterMeta, converted, inputFilters); + for (Entry entry : converted.entrySet()) { + setInputFilter(entry.getKey(), null); + setInputFilterUpgrade(entry.getKey(), entry.getValue()); + } + + converted.clear(); + convertToItemUpgrades(filterMeta, converted, outputFilters); + for (Entry entry : converted.entrySet()) { + setOutputFilter(entry.getKey(), null); + setOutputFilterUpgrade(entry.getKey(), entry.getValue()); + } + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); + setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); + setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); + setSelfFeedEnabled(dir, dataRoot.getBoolean("selfFeed")); + setRoundRobinEnabled(dir, dataRoot.getBoolean("roundRobin")); + setOutputPriority(dir, dataRoot.getInteger("outputPriority")); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort( + "extractionSignalColor", (short) getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort( + "extractionRedstoneMode", (short) getExtractionRedstoneMode(dir).ordinal()); + dataRoot.setShort("inputColor", (short) getInputColor(dir).ordinal()); + dataRoot.setShort("outputColor", (short) getOutputColor(dir).ordinal()); + dataRoot.setBoolean("selfFeed", isSelfFeedEnabled(dir)); + dataRoot.setBoolean("roundRobin", isRoundRobinEnabled(dir)); + dataRoot.setInteger("outputPriority", getOutputPriority(dir)); + } + + protected void convertToItemUpgrades( + int filterMeta, + Map converted, + EnumMap sourceFilters) { + for (Entry entry : sourceFilters.entrySet()) { + if (entry.getValue() != null) { + IItemFilter f = entry.getValue(); + ItemStack up = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, filterMeta); + FilterRegister.writeFilterToStack(f, up); + converted.put(entry.getKey(), up); + } + } + } + + @Override + public List getDrops() { + List res = new ArrayList(); + res.add(createItem()); + for (ItemStack stack : speedUpgrades.values()) { + res.add(stack); + } + for (ItemStack stack : functionUpgrades.values()) { + res.add(stack); + } + for (ItemStack stack : inputFilterUpgrades.values()) { + res.add(stack); + } + for (ItemStack stack : outputFilterUpgrades.values()) { + res.add(stack); + } + return res; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (ConduitUtil.isProbeEquipped(player)) { + if (!player.worldObj.isRemote) { + PacketConduitProbe.sendInfoMessage(player, this, null); } - // Attempt to join networks - return ConduitUtil.joinConduits(this, faceHit); - } else if(externalConnections.contains(connDir)) { - setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; - } else if(containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); - return true; - } + } else if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + // Attempt to join networks + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + return true; + } + } + } + } else { + + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + if (connDir != null && connDir != ForgeDirection.UNKNOWN && containsExternalConnection(connDir)) { + if (!player.worldObj.isRemote) { + PacketConduitProbe.sendInfoMessage(player, this, player.getCurrentEquippedItem()); + } + return true; + } + } } - } - } else { + return false; + } - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - if(connDir != null && connDir != ForgeDirection.UNKNOWN && containsExternalConnection(connDir)) { - if(!player.worldObj.isRemote) { - PacketConduitProbe.sendInfoMessage(player, this, player.getCurrentEquippedItem()); - } - return true; + @Override + public ItemStack insertItem(ForgeDirection from, ItemStack item) { + if (!externalConnections.contains(from)) { + return item; + } else if (!getConnectionMode(from).acceptsInput()) { + return item; + } else if (network == null) { + return item; + } else { + IItemFilter filter = inputFilters.get(from); + ItemConduitNetwork network = (ItemConduitNetwork) getNetwork(); + if (filter != null && !filter.doesItemPassFilter(network.getInventory(this, from.getOpposite()), item)) { + return item; + } } - } - - } - return false; - } - - @Override - public ItemStack insertItem(ForgeDirection from, ItemStack item) { - if(!externalConnections.contains(from)) { - return item; - } else if(!getConnectionMode(from).acceptsInput()) { - return item; - } else if(network == null) { - return item; - } else { - IItemFilter filter = inputFilters.get(from); - ItemConduitNetwork network = (ItemConduitNetwork) getNetwork(); - if(filter != null && !filter.doesItemPassFilter(network.getInventory(this, from.getOpposite()), item)) { - return item; - } - } - return network.sendItems(this, item, from); - } - - @Override - public void setInputFilter(ForgeDirection dir, IItemFilter filter) { - inputFilters.put(dir, filter); - if(network != null) { - network.routesChanged(); - } - setClientStateDirty(); - } - - @Override - public void setOutputFilter(ForgeDirection dir, IItemFilter filter) { - outputFilters.put(dir, filter); - if(network != null) { - network.routesChanged(); - } - setClientStateDirty(); - } - - @Override - public IItemFilter getInputFilter(ForgeDirection dir) { - return inputFilters.get(dir); - } - - @Override - public IItemFilter getOutputFilter(ForgeDirection dir) { - return outputFilters.get(dir); - } - - @Override - public void setInputFilterUpgrade(ForgeDirection dir, ItemStack stack) { - inputFilterUpgrades.put(dir, stack); - setInputFilter(dir, FilterRegister.getFilterForUpgrade(stack)); - setClientStateDirty(); - } - - @Override - public void setOutputFilterUpgrade(ForgeDirection dir, ItemStack stack) { - outputFilterUpgrades.put(dir, stack); - setOutputFilter(dir, FilterRegister.getFilterForUpgrade(stack)); - setClientStateDirty(); - } - - @Override - public ItemStack getInputFilterUpgrade(ForgeDirection dir) { - return inputFilterUpgrades.get(dir); - } - - @Override - public ItemStack getOutputFilterUpgrade(ForgeDirection dir) { - return outputFilterUpgrades.get(dir); - } - - @Override - public void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade) { - if(upgrade != null) { - speedUpgrades.put(dir, upgrade); - } else { - speedUpgrades.remove(dir); - } - setClientStateDirty(); - } - - @Override - public ItemStack getSpeedUpgrade(ForgeDirection dir) { - return speedUpgrades.get(dir); - } - - @Override - public void setFunctionUpgrade(ForgeDirection dir, ItemStack upgrade) { - boolean hadIPU = hasInventoryPanelUpgrade(dir); - if(upgrade != null) { - functionUpgrades.put(dir, upgrade); - } else { - functionUpgrades.remove(dir); - } - setClientStateDirty(); - if(network != null && hadIPU != hasInventoryPanelUpgrade(dir)) { - network.inventoryPanelSourcesChanged(); - } - } - - @Override - public ItemStack getFunctionUpgrade(ForgeDirection dir) { - return functionUpgrades.get(dir); - } - - @Override - public boolean hasInventoryPanelUpgrade(ForgeDirection dir) { - ItemStack upgrade = functionUpgrades.get(dir); - return upgrade != null && EnderIO.itemFunctionUpgrade.getFunctionUpgrade(upgrade) == FunctionUpgrade.INVENTORY_PANEL; - } - - @Override - public int getMetaData() { - return metaData; - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - extractionModes.put(dir, mode); - } - - @Override - public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { - RedstoneControlMode res = extractionModes.get(dir); - if(res == null) { - res = RedstoneControlMode.ON; - } - return res; - } - - @Override - public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { - extractionColors.put(dir, col); - } - - @Override - public DyeColor getExtractionSignalColor(ForgeDirection dir) { - DyeColor result = extractionColors.get(dir); - if(result == null) { - return DyeColor.RED; - } - return result; - } - - @Override - public boolean isExtractionRedstoneConditionMet(ForgeDirection dir) { - RedstoneControlMode mode = getExtractionRedstoneMode(dir); - if(mode == null) { - return true; - } - return ConduitUtil.isRedstoneControlModeMet(getBundle(), mode, getExtractionSignalColor(dir)); - } - - @Override - public DyeColor getInputColor(ForgeDirection dir) { - DyeColor result = inputColors.get(dir); - if(result == null) { - return DyeColor.GREEN; - } - return result; - } - - @Override - public DyeColor getOutputColor(ForgeDirection dir) { - DyeColor result = outputColors.get(dir); - if(result == null) { - return DyeColor.GREEN; - } - return result; - } - - @Override - public void setInputColor(ForgeDirection dir, DyeColor col) { - inputColors.put(dir, col); - if(network != null) { - network.routesChanged(); - } - setClientStateDirty(); - collidablesDirty = true; - } - - @Override - public void setOutputColor(ForgeDirection dir, DyeColor col) { - outputColors.put(dir, col); - if(network != null) { - network.routesChanged(); - } - setClientStateDirty(); - collidablesDirty = true; - } - - @Override - public int getMaximumExtracted(ForgeDirection dir) { - ItemStack stack = speedUpgrades.get(dir); - if(stack == null) { - return SpeedUpgrade.BASE_MAX_EXTRACTED; - } - SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(stack); - return speedUpgrade.getMaximumExtracted(stack.stackSize); - } - - @Override - public float getTickTimePerItem(ForgeDirection dir) { - float maxExtract = 10f / getMaximumExtracted(dir); - return maxExtract; - } - - @Override - public void itemsExtracted(int numExtracted, int slot) { - } - - @Override - public void externalConnectionAdded(ForgeDirection direction) { - super.externalConnectionAdded(direction); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.inventoryAdded(this, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, - getExternalInventory(direction)); - } - } - - @Override - public IInventory getExternalInventory(ForgeDirection direction) { - World world = getBundle().getWorld(); - if(world == null) { - return null; - } - BlockCoord loc = getLocation().getLocation(direction); - TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); - if(te instanceof IInventory && !(te instanceof IConduitBundle)) { - return (IInventory) te; - } - return null; - } - - @Override - public void externalConnectionRemoved(ForgeDirection direction) { - externalConnections.remove(direction); - connectionsChanged(); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.inventoryRemoved(this, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); - } - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - ConnectionMode oldVal = conectionModes.get(dir); - if(oldVal == mode) { - return; - } - super.setConnectionMode(dir, mode); - if(network != null) { - network.routesChanged(); - } - } - - @Override - public boolean isSelfFeedEnabled(ForgeDirection dir) { - Boolean val = selfFeed.get(dir); - if(val == null) { - return false; - } - return val; - } - - @Override - public void setSelfFeedEnabled(ForgeDirection dir, boolean enabled) { - if(!enabled) { - selfFeed.remove(dir); - } else { - selfFeed.put(dir, enabled); - } - if(network != null) { - network.routesChanged(); - } - } - - @Override - public boolean isRoundRobinEnabled(ForgeDirection dir) { - Boolean val = roundRobin.get(dir); - if(val == null) { - return false; - } - return val; - } - - @Override - public void setRoundRobinEnabled(ForgeDirection dir, boolean enabled) { - if(!enabled) { - roundRobin.remove(dir); - } else { - roundRobin.put(dir, enabled); - } - if(network != null) { - network.routesChanged(); - } - } - - @Override - public int getOutputPriority(ForgeDirection dir) { - Integer res = priority.get(dir); - if(res == null) { - return 0; - } - return res.intValue(); - } - - @Override - public void setOutputPriority(ForgeDirection dir, int priority) { - if(priority == 0) { - this.priority.remove(dir); - } else { - this.priority.put(dir, priority); - } - if(network != null) { - network.routesChanged(); + return network.sendItems(this, item, from); } - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - IInventory inv = getExternalInventory(direction); - if (inv==null) return false; - else if (inv instanceof IInventoryConnection){ - return ((IInventoryConnection)inv).canConnectInventory(direction.getOpposite()).canConnect; - } - else if(inv instanceof ISidedInventory) { - int[] slots = ((ISidedInventory) inv).getAccessibleSlotsFromSide(direction.getOpposite().ordinal()); - return slots!=null && slots.length>0; - } else { - return true; - } - } - - @Override - protected ConnectionMode getDefaultConnectionMode() { - return ConnectionMode.INPUT; - } - - @Override - public Class getBaseConduitType() { - return IItemConduit.class; - } - - @Override - public ItemStack createItem() { - ItemStack result = new ItemStack(EnderIO.itemItemConduit, 1, metaData); - return result; - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - this.network = (ItemConduitNetwork) network; - return true; - } - - @Override - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_KEY_INPUT); - } - - @Override - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_KEY_OUTPUT); - } - - @Override - public IIcon getTextureForInOutMode(boolean input) { - return input ? ICONS.get(ICON_KEY_IN_OUT_IN) : ICONS.get(ICON_KEY_IN_OUT_OUT); - } - - @Override - public IIcon getTextureForInOutBackground() { - return ICONS.get(ICON_KEY_IN_OUT_BG); - } - - @Override - public IIcon getEnderIcon() { - return ICONS.get(ICON_KEY_ENDER); - } - - public IIcon getCoreIcon() { - return metaData == 1 ? ICONS.get(ICON_KEY_CORE_ADV) : ICONS.get(ICON_KEY_CORE); - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return getCoreIcon(); - } - if(EXTERNAL_INTERFACE_GEOM.equals(component.data)) { - return getCoreIcon(); - } - return ICONS.get(ICON_KEY); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return getEnderIcon(); - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - - for (Entry entry : inputFilters.entrySet()) { - if(entry.getValue() != null) { - IItemFilter f = entry.getValue(); - if(!isDefault(f)) { - NBTTagCompound itemRoot = new NBTTagCompound(); - FilterRegister.writeFilterToNbt(f, itemRoot); - nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot); - } - } - } - - for (Entry entry : speedUpgrades.entrySet()) { - if(entry.getValue() != null) { - ItemStack up = entry.getValue(); - NBTTagCompound itemRoot = new NBTTagCompound(); - up.writeToNBT(itemRoot); - nbtRoot.setTag("speedUpgrades." + entry.getKey().name(), itemRoot); - } - } - - for (Entry entry : functionUpgrades.entrySet()) { - if(entry.getValue() != null) { - ItemStack up = entry.getValue(); - NBTTagCompound itemRoot = new NBTTagCompound(); - up.writeToNBT(itemRoot); - nbtRoot.setTag("functionUpgrades." + entry.getKey().name(), itemRoot); - } - } - - for (Entry entry : outputFilters.entrySet()) { - if(entry.getValue() != null) { - IItemFilter f = entry.getValue(); - if(!isDefault(f)) { - NBTTagCompound itemRoot = new NBTTagCompound(); - FilterRegister.writeFilterToNbt(f, itemRoot); - nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot); - } - } - } - - for (Entry entry : inputFilterUpgrades.entrySet()) { - if(entry.getValue() != null) { - ItemStack up = entry.getValue(); - IItemFilter filter = getInputFilter(entry.getKey()); - FilterRegister.writeFilterToStack(filter, up); - - NBTTagCompound itemRoot = new NBTTagCompound(); - up.writeToNBT(itemRoot); - nbtRoot.setTag("inputFilterUpgrades." + entry.getKey().name(), itemRoot); - } - } - - for (Entry entry : outputFilterUpgrades.entrySet()) { - if(entry.getValue() != null) { - ItemStack up = entry.getValue(); - IItemFilter filter = getOutputFilter(entry.getKey()); - FilterRegister.writeFilterToStack(filter, up); - - NBTTagCompound itemRoot = new NBTTagCompound(); - up.writeToNBT(itemRoot); - nbtRoot.setTag("outputFilterUpgrades." + entry.getKey().name(), itemRoot); - } - } - - for (Entry entry : extractionModes.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extRM." + entry.getKey().name(), ord); - } - } - - for (Entry entry : extractionColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extSC." + entry.getKey().name(), ord); - } - } - - for (Entry entry : selfFeed.entrySet()) { - if(entry.getValue() != null) { - nbtRoot.setBoolean("selfFeed." + entry.getKey().name(), entry.getValue()); - } - } - - for (Entry entry : roundRobin.entrySet()) { - if(entry.getValue() != null) { - nbtRoot.setBoolean("roundRobin." + entry.getKey().name(), entry.getValue()); - } - } - - for (Entry entry : priority.entrySet()) { - if(entry.getValue() != null) { - nbtRoot.setInteger("priority." + entry.getKey().name(), entry.getValue()); - } - } - - for (Entry entry : inputColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("inSC." + entry.getKey().name(), ord); - } - } - - for (Entry entry : outputColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("outSC." + entry.getKey().name(), ord); - } - } - - } - - private boolean isDefault(IItemFilter f) { - if(f instanceof ItemFilter) { - return ((ItemFilter) f).isDefault(); - } - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - - if(nbtRoot.hasKey("metaData")) { - metaData = nbtRoot.getShort("metaData"); - } else { - metaData = 0; - } - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - - String key = "inFilts." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); - IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag); + @Override + public void setInputFilter(ForgeDirection dir, IItemFilter filter) { inputFilters.put(dir, filter); - } + if (network != null) { + network.routesChanged(); + } + setClientStateDirty(); + } - key = "speedUpgrades." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); - ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); - speedUpgrades.put(dir, ups); - } - - key = "functionUpgrades." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); - ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); - functionUpgrades.put(dir, ups); - } - - key = "inputFilterUpgrades." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); - ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); - inputFilterUpgrades.put(dir, ups); - } - - key = "outputFilterUpgrades." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); - ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); - outputFilterUpgrades.put(dir, ups); - } - - key = "outFilts." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); - IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag); + @Override + public void setOutputFilter(ForgeDirection dir, IItemFilter filter) { outputFilters.put(dir, filter); - } - - key = "extRM." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < RedstoneControlMode.values().length) { - extractionModes.put(dir, RedstoneControlMode.values()[ord]); + if (network != null) { + network.routesChanged(); } - } - key = "extSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); - } - } - key = "selfFeed." + dir.name(); - if(nbtRoot.hasKey(key)) { - boolean val = nbtRoot.getBoolean(key); - selfFeed.put(dir, val); - } - - key = "roundRobin." + dir.name(); - if(nbtRoot.hasKey(key)) { - boolean val = nbtRoot.getBoolean(key); - roundRobin.put(dir, val); - } - - key = "priority." + dir.name(); - if(nbtRoot.hasKey(key)) { - int val = nbtRoot.getInteger(key); - priority.put(dir, val); - } - - key = "inSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - inputColors.put(dir, DyeColor.values()[ord]); - } - } - - key = "outSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - outputColors.put(dir, DyeColor.values()[ord]); - } - } + setClientStateDirty(); } - if(nbtRoot.hasKey("metaData")) { - updateFromNonUpgradeableVersion(); + @Override + public IItemFilter getInputFilter(ForgeDirection dir) { + return inputFilters.get(dir); } - if(nbtVersion == 0 && !nbtRoot.hasKey("conModes")) { - //all externals where on default so need to switch them to the old default - for (ForgeDirection dir : externalConnections) { - conectionModes.put(dir, ConnectionMode.OUTPUT); - } + @Override + public IItemFilter getOutputFilter(ForgeDirection dir) { + return outputFilters.get(dir); } - } + @Override + public void setInputFilterUpgrade(ForgeDirection dir, ItemStack stack) { + inputFilterUpgrades.put(dir, stack); + setInputFilter(dir, FilterRegister.getFilterForUpgrade(stack)); + setClientStateDirty(); + } + + @Override + public void setOutputFilterUpgrade(ForgeDirection dir, ItemStack stack) { + outputFilterUpgrades.put(dir, stack); + setOutputFilter(dir, FilterRegister.getFilterForUpgrade(stack)); + setClientStateDirty(); + } + + @Override + public ItemStack getInputFilterUpgrade(ForgeDirection dir) { + return inputFilterUpgrades.get(dir); + } + + @Override + public ItemStack getOutputFilterUpgrade(ForgeDirection dir) { + return outputFilterUpgrades.get(dir); + } + + @Override + public void setSpeedUpgrade(ForgeDirection dir, ItemStack upgrade) { + if (upgrade != null) { + speedUpgrades.put(dir, upgrade); + } else { + speedUpgrades.remove(dir); + } + setClientStateDirty(); + } + + @Override + public ItemStack getSpeedUpgrade(ForgeDirection dir) { + return speedUpgrades.get(dir); + } + + @Override + public void setFunctionUpgrade(ForgeDirection dir, ItemStack upgrade) { + boolean hadIPU = hasInventoryPanelUpgrade(dir); + if (upgrade != null) { + functionUpgrades.put(dir, upgrade); + } else { + functionUpgrades.remove(dir); + } + setClientStateDirty(); + if (network != null && hadIPU != hasInventoryPanelUpgrade(dir)) { + network.inventoryPanelSourcesChanged(); + } + } + + @Override + public ItemStack getFunctionUpgrade(ForgeDirection dir) { + return functionUpgrades.get(dir); + } + + @Override + public boolean hasInventoryPanelUpgrade(ForgeDirection dir) { + ItemStack upgrade = functionUpgrades.get(dir); + return upgrade != null + && EnderIO.itemFunctionUpgrade.getFunctionUpgrade(upgrade) == FunctionUpgrade.INVENTORY_PANEL; + } + + @Override + public int getMetaData() { + return metaData; + } + + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + extractionModes.put(dir, mode); + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = extractionModes.get(dir); + if (res == null) { + res = RedstoneControlMode.ON; + } + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + extractionColors.put(dir, col); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor result = extractionColors.get(dir); + if (result == null) { + return DyeColor.RED; + } + return result; + } + + @Override + public boolean isExtractionRedstoneConditionMet(ForgeDirection dir) { + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if (mode == null) { + return true; + } + return ConduitUtil.isRedstoneControlModeMet(getBundle(), mode, getExtractionSignalColor(dir)); + } + + @Override + public DyeColor getInputColor(ForgeDirection dir) { + DyeColor result = inputColors.get(dir); + if (result == null) { + return DyeColor.GREEN; + } + return result; + } + + @Override + public DyeColor getOutputColor(ForgeDirection dir) { + DyeColor result = outputColors.get(dir); + if (result == null) { + return DyeColor.GREEN; + } + return result; + } + + @Override + public void setInputColor(ForgeDirection dir, DyeColor col) { + inputColors.put(dir, col); + if (network != null) { + network.routesChanged(); + } + setClientStateDirty(); + collidablesDirty = true; + } + + @Override + public void setOutputColor(ForgeDirection dir, DyeColor col) { + outputColors.put(dir, col); + if (network != null) { + network.routesChanged(); + } + setClientStateDirty(); + collidablesDirty = true; + } + + @Override + public int getMaximumExtracted(ForgeDirection dir) { + ItemStack stack = speedUpgrades.get(dir); + if (stack == null) { + return SpeedUpgrade.BASE_MAX_EXTRACTED; + } + SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(stack); + return speedUpgrade.getMaximumExtracted(stack.stackSize); + } + + @Override + public float getTickTimePerItem(ForgeDirection dir) { + float maxExtract = 10f / getMaximumExtracted(dir); + return maxExtract; + } + + @Override + public void itemsExtracted(int numExtracted, int slot) {} + + @Override + public void externalConnectionAdded(ForgeDirection direction) { + super.externalConnectionAdded(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.inventoryAdded( + this, + direction, + te.xCoord + direction.offsetX, + te.yCoord + direction.offsetY, + te.zCoord + direction.offsetZ, + getExternalInventory(direction)); + } + } + + @Override + public IInventory getExternalInventory(ForgeDirection direction) { + World world = getBundle().getWorld(); + if (world == null) { + return null; + } + BlockCoord loc = getLocation().getLocation(direction); + TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); + if (te instanceof IInventory && !(te instanceof IConduitBundle)) { + return (IInventory) te; + } + return null; + } + + @Override + public void externalConnectionRemoved(ForgeDirection direction) { + externalConnections.remove(direction); + connectionsChanged(); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.inventoryRemoved( + this, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + } + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + ConnectionMode oldVal = conectionModes.get(dir); + if (oldVal == mode) { + return; + } + super.setConnectionMode(dir, mode); + if (network != null) { + network.routesChanged(); + } + } + + @Override + public boolean isSelfFeedEnabled(ForgeDirection dir) { + Boolean val = selfFeed.get(dir); + if (val == null) { + return false; + } + return val; + } + + @Override + public void setSelfFeedEnabled(ForgeDirection dir, boolean enabled) { + if (!enabled) { + selfFeed.remove(dir); + } else { + selfFeed.put(dir, enabled); + } + if (network != null) { + network.routesChanged(); + } + } + + @Override + public boolean isRoundRobinEnabled(ForgeDirection dir) { + Boolean val = roundRobin.get(dir); + if (val == null) { + return false; + } + return val; + } + + @Override + public void setRoundRobinEnabled(ForgeDirection dir, boolean enabled) { + if (!enabled) { + roundRobin.remove(dir); + } else { + roundRobin.put(dir, enabled); + } + if (network != null) { + network.routesChanged(); + } + } + + @Override + public int getOutputPriority(ForgeDirection dir) { + Integer res = priority.get(dir); + if (res == null) { + return 0; + } + return res.intValue(); + } + + @Override + public void setOutputPriority(ForgeDirection dir, int priority) { + if (priority == 0) { + this.priority.remove(dir); + } else { + this.priority.put(dir, priority); + } + if (network != null) { + network.routesChanged(); + } + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IInventory inv = getExternalInventory(direction); + if (inv == null) return false; + else if (inv instanceof IInventoryConnection) { + return ((IInventoryConnection) inv).canConnectInventory(direction.getOpposite()).canConnect; + } else if (inv instanceof ISidedInventory) { + int[] slots = ((ISidedInventory) inv) + .getAccessibleSlotsFromSide(direction.getOpposite().ordinal()); + return slots != null && slots.length > 0; + } else { + return true; + } + } + + @Override + protected ConnectionMode getDefaultConnectionMode() { + return ConnectionMode.INPUT; + } + + @Override + public Class getBaseConduitType() { + return IItemConduit.class; + } + + @Override + public ItemStack createItem() { + ItemStack result = new ItemStack(EnderIO.itemItemConduit, 1, metaData); + return result; + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (ItemConduitNetwork) network; + return true; + } + + @Override + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_KEY_INPUT); + } + + @Override + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_KEY_OUTPUT); + } + + @Override + public IIcon getTextureForInOutMode(boolean input) { + return input ? ICONS.get(ICON_KEY_IN_OUT_IN) : ICONS.get(ICON_KEY_IN_OUT_OUT); + } + + @Override + public IIcon getTextureForInOutBackground() { + return ICONS.get(ICON_KEY_IN_OUT_BG); + } + + @Override + public IIcon getEnderIcon() { + return ICONS.get(ICON_KEY_ENDER); + } + + public IIcon getCoreIcon() { + return metaData == 1 ? ICONS.get(ICON_KEY_CORE_ADV) : ICONS.get(ICON_KEY_CORE); + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return getCoreIcon(); + } + if (EXTERNAL_INTERFACE_GEOM.equals(component.data)) { + return getCoreIcon(); + } + return ICONS.get(ICON_KEY); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return getEnderIcon(); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + + for (Entry entry : inputFilters.entrySet()) { + if (entry.getValue() != null) { + IItemFilter f = entry.getValue(); + if (!isDefault(f)) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(f, itemRoot); + nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot); + } + } + } + + for (Entry entry : speedUpgrades.entrySet()) { + if (entry.getValue() != null) { + ItemStack up = entry.getValue(); + NBTTagCompound itemRoot = new NBTTagCompound(); + up.writeToNBT(itemRoot); + nbtRoot.setTag("speedUpgrades." + entry.getKey().name(), itemRoot); + } + } + + for (Entry entry : functionUpgrades.entrySet()) { + if (entry.getValue() != null) { + ItemStack up = entry.getValue(); + NBTTagCompound itemRoot = new NBTTagCompound(); + up.writeToNBT(itemRoot); + nbtRoot.setTag("functionUpgrades." + entry.getKey().name(), itemRoot); + } + } + + for (Entry entry : outputFilters.entrySet()) { + if (entry.getValue() != null) { + IItemFilter f = entry.getValue(); + if (!isDefault(f)) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(f, itemRoot); + nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot); + } + } + } + + for (Entry entry : inputFilterUpgrades.entrySet()) { + if (entry.getValue() != null) { + ItemStack up = entry.getValue(); + IItemFilter filter = getInputFilter(entry.getKey()); + FilterRegister.writeFilterToStack(filter, up); + + NBTTagCompound itemRoot = new NBTTagCompound(); + up.writeToNBT(itemRoot); + nbtRoot.setTag("inputFilterUpgrades." + entry.getKey().name(), itemRoot); + } + } + + for (Entry entry : outputFilterUpgrades.entrySet()) { + if (entry.getValue() != null) { + ItemStack up = entry.getValue(); + IItemFilter filter = getOutputFilter(entry.getKey()); + FilterRegister.writeFilterToStack(filter, up); + + NBTTagCompound itemRoot = new NBTTagCompound(); + up.writeToNBT(itemRoot); + nbtRoot.setTag("outputFilterUpgrades." + entry.getKey().name(), itemRoot); + } + } + + for (Entry entry : extractionModes.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extRM." + entry.getKey().name(), ord); + } + } + + for (Entry entry : extractionColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extSC." + entry.getKey().name(), ord); + } + } + + for (Entry entry : selfFeed.entrySet()) { + if (entry.getValue() != null) { + nbtRoot.setBoolean("selfFeed." + entry.getKey().name(), entry.getValue()); + } + } + + for (Entry entry : roundRobin.entrySet()) { + if (entry.getValue() != null) { + nbtRoot.setBoolean("roundRobin." + entry.getKey().name(), entry.getValue()); + } + } + + for (Entry entry : priority.entrySet()) { + if (entry.getValue() != null) { + nbtRoot.setInteger("priority." + entry.getKey().name(), entry.getValue()); + } + } + + for (Entry entry : inputColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("inSC." + entry.getKey().name(), ord); + } + } + + for (Entry entry : outputColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("outSC." + entry.getKey().name(), ord); + } + } + } + + private boolean isDefault(IItemFilter f) { + if (f instanceof ItemFilter) { + return ((ItemFilter) f).isDefault(); + } + return false; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + + if (nbtRoot.hasKey("metaData")) { + metaData = nbtRoot.getShort("metaData"); + } else { + metaData = 0; + } + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + + String key = "inFilts." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag); + inputFilters.put(dir, filter); + } + + key = "speedUpgrades." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); + ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); + speedUpgrades.put(dir, ups); + } + + key = "functionUpgrades." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); + ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); + functionUpgrades.put(dir, ups); + } + + key = "inputFilterUpgrades." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); + ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); + inputFilterUpgrades.put(dir, ups); + } + + key = "outputFilterUpgrades." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key); + ItemStack ups = ItemStack.loadItemStackFromNBT(upTag); + outputFilterUpgrades.put(dir, ups); + } + + key = "outFilts." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag); + outputFilters.put(dir, filter); + } + + key = "extRM." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < RedstoneControlMode.values().length) { + extractionModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "extSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + extractionColors.put(dir, DyeColor.values()[ord]); + } + } + key = "selfFeed." + dir.name(); + if (nbtRoot.hasKey(key)) { + boolean val = nbtRoot.getBoolean(key); + selfFeed.put(dir, val); + } + + key = "roundRobin." + dir.name(); + if (nbtRoot.hasKey(key)) { + boolean val = nbtRoot.getBoolean(key); + roundRobin.put(dir, val); + } + + key = "priority." + dir.name(); + if (nbtRoot.hasKey(key)) { + int val = nbtRoot.getInteger(key); + priority.put(dir, val); + } + + key = "inSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + inputColors.put(dir, DyeColor.values()[ord]); + } + } + + key = "outSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + outputColors.put(dir, DyeColor.values()[ord]); + } + } + } + + if (nbtRoot.hasKey("metaData")) { + updateFromNonUpgradeableVersion(); + } + + if (nbtVersion == 0 && !nbtRoot.hasKey("conModes")) { + // all externals where on default so need to switch them to the old default + for (ForgeDirection dir : externalConnections) { + conectionModes.put(dir, ConnectionMode.OUTPUT); + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 1f987e3e..a97678a5 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -1,231 +1,236 @@ package crazypants.enderio.conduit.item; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.item.NetworkedInventory.Target; +import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.item.NetworkedInventory.Target; -import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; - public class ItemConduitNetwork extends AbstractConduitNetwork { - final List inventories = new ArrayList(); - private final Map> invMap = new HashMap>(); + final List inventories = new ArrayList(); + private final Map> invMap = + new HashMap>(); - final Map conMap = new HashMap(); + final Map conMap = new HashMap(); - private boolean requiresSort = true; + private boolean requiresSort = true; - private boolean doingSend = false; + private boolean doingSend = false; - private int changeCount; + private int changeCount; - private InventoryDatabaseServer database; + private InventoryDatabaseServer database; - public ItemConduitNetwork() { - super(IItemConduit.class, IItemConduit.class); - } - - @Override - public void addConduit(IItemConduit con) { - super.addConduit(con); - conMap.put(con.getLocation(), con); - - TileEntity te = con.getBundle().getEntity(); - if(te != null) { - for (ForgeDirection direction : con.getExternalConnections()) { - IInventory extCon = con.getExternalInventory(direction); - if(extCon != null) { - inventoryAdded(con, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, extCon); - } - } - } - } - - public void inventoryAdded(IItemConduit itemConduit, ForgeDirection direction, int x, int y, int z, IInventory externalInventory) { - BlockCoord bc = new BlockCoord(x, y, z); - NetworkedInventory inv = new NetworkedInventory(this, externalInventory, itemConduit, direction, bc); - inventories.add(inv); - getOrCreate(bc).add(inv); - requiresSort = true; - } - - public NetworkedInventory getInventory(IItemConduit conduit, ForgeDirection dir) { - for(NetworkedInventory inv : inventories) { - if(inv.con == conduit && inv.conDir == dir) { - return inv; - } - } - return null; - } - - public List getInventoryPanelSources() { - ArrayList res = new ArrayList(); - for(NetworkedInventory inv : inventories) { - if(inv.con.hasInventoryPanelUpgrade(inv.conDir)) { - res.add(inv); - } - } - return res; - } - - private List getOrCreate(BlockCoord bc) { - List res = invMap.get(bc); - if(res == null) { - res = new ArrayList(); - invMap.put(bc, res); - } - return res; - } - - public void inventoryRemoved(ItemConduit itemConduit, int x, int y, int z) { - BlockCoord bc = new BlockCoord(x, y, z); - List invs = getOrCreate(bc); - NetworkedInventory remove = null; - for (NetworkedInventory ni : invs) { - if(ni.con.getLocation().equals(itemConduit.getLocation())) { - remove = ni; - break; - } - } - if(remove != null) { - invs.remove(remove); - inventories.remove(remove); - requiresSort = true; + public ItemConduitNetwork() { + super(IItemConduit.class, IItemConduit.class); } - } + @Override + public void addConduit(IItemConduit con) { + super.addConduit(con); + conMap.put(con.getLocation(), con); - public void routesChanged() { - requiresSort = true; - } - - public void inventoryPanelSourcesChanged() { - changeCount++; - } - - public int getChangeCount() { - return changeCount; - } - - public InventoryDatabaseServer getDatabase() { - check: { - if(database == null) { - database = new InventoryDatabaseServer(this); - } else if(database.isCurrent()) { - break check; - } - database.updateNetworkSources(); - } - return database; - } - - @Override - public void destroyNetwork() { - super.destroyNetwork(); - if(database != null) { - database.resetDatabase(); - database = null; - } - } - - public ItemStack sendItems(ItemConduit itemConduit, ItemStack item, ForgeDirection side) { - if(doingSend) { - return item; - } - - if(item == null) { - return item; - } - - try { - doingSend = true; - BlockCoord loc = itemConduit.getLocation().getLocation(side); - - ItemStack result = item.copy(); - List invs = getOrCreate(loc); - for (NetworkedInventory inv : invs) { - - if(inv.con.getLocation().equals(itemConduit.getLocation())) { - int numInserted = inv.insertIntoTargets(item.copy()); - if(numInserted >= item.stackSize) { - return null; - } - result.stackSize -= numInserted; - } - } - return result; - } finally { - doingSend = false; - } - } - - public List getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) { - List result = new ArrayList(); - - List invs = getOrCreate(extractFrom); - for (NetworkedInventory source : invs) { - - if(source.con.getLocation().equals(con.getLocation())) { - if(source.sendPriority != null) { - for (Target t : source.sendPriority) { - IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir); - if(input == null || f == null || f.doesItemPassFilter(t.inv, input)) { - String s = t.inv.getLocalizedInventoryName() + " " + t.inv.location.chatString() + " Distance [" + t.distance + "] "; - result.add(s); + TileEntity te = con.getBundle().getEntity(); + if (te != null) { + for (ForgeDirection direction : con.getExternalConnections()) { + IInventory extCon = con.getExternalInventory(direction); + if (extCon != null) { + inventoryAdded( + con, + direction, + te.xCoord + direction.offsetX, + te.yCoord + direction.offsetY, + te.zCoord + direction.offsetZ, + extCon); + } } - } } - } } - return result; - } + public void inventoryAdded( + IItemConduit itemConduit, ForgeDirection direction, int x, int y, int z, IInventory externalInventory) { + BlockCoord bc = new BlockCoord(x, y, z); + NetworkedInventory inv = new NetworkedInventory(this, externalInventory, itemConduit, direction, bc); + inventories.add(inv); + getOrCreate(bc).add(inv); + requiresSort = true; + } - public List getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) { - List result = new ArrayList(); - for (NetworkedInventory inv : inventories) { - if(inv.hasTarget(con, dir)) { - IItemFilter f = inv.con.getInputFilter(inv.conDir); - if(input == null || f == null || f.doesItemPassFilter(inv, input)) { - result.add(inv.getLocalizedInventoryName() + " " + inv.location.chatString()); + public NetworkedInventory getInventory(IItemConduit conduit, ForgeDirection dir) { + for (NetworkedInventory inv : inventories) { + if (inv.con == conduit && inv.conDir == dir) { + return inv; + } } - } + return null; } - return result; - } - @Override - public void doNetworkTick() { - for (NetworkedInventory ni : inventories) { - if(requiresSort) { - ni.updateInsertOrder(); - } - ni.onTick(); + public List getInventoryPanelSources() { + ArrayList res = new ArrayList(); + for (NetworkedInventory inv : inventories) { + if (inv.con.hasInventoryPanelUpgrade(inv.conDir)) { + res.add(inv); + } + } + return res; } - if(requiresSort) { - requiresSort = false; - changeCount++; + + private List getOrCreate(BlockCoord bc) { + List res = invMap.get(bc); + if (res == null) { + res = new ArrayList(); + invMap.put(bc, res); + } + return res; } - if(database != null) { - database.tick(); + + public void inventoryRemoved(ItemConduit itemConduit, int x, int y, int z) { + BlockCoord bc = new BlockCoord(x, y, z); + List invs = getOrCreate(bc); + NetworkedInventory remove = null; + for (NetworkedInventory ni : invs) { + if (ni.con.getLocation().equals(itemConduit.getLocation())) { + remove = ni; + break; + } + } + if (remove != null) { + invs.remove(remove); + inventories.remove(remove); + requiresSort = true; + } } - } - static int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); - } + public void routesChanged() { + requiresSort = true; + } - static int MAX_SLOT_CHECK_PER_TICK = 64; + public void inventoryPanelSourcesChanged() { + changeCount++; + } + public int getChangeCount() { + return changeCount; + } + + public InventoryDatabaseServer getDatabase() { + check: + { + if (database == null) { + database = new InventoryDatabaseServer(this); + } else if (database.isCurrent()) { + break check; + } + database.updateNetworkSources(); + } + return database; + } + + @Override + public void destroyNetwork() { + super.destroyNetwork(); + if (database != null) { + database.resetDatabase(); + database = null; + } + } + + public ItemStack sendItems(ItemConduit itemConduit, ItemStack item, ForgeDirection side) { + if (doingSend) { + return item; + } + + if (item == null) { + return item; + } + + try { + doingSend = true; + BlockCoord loc = itemConduit.getLocation().getLocation(side); + + ItemStack result = item.copy(); + List invs = getOrCreate(loc); + for (NetworkedInventory inv : invs) { + + if (inv.con.getLocation().equals(itemConduit.getLocation())) { + int numInserted = inv.insertIntoTargets(item.copy()); + if (numInserted >= item.stackSize) { + return null; + } + result.stackSize -= numInserted; + } + } + return result; + } finally { + doingSend = false; + } + } + + public List getTargetsForExtraction(BlockCoord extractFrom, IItemConduit con, ItemStack input) { + List result = new ArrayList(); + + List invs = getOrCreate(extractFrom); + for (NetworkedInventory source : invs) { + + if (source.con.getLocation().equals(con.getLocation())) { + if (source.sendPriority != null) { + for (Target t : source.sendPriority) { + IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir); + if (input == null || f == null || f.doesItemPassFilter(t.inv, input)) { + String s = t.inv.getLocalizedInventoryName() + " " + t.inv.location.chatString() + + " Distance [" + t.distance + "] "; + result.add(s); + } + } + } + } + } + + return result; + } + + public List getInputSourcesFor(IItemConduit con, ForgeDirection dir, ItemStack input) { + List result = new ArrayList(); + for (NetworkedInventory inv : inventories) { + if (inv.hasTarget(con, dir)) { + IItemFilter f = inv.con.getInputFilter(inv.conDir); + if (input == null || f == null || f.doesItemPassFilter(inv, input)) { + result.add(inv.getLocalizedInventoryName() + " " + inv.location.chatString()); + } + } + } + return result; + } + + @Override + public void doNetworkTick() { + for (NetworkedInventory ni : inventories) { + if (requiresSort) { + ni.updateInsertOrder(); + } + ni.onTick(); + } + if (requiresSort) { + requiresSort = false; + changeCount++; + } + if (database != null) { + database.tick(); + } + } + + static int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + + static int MAX_SLOT_CHECK_PER_TICK = 64; } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java index 073cb30b..6e438e6a 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitRenderer.java @@ -1,12 +1,6 @@ package crazypants.enderio.conduit.item; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -14,59 +8,71 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class ItemConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - if(conduit instanceof IItemConduit) { - return true; - } - return false; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - - IItemConduit pc = (IItemConduit) conduit; - for (ForgeDirection dir : conduit.getExternalConnections()) { - DyeColor inChannel = null; - DyeColor outChannel = null; - IIcon inTex = null; - IIcon outTex = null; - boolean render = true; - if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { - inTex = pc.getTextureForInputMode(); - inChannel = pc.getInputColor(dir); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { - outTex = pc.getTextureForOutputMode(); - outChannel = pc.getOutputColor(dir); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.IN_OUT) { - inTex = pc.getTextureForInOutMode(true); - outTex = pc.getTextureForInOutMode(false); - inChannel = pc.getInputColor(dir); - outChannel = pc.getOutputColor(dir); - } else { - render = false; - } - - if(render && !rb.hasOverrideBlockTexture()) { - Offset offset = te.getOffset(IItemConduit.class, dir); - ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true); - - if(inChannel != null) { - Tessellator.instance.setColorOpaque_I(inChannel.getColor()); - ConnectionModeGeometry.renderModeConnector(dir, offset, inTex, false); + @Override + public boolean isRendererForConduit(IConduit conduit) { + if (conduit instanceof IItemConduit) { + return true; + } + return false; + } + + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); + + IItemConduit pc = (IItemConduit) conduit; + for (ForgeDirection dir : conduit.getExternalConnections()) { + DyeColor inChannel = null; + DyeColor outChannel = null; + IIcon inTex = null; + IIcon outTex = null; + boolean render = true; + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + inTex = pc.getTextureForInputMode(); + inChannel = pc.getInputColor(dir); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + outTex = pc.getTextureForOutputMode(); + outChannel = pc.getOutputColor(dir); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.IN_OUT) { + inTex = pc.getTextureForInOutMode(true); + outTex = pc.getTextureForInOutMode(false); + inChannel = pc.getInputColor(dir); + outChannel = pc.getOutputColor(dir); + } else { + render = false; + } + + if (render && !rb.hasOverrideBlockTexture()) { + Offset offset = te.getOffset(IItemConduit.class, dir); + ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true); + + if (inChannel != null) { + Tessellator.instance.setColorOpaque_I(inChannel.getColor()); + ConnectionModeGeometry.renderModeConnector(dir, offset, inTex, false); + } + if (outChannel != null) { + Tessellator.instance.setColorOpaque_I(outChannel.getColor()); + ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false); + } + + Tessellator.instance.setColorOpaque_F(1f, 1f, 1f); + } } - if(outChannel != null) { - Tessellator.instance.setColorOpaque_I(outChannel.getColor()); - ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false); - } - - Tessellator.instance.setColorOpaque_F(1f, 1f, 1f); - } } - } } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 665d01c9..3a7d010d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -1,7 +1,12 @@ package crazypants.enderio.conduit.item; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -9,77 +14,68 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipProvider { - private static final SpeedUpgrade UPGRADES[] = SpeedUpgrade.values(); + private static final SpeedUpgrade UPGRADES[] = SpeedUpgrade.values(); - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemExtractSpeedUpgrade create() { - ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade(); - result.init(); - return result; - } - - protected ItemExtractSpeedUpgrade() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemExtractSpeedUpgrade.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - - icons = new IIcon[UPGRADES.length]; - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemExtractSpeedUpgrade.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, icons.length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - for (int i = 0; i < UPGRADES.length; i++) { - icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName); + public static ItemExtractSpeedUpgrade create() { + ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade(); + result.init(); + return result; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getSpeedUpgrade(par1ItemStack).unlocName; - } + protected ItemExtractSpeedUpgrade() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemExtractSpeedUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < UPGRADES.length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + icons = new IIcon[UPGRADES.length]; } - } - public SpeedUpgrade getSpeedUpgrade(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1); - return UPGRADES[i]; - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemExtractSpeedUpgrade.unlocalisedName); + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(itemStack); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, icons.length - 1); + return icons[damage]; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + for (int i = 0; i < UPGRADES.length; i++) { + icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return getSpeedUpgrade(par1ItemStack).unlocName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < UPGRADES.length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + public SpeedUpgrade getSpeedUpgrade(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1); + return UPGRADES[i]; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java index f5745824..fa48ec5e 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemFunctionUpgrade.java @@ -1,7 +1,12 @@ package crazypants.enderio.conduit.item; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -9,77 +14,68 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - public class ItemFunctionUpgrade extends Item implements IResourceTooltipProvider { - private static final FunctionUpgrade UPGRADES[] = FunctionUpgrade.values(); + private static final FunctionUpgrade UPGRADES[] = FunctionUpgrade.values(); - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemFunctionUpgrade create() { - ItemFunctionUpgrade result = new ItemFunctionUpgrade(); - result.init(); - return result; - } - - protected ItemFunctionUpgrade() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemFunctionUpgrade.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - - icons = new IIcon[UPGRADES.length]; - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemFunctionUpgrade.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, icons.length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - for (int i = 0; i < UPGRADES.length; i++) { - icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName); + public static ItemFunctionUpgrade create() { + ItemFunctionUpgrade result = new ItemFunctionUpgrade(); + result.init(); + return result; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getFunctionUpgrade(par1ItemStack).unlocName; - } + protected ItemFunctionUpgrade() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemFunctionUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < UPGRADES.length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + icons = new IIcon[UPGRADES.length]; } - } - public FunctionUpgrade getFunctionUpgrade(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1); - return UPGRADES[i]; - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemFunctionUpgrade.unlocalisedName); + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(itemStack); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, icons.length - 1); + return icons[damage]; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + for (int i = 0; i < UPGRADES.length; i++) { + icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return getFunctionUpgrade(par1ItemStack).unlocName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < UPGRADES.length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + public FunctionUpgrade getFunctionUpgrade(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1); + return UPGRADES[i]; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java index 019bd54c..cc15b113 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java @@ -1,44 +1,44 @@ package crazypants.enderio.conduit.item; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemItemConduit extends AbstractItemConduit { - // private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - // new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit"), - // new ItemConduitSubtype(ModObject.itemItemConduit.name() + "Empowered", "enderio:itemItemConduitAdvanced") - // }; - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit") - }; + // private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + // new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit"), + // new ItemConduitSubtype(ModObject.itemItemConduit.name() + "Empowered", "enderio:itemItemConduitAdvanced") + // }; + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemItemConduit.name(), "enderio:itemItemConduit") + }; - public static ItemItemConduit create() { - ItemItemConduit result = new ItemItemConduit(); - result.init(); - return result; - } + public static ItemItemConduit create() { + ItemItemConduit result = new ItemItemConduit(); + result.init(); + return result; + } - protected ItemItemConduit() { - super(ModObject.itemItemConduit, subtypes); - } + protected ItemItemConduit() { + super(ModObject.itemItemConduit, subtypes); + } - @Override - public Class getBaseConduitType() { - return IItemConduit.class; - } + @Override + public Class getBaseConduitType() { + return IItemConduit.class; + } - @Override - public IConduit createConduit(ItemStack item, EntityPlayer player) { - return new ItemConduit(item.getItemDamage()); - } + @Override + public IConduit createConduit(ItemStack item, EntityPlayer player) { + return new ItemConduit(item.getItemDamage()); + } - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 3f9dfd11..66457f2d 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -1,11 +1,18 @@ package crazypants.enderio.conduit.item; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.InventoryWrapper; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.RoundRobinIterator; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.invpanel.TileInventoryPanel; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -15,422 +22,413 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.InventoryWrapper; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.RoundRobinIterator; - -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.invpanel.TileInventoryPanel; - public class NetworkedInventory { - private ISidedInventory inv; - IItemConduit con; - ForgeDirection conDir; - BlockCoord location; - int inventorySide; + private ISidedInventory inv; + IItemConduit con; + ForgeDirection conDir; + BlockCoord location; + int inventorySide; - List sendPriority = new ArrayList(); - RoundRobinIterator rrIter = new RoundRobinIterator(sendPriority); + List sendPriority = new ArrayList(); + RoundRobinIterator rrIter = new RoundRobinIterator(sendPriority); - private int extractFromSlot = -1; + private int extractFromSlot = -1; - int tickDeficit; + int tickDeficit; - //work around for a vanilla chest changing into a double chest without doing unneeded checks all the time - boolean recheckInv = false; - //Hack for TiC crafting station not working correctly when setting output slot to null - boolean ticHack = false; + // work around for a vanilla chest changing into a double chest without doing unneeded checks all the time + boolean recheckInv = false; + // Hack for TiC crafting station not working correctly when setting output slot to null + boolean ticHack = false; - boolean inventoryPanel = false; + boolean inventoryPanel = false; - World world; - ItemConduitNetwork network; + World world; + ItemConduitNetwork network; - NetworkedInventory(ItemConduitNetwork network, IInventory inv, IItemConduit con, ForgeDirection conDir, BlockCoord location) { - this.network = network; - inventorySide = conDir.getOpposite().ordinal(); + NetworkedInventory( + ItemConduitNetwork network, IInventory inv, IItemConduit con, ForgeDirection conDir, BlockCoord location) { + this.network = network; + inventorySide = conDir.getOpposite().ordinal(); - this.con = con; - this.conDir = conDir; - this.location = location; - world = con.getBundle().getWorld(); + this.con = con; + this.conDir = conDir; + this.location = location; + world = con.getBundle().getWorld(); - TileEntity te = world.getTileEntity(location.x, location.y, location.z); - if(te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) { - ticHack = true; - } else if(te.getClass().getName().contains("cpw.mods.ironchest")) { - recheckInv = true; - } else if(te instanceof TileEntityChest) { - recheckInv = true; - } else if(te instanceof TileInventoryPanel) { - inventoryPanel = true; + TileEntity te = world.getTileEntity(location.x, location.y, location.z); + if (te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) { + ticHack = true; + } else if (te.getClass().getName().contains("cpw.mods.ironchest")) { + recheckInv = true; + } else if (te instanceof TileEntityChest) { + recheckInv = true; + } else if (te instanceof TileInventoryPanel) { + inventoryPanel = true; + } + updateInventory(); } - updateInventory(); - } - public boolean hasTarget(IItemConduit conduit, ForgeDirection dir) { - for (Target t : sendPriority) { - if(t.inv.con == conduit && t.inv.conDir == dir) { + public boolean hasTarget(IItemConduit conduit, ForgeDirection dir) { + for (Target t : sendPriority) { + if (t.inv.con == conduit && t.inv.conDir == dir) { + return true; + } + } + return false; + } + + boolean canExtract() { + ConnectionMode mode = con.getConnectionMode(conDir); + return mode == ConnectionMode.INPUT || mode == ConnectionMode.IN_OUT; + } + + boolean canInsert() { + if (inventoryPanel) { + return false; + } + ConnectionMode mode = con.getConnectionMode(conDir); + return mode == ConnectionMode.OUTPUT || mode == ConnectionMode.IN_OUT; + } + + boolean isInventoryPanel() { + return inventoryPanel; + } + + boolean isSticky() { + return con.getOutputFilter(conDir) != null + && con.getOutputFilter(conDir).isValid() + && con.getOutputFilter(conDir).isSticky(); + } + + int getPriority() { + return con.getOutputPriority(conDir); + } + + public void onTick() { + if (tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) { + // do nothing + } else { + transferItems(); + } + + tickDeficit--; + if (tickDeficit < -1) { + // Sleep for a second before checking again. + tickDeficit = 20; + } + } + + private boolean canExtractThisTick(long tick) { + if (!con.isExtractionRedstoneConditionMet(conDir)) { + return false; + } return true; - } - } - return false; - } - - boolean canExtract() { - ConnectionMode mode = con.getConnectionMode(conDir); - return mode == ConnectionMode.INPUT || mode == ConnectionMode.IN_OUT; - } - - boolean canInsert() { - if(inventoryPanel) { - return false; - } - ConnectionMode mode = con.getConnectionMode(conDir); - return mode == ConnectionMode.OUTPUT || mode == ConnectionMode.IN_OUT; - } - - boolean isInventoryPanel() { - return inventoryPanel; - } - - boolean isSticky() { - return con.getOutputFilter(conDir) != null && con.getOutputFilter(conDir).isValid() && con.getOutputFilter(conDir).isSticky(); - } - - int getPriority() { - return con.getOutputPriority(conDir); - } - - public void onTick() { - if(tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) { - //do nothing - } else { - transferItems(); } - tickDeficit--; - if(tickDeficit < -1) { - //Sleep for a second before checking again. - tickDeficit = 20; - } - } - - private boolean canExtractThisTick(long tick) { - if(!con.isExtractionRedstoneConditionMet(conDir)) { - return false; - } - return true; - } - - private int nextSlot(int numSlots) { - ++extractFromSlot; - if(extractFromSlot >= numSlots || extractFromSlot < 0) { - extractFromSlot = 0; - } - return extractFromSlot; - } - - private void setNextStartingSlot(int slot) { - extractFromSlot = slot; - extractFromSlot--; - } - - private boolean transferItems() { - - if(recheckInv) { - updateInventory(); + private int nextSlot(int numSlots) { + ++extractFromSlot; + if (extractFromSlot >= numSlots || extractFromSlot < 0) { + extractFromSlot = 0; + } + return extractFromSlot; } - int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide); - if(slotIndices == null) { - return false; + private void setNextStartingSlot(int slot) { + extractFromSlot = slot; + extractFromSlot--; } - int numSlots = slotIndices.length; - ItemStack extractItem = null; - int maxExtracted = con.getMaximumExtracted(conDir); - int slot = -1; - int slotChecksPerTick = Math.min(numSlots, ItemConduitNetwork.MAX_SLOT_CHECK_PER_TICK); - for (int i = 0; i < slotChecksPerTick; i++) { - int index = nextSlot(numSlots); - slot = slotIndices[index]; - ItemStack item = getInventory().getStackInSlot(slot); - if(canExtractItem(item)) { - extractItem = item.copy(); - if(getInventory().canExtractItem(slot, extractItem, inventorySide)) { - if(doTransfer(extractItem, slot, maxExtracted)) { - setNextStartingSlot(slot); + private boolean transferItems() { + + if (recheckInv) { + updateInventory(); + } + + int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide); + if (slotIndices == null) { + return false; + } + int numSlots = slotIndices.length; + ItemStack extractItem = null; + int maxExtracted = con.getMaximumExtracted(conDir); + + int slot = -1; + int slotChecksPerTick = Math.min(numSlots, ItemConduitNetwork.MAX_SLOT_CHECK_PER_TICK); + for (int i = 0; i < slotChecksPerTick; i++) { + int index = nextSlot(numSlots); + slot = slotIndices[index]; + ItemStack item = getInventory().getStackInSlot(slot); + if (canExtractItem(item)) { + extractItem = item.copy(); + if (getInventory().canExtractItem(slot, extractItem, inventorySide)) { + if (doTransfer(extractItem, slot, maxExtracted)) { + setNextStartingSlot(slot); + return true; + } + } + } + } + return false; + } + + private boolean canExtractItem(ItemStack itemStack) { + if (itemStack == null) { + return false; + } + IItemFilter filter = con.getInputFilter(conDir); + if (filter == null) { return true; - } } - } + return filter.doesItemPassFilter(this, itemStack); } - return false; - } - private boolean canExtractItem(ItemStack itemStack) { - if(itemStack == null) { - return false; + private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) { + if (extractedItem == null || extractedItem.getItem() == null) { + return false; + } + ItemStack toExtract = extractedItem.copy(); + toExtract.stackSize = Math.min(maxExtract, toExtract.stackSize); + int numInserted = insertIntoTargets(toExtract); + if (numInserted <= 0) { + return false; + } + itemExtracted(slot, numInserted); + return true; } - IItemFilter filter = con.getInputFilter(conDir); - if(filter == null) { - return true; - } - return filter.doesItemPassFilter(this, itemStack); - } - private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) { - if(extractedItem == null || extractedItem.getItem() == null) { - return false; + public void itemExtracted(int slot, int numInserted) { + ItemStack curStack = getInventory().getStackInSlot(slot); + if (curStack != null) { + if (ticHack) { + getInventory().decrStackSize(slot, numInserted); + getInventory().markDirty(); + } else { + curStack = curStack.copy(); + curStack.stackSize -= numInserted; + if (curStack.stackSize > 0) { + getInventory().setInventorySlotContents(slot, curStack); + getInventory().markDirty(); + } else { + getInventory().setInventorySlotContents(slot, null); + getInventory().markDirty(); + } + } + } + con.itemsExtracted(numInserted, slot); + tickDeficit = Math.round(numInserted * con.getTickTimePerItem(conDir)); } - ItemStack toExtract = extractedItem.copy(); - toExtract.stackSize = Math.min(maxExtract, toExtract.stackSize); - int numInserted = insertIntoTargets(toExtract); - if(numInserted <= 0) { - return false; + + int insertIntoTargets(ItemStack toExtract) { + if (toExtract == null) { + return 0; + } + + int totalToInsert = toExtract.stackSize; + int leftToInsert = totalToInsert; + boolean matchedStickyInput = false; + + Iterable targets = getTargetIterator(); + + // for (Target target : sendPriority) { + for (Target target : targets) { + if (target.stickyInput && !matchedStickyInput) { + IItemFilter of = target.inv.con.getOutputFilter(target.inv.conDir); + matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(this, toExtract); + } + if (target.stickyInput || !matchedStickyInput) { + if (target.inv.recheckInv) { + target.inv.updateInventory(); + } + int inserted = target.inv.insertItem(toExtract); + if (inserted > 0) { + toExtract.stackSize -= inserted; + leftToInsert -= inserted; + } + if (leftToInsert <= 0) { + return totalToInsert; + } + } + } + return totalToInsert - leftToInsert; } - itemExtracted(slot, numInserted); - return true; - } + private Iterable getTargetIterator() { + if (con.isRoundRobinEnabled(conDir)) { + return rrIter; + } + return sendPriority; + } - public void itemExtracted(int slot, int numInserted) { - ItemStack curStack = getInventory().getStackInSlot(slot); - if(curStack != null) { - if(ticHack) { - getInventory().decrStackSize(slot, numInserted); - getInventory().markDirty(); - } else { - curStack = curStack.copy(); - curStack.stackSize -= numInserted; - if(curStack.stackSize > 0) { - getInventory().setInventorySlotContents(slot, curStack); - getInventory().markDirty(); + public final void updateInventory() { + TileEntity te = world.getTileEntity(location.x, location.y, location.z); + if (te instanceof ISidedInventory) { + inv = (ISidedInventory) te; + } else if (te instanceof IInventory) { + inv = new InventoryWrapper((IInventory) te); + } + } + + private int insertItem(ItemStack item) { + if (!canInsert() || item == null) { + return 0; + } + IItemFilter filter = con.getOutputFilter(conDir); + if (filter != null) { + if (!filter.doesItemPassFilter(this, item)) { + return 0; + } + } + return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]); + } + + void updateInsertOrder() { + sendPriority.clear(); + if (!canExtract()) { + return; + } + List result = new ArrayList(); + + for (NetworkedInventory other : network.inventories) { + if ((con.isSelfFeedEnabled(conDir) || (other != this)) + && other.canInsert() + && con.getInputColor(conDir) == other.con.getOutputColor(other.conDir)) { + + if (Config.itemConduitUsePhyscialDistance) { + sendPriority.add(new Target(other, distanceTo(other), other.isSticky(), other.getPriority())); + } else { + result.add(new Target(other, 9999999, other.isSticky(), other.getPriority())); + } + } + } + + if (Config.itemConduitUsePhyscialDistance) { + Collections.sort(sendPriority); } else { - getInventory().setInventorySlotContents(slot, null); - getInventory().markDirty(); + if (!result.isEmpty()) { + Map visited = new HashMap(); + List steps = new ArrayList(); + steps.add(con.getLocation()); + calculateDistances(result, visited, steps, 0); + + sendPriority.addAll(result); + + Collections.sort(sendPriority); + } } - } - } - con.itemsExtracted(numInserted, slot); - tickDeficit = Math.round(numInserted * con.getTickTimePerItem(conDir)); - } - - int insertIntoTargets(ItemStack toExtract) { - if(toExtract == null) { - return 0; } - int totalToInsert = toExtract.stackSize; - int leftToInsert = totalToInsert; - boolean matchedStickyInput = false; - - Iterable targets = getTargetIterator(); - - //for (Target target : sendPriority) { - for (Target target : targets) { - if(target.stickyInput && !matchedStickyInput) { - IItemFilter of = target.inv.con.getOutputFilter(target.inv.conDir); - matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(this, toExtract); - } - if(target.stickyInput || !matchedStickyInput) { - if(target.inv.recheckInv) { - target.inv.updateInventory(); + private void calculateDistances( + List targets, Map visited, List steps, int distance) { + if (steps == null || steps.isEmpty()) { + return; } - int inserted = target.inv.insertItem(toExtract); - if(inserted > 0) { - toExtract.stackSize -= inserted; - leftToInsert -= inserted; + + ArrayList nextSteps = new ArrayList(); + for (BlockCoord bc : steps) { + IItemConduit con = network.conMap.get(bc); + if (con != null) { + for (ForgeDirection dir : con.getExternalConnections()) { + Target target = getTarget(targets, con, dir); + if (target != null && target.distance > distance) { + target.distance = distance; + } + } + + if (!visited.containsKey(bc)) { + visited.put(bc, distance); + } else { + int prevDist = visited.get(bc); + if (prevDist <= distance) { + continue; + } + visited.put(bc, distance); + } + + for (ForgeDirection dir : con.getConduitConnections()) { + nextSteps.add(bc.getLocation(dir)); + } + } } - if(leftToInsert <= 0) { - return totalToInsert; + calculateDistances(targets, visited, nextSteps, distance + 1); + } + + private Target getTarget(List targets, IItemConduit con, ForgeDirection dir) { + if (targets == null || con == null || con.getLocation() == null) { + return null; } - } + for (Target target : targets) { + BlockCoord targetConLoc = null; + if (target != null && target.inv != null && target.inv.con != null) { + targetConLoc = target.inv.con.getLocation(); + } + if (targetConLoc != null && target.inv.conDir == dir && targetConLoc.equals(con.getLocation())) { + return target; + } + } + return null; } - return totalToInsert - leftToInsert; - } - private Iterable getTargetIterator() { - if(con.isRoundRobinEnabled(conDir)) { - return rrIter; + private int distanceTo(NetworkedInventory other) { + return con.getLocation().getDistSq(other.con.getLocation()); } - return sendPriority; - } - public final void updateInventory() { - TileEntity te = world.getTileEntity(location.x, location.y, location.z); - if(te instanceof ISidedInventory) { - inv = (ISidedInventory) te; - } else if(te instanceof IInventory) { - inv = new InventoryWrapper((IInventory) te); + public ISidedInventory getInventory() { + return inv; } - } - private int insertItem(ItemStack item) { - if(!canInsert() || item == null) { - return 0; + public ISidedInventory getInventoryRecheck() { + if (recheckInv) { + updateInventory(); + } + return inv; } - IItemFilter filter = con.getOutputFilter(conDir); - if(filter != null) { - if(!filter.doesItemPassFilter(this, item)) { - return 0; - } + + public int getInventorySide() { + return inventorySide; } - return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]); - } - void updateInsertOrder() { - sendPriority.clear(); - if(!canExtract()) { - return; + public void setInventorySide(int inventorySide) { + this.inventorySide = inventorySide; } - List result = new ArrayList(); - for (NetworkedInventory other : network.inventories) { - if((con.isSelfFeedEnabled(conDir) || (other != this)) - && other.canInsert() - && con.getInputColor(conDir) == other.con.getOutputColor(other.conDir)) { - - if(Config.itemConduitUsePhyscialDistance) { - sendPriority.add(new Target(other, distanceTo(other), other.isSticky(), other.getPriority())); + public String getLocalizedInventoryName() { + String inventoryName = getInventory().getInventoryName(); + if (inventoryName == null) { + return "null"; } else { - result.add(new Target(other, 9999999, other.isSticky(), other.getPriority())); + // don't use Lang.localize as that passes the localized string to + // String.format which might crash when it contains formatting specifiers + return StatCollector.translateToLocal(inventoryName); } - } } - if(Config.itemConduitUsePhyscialDistance) { - Collections.sort(sendPriority); - } else { - if(!result.isEmpty()) { - Map visited = new HashMap(); - List steps = new ArrayList(); - steps.add(con.getLocation()); - calculateDistances(result, visited, steps, 0); + static class Target implements Comparable { + NetworkedInventory inv; + int distance; + boolean stickyInput; + int priority; - sendPriority.addAll(result); - - Collections.sort(sendPriority); - } - } - - } - - private void calculateDistances(List targets, Map visited, List steps, int distance) { - if(steps == null || steps.isEmpty()) { - return; - } - - ArrayList nextSteps = new ArrayList(); - for (BlockCoord bc : steps) { - IItemConduit con = network.conMap.get(bc); - if(con != null) { - for (ForgeDirection dir : con.getExternalConnections()) { - Target target = getTarget(targets, con, dir); - if(target != null && target.distance > distance) { - target.distance = distance; - } + Target(NetworkedInventory inv, int distance, boolean stickyInput, int priority) { + this.inv = inv; + this.distance = distance; + this.stickyInput = stickyInput; + this.priority = priority; } - if(!visited.containsKey(bc)) { - visited.put(bc, distance); - } else { - int prevDist = visited.get(bc); - if(prevDist <= distance) { - continue; - } - visited.put(bc, distance); + @Override + public int compareTo(Target o) { + if (stickyInput && !o.stickyInput) { + return -1; + } + if (!stickyInput && o.stickyInput) { + return 1; + } + if (priority != o.priority) { + return ItemConduitNetwork.compare(o.priority, priority); + } + return ItemConduitNetwork.compare(distance, o.distance); } - - for (ForgeDirection dir : con.getConduitConnections()) { - nextSteps.add(bc.getLocation(dir)); - } - } } - calculateDistances(targets, visited, nextSteps, distance + 1); - } - - private Target getTarget(List targets, IItemConduit con, ForgeDirection dir) { - if(targets == null || con == null || con.getLocation() == null) { - return null; - } - for (Target target : targets) { - BlockCoord targetConLoc = null; - if(target != null && target.inv != null && target.inv.con != null) { - targetConLoc = target.inv.con.getLocation(); - } - if(targetConLoc != null && target.inv.conDir == dir && targetConLoc.equals(con.getLocation())) { - return target; - } - } - return null; - } - - private int distanceTo(NetworkedInventory other) { - return con.getLocation().getDistSq(other.con.getLocation()); - } - - public ISidedInventory getInventory() { - return inv; - } - - public ISidedInventory getInventoryRecheck() { - if(recheckInv) { - updateInventory(); - } - return inv; - } - - public int getInventorySide() { - return inventorySide; - } - - public void setInventorySide(int inventorySide) { - this.inventorySide = inventorySide; - } - - public String getLocalizedInventoryName() { - String inventoryName = getInventory().getInventoryName(); - if(inventoryName == null) { - return "null"; - } else { - // don't use Lang.localize as that passes the localized string to - // String.format which might crash when it contains formatting specifiers - return StatCollector.translateToLocal(inventoryName); - } - } - - static class Target implements Comparable { - NetworkedInventory inv; - int distance; - boolean stickyInput; - int priority; - - Target(NetworkedInventory inv, int distance, boolean stickyInput, int priority) { - this.inv = inv; - this.distance = distance; - this.stickyInput = stickyInput; - this.priority = priority; - } - - @Override - public int compareTo(Target o) { - if(stickyInput && !o.stickyInput) { - return -1; - } - if(!stickyInput && o.stickyInput) { - return 1; - } - if(priority != o.priority) { - return ItemConduitNetwork.compare(o.priority, priority); - } - return ItemConduitNetwork.compare(distance, o.distance); - } - - } } diff --git a/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java index 844f9eb0..424963f4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java @@ -1,32 +1,30 @@ package crazypants.enderio.conduit.item; public enum SpeedUpgrade { + UPGRADE("enderio:extractSpeedUpgrade", "item.itemExtractSpeedUpgrade", 15) { + @Override + public int getMaximumExtracted(int stackSize) { + return BASE_MAX_EXTRACTED + Math.min(stackSize, maxStackSize) * 4; + } + }, + DOWNGRADE("enderio:extractSpeedDowngrade", "item.itemExtractSpeedDowngrade", 1) { + @Override + public int getMaximumExtracted(int stackSize) { + return 1; + } + }; - UPGRADE("enderio:extractSpeedUpgrade", "item.itemExtractSpeedUpgrade", 15) { - @Override - public int getMaximumExtracted(int stackSize) { - return BASE_MAX_EXTRACTED + Math.min(stackSize, maxStackSize) * 4; + public static final int BASE_MAX_EXTRACTED = 4; + + public final String iconName; + public final String unlocName; + public final int maxStackSize; + + private SpeedUpgrade(String iconName, String unlocName, int maxStackSize) { + this.iconName = iconName; + this.unlocName = unlocName; + this.maxStackSize = maxStackSize; } - }, - DOWNGRADE("enderio:extractSpeedDowngrade", "item.itemExtractSpeedDowngrade", 1) { - @Override - public int getMaximumExtracted(int stackSize) { - return 1; - } - }; - - public static final int BASE_MAX_EXTRACTED = 4; - - public final String iconName; - public final String unlocName; - public final int maxStackSize; - - private SpeedUpgrade(String iconName, String unlocName, int maxStackSize) { - this.iconName = iconName; - this.unlocName = unlocName; - this.maxStackSize = maxStackSize; - } - - public abstract int getMaximumExtracted(int stackSize); + public abstract int getMaximumExtracted(int stackSize); } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java index 96d49b77..4a6059b4 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java @@ -1,5 +1,8 @@ package crazypants.enderio.conduit.item.filter; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.item.FilterRegister; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -8,63 +11,62 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.item.FilterRegister; -public class ClearFilterRecipe implements IRecipe{ +public class ClearFilterRecipe implements IRecipe { - static { - RecipeSorter.register("EnderIO:clearFilter", ClearFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); - } - - private ItemStack output; - - @Override - public boolean matches(InventoryCrafting inv, World world) { - int count = 0; - ItemStack input = null; - - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack checkStack = inv.getStackInSlot(i); - if (checkStack != null && checkStack.getItem() instanceof IItemFilterUpgrade) { - count++; - } - input = (count == 1 && checkStack != null) ? checkStack : input; + static { + RecipeSorter.register( + "EnderIO:clearFilter", ClearFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); } - - if (count == 1 && FilterRegister.isFilterSet(input)) { - ItemStack out = input.copy(); - out.stackSize = 1; - out.stackTagCompound = null; - this.output = out; - } else { - this.output = null; + + private ItemStack output; + + @Override + public boolean matches(InventoryCrafting inv, World world) { + int count = 0; + ItemStack input = null; + + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack checkStack = inv.getStackInSlot(i); + if (checkStack != null && checkStack.getItem() instanceof IItemFilterUpgrade) { + count++; + } + input = (count == 1 && checkStack != null) ? checkStack : input; + } + + if (count == 1 && FilterRegister.isFilterSet(input)) { + ItemStack out = input.copy(); + out.stackSize = 1; + out.stackTagCompound = null; + this.output = out; + } else { + this.output = null; + } + + return count == 1 && output != null; } - - return count == 1 && output != null; - } - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - return output.copy(); - } - - @Override - public int getRecipeSize() { - return 1; - } - - @Override - public ItemStack getRecipeOutput() { - return output; - } - - @SubscribeEvent - public void onTooltip(ItemTooltipEvent event) { - if (this.output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { - event.toolTip.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigWarning")); + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + return output.copy(); } - } + @Override + public int getRecipeSize() { + return 1; + } + + @Override + public ItemStack getRecipeOutput() { + return output; + } + + @SubscribeEvent + public void onTooltip(ItemTooltipEvent event) { + if (this.output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { + event.toolTip.add(EnumChatFormatting.RED.toString() + + EnumChatFormatting.ITALIC + + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigWarning")); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java index d3d36c74..4cdc2525 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java @@ -1,69 +1,70 @@ package crazypants.enderio.conduit.item.filter; +import crazypants.enderio.conduit.item.FilterRegister; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import crazypants.enderio.conduit.item.FilterRegister; -public class CopyFilterRecipe implements IRecipe{ - - static { - RecipeSorter.register("EnderIO:copyFilter", CopyFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); - } +public class CopyFilterRecipe implements IRecipe { - private ItemStack output; - - @Override - public boolean matches(InventoryCrafting inv, World world) { - - int blankCount = 0; - ItemStack filterInput = null; - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack checkStack = inv.getStackInSlot(i); - if (checkStack != null && checkStack.getItem() instanceof IItemFilterUpgrade) { - if(FilterRegister.isFilterSet(checkStack)) { - if(filterInput != null) { - return false; - } - filterInput = checkStack; - } else { - if(!isSameTypeOrNull(filterInput, checkStack)) { - return false; - } - blankCount++; + static { + RecipeSorter.register( + "EnderIO:copyFilter", CopyFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); + } + + private ItemStack output; + + @Override + public boolean matches(InventoryCrafting inv, World world) { + + int blankCount = 0; + ItemStack filterInput = null; + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack checkStack = inv.getStackInSlot(i); + if (checkStack != null && checkStack.getItem() instanceof IItemFilterUpgrade) { + if (FilterRegister.isFilterSet(checkStack)) { + if (filterInput != null) { + return false; + } + filterInput = checkStack; + } else { + if (!isSameTypeOrNull(filterInput, checkStack)) { + return false; + } + blankCount++; + } + } } - } + + if (blankCount == 0 || filterInput == null) { + return false; + } + output = filterInput.copy(); + output.stackSize = blankCount + 1; + return true; } - - if(blankCount == 0 || filterInput == null) { - return false; + + private boolean isSameTypeOrNull(ItemStack matchOrNull, ItemStack checkStack) { + return matchOrNull == null + || (matchOrNull.getItem() == checkStack.getItem() + && matchOrNull.getItemDamage() == checkStack.getItemDamage()); } - output = filterInput.copy(); - output.stackSize = blankCount + 1; - return true; - } + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + return output.copy(); + } - private boolean isSameTypeOrNull(ItemStack matchOrNull, ItemStack checkStack) { - return matchOrNull == null || (matchOrNull.getItem() == checkStack.getItem() && matchOrNull.getItemDamage() == checkStack.getItemDamage()); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - return output.copy(); - } - - @Override - public int getRecipeSize() { - return 1; - } - - @Override - public ItemStack getRecipeOutput() { - return output; - } + @Override + public int getRecipeSize() { + return 1; + } + @Override + public ItemStack getRecipeOutput() { + return output; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index c6323149..9ea06d61 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -1,296 +1,288 @@ package crazypants.enderio.conduit.item.filter; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.gui.item.ExistingItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterGui; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.NetworkedInventory; import io.netty.buffer.ByteBuf; - import java.util.ArrayList; import java.util.List; - import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.network.NetworkUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.conduit.item.NetworkedInventory; - public class ExistingItemFilter implements IItemFilter { - boolean matchMeta = true; - boolean useOreDict = false; - boolean convertOreDict = false; - boolean matchNBT = false; - boolean sticky = false; - private boolean blacklist = false; + boolean matchMeta = true; + boolean useOreDict = false; + boolean convertOreDict = false; + boolean matchNBT = false; + boolean sticky = false; + private boolean blacklist = false; - List snapshot = null; + List snapshot = null; - @Override - public boolean doesItemPassFilter(NetworkedInventory ni, ItemStack item) { - if(item == null) { - return false; - } - if(snapshot != null) { - return isStackInSnapshot(item) == !blacklist; - } else if(ni != null) { - return isStackInInventory(ni, item) == !blacklist; - } - return false; - } - - private boolean isStackInInventory(NetworkedInventory ni, ItemStack item) { - int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); - for (int i = 0; i < slots.length; i++) { - ItemStack stack = ni.getInventory().getStackInSlot(i); - if (stackEqual(item, stack)) { - return true; - } - } - return false; - } - - boolean isStackInSnapshot(ItemStack item) { - for(ItemStack stack : snapshot) { - if(stackEqual(item, stack)) { - return true; - } - } - return false; - } - - boolean stackEqual(ItemStack toInsert, ItemStack existing) { - if(toInsert == null || existing == null) { - return false; - } - - boolean matched = false; - if(useOreDict) { - int existingId = OreDictionary.getOreID(existing); - matched = existingId != -1 && existingId == OreDictionary.getOreID(toInsert); - } - if(!matched) { - matched = toInsert.getItem() == existing.getItem(); - if(matched && matchMeta) { - matched = toInsert.getItemDamage() == existing.getItemDamage(); - } - if(matched && matchNBT) { - matched = ItemStack.areItemStackTagsEqual(toInsert, existing); - } - } - return matched; - } - - @Override - public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { - boolean res = sticky && doesItemPassFilter(inv, item); - return res; - } - - @Override - public boolean isValid() { - return true; - } - - @Override - public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { - } - - @Override - public int getSlotCount() { - return 0; - } - - public void setSnapshot(NetworkedInventory ni) { - snapshot = new ArrayList(); - mergeSnapshot(ni); - } - - public void mergeSnapshot(NetworkedInventory ni) { - if(snapshot == null) { - snapshot = new ArrayList(); - } - int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); - for (int i = 0; i < slots.length; i++) { - ItemStack stack = ni.getInventory().getStackInSlot(i); - if(stack != null && !isStackInSnapshot(stack)) { - snapshot.add(stack); - } - } - } - - public boolean mergeSnapshot(IInventory inventory) { - if(snapshot == null) { - snapshot = new ArrayList(); - } - int size = inventory.getSizeInventory(); - boolean added = false; - for (int i = 0; i < size; i++) { - ItemStack stack = inventory.getStackInSlot(i); - if(stack != null && !isStackInSnapshot(stack)) { - snapshot.add(stack); - added = true; - } - } - return added; - } - - public List getSnapshot() { - return snapshot; - } - - public void setSnapshot(List snapshot) { - this.snapshot = snapshot; - } - - public boolean isMatchMeta() { - return matchMeta; - } - - public void setMatchMeta(boolean matchMeta) { - this.matchMeta = matchMeta; - } - - public boolean isMatchNBT() { - return matchNBT; - } - - public void setMatchNBT(boolean matchNbt) { - matchNBT = matchNbt; - } - - public boolean isUseOreDict() { - return useOreDict; - } - - public void setUseOreDict(boolean useOreDict) { - this.useOreDict = useOreDict; - } - - @Override - public boolean isSticky() { - return sticky; - } - - public void setSticky(boolean sticky) { - this.sticky = sticky; - } - - public void setBlacklist(boolean value) { - blacklist = value; - } - - public boolean isBlacklist() { - return blacklist; - } - - @Override - @SideOnly(Side.CLIENT) - public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - return new ExistingItemFilterGui(gui, itemConduit, isInput); - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - readSettingsFromNBT(nbtRoot); - - if(nbtRoot.hasKey("snapshot")) { - snapshot = new ArrayList(); - NBTTagList itemList = (NBTTagList)nbtRoot.getTag("snapshot"); - for(int i=0;i(numItems); - for (int i = 0; i < numItems; i++) { - NBTTagCompound itemTag = NetworkUtil.readNBTTagCompound(buf); - ItemStack item = ItemStack.loadItemStackFromNBT(itemTag); - if(item != null) { - snapshot.add(item); - } + return false; } - } + private boolean isStackInInventory(NetworkedInventory ni, ItemStack item) { + int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); + for (int i = 0; i < slots.length; i++) { + ItemStack stack = ni.getInventory().getStackInSlot(i); + if (stackEqual(item, stack)) { + return true; + } + } + return false; + } - @Override - public String getUnlocalizedName() { - return "gui.existing_item_filter"; - } + boolean isStackInSnapshot(ItemStack item) { + for (ItemStack stack : snapshot) { + if (stackEqual(item, stack)) { + return true; + } + } + return false; + } + + boolean stackEqual(ItemStack toInsert, ItemStack existing) { + if (toInsert == null || existing == null) { + return false; + } + + boolean matched = false; + if (useOreDict) { + int existingId = OreDictionary.getOreID(existing); + matched = existingId != -1 && existingId == OreDictionary.getOreID(toInsert); + } + if (!matched) { + matched = toInsert.getItem() == existing.getItem(); + if (matched && matchMeta) { + matched = toInsert.getItemDamage() == existing.getItemDamage(); + } + if (matched && matchNBT) { + matched = ItemStack.areItemStackTagsEqual(toInsert, existing); + } + } + return matched; + } + + @Override + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + boolean res = sticky && doesItemPassFilter(inv, item); + return res; + } + + @Override + public boolean isValid() { + return true; + } + + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) {} + + @Override + public int getSlotCount() { + return 0; + } + + public void setSnapshot(NetworkedInventory ni) { + snapshot = new ArrayList(); + mergeSnapshot(ni); + } + + public void mergeSnapshot(NetworkedInventory ni) { + if (snapshot == null) { + snapshot = new ArrayList(); + } + int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); + for (int i = 0; i < slots.length; i++) { + ItemStack stack = ni.getInventory().getStackInSlot(i); + if (stack != null && !isStackInSnapshot(stack)) { + snapshot.add(stack); + } + } + } + + public boolean mergeSnapshot(IInventory inventory) { + if (snapshot == null) { + snapshot = new ArrayList(); + } + int size = inventory.getSizeInventory(); + boolean added = false; + for (int i = 0; i < size; i++) { + ItemStack stack = inventory.getStackInSlot(i); + if (stack != null && !isStackInSnapshot(stack)) { + snapshot.add(stack); + added = true; + } + } + return added; + } + + public List getSnapshot() { + return snapshot; + } + + public void setSnapshot(List snapshot) { + this.snapshot = snapshot; + } + + public boolean isMatchMeta() { + return matchMeta; + } + + public void setMatchMeta(boolean matchMeta) { + this.matchMeta = matchMeta; + } + + public boolean isMatchNBT() { + return matchNBT; + } + + public void setMatchNBT(boolean matchNbt) { + matchNBT = matchNbt; + } + + public boolean isUseOreDict() { + return useOreDict; + } + + public void setUseOreDict(boolean useOreDict) { + this.useOreDict = useOreDict; + } + + @Override + public boolean isSticky() { + return sticky; + } + + public void setSticky(boolean sticky) { + this.sticky = sticky; + } + + public void setBlacklist(boolean value) { + blacklist = value; + } + + public boolean isBlacklist() { + return blacklist; + } + + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + return new ExistingItemFilterGui(gui, itemConduit, isInput); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + readSettingsFromNBT(nbtRoot); + + if (nbtRoot.hasKey("snapshot")) { + snapshot = new ArrayList(); + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("snapshot"); + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemTag = itemList.getCompoundTagAt(i); + ItemStack itemStack = ItemStack.loadItemStackFromNBT(itemTag); + if (itemStack != null) { + snapshot.add(itemStack); + } + } + + } else { + snapshot = null; + } + } + + protected void readSettingsFromNBT(NBTTagCompound nbtRoot) { + matchMeta = nbtRoot.getBoolean("matchMeta"); + matchNBT = nbtRoot.getBoolean("matchNBT"); + useOreDict = nbtRoot.getBoolean("useOreDict"); + sticky = nbtRoot.getBoolean("sticky"); + blacklist = nbtRoot.getBoolean("blacklist"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + writeSettingToNBT(nbtRoot); + + if (snapshot != null) { + + NBTTagList itemList = new NBTTagList(); + for (ItemStack item : snapshot) { + if (item != null) { + NBTTagCompound itemTag = new NBTTagCompound(); + item.writeToNBT(itemTag); + itemList.appendTag(itemTag); + } + } + nbtRoot.setTag("snapshot", itemList); + } + } + + protected void writeSettingToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setBoolean("matchMeta", matchMeta); + nbtRoot.setBoolean("matchNBT", matchNBT); + nbtRoot.setBoolean("useOreDict", useOreDict); + nbtRoot.setBoolean("sticky", sticky); + nbtRoot.setBoolean("blacklist", blacklist); + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = new NBTTagCompound(); + writeSettingToNBT(settingsTag); + NetworkUtil.writeNBTTagCompound(settingsTag, buf); + buf.writeInt(snapshot == null ? 0 : snapshot.size()); + if (snapshot == null) { + return; + } + for (ItemStack item : snapshot) { + NBTTagCompound itemRoot = new NBTTagCompound(); + item.writeToNBT(itemRoot); + NetworkUtil.writeNBTTagCompound(itemRoot, buf); + } + } + + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = NetworkUtil.readNBTTagCompound(buf); + readSettingsFromNBT(settingsTag); + int numItems = buf.readInt(); + if (numItems == 0) { + snapshot = null; + return; + } + snapshot = new ArrayList(numItems); + for (int i = 0; i < numItems; i++) { + NBTTagCompound itemTag = NetworkUtil.readNBTTagCompound(buf); + ItemStack item = ItemStack.loadItemStackFromNBT(itemTag); + if (item != null) { + snapshot.add(item); + } + } + } + + @Override + public String getUnlocalizedName() { + return "gui.existing_item_filter"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java b/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java index 73e4efd8..d7e176a6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/FuzzyMode.java @@ -4,71 +4,70 @@ import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.CycleButton; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - import java.util.Arrays; import java.util.List; import java.util.Locale; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public enum FuzzyMode implements CycleButton.ICycleEnum { - DISABLED(IconEIO.FILTER_FUZZY_DISABLED) { - @Override - boolean compare(ItemStack stack) { - return false; + DISABLED(IconEIO.FILTER_FUZZY_DISABLED) { + @Override + boolean compare(ItemStack stack) { + return false; + } + }, + FUZZY_25(IconEIO.FILTER_FUZZY_25) { + @Override + boolean compare(ItemStack stack) { + return compareQuarter(stack, 1); + } + }, + FUZZY_50(IconEIO.FILTER_FUZZY_50) { + @Override + boolean compare(ItemStack stack) { + return compareQuarter(stack, 2); + } + }, + FUZZY_75(IconEIO.FILTER_FUZZY_75) { + @Override + boolean compare(ItemStack stack) { + return compareQuarter(stack, 3); + } + }, + FUZZY_99(IconEIO.FILTER_FUZZY_99) { + @Override + boolean compare(ItemStack stack) { + return stack.getItemDamageForDisplay() >= 1; + } + }; + + final IWidgetIcon icon; + + private FuzzyMode(IWidgetIcon icon) { + this.icon = icon; } - }, - FUZZY_25(IconEIO.FILTER_FUZZY_25) { - @Override - boolean compare(ItemStack stack) { - return compareQuarter(stack, 1); + + abstract boolean compare(ItemStack stack); + + private static boolean compareQuarter(ItemStack stack, int ratio) { + return stack.getItemDamageForDisplay() * 4 >= stack.getMaxDamage() * ratio; } - }, - FUZZY_50(IconEIO.FILTER_FUZZY_50) { + @Override - boolean compare(ItemStack stack) { - return compareQuarter(stack, 2); + public IWidgetIcon getIcon() { + return icon; } - }, - FUZZY_75(IconEIO.FILTER_FUZZY_75) { + @Override - boolean compare(ItemStack stack) { - return compareQuarter(stack, 3); + public List getTooltipLines() { + return Arrays.asList( + EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))), + EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.0"), + EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.1"), + EnumChatFormatting.GRAY + + EnderIO.lang.localize( + "gui.conduit.item.fuzzy.tooltip.2", + EnderIO.lang.localize("gui.conduit.item.whitelist"))); } - }, - FUZZY_99(IconEIO.FILTER_FUZZY_99) { - @Override - boolean compare(ItemStack stack) { - return stack.getItemDamageForDisplay() >= 1; - } - }; - - final IWidgetIcon icon; - - private FuzzyMode(IWidgetIcon icon) { - this.icon = icon; - } - - abstract boolean compare(ItemStack stack); - - private static boolean compareQuarter(ItemStack stack, int ratio) { - return stack.getItemDamageForDisplay() * 4 >= stack.getMaxDamage() * ratio; - } - - @Override - public IWidgetIcon getIcon() { - return icon; - } - - @Override - public List getTooltipLines() { - return Arrays.asList( - EnderIO.lang.localize("gui.conduit.item.fuzzy.".concat(name().toLowerCase(Locale.US))), - EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.0"), - EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.1"), - EnumChatFormatting.GRAY + EnderIO.lang.localize("gui.conduit.item.fuzzy.tooltip.2", - EnderIO.lang.localize("gui.conduit.item.whitelist")) - ); - } - } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index 8cdfae02..dfc818f0 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -1,54 +1,49 @@ package crazypants.enderio.conduit.item.filter; +import com.enderio.core.client.gui.widget.GhostSlot; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.gui.item.IItemFilterGui; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.NetworkedInventory; import io.netty.buffer.ByteBuf; - import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.client.gui.widget.GhostSlot; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.conduit.item.NetworkedInventory; - public interface IItemFilter { - @SideOnly(Side.CLIENT) - IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput); + @SideOnly(Side.CLIENT) + IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput); - void readFromNBT(NBTTagCompound nbtRoot); + void readFromNBT(NBTTagCompound nbtRoot); - void writeToNBT(NBTTagCompound nbtRoot); + void writeToNBT(NBTTagCompound nbtRoot); - void writeToByteBuf(ByteBuf buf); + void writeToByteBuf(ByteBuf buf); - void readFromByteBuf(ByteBuf buf); + void readFromByteBuf(ByteBuf buf); - /** - * Checks if the given item passes the filter or not. - * @param inv the attached inventory - or null when used without an inventory (eg for a GUI) - * @param item the item to check - * @return true if the item is allowed to pass - */ - boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item); + /** + * Checks if the given item passes the filter or not. + * @param inv the attached inventory - or null when used without an inventory (eg for a GUI) + * @param item the item to check + * @return true if the item is allowed to pass + */ + boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item); - boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item); + boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item); - boolean isValid(); + boolean isValid(); - boolean isSticky(); + boolean isSticky(); - void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb); + void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb); - int getSlotCount(); - - default String getUnlocalizedName() { - return "gui.basic_item_filter"; - } + int getSlotCount(); + default String getUnlocalizedName() { + return "gui.basic_item_filter"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilterUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilterUpgrade.java index 78aaa7c7..0e36b0c3 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilterUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilterUpgrade.java @@ -4,6 +4,5 @@ import net.minecraft.item.ItemStack; public interface IItemFilterUpgrade { - IItemFilter createFilterFromStack(ItemStack stack); - + IItemFilter createFilterFromStack(ItemStack stack); } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java index f2bf69c0..fe8b8ba3 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBasicItemFilter.java @@ -1,7 +1,14 @@ package crazypants.enderio.conduit.item.filter; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.item.FilterRegister; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,100 +18,89 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import com.enderio.core.client.handlers.SpecialTooltipHandler; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.item.FilterRegister; - public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade { - public static ItemBasicItemFilter create() { - ItemBasicItemFilter result = new ItemBasicItemFilter(); - result.init(); - return result; - } - - private final IIcon[] icons; - - protected ItemBasicItemFilter() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemBasicFilterUpgrade.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - - icons = new IIcon[2]; - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemBasicFilterUpgrade.unlocalisedName); - } - - @Override - public IItemFilter createFilterFromStack(ItemStack stack) { - int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); - ItemFilter filter; - if(damage == 0) { - filter = new ItemFilter(false); - } else { - filter = new ItemFilter(true); + public static ItemBasicItemFilter create() { + ItemBasicItemFilter result = new ItemBasicItemFilter(); + result.init(); + return result; } - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + + private final IIcon[] icons; + + protected ItemBasicItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBasicFilterUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + + icons = new IIcon[2]; } - return filter; - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - - icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBasic"); - icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeAdvanced"); - - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); - return i == 0 ? "enderio.filterUpgradeBasic" : "enderio.filterUpgradeAdvanced"; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < 2; ++j) { - par3List.add(new ItemStack(this, 1, j)); + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBasicFilterUpgrade.unlocalisedName); } - } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(FilterRegister.isFilterSet(par1ItemStack)) { - if(!SpecialTooltipHandler.showAdvancedTooltips()) { - par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade")); - SpecialTooltipHandler.addShowDetailsTooltip(par3List); - } else { - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); - } - } else { - par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade")); + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); + ItemFilter filter; + if (damage == 0) { + filter = new ItemFilter(false); + } else { + filter = new ItemFilter(true); + } + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; } - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + + icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBasic"); + icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeAdvanced"); + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); + return i == 0 ? "enderio.filterUpgradeBasic" : "enderio.filterUpgradeAdvanced"; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < 2; ++j) { + par3List.add(new ItemStack(this, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (FilterRegister.isFilterSet(par1ItemStack)) { + if (!SpecialTooltipHandler.showAdvancedTooltips()) { + par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade")); + SpecialTooltipHandler.addShowDetailsTooltip(par3List); + } else { + par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); + par3List.add(EnumChatFormatting.ITALIC + + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); + } + } else { + par3List.add(EnderIO.lang.localize("itemConduitFilterUpgrade")); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java index cbcacb7d..2e89bb33 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java @@ -12,60 +12,59 @@ import net.minecraft.util.MathHelper; public class ItemBigItemFilter extends ItemBasicItemFilter { - public static ItemBigItemFilter create() { - ItemBigItemFilter result = new ItemBigItemFilter(); - result.init(); - return result; - } + public static ItemBigItemFilter create() { + ItemBigItemFilter result = new ItemBigItemFilter(); + result.init(); + return result; + } - private final IIcon[] icons; + private final IIcon[] icons; - protected ItemBigItemFilter() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemBigFilterUpgrade.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - icons = new IIcon[2]; - } + protected ItemBigItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBigFilterUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + icons = new IIcon[2]; + } - protected void init() { - GameRegistry.registerItem(this, ModObject.itemBigFilterUpgrade.unlocalisedName); - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBigFilterUpgrade.unlocalisedName); + } - @Override - public IItemFilter createFilterFromStack(ItemStack stack) { - int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); - ItemFilter filter; - if(damage == 0) { - filter = new ItemFilterBig(24, false); - } else { - filter = new ItemFilterBig(24, true); - } - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); - } - return filter; - } + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1); + ItemFilter filter; + if (damage == 0) { + filter = new ItemFilterBig(24, false); + } else { + filter = new ItemFilterBig(24, true); + } + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, 1); - return icons[damage]; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + return icons[damage]; + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBig"); - icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeBigAdvanced"); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); - return i == 0 ? "enderio.filterUpgradeBig" : "enderio.filterUpgradeBigAdvanced"; - } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + icons[0] = IIconRegister.registerIcon("enderio:filterUpgradeBig"); + icons[1] = IIconRegister.registerIcon("enderio:filterUpgradeBigAdvanced"); + } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 1); + return i == 0 ? "enderio.filterUpgradeBig" : "enderio.filterUpgradeBigAdvanced"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java index 6e629168..9f921c70 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java @@ -1,22 +1,9 @@ package crazypants.enderio.conduit.item.filter; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.util.ChatUtil; import com.enderio.core.common.util.ItemUtil; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,77 +11,97 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { - public static ItemExistingItemFilter create() { - ItemExistingItemFilter result = new ItemExistingItemFilter(); - result.init(); - return result; - } - - protected ItemExistingItemFilter() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemExistingItemFilter.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemExistingItemFilter.unlocalisedName); - } - - @Override - public IItemFilter createFilterFromStack(ItemStack stack) { - IItemFilter filter = new ExistingItemFilter(); - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); - } - return filter; - } - - @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if(world.isRemote) { - return true; + public static ItemExistingItemFilter create() { + ItemExistingItemFilter result = new ItemExistingItemFilter(); + result.init(); + return result; } - if(player.isSneaking()) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IInventory) { - IInventory inv = ItemUtil.getInventory((IInventory) te); - ExistingItemFilter filter = (ExistingItemFilter) createFilterFromStack(item); - String unloc = "item.itemExistingItemFilter." + (filter.mergeSnapshot(inv) ? "filterUpdated" : "filterNotUpdated"); - ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, unloc); - FilterRegister.writeFilterToStack(filter, item); - return true; - } + protected ItemExistingItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemExistingItemFilter.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); } - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:existingItemFilter"); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(FilterRegister.isFilterSet(par1ItemStack)) { - if(SpecialTooltipHandler.showAdvancedTooltips()) { - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemExistingItemFilter.unlocalisedName); } - } + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + IItemFilter filter = new ExistingItemFilter(); + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; + } + + @Override + public boolean onItemUse( + ItemStack item, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + if (world.isRemote) { + return true; + } + + if (player.isSneaking()) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IInventory) { + IInventory inv = ItemUtil.getInventory((IInventory) te); + ExistingItemFilter filter = (ExistingItemFilter) createFilterFromStack(item); + String unloc = "item.itemExistingItemFilter." + + (filter.mergeSnapshot(inv) ? "filterUpdated" : "filterNotUpdated"); + ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, unloc); + FilterRegister.writeFilterToStack(filter, item); + return true; + } + } + + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:existingItemFilter"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (FilterRegister.isFilterSet(par1ItemStack)) { + if (SpecialTooltipHandler.showAdvancedTooltips()) { + par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); + par3List.add(EnumChatFormatting.ITALIC + + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index 22e8c246..c717367b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -11,476 +11,473 @@ import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.NetworkedInventory; import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class ItemFilter implements IInventory, IItemFilter { - private static final boolean DEFAULT_BLACKLIST = false; + private static final boolean DEFAULT_BLACKLIST = false; - private static final boolean DEFAULT_META = true; + private static final boolean DEFAULT_META = true; - private static final boolean DEFAULT_MBT = true; + private static final boolean DEFAULT_MBT = true; - private static final boolean DEFAULT_ORE_DICT = false; + private static final boolean DEFAULT_ORE_DICT = false; - private static final boolean DEFAULT_STICKY = false; + private static final boolean DEFAULT_STICKY = false; - boolean isBlacklist = DEFAULT_BLACKLIST; - boolean matchMeta = true; - boolean matchNBT = true; - boolean useOreDict = false; - boolean sticky = false; - FuzzyMode fuzzyMode = FuzzyMode.DISABLED; + boolean isBlacklist = DEFAULT_BLACKLIST; + boolean matchMeta = true; + boolean matchNBT = true; + boolean useOreDict = false; + boolean sticky = false; + FuzzyMode fuzzyMode = FuzzyMode.DISABLED; - int numItems; - ItemStack[] items; + int numItems; + ItemStack[] items; - final List oreIds; + final List oreIds; - private boolean isAdvanced; + private boolean isAdvanced; - public void copyFrom(ItemFilter o) { - isBlacklist = o.isBlacklist; - matchMeta = o.matchMeta; - matchNBT = o.matchNBT; - useOreDict = o.useOreDict; - sticky = o.sticky; - fuzzyMode = o.fuzzyMode; - items = o.items; - oreIds.clear(); - oreIds.addAll(o.oreIds); - isAdvanced = o.isAdvanced; - } - - public ItemFilter() { - this(5, false); - } - - public ItemFilter(boolean advanced) { - this(advanced ? 10 : 5, advanced); - } - - public ItemFilter(int numItems, boolean isAdvanced) { - this.isAdvanced = isAdvanced; - this.numItems = numItems; - items = new ItemStack[numItems]; - oreIds = new ArrayList(numItems); - for(int i=0;i(numItems); + for (int i = 0; i < numItems; i++) { + oreIds.add(null); } - } - - if (!matched && useOreDict && isOreDicMatch(i, item)) { - matched = true; - } - - if (matched) { - break; - } - } - return matched; - } - - private boolean isOreDicMatch(int filterItemIndex, ItemStack item) { - int[] ids1 = getCachedIds(filterItemIndex); - if(ids1 == null || ids1.length == 0) { - return false; - } - int[] ids2 = OreDictionary.getOreIDs(item); - if(ids2 == null || ids2.length == 0) { - return false; - } - for(int id1 : ids1) { - for(int id2 : ids2) { - if(id1 == id2) { - return true; - } - } - } - return false; - } - - private boolean isNBTMatch(ItemStack filter, ItemStack item) - { - if (filter.stackTagCompound == null && item.stackTagCompound == null) return true; - if (filter.stackTagCompound == null || item.stackTagCompound == null) return false; - if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound); - NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy(); - NBTTagCompound itemTag = (NBTTagCompound) item.getTagCompound().copy(); - filterTag.removeTag("GEN"); - itemTag.removeTag("GEN"); - return filterTag.equals(itemTag); - } - - private int[] getCachedIds(int filterItemIndex) { - int[] res = oreIds.get(filterItemIndex); - if(res == null) { - ItemStack item = items[filterItemIndex]; - if(item == null) { - res = new int[0]; - } else { - res = OreDictionary.getOreIDs(item); - if(res == null) { - res = new int[0]; - } - } - oreIds.set(filterItemIndex, res); - } - return res; - } - - @Override - public boolean isValid() { - //allows fuzzy mode to be not dependent from filter items - if(fuzzyMode != FuzzyMode.DISABLED) { - return true; - } - - return !isItemListEmpty(); - } - - private boolean isItemListEmpty() { - for (ItemStack item : items) { - if (item != null) { - return false; - } - } - return true; - } - - public boolean isBlacklist() { - return isBlacklist; - } - - public void setBlacklist(boolean isBlacklist) { - this.isBlacklist = isBlacklist; - } - - public boolean isMatchMeta() { - return matchMeta; - } - - public void setMatchMeta(boolean matchMeta) { - this.matchMeta = matchMeta; - } - - public boolean isMatchNBT() { - return matchNBT; - } - - public void setMatchNBT(boolean matchNbt) { - matchNBT = matchNbt; - } - - public boolean isUseOreDict() { - return useOreDict; - } - - public void setUseOreDict(boolean useOreDict) { - this.useOreDict = useOreDict; - } - - @Override - public boolean isSticky() { - return sticky; - } - - public void setSticky(boolean sticky) { - this.sticky = sticky; - } - - public FuzzyMode getFuzzyMode() { - return fuzzyMode; - } - - public void setFuzzyMode(FuzzyMode fuzzyMode) { - this.fuzzyMode = fuzzyMode; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - nbtRoot.setBoolean("isBlacklist", isBlacklist); - nbtRoot.setBoolean("matchMeta", matchMeta); - nbtRoot.setBoolean("matchNBT", matchNBT); - nbtRoot.setBoolean("useOreDict", useOreDict); - nbtRoot.setBoolean("sticky", sticky); - nbtRoot.setBoolean("isAdvanced", isAdvanced); - nbtRoot.setByte("fuzzyMode", (byte) fuzzyMode.ordinal()); - nbtRoot.setInteger("numItems", numItems); - - int i = 0; - for (ItemStack item : items) { - NBTTagCompound itemTag = new NBTTagCompound(); - if(item != null) { - item.writeToNBT(itemTag); - nbtRoot.setTag("item" + i, itemTag); - } - i++; - } - - } - - @Override - @SideOnly(Side.CLIENT) - public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); - BasicItemFilterGui basicItemFilterGui = new BasicItemFilterGui(gui, cont, !isInput, isInput); - basicItemFilterGui.createFilterSlots(); - return basicItemFilterGui; - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - isBlacklist = nbtRoot.getBoolean("isBlacklist"); - matchMeta = nbtRoot.getBoolean("matchMeta"); - matchNBT = nbtRoot.getBoolean("matchNBT"); - useOreDict = nbtRoot.getBoolean("useOreDict"); - sticky = nbtRoot.getBoolean("sticky"); - isAdvanced = nbtRoot.getBoolean("isAdvanced"); - fuzzyMode = FuzzyMode.values()[nbtRoot.getByte("fuzzyMode") & 255]; - numItems = nbtRoot.getInteger("numItems"); - - if(numItems<10 && isAdvanced) numItems = 10; - else if(numItems<5 && !isAdvanced) numItems = 5; - - items = new ItemStack[numItems]; - oreIds.clear(); - for(int i=0;i= items.length) { - return null; - } - return items[i]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - oreIds.set(fromSlot, null); - ItemStack item = items[fromSlot]; - items[fromSlot] = null; - if(item == null) { - return null; - } - item.stackSize = 0; - return item; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - if(itemstack != null) { - items[i] = itemstack.copy(); - items[i].stackSize = 0; - } else { - items[i] = null; - } - oreIds.set(i, null); - } - - @Override - public String getInventoryName() { - return "Item Filter"; - } - - @Override - public int getInventoryStackLimit() { - return 0; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public void markDirty() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - - @Override - public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { - int topY = yOffset; - int leftX = xOffset; - int index = 0; - int numRows = (int) Math.ceil(items.length/5); - for (int row = 0; row < numRows; ++row) { - for (int col = 0; col < 5; ++col) { - int x = leftX + col * 18; - int y = topY + row * 20; - slots.add(new ItemFilterGhostSlot(index, x, y, cb)); - index++; - } - } - } - - @Override - public int getSlotCount() { - return getSizeInventory(); - } - - public boolean isAdvanced() { - return isAdvanced; - } - - public boolean isDefault() { - return !isAdvanced && !isValid() && isBlacklist == DEFAULT_BLACKLIST && - matchMeta == DEFAULT_META && - matchNBT == DEFAULT_MBT && - useOreDict == DEFAULT_ORE_DICT && - sticky == DEFAULT_STICKY; - } - - @Override - public String toString() { -// return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky=" -// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]"; - return "ItemFilter [isAdvanced=" + isAdvanced + ", items=" + Arrays.toString(items) + "]"; - } - - @Override - public String getUnlocalizedName() { - return isAdvanced ? "enderio.gui.advanced_item_filter" : "gui.basic_item_filter"; - } - - class ItemFilterGhostSlot extends GhostSlot { - private final int slot; - private final Runnable cb; - - ItemFilterGhostSlot(int slot, int x, int y, Runnable cb) { - this.x = x; - this.y = y; - this.slot = slot; - this.cb = cb; } @Override - public void putStack(ItemStack stack) { - if(stack != null) { - stack = stack.copy(); - stack.stackSize = 1; - } - items[slot] = stack; - cb.run(); + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + return isSticky() && itemMatched(item); } @Override - public ItemStack getStack() { - return items[slot]; + public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { + return doesItemPassFilter(item); + } + + @SuppressWarnings("SimplifiableConditionalExpression") + public boolean doesItemPassFilter(ItemStack item) { + boolean allow = isValid() && itemMatched(item); + + return isBlacklist ? !allow : allow; + } + + private boolean itemMatched(ItemStack item) { + if (item == null) { + return false; + } + + boolean checkDamage = fuzzyMode != FuzzyMode.DISABLED; + boolean damageMatched = false; + if (checkDamage && item.getItem().isDamageable()) { + damageMatched = fuzzyMode.compare(item); + } + + if (isItemListEmpty()) { + if (checkDamage) { + return damageMatched; + } else { + return false; + } + } + + boolean matched = false; + + for (int i = 0; i < items.length; i++) { + ItemStack it = items[i]; + + if (it != null && item.getItem() == it.getItem()) { + matched = true; + + if (checkDamage && !damageMatched) { + matched = false; + } else if (matchMeta && item.getItemDamage() != it.getItemDamage()) { + matched = false; + } else if (matchNBT && !isNBTMatch(item, it)) { + matched = false; + } + } + + if (!matched && useOreDict && isOreDicMatch(i, item)) { + matched = true; + } + + if (matched) { + break; + } + } + return matched; + } + + private boolean isOreDicMatch(int filterItemIndex, ItemStack item) { + int[] ids1 = getCachedIds(filterItemIndex); + if (ids1 == null || ids1.length == 0) { + return false; + } + int[] ids2 = OreDictionary.getOreIDs(item); + if (ids2 == null || ids2.length == 0) { + return false; + } + for (int id1 : ids1) { + for (int id2 : ids2) { + if (id1 == id2) { + return true; + } + } + } + return false; + } + + private boolean isNBTMatch(ItemStack filter, ItemStack item) { + if (filter.stackTagCompound == null && item.stackTagCompound == null) return true; + if (filter.stackTagCompound == null || item.stackTagCompound == null) return false; + if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound); + NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy(); + NBTTagCompound itemTag = (NBTTagCompound) item.getTagCompound().copy(); + filterTag.removeTag("GEN"); + itemTag.removeTag("GEN"); + return filterTag.equals(itemTag); + } + + private int[] getCachedIds(int filterItemIndex) { + int[] res = oreIds.get(filterItemIndex); + if (res == null) { + ItemStack item = items[filterItemIndex]; + if (item == null) { + res = new int[0]; + } else { + res = OreDictionary.getOreIDs(item); + if (res == null) { + res = new int[0]; + } + } + oreIds.set(filterItemIndex, res); + } + return res; + } + + @Override + public boolean isValid() { + // allows fuzzy mode to be not dependent from filter items + if (fuzzyMode != FuzzyMode.DISABLED) { + return true; + } + + return !isItemListEmpty(); + } + + private boolean isItemListEmpty() { + for (ItemStack item : items) { + if (item != null) { + return false; + } + } + return true; + } + + public boolean isBlacklist() { + return isBlacklist; + } + + public void setBlacklist(boolean isBlacklist) { + this.isBlacklist = isBlacklist; + } + + public boolean isMatchMeta() { + return matchMeta; + } + + public void setMatchMeta(boolean matchMeta) { + this.matchMeta = matchMeta; + } + + public boolean isMatchNBT() { + return matchNBT; + } + + public void setMatchNBT(boolean matchNbt) { + matchNBT = matchNbt; + } + + public boolean isUseOreDict() { + return useOreDict; + } + + public void setUseOreDict(boolean useOreDict) { + this.useOreDict = useOreDict; + } + + @Override + public boolean isSticky() { + return sticky; + } + + public void setSticky(boolean sticky) { + this.sticky = sticky; + } + + public FuzzyMode getFuzzyMode() { + return fuzzyMode; + } + + public void setFuzzyMode(FuzzyMode fuzzyMode) { + this.fuzzyMode = fuzzyMode; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setBoolean("isBlacklist", isBlacklist); + nbtRoot.setBoolean("matchMeta", matchMeta); + nbtRoot.setBoolean("matchNBT", matchNBT); + nbtRoot.setBoolean("useOreDict", useOreDict); + nbtRoot.setBoolean("sticky", sticky); + nbtRoot.setBoolean("isAdvanced", isAdvanced); + nbtRoot.setByte("fuzzyMode", (byte) fuzzyMode.ordinal()); + nbtRoot.setInteger("numItems", numItems); + + int i = 0; + for (ItemStack item : items) { + NBTTagCompound itemTag = new NBTTagCompound(); + if (item != null) { + item.writeToNBT(itemTag); + nbtRoot.setTag("item" + i, itemTag); + } + i++; + } + } + + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); + BasicItemFilterGui basicItemFilterGui = new BasicItemFilterGui(gui, cont, !isInput, isInput); + basicItemFilterGui.createFilterSlots(); + return basicItemFilterGui; + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + isBlacklist = nbtRoot.getBoolean("isBlacklist"); + matchMeta = nbtRoot.getBoolean("matchMeta"); + matchNBT = nbtRoot.getBoolean("matchNBT"); + useOreDict = nbtRoot.getBoolean("useOreDict"); + sticky = nbtRoot.getBoolean("sticky"); + isAdvanced = nbtRoot.getBoolean("isAdvanced"); + fuzzyMode = FuzzyMode.values()[nbtRoot.getByte("fuzzyMode") & 255]; + numItems = nbtRoot.getInteger("numItems"); + + if (numItems < 10 && isAdvanced) numItems = 10; + else if (numItems < 5 && !isAdvanced) numItems = 5; + + items = new ItemStack[numItems]; + oreIds.clear(); + for (int i = 0; i < numItems; i++) { + oreIds.add(null); + } + for (int i = 0; i < numItems; i++) { + NBTBase tag = nbtRoot.getTag("item" + i); + if (tag instanceof NBTTagCompound) { + items[i] = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag); + } else { + items[i] = null; + } + } + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound root = new NBTTagCompound(); + writeToNBT(root); + NetworkUtil.writeNBTTagCompound(root, buf); + } + + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + readFromNBT(tag); + } + + @Override + public int getSizeInventory() { + return items.length; + } + + @Override + public ItemStack getStackInSlot(int i) { + if (i < 0 || i >= items.length) { + return null; + } + return items[i]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + oreIds.set(fromSlot, null); + ItemStack item = items[fromSlot]; + items[fromSlot] = null; + if (item == null) { + return null; + } + item.stackSize = 0; + return item; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + if (itemstack != null) { + items[i] = itemstack.copy(); + items[i].stackSize = 0; + } else { + items[i] = null; + } + oreIds.set(i, null); + } + + @Override + public String getInventoryName() { + return "Item Filter"; + } + + @Override + public int getInventoryStackLimit() { + return 0; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public void markDirty() {} + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return true; + } + + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { + int topY = yOffset; + int leftX = xOffset; + int index = 0; + int numRows = (int) Math.ceil(items.length / 5); + for (int row = 0; row < numRows; ++row) { + for (int col = 0; col < 5; ++col) { + int x = leftX + col * 18; + int y = topY + row * 20; + slots.add(new ItemFilterGhostSlot(index, x, y, cb)); + index++; + } + } + } + + @Override + public int getSlotCount() { + return getSizeInventory(); + } + + public boolean isAdvanced() { + return isAdvanced; + } + + public boolean isDefault() { + return !isAdvanced + && !isValid() + && isBlacklist == DEFAULT_BLACKLIST + && matchMeta == DEFAULT_META + && matchNBT == DEFAULT_MBT + && useOreDict == DEFAULT_ORE_DICT + && sticky == DEFAULT_STICKY; + } + + @Override + public String toString() { + // return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + + // ", useOreDict=" + useOreDict + ", sticky=" + // + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", + // isAdvanced=" + isAdvanced + "]"; + return "ItemFilter [isAdvanced=" + isAdvanced + ", items=" + Arrays.toString(items) + "]"; + } + + @Override + public String getUnlocalizedName() { + return isAdvanced ? "enderio.gui.advanced_item_filter" : "gui.basic_item_filter"; + } + + class ItemFilterGhostSlot extends GhostSlot { + private final int slot; + private final Runnable cb; + + ItemFilterGhostSlot(int slot, int x, int y, Runnable cb) { + this.x = x; + this.y = y; + this.slot = slot; + this.cb = cb; + } + + @Override + public void putStack(ItemStack stack) { + if (stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + } + items[slot] = stack; + cb.run(); + } + + @Override + public ItemStack getStack() { + return items[slot]; + } } - } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java index 1a202551..d16b54bd 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java @@ -1,73 +1,71 @@ package crazypants.enderio.conduit.item.filter; -import java.util.List; - import com.enderio.core.client.gui.widget.GhostSlot; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.gui.GuiExternalConnection; -import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; import crazypants.enderio.conduit.gui.item.BigItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterGui; import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer; import crazypants.enderio.conduit.item.IItemConduit; +import java.util.List; public class ItemFilterBig extends ItemFilter { - public ItemFilterBig() { - this(24,false); - } - - public ItemFilterBig(int numItems, boolean isAdvanced) { - super(numItems, isAdvanced); - } - - @Override - public String getInventoryName() { - return "Big Item Filter"; - } - - @Override - @SideOnly(Side.CLIENT) - public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); - BigItemFilterGui bigItemFilterGui = new BigItemFilterGui(gui, cont, !isInput, isInput); - bigItemFilterGui.createFilterSlots(); - return bigItemFilterGui; - } - - @Override - public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { - int topY = yOffset; - int leftX = xOffset; - int index = 0; - int numRows = (int) Math.ceil(items.length/8); - for (int row = 0; row < numRows; ++row) { - for (int col = 0; col < 8; ++col) { - int x = leftX + col * 18; - int y = topY + row * 18; - slots.add(new ItemFilterGhostSlot(index, x, y, cb)); - index++; - } + public ItemFilterBig() { + this(24, false); } - } - @Override - public int getSlotCount() { - return getSizeInventory(); - } + public ItemFilterBig(int numItems, boolean isAdvanced) { + super(numItems, isAdvanced); + } + @Override + public String getInventoryName() { + return "Big Item Filter"; + } - @Override - public String toString() { -// return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky=" -// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]"; - return "Big"+super.toString(); - } + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); + BigItemFilterGui bigItemFilterGui = new BigItemFilterGui(gui, cont, !isInput, isInput); + bigItemFilterGui.createFilterSlots(); + return bigItemFilterGui; + } - @Override - public String getUnlocalizedName() { - return isAdvanced() ? "gui.big_advanced_item_filter" : "gui.big_item_filter"; - } + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { + int topY = yOffset; + int leftX = xOffset; + int index = 0; + int numRows = (int) Math.ceil(items.length / 8); + for (int row = 0; row < numRows; ++row) { + for (int col = 0; col < 8; ++col) { + int x = leftX + col * 18; + int y = topY + row * 18; + slots.add(new ItemFilterGhostSlot(index, x, y, cb)); + index++; + } + } + } + + @Override + public int getSlotCount() { + return getSizeInventory(); + } + + @Override + public String toString() { + // return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + + // ", useOreDict=" + useOreDict + ", sticky=" + // + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", + // isAdvanced=" + isAdvanced + "]"; + return "Big" + super.toString(); + } + + @Override + public String getUnlocalizedName() { + return isAdvanced() ? "gui.big_advanced_item_filter" : "gui.big_item_filter"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java index 00637540..c94b2864 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemModItemFilter.java @@ -1,16 +1,7 @@ package crazypants.enderio.conduit.item.filter; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,55 +9,61 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class ItemModItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { - public static ItemModItemFilter create() { - ItemModItemFilter result = new ItemModItemFilter(); - result.init(); - return result; - } - - protected ItemModItemFilter() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemModItemFilter.unlocalisedName); - setMaxDamage(0); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemModItemFilter.unlocalisedName); - } - - @Override - public IItemFilter createFilterFromStack(ItemStack stack) { - IItemFilter filter = new ModItemFilter(); - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + public static ItemModItemFilter create() { + ItemModItemFilter result = new ItemModItemFilter(); + result.init(); + return result; } - return filter; - } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:modItemFilter"); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(FilterRegister.isFilterSet(par1ItemStack)) { - if(SpecialTooltipHandler.showAdvancedTooltips()) { - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); - par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); - } + protected ItemModItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemModItemFilter.unlocalisedName); + setMaxDamage(0); + setMaxStackSize(64); } - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemModItemFilter.unlocalisedName); + } + + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + IItemFilter filter = new ModItemFilter(); + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:modItemFilter"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (FilterRegister.isFilterSet(par1ItemStack)) { + if (SpecialTooltipHandler.showAdvancedTooltips()) { + par3List.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("itemConduitFilterUpgrade.configured")); + par3List.add(EnumChatFormatting.ITALIC + + EnderIO.lang.localize("itemConduitFilterUpgrade.clearConfigMethod")); + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java index 2246ba27..d8e3da3b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemPowerItemFilter.java @@ -1,16 +1,14 @@ package crazypants.enderio.conduit.item.filter; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; /** * @@ -18,47 +16,46 @@ import crazypants.enderio.ModObject; */ public class ItemPowerItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider { - public static ItemPowerItemFilter create() { - ItemPowerItemFilter result = new ItemPowerItemFilter(); - result.init(); - return result; - } - - protected ItemPowerItemFilter() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemPowerItemFilter.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemPowerItemFilter.unlocalisedName); - } - - @Override - public IItemFilter createFilterFromStack(ItemStack stack) { - IItemFilter filter = new PowerItemFilter(); - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { - filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + public static ItemPowerItemFilter create() { + ItemPowerItemFilter result = new ItemPowerItemFilter(); + result.init(); + return result; } - return filter; - } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:filterUpgradePower"); - } + protected ItemPowerItemFilter() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemPowerItemFilter.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + } - @Override - public String getUnlocalizedName(ItemStack stack) { - return getUnlocalizedName(); - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemPowerItemFilter.unlocalisedName); + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + public IItemFilter createFilterFromStack(ItemStack stack) { + IItemFilter filter = new PowerItemFilter(); + if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) { + filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter")); + } + return filter; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:filterUpgradePower"); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java index 7eae2450..f7d79a60 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java @@ -1,170 +1,165 @@ package crazypants.enderio.conduit.item.filter; -import crazypants.enderio.conduit.gui.GuiExternalConnection; -import crazypants.enderio.conduit.gui.item.IItemFilterGui; -import crazypants.enderio.conduit.gui.item.ModItemFilterGui; -import crazypants.enderio.conduit.item.IItemConduit; -import io.netty.buffer.ByteBuf; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.conduit.gui.GuiExternalConnection; +import crazypants.enderio.conduit.gui.item.IItemFilterGui; +import crazypants.enderio.conduit.gui.item.ModItemFilterGui; +import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.NetworkedInventory; +import io.netty.buffer.ByteBuf; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class ModItemFilter implements IItemFilter { - private final String[] mods = new String[3]; - private boolean blacklist = false; + private final String[] mods = new String[3]; + private boolean blacklist = false; - public String setMod(int index, ItemStack itemStack) { - if(index < 0 || index >= mods.length) { - return null; - } - - if(itemStack == null || itemStack.getItem() == null) { - setMod(index, (String) null); - return null; - } - UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(itemStack.getItem()); - if(ui == null) { - setMod(index, (String) null); - return null; - } - String targetMod = ui.modId; - if(targetMod == null) { - setMod(index, (String) null); - return null; - } - setMod(index, targetMod); - return targetMod; - } - - public void setMod(int index, String mod) { - if(index < 0 || index >= mods.length) { - return; - } - mods[index] = mod; - } - - public String getModAt(int index) { - if(index < 0 || index >= mods.length) { - return null; - } - return mods[index]; - } - - public void setBlacklist(boolean value) { - blacklist = value; - } - - public boolean isBlacklist() { - return blacklist; - } - - @Override - public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { - if(item == null || item.getItem() == null) { - return false; - } - UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(item.getItem()); - if(ui == null) { - return false; - } - String targetMod = ui.modId; - if (targetMod != null) { - for (String mod : mods) { - if (targetMod.equals(mod)) { - return !blacklist; + public String setMod(int index, ItemStack itemStack) { + if (index < 0 || index >= mods.length) { + return null; } - } + + if (itemStack == null || itemStack.getItem() == null) { + setMod(index, (String) null); + return null; + } + UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(itemStack.getItem()); + if (ui == null) { + setMod(index, (String) null); + return null; + } + String targetMod = ui.modId; + if (targetMod == null) { + setMod(index, (String) null); + return null; + } + setMod(index, targetMod); + return targetMod; } - return blacklist; - } - @Override - public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { - return false; - } - - @Override - public boolean isSticky() { - return false; - } - - @Override - public boolean isValid() { - return true; - } - - @Override - public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { - } - - @Override - public int getSlotCount() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - return new ModItemFilterGui(gui, itemConduit, isInput); - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - for (int i = 0; i < mods.length; i++) { - String mod = nbtRoot.getString("mod" + i); - if(mod == null || mod.isEmpty() || "-".equals(mod)) { - mods[i] = null; - } else { - mods[i] = mod; - } - if (nbtRoot.hasKey("blacklist")) { - blacklist = nbtRoot.getBoolean("blacklist"); - } else { - blacklist = false; - } + public void setMod(int index, String mod) { + if (index < 0 || index >= mods.length) { + return; + } + mods[index] = mod; } - } - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - for (int i = 0; i < mods.length; i++) { - String mod = mods[i]; - if(mod == null || mod.trim().isEmpty()) { - nbtRoot.setString("mod" + i, "-"); - } else { - nbtRoot.setString("mod" + i, mod); - } + public String getModAt(int index) { + if (index < 0 || index >= mods.length) { + return null; + } + return mods[index]; } - nbtRoot.setBoolean("blacklist", blacklist); - } - @Override - public void writeToByteBuf(ByteBuf buf) { - NBTTagCompound root = new NBTTagCompound(); - writeToNBT(root); - NetworkUtil.writeNBTTagCompound(root, buf); - } + public void setBlacklist(boolean value) { + blacklist = value; + } - @Override - public void readFromByteBuf(ByteBuf buf) { - NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); - readFromNBT(tag); - } + public boolean isBlacklist() { + return blacklist; + } - @Override - public String getUnlocalizedName() { - return "gui.mod_item_filter"; - } + @Override + public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { + if (item == null || item.getItem() == null) { + return false; + } + UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(item.getItem()); + if (ui == null) { + return false; + } + String targetMod = ui.modId; + if (targetMod != null) { + for (String mod : mods) { + if (targetMod.equals(mod)) { + return !blacklist; + } + } + } + return blacklist; + } + + @Override + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + return false; + } + + @Override + public boolean isSticky() { + return false; + } + + @Override + public boolean isValid() { + return true; + } + + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) {} + + @Override + public int getSlotCount() { + return 0; + } + + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + return new ModItemFilterGui(gui, itemConduit, isInput); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + for (int i = 0; i < mods.length; i++) { + String mod = nbtRoot.getString("mod" + i); + if (mod == null || mod.isEmpty() || "-".equals(mod)) { + mods[i] = null; + } else { + mods[i] = mod; + } + if (nbtRoot.hasKey("blacklist")) { + blacklist = nbtRoot.getBoolean("blacklist"); + } else { + blacklist = false; + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + for (int i = 0; i < mods.length; i++) { + String mod = mods[i]; + if (mod == null || mod.trim().isEmpty()) { + nbtRoot.setString("mod" + i, "-"); + } else { + nbtRoot.setString("mod" + i, mod); + } + } + nbtRoot.setBoolean("blacklist", blacklist); + } + + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound root = new NBTTagCompound(); + writeToNBT(root); + NetworkUtil.writeNBTTagCompound(root, buf); + } + + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + readFromNBT(tag); + } + + @Override + public String getUnlocalizedName() { + return "gui.mod_item_filter"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index e8f402fa..3d53dcc5 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -1,23 +1,19 @@ package crazypants.enderio.conduit.item.filter; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.network.NetworkUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.gui.item.IItemFilterGui; import crazypants.enderio.conduit.gui.item.PowerItemFilterGui; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.NetworkedInventory; import io.netty.buffer.ByteBuf; - import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cofh.api.energy.IEnergyContainerItem; - -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.network.NetworkUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.conduit.item.NetworkedInventory; /** * @@ -25,139 +21,144 @@ import crazypants.enderio.conduit.item.NetworkedInventory; */ public class PowerItemFilter implements IItemFilter { - public enum CmpMode { - LESS, - LESS_EQUAL, - EQUAL, - MORE_EQUAL, - MORE; + public enum CmpMode { + LESS, + LESS_EQUAL, + EQUAL, + MORE_EQUAL, + MORE; - public CmpMode next() { - CmpMode[] values = values(); - return values[(ordinal() + 1) % values.length]; + public CmpMode next() { + CmpMode[] values = values(); + return values[(ordinal() + 1) % values.length]; + } + + public CmpMode prev() { + CmpMode[] values = values(); + return values[(ordinal() - 1 + values.length) % values.length]; + } } - public CmpMode prev() { - CmpMode[] values = values(); - return values[(ordinal() - 1 + values.length) % values.length]; + public static final int MAX_LEVEL = 4; + + CmpMode mode = CmpMode.EQUAL; + boolean sticky; + int level = MAX_LEVEL; + + @Override + public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { + if (item != null && item.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int ref = (int) ((long) max * level / MAX_LEVEL); + + switch (mode) { + case LESS: + return cur < ref; + case LESS_EQUAL: + return cur <= ref; + case EQUAL: + return cur == ref; + case MORE_EQUAL: + return cur >= ref; + case MORE: + return cur > ref; + default: + return false; + } + } + return false; } - } - public static final int MAX_LEVEL = 4; - - CmpMode mode = CmpMode.EQUAL; - boolean sticky; - int level = MAX_LEVEL; - - @Override - public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) { - if(item != null && item.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - - int max = chargable.getMaxEnergyStored(item); - int cur = chargable.getEnergyStored(item); - int ref = (int)((long)max * level / MAX_LEVEL); - - switch (mode) { - case LESS: return cur < ref; - case LESS_EQUAL: return cur <= ref; - case EQUAL: return cur == ref; - case MORE_EQUAL: return cur >= ref; - case MORE: return cur > ref; - default: return false; - } + @Override + public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { + boolean res = sticky && doesItemPassFilter(inv, item); + return res; } - return false; - } - @Override - public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) { - boolean res = sticky && doesItemPassFilter(inv, item); - return res; - } + @Override + public boolean isValid() { + return true; + } - @Override - public boolean isValid() { - return true; - } + @Override + public boolean isSticky() { + return sticky; + } - @Override - public boolean isSticky() { - return sticky; - } + public void setSticky(boolean sticky) { + this.sticky = sticky; + } - public void setSticky(boolean sticky) { - this.sticky = sticky; - } + @Override + public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) {} - @Override - public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) { - } + @Override + public int getSlotCount() { + return 0; + } - @Override - public int getSlotCount() { - return 0; - } + public CmpMode getMode() { + return mode; + } - public CmpMode getMode() { - return mode; - } + public void setMode(CmpMode mode) { + this.mode = mode; + } - public void setMode(CmpMode mode) { - this.mode = mode; - } + public int getLevel() { + return level; + } - public int getLevel() { - return level; - } + public void setLevel(int level) { + this.level = level; + } - public void setLevel(int level) { - this.level = level; - } + @Override + @SideOnly(Side.CLIENT) + public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + return new PowerItemFilterGui(gui, itemConduit, isInput); + } - @Override - @SideOnly(Side.CLIENT) - public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { - return new PowerItemFilterGui(gui, itemConduit, isInput); - } + @Override + public void readFromNBT(NBTTagCompound nbtRoot) { + readSettingsFromNBT(nbtRoot); + } - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - readSettingsFromNBT(nbtRoot); - } + protected void readSettingsFromNBT(NBTTagCompound nbtRoot) { + mode = CmpMode.values()[nbtRoot.getByte("mode") & 255]; + level = nbtRoot.getShort("level"); + sticky = nbtRoot.getBoolean("sticky"); + } - protected void readSettingsFromNBT(NBTTagCompound nbtRoot) { - mode = CmpMode.values()[nbtRoot.getByte("mode") & 255]; - level = nbtRoot.getShort("level"); - sticky = nbtRoot.getBoolean("sticky"); - } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + writeSettingToNBT(nbtRoot); + } - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - writeSettingToNBT(nbtRoot); - } + protected void writeSettingToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setByte("mode", (byte) mode.ordinal()); + nbtRoot.setShort("level", (short) level); + nbtRoot.setBoolean("sticky", sticky); + } - protected void writeSettingToNBT(NBTTagCompound nbtRoot) { - nbtRoot.setByte("mode", (byte)mode.ordinal()); - nbtRoot.setShort("level", (short)level); - nbtRoot.setBoolean("sticky", sticky); - } + @Override + public void writeToByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = new NBTTagCompound(); + writeSettingToNBT(settingsTag); + NetworkUtil.writeNBTTagCompound(settingsTag, buf); + } - @Override - public void writeToByteBuf(ByteBuf buf) { - NBTTagCompound settingsTag = new NBTTagCompound(); - writeSettingToNBT(settingsTag); - NetworkUtil.writeNBTTagCompound(settingsTag, buf); - } + @Override + public void readFromByteBuf(ByteBuf buf) { + NBTTagCompound settingsTag = NetworkUtil.readNBTTagCompound(buf); + readSettingsFromNBT(settingsTag); + } - @Override - public void readFromByteBuf(ByteBuf buf) { - NBTTagCompound settingsTag = NetworkUtil.readNBTTagCompound(buf); - readSettingsFromNBT(settingsTag); - } - - @Override - public String getUnlocalizedName() { - return "gui.power_item_filter"; - } + @Override + public String getUnlocalizedName() { + return "gui.power_item_filter"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java index 685bb7e4..b3aef388 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java @@ -16,7 +16,14 @@ import crazypants.enderio.conduit.item.ItemConduit; import crazypants.enderio.config.Config; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; - +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.function.Supplier; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,536 +35,521 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.function.Supplier; -import java.util.Set; - - public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { - public static final String ICON_KEY_INPUT = ItemConduit.ICON_KEY_INPUT; - public static final String ICON_KEY_OUTPUT = ItemConduit.ICON_KEY_OUTPUT; - public static final String ICON_KEY_IN_OUT_BG = ItemConduit.ICON_KEY_IN_OUT_BG; - public static final String ICON_KEY_IN_OUT_OUT = ItemConduit.ICON_KEY_IN_OUT_OUT; - public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN; + public static final String ICON_KEY_INPUT = ItemConduit.ICON_KEY_INPUT; + public static final String ICON_KEY_OUTPUT = ItemConduit.ICON_KEY_OUTPUT; + public static final String ICON_KEY_IN_OUT_BG = ItemConduit.ICON_KEY_IN_OUT_BG; + public static final String ICON_KEY_IN_OUT_OUT = ItemConduit.ICON_KEY_IN_OUT_OUT; + public static final String ICON_KEY_IN_OUT_IN = ItemConduit.ICON_KEY_IN_OUT_IN; - static final Map ICONS = new HashMap(); - private final Set filledFromThisTick = new HashSet<>(); - - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + static final Map ICONS = new HashMap(); + private final Set filledFromThisTick = new HashSet<>(); - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(ICON_KEY_INPUT, register.registerIcon(ICON_KEY_INPUT)); - ICONS.put(ICON_KEY_OUTPUT, register.registerIcon(ICON_KEY_OUTPUT)); - ICONS.put(ICON_KEY_IN_OUT_OUT, register.registerIcon(ICON_KEY_IN_OUT_OUT)); - ICONS.put(ICON_KEY_IN_OUT_IN, register.registerIcon(ICON_KEY_IN_OUT_IN)); - ICONS.put(ICON_KEY_IN_OUT_BG, register.registerIcon(ICON_KEY_IN_OUT_BG)); - } + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public int getTextureType() { - return 0; - } - - }); - } - - public enum Type { - ENDER( - () -> Config.enderFluidConduitExtractRate, - () -> Config.enderFluidConduitMaxIoRate), - - CRYSTALLINE( - () -> Config.crystallineEnderFluidConduitExtractRate, - () -> Config.crystallineEnderFluidConduitMaxIoRate), - - CRYSTALLINE_PINK_SLIME( - () -> Config.crystallinePinkSlimeEnderFluidConduitExtractRate, - () -> Config.crystallinePinkSlimeEnderFluidConduitMaxIoRate), - - MELODIC( - () -> Config.melodicEnderFluidConduitExtractRate, - () -> Config.melodicEnderFluidConduitMaxIoRate), - - STELLAR( - () -> Config.stellarEnderFluidConduitExtractRate, - () -> Config.stellarEnderFluidConduitMaxIoRate); - - private final Supplier getMaxExtractPerTick; - private final Supplier getMaxIoPerTick; - - Type(Supplier getMaxExtractPerTick, Supplier getMaxIoPerTick) { - this.getMaxExtractPerTick = getMaxExtractPerTick; - this.getMaxIoPerTick = getMaxIoPerTick; - } - - public int getMaxExtractPerTick() { - return getMaxExtractPerTick.get(); - } - - public int getMaxIoPerTick() { - return getMaxIoPerTick.get(); - } - } - - private EnderLiquidConduitNetwork network; - private int ticksSinceFailedExtract; - - private final EnumMap outputFilters = new EnumMap(ForgeDirection.class); - private final EnumMap inputFilters = new EnumMap(ForgeDirection.class); - - protected final EnumMap outputColors = new EnumMap(ForgeDirection.class); - protected final EnumMap inputColors = new EnumMap(ForgeDirection.class); - - private int roundRobin = 0; - - public abstract Type getType(); - public abstract int getMetadata(); - protected abstract IIcon getIconKey(); - protected abstract IIcon getIconCoreKey(); - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(player.getCurrentEquippedItem() == null) { - return false; - } - - if(ToolUtil.isToolEquipped(player)) { - - if(!getBundle().getEntity().getWorldObj().isRemote) { - - if(res != null && res.component != null) { - - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(ICON_KEY_INPUT, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT, register.registerIcon(ICON_KEY_OUTPUT)); + ICONS.put(ICON_KEY_IN_OUT_OUT, register.registerIcon(ICON_KEY_IN_OUT_OUT)); + ICONS.put(ICON_KEY_IN_OUT_IN, register.registerIcon(ICON_KEY_IN_OUT_IN)); + ICONS.put(ICON_KEY_IN_OUT_BG, register.registerIcon(ICON_KEY_IN_OUT_BG)); } - BlockCoord loc = getLocation().getLocation(faceHit); - ILiquidConduit n = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); - if(n == null) { - return false; + @Override + public int getTextureType() { + return 0; } - if(!(n instanceof AbstractEnderLiquidConduit)) { - return false; + }); + } + + public enum Type { + ENDER(() -> Config.enderFluidConduitExtractRate, () -> Config.enderFluidConduitMaxIoRate), + + CRYSTALLINE( + () -> Config.crystallineEnderFluidConduitExtractRate, + () -> Config.crystallineEnderFluidConduitMaxIoRate), + + CRYSTALLINE_PINK_SLIME( + () -> Config.crystallinePinkSlimeEnderFluidConduitExtractRate, + () -> Config.crystallinePinkSlimeEnderFluidConduitMaxIoRate), + + MELODIC(() -> Config.melodicEnderFluidConduitExtractRate, () -> Config.melodicEnderFluidConduitMaxIoRate), + + STELLAR(() -> Config.stellarEnderFluidConduitExtractRate, () -> Config.stellarEnderFluidConduitMaxIoRate); + + private final Supplier getMaxExtractPerTick; + private final Supplier getMaxIoPerTick; + + Type(Supplier getMaxExtractPerTick, Supplier getMaxIoPerTick) { + this.getMaxExtractPerTick = getMaxExtractPerTick; + this.getMaxIoPerTick = getMaxIoPerTick; + } + + public int getMaxExtractPerTick() { + return getMaxExtractPerTick.get(); + } + + public int getMaxIoPerTick() { + return getMaxIoPerTick.get(); + } + } + + private EnderLiquidConduitNetwork network; + private int ticksSinceFailedExtract; + + private final EnumMap outputFilters = + new EnumMap(ForgeDirection.class); + private final EnumMap inputFilters = + new EnumMap(ForgeDirection.class); + + protected final EnumMap outputColors = + new EnumMap(ForgeDirection.class); + protected final EnumMap inputColors = + new EnumMap(ForgeDirection.class); + + private int roundRobin = 0; + + public abstract Type getType(); + + public abstract int getMetadata(); + + protected abstract IIcon getIconKey(); + + protected abstract IIcon getIconCoreKey(); + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (player.getCurrentEquippedItem() == null) { + return false; + } + + if (ToolUtil.isToolEquipped(player)) { + + if (!getBundle().getEntity().getWorldObj().isRemote) { + + if (res != null && res.component != null) { + + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + + BlockCoord loc = getLocation().getLocation(faceHit); + ILiquidConduit n = ConduitUtil.getConduit( + getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); + if (n == null) { + return false; + } + if (!(n instanceof AbstractEnderLiquidConduit)) { + return false; + } + if (getType() != ((AbstractEnderLiquidConduit) n).getType()) { + return false; + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (containsExternalConnection(connDir)) { + // Toggle extraction mode + setConnectionMode(connDir, getNextConnectionMode(connDir)); + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + } + } } - if(getType() != ((AbstractEnderLiquidConduit) n).getType()) { - return false; + return true; + } + return false; + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemLiquidConduit, 1, getMetadata()); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + public FluidFilter getFilter(ForgeDirection dir, boolean isInput) { + if (isInput) { + return inputFilters.get(dir); + } + return outputFilters.get(dir); + } + + public void setFilter(ForgeDirection dir, FluidFilter filter, boolean isInput) { + if (isInput) { + inputFilters.put(dir, filter); + } else { + outputFilters.put(dir, filter); + } + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + this.network = null; + return true; + } + if (!(network instanceof EnderLiquidConduitNetwork)) { + return false; + } + this.network = (EnderLiquidConduitNetwork) network; + for (ForgeDirection dir : externalConnections) { + this.network.connectionChanged(this, dir); + } + + return true; + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return getIconCoreKey(); + } + return getIconKey(); + } + + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_KEY_INPUT); + } + + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_KEY_OUTPUT); + } + + public IIcon getTextureForInOutMode(boolean input) { + return input ? ICONS.get(ICON_KEY_IN_OUT_IN) : ICONS.get(ICON_KEY_IN_OUT_OUT); + } + + public IIcon getTextureForInOutBackground() { + return ICONS.get(ICON_KEY_IN_OUT_BG); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { + if (!super.canConnectToConduit(direction, con)) { + return false; + } + if (!(con instanceof AbstractEnderLiquidConduit)) { + return false; + } + if (getType() != ((AbstractEnderLiquidConduit) con).getType()) { + return false; + } + return true; + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + refreshConnections(dir); + } + + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + super.setExtractionRedstoneMode(mode, dir); + refreshConnections(dir); + } + + private void refreshConnections(ForgeDirection dir) { + if (network == null) { + return; + } + network.connectionChanged(this, dir); + } + + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + super.externalConnectionAdded(fromDirection); + refreshConnections(fromDirection); + } + + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + super.externalConnectionRemoved(fromDirection); + refreshConnections(fromDirection); + } + + @Override + public void updateEntity(World world) { + super.updateEntity(world); + filledFromThisTick.clear(); + if (world.isRemote) { + return; + } + doExtract(); + } + + private void doExtract() { + BlockCoord loc = getLocation(); + if (!hasExtractableMode()) { + return; + } + if (network == null) { + return; + } + + // assume failure, reset to 0 if we do extract + ticksSinceFailedExtract++; + if (ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { + // after 25 ticks of failing, only check every 10 ticks + return; + } + + for (ForgeDirection dir : externalConnections) { + if (autoExtractForDir(dir)) { + if (network.extractFrom(this, dir)) { + ticksSinceFailedExtract = 0; + } } - return ConduitUtil.joinConduits(this, faceHit); - } else if(containsExternalConnection(connDir)) { - // Toggle extraction mode - setConnectionMode(connDir, getNextConnectionMode(connDir)); - } else if(containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); - - } } - } - return true; - } - return false; - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemLiquidConduit, 1, getMetadata()); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - public FluidFilter getFilter(ForgeDirection dir, boolean isInput) { - if(isInput) { - return inputFilters.get(dir); - } - return outputFilters.get(dir); - } - - public void setFilter(ForgeDirection dir, FluidFilter filter, boolean isInput) { - if(isInput) { - inputFilters.put(dir, filter); - } else { - outputFilters.put(dir, filter); - } - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - if(network == null) { - this.network = null; - return true; - } - if(!(network instanceof EnderLiquidConduitNetwork)) { - return false; - } - this.network = (EnderLiquidConduitNetwork) network; - for (ForgeDirection dir : externalConnections) { - this.network.connectionChanged(this, dir); } - return true; - } + // Fluid API - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return getIconCoreKey(); - } - return getIconKey(); - } - - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_KEY_INPUT); - } - - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_KEY_OUTPUT); - } - - - public IIcon getTextureForInOutMode(boolean input) { - return input ? ICONS.get(ICON_KEY_IN_OUT_IN) : ICONS.get(ICON_KEY_IN_OUT_OUT); - } - - public IIcon getTextureForInOutBackground() { - return ICONS.get(ICON_KEY_IN_OUT_BG); - } - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { - if(!super.canConnectToConduit(direction, con)) { - return false; - } - if(!(con instanceof AbstractEnderLiquidConduit)) { - return false; - } - if(getType() != ((AbstractEnderLiquidConduit) con).getType()) { - return false; - } - return true; - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - refreshConnections(dir); - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - super.setExtractionRedstoneMode(mode, dir); - refreshConnections(dir); - } - - private void refreshConnections(ForgeDirection dir) { - if(network == null) { - return; - } - network.connectionChanged(this, dir); - } - - @Override - public void externalConnectionAdded(ForgeDirection fromDirection) { - super.externalConnectionAdded(fromDirection); - refreshConnections(fromDirection); - } - - @Override - public void externalConnectionRemoved(ForgeDirection fromDirection) { - super.externalConnectionRemoved(fromDirection); - refreshConnections(fromDirection); - } - - @Override - public void updateEntity(World world) { - super.updateEntity(world); - filledFromThisTick.clear(); - if(world.isRemote) { - return; - } - doExtract(); - } - - private void doExtract() { - BlockCoord loc = getLocation(); - if(!hasExtractableMode()) { - return; - } - if(network == null) { - return; - } - - // assume failure, reset to 0 if we do extract - ticksSinceFailedExtract++; - if(ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { - // after 25 ticks of failing, only check every 10 ticks - return; - } - - for (ForgeDirection dir : externalConnections) { - if(autoExtractForDir(dir)) { - if(network.extractFrom(this, dir)) { - ticksSinceFailedExtract = 0; + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (network == null || !getConnectionMode(from).acceptsInput()) { + return 0; } - } - } - } - - //Fluid API - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(network == null || !getConnectionMode(from).acceptsInput()) { - return 0; - } - - // Guard against things that continuously call fill! - if(filledFromThisTick.contains(getLocation().getLocation(from))) { - return 0; - } - if(doFill) { - filledFromThisTick.add(getLocation().getLocation(from)); - } - - return network.fillFrom(this, from, resource, doFill); - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(network == null) { - return false; - } - return getConnectionMode(from).acceptsInput(); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(network == null) { - return new FluidTankInfo[0]; - } - return network.getTankInfo(this, from); - } - //@Override - public DyeColor getInputColor(ForgeDirection dir) { - DyeColor result = inputColors.get(dir); - if(result == null) { - return DyeColor.GREEN; - } - return result; - } - - //@Override - public DyeColor getOutputColor(ForgeDirection dir) { - DyeColor result = outputColors.get(dir); - if(result == null) { - return DyeColor.GREEN; - } - return result; - } - //@Override - public void setInputColor(ForgeDirection dir, DyeColor col) { - inputColors.put(dir, col); - if(network != null) { - network.notifyNetworkOfUpdate(); - } - setClientStateDirty(); - collidablesDirty = true; - } - - //@Override - public void setOutputColor(ForgeDirection dir, DyeColor col) { - outputColors.put(dir, col); - if(network != null) { - network.notifyNetworkOfUpdate(); - } - setClientStateDirty(); - collidablesDirty = true; - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - super.readTypeSettings(dir, dataRoot); - - if (dataRoot.hasKey("inputColor")) { - setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); - } - if (dataRoot.hasKey("outputColor")) { - setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); - } - - if(dataRoot.hasKey("roundRobin")) { - setRoundRobin(dir, dataRoot.getBoolean("roundRobin")); - } else { - setRoundRobin(dir, true); - } - - if (dataRoot.hasKey("outputFilters")) { - FluidFilter out = new FluidFilter(); - out.readFromNBT(dataRoot.getCompoundTag("outputFilters")); - outputFilters.put(dir, out); - } - if (dataRoot.hasKey("inputFilters")) { - FluidFilter in = new FluidFilter(); - in.readFromNBT(dataRoot.getCompoundTag("inputFilters")); - inputFilters.put(dir, in); - } - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - super.writeTypeSettingsToNbt(dir, dataRoot); - - dataRoot.setShort("inputColor", (short)getInputColor(dir).ordinal()); - dataRoot.setShort("outputColor", (short)getOutputColor(dir).ordinal()); - - dataRoot.setBoolean("roundRobin", isRoundRobin(dir)); - - FluidFilter out = outputFilters.get(dir); - if (out != null) { - NBTTagCompound outTag = new NBTTagCompound(); - out.writeToNBT(outTag); - dataRoot.setTag("outputFilters", outTag); - } - FluidFilter in = inputFilters.get(dir); - if (in != null) { - NBTTagCompound inTag = new NBTTagCompound(); - in.writeToNBT(inTag); - dataRoot.setTag("inputFilters", inTag); - } - - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setInteger("roundRobin", roundRobin); - for (Entry entry : inputFilters.entrySet()) { - if(entry.getValue() != null) { - FluidFilter f = entry.getValue(); - if(f != null && !f.isDefault()) { - NBTTagCompound itemRoot = new NBTTagCompound(); - f.writeToNBT(itemRoot); - nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot); + // Guard against things that continuously call fill! + if (filledFromThisTick.contains(getLocation().getLocation(from))) { + return 0; } - } - } - for (Entry entry : outputFilters.entrySet()) { - if(entry.getValue() != null) { - FluidFilter f = entry.getValue(); - if(f != null && !f.isDefault()) { - NBTTagCompound itemRoot = new NBTTagCompound(); - f.writeToNBT(itemRoot); - nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot); + if (doFill) { + filledFromThisTick.add(getLocation().getLocation(from)); } - } - } - for (Entry entry : inputColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("inSC." + entry.getKey().name(), ord); - } + + return network.fillFrom(this, from, resource, doFill); } - for (Entry entry : outputColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("outSC." + entry.getKey().name(), ord); - } - } - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - if(nbtRoot.hasKey("roundRobin")) { - roundRobin = nbtRoot.getInteger("roundRobin"); - } else { - roundRobin = 0b111111; - } - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "inFilts." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); - FluidFilter f = new FluidFilter(); - f.readFromNBT(filterTag); - if(!f.isEmpty()) { - inputFilters.put(dir, f); + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (network == null) { + return false; } - } - - key = "outFilts." + dir.name(); - if(nbtRoot.hasKey(key)) { - NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); - FluidFilter f = new FluidFilter(); - f.readFromNBT(filterTag); - if(!f.isEmpty()) { - outputFilters.put(dir, f); - } - } - - key = "inSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - inputColors.put(dir, DyeColor.values()[ord]); - } - } - - key = "outSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - outputColors.put(dir, DyeColor.values()[ord]); - } - } + return getConnectionMode(from).acceptsInput(); } - } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; + } - public boolean isRoundRobin(ForgeDirection dir) { - return (roundRobin & dir.flag) != 0; - } + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } - public void setRoundRobin(ForgeDirection dir, boolean roundRobin) { - if (roundRobin) - this.roundRobin |= dir.flag; - else - this.roundRobin &= ~dir.flag; - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (network == null) { + return new FluidTankInfo[0]; + } + return network.getTankInfo(this, from); + } + // @Override + public DyeColor getInputColor(ForgeDirection dir) { + DyeColor result = inputColors.get(dir); + if (result == null) { + return DyeColor.GREEN; + } + return result; + } + + // @Override + public DyeColor getOutputColor(ForgeDirection dir) { + DyeColor result = outputColors.get(dir); + if (result == null) { + return DyeColor.GREEN; + } + return result; + } + // @Override + public void setInputColor(ForgeDirection dir, DyeColor col) { + inputColors.put(dir, col); + if (network != null) { + network.notifyNetworkOfUpdate(); + } + setClientStateDirty(); + collidablesDirty = true; + } + + // @Override + public void setOutputColor(ForgeDirection dir, DyeColor col) { + outputColors.put(dir, col); + if (network != null) { + network.notifyNetworkOfUpdate(); + } + setClientStateDirty(); + collidablesDirty = true; + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + super.readTypeSettings(dir, dataRoot); + + if (dataRoot.hasKey("inputColor")) { + setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); + } + if (dataRoot.hasKey("outputColor")) { + setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); + } + + if (dataRoot.hasKey("roundRobin")) { + setRoundRobin(dir, dataRoot.getBoolean("roundRobin")); + } else { + setRoundRobin(dir, true); + } + + if (dataRoot.hasKey("outputFilters")) { + FluidFilter out = new FluidFilter(); + out.readFromNBT(dataRoot.getCompoundTag("outputFilters")); + outputFilters.put(dir, out); + } + if (dataRoot.hasKey("inputFilters")) { + FluidFilter in = new FluidFilter(); + in.readFromNBT(dataRoot.getCompoundTag("inputFilters")); + inputFilters.put(dir, in); + } + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + super.writeTypeSettingsToNbt(dir, dataRoot); + + dataRoot.setShort("inputColor", (short) getInputColor(dir).ordinal()); + dataRoot.setShort("outputColor", (short) getOutputColor(dir).ordinal()); + + dataRoot.setBoolean("roundRobin", isRoundRobin(dir)); + + FluidFilter out = outputFilters.get(dir); + if (out != null) { + NBTTagCompound outTag = new NBTTagCompound(); + out.writeToNBT(outTag); + dataRoot.setTag("outputFilters", outTag); + } + FluidFilter in = inputFilters.get(dir); + if (in != null) { + NBTTagCompound inTag = new NBTTagCompound(); + in.writeToNBT(inTag); + dataRoot.setTag("inputFilters", inTag); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setInteger("roundRobin", roundRobin); + for (Entry entry : inputFilters.entrySet()) { + if (entry.getValue() != null) { + FluidFilter f = entry.getValue(); + if (f != null && !f.isDefault()) { + NBTTagCompound itemRoot = new NBTTagCompound(); + f.writeToNBT(itemRoot); + nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot); + } + } + } + for (Entry entry : outputFilters.entrySet()) { + if (entry.getValue() != null) { + FluidFilter f = entry.getValue(); + if (f != null && !f.isDefault()) { + NBTTagCompound itemRoot = new NBTTagCompound(); + f.writeToNBT(itemRoot); + nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot); + } + } + } + for (Entry entry : inputColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("inSC." + entry.getKey().name(), ord); + } + } + + for (Entry entry : outputColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("outSC." + entry.getKey().name(), ord); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + if (nbtRoot.hasKey("roundRobin")) { + roundRobin = nbtRoot.getInteger("roundRobin"); + } else { + roundRobin = 0b111111; + } + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "inFilts." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + FluidFilter f = new FluidFilter(); + f.readFromNBT(filterTag); + if (!f.isEmpty()) { + inputFilters.put(dir, f); + } + } + + key = "outFilts." + dir.name(); + if (nbtRoot.hasKey(key)) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key); + FluidFilter f = new FluidFilter(); + f.readFromNBT(filterTag); + if (!f.isEmpty()) { + outputFilters.put(dir, f); + } + } + + key = "inSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + inputColors.put(dir, DyeColor.values()[ord]); + } + } + + key = "outSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + outputColors.put(dir, DyeColor.values()[ord]); + } + } + } + } + + public boolean isRoundRobin(ForgeDirection dir) { + return (roundRobin & dir.flag) != 0; + } + + public void setRoundRobin(ForgeDirection dir, boolean roundRobin) { + if (roundRobin) this.roundRobin |= dir.flag; + else this.roundRobin &= ~dir.flag; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 2580343b..8ea346ee 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -1,21 +1,8 @@ package crazypants.enderio.conduit.liquid; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidHandler; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.FluidUtil; - import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -23,219 +10,234 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit { - protected final EnumMap extractionModes = new EnumMap(ForgeDirection.class); - protected final EnumMap extractionColors = new EnumMap(ForgeDirection.class); + protected final EnumMap extractionModes = + new EnumMap(ForgeDirection.class); + protected final EnumMap extractionColors = + new EnumMap(ForgeDirection.class); - protected final Map externalRedstoneSignals = new HashMap(); - protected boolean redstoneStateDirty = true; + protected final Map externalRedstoneSignals = new HashMap(); + protected boolean redstoneStateDirty = true; - public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) { - IFluidHandler con = FluidUtil.getFluidHandler(world, bc); - return (con != null && !(con instanceof IConduitBundle)) ? con : null; - } - - public IFluidHandler getExternalHandler(ForgeDirection direction) { - IFluidHandler con = getExternalFluidHandler(getBundle().getWorld(), getLocation().getLocation(direction)); - return (con != null && !(con instanceof IConduitBundle)) ? con : null; - } - - public IFluidHandler getTankContainer(BlockCoord bc) { - return FluidUtil.getFluidHandler(getBundle().getWorld(), bc); - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - IFluidHandler h = getExternalHandler(direction); - if(h == null) { - return false; - } - //TODO: This check was added to work around a bug in dynamic tanks, but - //it causes issues with not conecting to empty tanks such as dim. trans + - //BC fluid pipes, so I am removing it for now. - - // FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); - // if(info == null) { - // return false; - // } - // return info.length > 0; - return true; - } - - @Override - public Class getBaseConduitType() { - return ILiquidConduit.class; - } - - @Override - public boolean onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - return super.onNeighborBlockChange(blockId); - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - extractionModes.put(dir, mode); - redstoneStateDirty = true; - } - - @Override - public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { - RedstoneControlMode res = extractionModes.get(dir); - if(res == null) { - res = RedstoneControlMode.ON; - } - return res; - } - - @Override - public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { - extractionColors.put(dir, col); - } - - @Override - public DyeColor getExtractionSignalColor(ForgeDirection dir) { - DyeColor result = extractionColors.get(dir); - if(result == null) { - return DyeColor.RED; - } - return result; - } - - @Override - public boolean canOutputToDir(ForgeDirection dir) { - if(!canInputToDir(dir)) { - return false; - } - if(conduitConnections.contains(dir)) { - return true; - } - if(!externalConnections.contains(dir)) { - return false; - } - IFluidHandler ext = getExternalHandler(dir); - if(ext instanceof TileReservoir) { // dont push to an auto ejecting - // resevoir or we loop - TileReservoir tr = (TileReservoir) ext; - return !tr.isMultiblock() || !tr.isAutoEject(); - } - return true; - } - - protected boolean autoExtractForDir(ForgeDirection dir) { - if(!canExtractFromDir(dir)) { - return false; - } - RedstoneControlMode mode = getExtractionRedstoneMode(dir); - if(mode == RedstoneControlMode.IGNORE) { - return true; - } - if(mode == RedstoneControlMode.NEVER) { - return false; - } - if(redstoneStateDirty) { - externalRedstoneSignals.clear(); - redstoneStateDirty = false; + public static IFluidHandler getExternalFluidHandler(IBlockAccess world, BlockCoord bc) { + IFluidHandler con = FluidUtil.getFluidHandler(world, bc); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; } - DyeColor col = getExtractionSignalColor(dir); - int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - - boolean res; - if(mode == RedstoneControlMode.OFF) { - //if checking for no signal, must be no signal from both - res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col)); - } else { - //if checking for a signal, either is fine - res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col)); - } - return res; - } - - private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { - int externalSignal = 0; - if(col == DyeColor.RED) { - Integer val = externalRedstoneSignals.get(dir); - if(val == null) { - TileEntity te = getBundle().getEntity(); - externalSignal = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); - externalRedstoneSignals.put(dir, externalSignal); - } else { - externalSignal = val; - } + public IFluidHandler getExternalHandler(ForgeDirection direction) { + IFluidHandler con = + getExternalFluidHandler(getBundle().getWorld(), getLocation().getLocation(direction)); + return (con != null && !(con instanceof IConduitBundle)) ? con : null; } - return mode.isConditionMet(mode, externalSignal); - } - - @Override - public boolean canExtractFromDir(ForgeDirection dir) { - return getConnectionMode(dir).acceptsInput(); - } - - @Override - public boolean canInputToDir(ForgeDirection dir) { - return getConnectionMode(dir).acceptsOutput() && !autoExtractForDir(dir); - } - - protected boolean hasExtractableMode() { - return hasConnectionMode(ConnectionMode.INPUT) || hasConnectionMode(ConnectionMode.IN_OUT); - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); - setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); - dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - - for (Entry entry : extractionModes.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extRM." + entry.getKey().name(), ord); - } + public IFluidHandler getTankContainer(BlockCoord bc) { + return FluidUtil.getFluidHandler(getBundle().getWorld(), bc); } - for (Entry entry : extractionColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("extSC." + entry.getKey().name(), ord); - } - } - - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "extRM." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < RedstoneControlMode.values().length) { - extractionModes.put(dir, RedstoneControlMode.values()[ord]); + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IFluidHandler h = getExternalHandler(direction); + if (h == null) { + return false; } - } - key = "extSC." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); - } - } - } - } + // TODO: This check was added to work around a bug in dynamic tanks, but + // it causes issues with not conecting to empty tanks such as dim. trans + + // BC fluid pipes, so I am removing it for now. + // FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); + // if(info == null) { + // return false; + // } + // return info.length > 0; + return true; + } + + @Override + public Class getBaseConduitType() { + return ILiquidConduit.class; + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + return super.onNeighborBlockChange(blockId); + } + + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + extractionModes.put(dir, mode); + redstoneStateDirty = true; + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = extractionModes.get(dir); + if (res == null) { + res = RedstoneControlMode.ON; + } + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + extractionColors.put(dir, col); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor result = extractionColors.get(dir); + if (result == null) { + return DyeColor.RED; + } + return result; + } + + @Override + public boolean canOutputToDir(ForgeDirection dir) { + if (!canInputToDir(dir)) { + return false; + } + if (conduitConnections.contains(dir)) { + return true; + } + if (!externalConnections.contains(dir)) { + return false; + } + IFluidHandler ext = getExternalHandler(dir); + if (ext instanceof TileReservoir) { // dont push to an auto ejecting + // resevoir or we loop + TileReservoir tr = (TileReservoir) ext; + return !tr.isMultiblock() || !tr.isAutoEject(); + } + return true; + } + + protected boolean autoExtractForDir(ForgeDirection dir) { + if (!canExtractFromDir(dir)) { + return false; + } + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if (mode == RedstoneControlMode.IGNORE) { + return true; + } + if (mode == RedstoneControlMode.NEVER) { + return false; + } + if (redstoneStateDirty) { + externalRedstoneSignals.clear(); + redstoneStateDirty = false; + } + + DyeColor col = getExtractionSignalColor(dir); + int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); + + boolean res; + if (mode == RedstoneControlMode.OFF) { + // if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) + && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col)); + } else { + // if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) + || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col)); + } + return res; + } + + private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { + int externalSignal = 0; + if (col == DyeColor.RED) { + Integer val = externalRedstoneSignals.get(dir); + if (val == null) { + TileEntity te = getBundle().getEntity(); + externalSignal = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); + externalRedstoneSignals.put(dir, externalSignal); + } else { + externalSignal = val; + } + } + + return mode.isConditionMet(mode, externalSignal); + } + + @Override + public boolean canExtractFromDir(ForgeDirection dir) { + return getConnectionMode(dir).acceptsInput(); + } + + @Override + public boolean canInputToDir(ForgeDirection dir) { + return getConnectionMode(dir).acceptsOutput() && !autoExtractForDir(dir); + } + + protected boolean hasExtractableMode() { + return hasConnectionMode(ConnectionMode.INPUT) || hasConnectionMode(ConnectionMode.IN_OUT); + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort( + "extractionSignalColor", (short) getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort( + "extractionRedstoneMode", (short) getExtractionRedstoneMode(dir).ordinal()); + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + + for (Entry entry : extractionModes.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extRM." + entry.getKey().name(), ord); + } + } + + for (Entry entry : extractionColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("extSC." + entry.getKey().name(), ord); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "extRM." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < RedstoneControlMode.values().length) { + extractionModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "extSC." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + extractionColors.put(dir, DyeColor.values()[ord]); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java index 1d753e27..0ab51a48 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduit.java @@ -1,13 +1,19 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ChatUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.tool.ToolUtil; import java.util.HashSet; import java.util.List; import java.util.Set; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -15,227 +21,221 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ChatUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.RaytraceResult; -import crazypants.enderio.tool.ToolUtil; - public abstract class AbstractTankConduit extends AbstractLiquidConduit { - protected ConduitTank tank = new ConduitTank(0); - protected boolean stateDirty = false; - protected long lastEmptyTick = 0; - protected int numEmptyEvents = 0; - protected boolean fluidTypeLocked = false; - private int lastLightValue; - protected final Set filledFromThisTick = new HashSet<>(); + protected ConduitTank tank = new ConduitTank(0); + protected boolean stateDirty = false; + protected long lastEmptyTick = 0; + protected int numEmptyEvents = 0; + protected boolean fluidTypeLocked = false; + private int lastLightValue; + protected final Set filledFromThisTick = new HashSet<>(); - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(player.getCurrentEquippedItem() == null) { - return false; - } - AbstractTankConduitNetwork network = getTankNetwork(); - if(ToolUtil.isToolEquipped(player)) { - - if(!getBundle().getEntity().getWorldObj().isRemote) { - - if(res != null && res.component != null) { - - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; - } - - BlockCoord loc = getLocation().getLocation(faceHit); - ILiquidConduit n = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); - if(n == null) { - return false; - } - if(!canJoinNeighbour(n)) { - return false; - } - if(!(n instanceof AbstractTankConduit)) { - return false; - } - AbstractTankConduit neighbour = (AbstractTankConduit) n; - if(neighbour.getFluidType() == null || getFluidType() == null) { - FluidStack type = getFluidType(); - type = type != null ? type : neighbour.getFluidType(); - neighbour.setFluidTypeOnNetwork(neighbour, type); - setFluidTypeOnNetwork(this, type); - } - return ConduitUtil.joinConduits(this, faceHit); - } else if(containsExternalConnection(connDir)) { - // Toggle extraction mode - setConnectionMode(connDir, getNextConnectionMode(connDir)); - } else if(containsConduitConnection(connDir)) { - FluidStack curFluidType = null; - if(getTankNetwork() != null) { - curFluidType = getTankNetwork().getFluidType(); - } - ConduitUtil.disconectConduits(this, connDir); - setFluidType(curFluidType); - - } + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (player.getCurrentEquippedItem() == null) { + return false; } - } - return true; + AbstractTankConduitNetwork network = getTankNetwork(); + if (ToolUtil.isToolEquipped(player)) { - } else if(player.getCurrentEquippedItem().getItem() == Items.bucket) { + if (!getBundle().getEntity().getWorldObj().isRemote) { - if(!getBundle().getEntity().getWorldObj().isRemote) { - long curTick = getBundle().getEntity().getWorldObj().getTotalWorldTime(); - if(curTick - lastEmptyTick < 20) { - numEmptyEvents++; + if (res != null && res.component != null) { + + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + + BlockCoord loc = getLocation().getLocation(faceHit); + ILiquidConduit n = ConduitUtil.getConduit( + getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); + if (n == null) { + return false; + } + if (!canJoinNeighbour(n)) { + return false; + } + if (!(n instanceof AbstractTankConduit)) { + return false; + } + AbstractTankConduit neighbour = (AbstractTankConduit) n; + if (neighbour.getFluidType() == null || getFluidType() == null) { + FluidStack type = getFluidType(); + type = type != null ? type : neighbour.getFluidType(); + neighbour.setFluidTypeOnNetwork(neighbour, type); + setFluidTypeOnNetwork(this, type); + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (containsExternalConnection(connDir)) { + // Toggle extraction mode + setConnectionMode(connDir, getNextConnectionMode(connDir)); + } else if (containsConduitConnection(connDir)) { + FluidStack curFluidType = null; + if (getTankNetwork() != null) { + curFluidType = getTankNetwork().getFluidType(); + } + ConduitUtil.disconectConduits(this, connDir); + setFluidType(curFluidType); + } + } + } + return true; + + } else if (player.getCurrentEquippedItem().getItem() == Items.bucket) { + + if (!getBundle().getEntity().getWorldObj().isRemote) { + long curTick = getBundle().getEntity().getWorldObj().getTotalWorldTime(); + if (curTick - lastEmptyTick < 20) { + numEmptyEvents++; + } else { + numEmptyEvents = 1; + } + lastEmptyTick = curTick; + + if (numEmptyEvents < 2) { + if (network.fluidTypeLocked) { + network.setFluidTypeLocked(false); + numEmptyEvents = 0; + ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, "itemLiquidConduit.unlockedType"); + } + } else if (network != null) { + network.setFluidType(null); + numEmptyEvents = 0; + } + } + + return true; } else { - numEmptyEvents = 1; + + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem()); + if (fluid != null) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (network != null + && (network.getFluidType() == null + || network.getTotalVolume() < 500 + || LiquidConduitNetwork.areFluidsCompatable(getFluidType(), fluid))) { + network.setFluidType(fluid); + network.setFluidTypeLocked(true); + ChatUtil.sendNoSpamUnloc( + player, + EnderIO.lang, + "itemLiquidConduit.lockedType", + " " + FluidRegistry.getFluidName(fluid)); + } + } + return true; + } } - lastEmptyTick = curTick; - if(numEmptyEvents < 2) { - if(network.fluidTypeLocked) { - network.setFluidTypeLocked(false); - numEmptyEvents = 0; - ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, "itemLiquidConduit.unlockedType"); - } - } else if(network != null) { - network.setFluidType(null); - numEmptyEvents = 0; + return false; + } + + void setFluidTypeLocked(boolean fluidTypeLocked) { + if (fluidTypeLocked == this.fluidTypeLocked) { + return; } - } - return true; - } else { + this.fluidTypeLocked = fluidTypeLocked; + stateDirty = true; - FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem()); - if (fluid != null) { - if (!getBundle().getEntity().getWorldObj().isRemote) { - if (network != null - && (network.getFluidType() == null || network.getTotalVolume() < 500 || LiquidConduitNetwork.areFluidsCompatable(getFluidType(), fluid))) { - network.setFluidType(fluid); - network.setFluidTypeLocked(true); - ChatUtil.sendNoSpamUnloc(player, EnderIO.lang, "itemLiquidConduit.lockedType", " " + FluidRegistry.getFluidName(fluid)); - } + // BlockCoord l = getLocation(); + // getBundle().getEntity().worldObj.markTileEntityChunkModified(l.x, l.y, l.z, getBundle().getEntity()); + } + + private void setFluidTypeOnNetwork(AbstractTankConduit con, FluidStack type) { + AbstractConduitNetwork n = con.getNetwork(); + if (n != null) { + AbstractTankConduitNetwork network = (AbstractTankConduitNetwork) n; + network.setFluidType(type); } - return true; - } } - return false; - } + protected abstract boolean canJoinNeighbour(ILiquidConduit n); - void setFluidTypeLocked(boolean fluidTypeLocked) { - if(fluidTypeLocked == this.fluidTypeLocked) { - return; + public abstract AbstractTankConduitNetwork getTankNetwork(); + + public void setFluidType(FluidStack liquidType) { + if (tank.getFluid() != null && tank.getFluid().isFluidEqual(liquidType)) { + return; + } + if (liquidType != null) { + liquidType = liquidType.copy(); + } else if (tank.getFluid() == null) { + return; + } + tank.setLiquid(liquidType); + stateDirty = true; } - this.fluidTypeLocked = fluidTypeLocked; - stateDirty = true; - - // BlockCoord l = getLocation(); - // getBundle().getEntity().worldObj.markTileEntityChunkModified(l.x, l.y, l.z, getBundle().getEntity()); - } - - private void setFluidTypeOnNetwork(AbstractTankConduit con, FluidStack type) { - AbstractConduitNetwork n = con.getNetwork(); - if(n != null) { - AbstractTankConduitNetwork network = (AbstractTankConduitNetwork) n; - network.setFluidType(type); + public ConduitTank getTank() { + return tank; } - } - - protected abstract boolean canJoinNeighbour(ILiquidConduit n); - - public abstract AbstractTankConduitNetwork getTankNetwork(); - - public void setFluidType(FluidStack liquidType) { - if(tank.getFluid() != null && tank.getFluid().isFluidEqual(liquidType)) { - return; + public FluidStack getFluidType() { + FluidStack result = null; + if (getTankNetwork() != null) { + result = getTankNetwork().getFluidType(); + } + if (result == null) { + result = tank.getFluid(); + } + return result; } - if(liquidType != null) { - liquidType = liquidType.copy(); - } else if(tank.getFluid() == null) { - return; + + public boolean isFluidTypeLocked() { + return fluidTypeLocked; } - tank.setLiquid(liquidType); - stateDirty = true; - } - public ConduitTank getTank() { - return tank; - } - - public FluidStack getFluidType() { - FluidStack result = null; - if(getTankNetwork() != null) { - result = getTankNetwork().getFluidType(); + @Override + public void updateEntity(World world) { + filledFromThisTick.clear(); + int lightValue = getLightValue(); + if (lastLightValue != lightValue) { + BlockCoord bc = getLocation(); + getBundle().getWorld().updateLightByType(EnumSkyBlock.Block, bc.x, bc.y, bc.z); + lastLightValue = lightValue; + } + super.updateEntity(world); } - if(result == null) { - result = tank.getFluid(); + + @Override + public int getLightValue() { + FluidStack stack = getFluidType(); + return stack == null || stack.amount <= 0 ? 0 : stack.getFluid().getLuminosity(stack); } - return result; - } - public boolean isFluidTypeLocked() { - return fluidTypeLocked; - } + protected abstract void updateTank(); - @Override - public void updateEntity(World world) { - filledFromThisTick.clear(); - int lightValue = getLightValue(); - if(lastLightValue != lightValue) { - BlockCoord bc = getLocation(); - getBundle().getWorld().updateLightByType(EnumSkyBlock.Block, bc.x, bc.y, bc.z); - lastLightValue = lightValue; + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + updateTank(); + if (nbtRoot.hasKey("tank")) { + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); + tank.setLiquid(liquid); + } else { + tank.setLiquid(null); + } + fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); } - super.updateEntity(world); - } - @Override - public int getLightValue() { - FluidStack stack = getFluidType(); - return stack == null || stack.amount <= 0 ? 0 : stack.getFluid().getLuminosity(stack); - } - - protected abstract void updateTank(); - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - updateTank(); - if(nbtRoot.hasKey("tank")) { - FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); - tank.setLiquid(liquid); - } else { - tank.setLiquid(null); + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + FluidStack ft = getFluidType(); + if (ConduitUtil.isFluidValid(ft)) { + updateTank(); + ft = ft.copy(); + ft.amount = tank.getFluidAmount(); + nbtRoot.setTag("tank", ft.writeToNBT(new NBTTagCompound())); + } + nbtRoot.setBoolean("fluidLocked", fluidTypeLocked); } - fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - FluidStack ft = getFluidType(); - if(ConduitUtil.isFluidValid(ft)) { - updateTank(); - ft = ft.copy(); - ft.amount = tank.getFluidAmount(); - nbtRoot.setTag("tank", ft.writeToNBT(new NBTTagCompound())); - } - nbtRoot.setBoolean("fluidLocked", fluidTypeLocked); - } - } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduitNetwork.java index 5ba25700..473c43fc 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractTankConduitNetwork.java @@ -1,73 +1,73 @@ package crazypants.enderio.conduit.liquid; -import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.conduit.AbstractConduitNetwork; +import net.minecraftforge.fluids.FluidStack; -public class AbstractTankConduitNetwork extends AbstractConduitNetwork { +public class AbstractTankConduitNetwork + extends AbstractConduitNetwork { - protected FluidStack liquidType; - protected boolean fluidTypeLocked = false; + protected FluidStack liquidType; + protected boolean fluidTypeLocked = false; - protected AbstractTankConduitNetwork(Class cl) { - super(cl, ILiquidConduit.class); - } - - public FluidStack getFluidType() { - return liquidType; - } - - @Override - public void addConduit(T con) { - super.addConduit(con); - con.setFluidType(liquidType); - if(con.fluidTypeLocked && !fluidTypeLocked) { - setFluidTypeLocked(true); + protected AbstractTankConduitNetwork(Class cl) { + super(cl, ILiquidConduit.class); } - } - public boolean setFluidType(FluidStack newType) { - if(liquidType != null && liquidType.isFluidEqual(newType)) { - return false; + public FluidStack getFluidType() { + return liquidType; } - if(newType != null) { - liquidType = newType.copy(); - liquidType.amount = 0; - } else { - liquidType = null; - } - for (AbstractTankConduit conduit : conduits) { - conduit.setFluidType(liquidType); - } - return true; - } - public void setFluidTypeLocked(boolean fluidTypeLocked) { - if(this.fluidTypeLocked == fluidTypeLocked) { - return; + @Override + public void addConduit(T con) { + super.addConduit(con); + con.setFluidType(liquidType); + if (con.fluidTypeLocked && !fluidTypeLocked) { + setFluidTypeLocked(true); + } } - this.fluidTypeLocked = fluidTypeLocked; - for (AbstractTankConduit conduit : conduits) { - conduit.setFluidTypeLocked(fluidTypeLocked); + + public boolean setFluidType(FluidStack newType) { + if (liquidType != null && liquidType.isFluidEqual(newType)) { + return false; + } + if (newType != null) { + liquidType = newType.copy(); + liquidType.amount = 0; + } else { + liquidType = null; + } + for (AbstractTankConduit conduit : conduits) { + conduit.setFluidType(liquidType); + } + return true; } - } - public boolean canAcceptLiquid(FluidStack acceptable) { - return areFluidsCompatable(liquidType, acceptable); - } - - public static boolean areFluidsCompatable(FluidStack a, FluidStack b) { - if(a == null || b == null) { - return true; + public void setFluidTypeLocked(boolean fluidTypeLocked) { + if (this.fluidTypeLocked == fluidTypeLocked) { + return; + } + this.fluidTypeLocked = fluidTypeLocked; + for (AbstractTankConduit conduit : conduits) { + conduit.setFluidTypeLocked(fluidTypeLocked); + } } - return a.isFluidEqual(b); - } - public int getTotalVolume() { - int totalVolume = 0; - for (T con : conduits) { - totalVolume += con.getTank().getFluidAmount(); + public boolean canAcceptLiquid(FluidStack acceptable) { + return areFluidsCompatable(liquidType, acceptable); } - return totalVolume; - } + public static boolean areFluidsCompatable(FluidStack a, FluidStack b) { + if (a == null || b == null) { + return true; + } + return a.isFluidEqual(b); + } + + public int getTotalVolume() { + int totalVolume = 0; + for (T con : conduits) { + totalVolume += con.getTank().getFluidAmount(); + } + return totalVolume; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java index 95238acb..68e7e15f 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduit.java @@ -1,8 +1,18 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.RedstoneControlMode; import java.util.HashMap; import java.util.Map; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -13,292 +23,277 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.RedstoneControlMode; - public class AdvancedLiquidConduit extends AbstractTankConduit { - public static final int CONDUIT_VOLUME = FluidContainerRegistry.BUCKET_VOLUME; + public static final int CONDUIT_VOLUME = FluidContainerRegistry.BUCKET_VOLUME; - public static final String ICON_KEY = "enderio:liquidConduitAdvanced"; - public static final String ICON_KEY_LOCKED = "enderio:liquidConduitAdvancedLocked"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreAdvanced"; - public static final String ICON_EXTRACT_KEY = "enderio:liquidConduitAdvancedInput"; - public static final String ICON_INSERT_KEY = "enderio:liquidConduitAdvancedOutput"; - public static final String ICON_EMPTY_EDGE = "enderio:liquidConduitAdvancedEdge"; + public static final String ICON_KEY = "enderio:liquidConduitAdvanced"; + public static final String ICON_KEY_LOCKED = "enderio:liquidConduitAdvancedLocked"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreAdvanced"; + public static final String ICON_EXTRACT_KEY = "enderio:liquidConduitAdvancedInput"; + public static final String ICON_INSERT_KEY = "enderio:liquidConduitAdvancedOutput"; + public static final String ICON_EMPTY_EDGE = "enderio:liquidConduitAdvancedEdge"; - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); - ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); - ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); - ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); - ICONS.put(ICON_EMPTY_EDGE, register.registerIcon(ICON_EMPTY_EDGE)); - ICONS.put(ICON_KEY_LOCKED, register.registerIcon(ICON_KEY_LOCKED)); - } + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); + ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); + ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); + ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); + ICONS.put(ICON_EMPTY_EDGE, register.registerIcon(ICON_EMPTY_EDGE)); + ICONS.put(ICON_KEY_LOCKED, register.registerIcon(ICON_KEY_LOCKED)); + } - @Override - public int getTextureType() { - return 0; - } - - }); - } - - private AdvancedLiquidConduitNetwork network; - - private long ticksSinceFailedExtract = 0; - - public static final int MAX_EXTRACT_PER_TICK = Config.advancedFluidConduitExtractRate; - - public static final int MAX_IO_PER_TICK = Config.advancedFluidConduitMaxIoRate; - - public AdvancedLiquidConduit() { - updateTank(); - } - - @Override - public void updateEntity(World world) { - super.updateEntity(world); - if(world.isRemote) { - return; - } - doExtract(); - if(stateDirty) { - getBundle().dirty(); - stateDirty = false; - } - } - - private void doExtract() { - BlockCoord loc = getLocation(); - // Extraction can happen on extract mode or in/out mode - if(!hasExtractableMode()) { - return; - } - if(network == null) { - return; + @Override + public int getTextureType() { + return 0; + } + }); } - // assume failure, reset to 0 if we do extract - ticksSinceFailedExtract++; - if(ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { - // after 25 ticks of failing, only check every 10 ticks - return; + private AdvancedLiquidConduitNetwork network; + + private long ticksSinceFailedExtract = 0; + + public static final int MAX_EXTRACT_PER_TICK = Config.advancedFluidConduitExtractRate; + + public static final int MAX_IO_PER_TICK = Config.advancedFluidConduitMaxIoRate; + + public AdvancedLiquidConduit() { + updateTank(); } - Fluid f = tank.getFluid() == null ? null : tank.getFluid().getFluid(); - for (ForgeDirection dir : externalConnections) { - if(autoExtractForDir(dir)) { - if(network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) { - ticksSinceFailedExtract = 0; + @Override + public void updateEntity(World world) { + super.updateEntity(world); + if (world.isRemote) { + return; + } + doExtract(); + if (stateDirty) { + getBundle().dirty(); + stateDirty = false; } - } } - } + private void doExtract() { + BlockCoord loc = getLocation(); + // Extraction can happen on extract mode or in/out mode + if (!hasExtractableMode()) { + return; + } + if (network == null) { + return; + } - @Override - protected void updateTank() { - tank.setCapacity(CONDUIT_VOLUME); - if(network != null) { - network.updateConduitVolumes(); - } - } + // assume failure, reset to 0 if we do extract + ticksSinceFailedExtract++; + if (ticksSinceFailedExtract > 25 && ticksSinceFailedExtract % 10 != 0) { + // after 25 ticks of failing, only check every 10 ticks + return; + } - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemLiquidConduit, 1, 1); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - if(network == null) { - this.network = null; - return true; - } - if(!(network instanceof AdvancedLiquidConduitNetwork)) { - return false; + Fluid f = tank.getFluid() == null ? null : tank.getFluid().getFluid(); + for (ForgeDirection dir : externalConnections) { + if (autoExtractForDir(dir)) { + if (network.extractFrom(this, dir, MAX_EXTRACT_PER_TICK)) { + ticksSinceFailedExtract = 0; + } + } + } } - AdvancedLiquidConduitNetwork n = (AdvancedLiquidConduitNetwork) network; - if(tank.getFluid() == null) { - tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy()); - } else if(n.getFluidType() == null) { - n.setFluidType(tank.getFluid()); - } else if(!tank.getFluid().isFluidEqual(n.getFluidType())) { - return false; - } - this.network = n; - return true; - - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { - if(!super.canConnectToConduit(direction, con)) { - return false; - } - if(!(con instanceof AdvancedLiquidConduit)) { - return false; - } - if(getFluidType() != null && ((AdvancedLiquidConduit) con).getFluidType() == null) { - return false; - } - return LiquidConduitNetwork.areFluidsCompatable(getFluidType(), ((AdvancedLiquidConduit) con).getFluidType()); - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - refreshInputs(dir); - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - super.setExtractionRedstoneMode(mode, dir); - refreshInputs(dir); - } - - private void refreshInputs(ForgeDirection dir) { - if(network == null) { - return; - } - LiquidOutput lo = new LiquidOutput(getLocation().getLocation(dir), dir.getOpposite()); - network.removeInput(lo); - if(canInputToDir(dir) && containsExternalConnection(dir)) { - network.addInput(lo); - } - } - - @Override - public void externalConnectionAdded(ForgeDirection fromDirection) { - super.externalConnectionAdded(fromDirection); - refreshInputs(fromDirection); - } - - @Override - public void externalConnectionRemoved(ForgeDirection fromDirection) { - super.externalConnectionRemoved(fromDirection); - refreshInputs(fromDirection); - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return ICONS.get(ICON_CORE_KEY); - } - return fluidTypeLocked ? ICONS.get(ICON_KEY_LOCKED) : ICONS.get(ICON_KEY); - } - - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_EXTRACT_KEY); - } - - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_INSERT_KEY); - } - - public IIcon getNotSetEdgeTexture() { - return ICONS.get(ICON_EMPTY_EDGE); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - if(isActive() && tank.containsValidLiquid()) { - return tank.getFluid().getFluid().getStillIcon(); - } - return null; - } - - // ------------------------------------------- Fluid API - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(network == null || !getConnectionMode(from).acceptsInput()) { - return 0; + @Override + protected void updateTank() { + tank.setCapacity(CONDUIT_VOLUME); + if (network != null) { + network.updateConduitVolumes(); + } } - // Guard against things that continuously call fill! - if(filledFromThisTick.contains(getLocation().getLocation(from))) { - return 0; - } - if(doFill) { - filledFromThisTick.add(getLocation().getLocation(from)); + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemLiquidConduit, 1, 1); } - return network.fill(from, resource, doFill); - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(network == null || !getConnectionMode(from).acceptsOutput()) { - return null; + @Override + public AbstractConduitNetwork getNetwork() { + return network; } - return network.drain(from, resource, doDrain); - } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(network == null || !getConnectionMode(from).acceptsOutput()) { - return null; + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + this.network = null; + return true; + } + if (!(network instanceof AdvancedLiquidConduitNetwork)) { + return false; + } + + AdvancedLiquidConduitNetwork n = (AdvancedLiquidConduitNetwork) network; + if (tank.getFluid() == null) { + tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy()); + } else if (n.getFluidType() == null) { + n.setFluidType(tank.getFluid()); + } else if (!tank.getFluid().isFluidEqual(n.getFluidType())) { + return false; + } + this.network = n; + return true; } - return network.drain(from, maxDrain, doDrain); - } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(network == null) { - return false; + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { + if (!super.canConnectToConduit(direction, con)) { + return false; + } + if (!(con instanceof AdvancedLiquidConduit)) { + return false; + } + if (getFluidType() != null && ((AdvancedLiquidConduit) con).getFluidType() == null) { + return false; + } + return LiquidConduitNetwork.areFluidsCompatable(getFluidType(), ((AdvancedLiquidConduit) con).getFluidType()); } - return canExtractFromDir(from) && LiquidConduitNetwork.areFluidsCompatable(getFluidType(), new FluidStack(fluid, 0)); - } - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(network == null) { - return false; + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + refreshInputs(dir); } - return canInputToDir(from) && LiquidConduitNetwork.areFluidsCompatable(getFluidType(), new FluidStack(fluid, 0)); - } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(network == null) { - return null; + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + super.setExtractionRedstoneMode(mode, dir); + refreshInputs(dir); } - return new FluidTankInfo[] { new FluidTankInfo(tank) }; - } - @Override - protected boolean canJoinNeighbour(ILiquidConduit n) { - return n instanceof AdvancedLiquidConduit; - } + private void refreshInputs(ForgeDirection dir) { + if (network == null) { + return; + } + LiquidOutput lo = new LiquidOutput(getLocation().getLocation(dir), dir.getOpposite()); + network.removeInput(lo); + if (canInputToDir(dir) && containsExternalConnection(dir)) { + network.addInput(lo); + } + } - @Override - public AbstractTankConduitNetwork getTankNetwork() { - return network; - } + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + super.externalConnectionAdded(fromDirection); + refreshInputs(fromDirection); + } + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + super.externalConnectionRemoved(fromDirection); + refreshInputs(fromDirection); + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY); + } + return fluidTypeLocked ? ICONS.get(ICON_KEY_LOCKED) : ICONS.get(ICON_KEY); + } + + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_EXTRACT_KEY); + } + + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_INSERT_KEY); + } + + public IIcon getNotSetEdgeTexture() { + return ICONS.get(ICON_EMPTY_EDGE); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + if (isActive() && tank.containsValidLiquid()) { + return tank.getFluid().getFluid().getStillIcon(); + } + return null; + } + + // ------------------------------------------- Fluid API + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (network == null || !getConnectionMode(from).acceptsInput()) { + return 0; + } + + // Guard against things that continuously call fill! + if (filledFromThisTick.contains(getLocation().getLocation(from))) { + return 0; + } + if (doFill) { + filledFromThisTick.add(getLocation().getLocation(from)); + } + + return network.fill(from, resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (network == null || !getConnectionMode(from).acceptsOutput()) { + return null; + } + return network.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (network == null || !getConnectionMode(from).acceptsOutput()) { + return null; + } + return network.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (network == null) { + return false; + } + return canExtractFromDir(from) + && LiquidConduitNetwork.areFluidsCompatable(getFluidType(), new FluidStack(fluid, 0)); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (network == null) { + return false; + } + return canInputToDir(from) + && LiquidConduitNetwork.areFluidsCompatable(getFluidType(), new FluidStack(fluid, 0)); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (network == null) { + return null; + } + return new FluidTankInfo[] {new FluidTankInfo(tank)}; + } + + @Override + protected boolean canJoinNeighbour(ILiquidConduit n) { + return n instanceof AdvancedLiquidConduit; + } + + @Override + public AbstractTankConduitNetwork getTankNetwork() { + return network; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index cf0f3bbf..ad47929a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -1,298 +1,298 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import crazypants.enderio.conduit.IConduit; import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; - -import crazypants.enderio.conduit.IConduit; - public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork { - private final ConduitTank tank = new ConduitTank(0); + private final ConduitTank tank = new ConduitTank(0); - private final Set outputs = new HashSet(); + private final Set outputs = new HashSet(); - private Iterator outputIterator; + private Iterator outputIterator; - private boolean lastSyncedActive = false; + private boolean lastSyncedActive = false; - private int lastSyncedVolume = -1; + private int lastSyncedVolume = -1; - private int ticksEmpty; + private int ticksEmpty; - public AdvancedLiquidConduitNetwork() { - super(AdvancedLiquidConduit.class); - } - - @Override - public void addConduit(AdvancedLiquidConduit con) { - tank.setCapacity(tank.getCapacity() + AdvancedLiquidConduit.CONDUIT_VOLUME); - if(con.getTank().containsValidLiquid()) { - tank.addAmount(con.getTank().getFluidAmount()); + public AdvancedLiquidConduitNetwork() { + super(AdvancedLiquidConduit.class); } - for (ForgeDirection dir : con.getExternalConnections()) { - if(con.getConnectionMode(dir).acceptsOutput()) { - outputs.add(new LiquidOutput(con.getLocation().getLocation(dir), dir.getOpposite())); - } - } - outputIterator = null; - super.addConduit(con); - } - @Override - public boolean setFluidType(FluidStack newType) { - if(super.setFluidType(newType)) { - - FluidStack ft = getFluidType(); - tank.setLiquid(ft == null ? null : ft.copy()); - return true; - } - return false; - } - - @Override - public void setFluidTypeLocked(boolean fluidTypeLocked) { - super.setFluidTypeLocked(fluidTypeLocked); - if(!fluidTypeLocked && tank.isEmpty()) { - setFluidType(null); - } - } - - @Override - public void destroyNetwork() { - setConduitVolumes(); - outputs.clear(); - super.destroyNetwork(); - } - - private void setConduitVolumes() { - if(tank.containsValidLiquid() && !conduits.isEmpty()) { - FluidStack fluidPerConduit = tank.getFluid().copy(); - int numCons = conduits.size(); - int leftOvers = fluidPerConduit.amount % numCons; - fluidPerConduit.amount = fluidPerConduit.amount / numCons; - - for (AdvancedLiquidConduit con : conduits) { - FluidStack f = fluidPerConduit.copy(); - if(leftOvers > 0) { - f.amount += 1; - leftOvers--; + @Override + public void addConduit(AdvancedLiquidConduit con) { + tank.setCapacity(tank.getCapacity() + AdvancedLiquidConduit.CONDUIT_VOLUME); + if (con.getTank().containsValidLiquid()) { + tank.addAmount(con.getTank().getFluidAmount()); } - con.getTank().setLiquid(f); - BlockCoord bc = con.getLocation(); - con.getBundle().getEntity().getWorldObj().markTileEntityChunkModified(bc.x, bc.y, bc.z, con.getBundle().getEntity()); - } - - } - } - - @Override - public void doNetworkTick() { - if(liquidType == null || outputs.isEmpty() || !tank.containsValidLiquid() || tank.isEmpty()) { - updateActiveState(); - return; - } - - if(outputIterator == null || !outputIterator.hasNext()) { - outputIterator = outputs.iterator(); - } - - updateActiveState(); - - int numVisited = 0; - while (!tank.isEmpty() && numVisited < outputs.size()) { - if(!outputIterator.hasNext()) { - outputIterator = outputs.iterator(); - } - LiquidOutput output = outputIterator.next(); - if(output != null) { - IFluidHandler cont = getTankContainer(output.location); - if(cont != null) { - FluidStack offer = tank.getFluid().copy(); - int filled = cont.fill(output.dir, offer, true); - if(filled > 0) { - tank.addAmount(-filled); - - } + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.getConnectionMode(dir).acceptsOutput()) { + outputs.add(new LiquidOutput(con.getLocation().getLocation(dir), dir.getOpposite())); + } } - } - numVisited++; + outputIterator = null; + super.addConduit(con); } - } + @Override + public boolean setFluidType(FluidStack newType) { + if (super.setFluidType(newType)) { - private void updateActiveState() { - - boolean isActive = tank.containsValidLiquid() && !tank.isEmpty(); - if(!isActive) { - if(!fluidTypeLocked && liquidType != null) { - ticksEmpty++; - if(ticksEmpty > 40) { - setFluidType(null); - ticksEmpty = 0; - for (IConduit con : conduits) { - con.setActive(false); - } - lastSyncedActive = false; + FluidStack ft = getFluidType(); + tank.setLiquid(ft == null ? null : ft.copy()); + return true; } - } - return; - } - - ticksEmpty = 0; - - if(!lastSyncedActive) { - for (IConduit con : conduits) { - con.setActive(true); - } - lastSyncedActive = true; - } - - } - - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null) { - return 0; - } - resource.amount = Math.min(resource.amount, AdvancedLiquidConduit.MAX_IO_PER_TICK); - boolean liquidWasValid = !tank.containsValidLiquid(); - int res = tank.fill(resource, doFill); - if(doFill && res > 0 && !liquidWasValid) { - int vol = tank.getFluidAmount(); - setFluidType(resource); - tank.setAmount(vol); - } - return res; - } - - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(resource == null || tank.isEmpty() || !tank.containsValidLiquid() || !LiquidConduitNetwork.areFluidsCompatable(getFluidType(), resource)) { - return null; - } - int amount = Math.min(resource.amount, tank.getFluidAmount()); - amount = Math.min(amount, AdvancedLiquidConduit.MAX_IO_PER_TICK); - FluidStack result = resource.copy(); - result.amount = amount; - if(doDrain) { - tank.addAmount(-amount); - } - return result; - } - - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(tank.isEmpty() || !tank.containsValidLiquid()) { - return null; - } - int amount = Math.min(maxDrain, tank.getFluidAmount()); - FluidStack result = tank.getFluid().copy(); - result.amount = amount; - if(doDrain) { - tank.addAmount(-amount); - } - return result; - } - - public boolean extractFrom(AdvancedLiquidConduit advancedLiquidConduit, ForgeDirection dir, int maxExtractPerTick) { - - if(tank.isFull()) { - return false; - } - - IFluidHandler extTank = getTankContainer(advancedLiquidConduit, dir); - if(extTank != null) { - int maxExtract = Math.min(maxExtractPerTick, tank.getAvailableSpace()); - - if(liquidType == null || !tank.containsValidLiquid()) { - FluidStack drained = extTank.drain(dir.getOpposite(), maxExtract, true); - if(drained == null || drained.amount <= 0) { - return false; - } - setFluidType(drained); - tank.setLiquid(drained.copy()); - return true; - } - - FluidStack couldDrain = liquidType.copy(); - couldDrain.amount = maxExtract; - - boolean foundFluid = false; - FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); - if(info != null) { - for (FluidTankInfo inf : info) { - if(inf != null && inf.fluid != null && inf.fluid.amount > 0) { - foundFluid = true; - } - } - } - if(!foundFluid) { return false; - } + } - // FluidStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); - // if(drained == null || drained.amount <= 0) { - // return false; - // } - // tank.addAmount(drained.amount); - - //Have to use this 'double handle' approach to work around an issue with TiC - FluidStack drained = extTank.drain(dir.getOpposite(), maxExtract, false); - if(drained == null || drained.amount == 0) { - return false; - } else { - if(drained.isFluidEqual(getFluidType())) { - drained = extTank.drain(dir.getOpposite(), maxExtract, true); - tank.addAmount(drained.amount); + @Override + public void setFluidTypeLocked(boolean fluidTypeLocked) { + super.setFluidTypeLocked(fluidTypeLocked); + if (!fluidTypeLocked && tank.isEmpty()) { + setFluidType(null); } - } - return true; } - return false; - } - public IFluidHandler getTankContainer(BlockCoord bc) { - World w = getWorld(); - if(w == null) { - return null; + @Override + public void destroyNetwork() { + setConduitVolumes(); + outputs.clear(); + super.destroyNetwork(); } - return FluidUtil.getFluidHandler(w.getTileEntity(bc.x, bc.y, bc.z)); - } - public IFluidHandler getTankContainer(AdvancedLiquidConduit con, ForgeDirection dir) { - BlockCoord bc = con.getLocation().getLocation(dir); - return getTankContainer(bc); - } + private void setConduitVolumes() { + if (tank.containsValidLiquid() && !conduits.isEmpty()) { + FluidStack fluidPerConduit = tank.getFluid().copy(); + int numCons = conduits.size(); + int leftOvers = fluidPerConduit.amount % numCons; + fluidPerConduit.amount = fluidPerConduit.amount / numCons; - World getWorld() { - if(conduits.isEmpty()) { - return null; + for (AdvancedLiquidConduit con : conduits) { + FluidStack f = fluidPerConduit.copy(); + if (leftOvers > 0) { + f.amount += 1; + leftOvers--; + } + con.getTank().setLiquid(f); + BlockCoord bc = con.getLocation(); + con.getBundle() + .getEntity() + .getWorldObj() + .markTileEntityChunkModified( + bc.x, bc.y, bc.z, con.getBundle().getEntity()); + } + } } - return conduits.get(0).getBundle().getWorld(); - } - public void removeInput(LiquidOutput lo) { - outputs.remove(lo); - outputIterator = null; - } + @Override + public void doNetworkTick() { + if (liquidType == null || outputs.isEmpty() || !tank.containsValidLiquid() || tank.isEmpty()) { + updateActiveState(); + return; + } - public void addInput(LiquidOutput lo) { - outputs.add(lo); - outputIterator = null; - } + if (outputIterator == null || !outputIterator.hasNext()) { + outputIterator = outputs.iterator(); + } - public void updateConduitVolumes() { - if(tank.getFluidAmount() == lastSyncedVolume) { - return; + updateActiveState(); + + int numVisited = 0; + while (!tank.isEmpty() && numVisited < outputs.size()) { + if (!outputIterator.hasNext()) { + outputIterator = outputs.iterator(); + } + LiquidOutput output = outputIterator.next(); + if (output != null) { + IFluidHandler cont = getTankContainer(output.location); + if (cont != null) { + FluidStack offer = tank.getFluid().copy(); + int filled = cont.fill(output.dir, offer, true); + if (filled > 0) { + tank.addAmount(-filled); + } + } + } + numVisited++; + } + } + + private void updateActiveState() { + + boolean isActive = tank.containsValidLiquid() && !tank.isEmpty(); + if (!isActive) { + if (!fluidTypeLocked && liquidType != null) { + ticksEmpty++; + if (ticksEmpty > 40) { + setFluidType(null); + ticksEmpty = 0; + for (IConduit con : conduits) { + con.setActive(false); + } + lastSyncedActive = false; + } + } + return; + } + + ticksEmpty = 0; + + if (!lastSyncedActive) { + for (IConduit con : conduits) { + con.setActive(true); + } + lastSyncedActive = true; + } + } + + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (resource == null) { + return 0; + } + resource.amount = Math.min(resource.amount, AdvancedLiquidConduit.MAX_IO_PER_TICK); + boolean liquidWasValid = !tank.containsValidLiquid(); + int res = tank.fill(resource, doFill); + if (doFill && res > 0 && !liquidWasValid) { + int vol = tank.getFluidAmount(); + setFluidType(resource); + tank.setAmount(vol); + } + return res; + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource == null + || tank.isEmpty() + || !tank.containsValidLiquid() + || !LiquidConduitNetwork.areFluidsCompatable(getFluidType(), resource)) { + return null; + } + int amount = Math.min(resource.amount, tank.getFluidAmount()); + amount = Math.min(amount, AdvancedLiquidConduit.MAX_IO_PER_TICK); + FluidStack result = resource.copy(); + result.amount = amount; + if (doDrain) { + tank.addAmount(-amount); + } + return result; + } + + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (tank.isEmpty() || !tank.containsValidLiquid()) { + return null; + } + int amount = Math.min(maxDrain, tank.getFluidAmount()); + FluidStack result = tank.getFluid().copy(); + result.amount = amount; + if (doDrain) { + tank.addAmount(-amount); + } + return result; + } + + public boolean extractFrom(AdvancedLiquidConduit advancedLiquidConduit, ForgeDirection dir, int maxExtractPerTick) { + + if (tank.isFull()) { + return false; + } + + IFluidHandler extTank = getTankContainer(advancedLiquidConduit, dir); + if (extTank != null) { + int maxExtract = Math.min(maxExtractPerTick, tank.getAvailableSpace()); + + if (liquidType == null || !tank.containsValidLiquid()) { + FluidStack drained = extTank.drain(dir.getOpposite(), maxExtract, true); + if (drained == null || drained.amount <= 0) { + return false; + } + setFluidType(drained); + tank.setLiquid(drained.copy()); + return true; + } + + FluidStack couldDrain = liquidType.copy(); + couldDrain.amount = maxExtract; + + boolean foundFluid = false; + FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); + if (info != null) { + for (FluidTankInfo inf : info) { + if (inf != null && inf.fluid != null && inf.fluid.amount > 0) { + foundFluid = true; + } + } + } + if (!foundFluid) { + return false; + } + + // FluidStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); + // if(drained == null || drained.amount <= 0) { + // return false; + // } + // tank.addAmount(drained.amount); + + // Have to use this 'double handle' approach to work around an issue with TiC + FluidStack drained = extTank.drain(dir.getOpposite(), maxExtract, false); + if (drained == null || drained.amount == 0) { + return false; + } else { + if (drained.isFluidEqual(getFluidType())) { + drained = extTank.drain(dir.getOpposite(), maxExtract, true); + tank.addAmount(drained.amount); + } + } + return true; + } + return false; + } + + public IFluidHandler getTankContainer(BlockCoord bc) { + World w = getWorld(); + if (w == null) { + return null; + } + return FluidUtil.getFluidHandler(w.getTileEntity(bc.x, bc.y, bc.z)); + } + + public IFluidHandler getTankContainer(AdvancedLiquidConduit con, ForgeDirection dir) { + BlockCoord bc = con.getLocation().getLocation(dir); + return getTankContainer(bc); + } + + World getWorld() { + if (conduits.isEmpty()) { + return null; + } + return conduits.get(0).getBundle().getWorld(); + } + + public void removeInput(LiquidOutput lo) { + outputs.remove(lo); + outputIterator = null; + } + + public void addInput(LiquidOutput lo) { + outputs.add(lo); + outputIterator = null; + } + + public void updateConduitVolumes() { + if (tank.getFluidAmount() == lastSyncedVolume) { + return; + } + setConduitVolumes(); + lastSyncedVolume = tank.getFluidAmount(); } - setConduitVolumes(); - lastSyncedVolume = tank.getFluidAmount(); - } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index f0062e21..fde9d8df 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -1,18 +1,11 @@ package crazypants.enderio.conduit.liquid; -import java.util.List; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; +import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; @@ -22,164 +15,174 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; - -import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; +import java.util.List; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit instanceof AdvancedLiquidConduit; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - - if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { - return; + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof AdvancedLiquidConduit; } - AdvancedLiquidConduit pc = (AdvancedLiquidConduit) conduit; - for (ForgeDirection dir : conduit.getExternalConnections()) { - IIcon tex = null; - if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { - tex = pc.getTextureForInputMode(); - } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { - tex = pc.getTextureForOutputMode(); - } - if (tex != null) { - Offset offset = te.getOffset(ILiquidConduit.class, dir); - ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); - } - } - } - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - super.renderConduit(tex, conduit, component, brightness); + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - if (isNSEWUD(component.dir)) { - AdvancedLiquidConduit lc = (AdvancedLiquidConduit) conduit; - - FluidStack fluid = lc.getFluidType(); - IIcon texture = null; - if (fluid != null) { - texture = fluid.getFluid().getStillIcon(); - if (texture == null) { - texture = fluid.getFluid().getIcon(); + if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { + return; } - } - - if (texture == null) { - texture = lc.getNotSetEdgeTexture(); - } - - float scaleFactor = 0.75f; - float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; - float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; - float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; - - BoundingBox cube = component.bound; - BoundingBox bb = cube.scale(xLen, yLen, zLen); - - for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - if (d != component.dir && d != component.dir.getOpposite()) { - - ForgeDirection vDir = RenderUtil.getVDirForFace(d); - if (component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { - vDir = RenderUtil.getUDirForFace(d); - } else if ((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) && d.offsetY != 0) { - vDir = RenderUtil.getUDirForFace(d); - } - - float minU = texture.getMinU(); - float maxU = texture.getMaxU(); - float minV = texture.getMinV(); - float maxV = texture.getMaxV(); - - float sideScale = Math.max(bb.sizeX(), bb.sizeY()) * 2 / 16f; - sideScale = Math.max(sideScale, bb.sizeZ() * 2 / 16f); - float width = Math.min(bb.sizeX(), bb.sizeY()) * 15f / 16f; - - List corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); - moveEdgeCorners(corners, vDir, width); - moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - - corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); - moveEdgeCorners(corners, vDir.getOpposite(), width); - moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - + AdvancedLiquidConduit pc = (AdvancedLiquidConduit) conduit; + for (ForgeDirection dir : conduit.getExternalConnections()) { + IIcon tex = null; + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + tex = pc.getTextureForInputMode(); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + tex = pc.getTextureForOutputMode(); + } + if (tex != null) { + Offset offset = te.getOffset(ILiquidConduit.class, dir); + ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); + } } - } - - if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); - Tessellator tessellator = Tessellator.instance; - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - //back face - for (int i = corners.size() - 1; i >= 0; i--) { - Vertex c = corners.get(i); - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - } - } - } + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { + super.renderConduit(tex, conduit, component, brightness); - @Override - protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { - super.renderTransmission(conduit, tex, component, selfIllum); - } + if (isNSEWUD(component.dir)) { + AdvancedLiquidConduit lc = (AdvancedLiquidConduit) conduit; - private void moveEdgeCorners(List vertices, ForgeDirection edge, float scaleFactor) { - int[] indices = getClosest(edge, vertices); - vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; - vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[1]).xyz.y -= scaleFactor * edge.offsetY; - vertices.get(indices[0]).xyz.z -= scaleFactor * edge.offsetZ; - vertices.get(indices[1]).xyz.z -= scaleFactor * edge.offsetZ; - } + FluidStack fluid = lc.getFluidType(); + IIcon texture = null; + if (fluid != null) { + texture = fluid.getFluid().getStillIcon(); + if (texture == null) { + texture = fluid.getFluid().getIcon(); + } + } - private int[] getClosest(ForgeDirection edge, List vertices) { - int[] res = new int[] { -1, -1 }; - boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0; - double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE; - int index = 0; - for (Vertex v : vertices) { - double val = get(v.xyz, edge); - if (highest ? val >= minMax : val <= minMax) { - if (val != minMax) { - res[0] = index; - } else { - res[1] = index; + if (texture == null) { + texture = lc.getNotSetEdgeTexture(); + } + + float scaleFactor = 0.75f; + float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; + float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; + float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; + + BoundingBox cube = component.bound; + BoundingBox bb = cube.scale(xLen, yLen, zLen); + + for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { + if (d != component.dir && d != component.dir.getOpposite()) { + + ForgeDirection vDir = RenderUtil.getVDirForFace(d); + if (component.dir == ForgeDirection.UP || component.dir == ForgeDirection.DOWN) { + vDir = RenderUtil.getUDirForFace(d); + } else if ((component.dir == ForgeDirection.NORTH || component.dir == ForgeDirection.SOUTH) + && d.offsetY != 0) { + vDir = RenderUtil.getUDirForFace(d); + } + + float minU = texture.getMinU(); + float maxU = texture.getMaxU(); + float minV = texture.getMinV(); + float maxV = texture.getMaxV(); + + float sideScale = Math.max(bb.sizeX(), bb.sizeY()) * 2 / 16f; + sideScale = Math.max(sideScale, bb.sizeZ() * 2 / 16f); + float width = Math.min(bb.sizeX(), bb.sizeY()) * 15f / 16f; + + List corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); + moveEdgeCorners(corners, vDir, width); + moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + + corners = bb.getCornersWithUvForFace(d, minU, maxU, minV, maxV); + moveEdgeCorners(corners, vDir.getOpposite(), width); + moveEdgeCorners(corners, component.dir.getOpposite(), sideScale); + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + } + } + + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + List corners = component.bound.getCornersWithUvForFace( + component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + Tessellator tessellator = Tessellator.instance; + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + // back face + for (int i = corners.size() - 1; i >= 0; i--) { + Vertex c = corners.get(i); + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + } } - minMax = val; - } - index++; } - return res; - } - private double get(Vector3d xyz, ForgeDirection edge) { - if (edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { - return xyz.x; + @Override + protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { + super.renderTransmission(conduit, tex, component, selfIllum); } - if (edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { - return xyz.y; - } - return xyz.z; - } + private void moveEdgeCorners(List vertices, ForgeDirection edge, float scaleFactor) { + int[] indices = getClosest(edge, vertices); + vertices.get(indices[0]).xyz.x -= scaleFactor * edge.offsetX; + vertices.get(indices[1]).xyz.x -= scaleFactor * edge.offsetX; + vertices.get(indices[0]).xyz.y -= scaleFactor * edge.offsetY; + vertices.get(indices[1]).xyz.y -= scaleFactor * edge.offsetY; + vertices.get(indices[0]).xyz.z -= scaleFactor * edge.offsetZ; + vertices.get(indices[1]).xyz.z -= scaleFactor * edge.offsetZ; + } + + private int[] getClosest(ForgeDirection edge, List vertices) { + int[] res = new int[] {-1, -1}; + boolean highest = edge.offsetX > 0 || edge.offsetY > 0 || edge.offsetZ > 0; + double minMax = highest ? -Double.MAX_VALUE : Double.MAX_VALUE; + int index = 0; + for (Vertex v : vertices) { + double val = get(v.xyz, edge); + if (highest ? val >= minMax : val <= minMax) { + if (val != minMax) { + res[0] = index; + } else { + res[1] = index; + } + minMax = val; + } + index++; + } + return res; + } + + private double get(Vector3d xyz, ForgeDirection edge) { + if (edge == ForgeDirection.EAST || edge == ForgeDirection.WEST) { + return xyz.x; + } + if (edge == ForgeDirection.UP || edge == ForgeDirection.DOWN) { + return xyz.y; + } + return xyz.z; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ConduitTank.java b/src/main/java/crazypants/enderio/conduit/liquid/ConduitTank.java index 22df9eed..6f149ee6 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ConduitTank.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ConduitTank.java @@ -1,179 +1,176 @@ package crazypants.enderio.conduit.liquid; +import crazypants.enderio.conduit.ConduitUtil; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; -import crazypants.enderio.conduit.ConduitUtil; public class ConduitTank implements IFluidTank { - private FluidStack fluid; - private int capacity; + private FluidStack fluid; + private int capacity; - ConduitTank(int capacity) { - this.capacity = capacity; - } - - @Override - public int getFluidAmount() { - return fluid == null ? 0 : fluid.amount; - } - - public float getFilledRatio() { - if(getFluidAmount() <= 0) { - return 0; - } - if(getCapacity() <= 0) { - return -1; - } - float res = (float) getFluidAmount() / getCapacity(); - return res; - } - - public boolean isFull() { - return getFluidAmount() >= getCapacity(); - } - - public void setAmount(int amount) { - if(fluid != null) { - fluid.amount = amount; - } - } - - public int getAvailableSpace() { - return getCapacity() - getFluidAmount(); - } - - public void addAmount(int amount) { - setAmount(getFluidAmount() + amount); - } - - @Override - public FluidTankInfo getInfo() { - return new FluidTankInfo(this); - } - - @Override - public FluidStack getFluid() { - return this.fluid; - } - - @Override - public int getCapacity() { - return this.capacity; - } - - public void setLiquid(FluidStack liquid) { - this.fluid = liquid; - } - - public void setCapacity(int capacity) { - this.capacity = capacity; - if(getFluidAmount() > capacity) { - setAmount(capacity); - } - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - if (resource == null || resource.getFluidID() <= 0) { - return 0; + ConduitTank(int capacity) { + this.capacity = capacity; } - if (fluid == null || fluid.getFluidID() <= 0) { - if(resource.amount <= capacity) { - if(doFill) { - setLiquid(resource.copy()); + @Override + public int getFluidAmount() { + return fluid == null ? 0 : fluid.amount; + } + + public float getFilledRatio() { + if (getFluidAmount() <= 0) { + return 0; } - return resource.amount; - } else { - if(doFill) { - fluid = resource.copy(); - fluid.amount = capacity; + if (getCapacity() <= 0) { + return -1; } - return capacity; - } + float res = (float) getFluidAmount() / getCapacity(); + return res; } - if(!fluid.isFluidEqual(resource)) { - return 0; + public boolean isFull() { + return getFluidAmount() >= getCapacity(); } - int space = capacity - fluid.amount; - if(resource.amount <= space) { - if(doFill) { - addAmount(resource.amount); - } - return resource.amount; - } else { - if(doFill) { - fluid.amount = capacity; - } - return space; + public void setAmount(int amount) { + if (fluid != null) { + fluid.amount = amount; + } } - } - - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - if (fluid == null || fluid.getFluidID() <= 0) { - return null; - } - if(fluid.amount <= 0) { - return null; + public int getAvailableSpace() { + return getCapacity() - getFluidAmount(); } - int used = maxDrain; - if(fluid.amount < used) { - used = fluid.amount; + public void addAmount(int amount) { + setAmount(getFluidAmount() + amount); } - if(doDrain) { - addAmount(-used); + @Override + public FluidTankInfo getInfo() { + return new FluidTankInfo(this); } - FluidStack drained = new FluidStack(fluid.getFluidID(), used); - - if(fluid.amount < 0) { - fluid.amount = 0; + @Override + public FluidStack getFluid() { + return this.fluid; } - return drained; - } - public void setTankPressure(int pressure) { - } - - public String getLiquidName() { - return fluid != null ? FluidRegistry.getFluidName(fluid) : null; - } - - public boolean containsValidLiquid() { - return ConduitUtil.isFluidValid(fluid); - } - - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - if(containsValidLiquid()) { - fluid.writeToNBT(nbt); - } else { - nbt.setBoolean("emptyTank", true); + @Override + public int getCapacity() { + return this.capacity; } - return nbt; - } - public IFluidTank readFromNBT(NBTTagCompound nbt) { - if(!nbt.hasKey("emptyTank")) { - FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbt); - if(liquid != null) { - setLiquid(liquid); - } + public void setLiquid(FluidStack liquid) { + this.fluid = liquid; } - return this; - } - public boolean isEmpty() { - return fluid == null || fluid.amount == 0; - } + public void setCapacity(int capacity) { + this.capacity = capacity; + if (getFluidAmount() > capacity) { + setAmount(capacity); + } + } + @Override + public int fill(FluidStack resource, boolean doFill) { + if (resource == null || resource.getFluidID() <= 0) { + return 0; + } + + if (fluid == null || fluid.getFluidID() <= 0) { + if (resource.amount <= capacity) { + if (doFill) { + setLiquid(resource.copy()); + } + return resource.amount; + } else { + if (doFill) { + fluid = resource.copy(); + fluid.amount = capacity; + } + return capacity; + } + } + + if (!fluid.isFluidEqual(resource)) { + return 0; + } + + int space = capacity - fluid.amount; + if (resource.amount <= space) { + if (doFill) { + addAmount(resource.amount); + } + return resource.amount; + } else { + if (doFill) { + fluid.amount = capacity; + } + return space; + } + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + if (fluid == null || fluid.getFluidID() <= 0) { + return null; + } + if (fluid.amount <= 0) { + return null; + } + + int used = maxDrain; + if (fluid.amount < used) { + used = fluid.amount; + } + + if (doDrain) { + addAmount(-used); + } + + FluidStack drained = new FluidStack(fluid.getFluidID(), used); + + if (fluid.amount < 0) { + fluid.amount = 0; + } + return drained; + } + + public void setTankPressure(int pressure) {} + + public String getLiquidName() { + return fluid != null ? FluidRegistry.getFluidName(fluid) : null; + } + + public boolean containsValidLiquid() { + return ConduitUtil.isFluidValid(fluid); + } + + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + if (containsValidLiquid()) { + fluid.writeToNBT(nbt); + } else { + nbt.setBoolean("emptyTank", true); + } + return nbt; + } + + public IFluidTank readFromNBT(NBTTagCompound nbt) { + if (!nbt.hasKey("emptyTank")) { + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbt); + if (liquid != null) { + setLiquid(liquid); + } + } + return this; + } + + public boolean isEmpty() { + return fluid == null || fluid.amount == 0; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/CrystallineEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/CrystallineEnderLiquidConduit.java index 7d58e597..ed90d963 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/CrystallineEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/CrystallineEnderLiquidConduit.java @@ -3,55 +3,53 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.client.render.IconUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class CrystallineEnderLiquidConduit extends AbstractEnderLiquidConduit { - public static final Type TYPE = Type.CRYSTALLINE; - public static final int METADATA = 3; - public static final String ICON_KEY = "enderio:liquidConduitCrystallineEnder"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallineEnder"; + public static final Type TYPE = Type.CRYSTALLINE; + public static final int METADATA = 3; + public static final String ICON_KEY = "enderio:liquidConduitCrystallineEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallineEnder"; - static IIcon iconKey; - static IIcon iconCoreKey; + static IIcon iconKey; + static IIcon iconCoreKey; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - iconKey = register.registerIcon(ICON_KEY); - iconCoreKey = register.registerIcon(ICON_CORE_KEY); - } + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } - @Override - public int getTextureType() { - return 0; - } + @Override + public int getTextureType() { + return 0; + } + }); + } - }); - } + @Override + public Type getType() { + return TYPE; + } - @Override - public Type getType() { - return TYPE; - } + @Override + public int getMetadata() { + return METADATA; + } - @Override - public int getMetadata() { - return METADATA; - } + @Override + protected IIcon getIconKey() { + return iconKey; + } - @Override - protected IIcon getIconKey() { - return iconKey; - } - - @Override - protected IIcon getIconCoreKey() { - return iconCoreKey; - } -} \ No newline at end of file + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/CrystallinePinkSlimeEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/CrystallinePinkSlimeEnderLiquidConduit.java index 1451e655..10abdfac 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/CrystallinePinkSlimeEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/CrystallinePinkSlimeEnderLiquidConduit.java @@ -3,55 +3,53 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.client.render.IconUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class CrystallinePinkSlimeEnderLiquidConduit extends AbstractEnderLiquidConduit { - public static final Type TYPE = Type.CRYSTALLINE_PINK_SLIME; - public static final int METADATA = 4; - public static final String ICON_KEY = "enderio:liquidConduitCrystallinePinkSlimeEnder"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallinePinkSlimeEnder"; + public static final Type TYPE = Type.CRYSTALLINE_PINK_SLIME; + public static final int METADATA = 4; + public static final String ICON_KEY = "enderio:liquidConduitCrystallinePinkSlimeEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreCrystallinePinkSlimeEnder"; - static IIcon iconKey; - static IIcon iconCoreKey; + static IIcon iconKey; + static IIcon iconCoreKey; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - iconKey = register.registerIcon(ICON_KEY); - iconCoreKey = register.registerIcon(ICON_CORE_KEY); - } + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } - @Override - public int getTextureType() { - return 0; - } + @Override + public int getTextureType() { + return 0; + } + }); + } - }); - } + @Override + public Type getType() { + return TYPE; + } - @Override - public Type getType() { - return TYPE; - } + @Override + public int getMetadata() { + return METADATA; + } - @Override - public int getMetadata() { - return METADATA; - } + @Override + protected IIcon getIconKey() { + return iconKey; + } - @Override - protected IIcon getIconKey() { - return iconKey; - } - - @Override - protected IIcon getIconCoreKey() { - return iconCoreKey; - } -} \ No newline at end of file + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java index a56cd202..4c3c0604 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduit.java @@ -3,55 +3,53 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.client.render.IconUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class EnderLiquidConduit extends AbstractEnderLiquidConduit { - public static final Type TYPE = Type.ENDER; - public static final int METADATA = 2; - public static final String ICON_KEY = "enderio:liquidConduitEnder"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreEnder"; + public static final Type TYPE = Type.ENDER; + public static final int METADATA = 2; + public static final String ICON_KEY = "enderio:liquidConduitEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreEnder"; - static IIcon iconKey; - static IIcon iconCoreKey; + static IIcon iconKey; + static IIcon iconCoreKey; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - iconKey = register.registerIcon(ICON_KEY); - iconCoreKey = register.registerIcon(ICON_CORE_KEY); - } + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } - @Override - public int getTextureType() { - return 0; - } + @Override + public int getTextureType() { + return 0; + } + }); + } - }); - } + @Override + public Type getType() { + return TYPE; + } - @Override - public Type getType() { - return TYPE; - } + @Override + public int getMetadata() { + return METADATA; + } - @Override - public int getMetadata() { - return METADATA; - } + @Override + protected IIcon getIconKey() { + return iconKey; + } - @Override - protected IIcon getIconKey() { - return iconKey; - } - - @Override - protected IIcon getIconCoreKey() { - return iconCoreKey; - } -} \ No newline at end of file + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java index 050022fc..cea3f15f 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitNetwork.java @@ -1,317 +1,316 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConnectionMode; import java.util.*; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConnectionMode; - public class EnderLiquidConduitNetwork extends AbstractConduitNetwork { - private class TankIterator implements Iterator { - private int index = -1; - private int currentCount = 0; + private class TankIterator implements Iterator { + private int index = -1; + private int currentCount = 0; - public TankIterator start() { - currentCount = 0; - return this; - } - - @Override - public boolean hasNext() { - return !tanks.isEmpty() && currentCount < tanks.size(); - } - - @Override - public NetworkTank next() { - if (tanks.isEmpty()) { - return null; - } - currentCount++; - index++; - if (index >= tanks.size()) { - index = 0; - } - return tanks.get(index); - } - - @Override - public void remove() { - } - - public void rewind() { - if (index == 0) - index = tanks.size() - 1; - else - index--; - currentCount--; - } - } - - private final AbstractEnderLiquidConduit.Type type; - - List tanks = new ArrayList(); - Map tankMap = new HashMap(); - - Map iterators; - - boolean filling; - - public EnderLiquidConduitNetwork(AbstractEnderLiquidConduit.Type type) { - super(AbstractEnderLiquidConduit.class, ILiquidConduit.class); - this.type = type; - } - - public void connectionChanged(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - NetworkTankKey key = new NetworkTankKey(con, conDir); - NetworkTank tank = new NetworkTank(con, conDir); - tanks.remove(tank); // remove old tank, NB: =/hash is only calced on location and dir - tankMap.remove(key); - tanks.add(tank); - tankMap.put(key, tank); - } - - public boolean extractFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - NetworkTank tank = getTank(con, conDir); - if(tank == null || !tank.isValid()) { - return false; - } - - if(tank.externalTank.getTankInfo(conDir.getOpposite()) != null) { - for (FluidTankInfo tankInfo : tank.externalTank.getTankInfo(conDir.getOpposite())) { - if(tankInfo == null || tankInfo.fluid == null) { - continue; + public TankIterator start() { + currentCount = 0; + return this; } - FluidStack tryDrain = tankInfo.fluid.copy(); - tryDrain.amount = type.getMaxExtractPerTick(); - FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, false); - if(drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true) || !tryDrain.isFluidEqual(drained)) { - continue; + + @Override + public boolean hasNext() { + return !tanks.isEmpty() && currentCount < tanks.size(); + } + + @Override + public NetworkTank next() { + if (tanks.isEmpty()) { + return null; + } + currentCount++; + index++; + if (index >= tanks.size()) { + index = 0; + } + return tanks.get(index); + } + + @Override + public void remove() {} + + public void rewind() { + if (index == 0) index = tanks.size() - 1; + else index--; + currentCount--; + } + } + + private final AbstractEnderLiquidConduit.Type type; + + List tanks = new ArrayList(); + Map tankMap = new HashMap(); + + Map iterators; + + boolean filling; + + public EnderLiquidConduitNetwork(AbstractEnderLiquidConduit.Type type) { + super(AbstractEnderLiquidConduit.class, ILiquidConduit.class); + this.type = type; + } + + public void connectionChanged(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + NetworkTankKey key = new NetworkTankKey(con, conDir); + NetworkTank tank = new NetworkTank(con, conDir); + tanks.remove(tank); // remove old tank, NB: =/hash is only calced on location and dir + tankMap.remove(key); + tanks.add(tank); + tankMap.put(key, tank); + } + + public boolean extractFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + NetworkTank tank = getTank(con, conDir); + if (tank == null || !tank.isValid()) { + return false; + } + + if (tank.externalTank.getTankInfo(conDir.getOpposite()) != null) { + for (FluidTankInfo tankInfo : tank.externalTank.getTankInfo(conDir.getOpposite())) { + if (tankInfo == null || tankInfo.fluid == null) { + continue; + } + FluidStack tryDrain = tankInfo.fluid.copy(); + tryDrain.amount = type.getMaxExtractPerTick(); + FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, false); + if (drained == null + || drained.amount <= 0 + || !matchedFilter(drained, con, conDir, true) + || !tryDrain.isFluidEqual(drained)) { + continue; + } + int amountAccepted = fillFrom(tank, drained.copy(), true); + if (amountAccepted <= 0) { + continue; + } + tryDrain.amount = amountAccepted; + drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, true); + if (drained == null || drained.amount <= 0) { + continue; + } + return true; + } + } + + FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), type.getMaxExtractPerTick(), false); + if (drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true)) { + return false; } int amountAccepted = fillFrom(tank, drained.copy(), true); - if(amountAccepted <= 0) { - continue; + if (amountAccepted <= 0) { + return false; } - tryDrain.amount = amountAccepted; - drained = tank.externalTank.drain(conDir.getOpposite(), tryDrain, true); - if(drained == null || drained.amount <= 0) { - continue; + drained = tank.externalTank.drain(conDir.getOpposite(), amountAccepted, true); + return drained != null && drained.amount > 0; + } + + private NetworkTank getTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + return tankMap.get(new NetworkTankKey(con, conDir)); + } + + public int fillFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir, FluidStack resource, boolean doFill) { + return fillFrom(getTank(con, conDir), resource, doFill); + } + + public int fillFrom(NetworkTank tank, FluidStack resource, boolean doFill) { + + if (filling) { + return 0; } - return true; - } - } - FluidStack drained = tank.externalTank.drain(conDir.getOpposite(), type.getMaxExtractPerTick(), false); - if(drained == null || drained.amount <= 0 || !matchedFilter(drained, con, conDir, true)) { - return false; - } - int amountAccepted = fillFrom(tank, drained.copy(), true); - if(amountAccepted <= 0) { - return false; - } - drained = tank.externalTank.drain(conDir.getOpposite(), amountAccepted, true); - return drained != null && drained.amount > 0; - } + try { - private NetworkTank getTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - return tankMap.get(new NetworkTankKey(con, conDir)); - } + filling = true; - public int fillFrom(AbstractEnderLiquidConduit con, ForgeDirection conDir, FluidStack resource, boolean doFill) { - return fillFrom(getTank(con, conDir), resource, doFill); - } + if (resource == null || tank == null || !matchedFilter(resource, tank.con, tank.conDir, true)) { + return 0; + } + resource = resource.copy(); + resource.amount = Math.min(resource.amount, type.getMaxIoPerTick()); + int filled = 0; + int remaining = resource.amount; + // TODO: Only change starting pos of iterator is doFill is true so a false then true returns the same - public int fillFrom(NetworkTank tank, FluidStack resource, boolean doFill) { + TankIterator iterator; + for (iterator = getIteratorForTank(tank).start(); iterator.hasNext(); ) { + NetworkTank target = iterator.next(); + if (!target.equals(tank) + && target.con.getOutputColor(target.conDir).equals(tank.con.getInputColor(tank.conDir)) + && target.acceptsOuput + && target.isValid() + && matchedFilter(resource, target.con, target.conDir, false)) { + int vol = target.externalTank.fill(target.tankDir, resource.copy(), doFill); + remaining -= vol; + filled += vol; + if (remaining <= 0) { + break; + } + resource.amount = remaining; + } + } + if (!tank.con.isRoundRobin(tank.conDir)) iterator.rewind(); + return filled; - if(filling) { - return 0; - } - - try { - - filling = true; - - if(resource == null || tank == null || !matchedFilter(resource, tank.con, tank.conDir, true)) { - return 0; - } - resource = resource.copy(); - resource.amount = Math.min(resource.amount, type.getMaxIoPerTick()); - int filled = 0; - int remaining = resource.amount; - //TODO: Only change starting pos of iterator is doFill is true so a false then true returns the same - - TankIterator iterator; - for (iterator = getIteratorForTank(tank).start(); iterator.hasNext(); ) { - NetworkTank target = iterator.next(); - if (!target.equals(tank) && target.con.getOutputColor(target.conDir).equals(tank.con.getInputColor(tank.conDir)) && target.acceptsOuput && target.isValid() && matchedFilter(resource, target.con, target.conDir, false)) { - int vol = target.externalTank.fill(target.tankDir, resource.copy(), doFill); - remaining -= vol; - filled += vol; - if (remaining <= 0) { - break; - } - resource.amount = remaining; + } finally { + filling = false; } - } - if (!tank.con.isRoundRobin(tank.conDir)) - iterator.rewind(); - return filled; + } - } finally { - filling = false; - } - } - - private boolean matchedFilter(FluidStack drained, AbstractEnderLiquidConduit con, ForgeDirection conDir, boolean isInput) { - if(drained == null || con == null || conDir == null) { - return false; - } - FluidFilter filter = con.getFilter(conDir, isInput); - if(filter == null || filter.isEmpty()) { - return true; - } - return filter.matchesFilter(drained); - } - - private TankIterator getIteratorForTank(NetworkTank tank) { - if(iterators == null) { - iterators = new HashMap<>(); - } - TankIterator res = iterators.get(tank); - if(res == null) { - res = new TankIterator(); - iterators.put(tank, res); - } - return res; - } - - public FluidTankInfo[] getTankInfo(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - List res = new ArrayList(tanks.size()); - NetworkTank tank = getTank(con, conDir); - for (NetworkTank target : tanks) { - if(!target.equals(tank) && target.isValid()) { - FluidTankInfo[] tTanks = target.externalTank.getTankInfo(target.tankDir); - if(tTanks != null) { - for (FluidTankInfo info : tTanks) { - res.add(info); - } + private boolean matchedFilter( + FluidStack drained, AbstractEnderLiquidConduit con, ForgeDirection conDir, boolean isInput) { + if (drained == null || con == null || conDir == null) { + return false; } - } - } - return res.toArray(new FluidTankInfo[res.size()]); - } - - static class NetworkTankKey { - - ForgeDirection conDir; - BlockCoord conduitLoc; - - public NetworkTankKey(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - this(con.getLocation(), conDir); - } - - public NetworkTankKey(BlockCoord conduitLoc, ForgeDirection conDir) { - this.conDir = conDir; - this.conduitLoc = conduitLoc; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conDir == null) ? 0 : conDir.hashCode()); - result = prime * result + ((conduitLoc == null) ? 0 : conduitLoc.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - NetworkTankKey other = (NetworkTankKey) obj; - if(conDir != other.conDir) { - return false; - } - if(conduitLoc == null) { - if(other.conduitLoc != null) { - return false; + FluidFilter filter = con.getFilter(conDir, isInput); + if (filter == null || filter.isEmpty()) { + return true; } - } else if(!conduitLoc.equals(other.conduitLoc)) { - return false; - } - return true; + return filter.matchesFilter(drained); } - } - - static class NetworkTank { - - AbstractEnderLiquidConduit con; - ForgeDirection conDir; - IFluidHandler externalTank; - ForgeDirection tankDir; - BlockCoord conduitLoc; - boolean acceptsOuput; - - public NetworkTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) { - this.con = con; - this.conDir = conDir; - conduitLoc = con.getLocation(); - tankDir = conDir.getOpposite(); - externalTank = AbstractLiquidConduit.getExternalFluidHandler(con.getBundle().getWorld(), conduitLoc.getLocation(conDir)); - acceptsOuput = con.getConnectionMode(conDir).acceptsOutput(); - } - - public boolean isValid() { - return externalTank != null && con.getConnectionMode(conDir) != ConnectionMode.DISABLED; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((conDir == null) ? 0 : conDir.hashCode()); - result = prime * result + ((conduitLoc == null) ? 0 : conduitLoc.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - NetworkTank other = (NetworkTank) obj; - if(conDir != other.conDir) { - return false; - } - if(conduitLoc == null) { - if(other.conduitLoc != null) { - return false; + private TankIterator getIteratorForTank(NetworkTank tank) { + if (iterators == null) { + iterators = new HashMap<>(); } - } else if(!conduitLoc.equals(other.conduitLoc)) { - return false; - } - return true; + TankIterator res = iterators.get(tank); + if (res == null) { + res = new TankIterator(); + iterators.put(tank, res); + } + return res; } - } + public FluidTankInfo[] getTankInfo(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + List res = new ArrayList(tanks.size()); + NetworkTank tank = getTank(con, conDir); + for (NetworkTank target : tanks) { + if (!target.equals(tank) && target.isValid()) { + FluidTankInfo[] tTanks = target.externalTank.getTankInfo(target.tankDir); + if (tTanks != null) { + for (FluidTankInfo info : tTanks) { + res.add(info); + } + } + } + } + return res.toArray(new FluidTankInfo[res.size()]); + } + static class NetworkTankKey { + + ForgeDirection conDir; + BlockCoord conduitLoc; + + public NetworkTankKey(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + this(con.getLocation(), conDir); + } + + public NetworkTankKey(BlockCoord conduitLoc, ForgeDirection conDir) { + this.conDir = conDir; + this.conduitLoc = conduitLoc; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conDir == null) ? 0 : conDir.hashCode()); + result = prime * result + ((conduitLoc == null) ? 0 : conduitLoc.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + NetworkTankKey other = (NetworkTankKey) obj; + if (conDir != other.conDir) { + return false; + } + if (conduitLoc == null) { + if (other.conduitLoc != null) { + return false; + } + } else if (!conduitLoc.equals(other.conduitLoc)) { + return false; + } + return true; + } + } + + static class NetworkTank { + + AbstractEnderLiquidConduit con; + ForgeDirection conDir; + IFluidHandler externalTank; + ForgeDirection tankDir; + BlockCoord conduitLoc; + boolean acceptsOuput; + + public NetworkTank(AbstractEnderLiquidConduit con, ForgeDirection conDir) { + this.con = con; + this.conDir = conDir; + conduitLoc = con.getLocation(); + tankDir = conDir.getOpposite(); + externalTank = AbstractLiquidConduit.getExternalFluidHandler( + con.getBundle().getWorld(), conduitLoc.getLocation(conDir)); + acceptsOuput = con.getConnectionMode(conDir).acceptsOutput(); + } + + public boolean isValid() { + return externalTank != null && con.getConnectionMode(conDir) != ConnectionMode.DISABLED; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((conDir == null) ? 0 : conDir.hashCode()); + result = prime * result + ((conduitLoc == null) ? 0 : conduitLoc.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + NetworkTank other = (NetworkTank) obj; + if (conDir != other.conDir) { + return false; + } + if (conduitLoc == null) { + if (other.conduitLoc != null) { + return false; + } + } else if (!conduitLoc.equals(other.conduitLoc)) { + return false; + } + return true; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java index 501f8173..2987ab6e 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/EnderLiquidConduitRenderer.java @@ -1,11 +1,6 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.common.util.DyeColor; -import crazypants.enderio.conduit.item.IItemConduit; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -13,62 +8,70 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class EnderLiquidConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - if(conduit instanceof AbstractEnderLiquidConduit) { - return true; - } - return false; - } - - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - - AbstractEnderLiquidConduit pc = (AbstractEnderLiquidConduit) conduit; - for (ForgeDirection dir : conduit.getExternalConnections()) { - DyeColor inChannel = null; - DyeColor outChannel = null; - IIcon inTex = null; - IIcon outTex = null; - boolean render = true; - if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { - inTex = pc.getTextureForInputMode(); - inChannel = pc.getInputColor(dir); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { - outTex = pc.getTextureForOutputMode(); - outChannel = pc.getOutputColor(dir); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.IN_OUT) { - inTex = pc.getTextureForInOutMode(true); - outTex = pc.getTextureForInOutMode(false); - inChannel = pc.getInputColor(dir); - outChannel = pc.getOutputColor(dir); - } else { - render = false; - } - if(render && !rb.hasOverrideBlockTexture()) { - Offset offset = te.getOffset(ILiquidConduit.class, dir); - ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true); - - if(inChannel != null) { - Tessellator.instance.setColorOpaque_I(inChannel.getColor()); - ConnectionModeGeometry.renderModeConnector(dir, offset, inTex, false); + @Override + public boolean isRendererForConduit(IConduit conduit) { + if (conduit instanceof AbstractEnderLiquidConduit) { + return true; } - if(outChannel != null) { - Tessellator.instance.setColorOpaque_I(outChannel.getColor()); - ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false); - } - - Tessellator.instance.setColorOpaque_F(1f, 1f, 1f); - } + return false; } - } - + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); + AbstractEnderLiquidConduit pc = (AbstractEnderLiquidConduit) conduit; + for (ForgeDirection dir : conduit.getExternalConnections()) { + DyeColor inChannel = null; + DyeColor outChannel = null; + IIcon inTex = null; + IIcon outTex = null; + boolean render = true; + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + inTex = pc.getTextureForInputMode(); + inChannel = pc.getInputColor(dir); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + outTex = pc.getTextureForOutputMode(); + outChannel = pc.getOutputColor(dir); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.IN_OUT) { + inTex = pc.getTextureForInOutMode(true); + outTex = pc.getTextureForInOutMode(false); + inChannel = pc.getInputColor(dir); + outChannel = pc.getOutputColor(dir); + } else { + render = false; + } + if (render && !rb.hasOverrideBlockTexture()) { + Offset offset = te.getOffset(ILiquidConduit.class, dir); + ConnectionModeGeometry.renderModeConnector(dir, offset, pc.getTextureForInOutBackground(), true); + + if (inChannel != null) { + Tessellator.instance.setColorOpaque_I(inChannel.getColor()); + ConnectionModeGeometry.renderModeConnector(dir, offset, inTex, false); + } + if (outChannel != null) { + Tessellator.instance.setColorOpaque_I(outChannel.getColor()); + ConnectionModeGeometry.renderModeConnector(dir, offset, outTex, false); + } + + Tessellator.instance.setColorOpaque_F(1f, 1f, 1f); + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java index d74f23bd..d13b7bff 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/FluidFilter.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.util.FluidUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -7,148 +8,144 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.common.util.FluidUtil; - public class FluidFilter { - private final FluidStack[] fluids = new FluidStack[5]; - private boolean isBlacklist; + private final FluidStack[] fluids = new FluidStack[5]; + private boolean isBlacklist; - public boolean isEmpty() { - for (FluidStack f : fluids) { - if(f != null) { - return false; - } - } - return true; - } - - public int size() { - return fluids.length; - } - - @Deprecated - public Fluid getFluidAt(int index) { - return fluids[index].getFluid(); - } - - public FluidStack getFluidStackAt(int index) { - return fluids[index]; - } - - @Deprecated - public boolean setFluid(int index, Fluid fluid) { - fluids[index] = new FluidStack(fluid, 0); - return true; - } - - public boolean setFluid(int index, FluidStack fluid) { - if (fluid == null || fluid.getFluid() == null) { - fluids[index] = null; - } else { - fluids[index] = fluid; - } - return true; - } - - public boolean setFluid(int index, ItemStack stack) { - if(stack == null) { - return setFluid(index, (FluidStack) null); - } - FluidStack f = FluidUtil.getFluidFromItem(stack); - if (f == null || f.getFluid() == null) { - return false; - } - return setFluid(index, f); - } - - public boolean removeFluid(int index) { - if(index < 0 || index >= fluids.length) { - return false; - } - fluids[index] = null; - return true; - } - - @Deprecated - protected void setFluid(int index, String fluidName) { - Fluid f = FluidRegistry.getFluid(fluidName); - setFluid(index, f); - } - - public boolean isBlacklist() { - return isBlacklist; - } - - public void setBlacklist(boolean isBlacklist) { - this.isBlacklist = isBlacklist; - } - - public boolean isDefault() { - return !isBlacklist && isEmpty(); - } - - public void writeToNBT(NBTTagCompound root) { - root.setBoolean("isBlacklist", isBlacklist); - if(isEmpty()) { - root.removeTag("fluidFilter"); - return; + public boolean isEmpty() { + for (FluidStack f : fluids) { + if (f != null) { + return false; + } + } + return true; } - NBTTagList fluidList = new NBTTagList(); - int index = 0; - for (FluidStack f : fluids) { - if(f != null) { - NBTTagCompound fRoot = new NBTTagCompound(); - fRoot.setInteger("index", index); - f.writeToNBT(fRoot); - fluidList.appendTag(fRoot); - } - index++; + public int size() { + return fluids.length; } - root.setTag("fluidStackFilter", fluidList); - } - - public void readFromNBT(NBTTagCompound root) { - isBlacklist = root.getBoolean("isBlacklist"); - if (root.hasKey("fluidFilter")) { - NBTTagList fluidList = (NBTTagList) root.getTag("fluidFilter"); - for (int i = 0; i < fluidList.tagCount(); i++) { - NBTTagCompound fRoot = fluidList.getCompoundTagAt(i); - setFluid(fRoot.getInteger("index"), fRoot.getString("fluidName")); - } - } else if (root.hasKey("fluidStackFilter")) { - NBTTagList fluidList = (NBTTagList) root.getTag("fluidStackFilter"); - for (int i = 0; i < fluidList.tagCount(); i++) { - NBTTagCompound fRoot = fluidList.getCompoundTagAt(i); - setFluid(fRoot.getInteger("index"), FluidStack.loadFluidStackFromNBT(fRoot)); - } - } else { - clear(); - return; + @Deprecated + public Fluid getFluidAt(int index) { + return fluids[index].getFluid(); } - } - private void clear() { - for(int i=0;i= fluids.length) { + return false; + } + fluids[index] = null; + return true; + } + + @Deprecated + protected void setFluid(int index, String fluidName) { + Fluid f = FluidRegistry.getFluid(fluidName); + setFluid(index, f); + } + + public boolean isBlacklist() { + return isBlacklist; + } + + public void setBlacklist(boolean isBlacklist) { + this.isBlacklist = isBlacklist; + } + + public boolean isDefault() { + return !isBlacklist && isEmpty(); + } + + public void writeToNBT(NBTTagCompound root) { + root.setBoolean("isBlacklist", isBlacklist); + if (isEmpty()) { + root.removeTag("fluidFilter"); + return; + } + + NBTTagList fluidList = new NBTTagList(); + int index = 0; + for (FluidStack f : fluids) { + if (f != null) { + NBTTagCompound fRoot = new NBTTagCompound(); + fRoot.setInteger("index", index); + f.writeToNBT(fRoot); + fluidList.appendTag(fRoot); + } + index++; + } + root.setTag("fluidStackFilter", fluidList); + } + + public void readFromNBT(NBTTagCompound root) { + isBlacklist = root.getBoolean("isBlacklist"); + if (root.hasKey("fluidFilter")) { + NBTTagList fluidList = (NBTTagList) root.getTag("fluidFilter"); + for (int i = 0; i < fluidList.tagCount(); i++) { + NBTTagCompound fRoot = fluidList.getCompoundTagAt(i); + setFluid(fRoot.getInteger("index"), fRoot.getString("fluidName")); + } + } else if (root.hasKey("fluidStackFilter")) { + NBTTagList fluidList = (NBTTagList) root.getTag("fluidStackFilter"); + for (int i = 0; i < fluidList.tagCount(); i++) { + NBTTagCompound fRoot = fluidList.getCompoundTagAt(i); + setFluid(fRoot.getInteger("index"), FluidStack.loadFluidStackFromNBT(fRoot)); + } + } else { + clear(); + return; + } + } + + private void clear() { + for (int i = 0; i < fluids.length; i++) { + fluids[i] = null; + } + } + + public boolean matchesFilter(FluidStack drained) { + if (drained == null || drained.getFluid() == null) { + return false; + } + if (isEmpty()) { + return true; + } + for (FluidStack f : fluids) { + if (f != null && f.isFluidEqual(drained)) { + return !isBlacklist; + } + } + return isBlacklist; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java index 24e223a0..1262c69d 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java @@ -1,15 +1,15 @@ package crazypants.enderio.conduit.liquid; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; public interface ILiquidConduit extends IConduit, IFluidHandler, IExtractor { - boolean canOutputToDir(ForgeDirection dir); + boolean canOutputToDir(ForgeDirection dir); - boolean canExtractFromDir(ForgeDirection dir); + boolean canExtractFromDir(ForgeDirection dir); - boolean canInputToDir(ForgeDirection dir); + boolean canInputToDir(ForgeDirection dir); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index d09053db..d29e25a2 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -1,13 +1,7 @@ package crazypants.enderio.conduit.liquid; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -16,128 +10,132 @@ import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.config.Config; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedTooltipProvider { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemLiquidConduit.name(), "enderio:itemLiquidConduit"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Advanced", "enderio:itemLiquidConduitAdvanced"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Ender", "enderio:itemLiquidConduitEnder"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "CrystallineEnder", "enderio:itemLiquidConduitCrystallineEnder"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "CrystallinePinkSlimeEnder", "enderio:itemLiquidConduitCrystallinePinkSlimeEnder"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "MelodicEnder", "enderio:itemLiquidConduitMelodicEnder"), - new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "StellarEnder", "enderio:itemLiquidConduitStellarEnder") - }; + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemLiquidConduit.name(), "enderio:itemLiquidConduit"), + new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Advanced", "enderio:itemLiquidConduitAdvanced"), + new ItemConduitSubtype(ModObject.itemLiquidConduit.name() + "Ender", "enderio:itemLiquidConduitEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "CrystallineEnder", "enderio:itemLiquidConduitCrystallineEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "CrystallinePinkSlimeEnder", + "enderio:itemLiquidConduitCrystallinePinkSlimeEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "MelodicEnder", "enderio:itemLiquidConduitMelodicEnder"), + new ItemConduitSubtype( + ModObject.itemLiquidConduit.name() + "StellarEnder", "enderio:itemLiquidConduitStellarEnder") + }; - public static ItemLiquidConduit create() { - ItemLiquidConduit result = new ItemLiquidConduit(); - result.init(); - return result; - } - - protected ItemLiquidConduit() { - super(ModObject.itemLiquidConduit, subtypes); - } - - @Override - public Class getBaseConduitType() { - return ILiquidConduit.class; - } - - @Override - public IConduit createConduit(ItemStack stack, EntityPlayer player) { - switch (stack.getItemDamage()) { - case 0: - return new LiquidConduit(); - case 1: - return new AdvancedLiquidConduit(); - case EnderLiquidConduit.METADATA: - return new EnderLiquidConduit(); - case CrystallineEnderLiquidConduit.METADATA: - return new CrystallineEnderLiquidConduit(); - case CrystallinePinkSlimeEnderLiquidConduit.METADATA: - return new CrystallinePinkSlimeEnderLiquidConduit(); - case MelodicEnderLiquidConduit.METADATA: - return new MelodicEnderLiquidConduit(); - case StellarEnderLiquidConduit.METADATA: - return new StellarEnderLiquidConduit(); - default: - throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage()); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - int extractRate; - int maxIo; - - switch (itemstack.getItemDamage()) { - case 0: - extractRate = Config.fluidConduitExtractRate; - maxIo = Config.fluidConduitMaxIoRate; - break; - - case 1: - extractRate = Config.advancedFluidConduitExtractRate; - maxIo = Config.advancedFluidConduitMaxIoRate; - break; - - case EnderLiquidConduit.METADATA: - extractRate = EnderLiquidConduit.TYPE.getMaxExtractPerTick(); - maxIo = EnderLiquidConduit.TYPE.getMaxIoPerTick(); - break; - - case CrystallineEnderLiquidConduit.METADATA: - extractRate = CrystallineEnderLiquidConduit.TYPE.getMaxExtractPerTick(); - maxIo = CrystallineEnderLiquidConduit.TYPE.getMaxIoPerTick(); - break; - - case CrystallinePinkSlimeEnderLiquidConduit.METADATA: - extractRate = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxExtractPerTick(); - maxIo = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxIoPerTick(); - break; - - case MelodicEnderLiquidConduit.METADATA: - extractRate = MelodicEnderLiquidConduit.TYPE.getMaxExtractPerTick(); - maxIo = MelodicEnderLiquidConduit.TYPE.getMaxIoPerTick(); - break; - - case StellarEnderLiquidConduit.METADATA: - extractRate = StellarEnderLiquidConduit.TYPE.getMaxExtractPerTick(); - maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick(); - break; - - default: - throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + itemstack.getItemDamage()); + public static ItemLiquidConduit create() { + ItemLiquidConduit result = new ItemLiquidConduit(); + result.init(); + return result; } - String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick"); - list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt); - list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt); - - if(itemstack.getItemDamage() == 0) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit"); - } else if(itemstack.getItemDamage() > 1) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduitEnder"); + protected ItemLiquidConduit() { + super(ModObject.itemLiquidConduit, subtypes); } - } + @Override + public Class getBaseConduitType() { + return ILiquidConduit.class; + } - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + switch (stack.getItemDamage()) { + case 0: + return new LiquidConduit(); + case 1: + return new AdvancedLiquidConduit(); + case EnderLiquidConduit.METADATA: + return new EnderLiquidConduit(); + case CrystallineEnderLiquidConduit.METADATA: + return new CrystallineEnderLiquidConduit(); + case CrystallinePinkSlimeEnderLiquidConduit.METADATA: + return new CrystallinePinkSlimeEnderLiquidConduit(); + case MelodicEnderLiquidConduit.METADATA: + return new MelodicEnderLiquidConduit(); + case StellarEnderLiquidConduit.METADATA: + return new StellarEnderLiquidConduit(); + default: + throw new IllegalArgumentException("Unrecognized ender fluid conduit type: " + stack.getItemDamage()); + } + } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + int extractRate; + int maxIo; + + switch (itemstack.getItemDamage()) { + case 0: + extractRate = Config.fluidConduitExtractRate; + maxIo = Config.fluidConduitMaxIoRate; + break; + + case 1: + extractRate = Config.advancedFluidConduitExtractRate; + maxIo = Config.advancedFluidConduitMaxIoRate; + break; + + case EnderLiquidConduit.METADATA: + extractRate = EnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = EnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case CrystallineEnderLiquidConduit.METADATA: + extractRate = CrystallineEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = CrystallineEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case CrystallinePinkSlimeEnderLiquidConduit.METADATA: + extractRate = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = CrystallinePinkSlimeEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case MelodicEnderLiquidConduit.METADATA: + extractRate = MelodicEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = MelodicEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + case StellarEnderLiquidConduit.METADATA: + extractRate = StellarEnderLiquidConduit.TYPE.getMaxExtractPerTick(); + maxIo = StellarEnderLiquidConduit.TYPE.getMaxIoPerTick(); + break; + + default: + throw new IllegalArgumentException( + "Unrecognized ender fluid conduit type: " + itemstack.getItemDamage()); + } + + String mbt = " " + EnderIO.lang.localize("fluid.millibucketsTick"); + list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxExtract") + " " + extractRate + mbt); + list.add(EnderIO.lang.localize("itemLiquidConduit.tooltip.maxIo") + " " + maxIo + mbt); + + if (itemstack.getItemDamage() == 0) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduit"); + } else if (itemstack.getItemDamage() > 1) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemLiquidConduitEnder"); + } + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 91d03421..b6e0dd92 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -1,10 +1,20 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.config.Config; +import crazypants.enderio.network.PacketHandler; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -17,416 +27,401 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.config.Config; -import crazypants.enderio.network.PacketHandler; - public class LiquidConduit extends AbstractTankConduit { - static final int VOLUME_PER_CONNECTION = FluidContainerRegistry.BUCKET_VOLUME / 4; + static final int VOLUME_PER_CONNECTION = FluidContainerRegistry.BUCKET_VOLUME / 4; - public static final String ICON_KEY = "enderio:liquidConduit"; - public static final String ICON_KEY_LOCKED = "enderio:liquidConduitLocked"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCore"; - public static final String ICON_EXTRACT_KEY = "enderio:liquidConduitExtract"; - public static final String ICON_EMPTY_EXTRACT_KEY = "enderio:emptyLiquidConduitExtract"; - public static final String ICON_INSERT_KEY = "enderio:liquidConduitInsert"; - public static final String ICON_EMPTY_INSERT_KEY = "enderio:emptyLiquidConduitInsert"; + public static final String ICON_KEY = "enderio:liquidConduit"; + public static final String ICON_KEY_LOCKED = "enderio:liquidConduitLocked"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCore"; + public static final String ICON_EXTRACT_KEY = "enderio:liquidConduitExtract"; + public static final String ICON_EMPTY_EXTRACT_KEY = "enderio:emptyLiquidConduitExtract"; + public static final String ICON_INSERT_KEY = "enderio:liquidConduitInsert"; + public static final String ICON_EMPTY_INSERT_KEY = "enderio:emptyLiquidConduitInsert"; - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); - ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); - ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); - ICONS.put(ICON_EMPTY_EXTRACT_KEY, register.registerIcon(ICON_EMPTY_EXTRACT_KEY)); - ICONS.put(ICON_EMPTY_INSERT_KEY, register.registerIcon(ICON_EMPTY_INSERT_KEY)); - ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); - ICONS.put(ICON_KEY_LOCKED, register.registerIcon(ICON_KEY_LOCKED)); - } - - @Override - public int getTextureType() { - return 0; - } - - }); - } - - private LiquidConduitNetwork network; - - private float lastSyncRatio = -99; - - private int currentPushToken; - - // ----------------------------- - - public static final int MAX_EXTRACT_PER_TICK = Config.fluidConduitExtractRate; - - public static final int MAX_IO_PER_TICK = Config.fluidConduitMaxIoRate; - - private ForgeDirection startPushDir = ForgeDirection.DOWN; - - private long ticksSinceFailedExtract = 0; - - @Override - public void updateEntity(World world) { - super.updateEntity(world); - if(world.isRemote) { - return; - } - filledFromThisTick.clear(); - updateStartPushDir(); - doExtract(); - - if(stateDirty) { - getBundle().dirty(); - stateDirty = false; - lastSyncRatio = tank.getFilledRatio(); - - } else if((lastSyncRatio != tank.getFilledRatio() && world.getTotalWorldTime() % 2 == 0)) { - - //need to send a custom packet as we don't want want to trigger a full chunk update, just - //need to get the required values to the entity renderer - BlockCoord loc = getLocation(); - PacketHandler.INSTANCE.sendToAllAround(new PacketFluidLevel(this), new TargetPoint(world.provider.dimensionId, loc.x, loc.y, loc.z, 64)); - lastSyncRatio = tank.getFilledRatio(); - } - } - - private void doExtract() { - if(!hasExtractableMode()) { - return; - } - - // assume failure, reset to 0 if we do extract - ticksSinceFailedExtract++; - if(ticksSinceFailedExtract > 9 && ticksSinceFailedExtract % 10 != 0) { - // after 10 ticks of failing, only check every 10 ticks - return; - } - - for (ForgeDirection dir : externalConnections) { - if(autoExtractForDir(dir)) { - - IFluidHandler extTank = getTankContainer(getLocation().getLocation(dir)); - if(extTank != null) { - - boolean foundFluid = false; - FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); - if(info != null) { - for (FluidTankInfo inf : info) { - if(inf != null && inf.fluid != null && inf.fluid.amount > 0) { - foundFluid = true; - } + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(ICON_KEY, register.registerIcon(ICON_KEY)); + ICONS.put(ICON_CORE_KEY, register.registerIcon(ICON_CORE_KEY)); + ICONS.put(ICON_EXTRACT_KEY, register.registerIcon(ICON_EXTRACT_KEY)); + ICONS.put(ICON_EMPTY_EXTRACT_KEY, register.registerIcon(ICON_EMPTY_EXTRACT_KEY)); + ICONS.put(ICON_EMPTY_INSERT_KEY, register.registerIcon(ICON_EMPTY_INSERT_KEY)); + ICONS.put(ICON_INSERT_KEY, register.registerIcon(ICON_INSERT_KEY)); + ICONS.put(ICON_KEY_LOCKED, register.registerIcon(ICON_KEY_LOCKED)); } - } - if(!foundFluid) { + + @Override + public int getTextureType() { + return 0; + } + }); + } + + private LiquidConduitNetwork network; + + private float lastSyncRatio = -99; + + private int currentPushToken; + + // ----------------------------- + + public static final int MAX_EXTRACT_PER_TICK = Config.fluidConduitExtractRate; + + public static final int MAX_IO_PER_TICK = Config.fluidConduitMaxIoRate; + + private ForgeDirection startPushDir = ForgeDirection.DOWN; + + private long ticksSinceFailedExtract = 0; + + @Override + public void updateEntity(World world) { + super.updateEntity(world); + if (world.isRemote) { return; - } - - FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false); - if(couldDrain != null && couldDrain.amount > 0 && canFill(dir, couldDrain.getFluid())) { - int used = pushLiquid(dir, couldDrain, true, network == null ? -1 : network.getNextPushToken()); - extTank.drain(dir.getOpposite(), used, true); - if(used > 0 && network != null && network.getFluidType() == null) { - network.setFluidType(couldDrain); - } - if(used > 0) { - ticksSinceFailedExtract = 0; - } - } } - } - } + filledFromThisTick.clear(); + updateStartPushDir(); + doExtract(); - } + if (stateDirty) { + getBundle().dirty(); + stateDirty = false; + lastSyncRatio = tank.getFilledRatio(); - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + } else if ((lastSyncRatio != tank.getFilledRatio() && world.getTotalWorldTime() % 2 == 0)) { - if(network == null || resource == null) { - return 0; - } - if(!canFill(from, resource.getFluid())) { - return 0; - } - - // Guard against things that continuously call fill! - if(filledFromThisTick.contains(getLocation().getLocation(from))) { - return 0; - } - - if(network.lockNetworkForFill()) { - if(doFill) { - filledFromThisTick.add(getLocation().getLocation(from)); - } - try { - int res = fill(from, resource, doFill, true, network == null ? -1 : network.getNextPushToken()); - if(doFill && externalConnections.contains(from) && network != null) { - network.addedFromExternal(res); + // need to send a custom packet as we don't want want to trigger a full chunk update, just + // need to get the required values to the entity renderer + BlockCoord loc = getLocation(); + PacketHandler.INSTANCE.sendToAllAround( + new PacketFluidLevel(this), new TargetPoint(world.provider.dimensionId, loc.x, loc.y, loc.z, 64)); + lastSyncRatio = tank.getFilledRatio(); } - return res; - } finally { - network.unlockNetworkFromFill(); - - } - } else { - return 0; } - } + private void doExtract() { + if (!hasExtractableMode()) { + return; + } - public int fill(ForgeDirection from, FluidStack resource, boolean doFill, boolean doPush, int pushToken) { - if(resource == null || resource.amount <= 0) { - return 0; - } + // assume failure, reset to 0 if we do extract + ticksSinceFailedExtract++; + if (ticksSinceFailedExtract > 9 && ticksSinceFailedExtract % 10 != 0) { + // after 10 ticks of failing, only check every 10 ticks + return; + } - if(!canFill(from, resource.getFluid())) { - return 0; - } + for (ForgeDirection dir : externalConnections) { + if (autoExtractForDir(dir)) { - if(network == null) { - return 0; - } - if(network.canAcceptLiquid(resource)) { - network.setFluidType(resource); - } else { - return 0; - } - resource = resource.copy(); - resource.amount = Math.min(MAX_IO_PER_TICK, resource.amount); + IFluidHandler extTank = getTankContainer(getLocation().getLocation(dir)); + if (extTank != null) { - if(doPush) { - return pushLiquid(from, resource, doFill, pushToken); - } else { - return tank.fill(resource, doFill); - } - } + boolean foundFluid = false; + FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); + if (info != null) { + for (FluidTankInfo inf : info) { + if (inf != null && inf.fluid != null && inf.fluid.amount > 0) { + foundFluid = true; + } + } + } + if (!foundFluid) { + return; + } - private void updateStartPushDir() { - - ForgeDirection newVal = getNextDir(startPushDir); - boolean foundNewStart = false; - while (newVal != startPushDir && !foundNewStart) { - foundNewStart = getConduitConnections().contains(newVal) || getExternalConnections().contains(newVal); - newVal = getNextDir(newVal); - } - startPushDir = newVal; - } - - private ForgeDirection getNextDir(ForgeDirection dir) { - if(dir.ordinal() >= ForgeDirection.UNKNOWN.ordinal() - 1) { - return ForgeDirection.VALID_DIRECTIONS[0]; - } - return ForgeDirection.VALID_DIRECTIONS[dir.ordinal() + 1]; - } - - private int pushLiquid(ForgeDirection from, FluidStack pushStack, boolean doPush, int token) { - if(token == currentPushToken || pushStack == null || pushStack.amount <= 0 || network == null) { - return 0; - } - currentPushToken = token; - int pushed = 0; - int total = pushStack.amount; - - ForgeDirection dir = startPushDir; - FluidStack toPush = pushStack.copy(); - - int filledLocal = tank.fill(toPush, doPush); - toPush.amount -= filledLocal; - pushed += filledLocal; - - do { - if(dir != from && canOutputToDir(dir) && !autoExtractForDir(dir)) { - if(getConduitConnections().contains(dir)) { - ILiquidConduit conduitCon = getFluidConduit(dir); - if(conduitCon != null) { - int toCon = ((LiquidConduit) conduitCon).pushLiquid(dir.getOpposite(), toPush, doPush, token); - toPush.amount -= toCon; - pushed += toCon; - } - } else if(getExternalConnections().contains(dir)) { - IFluidHandler con = getTankContainer(getLocation().getLocation(dir)); - if(con != null) { - int toExt = con.fill(dir.getOpposite(), toPush, doPush); - toPush.amount -= toExt; - pushed += toExt; - if(doPush) { - network.outputedToExternal(toExt); + FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false); + if (couldDrain != null && couldDrain.amount > 0 && canFill(dir, couldDrain.getFluid())) { + int used = pushLiquid(dir, couldDrain, true, network == null ? -1 : network.getNextPushToken()); + extTank.drain(dir.getOpposite(), used, true); + if (used > 0 && network != null && network.getFluidType() == null) { + network.setFluidType(couldDrain); + } + if (used > 0) { + ticksSinceFailedExtract = 0; + } + } + } } - } } - } - dir = getNextDir(dir); - } while (dir != startPushDir && pushed < total); - - return pushed; - } - - private ILiquidConduit getFluidConduit(ForgeDirection dir) { - TileEntity ent = getBundle().getEntity(); - return ConduitUtil.getConduit(ent.getWorldObj(), ent, dir, ILiquidConduit.class); - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(getConnectionMode(from) == ConnectionMode.INPUT || getConnectionMode(from) == ConnectionMode.DISABLED) { - return null; - } - return tank.drain(maxDrain, doDrain); - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if (resource == null || !resource.isFluidEqual(tank.getFluid())) { - return null; - } - return drain(from, resource.amount, doDrain); - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(getConnectionMode(from) == ConnectionMode.OUTPUT || getConnectionMode(from) == ConnectionMode.DISABLED) { - return false; - } - if(tank.getFluid() == null) { - return true; - } - if (fluid != null && fluid.getID() == tank.getFluid().getFluidID()) { - return true; - } - return false; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(getConnectionMode(from) == ConnectionMode.INPUT || getConnectionMode(from) == ConnectionMode.DISABLED - || tank.getFluid() == null || fluid == null) { - return false; - } - return tank.getFluid().getFluid().getID() == fluid.getID(); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { tank.getInfo() }; - } - - // ----------------------------- - - @Override - public void connectionsChanged() { - super.connectionsChanged(); - updateTank(); - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemLiquidConduit, 1, 0); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - if(network == null) { - this.network = null; - return true; - } - if(!(network instanceof AbstractTankConduitNetwork)) { - return false; } - AbstractTankConduitNetwork n = (AbstractTankConduitNetwork) network; - if(tank.getFluid() == null) { - tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy()); - } else if(n.getFluidType() == null) { - n.setFluidType(tank.getFluid()); - } else if(!tank.getFluid().isFluidEqual(n.getFluidType())) { - return false; - } - this.network = (LiquidConduitNetwork) network; - return true; - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { - if(!super.canConnectToConduit(direction, con)) { - return false; - } - if(!(con instanceof LiquidConduit)) { - return false; - } - if(getFluidType() != null && ((LiquidConduit) con).getFluidType() == null) { - return false; - } - return LiquidConduitNetwork.areFluidsCompatable(getFluidType(), ((LiquidConduit) con).getFluidType()); - } + if (network == null || resource == null) { + return 0; + } + if (!canFill(from, resource.getFluid())) { + return 0; + } - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return ICONS.get(ICON_CORE_KEY); + // Guard against things that continuously call fill! + if (filledFromThisTick.contains(getLocation().getLocation(from))) { + return 0; + } + + if (network.lockNetworkForFill()) { + if (doFill) { + filledFromThisTick.add(getLocation().getLocation(from)); + } + try { + int res = fill(from, resource, doFill, true, network == null ? -1 : network.getNextPushToken()); + if (doFill && externalConnections.contains(from) && network != null) { + network.addedFromExternal(res); + } + return res; + } finally { + network.unlockNetworkFromFill(); + } + } else { + return 0; + } } - if(getConnectionMode(component.dir) == ConnectionMode.INPUT) { - return ICONS.get(getFluidType() == null ? ICON_EMPTY_EXTRACT_KEY : ICON_EXTRACT_KEY); + + public int fill(ForgeDirection from, FluidStack resource, boolean doFill, boolean doPush, int pushToken) { + if (resource == null || resource.amount <= 0) { + return 0; + } + + if (!canFill(from, resource.getFluid())) { + return 0; + } + + if (network == null) { + return 0; + } + if (network.canAcceptLiquid(resource)) { + network.setFluidType(resource); + } else { + return 0; + } + resource = resource.copy(); + resource.amount = Math.min(MAX_IO_PER_TICK, resource.amount); + + if (doPush) { + return pushLiquid(from, resource, doFill, pushToken); + } else { + return tank.fill(resource, doFill); + } } - if(getConnectionMode(component.dir) == ConnectionMode.OUTPUT) { - return ICONS.get(getFluidType() == null ? ICON_EMPTY_INSERT_KEY : ICON_INSERT_KEY); + + private void updateStartPushDir() { + + ForgeDirection newVal = getNextDir(startPushDir); + boolean foundNewStart = false; + while (newVal != startPushDir && !foundNewStart) { + foundNewStart = getConduitConnections().contains(newVal) + || getExternalConnections().contains(newVal); + newVal = getNextDir(newVal); + } + startPushDir = newVal; } - // if(getFluidType() == null) { - // return ICONS.get(ICON_EMPTY_KEY); - // } - return fluidTypeLocked ? ICONS.get(ICON_KEY_LOCKED) : ICONS.get(ICON_KEY); - } - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - if(tank.getFluid() != null && tank.getFluid().getFluid() != null) { - return tank.getFluid().getFluid().getStillIcon(); + private ForgeDirection getNextDir(ForgeDirection dir) { + if (dir.ordinal() >= ForgeDirection.UNKNOWN.ordinal() - 1) { + return ForgeDirection.VALID_DIRECTIONS[0]; + } + return ForgeDirection.VALID_DIRECTIONS[dir.ordinal() + 1]; } - return null; - } - @Override - public float getTransmitionGeometryScale() { - return tank.getFilledRatio(); - } + private int pushLiquid(ForgeDirection from, FluidStack pushStack, boolean doPush, int token) { + if (token == currentPushToken || pushStack == null || pushStack.amount <= 0 || network == null) { + return 0; + } + currentPushToken = token; + int pushed = 0; + int total = pushStack.amount; - @Override - protected void updateTank() { - int totalConnections = getConduitConnections().size() + getExternalConnections().size(); - tank.setCapacity(totalConnections * VOLUME_PER_CONNECTION); - } + ForgeDirection dir = startPushDir; + FluidStack toPush = pushStack.copy(); - @Override - protected boolean canJoinNeighbour(ILiquidConduit n) { - return n instanceof LiquidConduit; - } + int filledLocal = tank.fill(toPush, doPush); + toPush.amount -= filledLocal; + pushed += filledLocal; - @Override - public AbstractTankConduitNetwork getTankNetwork() { - return network; - } + do { + if (dir != from && canOutputToDir(dir) && !autoExtractForDir(dir)) { + if (getConduitConnections().contains(dir)) { + ILiquidConduit conduitCon = getFluidConduit(dir); + if (conduitCon != null) { + int toCon = ((LiquidConduit) conduitCon).pushLiquid(dir.getOpposite(), toPush, doPush, token); + toPush.amount -= toCon; + pushed += toCon; + } + } else if (getExternalConnections().contains(dir)) { + IFluidHandler con = getTankContainer(getLocation().getLocation(dir)); + if (con != null) { + int toExt = con.fill(dir.getOpposite(), toPush, doPush); + toPush.amount -= toExt; + pushed += toExt; + if (doPush) { + network.outputedToExternal(toExt); + } + } + } + } + dir = getNextDir(dir); + } while (dir != startPushDir && pushed < total); + return pushed; + } + + private ILiquidConduit getFluidConduit(ForgeDirection dir) { + TileEntity ent = getBundle().getEntity(); + return ConduitUtil.getConduit(ent.getWorldObj(), ent, dir, ILiquidConduit.class); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (getConnectionMode(from) == ConnectionMode.INPUT || getConnectionMode(from) == ConnectionMode.DISABLED) { + return null; + } + return tank.drain(maxDrain, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource == null || !resource.isFluidEqual(tank.getFluid())) { + return null; + } + return drain(from, resource.amount, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (getConnectionMode(from) == ConnectionMode.OUTPUT || getConnectionMode(from) == ConnectionMode.DISABLED) { + return false; + } + if (tank.getFluid() == null) { + return true; + } + if (fluid != null && fluid.getID() == tank.getFluid().getFluidID()) { + return true; + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (getConnectionMode(from) == ConnectionMode.INPUT + || getConnectionMode(from) == ConnectionMode.DISABLED + || tank.getFluid() == null + || fluid == null) { + return false; + } + return tank.getFluid().getFluid().getID() == fluid.getID(); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {tank.getInfo()}; + } + + // ----------------------------- + + @Override + public void connectionsChanged() { + super.connectionsChanged(); + updateTank(); + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemLiquidConduit, 1, 0); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + this.network = null; + return true; + } + if (!(network instanceof AbstractTankConduitNetwork)) { + return false; + } + + AbstractTankConduitNetwork n = (AbstractTankConduitNetwork) network; + if (tank.getFluid() == null) { + tank.setLiquid(n.getFluidType() == null ? null : n.getFluidType().copy()); + } else if (n.getFluidType() == null) { + n.setFluidType(tank.getFluid()); + } else if (!tank.getFluid().isFluidEqual(n.getFluidType())) { + return false; + } + this.network = (LiquidConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit con) { + if (!super.canConnectToConduit(direction, con)) { + return false; + } + if (!(con instanceof LiquidConduit)) { + return false; + } + if (getFluidType() != null && ((LiquidConduit) con).getFluidType() == null) { + return false; + } + return LiquidConduitNetwork.areFluidsCompatable(getFluidType(), ((LiquidConduit) con).getFluidType()); + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY); + } + if (getConnectionMode(component.dir) == ConnectionMode.INPUT) { + return ICONS.get(getFluidType() == null ? ICON_EMPTY_EXTRACT_KEY : ICON_EXTRACT_KEY); + } + if (getConnectionMode(component.dir) == ConnectionMode.OUTPUT) { + return ICONS.get(getFluidType() == null ? ICON_EMPTY_INSERT_KEY : ICON_INSERT_KEY); + } + // if(getFluidType() == null) { + // return ICONS.get(ICON_EMPTY_KEY); + // } + return fluidTypeLocked ? ICONS.get(ICON_KEY_LOCKED) : ICONS.get(ICON_KEY); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + if (tank.getFluid() != null && tank.getFluid().getFluid() != null) { + return tank.getFluid().getFluid().getStillIcon(); + } + return null; + } + + @Override + public float getTransmitionGeometryScale() { + return tank.getFilledRatio(); + } + + @Override + protected void updateTank() { + int totalConnections = + getConduitConnections().size() + getExternalConnections().size(); + tank.setCapacity(totalConnections * VOLUME_PER_CONNECTION); + } + + @Override + protected boolean canJoinNeighbour(ILiquidConduit n) { + return n instanceof LiquidConduit; + } + + @Override + public AbstractTankConduitNetwork getTankNetwork() { + return network; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index 17df2d70..b886e64d 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -1,367 +1,360 @@ package crazypants.enderio.conduit.liquid; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.ConduitUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.ConduitUtil; - public class LiquidConduitNetwork extends AbstractTankConduitNetwork { - public LiquidConduitNetwork() { - super(LiquidConduit.class); - } - - private int ticksEmpty = 0; - - private int maxFlowsPerTick = 10; - private int lastFlowIndex = 0; - - private boolean printFlowTiming = false; - - private int lastPushToken = 0; - - private int inputVolume; - - private int outputVolume; - - private boolean inputLocked = false; - - public boolean lockNetworkForFill() { - if(inputLocked) { - return false; - } - inputLocked = true; - return true; - } - - public void unlockNetworkFromFill() { - inputLocked = false; - } - - @Override - public void doNetworkTick() { - List cons = getConduits(); - if(cons == null || cons.isEmpty()) { - return; + public LiquidConduitNetwork() { + super(LiquidConduit.class); } - if(isEmpty()) { - if(!fluidTypeLocked && liquidType != null) { - ticksEmpty++; - if(ticksEmpty > 40) { - setFluidType(null); - ticksEmpty = 0; + private int ticksEmpty = 0; + + private int maxFlowsPerTick = 10; + private int lastFlowIndex = 0; + + private boolean printFlowTiming = false; + + private int lastPushToken = 0; + + private int inputVolume; + + private int outputVolume; + + private boolean inputLocked = false; + + public boolean lockNetworkForFill() { + if (inputLocked) { + return false; } - } - return; + inputLocked = true; + return true; } - ticksEmpty = 0; - long curTime = cons.get(0).getBundle().getEntity().getWorldObj().getTotalWorldTime(); + public void unlockNetworkFromFill() { + inputLocked = false; + } - // 1000 water, 6000 lava - if(liquidType != null && liquidType.getFluid() != null && !isEmpty()) { - int visc = Math.max(1000, liquidType.getFluid().getViscosity()); - if(curTime % (visc / 500) == 0) { - long start = System.nanoTime(); - if(doFlow() && printFlowTiming) { - long took = System.nanoTime() - start; - double secs = took / 1000000000.0; - System.out.println("LiquidConduitNetwork.onUpdateEntity: took " + secs + " secs, " + (secs * 1000) + " millis"); + @Override + public void doNetworkTick() { + List cons = getConduits(); + if (cons == null || cons.isEmpty()) { + return; } - } - } - } - void addedFromExternal(int res) { - inputVolume += res; - } - - void outputedToExternal(int filled) { - outputVolume += filled; - } - - int getNextPushToken() { - return ++lastPushToken; - } - - private boolean doFlow() { - - int pushToken = getNextPushToken(); - List actions = new ArrayList(); - for (int i = 0; i < Math.min(maxFlowsPerTick, conduits.size()); i++) { - - if(lastFlowIndex >= conduits.size()) { - lastFlowIndex = 0; - } - flowFrom(conduits.get(lastFlowIndex), actions, pushToken); - ++lastFlowIndex; - - } - for (FlowAction action : actions) { - action.apply(); - } - - boolean result = !actions.isEmpty(); - - // Flush any tanks with a tiny bit left - List toEmpty = new ArrayList(); - for (LiquidConduit con : conduits) { - if(con != null && con.getTank().getFluidAmount() < 10) { - toEmpty.add(con); - } else { - //some of the conduits have fluid left in them so don't do the final drain yet - return result; - } - - } - if(toEmpty.isEmpty()) { - return result; - } - - List externals = new ArrayList(); - for (AbstractTankConduit con : conduits) { - Set extCons = con.getExternalConnections(); - - for (ForgeDirection dir : extCons) { - if(con.canOutputToDir(dir)) { - IFluidHandler externalTank = con.getExternalHandler(dir); - if(externalTank != null) { - externals.add(new LocatedFluidHandler(externalTank, con.getLocation().getLocation(dir), dir.getOpposite())); - } - } - } - } - if(externals.isEmpty()) { - return result; - } - - for (LiquidConduit con : toEmpty) { - drainConduitToNearestExternal(con, externals); - } - - return result; - } - - @Override - public void setFluidTypeLocked(boolean fluidTypeLocked) { - super.setFluidTypeLocked(fluidTypeLocked); - if(!fluidTypeLocked && isEmpty()) { - setFluidType(null); - } - } - - private boolean isEmpty() { - for (LiquidConduit con : conduits) { - if(con.tank.getFluidAmount() > 0) { - return false; - } - } - return true; - } - - private void drainConduitToNearestExternal(LiquidConduit con, List externals) { - BlockCoord conLoc = con.getLocation(); - FluidStack toDrain = con.getTank().getFluid(); - if(toDrain == null) { - return; - } - int closestDistance = Integer.MAX_VALUE; - LocatedFluidHandler closestTank = null; - for (LocatedFluidHandler lh : externals) { - int distance = lh.bc.getDistSq(conLoc); - if(distance < closestDistance && con.canOutputToDir(lh.dir.getOpposite())) { - int couldFill = lh.tank.fill(lh.dir, toDrain.copy(), false); - if(couldFill > 0) { - closestTank = lh; - closestDistance = distance; - } - } - } - - if(closestTank != null) { - int filled = closestTank.tank.fill(closestTank.dir, toDrain.copy(), true); - con.getTank().addAmount(-filled); - } - - } - - private void flowFrom(LiquidConduit con, List actions, int pushPoken) { - - ConduitTank tank = con.getTank(); - int totalAmount = tank.getFluidAmount(); - if(totalAmount <= 0) { - return; - } - - int maxFlowVolume = 20; - - // First flow all we can down, then balance the rest - if(con.getConduitConnections().contains(ForgeDirection.DOWN)) { - BlockCoord loc = con.getLocation().getLocation(ForgeDirection.DOWN); - ILiquidConduit dc = ConduitUtil.getConduit(con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); - if(dc instanceof LiquidConduit) { - LiquidConduit downCon = (LiquidConduit) dc; - int filled = downCon.fill(ForgeDirection.UP, tank.getFluid().copy(), false, false, pushPoken); - int actual = filled; - actual = Math.min(actual, tank.getFluidAmount()); - actual = Math.min(actual, downCon.getTank().getAvailableSpace()); - tank.addAmount(-actual); - downCon.getTank().addAmount(actual); - } - } - - totalAmount = tank.getFluidAmount(); - if(totalAmount <= 0) { - return; - } - FluidStack available = tank.getFluid(); - int totalRequested = 0; - int numRequests = 0; - // Then to external connections - for (ForgeDirection dir : con.getExternalConnections()) { - if(con.canOutputToDir(dir)) { - IFluidHandler extCon = con.getExternalHandler(dir); - if(extCon != null) { - int amount = extCon.fill(dir.getOpposite(), available.copy(), false); - if(amount > 0) { - totalRequested += amount; - numRequests++; - } - } - } - } - - if(numRequests > 0) { - int amountPerRequest = Math.min(totalAmount, totalRequested) / numRequests; - amountPerRequest = Math.min(maxFlowVolume, amountPerRequest); - - FluidStack requestSource = available.copy(); - requestSource.amount = amountPerRequest; - for (ForgeDirection dir : con.getExternalConnections()) { - if(con.canOutputToDir(dir)) { - IFluidHandler extCon = con.getExternalHandler(dir); - if(extCon != null) { - int amount = extCon.fill(dir.getOpposite(), requestSource.copy(), true); - if(amount > 0) { - outputedToExternal(amount); - tank.addAmount(-amount); + if (isEmpty()) { + if (!fluidTypeLocked && liquidType != null) { + ticksEmpty++; + if (ticksEmpty > 40) { + setFluidType(null); + ticksEmpty = 0; + } } - } - } - } - } - - totalAmount = tank.getFluidAmount(); - if(totalAmount <= 0) { - return; - } - int totalCapacity = tank.getCapacity(); - - BlockCoord loc = con.getLocation(); - Collection connections = - ConduitUtil.getConnectedConduits(con.getBundle().getEntity().getWorldObj(), - loc.x, loc.y, loc.z, ILiquidConduit.class); - int numTargets = 0; - for (ILiquidConduit n : connections) { - LiquidConduit neighbour = (LiquidConduit) n; - if(canFlowTo(con, neighbour)) { // can only flow within same network - totalAmount += neighbour.getTank().getFluidAmount(); - totalCapacity += neighbour.getTank().getCapacity(); - numTargets++; - } - } - - float targetRatio = (float) totalAmount / totalCapacity; - int flowVolume = (int) Math.floor((targetRatio - tank.getFilledRatio()) * tank.getCapacity()); - flowVolume = Math.min(maxFlowVolume, flowVolume); - - if(Math.abs(flowVolume) < 2) { - return; // dont bother with transfers of less than a thousands of a bucket - } - - for (ILiquidConduit n : connections) { - LiquidConduit neigbour = (LiquidConduit) n; - if(canFlowTo(con, neigbour)) { // can only flow within same network - flowVolume = (int) Math.floor((targetRatio - neigbour.getTank().getFilledRatio()) * neigbour.getTank().getCapacity()); - if(flowVolume != 0) { - actions.add(new FlowAction(con, neigbour, flowVolume)); - } - } - } - - } - - private boolean canFlowTo(LiquidConduit con, LiquidConduit neighbour) { - if(con == null || neighbour == null) { - return false; - } - if(neighbour.getNetwork() != this) { - return false; - } - if(neighbour.getLocation().y > con.getLocation().y) { - return false; - } - float nr = neighbour.getTank().getFilledRatio(); - if(nr >= con.getTank().getFilledRatio()) { - return false; - } - return true; - } - - static class FlowAction { - final LiquidConduit from; - final LiquidConduit to; - final int amount; - - FlowAction(LiquidConduit fromIn, LiquidConduit toIn, int amountIn) { - if(amountIn < 0) { - to = fromIn; - from = toIn; - amount = -amountIn; - } else { - to = toIn; - from = fromIn; - amount = amountIn; - } - } - - void apply() { - if(amount != 0) { - - // don't take more than it has - int actual = Math.min(amount, from.getTank().getFluidAmount()); - // and don't add more than it can take - actual = Math.min(actual, to.getTank().getAvailableSpace()); - - if(from != null && to != null) { - from.getTank().addAmount(-actual); - to.getTank().addAmount(actual); + return; } - } + ticksEmpty = 0; + long curTime = cons.get(0).getBundle().getEntity().getWorldObj().getTotalWorldTime(); + + // 1000 water, 6000 lava + if (liquidType != null && liquidType.getFluid() != null && !isEmpty()) { + int visc = Math.max(1000, liquidType.getFluid().getViscosity()); + if (curTime % (visc / 500) == 0) { + long start = System.nanoTime(); + if (doFlow() && printFlowTiming) { + long took = System.nanoTime() - start; + double secs = took / 1000000000.0; + System.out.println("LiquidConduitNetwork.onUpdateEntity: took " + secs + " secs, " + (secs * 1000) + + " millis"); + } + } + } } - } - - static class LocatedFluidHandler { - final IFluidHandler tank; - final BlockCoord bc; - final ForgeDirection dir; - - LocatedFluidHandler(IFluidHandler tank, BlockCoord bc, ForgeDirection dir) { - this.tank = tank; - this.bc = bc; - this.dir = dir; + void addedFromExternal(int res) { + inputVolume += res; } - } + void outputedToExternal(int filled) { + outputVolume += filled; + } + + int getNextPushToken() { + return ++lastPushToken; + } + + private boolean doFlow() { + + int pushToken = getNextPushToken(); + List actions = new ArrayList(); + for (int i = 0; i < Math.min(maxFlowsPerTick, conduits.size()); i++) { + + if (lastFlowIndex >= conduits.size()) { + lastFlowIndex = 0; + } + flowFrom(conduits.get(lastFlowIndex), actions, pushToken); + ++lastFlowIndex; + } + for (FlowAction action : actions) { + action.apply(); + } + + boolean result = !actions.isEmpty(); + + // Flush any tanks with a tiny bit left + List toEmpty = new ArrayList(); + for (LiquidConduit con : conduits) { + if (con != null && con.getTank().getFluidAmount() < 10) { + toEmpty.add(con); + } else { + // some of the conduits have fluid left in them so don't do the final drain yet + return result; + } + } + if (toEmpty.isEmpty()) { + return result; + } + + List externals = new ArrayList(); + for (AbstractTankConduit con : conduits) { + Set extCons = con.getExternalConnections(); + + for (ForgeDirection dir : extCons) { + if (con.canOutputToDir(dir)) { + IFluidHandler externalTank = con.getExternalHandler(dir); + if (externalTank != null) { + externals.add(new LocatedFluidHandler( + externalTank, con.getLocation().getLocation(dir), dir.getOpposite())); + } + } + } + } + if (externals.isEmpty()) { + return result; + } + + for (LiquidConduit con : toEmpty) { + drainConduitToNearestExternal(con, externals); + } + + return result; + } + + @Override + public void setFluidTypeLocked(boolean fluidTypeLocked) { + super.setFluidTypeLocked(fluidTypeLocked); + if (!fluidTypeLocked && isEmpty()) { + setFluidType(null); + } + } + + private boolean isEmpty() { + for (LiquidConduit con : conduits) { + if (con.tank.getFluidAmount() > 0) { + return false; + } + } + return true; + } + + private void drainConduitToNearestExternal(LiquidConduit con, List externals) { + BlockCoord conLoc = con.getLocation(); + FluidStack toDrain = con.getTank().getFluid(); + if (toDrain == null) { + return; + } + int closestDistance = Integer.MAX_VALUE; + LocatedFluidHandler closestTank = null; + for (LocatedFluidHandler lh : externals) { + int distance = lh.bc.getDistSq(conLoc); + if (distance < closestDistance && con.canOutputToDir(lh.dir.getOpposite())) { + int couldFill = lh.tank.fill(lh.dir, toDrain.copy(), false); + if (couldFill > 0) { + closestTank = lh; + closestDistance = distance; + } + } + } + + if (closestTank != null) { + int filled = closestTank.tank.fill(closestTank.dir, toDrain.copy(), true); + con.getTank().addAmount(-filled); + } + } + + private void flowFrom(LiquidConduit con, List actions, int pushPoken) { + + ConduitTank tank = con.getTank(); + int totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + + int maxFlowVolume = 20; + + // First flow all we can down, then balance the rest + if (con.getConduitConnections().contains(ForgeDirection.DOWN)) { + BlockCoord loc = con.getLocation().getLocation(ForgeDirection.DOWN); + ILiquidConduit dc = ConduitUtil.getConduit( + con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); + if (dc instanceof LiquidConduit) { + LiquidConduit downCon = (LiquidConduit) dc; + int filled = downCon.fill(ForgeDirection.UP, tank.getFluid().copy(), false, false, pushPoken); + int actual = filled; + actual = Math.min(actual, tank.getFluidAmount()); + actual = Math.min(actual, downCon.getTank().getAvailableSpace()); + tank.addAmount(-actual); + downCon.getTank().addAmount(actual); + } + } + + totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + FluidStack available = tank.getFluid(); + int totalRequested = 0; + int numRequests = 0; + // Then to external connections + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.canOutputToDir(dir)) { + IFluidHandler extCon = con.getExternalHandler(dir); + if (extCon != null) { + int amount = extCon.fill(dir.getOpposite(), available.copy(), false); + if (amount > 0) { + totalRequested += amount; + numRequests++; + } + } + } + } + + if (numRequests > 0) { + int amountPerRequest = Math.min(totalAmount, totalRequested) / numRequests; + amountPerRequest = Math.min(maxFlowVolume, amountPerRequest); + + FluidStack requestSource = available.copy(); + requestSource.amount = amountPerRequest; + for (ForgeDirection dir : con.getExternalConnections()) { + if (con.canOutputToDir(dir)) { + IFluidHandler extCon = con.getExternalHandler(dir); + if (extCon != null) { + int amount = extCon.fill(dir.getOpposite(), requestSource.copy(), true); + if (amount > 0) { + outputedToExternal(amount); + tank.addAmount(-amount); + } + } + } + } + } + + totalAmount = tank.getFluidAmount(); + if (totalAmount <= 0) { + return; + } + int totalCapacity = tank.getCapacity(); + + BlockCoord loc = con.getLocation(); + Collection connections = ConduitUtil.getConnectedConduits( + con.getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, ILiquidConduit.class); + int numTargets = 0; + for (ILiquidConduit n : connections) { + LiquidConduit neighbour = (LiquidConduit) n; + if (canFlowTo(con, neighbour)) { // can only flow within same network + totalAmount += neighbour.getTank().getFluidAmount(); + totalCapacity += neighbour.getTank().getCapacity(); + numTargets++; + } + } + + float targetRatio = (float) totalAmount / totalCapacity; + int flowVolume = (int) Math.floor((targetRatio - tank.getFilledRatio()) * tank.getCapacity()); + flowVolume = Math.min(maxFlowVolume, flowVolume); + + if (Math.abs(flowVolume) < 2) { + return; // dont bother with transfers of less than a thousands of a bucket + } + + for (ILiquidConduit n : connections) { + LiquidConduit neigbour = (LiquidConduit) n; + if (canFlowTo(con, neigbour)) { // can only flow within same network + flowVolume = (int) Math.floor((targetRatio - neigbour.getTank().getFilledRatio()) + * neigbour.getTank().getCapacity()); + if (flowVolume != 0) { + actions.add(new FlowAction(con, neigbour, flowVolume)); + } + } + } + } + + private boolean canFlowTo(LiquidConduit con, LiquidConduit neighbour) { + if (con == null || neighbour == null) { + return false; + } + if (neighbour.getNetwork() != this) { + return false; + } + if (neighbour.getLocation().y > con.getLocation().y) { + return false; + } + float nr = neighbour.getTank().getFilledRatio(); + if (nr >= con.getTank().getFilledRatio()) { + return false; + } + return true; + } + + static class FlowAction { + final LiquidConduit from; + final LiquidConduit to; + final int amount; + + FlowAction(LiquidConduit fromIn, LiquidConduit toIn, int amountIn) { + if (amountIn < 0) { + to = fromIn; + from = toIn; + amount = -amountIn; + } else { + to = toIn; + from = fromIn; + amount = amountIn; + } + } + + void apply() { + if (amount != 0) { + + // don't take more than it has + int actual = Math.min(amount, from.getTank().getFluidAmount()); + // and don't add more than it can take + actual = Math.min(actual, to.getTank().getAvailableSpace()); + + if (from != null && to != null) { + from.getTank().addAmount(-actual); + to.getTank().addAmount(actual); + } + } + } + } + + static class LocatedFluidHandler { + final IFluidHandler tank; + final BlockCoord bc; + final ForgeDirection dir; + + LocatedFluidHandler(IFluidHandler tank, BlockCoord bc, ForgeDirection dir) { + this.tank = tank; + this.bc = bc; + this.dir = dir; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 88d8fb27..53318762 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -1,12 +1,27 @@ package crazypants.enderio.conduit.liquid; +import static com.enderio.core.client.render.CubeRenderer.*; + +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector2f; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import com.enderio.core.common.vecmath.Vertex; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.render.ConduitBundleRenderer; +import crazypants.enderio.conduit.render.DefaultConduitRenderer; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.IResourceManager; @@ -16,315 +31,322 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; -import com.enderio.core.common.vecmath.Vertex; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.conduit.render.ConduitBundleRenderer; -import crazypants.enderio.conduit.render.DefaultConduitRenderer; -import static com.enderio.core.client.render.CubeRenderer.*; - public class LiquidConduitRenderer extends DefaultConduitRenderer implements IResourceManagerReloadListener { - private float downRatio; + private float downRatio; - private float flatRatio; + private float flatRatio; - private float upRatio; + private float upRatio; - private LiquidConduitRenderer() { - super(); - } - - public static LiquidConduitRenderer create() { - LiquidConduitRenderer result = new LiquidConduitRenderer(); - RenderUtil.registerReloadListener(result); - return result; - } - - @Override - public boolean isRendererForConduit(IConduit conduit) { - if (conduit instanceof LiquidConduit) { - return true; - } - return false; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - calculateRatios((LiquidConduit) conduit); - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - } - - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - if (isNSEWUD(component.dir)) { - LiquidConduit lc = (LiquidConduit) conduit; - FluidStack fluid = lc.getFluidType(); - if (fluid != null) { - renderFluidOutline(component, fluid); - } - BoundingBox[] cubes = toCubes(component.bound); - for (BoundingBox cube : cubes) { - drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); - } - - } else { - drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + private LiquidConduitRenderer() { + super(); } - if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - //back face - for (int i = corners.size() - 1; i >= 0; i--) { - Vertex c = corners.get(i); - addVecWithUV(c.xyz, c.uv.x, c.uv.y); - } - } - } - - public static void renderFluidOutline(CollidableComponent component, FluidStack fluid) { - renderFluidOutline(component, fluid, 1, 13f / 16f); - } - - public static void renderFluidOutline(CollidableComponent component, FluidStack fluid, double scaleFactor, float outlineWidth) { - for (CachableRenderStatement elem : computeFluidOutlineToCache(component, fluid.getFluid(), scaleFactor, outlineWidth)) { - elem.execute(); - } - } - - private static Map>> cache = new WeakHashMap>>(); - - public static List computeFluidOutlineToCache(CollidableComponent component, Fluid fluid, double scaleFactor, float outlineWidth) { - - Map> cache0 = cache.get(component); - if (cache0 == null) { - cache0 = new HashMap>(); - cache.put(component, cache0); - } - List data = cache0.get(fluid); - if (data != null) { - return data; - } - data = new ArrayList(); - cache0.put(fluid, data); - - IIcon texture = fluid.getStillIcon(); - if (texture == null) { - texture = fluid.getIcon(); - if (texture == null) { - return data; - } + public static LiquidConduitRenderer create() { + LiquidConduitRenderer result = new LiquidConduitRenderer(); + RenderUtil.registerReloadListener(result); + return result; } - BoundingBox bbb; - if (scaleFactor == 1) { - bbb = component.bound; - } else { - double xScale = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; - double yScale = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; - double zScale = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; - bbb = component.bound.scale(xScale, yScale, zScale); + @Override + public boolean isRendererForConduit(IConduit conduit) { + if (conduit instanceof LiquidConduit) { + return true; + } + return false; } - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if (face != component.dir && face != component.dir.getOpposite()) { + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + calculateRatios((LiquidConduit) conduit); + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); + } - data.add(new CachableRenderStatement.SetNormal(face.offsetX, face.offsetY, face.offsetZ)); - Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, -0.005); - - Vector2f uv = new Vector2f(); - List edges = RenderUtil.getEdgesForFace(face); - for (ForgeDirection edge : edges) { - if (edge != component.dir && edge != component.dir.getOpposite()) { - float xLen = 1 - Math.abs(edge.offsetX) * outlineWidth; - float yLen = 1 - Math.abs(edge.offsetY) * outlineWidth; - float zLen = 1 - Math.abs(edge.offsetZ) * outlineWidth; - BoundingBox bb = bbb.scale(xLen, yLen, zLen); - - List corners = bb.getCornersForFace(face); - - for (Vector3f unitCorn : corners) { - Vector3d corner = new Vector3d(unitCorn); - corner.add(offset); - - corner.x += (float) (edge.offsetX * 0.5 * bbb.sizeX()) - (Math.signum(edge.offsetX) * xLen / 2f * bbb.sizeX()) * 2f; - corner.y += (float) (edge.offsetY * 0.5 * bbb.sizeY()) - (Math.signum(edge.offsetY) * yLen / 2f * bbb.sizeY()) * 2f; - corner.z += (float) (edge.offsetZ * 0.5 * bbb.sizeZ()) - (Math.signum(edge.offsetZ) * zLen / 2f * bbb.sizeZ()) * 2f; - - //polyOffset - - RenderUtil.getUvForCorner(uv, corner, 0, 0, 0, face, texture); - - data.add(new CachableRenderStatement.AddVertexWithUV(corner.x, corner.y, corner.z, uv.x, uv.y)); + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { + if (isNSEWUD(component.dir)) { + LiquidConduit lc = (LiquidConduit) conduit; + FluidStack fluid = lc.getFluidType(); + if (fluid != null) { + renderFluidOutline(component, fluid); + } + BoundingBox[] cubes = toCubes(component.bound); + for (BoundingBox cube : cubes) { + drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); } - } + } else { + drawSection( + component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); } - } - } - return data; - } - private interface CachableRenderStatement { - void execute(); - - static class SetNormal implements CachableRenderStatement { - private final float x, y, z; - - private SetNormal(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - } - - @Override - public void execute() { - Tessellator.instance.setNormal(x, y, z); - } - } - - static class AddVertexWithUV implements CachableRenderStatement { - private final double x, y, z, u, v; - - private AddVertexWithUV(double x, double y, double z, double u, double v) { - this.x = x; - this.y = y; - this.z = z; - this.u = u; - this.v = v; - } - - @Override - public void execute() { - Tessellator.instance.addVertexWithUV(x, y, z, u, v); - } - } - } - - @Override - protected void renderTransmission(IConduit con, IIcon tex, CollidableComponent component, float brightness) { - //done in the dynamic section - } - - @Override - public boolean isDynamic() { - return true; - } - - @Override - public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, - float partialTick, float worldLight) { - - if (((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) { - return; - } - - Collection components = conduit.getCollidableComponents(); - Tessellator tessellator = Tessellator.instance; - - calculateRatios((LiquidConduit) conduit); - transmissionScaleFactor = conduit.getTransmitionGeometryScale(); - - IIcon tex; - for (CollidableComponent component : components) { - if (renderComponent(component)) { - if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) { - - tessellator.setColorOpaque_F(1, 1, 1); - tex = conduit.getTransmitionTextureForState(component); - - BoundingBox[] cubes = toCubes(component.bound); - for (BoundingBox cube : cubes) { - drawSection(cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); - } + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + List corners = component.bound.getCornersWithUvForFace( + component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + // back face + for (int i = corners.size() - 1; i >= 0; i--) { + Vertex c = corners.get(i); + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } } - } - } - } - - @Override - protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection id) { - - float yScale = getRatioForConnection(id); - - float xs = id.offsetX == 0 ? 0.9f : 1; - float ys = id.offsetY == 0 ? Math.min(yScale, 0.9f) : yScale; - float zs = id.offsetZ == 0 ? 0.9f : 1; - - float sizeY = bound.sizeY(); - bound = bound.scale(xs, ys, zs); - float transY = (bound.sizeY() - sizeY) / 2; - - Vector3d translation = new Vector3d(0, transY, 0); - setupVertices(bound.translate(translation)); - } - - private void calculateRatios(LiquidConduit conduit) { - ConduitTank tank = conduit.getTank(); - int totalAmount = tank.getFluidAmount(); - - int upCapacity = 0; - if (conduit.containsConduitConnection(ForgeDirection.UP) || conduit.containsExternalConnection(ForgeDirection.UP)) { - upCapacity = LiquidConduit.VOLUME_PER_CONNECTION; - } - int downCapacity = 0; - if (conduit.containsConduitConnection(ForgeDirection.DOWN) || conduit.containsExternalConnection(ForgeDirection.DOWN)) { - downCapacity = LiquidConduit.VOLUME_PER_CONNECTION; } - int flatCapacity = tank.getCapacity() - upCapacity - downCapacity; - - int usedCapacity = 0; - if (downCapacity > 0) { - int inDown = Math.min(totalAmount, downCapacity); - usedCapacity += inDown; - downRatio = (float) inDown / downCapacity; - } - if (flatCapacity > 0 && usedCapacity < totalAmount) { - int inFlat = Math.min(flatCapacity, totalAmount - usedCapacity); - usedCapacity += inFlat; - flatRatio = (float) inFlat / flatCapacity; - } else { - flatRatio = 0; - } - if (upCapacity > 0 && usedCapacity < totalAmount) { - int inUp = Math.min(upCapacity, totalAmount - usedCapacity); - upRatio = (float) inUp / upCapacity; - } else { - upRatio = 0; + public static void renderFluidOutline(CollidableComponent component, FluidStack fluid) { + renderFluidOutline(component, fluid, 1, 13f / 16f); } - } - - private float getRatioForConnection(ForgeDirection id) { - if (id == ForgeDirection.UP) { - return upRatio; + public static void renderFluidOutline( + CollidableComponent component, FluidStack fluid, double scaleFactor, float outlineWidth) { + for (CachableRenderStatement elem : + computeFluidOutlineToCache(component, fluid.getFluid(), scaleFactor, outlineWidth)) { + elem.execute(); + } } - if (id == ForgeDirection.DOWN) { - return downRatio; + + private static Map>> cache = + new WeakHashMap>>(); + + public static List computeFluidOutlineToCache( + CollidableComponent component, Fluid fluid, double scaleFactor, float outlineWidth) { + + Map> cache0 = cache.get(component); + if (cache0 == null) { + cache0 = new HashMap>(); + cache.put(component, cache0); + } + List data = cache0.get(fluid); + if (data != null) { + return data; + } + data = new ArrayList(); + cache0.put(fluid, data); + + IIcon texture = fluid.getStillIcon(); + if (texture == null) { + texture = fluid.getIcon(); + if (texture == null) { + return data; + } + } + + BoundingBox bbb; + if (scaleFactor == 1) { + bbb = component.bound; + } else { + double xScale = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; + double yScale = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; + double zScale = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; + bbb = component.bound.scale(xScale, yScale, zScale); + } + + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + if (face != component.dir && face != component.dir.getOpposite()) { + + data.add(new CachableRenderStatement.SetNormal(face.offsetX, face.offsetY, face.offsetZ)); + Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, -0.005); + + Vector2f uv = new Vector2f(); + List edges = RenderUtil.getEdgesForFace(face); + for (ForgeDirection edge : edges) { + if (edge != component.dir && edge != component.dir.getOpposite()) { + float xLen = 1 - Math.abs(edge.offsetX) * outlineWidth; + float yLen = 1 - Math.abs(edge.offsetY) * outlineWidth; + float zLen = 1 - Math.abs(edge.offsetZ) * outlineWidth; + BoundingBox bb = bbb.scale(xLen, yLen, zLen); + + List corners = bb.getCornersForFace(face); + + for (Vector3f unitCorn : corners) { + Vector3d corner = new Vector3d(unitCorn); + corner.add(offset); + + corner.x += (float) (edge.offsetX * 0.5 * bbb.sizeX()) + - (Math.signum(edge.offsetX) * xLen / 2f * bbb.sizeX()) * 2f; + corner.y += (float) (edge.offsetY * 0.5 * bbb.sizeY()) + - (Math.signum(edge.offsetY) * yLen / 2f * bbb.sizeY()) * 2f; + corner.z += (float) (edge.offsetZ * 0.5 * bbb.sizeZ()) + - (Math.signum(edge.offsetZ) * zLen / 2f * bbb.sizeZ()) * 2f; + + // polyOffset + + RenderUtil.getUvForCorner(uv, corner, 0, 0, 0, face, texture); + + data.add(new CachableRenderStatement.AddVertexWithUV( + corner.x, corner.y, corner.z, uv.x, uv.y)); + } + } + } + } + } + return data; } - return flatRatio; - } - @Override - public void onResourceManagerReload(IResourceManager p_110549_1_) { - cache.clear(); - } + private interface CachableRenderStatement { + void execute(); + static class SetNormal implements CachableRenderStatement { + private final float x, y, z; + + private SetNormal(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + + @Override + public void execute() { + Tessellator.instance.setNormal(x, y, z); + } + } + + static class AddVertexWithUV implements CachableRenderStatement { + private final double x, y, z, u, v; + + private AddVertexWithUV(double x, double y, double z, double u, double v) { + this.x = x; + this.y = y; + this.z = z; + this.u = u; + this.v = v; + } + + @Override + public void execute() { + Tessellator.instance.addVertexWithUV(x, y, z, u, v); + } + } + } + + @Override + protected void renderTransmission(IConduit con, IIcon tex, CollidableComponent component, float brightness) { + // done in the dynamic section + } + + @Override + public boolean isDynamic() { + return true; + } + + @Override + public void renderDynamicEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight) { + + if (((LiquidConduit) conduit).getTank().getFilledRatio() <= 0) { + return; + } + + Collection components = conduit.getCollidableComponents(); + Tessellator tessellator = Tessellator.instance; + + calculateRatios((LiquidConduit) conduit); + transmissionScaleFactor = conduit.getTransmitionGeometryScale(); + + IIcon tex; + for (CollidableComponent component : components) { + if (renderComponent(component)) { + if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) { + + tessellator.setColorOpaque_F(1, 1, 1); + tex = conduit.getTransmitionTextureForState(component); + + BoundingBox[] cubes = toCubes(component.bound); + for (BoundingBox cube : cubes) { + drawSection( + cube, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); + } + } + } + } + } + + @Override + protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection id) { + + float yScale = getRatioForConnection(id); + + float xs = id.offsetX == 0 ? 0.9f : 1; + float ys = id.offsetY == 0 ? Math.min(yScale, 0.9f) : yScale; + float zs = id.offsetZ == 0 ? 0.9f : 1; + + float sizeY = bound.sizeY(); + bound = bound.scale(xs, ys, zs); + float transY = (bound.sizeY() - sizeY) / 2; + + Vector3d translation = new Vector3d(0, transY, 0); + setupVertices(bound.translate(translation)); + } + + private void calculateRatios(LiquidConduit conduit) { + ConduitTank tank = conduit.getTank(); + int totalAmount = tank.getFluidAmount(); + + int upCapacity = 0; + if (conduit.containsConduitConnection(ForgeDirection.UP) + || conduit.containsExternalConnection(ForgeDirection.UP)) { + upCapacity = LiquidConduit.VOLUME_PER_CONNECTION; + } + int downCapacity = 0; + if (conduit.containsConduitConnection(ForgeDirection.DOWN) + || conduit.containsExternalConnection(ForgeDirection.DOWN)) { + downCapacity = LiquidConduit.VOLUME_PER_CONNECTION; + } + + int flatCapacity = tank.getCapacity() - upCapacity - downCapacity; + + int usedCapacity = 0; + if (downCapacity > 0) { + int inDown = Math.min(totalAmount, downCapacity); + usedCapacity += inDown; + downRatio = (float) inDown / downCapacity; + } + if (flatCapacity > 0 && usedCapacity < totalAmount) { + int inFlat = Math.min(flatCapacity, totalAmount - usedCapacity); + usedCapacity += inFlat; + flatRatio = (float) inFlat / flatCapacity; + } else { + flatRatio = 0; + } + if (upCapacity > 0 && usedCapacity < totalAmount) { + int inUp = Math.min(upCapacity, totalAmount - usedCapacity); + upRatio = (float) inUp / upCapacity; + } else { + upRatio = 0; + } + } + + private float getRatioForConnection(ForgeDirection id) { + if (id == ForgeDirection.UP) { + return upRatio; + } + if (id == ForgeDirection.DOWN) { + return downRatio; + } + return flatRatio; + } + + @Override + public void onResourceManagerReload(IResourceManager p_110549_1_) { + cache.clear(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java index 1da66cfc..94aac23d 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidOutput.java @@ -1,50 +1,42 @@ package crazypants.enderio.conduit.liquid; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; +import net.minecraftforge.common.util.ForgeDirection; public class LiquidOutput { - final ForgeDirection dir; - final BlockCoord location; + final ForgeDirection dir; + final BlockCoord location; - public LiquidOutput(BlockCoord bc, ForgeDirection dir) { - this.dir = dir; - this.location = bc; - } + public LiquidOutput(BlockCoord bc, ForgeDirection dir) { + this.dir = dir; + this.location = bc; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((location == null) ? 0 : location.hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - return result; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((location == null) ? 0 : location.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + return result; + } - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - LiquidOutput other = (LiquidOutput) obj; - if(location == null) { - if(other.location != null) - return false; - } else if(!location.equals(other.location)) - return false; - if(dir != other.dir) - return false; - return true; - } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + LiquidOutput other = (LiquidOutput) obj; + if (location == null) { + if (other.location != null) return false; + } else if (!location.equals(other.location)) return false; + if (dir != other.dir) return false; + return true; + } - @Override - public String toString() { - return "LiquidOutput [dir=" + dir + ", location=" + location + "]"; - } - -} \ No newline at end of file + @Override + public String toString() { + return "LiquidOutput [dir=" + dir + ", location=" + location + "]"; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/MelodicEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/MelodicEnderLiquidConduit.java index 27ffd6a2..a7733413 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/MelodicEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/MelodicEnderLiquidConduit.java @@ -3,55 +3,53 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.client.render.IconUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class MelodicEnderLiquidConduit extends AbstractEnderLiquidConduit { - public static final Type TYPE = Type.MELODIC; - public static final int METADATA = 5; - public static final String ICON_KEY = "enderio:liquidConduitMelodicEnder"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreMelodicEnder"; + public static final Type TYPE = Type.MELODIC; + public static final int METADATA = 5; + public static final String ICON_KEY = "enderio:liquidConduitMelodicEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreMelodicEnder"; - static IIcon iconKey; - static IIcon iconCoreKey; + static IIcon iconKey; + static IIcon iconCoreKey; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - iconKey = register.registerIcon(ICON_KEY); - iconCoreKey = register.registerIcon(ICON_CORE_KEY); - } + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } - @Override - public int getTextureType() { - return 0; - } + @Override + public int getTextureType() { + return 0; + } + }); + } - }); - } + @Override + public Type getType() { + return TYPE; + } - @Override - public Type getType() { - return TYPE; - } + @Override + public int getMetadata() { + return METADATA; + } - @Override - public int getMetadata() { - return METADATA; - } + @Override + protected IIcon getIconKey() { + return iconKey; + } - @Override - protected IIcon getIconKey() { - return iconKey; - } - - @Override - protected IIcon getIconCoreKey() { - return iconCoreKey; - } -} \ No newline at end of file + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java index 9acd47d3..e44a5f5c 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/PacketFluidLevel.java @@ -1,46 +1,43 @@ package crazypants.enderio.conduit.liquid; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.util.ClientUtil; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; -public class PacketFluidLevel extends MessageTileEntity implements IMessageHandler{ +public class PacketFluidLevel extends MessageTileEntity + implements IMessageHandler { - public NBTTagCompound tc; + public NBTTagCompound tc; - public PacketFluidLevel() { - } + public PacketFluidLevel() {} - public PacketFluidLevel(ILiquidConduit conduit) { - super(conduit.getBundle().getEntity()); - tc = new NBTTagCompound(); - conduit.writeToNBT(tc); - } + public PacketFluidLevel(ILiquidConduit conduit) { + super(conduit.getBundle().getEntity()); + tc = new NBTTagCompound(); + conduit.writeToNBT(tc); + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - ByteBufUtils.writeTag(buf, tc); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + ByteBufUtils.writeTag(buf, tc); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - tc = ByteBufUtils.readTag(buf); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + tc = ByteBufUtils.readTag(buf); + } - - @Override - public IMessage onMessage(PacketFluidLevel message, MessageContext ctx) { - ClientUtil.doFluidLevelUpdate(message.x, message.y, message.z, message); - return null; - } + @Override + public IMessage onMessage(PacketFluidLevel message, MessageContext ctx) { + ClientUtil.doFluidLevelUpdate(message.x, message.y, message.z, message); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/StellarEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/StellarEnderLiquidConduit.java index 6149beaa..b45b9314 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/StellarEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/StellarEnderLiquidConduit.java @@ -3,55 +3,53 @@ package crazypants.enderio.conduit.liquid; import com.enderio.core.client.render.IconUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public class StellarEnderLiquidConduit extends AbstractEnderLiquidConduit { - public static final Type TYPE = Type.STELLAR; - public static final int METADATA = 6; - public static final String ICON_KEY = "enderio:liquidConduitStellarEnder"; - public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreStellarEnder"; + public static final Type TYPE = Type.STELLAR; + public static final int METADATA = 6; + public static final String ICON_KEY = "enderio:liquidConduitStellarEnder"; + public static final String ICON_CORE_KEY = "enderio:liquidConduitCoreStellarEnder"; - static IIcon iconKey; - static IIcon iconCoreKey; + static IIcon iconKey; + static IIcon iconCoreKey; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - iconKey = register.registerIcon(ICON_KEY); - iconCoreKey = register.registerIcon(ICON_CORE_KEY); - } + @Override + public void registerIcons(IIconRegister register) { + iconKey = register.registerIcon(ICON_KEY); + iconCoreKey = register.registerIcon(ICON_CORE_KEY); + } - @Override - public int getTextureType() { - return 0; - } + @Override + public int getTextureType() { + return 0; + } + }); + } - }); - } + @Override + public Type getType() { + return TYPE; + } - @Override - public Type getType() { - return TYPE; - } + @Override + public int getMetadata() { + return METADATA; + } - @Override - public int getMetadata() { - return METADATA; - } + @Override + protected IIcon getIconKey() { + return iconKey; + } - @Override - protected IIcon getIconKey() { - return iconKey; - } - - @Override - protected IIcon getIconCoreKey() { - return iconCoreKey; - } -} \ No newline at end of file + @Override + protected IIcon getIconCoreKey() { + return iconCoreKey; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java index 708da541..4d97255b 100644 --- a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java @@ -1,18 +1,16 @@ package crazypants.enderio.conduit.me; -import java.util.EnumSet; - -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; +import java.util.EnumSet; +import net.minecraftforge.common.util.ForgeDirection; public interface IMEConduit extends IConduit { - MEConduitGrid getGrid(); - - EnumSet getConnections(); - - boolean isDense(); + MEConduitGrid getGrid(); - int getChannelsInUse(); + EnumSet getConnections(); + boolean isDense(); + + int getChannelsInUse(); } diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index c9f8685c..3951a5d2 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -1,7 +1,5 @@ package crazypants.enderio.conduit.me; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import appeng.api.AEApi; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -9,41 +7,44 @@ import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.gui.IconEIO; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemMEConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"), - new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") - }; + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"), + new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMeConduitDense") + }; - public static ItemMEConduit create() { - ItemMEConduit result = new ItemMEConduit(); - if (MEUtil.isMEEnabled()) { - result.init(); - ConduitDisplayMode.registerDisplayMode(new ConduitDisplayMode(IMEConduit.class, IconEIO.WRENCH_OVERLAY_ME, IconEIO.WRENCH_OVERLAY_ME_OFF)); + public static ItemMEConduit create() { + ItemMEConduit result = new ItemMEConduit(); + if (MEUtil.isMEEnabled()) { + result.init(); + ConduitDisplayMode.registerDisplayMode( + new ConduitDisplayMode(IMEConduit.class, IconEIO.WRENCH_OVERLAY_ME, IconEIO.WRENCH_OVERLAY_ME_OFF)); + } + return result; } - return result; - } - protected ItemMEConduit() { - super(ModObject.itemMEConduit, subtypes); - } + protected ItemMEConduit() { + super(ModObject.itemMEConduit, subtypes); + } - @Override - public Class getBaseConduitType() { - return IMEConduit.class; - } + @Override + public Class getBaseConduitType() { + return IMEConduit.class; + } - @Override - public IConduit createConduit(ItemStack item, EntityPlayer player) { - MEConduit con = new MEConduit(item.getItemDamage()); - con.setPlayerID(AEApi.instance().registries().players().getID(player)); - return con; - } - - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + public IConduit createConduit(ItemStack item, EntityPlayer player) { + MEConduit con = new MEConduit(item.getItemDamage()); + con.setPlayerID(AEApi.instance().registries().players().getID(player)); + return con; + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index bfe2d761..5cbf62f4 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -1,26 +1,13 @@ package crazypants.enderio.conduit.me; -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; @@ -33,312 +20,325 @@ import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.tool.ToolUtil; +import java.util.EnumSet; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class MEConduit extends AbstractConduit implements IMEConduit { - protected MEConduitNetwork network; - protected MEConduitGrid grid; + protected MEConduitNetwork network; + protected MEConduitGrid grid; - public static IIcon[] coreTextures; - public static IIcon[] longTextures; - - private boolean isDense; - private int playerID = -1; + public static IIcon[] coreTextures; + public static IIcon[] longTextures; - public MEConduit() { - this(0); - } - - public MEConduit(int itemDamage) { - isDense = itemDamage == 1; - } + private boolean isDense; + private int playerID = -1; - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - coreTextures = new IIcon[2]; - longTextures = new IIcon[2]; - - coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore"); - coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense"); - - longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit"); - longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense"); - } - - @Override - public int getTextureType() { - return 0; - } - - }); - } - - public static int getDamageForState(boolean isDense) { - return isDense ? 1 : 0; - } - - @Override - public Class getBaseConduitType() { - return IMEConduit.class; - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense)); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - this.network = (MEConduitNetwork) network; - return true; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setBoolean("isDense", isDense); - nbtRoot.setInteger("playerID", playerID); - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - isDense = nbtRoot.getBoolean("isDense"); - if(nbtRoot.hasKey("playerID")) { - playerID = nbtRoot.getInteger("playerID"); - } else { - playerID = -1; - } - } - - public void setPlayerID(int playerID) { - this.playerID = playerID; - } - - @Override - public int getChannelsInUse() { - int channelsInUse = 0; - IGridNode node = getNode(); - if(node != null) { - for (IGridConnection gc : node.getConnections()) { - channelsInUse = Math.max(channelsInUse, gc.getUsedChannels()); - } - } - return channelsInUse; - } - - @Override - @Method(modid = "appliedenergistics2") - public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) { - World world = getBundle().getWorld(); - BlockCoord pos = getLocation(); - TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ); - - if(te instanceof TileConduitBundle) { - return false; + public MEConduit() { + this(0); } - // because the AE2 API doesn't allow an easy query like "which side can connect to an ME cable" it needs this mess - if(te instanceof IPartHost) { - IPart part = ((IPartHost) te).getPart(dir.getOpposite()); - if(part == null) { - part = ((IPartHost) te).getPart(ForgeDirection.UNKNOWN); - return part != null; - } - if(part.getExternalFacingNode() != null) { - return true; - } - String name = part.getClass().getSimpleName(); - return "PartP2PTunnelME".equals(name) || "PartQuartzFiber".endsWith(name) || - "PartToggleBus".equals(name) || "PartInvertedToggleBus".equals(name); - } else if(te instanceof IGridHost) { - IGridNode node = ((IGridHost) te).getGridNode(dir.getOpposite()); - if(node == null) { - node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); - } - if(node != null) { - return node.getGridBlock().getConnectableSides().contains(dir.getOpposite()); - } - } - return false; - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - int state = getDamageForState(isDense); - if(component.dir == ForgeDirection.UNKNOWN) { - return coreTextures[state]; - } else { - return longTextures[state]; - } - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - @Override - @Method(modid = "appliedenergistics2") - public void updateEntity(World worldObj) { - if(grid == null) { - grid = new MEConduitGrid(this); + public MEConduit(int itemDamage) { + isDense = itemDamage == 1; } - if(getNode() == null && !worldObj.isRemote) { - IGridNode node = AEApi.instance().createGridNode(grid); - if(node != null) { - node.setPlayerID(playerID); - getBundle().setGridNode(node); - getNode().updateState(); - } - } + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - super.updateEntity(worldObj); - } + @Override + public void registerIcons(IIconRegister register) { + coreTextures = new IIcon[2]; + longTextures = new IIcon[2]; - @Override - public ConnectionMode getNextConnectionMode(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - mode = mode == ConnectionMode.IN_OUT ? ConnectionMode.DISABLED : ConnectionMode.IN_OUT; - return mode; - } + coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore"); + coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense"); - @Override - public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { - return getNextConnectionMode(dir); - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - if(!super.canConnectToConduit(direction, conduit)) { - return false; - } - return conduit instanceof IMEConduit; - } - - @Override - @Method(modid = "appliedenergistics2") - public void connectionsChanged() { - super.connectionsChanged(); - BlockCoord loc = getLocation(); - if(loc != null) { - onNodeChanged(loc); - IGridNode node = getNode(); - if(node != null) { - node.updateState(); - node.getWorld().markBlockForUpdate(loc.x, loc.y, loc.z); - } - } - } - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(ToolUtil.isToolEquipped(player)) { - if(!getBundle().getEntity().getWorldObj().isRemote) { - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, ConnectionMode.IN_OUT); - return true; + longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit"); + longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense"); } - return ConduitUtil.joinConduits(this, faceHit); - } else if(externalConnections.contains(connDir)) { - setConnectionMode(connDir, getNextConnectionMode(connDir)); - return true; - } else if(containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); - return true; - } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + public static int getDamageForState(boolean isDense) { + return isDense ? 1 : 0; + } + + @Override + public Class getBaseConduitType() { + return IMEConduit.class; + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense)); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (MEConduitNetwork) network; + return true; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setBoolean("isDense", isDense); + nbtRoot.setInteger("playerID", playerID); + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + isDense = nbtRoot.getBoolean("isDense"); + if (nbtRoot.hasKey("playerID")) { + playerID = nbtRoot.getInteger("playerID"); + } else { + playerID = -1; } - } } - return false; - } - @Method(modid = "appliedenergistics2") - private void onNodeChanged(BlockCoord location) { - World world = getBundle().getWorld(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity te = location.getLocation(dir).getTileEntity(world); - if(te != null && te instanceof IGridHost && !(te instanceof IConduitBundle)) { - IGridNode node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); - if(node == null) { - node = ((IGridHost) te).getGridNode(dir.getOpposite()); + public void setPlayerID(int playerID) { + this.playerID = playerID; + } + + @Override + public int getChannelsInUse() { + int channelsInUse = 0; + IGridNode node = getNode(); + if (node != null) { + for (IGridConnection gc : node.getConnections()) { + channelsInUse = Math.max(channelsInUse, gc.getUsedChannels()); + } } - if(node != null) { - node.updateState(); + return channelsInUse; + } + + @Override + @Method(modid = "appliedenergistics2") + public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) { + World world = getBundle().getWorld(); + BlockCoord pos = getLocation(); + TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ); + + if (te instanceof TileConduitBundle) { + return false; } - } - } - } - @Override - public void onAddedToBundle() { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity te = getLocation().getLocation(dir).getTileEntity(getBundle().getWorld()); - if(te instanceof TileConduitBundle) { - IMEConduit cond = ((TileConduitBundle) te).getConduit(IMEConduit.class); - if(cond != null) { - cond.setConnectionMode(dir.getOpposite(), ConnectionMode.IN_OUT); - ConduitUtil.joinConduits(cond, dir.getOpposite()); + // because the AE2 API doesn't allow an easy query like "which side can connect to an ME cable" it needs this + // mess + if (te instanceof IPartHost) { + IPart part = ((IPartHost) te).getPart(dir.getOpposite()); + if (part == null) { + part = ((IPartHost) te).getPart(ForgeDirection.UNKNOWN); + return part != null; + } + if (part.getExternalFacingNode() != null) { + return true; + } + String name = part.getClass().getSimpleName(); + return "PartP2PTunnelME".equals(name) + || "PartQuartzFiber".endsWith(name) + || "PartToggleBus".equals(name) + || "PartInvertedToggleBus".equals(name); + } else if (te instanceof IGridHost) { + IGridNode node = ((IGridHost) te).getGridNode(dir.getOpposite()); + if (node == null) { + node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); + } + if (node != null) { + return node.getGridBlock().getConnectableSides().contains(dir.getOpposite()); + } } - } + return false; } - } - @Override - @Method(modid = "appliedenergistics2") - public void onRemovedFromBundle() { - super.onRemovedFromBundle(); - getNode().destroy(); - getBundle().setGridNode(null); - } - - @Override - @Method(modid = "appliedenergistics2") - public void onChunkUnload(World worldObj) { - super.onChunkUnload(worldObj); - if(getNode() != null) { - getNode().destroy(); - getBundle().setGridNode(null); + @Override + public IIcon getTextureForState(CollidableComponent component) { + int state = getDamageForState(isDense); + if (component.dir == ForgeDirection.UNKNOWN) { + return coreTextures[state]; + } else { + return longTextures[state]; + } } - } - @Override - public MEConduitGrid getGrid() { - return grid; - } - - @Method(modid = "appliedenergistics2") - private IGridNode getNode() { - return getBundle().getGridNode(null); - } - - @Override - public EnumSet getConnections() { - EnumSet cons = EnumSet.noneOf(ForgeDirection.class); - cons.addAll(getConduitConnections()); - for(ForgeDirection dir : getExternalConnections()) { - if(getConnectionMode(dir) != ConnectionMode.DISABLED) { - cons.add(dir); - } + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; } - return cons; - } - @Override - public boolean isDense() { - return isDense; - } + @Override + @Method(modid = "appliedenergistics2") + public void updateEntity(World worldObj) { + if (grid == null) { + grid = new MEConduitGrid(this); + } + + if (getNode() == null && !worldObj.isRemote) { + IGridNode node = AEApi.instance().createGridNode(grid); + if (node != null) { + node.setPlayerID(playerID); + getBundle().setGridNode(node); + getNode().updateState(); + } + } + + super.updateEntity(worldObj); + } + + @Override + public ConnectionMode getNextConnectionMode(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + mode = mode == ConnectionMode.IN_OUT ? ConnectionMode.DISABLED : ConnectionMode.IN_OUT; + return mode; + } + + @Override + public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { + return getNextConnectionMode(dir); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + if (!super.canConnectToConduit(direction, conduit)) { + return false; + } + return conduit instanceof IMEConduit; + } + + @Override + @Method(modid = "appliedenergistics2") + public void connectionsChanged() { + super.connectionsChanged(); + BlockCoord loc = getLocation(); + if (loc != null) { + onNodeChanged(loc); + IGridNode node = getNode(); + if (node != null) { + node.updateState(); + node.getWorld().markBlockForUpdate(loc.x, loc.y, loc.z); + } + } + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + return true; + } + } + } + } + return false; + } + + @Method(modid = "appliedenergistics2") + private void onNodeChanged(BlockCoord location) { + World world = getBundle().getWorld(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + TileEntity te = location.getLocation(dir).getTileEntity(world); + if (te != null && te instanceof IGridHost && !(te instanceof IConduitBundle)) { + IGridNode node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); + if (node == null) { + node = ((IGridHost) te).getGridNode(dir.getOpposite()); + } + if (node != null) { + node.updateState(); + } + } + } + } + + @Override + public void onAddedToBundle() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + TileEntity te = + getLocation().getLocation(dir).getTileEntity(getBundle().getWorld()); + if (te instanceof TileConduitBundle) { + IMEConduit cond = ((TileConduitBundle) te).getConduit(IMEConduit.class); + if (cond != null) { + cond.setConnectionMode(dir.getOpposite(), ConnectionMode.IN_OUT); + ConduitUtil.joinConduits(cond, dir.getOpposite()); + } + } + } + } + + @Override + @Method(modid = "appliedenergistics2") + public void onRemovedFromBundle() { + super.onRemovedFromBundle(); + getNode().destroy(); + getBundle().setGridNode(null); + } + + @Override + @Method(modid = "appliedenergistics2") + public void onChunkUnload(World worldObj) { + super.onChunkUnload(worldObj); + if (getNode() != null) { + getNode().destroy(); + getBundle().setGridNode(null); + } + } + + @Override + public MEConduitGrid getGrid() { + return grid; + } + + @Method(modid = "appliedenergistics2") + private IGridNode getNode() { + return getBundle().getGridNode(null); + } + + @Override + public EnumSet getConnections() { + EnumSet cons = EnumSet.noneOf(ForgeDirection.class); + cons.addAll(getConduitConnections()); + for (ForgeDirection dir : getExternalConnections()) { + if (getConnectionMode(dir) != ConnectionMode.DISABLED) { + cons.add(dir); + } + } + return cons; + } + + @Override + public boolean isDense() { + return isDense; + } } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java index 4bd94ee0..2c187814 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java @@ -1,9 +1,5 @@ package crazypants.enderio.conduit.me; -import java.util.EnumSet; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; import appeng.api.networking.GridFlags; import appeng.api.networking.GridNotification; import appeng.api.networking.IGrid; @@ -11,67 +7,70 @@ import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridHost; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; +import java.util.EnumSet; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; public class MEConduitGrid implements IGridBlock { - private final IMEConduit conduit; + private final IMEConduit conduit; - public MEConduitGrid(IMEConduit conduit) { - this.conduit = conduit; - } + public MEConduitGrid(IMEConduit conduit) { + this.conduit = conduit; + } - @Override - public double getIdlePowerUsage() { - return 0; - } + @Override + public double getIdlePowerUsage() { + return 0; + } - @Override - public AEColor getGridColor() { - return AEColor.Transparent; - } + @Override + public AEColor getGridColor() { + return AEColor.Transparent; + } - @Override - public EnumSet getConnectableSides() { - return conduit.getConnections(); - } + @Override + public EnumSet getConnectableSides() { + return conduit.getConnections(); + } - @Override - public ItemStack getMachineRepresentation() { - return conduit.createItem(); - } + @Override + public ItemStack getMachineRepresentation() { + return conduit.createItem(); + } - @Override - public EnumSet getFlags() { - return conduit.isDense() ? EnumSet.of(GridFlags.DENSE_CAPACITY) : EnumSet.noneOf(GridFlags.class); - } - - @Override - public boolean isWorldAccessible() { - return true; - } + @Override + public EnumSet getFlags() { + return conduit.isDense() ? EnumSet.of(GridFlags.DENSE_CAPACITY) : EnumSet.noneOf(GridFlags.class); + } - @Override - public DimensionalCoord getLocation() { - return new DimensionalCoord(conduit.getBundle().getEntity()); - } + @Override + public boolean isWorldAccessible() { + return true; + } - @Override - public void onGridNotification(GridNotification notification) { - ; - } + @Override + public DimensionalCoord getLocation() { + return new DimensionalCoord(conduit.getBundle().getEntity()); + } - @Override - public void setNetworkStatus(IGrid grid, int channelsInUse) { - ; - } + @Override + public void onGridNotification(GridNotification notification) { + ; + } - @Override - public IGridHost getMachine() { - return conduit.getBundle(); - } + @Override + public void setNetworkStatus(IGrid grid, int channelsInUse) { + ; + } - @Override - public void gridChanged() { - conduit.onNeighborBlockChange(null); - } + @Override + public IGridHost getMachine() { + return conduit.getBundle(); + } + + @Override + public void gridChanged() { + conduit.onNeighborBlockChange(null); + } } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/me/MEConduitNetwork.java index f5e53abd..19ac4da9 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduitNetwork.java @@ -4,8 +4,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork; public class MEConduitNetwork extends AbstractConduitNetwork { - public MEConduitNetwork() { - super(IMEConduit.class, IMEConduit.class); - } - -} \ No newline at end of file + public MEConduitNetwork() { + super(IMEConduit.class, IMEConduit.class); + } +} diff --git a/src/main/java/crazypants/enderio/conduit/me/MEUtil.java b/src/main/java/crazypants/enderio/conduit/me/MEUtil.java index f1120811..a62a8223 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEUtil.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEUtil.java @@ -5,14 +5,14 @@ import crazypants.enderio.config.Config; public class MEUtil { - private static boolean useCheckPerformed = false; - private static boolean isMeConduitEnabled = false; + private static boolean useCheckPerformed = false; + private static boolean isMeConduitEnabled = false; - public static boolean isMEEnabled() { - if(!useCheckPerformed) { - isMeConduitEnabled = Loader.isModLoaded("appliedenergistics2") && Config.enableMEConduits; - useCheckPerformed = true; + public static boolean isMEEnabled() { + if (!useCheckPerformed) { + isMeConduitEnabled = Loader.isModLoaded("appliedenergistics2") && Config.enableMEConduits; + useCheckPerformed = true; + } + return isMeConduitEnabled; } - return isMeConduitEnabled; - } } diff --git a/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java index ab4a8b23..842f837e 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java @@ -1,26 +1,24 @@ package crazypants.enderio.conduit.oc; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - -import li.cil.oc.api.network.Environment; -import li.cil.oc.api.network.SidedEnvironment; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import crazypants.enderio.conduit.IConduit; -import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; +import net.minecraftforge.common.util.ForgeDirection; -@InterfaceList({ @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), - @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") }) +@InterfaceList({ + @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), + @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") +}) public interface IOCConduit extends IConduit, Environment, SidedEnvironment { - public static final String COLOR_CONTROLLER_ID = "ColorController"; + public static final String COLOR_CONTROLLER_ID = "ColorController"; - void invalidate(); + void invalidate(); - public abstract void setSignalColor(ForgeDirection dir, DyeColor col); - - public abstract DyeColor getSignalColor(ForgeDirection dir); + public abstract void setSignalColor(ForgeDirection dir, DyeColor col); + public abstract DyeColor getSignalColor(ForgeDirection dir); } diff --git a/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java index c8247f33..3c3f703b 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/ItemOCConduit.java @@ -1,44 +1,46 @@ package crazypants.enderio.conduit.oc; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.gui.IconEIO; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemOCConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemOCConduit.name(), "enderio:itemOCConduit") }; + private static ItemConduitSubtype[] subtypes = + new ItemConduitSubtype[] {new ItemConduitSubtype(ModObject.itemOCConduit.name(), "enderio:itemOCConduit")}; - public static ItemOCConduit create() { - ItemOCConduit result = new ItemOCConduit(); - if (OCUtil.isOCEnabled()) { - result.init(); - ConduitDisplayMode.registerDisplayMode(new ConduitDisplayMode(IOCConduit.class, IconEIO.WRENCH_OVERLAY_OC, IconEIO.WRENCH_OVERLAY_OC_OFF)); + public static ItemOCConduit create() { + ItemOCConduit result = new ItemOCConduit(); + if (OCUtil.isOCEnabled()) { + result.init(); + ConduitDisplayMode.registerDisplayMode( + new ConduitDisplayMode(IOCConduit.class, IconEIO.WRENCH_OVERLAY_OC, IconEIO.WRENCH_OVERLAY_OC_OFF)); + } + return result; } - return result; - } - protected ItemOCConduit() { - super(ModObject.itemOCConduit, subtypes); - } + protected ItemOCConduit() { + super(ModObject.itemOCConduit, subtypes); + } - @Override - public Class getBaseConduitType() { - return IOCConduit.class; - } + @Override + public Class getBaseConduitType() { + return IOCConduit.class; + } - @Override - public IConduit createConduit(ItemStack item, EntityPlayer player) { - OCConduit con = new OCConduit(item.getItemDamage()); - return con; - } - - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + public IConduit createConduit(ItemStack item, EntityPlayer player) { + OCConduit con = new OCConduit(item.getItemDamage()); + return con; + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java index fa6537f3..778b6efc 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java @@ -1,5 +1,24 @@ package crazypants.enderio.conduit.oc; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; +import cpw.mods.fml.common.Optional.Method; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduit; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.config.Config; +import crazypants.enderio.tool.ToolUtil; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; @@ -8,557 +27,521 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; - -import appeng.api.networking.IGridNode; - -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Log; - -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import li.cil.oc.api.Network; import li.cil.oc.api.network.Environment; import li.cil.oc.api.network.Message; import li.cil.oc.api.network.Node; import li.cil.oc.api.network.SidedEnvironment; -import li.cil.oc.api.network.Visibility; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduit; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduit; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.RaytraceResult; -import crazypants.enderio.conduit.TileConduitBundle; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.conduit.geom.ConduitGeometryUtil; -import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; -import crazypants.enderio.conduit.me.IMEConduit; -import crazypants.enderio.conduit.me.MEConduitNetwork; -import crazypants.enderio.conduit.redstone.IRedstoneConduit; -import crazypants.enderio.conduit.redstone.Signal; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.PacketConduitProbe; -import crazypants.enderio.tool.ToolUtil; public class OCConduit extends AbstractConduit implements IOCConduit { - protected OCConduitNetwork network; + protected OCConduitNetwork network; - private Map signalColors = new HashMap(); + private Map signalColors = new HashMap(); - public static IIcon[] coreTextures; - public static IIcon[] longTextures; + public static IIcon[] coreTextures; + public static IIcon[] longTextures; - public OCConduit() { - super(); - } - - public OCConduit(int meta) { - super(); - } - - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - coreTextures = new IIcon[2]; - longTextures = new IIcon[2]; - - coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCore"); - coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCoreAnim"); - - longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduit"); - longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitAnim"); - } - - @Override - public int getTextureType() { - return 0; - } - - }); - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("signalColor", (short) getSignalColor(dir).ordinal()); - } - - @Override - public DyeColor getSignalColor(ForgeDirection dir) { - DyeColor res = signalColors.get(dir); - if (res == null) { - return DyeColor.SILVER; - } - return res; - } - - @Override - public Collection createCollidables(CacheKey key) { - Collection baseCollidables = super.createCollidables(key); - if (key.dir == ForgeDirection.UNKNOWN) { - return baseCollidables; + public OCConduit() { + super(); } - BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); - CollidableComponent cc = new CollidableComponent(IOCConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + public OCConduit(int meta) { + super(); + } - List result = new ArrayList(); - result.addAll(baseCollidables); - result.add(cc); + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - return result; - } + @Override + public void registerIcons(IIconRegister register) { + coreTextures = new IIcon[2]; + longTextures = new IIcon[2]; - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - if (signalColors.size() >= 0) { - byte[] modes = new byte[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - DyeColor col = signalColors.get(dir); - if (col != null) { - modes[i] = (byte) col.ordinal(); - } else { - modes[i] = -1; + coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCore"); + coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitCoreAnim"); + + longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":ocConduit"); + longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":ocConduitAnim"); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); + } + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort("signalColor", (short) getSignalColor(dir).ordinal()); + } + + @Override + public DyeColor getSignalColor(ForgeDirection dir) { + DyeColor res = signalColors.get(dir); + if (res == null) { + return DyeColor.SILVER; } - i++; - } - nbtRoot.setByteArray("signalColors", modes); + return res; } - } - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - signalColors.clear(); - byte[] cols = nbtRoot.getByteArray("signalColors"); - if (cols != null && cols.length == 6) { - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (cols[i] >= 0) { - signalColors.put(dir, DyeColor.values()[cols[i]]); + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if (key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; } - i++; - } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IOCConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; } - } - @Override - public void setSignalColor(ForgeDirection dir, DyeColor col) { - if (signalColors.get(dir) == col) { - return; + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + if (signalColors.size() >= 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + DyeColor col = signalColors.get(dir); + if (col != null) { + modes[i] = (byte) col.ordinal(); + } else { + modes[i] = -1; + } + i++; + } + nbtRoot.setByteArray("signalColors", modes); + } } - disconnectNode(dir); - signalColors.put(dir, col); - addMissingNodeConnections(); - setClientStateDirty(); - } - @Override - public Class getBaseConduitType() { - return IOCConduit.class; - } + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + signalColors.clear(); + byte[] cols = nbtRoot.getByteArray("signalColors"); + if (cols != null && cols.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (cols[i] >= 0) { + signalColors.put(dir, DyeColor.values()[cols[i]]); + } + i++; + } + } + } - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemOCConduit, 1, 0); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - if (network == null) { - for (ForgeDirection dir : getExternalConnections()) { + @Override + public void setSignalColor(ForgeDirection dir, DyeColor col) { + if (signalColors.get(dir) == col) { + return; + } disconnectNode(dir); - } + signalColors.put(dir, col); + addMissingNodeConnections(); + setClientStateDirty(); } - this.network = (OCConduitNetwork) network; - addMissingNodeConnections(); - return true; - } - @Override - public IIcon getTextureForState(CollidableComponent component) { - int state = Config.enableOCConduitsAnimatedTexture ? 1 : 0; - if (component.dir == ForgeDirection.UNKNOWN) { - return coreTextures[state]; - } else { - return longTextures[state]; + @Override + public Class getBaseConduitType() { + return IOCConduit.class; } - } - @Override - public boolean shouldMirrorTexture() { - return !Config.enableOCConduitsAnimatedTexture; - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - private static String prettyNode(Node o) { - String at = ""; - Environment host = o.host(); - if (host instanceof TileEntity) { - BlockCoord bc = new BlockCoord((TileEntity) host); - at = " at " + bc.x + "/" + bc.y + "/" + bc.z; + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemOCConduit, 1, 0); } - return host.getClass().getName().replaceFirst("^.*\\.", "") + at; - } - private static EnumChatFormatting dye2chat(DyeColor dyeColor) { - switch (dyeColor) { - case BLACK: - return EnumChatFormatting.BLACK; - case BLUE: - return EnumChatFormatting.DARK_BLUE; - case BROWN: - return EnumChatFormatting.DARK_RED; - case CYAN: - return EnumChatFormatting.DARK_AQUA; - // return EnumChatFormatting.AQUA; - case GRAY: - return EnumChatFormatting.DARK_GRAY; - case GREEN: - return EnumChatFormatting.DARK_GREEN; - case LIGHT_BLUE: - return EnumChatFormatting.BLUE; - case LIME: - return EnumChatFormatting.GREEN; - case MAGENTA: - return EnumChatFormatting.LIGHT_PURPLE; - case ORANGE: - return EnumChatFormatting.GOLD; - case PINK: - return EnumChatFormatting.LIGHT_PURPLE; - case PURPLE: - return EnumChatFormatting.DARK_PURPLE; - case RED: - return EnumChatFormatting.RED; - case SILVER: - return EnumChatFormatting.GRAY; - case WHITE: - return EnumChatFormatting.WHITE; - case YELLOW: - return EnumChatFormatting.YELLOW; - default: - return null; + @Override + public AbstractConduitNetwork getNetwork() { + return network; } - } - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); - if (col != null && res.component != null) { - setSignalColor(res.component.dir, col); - return true; - } else if (ConduitUtil.isProbeEquipped(player)) { - if (!player.worldObj.isRemote) { - BlockCoord bc = getLocation(); - if (network != null) { - boolean noconnections = true; - for (DyeColor color : DyeColor.values()) { - if (node(color).neighbors().iterator().hasNext()) { - noconnections = false; - ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName()); - coltxt.getChatStyle().setColor(dye2chat(color)); - ChatComponentText chantxt = new ChatComponentText("Channel "); - chantxt.appendSibling(coltxt); - chantxt.appendText(" at " + bc.x + "/" + bc.y + "/" + bc.z); - player.addChatMessage(chantxt); - for (Node other : node(color).neighbors()) { - player.addChatMessage(new ChatComponentText(" Connected to: " + prettyNode(other))); - } + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + if (network == null) { + for (ForgeDirection dir : getExternalConnections()) { + disconnectNode(dir); } - } - if (noconnections) { - player.addChatMessage(new ChatComponentText("No connections at " + bc.x + "/" + bc.y + "/" + bc.z)); - } + } + this.network = (OCConduitNetwork) network; + addMissingNodeConnections(); + return true; + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + int state = Config.enableOCConduitsAnimatedTexture ? 1 : 0; + if (component.dir == ForgeDirection.UNKNOWN) { + return coreTextures[state]; } else { - player.addChatMessage(new ChatComponentText("No network at " + bc.x + "/" + bc.y + "/" + bc.z)); + return longTextures[state]; } - } - return true; - } else if (ToolUtil.isToolEquipped(player)) { - if (!getBundle().getEntity().getWorldObj().isRemote) { - if (res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - if (all != null && containsExternalConnection(connDir)) { - for (RaytraceResult rtr : all) { - if (rtr != null && rtr.component != null && COLOR_CONTROLLER_ID.equals(rtr.component.data)) { - setSignalColor(connDir, DyeColor.getNext(getSignalColor(connDir))); - return true; - } - } - } - if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, ConnectionMode.IN_OUT); - return true; - } - return ConduitUtil.joinConduits(this, faceHit); - } else if (externalConnections.contains(connDir)) { - setConnectionMode(connDir, getNextConnectionMode(connDir)); + } + + @Override + public boolean shouldMirrorTexture() { + return !Config.enableOCConduitsAnimatedTexture; + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + private static String prettyNode(Node o) { + String at = ""; + Environment host = o.host(); + if (host instanceof TileEntity) { + BlockCoord bc = new BlockCoord((TileEntity) host); + at = " at " + bc.x + "/" + bc.y + "/" + bc.z; + } + return host.getClass().getName().replaceFirst("^.*\\.", "") + at; + } + + private static EnumChatFormatting dye2chat(DyeColor dyeColor) { + switch (dyeColor) { + case BLACK: + return EnumChatFormatting.BLACK; + case BLUE: + return EnumChatFormatting.DARK_BLUE; + case BROWN: + return EnumChatFormatting.DARK_RED; + case CYAN: + return EnumChatFormatting.DARK_AQUA; + // return EnumChatFormatting.AQUA; + case GRAY: + return EnumChatFormatting.DARK_GRAY; + case GREEN: + return EnumChatFormatting.DARK_GREEN; + case LIGHT_BLUE: + return EnumChatFormatting.BLUE; + case LIME: + return EnumChatFormatting.GREEN; + case MAGENTA: + return EnumChatFormatting.LIGHT_PURPLE; + case ORANGE: + return EnumChatFormatting.GOLD; + case PINK: + return EnumChatFormatting.LIGHT_PURPLE; + case PURPLE: + return EnumChatFormatting.DARK_PURPLE; + case RED: + return EnumChatFormatting.RED; + case SILVER: + return EnumChatFormatting.GRAY; + case WHITE: + return EnumChatFormatting.WHITE; + case YELLOW: + return EnumChatFormatting.YELLOW; + default: + return null; + } + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if (col != null && res.component != null) { + setSignalColor(res.component.dir, col); return true; - } else if (containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); - addMissingNodeConnections(); + } else if (ConduitUtil.isProbeEquipped(player)) { + if (!player.worldObj.isRemote) { + BlockCoord bc = getLocation(); + if (network != null) { + boolean noconnections = true; + for (DyeColor color : DyeColor.values()) { + if (node(color).neighbors().iterator().hasNext()) { + noconnections = false; + ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName()); + coltxt.getChatStyle().setColor(dye2chat(color)); + ChatComponentText chantxt = new ChatComponentText("Channel "); + chantxt.appendSibling(coltxt); + chantxt.appendText(" at " + bc.x + "/" + bc.y + "/" + bc.z); + player.addChatMessage(chantxt); + for (Node other : node(color).neighbors()) { + player.addChatMessage(new ChatComponentText(" Connected to: " + prettyNode(other))); + } + } + } + if (noconnections) { + player.addChatMessage( + new ChatComponentText("No connections at " + bc.x + "/" + bc.y + "/" + bc.z)); + } + } else { + player.addChatMessage(new ChatComponentText("No network at " + bc.x + "/" + bc.y + "/" + bc.z)); + } + } return true; - } - } - } - } - return false; - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - if (mode == ConnectionMode.DISABLED) { - disconnectNode(dir); - } - super.setConnectionMode(dir, mode); - } - - @Override - public void connectionsChanged() { - super.connectionsChanged(); - addMissingNodeConnections(); - } - - private void addMissingNodeConnections() { - BlockCoord loc = getLocation(); - if (loc != null && network != null) { - World world = getBundle().getWorld(); - EnumSet conns = getConnections(); - for (DyeColor color : DyeColor.values()) { - Set should = new HashSet(); - for (ForgeDirection direction : conns) { - if (getSignalColor(direction) == color) { - TileEntity te = getLocation().getLocation(direction).getTileEntity(world); - Node other = null; - if (te instanceof SidedEnvironment) { - other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); - } else if (te instanceof Environment) { - other = ((Environment) te).node(); - } else { - // We have a connection to something we cannot connect to. Should - // not happen. Poke debugger in >here< if it does! + } else if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (all != null && containsExternalConnection(connDir)) { + for (RaytraceResult rtr : all) { + if (rtr != null + && rtr.component != null + && COLOR_CONTROLLER_ID.equals(rtr.component.data)) { + setSignalColor(connDir, DyeColor.getNext(getSignalColor(connDir))); + return true; + } + } + } + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; + } + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + addMissingNodeConnections(); + return true; + } + } } - if (other != null && other != node(color)) { - should.add(other); + } + return false; + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + if (mode == ConnectionMode.DISABLED) { + disconnectNode(dir); + } + super.setConnectionMode(dir, mode); + } + + @Override + public void connectionsChanged() { + super.connectionsChanged(); + addMissingNodeConnections(); + } + + private void addMissingNodeConnections() { + BlockCoord loc = getLocation(); + if (loc != null && network != null) { + World world = getBundle().getWorld(); + EnumSet conns = getConnections(); + for (DyeColor color : DyeColor.values()) { + Set should = new HashSet(); + for (ForgeDirection direction : conns) { + if (getSignalColor(direction) == color) { + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other = null; + if (te instanceof SidedEnvironment) { + other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other = ((Environment) te).node(); + } else { + // We have a connection to something we cannot connect to. Should + // not happen. Poke debugger in >here< if it does! + } + if (other != null && other != node(color)) { + should.add(other); + } + } + } + for (Node other : should) { + if (!node(color).isNeighborOf(other)) { + node(color).connect(other); + } + } } - } } - for (Node other : should) { - if (!node(color).isNeighborOf(other)) { - node(color).connect(other); - } + } + + private void disconnectNode(ForgeDirection direction) { + World world = getBundle().getWorld(); + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other = null; + if (te instanceof SidedEnvironment) { + other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other = ((Environment) te).node(); } - } - } - } - - private void disconnectNode(ForgeDirection direction) { - World world = getBundle().getWorld(); - TileEntity te = getLocation().getLocation(direction).getTileEntity(world); - Node other = null; - if (te instanceof SidedEnvironment) { - other = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); - } else if (te instanceof Environment) { - other = ((Environment) te).node(); - } - if (other != null) { - disconnectNode(other, getSignalColor(direction)); - } - } - - /** - * This will disconnect a node from our network unless it has another - * connection to our network. This only works if all the node's blocks are - * adjacent to us. Connecting 2 ManagedEnvironments at different locations - * won't work well. - * - * @param other - * The node to disconnect from us - */ - private void disconnectNode(Node other, DyeColor color) { - - // Um. No. - if (other == node(color)) { - return; - } - // Two conduit networks never connect to each other. They join instead. - Environment otherHost = other.host(); - if (otherHost instanceof OCConduitNetwork && otherHost != network) { - node(color).disconnect(other); - return; - } - - World world = getBundle().getWorld(); - EnumSet conns = getConnections(); - // we need to check if that node has another way of connecting to our - // network. First find out which of our neighbor(s) it belongs to. May - // be just one, may be many. - List toCheck = new ArrayList(); - if (otherHost instanceof TileEntity) { - TileEntity otherTe = (TileEntity) otherHost; - toCheck.add(otherTe); - } else { - for (ForgeDirection direction : conns) { - if (getSignalColor(direction) == color) { - TileEntity te = getLocation().getLocation(direction).getTileEntity(world); - Node other2 = null; - if (te instanceof SidedEnvironment) { - other2 = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); - } else if (te instanceof Environment) { - other2 = ((Environment) te).node(); - } - if (other2 == other) { - toCheck.add(te); - } + if (other != null) { + disconnectNode(other, getSignalColor(direction)); } - } } - // Then see if it still has a connection to our node other than through us. - boolean stayConnected = false; - for (TileEntity otherTe : toCheck) { - for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { + + /** + * This will disconnect a node from our network unless it has another + * connection to our network. This only works if all the node's blocks are + * adjacent to us. Connecting 2 ManagedEnvironments at different locations + * won't work well. + * + * @param other + * The node to disconnect from us + */ + private void disconnectNode(Node other, DyeColor color) { + + // Um. No. + if (other == node(color)) { + return; + } + // Two conduit networks never connect to each other. They join instead. + Environment otherHost = other.host(); + if (otherHost instanceof OCConduitNetwork && otherHost != network) { + node(color).disconnect(other); + return; + } + + World world = getBundle().getWorld(); + EnumSet conns = getConnections(); + // we need to check if that node has another way of connecting to our + // network. First find out which of our neighbor(s) it belongs to. May + // be just one, may be many. + List toCheck = new ArrayList(); + if (otherHost instanceof TileEntity) { + TileEntity otherTe = (TileEntity) otherHost; + toCheck.add(otherTe); + } else { + for (ForgeDirection direction : conns) { + if (getSignalColor(direction) == color) { + TileEntity te = getLocation().getLocation(direction).getTileEntity(world); + Node other2 = null; + if (te instanceof SidedEnvironment) { + other2 = ((SidedEnvironment) te).sidedNode(direction.getOpposite()); + } else if (te instanceof Environment) { + other2 = ((Environment) te).node(); + } + if (other2 == other) { + toCheck.add(te); + } + } + } + } + // Then see if it still has a connection to our node other than through us. + boolean stayConnected = false; + for (TileEntity otherTe : toCheck) { + for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { + if (!stayConnected) { + boolean checkThisSide = true; + if (otherHost instanceof SidedEnvironment) { + checkThisSide = ((SidedEnvironment) otherHost).sidedNode(direction) != null; + } + if (checkThisSide) { + BlockCoord otherPos = new BlockCoord(otherTe); + BlockCoord connTo = otherPos.getLocation(direction); + if (!connTo.equals(getLocation())) { + TileEntity connToTe = connTo.getTileEntity(world); + if (connToTe instanceof SidedEnvironment) { + stayConnected = + ((SidedEnvironment) connToTe).sidedNode(direction.getOpposite()) == node(color); + } else if (connToTe instanceof Environment) { + stayConnected = ((Environment) connToTe).node() == node(color); + } + } + } + } + } + } if (!stayConnected) { - boolean checkThisSide = true; - if (otherHost instanceof SidedEnvironment) { - checkThisSide = ((SidedEnvironment) otherHost).sidedNode(direction) != null; - } - if (checkThisSide) { - BlockCoord otherPos = new BlockCoord(otherTe); - BlockCoord connTo = otherPos.getLocation(direction); - if (!connTo.equals(getLocation())) { - TileEntity connToTe = connTo.getTileEntity(world); - if (connToTe instanceof SidedEnvironment) { - stayConnected = ((SidedEnvironment) connToTe).sidedNode(direction.getOpposite()) == node(color); - } else if (connToTe instanceof Environment) { - stayConnected = ((Environment) connToTe).node() == node(color); - } - } - } + node(color).disconnect(other); } - } } - if (!stayConnected) { - node(color).disconnect(other); + + public EnumSet getConnections() { + EnumSet cons = EnumSet.noneOf(ForgeDirection.class); + cons.addAll(getConduitConnections()); + for (ForgeDirection dir : getExternalConnections()) { + if (getConnectionMode(dir) != ConnectionMode.DISABLED) { + cons.add(dir); + } + } + return cons; } - } - public EnumSet getConnections() { - EnumSet cons = EnumSet.noneOf(ForgeDirection.class); - cons.addAll(getConduitConnections()); - for (ForgeDirection dir : getExternalConnections()) { - if (getConnectionMode(dir) != ConnectionMode.DISABLED) { - cons.add(dir); - } + @Override + public ConnectionMode getNextConnectionMode(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + mode = mode == ConnectionMode.IN_OUT ? ConnectionMode.DISABLED : ConnectionMode.IN_OUT; + return mode; } - return cons; - } - @Override - public ConnectionMode getNextConnectionMode(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - mode = mode == ConnectionMode.IN_OUT ? ConnectionMode.DISABLED : ConnectionMode.IN_OUT; - return mode; - } - - @Override - public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { - return getNextConnectionMode(dir); - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) { - TileEntity te = getLocation().getLocation(direction).getTileEntity(getBundle().getWorld()); - if (te instanceof SidedEnvironment) { - if (getBundle().getWorld().isRemote) { - return ((SidedEnvironment) te).canConnect(direction.getOpposite()); - } else { - return ((SidedEnvironment) te).sidedNode(direction.getOpposite()) != null; - } - } else if (te instanceof Environment) { - return true; + @Override + public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { + return getNextConnectionMode(dir); } - return false; - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public Node node() { - return network != null ? network.node(DyeColor.SILVER) : null; - } + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) { + TileEntity te = + getLocation().getLocation(direction).getTileEntity(getBundle().getWorld()); + if (te instanceof SidedEnvironment) { + if (getBundle().getWorld().isRemote) { + return ((SidedEnvironment) te).canConnect(direction.getOpposite()); + } else { + return ((SidedEnvironment) te).sidedNode(direction.getOpposite()) != null; + } + } else if (te instanceof Environment) { + return true; + } + return false; + } - @Method(modid = "OpenComputersAPI|Network") - public Node node(DyeColor subnet) { - return network != null ? network.node(subnet) : null; - } + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + return network != null ? network.node(DyeColor.SILVER) : null; + } - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onConnect(Node node) { - } + @Method(modid = "OpenComputersAPI|Network") + public Node node(DyeColor subnet) { + return network != null ? network.node(subnet) : null; + } - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onDisconnect(Node node) { - } + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) {} - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onMessage(Message message) { - } + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) {} - @Override - @Method(modid = "OpenComputersAPI|Network") - public Node sidedNode(ForgeDirection side) { - return getConnections().contains(side) ? node(getSignalColor(side)) : null; - } + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) {} - @Override - @SideOnly(Side.CLIENT) - @Method(modid = "OpenComputersAPI|Network") - public boolean canConnect(ForgeDirection side) { - return getConnections().contains(side); - } + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node sidedNode(ForgeDirection side) { + return getConnections().contains(side) ? node(getSignalColor(side)) : null; + } - @Override - public void invalidate() { - } + @Override + @SideOnly(Side.CLIENT) + @Method(modid = "OpenComputersAPI|Network") + public boolean canConnect(ForgeDirection side) { + return getConnections().contains(side); + } + @Override + public void invalidate() {} } diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java index c088ae12..f687b2d1 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java @@ -1,89 +1,74 @@ package crazypants.enderio.conduit.oc; -import javax.annotation.Nonnull; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; +import crazypants.enderio.conduit.AbstractConduitNetwork; import li.cil.oc.api.Network; import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.network.Message; import li.cil.oc.api.network.Node; import li.cil.oc.api.network.Visibility; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.conduit.AbstractConduitNetwork; @Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network") public class OCConduitNetwork extends AbstractConduitNetwork implements ManagedEnvironment { - private Node[] node = new Node[DyeColor.values().length]; + private Node[] node = new Node[DyeColor.values().length]; - public OCConduitNetwork() { - super(IOCConduit.class, IOCConduit.class); - for (DyeColor dyeColor : DyeColor.values()) { - node[dyeColor.ordinal()] = Network.newNode(this, Visibility.Network).create(); - Network.joinNewNetwork(node[dyeColor.ordinal()]); + public OCConduitNetwork() { + super(IOCConduit.class, IOCConduit.class); + for (DyeColor dyeColor : DyeColor.values()) { + node[dyeColor.ordinal()] = Network.newNode(this, Visibility.Network).create(); + Network.joinNewNetwork(node[dyeColor.ordinal()]); + } } - } - @Override - @Method(modid = "OpenComputersAPI|Network") - public Node node() { - return node[DyeColor.SILVER.ordinal()]; - } - - public Node node(DyeColor subnet) { - return node[subnet.ordinal()]; - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onConnect(Node node) { - - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onDisconnect(Node node) { - - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void onMessage(Message message) { - - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void load(NBTTagCompound nbt) { - - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void save(NBTTagCompound nbt) { - - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public boolean canUpdate() { - return false; - } - - @Override - @Method(modid = "OpenComputersAPI|Network") - public void update() { - } - - @Override - public void destroyNetwork() { - for (DyeColor dyeColor : DyeColor.values()) { - node[dyeColor.ordinal()].remove(); + @Override + @Method(modid = "OpenComputersAPI|Network") + public Node node() { + return node[DyeColor.SILVER.ordinal()]; } - super.destroyNetwork(); - } + public Node node(DyeColor subnet) { + return node[subnet.ordinal()]; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onConnect(Node node) {} + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onDisconnect(Node node) {} + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void onMessage(Message message) {} + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void load(NBTTagCompound nbt) {} + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void save(NBTTagCompound nbt) {} + + @Override + @Method(modid = "OpenComputersAPI|Network") + public boolean canUpdate() { + return false; + } + + @Override + @Method(modid = "OpenComputersAPI|Network") + public void update() {} + + @Override + public void destroyNetwork() { + for (DyeColor dyeColor : DyeColor.values()) { + node[dyeColor.ordinal()].remove(); + } + super.destroyNetwork(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java index 172f731c..ae823893 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitRenderer.java @@ -1,34 +1,31 @@ package crazypants.enderio.conduit.oc; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; - import com.enderio.core.client.render.CubeRenderer; - import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; public class OCConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit instanceof IOCConduit; - } - - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { - if (IOCConduit.COLOR_CONTROLLER_ID.equals(component.data)) { - if (conduit.containsExternalConnection(component.dir)) { - int c = ((IOCConduit) conduit).getSignalColor(component.dir).getColor(); - Tessellator tessellator = Tessellator.instance; - tessellator.setColorOpaque_I(c); - CubeRenderer.render(component.bound, tex); - tessellator.setColorOpaque(255, 255, 255); - } - } else { - super.renderConduit(tex, conduit, component, selfIllum); + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof IOCConduit; } - } + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { + if (IOCConduit.COLOR_CONTROLLER_ID.equals(component.data)) { + if (conduit.containsExternalConnection(component.dir)) { + int c = ((IOCConduit) conduit).getSignalColor(component.dir).getColor(); + Tessellator tessellator = Tessellator.instance; + tessellator.setColorOpaque_I(c); + CubeRenderer.render(component.bound, tex); + tessellator.setColorOpaque(255, 255, 255); + } + } else { + super.renderConduit(tex, conduit, component, selfIllum); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java b/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java index 97324fae..397651ff 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCUtil.java @@ -5,14 +5,14 @@ import crazypants.enderio.config.Config; public class OCUtil { - private static boolean useCheckPerformed = false; - private static boolean isOCConduitEnabled = false; + private static boolean useCheckPerformed = false; + private static boolean isOCConduitEnabled = false; - public static boolean isOCEnabled() { - if(!useCheckPerformed) { - isOCConduitEnabled = Loader.isModLoaded("OpenComputers") && Config.enableOCConduits; - useCheckPerformed = true; + public static boolean isOCEnabled() { + if (!useCheckPerformed) { + isOCConduitEnabled = Loader.isModLoaded("OpenComputers") && Config.enableOCConduits; + useCheckPerformed = true; + } + return isOCConduitEnabled; } - return isOCConduitEnabled; - } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java index 4e760113..db36134c 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitBundlePacket.java @@ -1,15 +1,13 @@ package crazypants.enderio.conduit.packet; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; +import net.minecraft.tileentity.TileEntity; public abstract class AbstractConduitBundlePacket extends MessageTileEntity { - public AbstractConduitBundlePacket() { - } + public AbstractConduitBundlePacket() {} - public AbstractConduitBundlePacket(TileEntity tile) { - super(tile); - } + public AbstractConduitBundlePacket(TileEntity tile) { + super(tile); + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java index 7275dbf8..041e773b 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java @@ -1,53 +1,52 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class AbstractConduitPacket extends AbstractConduitBundlePacket { - protected ConTypeEnum conType; + protected ConTypeEnum conType; - public AbstractConduitPacket() { - } + public AbstractConduitPacket() {} - public AbstractConduitPacket(TileEntity tile, ConTypeEnum conType) { - super(tile); - this.conType = conType; - } - - protected Class getConType() { - return conType.getBaseType(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(conType.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - short ordinal = buf.readShort(); - conType = ConTypeEnum.values()[ordinal]; - } - - @SuppressWarnings("unchecked") - protected T getTileCasted(MessageContext ctx) { - World world = getWorld(ctx); - if(world == null) { - return null; + public AbstractConduitPacket(TileEntity tile, ConTypeEnum conType) { + super(tile); + this.conType = conType; } - TileEntity te = world.getTileEntity(x, y, z); - if( ! (te instanceof IConduitBundle)) { - return null; + + protected Class getConType() { + return conType.getBaseType(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(conType.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + short ordinal = buf.readShort(); + conType = ConTypeEnum.values()[ordinal]; + } + + @SuppressWarnings("unchecked") + protected T getTileCasted(MessageContext ctx) { + World world = getWorld(ctx); + if (world == null) { + return null; + } + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return null; + } + + IConduitBundle bundle = (IConduitBundle) te; + return (T) bundle.getConduit(getConType()); } - - IConduitBundle bundle = (IConduitBundle)te; - return (T) bundle.getConduit(getConType()); - } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java b/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java index 9325ac40..52910832 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java +++ b/src/main/java/crazypants/enderio/conduit/packet/ConTypeEnum.java @@ -10,32 +10,31 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; public enum ConTypeEnum { + POWER(IPowerConduit.class), + FLUID(ILiquidConduit.class), + ITEM(IItemConduit.class), + REDSTONE(IRedstoneConduit.class), + GAS(IGasConduit.class), + ME(IMEConduit.class), + OC(IOCConduit.class); - POWER(IPowerConduit.class), - FLUID(ILiquidConduit.class), - ITEM(IItemConduit.class), - REDSTONE(IRedstoneConduit.class), - GAS(IGasConduit.class), - ME(IMEConduit.class), - OC(IOCConduit.class); + final Class baseType; - final Class baseType; - - private ConTypeEnum(Class baseType) { - this.baseType = baseType; - } - - public Class getBaseType() { - return baseType; - } - - public static ConTypeEnum get(IConduit con) { - Class from = con.getBaseConduitType(); - for (ConTypeEnum ct : ConTypeEnum.values()) { - if (ct.getBaseType() == from) { - return ct; - } + private ConTypeEnum(Class baseType) { + this.baseType = baseType; } - return null; - } -} \ No newline at end of file + + public Class getBaseType() { + return baseType; + } + + public static ConTypeEnum get(IConduit con) { + Class from = con.getBaseConduitType(); + for (ConTypeEnum ct : ConTypeEnum.values()) { + if (ct.getBaseType() == from) { + return ct; + } + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java index 5fa2255e..8d96dc6c 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java @@ -1,56 +1,54 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketConnectionMode extends AbstractConduitPacket implements IMessageHandler{ +public class PacketConnectionMode extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private ConnectionMode mode; + private ForgeDirection dir; + private ConnectionMode mode; - public PacketConnectionMode() { - } + public PacketConnectionMode() {} - public PacketConnectionMode(IConduit con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.get(con)); - this.dir = dir; - mode = con.getConnectionMode(dir); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeShort(mode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - mode = ConnectionMode.values()[buf.readShort()]; - - } - - @Override - public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) { - IConduit conduit = message.getTileCasted(ctx); - if(conduit == null) { - return null; + public PacketConnectionMode(IConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.get(con)); + this.dir = dir; + mode = con.getConnectionMode(dir); } - if(conduit instanceof IInsulatedRedstoneConduit) { - ((IInsulatedRedstoneConduit)conduit).forceConnectionMode(message.dir, message.mode); - } else { - conduit.setConnectionMode(message.dir, message.mode); - } - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeShort(mode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + mode = ConnectionMode.values()[buf.readShort()]; + } + + @Override + public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) { + IConduit conduit = message.getTileCasted(ctx); + if (conduit == null) { + return null; + } + if (conduit instanceof IInsulatedRedstoneConduit) { + ((IInsulatedRedstoneConduit) conduit).forceConnectionMode(message.dir, message.mode); + } else { + conduit.setConnectionMode(message.dir, message.mode); + } + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java index 05597d1a..e181ec54 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java @@ -1,54 +1,51 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.machine.RedstoneControlMode; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketExtractMode extends AbstractConduitPacket implements IMessageHandler { +public class PacketExtractMode extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private RedstoneControlMode mode; - private DyeColor color; + private ForgeDirection dir; + private RedstoneControlMode mode; + private DyeColor color; - public PacketExtractMode() { - } + public PacketExtractMode() {} - public PacketExtractMode(IExtractor con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.get(con)); - this.dir = dir; - mode = con.getExtractionRedstoneMode(dir); - color = con.getExtractionSignalColor(dir); - } + public PacketExtractMode(IExtractor con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.get(con)); + this.dir = dir; + mode = con.getExtractionRedstoneMode(dir); + color = con.getExtractionSignalColor(dir); + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeShort(mode.ordinal()); - buf.writeShort(color.ordinal()); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeShort(mode.ordinal()); + buf.writeShort(color.ordinal()); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - mode = RedstoneControlMode.values()[buf.readShort()]; - color = DyeColor.values()[buf.readShort()]; - } - - @Override - public IMessage onMessage(PacketExtractMode message, MessageContext ctx) { - message.getTileCasted(ctx).setExtractionRedstoneMode(message.mode, message.dir); - message.getTileCasted(ctx).setExtractionSignalColor(message.dir, message.color); - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + mode = RedstoneControlMode.values()[buf.readShort()]; + color = DyeColor.values()[buf.readShort()]; + } + @Override + public IMessage onMessage(PacketExtractMode message, MessageContext ctx) { + message.getTileCasted(ctx).setExtractionRedstoneMode(message.mode, message.dir); + message.getTileCasted(ctx).setExtractionSignalColor(message.dir, message.color); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java index 970cf655..dd063bab 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -1,93 +1,90 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketItemConduitFilter extends AbstractConduitPacket implements IMessageHandler { +public class PacketItemConduitFilter extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private boolean loopMode; - private boolean roundRobin; - private DyeColor colIn; - private DyeColor colOut; - private int priority; + private ForgeDirection dir; + private boolean loopMode; + private boolean roundRobin; + private DyeColor colIn; + private DyeColor colOut; + private int priority; - private IItemFilter inputFilter; - private IItemFilter outputFilter; + private IItemFilter inputFilter; + private IItemFilter outputFilter; - public PacketItemConduitFilter() { - } + public PacketItemConduitFilter() {} - public PacketItemConduitFilter(IItemConduit con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.ITEM); - this.dir = dir; - loopMode = con.isSelfFeedEnabled(dir); - roundRobin = con.isRoundRobinEnabled(dir); - colIn = con.getInputColor(dir); - colOut = con.getOutputColor(dir); - priority = con.getOutputPriority(dir); + public PacketItemConduitFilter(IItemConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.ITEM); + this.dir = dir; + loopMode = con.isSelfFeedEnabled(dir); + roundRobin = con.isRoundRobinEnabled(dir); + colIn = con.getInputColor(dir); + colOut = con.getOutputColor(dir); + priority = con.getOutputPriority(dir); - inputFilter = con.getInputFilter(dir); - outputFilter = con.getOutputFilter(dir); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(loopMode); - buf.writeBoolean(roundRobin); - buf.writeInt(priority); - buf.writeShort(colIn.ordinal()); - buf.writeShort(colOut.ordinal()); - FilterRegister.writeFilter(buf, inputFilter); - FilterRegister.writeFilter(buf, outputFilter); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - loopMode = buf.readBoolean(); - roundRobin = buf.readBoolean(); - priority = buf.readInt(); - colIn = DyeColor.values()[buf.readShort()]; - colOut = DyeColor.values()[buf.readShort()]; - inputFilter = FilterRegister.readFilter(buf); - outputFilter = FilterRegister.readFilter(buf); - } - - @Override - public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) { - IItemConduit conduit = message.getTileCasted(ctx); - conduit.setSelfFeedEnabled(message.dir, message.loopMode); - conduit.setRoundRobinEnabled(message.dir, message.roundRobin); - conduit.setInputColor(message.dir, message.colIn); - conduit.setOutputColor(message.dir, message.colOut); - conduit.setOutputPriority(message.dir, message.priority); - applyFilter(message.dir, conduit, message.inputFilter, true); - applyFilter(message.dir, conduit, message.outputFilter, false); - - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } - - private void applyFilter(ForgeDirection dir, IItemConduit conduit, IItemFilter filter, boolean isInput) { - if(isInput) { - conduit.setInputFilter(dir, filter); - } else { - conduit.setOutputFilter(dir, filter); + inputFilter = con.getInputFilter(dir); + outputFilter = con.getOutputFilter(dir); } - return; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(loopMode); + buf.writeBoolean(roundRobin); + buf.writeInt(priority); + buf.writeShort(colIn.ordinal()); + buf.writeShort(colOut.ordinal()); + FilterRegister.writeFilter(buf, inputFilter); + FilterRegister.writeFilter(buf, outputFilter); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + loopMode = buf.readBoolean(); + roundRobin = buf.readBoolean(); + priority = buf.readInt(); + colIn = DyeColor.values()[buf.readShort()]; + colOut = DyeColor.values()[buf.readShort()]; + inputFilter = FilterRegister.readFilter(buf); + outputFilter = FilterRegister.readFilter(buf); + } + + @Override + public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) { + IItemConduit conduit = message.getTileCasted(ctx); + conduit.setSelfFeedEnabled(message.dir, message.loopMode); + conduit.setRoundRobinEnabled(message.dir, message.roundRobin); + conduit.setInputColor(message.dir, message.colIn); + conduit.setOutputColor(message.dir, message.colOut); + conduit.setOutputPriority(message.dir, message.priority); + applyFilter(message.dir, conduit, message.inputFilter, true); + applyFilter(message.dir, conduit, message.outputFilter, false); + + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } + + private void applyFilter(ForgeDirection dir, IItemConduit conduit, IItemFilter filter, boolean isInput) { + if (isInput) { + conduit.setInputFilter(dir, filter); + } else { + conduit.setOutputFilter(dir, filter); + } + return; + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java index 7b666efb..70032012 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java @@ -1,50 +1,45 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.oc.IOCConduit; -import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketOCConduitSignalColor extends AbstractConduitPacket implements - IMessageHandler { +public class PacketOCConduitSignalColor extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private DyeColor col; + private ForgeDirection dir; + private DyeColor col; - public PacketOCConduitSignalColor() { - } + public PacketOCConduitSignalColor() {} - public PacketOCConduitSignalColor(IOCConduit con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.OC); - this.dir = dir; - col = con.getSignalColor(dir); - } + public PacketOCConduitSignalColor(IOCConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.OC); + this.dir = dir; + col = con.getSignalColor(dir); + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeShort(col.ordinal()); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeShort(col.ordinal()); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - col = DyeColor.values()[buf.readShort()]; - } - - @Override - public IMessage onMessage(PacketOCConduitSignalColor message, MessageContext ctx) { - message.getTileCasted(ctx).setSignalColor(message.dir, message.col); - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + col = DyeColor.values()[buf.readShort()]; + } + @Override + public IMessage onMessage(PacketOCConduitSignalColor message, MessageContext ctx) { + message.getTileCasted(ctx).setSignalColor(message.dir, message.col); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java index 210896d7..5bf2fce2 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitOutputStrength.java @@ -1,48 +1,47 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket implements - IMessageHandler { +public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private boolean isStrong; + private ForgeDirection dir; + private boolean isStrong; - public PacketRedstoneConduitOutputStrength() { - } + public PacketRedstoneConduitOutputStrength() {} - public PacketRedstoneConduitOutputStrength(IInsulatedRedstoneConduit con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.REDSTONE); - this.dir = dir; - isStrong = con.isOutputStrong(dir); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeBoolean(isStrong); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - isStrong = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketRedstoneConduitOutputStrength message, MessageContext ctx) { - IInsulatedRedstoneConduit tile = message.getTileCasted(ctx); - if(tile != null) { - tile.setOutputStrength(message.dir, message.isStrong); - //message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + public PacketRedstoneConduitOutputStrength(IInsulatedRedstoneConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.REDSTONE); + this.dir = dir; + isStrong = con.isOutputStrong(dir); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeBoolean(isStrong); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + isStrong = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketRedstoneConduitOutputStrength message, MessageContext ctx) { + IInsulatedRedstoneConduit tile = message.getTileCasted(ctx); + if (tile != null) { + tile.setOutputStrength(message.dir, message.isStrong); + // message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java index b3bb4bc8..68c6d696 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketRedstoneConduitSignalColor.java @@ -1,48 +1,45 @@ package crazypants.enderio.conduit.packet; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.common.util.ForgeDirection; -public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket implements IMessageHandler { +public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket + implements IMessageHandler { - private ForgeDirection dir; - private DyeColor col; + private ForgeDirection dir; + private DyeColor col; - public PacketRedstoneConduitSignalColor() { - } + public PacketRedstoneConduitSignalColor() {} - public PacketRedstoneConduitSignalColor(IInsulatedRedstoneConduit con, ForgeDirection dir) { - super(con.getBundle().getEntity(), ConTypeEnum.REDSTONE); - this.dir = dir; - col = con.getSignalColor(dir); - } + public PacketRedstoneConduitSignalColor(IInsulatedRedstoneConduit con, ForgeDirection dir) { + super(con.getBundle().getEntity(), ConTypeEnum.REDSTONE); + this.dir = dir; + col = con.getSignalColor(dir); + } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(dir.ordinal()); - buf.writeShort(col.ordinal()); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(dir.ordinal()); + buf.writeShort(col.ordinal()); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - col = DyeColor.values()[buf.readShort()]; - } - - @Override - public IMessage onMessage(PacketRedstoneConduitSignalColor message, MessageContext ctx) { - message.getTileCasted(ctx).setSignalColor(message.dir, message.col); - message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + dir = ForgeDirection.values()[buf.readShort()]; + col = DyeColor.values()[buf.readShort()]; + } + @Override + public IMessage onMessage(PacketRedstoneConduitSignalColor message, MessageContext ctx) { + message.getTileCasted(ctx).setSignalColor(message.dir, message.col); + message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java index fa5c4261..9ef63c31 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketRoundRobinMode.java @@ -8,12 +8,12 @@ import crazypants.enderio.conduit.liquid.ILiquidConduit; import io.netty.buffer.ByteBuf; import net.minecraftforge.common.util.ForgeDirection; -public class PacketRoundRobinMode extends AbstractConduitPacket implements IMessageHandler { +public class PacketRoundRobinMode extends AbstractConduitPacket + implements IMessageHandler { private ForgeDirection dir; private boolean roundRobin; - public PacketRoundRobinMode() { - } + public PacketRoundRobinMode() {} public PacketRoundRobinMode(AbstractEnderLiquidConduit eConduit, ForgeDirection dir) { super(eConduit.getBundle().getEntity(), ConTypeEnum.FLUID); diff --git a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java index 45b1fb4c..9e37108b 100644 --- a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java @@ -1,40 +1,38 @@ package crazypants.enderio.conduit.power; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.IPowerInterface; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public interface IPowerConduit extends IConduit, IInternalPowerHandler, IExtractor { - public static final String ICON_KEY = "enderio:powerConduit"; - public static final String ICON_KEY_INPUT = "enderio:powerConduitInput"; - public static final String ICON_KEY_OUTPUT = "enderio:powerConduitOutput"; - public static final String ICON_CORE_KEY = "enderio:powerConduitCore"; - public static final String ICON_TRANSMISSION_KEY = "enderio:powerConduitTransmission"; + public static final String ICON_KEY = "enderio:powerConduit"; + public static final String ICON_KEY_INPUT = "enderio:powerConduitInput"; + public static final String ICON_KEY_OUTPUT = "enderio:powerConduitOutput"; + public static final String ICON_CORE_KEY = "enderio:powerConduitCore"; + public static final String ICON_TRANSMISSION_KEY = "enderio:powerConduitTransmission"; - public static final String COLOR_CONTROLLER_ID = "ColorController"; + public static final String COLOR_CONTROLLER_ID = "ColorController"; - IPowerInterface getExternalPowerReceptor(ForgeDirection direction); + IPowerInterface getExternalPowerReceptor(ForgeDirection direction); - ICapacitor getCapacitor(); + ICapacitor getCapacitor(); - int getMaxEnergyExtracted(ForgeDirection dir); + int getMaxEnergyExtracted(ForgeDirection dir); - @Override - int getMaxEnergyRecieved(ForgeDirection dir); + @Override + int getMaxEnergyRecieved(ForgeDirection dir); - IIcon getTextureForInputMode(); + IIcon getTextureForInputMode(); - IIcon getTextureForOutputMode(); - - //called from NetworkPowerManager - void onTick(); - - boolean getConnectionsDirty(); + IIcon getTextureForOutputMode(); + // called from NetworkPowerManager + void onTick(); + boolean getConnectionsDirty(); } diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 30245f4d..a7677663 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -1,9 +1,5 @@ package crazypants.enderio.conduit.power; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -13,56 +9,59 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.ICapacitor; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemPowerConduit extends AbstractItemConduit { - private static String PREFIX; - private static String POSTFIX; + private static String PREFIX; + private static String POSTFIX; - static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemPowerConduit.name(), "enderio:itemPowerConduit"), - new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Enhanced", "enderio:itemPowerConduitEnhanced"), - new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder"), - }; + static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemPowerConduit.name(), "enderio:itemPowerConduit"), + new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Enhanced", "enderio:itemPowerConduitEnhanced"), + new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder"), + }; - public static ItemPowerConduit create() { - ItemPowerConduit result = new ItemPowerConduit(); - result.init(); - return result; - } - - protected ItemPowerConduit() { - super(ModObject.itemPowerConduit, subtypes); - } - - protected ItemPowerConduit(ModObject modObject, ItemConduitSubtype[] subtypes) { - super(modObject, subtypes); - } - - @Override - public Class getBaseConduitType() { - return IPowerConduit.class; - } - - @Override - public IConduit createConduit(ItemStack stack, EntityPlayer player) { - return new PowerConduit(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - if(PREFIX == null) { - POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; + public static ItemPowerConduit create() { + ItemPowerConduit result = new ItemPowerConduit(); + result.init(); + return result; } - super.addInformation(itemStack, par2EntityPlayer, list, par4); - ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; - list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); - } - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + protected ItemPowerConduit() { + super(ModObject.itemPowerConduit, subtypes); + } + + protected ItemPowerConduit(ModObject modObject, ItemConduitSubtype[] subtypes) { + super(modObject, subtypes); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + return new PowerConduit(stack.getItemDamage()); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + if (PREFIX == null) { + POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; + } + super.addInformation(itemStack, par2EntityPlayer, list, par4); + ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; + list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 10a44cd6..58de6258 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -1,5 +1,11 @@ package crazypants.enderio.conduit.power; +import crazypants.enderio.Log; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; +import crazypants.enderio.config.Config; +import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.IPowerStorage; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -7,528 +13,512 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; import java.util.Set; - import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.Log; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; -import crazypants.enderio.config.Config; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.IPowerStorage; public class NetworkPowerManager { - private final PowerConduitNetwork network; + private final PowerConduitNetwork network; - int maxEnergyStored; - int energyStored; + int maxEnergyStored; + int energyStored; - private int updateRenderTicks = 10; - private int inactiveTicks = 100; + private int updateRenderTicks = 10; + private int inactiveTicks = 100; - private final List receptors = new ArrayList(); - private ListIterator receptorIterator = receptors.listIterator(); + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); - private final List storageReceptors = new ArrayList(); + private final List storageReceptors = new ArrayList(); - private boolean receptorsDirty = true; + private boolean receptorsDirty = true; - private final Map powerTrackers = new HashMap(); + private final Map powerTrackers = new HashMap(); - private final PowerTracker networkPowerTracker = new PowerTracker(); + private final PowerTracker networkPowerTracker = new PowerTracker(); - private final CapBankSupply capSupply = new CapBankSupply(); + private final CapBankSupply capSupply = new CapBankSupply(); - public NetworkPowerManager(PowerConduitNetwork netowrk, World world) { - network = netowrk; - maxEnergyStored = 64; - } - - public PowerTracker getTracker(IPowerConduit conduit) { - return powerTrackers.get(conduit); - } - - public PowerTracker getNetworkPowerTracker() { - return networkPowerTracker; - } - - public int getPowerInConduits() { - return energyStored; - } - - public int getMaxPowerInConduits() { - return maxEnergyStored; - } - - public long getPowerInCapacitorBanks() { - if(capSupply == null) { - return 0; + public NetworkPowerManager(PowerConduitNetwork netowrk, World world) { + network = netowrk; + maxEnergyStored = 64; } - return capSupply.stored; - } - public long getMaxPowerInCapacitorBanks() { - if(capSupply == null) { - return 0; + public PowerTracker getTracker(IPowerConduit conduit) { + return powerTrackers.get(conduit); } - return capSupply.maxCap; - } - public long getPowerInReceptors() { - long result = 0; - Set done = new HashSet(); - for (ReceptorEntry re : receptors) { - if(!re.emmiter.getConnectionsDirty()) { - IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor.getDelegate())) { - done.add(powerReceptor.getDelegate()); - result += powerReceptor.getEnergyStored(re.direction); + public PowerTracker getNetworkPowerTracker() { + return networkPowerTracker; + } + + public int getPowerInConduits() { + return energyStored; + } + + public int getMaxPowerInConduits() { + return maxEnergyStored; + } + + public long getPowerInCapacitorBanks() { + if (capSupply == null) { + return 0; } - } + return capSupply.stored; } - return result; - } - public long getMaxPowerInReceptors() { - long result = 0; - Set done = new HashSet(); - for (ReceptorEntry re : receptors) { - if(!re.emmiter.getConnectionsDirty()) { - IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor.getDelegate())) { - done.add(powerReceptor.getDelegate()); - result += powerReceptor.getMaxEnergyStored(re.direction); + public long getMaxPowerInCapacitorBanks() { + if (capSupply == null) { + return 0; } - } - } - return result; - } - - private int errorSupressionA = 0; - private int errorSupressionB = 0; - - public void applyRecievedPower() { - try { - doApplyRecievedPower(); - } catch (Exception e) { - if (errorSupressionA-- <= 0) { - Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e); - e.printStackTrace(); - errorSupressionA = 200; - errorSupressionB = 20; - } else if (errorSupressionB-- <= 0) { - Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e); - errorSupressionB = 20; - } - } - } - - public void doApplyRecievedPower() { - - trackerStartTick(); - - checkReceptors(); - - // Update our energy stored based on what's in our conduits - updateNetorkStorage(); - networkPowerTracker.tickStart(energyStored); - - capSupply.init(); - - int appliedCount = 0; - int numReceptors = receptors.size(); - int available = energyStored + capSupply.canExtract; - int wasAvailable = available; - - if(available <= 0 || (receptors.isEmpty() && storageReceptors.isEmpty())) { - trackerEndTick(); - networkPowerTracker.tickEnd(energyStored); - return; + return capSupply.maxCap; } - while (available > 0 && appliedCount < numReceptors) { - - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = receptors.listIterator(); - } - ReceptorEntry r = receptorIterator.next(); - IPowerInterface pp = r.powerInterface; - if(pp != null) { - int canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); - int used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); - used = Math.max(0, used); - trackerSend(r.emmiter, used, false); - available -= used; - if(available <= 0) { - break; - } - } - appliedCount++; - } - - int used = wasAvailable - available; - // use all the capacator storage first - energyStored -= used; - - if(!capSupply.capBanks.isEmpty()) { - int capBankChange = 0; - if(energyStored < 0) { - // not enough so get the rest from the capacitor bank - capBankChange = energyStored; - energyStored = 0; - } else if(energyStored > 0) { - // push as much as we can back to the cap banks - capBankChange = Math.min(energyStored, capSupply.canFill); - energyStored -= capBankChange; - } - - if(capBankChange < 0) { - capSupply.remove(Math.abs(capBankChange)); - } else if(capBankChange > 0) { - capSupply.add(capBankChange); - } - - capSupply.balance(); - } - - distributeStorageToConduits(); - - trackerEndTick(); - - networkPowerTracker.tickEnd(energyStored); - } - - private void trackerStartTick() { - - if(!Config.detailedPowerTrackingEnabled) { - return; - } - for (IPowerConduit con : network.getConduits()) { - if(con.hasExternalConnections()) { - PowerTracker tracker = getOrCreateTracker(con); - tracker.tickStart(con.getEnergyStored()); - } - } - } - - private void trackerSend(IPowerConduit con, int sent, boolean fromBank) { - if(!fromBank) { - networkPowerTracker.powerSent(sent); - } - if(!Config.detailedPowerTrackingEnabled) { - return; - } - getOrCreateTracker(con).powerSent(sent); - } - - private void trackerRecieve(IPowerConduit con, int recieved, boolean fromBank) { - if(!fromBank) { - networkPowerTracker.powerRecieved(recieved); - } - if(!Config.detailedPowerTrackingEnabled) { - return; - } - getOrCreateTracker(con).powerRecieved(recieved); - } - - private void trackerEndTick() { - if(!Config.detailedPowerTrackingEnabled) { - return; - } - for (IPowerConduit con : network.getConduits()) { - if(con.hasExternalConnections()) { - PowerTracker tracker = getOrCreateTracker(con); - tracker.tickEnd(con.getEnergyStored()); - } - } - } - - private PowerTracker getOrCreateTracker(IPowerConduit con) { - PowerTracker result = powerTrackers.get(con); - if(result == null) { - result = new PowerTracker(); - powerTrackers.put(con, result); - } - return result; - } - - private void distributeStorageToConduits() { - if(maxEnergyStored <= 0 || energyStored <= 0) { - for (IPowerConduit con : network.getConduits()) { - con.setEnergyStored(0); - } - return; - } - energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); - - float filledRatio = (float) energyStored / maxEnergyStored; - int energyLeft = energyStored; - int given = 0; - for (IPowerConduit con : network.getConduits()) { - if(energyLeft > 0) { - // NB: use ceil to ensure we dont through away any energy due to - // rounding - // errors - int give = (int) Math.ceil(con.getMaxEnergyStored() * filledRatio); - give = Math.min(give, con.getMaxEnergyStored()); - give = Math.min(give, energyLeft); - con.setEnergyStored(give); - given += give; - energyLeft -= give; - } else { - con.setEnergyStored(0); - } - } - } - - boolean isActive() { - return energyStored > 0; - } - - private void updateNetorkStorage() { - maxEnergyStored = 0; - energyStored = 0; - for (IPowerConduit con : network.getConduits()) { - maxEnergyStored += con.getMaxEnergyStored(); - con.onTick(); - energyStored += con.getEnergyStored(); - } - energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); - } - - public void receptorsChanged() { - receptorsDirty = true; - } - - private void checkReceptors() { - if(!receptorsDirty) { - return; - } - receptors.clear(); - storageReceptors.clear(); - for (ReceptorEntry rec : network.getPowerReceptors()) { - if(rec.powerInterface.getDelegate() != null && - rec.powerInterface.getDelegate() instanceof IPowerStorage) { - storageReceptors.add(rec); - } else { - receptors.add(rec); - } - } - receptorIterator = receptors.listIterator(); - - receptorsDirty = false; - } - - void onNetworkDestroyed() { - } - - private static class StarveBuffer { - - int stored; - - public StarveBuffer(int stored) { - this.stored = stored; - } - - void addToStore(float val) { - stored += val; - } - - } - - private int minAbs(int amount, int limit) { - if(amount < 0) { - return Math.max(amount, -limit); - } else { - return Math.min(amount, limit); - } - } - - private class CapBankSupply { - - int canExtract; - int canFill; - Set capBanks = new HashSet(); - - double filledRatio; - long stored = 0; - long maxCap = 0; - - List enteries = new ArrayList(); - - CapBankSupply() { - } - - void init() { - capBanks.clear(); - enteries.clear(); - canExtract = 0; - canFill = 0; - stored = 0; - maxCap = 0; - - double toBalance = 0; - double maxToBalance = 0; - - for (ReceptorEntry rec : storageReceptors) { - IPowerStorage cb = (IPowerStorage) rec.powerInterface.getDelegate(); - - boolean processed = capBanks.contains(cb.getController()); - - if(!processed) { - stored += cb.getEnergyStoredL(); - maxCap += cb.getMaxEnergyStoredL(); - capBanks.add(cb.getController()); - } - - if(rec.emmiter.getConnectionMode(rec.direction) == ConnectionMode.IN_OUT) { - toBalance += cb.getEnergyStoredL(); - maxToBalance += cb.getMaxEnergyStoredL(); - } - - long canGet = 0; - long canFill = 0; - if(cb.isNetworkControlledIo(rec.direction.getOpposite())) { - if(cb.isOutputEnabled(rec.direction.getOpposite())) { - canGet = Math.min(cb.getEnergyStoredL(), cb.getMaxOutput()); - canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); - canExtract += canGet; - } - - if(cb.isInputEnabled(rec.direction.getOpposite())) { - canFill = Math.min(cb.getMaxEnergyStoredL() - cb.getEnergyStoredL(), cb.getMaxInput()); - canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); - this.canFill += canFill; - } - enteries.add(new CapBankSupplyEntry(cb, (int) canGet, (int) canFill, rec.emmiter, rec.direction)); - } - - } - - filledRatio = 0; - if(maxToBalance > 0) { - filledRatio = toBalance / maxToBalance; - } - } - - void balance() { - if(enteries.size() < 2) { - return; - } - init(); - int canRemove = 0; - int canAdd = 0; - for (CapBankSupplyEntry entry : enteries) { - if(entry.emmiter.getConnectionMode(entry.direction) == ConnectionMode.IN_OUT) { - entry.calcToBalance(filledRatio); - if(entry.toBalance < 0) { - canRemove += -entry.toBalance; - } else { - canAdd += entry.toBalance; - } - } - } - - int toalTransferAmount = Math.min(canAdd, canRemove); - - for (int i = 0; i < enteries.size() && toalTransferAmount > 0; i++) { - CapBankSupplyEntry from = enteries.get(i); - if(from.emmiter.getConnectionMode(from.direction) == ConnectionMode.IN_OUT) { - - int amount = from.toBalance; - amount = minAbs(amount, toalTransferAmount); - from.capBank.addEnergy(amount); - toalTransferAmount -= Math.abs(amount); - int toTranfser = Math.abs(amount); - - for (int j = i + 1; j < enteries.size() && toTranfser > 0; j++) { - CapBankSupplyEntry to = enteries.get(j); - if(Math.signum(amount) != Math.signum(to.toBalance)) { - int toAmount = Math.min(toTranfser, Math.abs(to.toBalance)); - to.capBank.addEnergy(toAmount * (int) Math.signum(to.toBalance)); - toTranfser -= toAmount; + public long getPowerInReceptors() { + long result = 0; + Set done = new HashSet(); + for (ReceptorEntry re : receptors) { + if (!re.emmiter.getConnectionsDirty()) { + IPowerInterface powerReceptor = re.powerInterface; + if (!done.contains(powerReceptor.getDelegate())) { + done.add(powerReceptor.getDelegate()); + result += powerReceptor.getEnergyStored(re.direction); + } } - } } - } - + return result; } - void remove(int amount) { - if(canExtract <= 0 || amount <= 0) { - return; - } - double ratio = (double) amount / canExtract; - - for (CapBankSupplyEntry entry : enteries) { - long use = (int) Math.ceil(ratio * entry.canExtract); - use = Math.min(use, amount); - use = Math.min(use, entry.canExtract); - entry.capBank.addEnergy((int) -use); - trackerRecieve(entry.emmiter, (int) use, true); - amount -= use; - if(amount == 0) { - return; + public long getMaxPowerInReceptors() { + long result = 0; + Set done = new HashSet(); + for (ReceptorEntry re : receptors) { + if (!re.emmiter.getConnectionsDirty()) { + IPowerInterface powerReceptor = re.powerInterface; + if (!done.contains(powerReceptor.getDelegate())) { + done.add(powerReceptor.getDelegate()); + result += powerReceptor.getMaxEnergyStored(re.direction); + } + } } - } + return result; } - void add(int amount) { - if(canFill <= 0 || amount <= 0) { - return; - } - double ratio = (double) amount / canFill; + private int errorSupressionA = 0; + private int errorSupressionB = 0; - for (CapBankSupplyEntry entry : enteries) { - long add = (int) Math.ceil(ratio * entry.canFill); - add = Math.min(add, entry.canFill); - add = Math.min(add, amount); - entry.capBank.addEnergy((int) add); - trackerSend(entry.emmiter, (int) add, true); - amount -= add; - if(amount == 0) { - return; + public void applyRecievedPower() { + try { + doApplyRecievedPower(); + } catch (Exception e) { + if (errorSupressionA-- <= 0) { + Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e); + e.printStackTrace(); + errorSupressionA = 200; + errorSupressionB = 20; + } else if (errorSupressionB-- <= 0) { + Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e); + errorSupressionB = 20; + } } - } } - } + public void doApplyRecievedPower() { - private static class CapBankSupplyEntry { + trackerStartTick(); - final IPowerStorage capBank; - final int canExtract; - final int canFill; - int toBalance; - IPowerConduit emmiter; - ForgeDirection direction; + checkReceptors(); - private CapBankSupplyEntry(IPowerStorage capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { - this.capBank = capBank; - canExtract = available; - this.canFill = canFill; - this.emmiter = emmiter; - this.direction = direction; + // Update our energy stored based on what's in our conduits + updateNetorkStorage(); + networkPowerTracker.tickStart(energyStored); + + capSupply.init(); + + int appliedCount = 0; + int numReceptors = receptors.size(); + int available = energyStored + capSupply.canExtract; + int wasAvailable = available; + + if (available <= 0 || (receptors.isEmpty() && storageReceptors.isEmpty())) { + trackerEndTick(); + networkPowerTracker.tickEnd(energyStored); + return; + } + + while (available > 0 && appliedCount < numReceptors) { + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + ReceptorEntry r = receptorIterator.next(); + IPowerInterface pp = r.powerInterface; + if (pp != null) { + int canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); + int used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); + used = Math.max(0, used); + trackerSend(r.emmiter, used, false); + available -= used; + if (available <= 0) { + break; + } + } + appliedCount++; + } + + int used = wasAvailable - available; + // use all the capacator storage first + energyStored -= used; + + if (!capSupply.capBanks.isEmpty()) { + int capBankChange = 0; + if (energyStored < 0) { + // not enough so get the rest from the capacitor bank + capBankChange = energyStored; + energyStored = 0; + } else if (energyStored > 0) { + // push as much as we can back to the cap banks + capBankChange = Math.min(energyStored, capSupply.canFill); + energyStored -= capBankChange; + } + + if (capBankChange < 0) { + capSupply.remove(Math.abs(capBankChange)); + } else if (capBankChange > 0) { + capSupply.add(capBankChange); + } + + capSupply.balance(); + } + + distributeStorageToConduits(); + + trackerEndTick(); + + networkPowerTracker.tickEnd(energyStored); } - void calcToBalance(double targetRatio) { - if(capBank.isCreative()) { - toBalance = 0; - return; - } - - long targetAmount = (long) Math.floor(capBank.getMaxEnergyStoredL() * targetRatio); - long b = targetAmount - capBank.getEnergyStoredL(); - if(b < 0) { - toBalance = -canExtract; - } else { - toBalance = canFill; - } + private void trackerStartTick() { + if (!Config.detailedPowerTrackingEnabled) { + return; + } + for (IPowerConduit con : network.getConduits()) { + if (con.hasExternalConnections()) { + PowerTracker tracker = getOrCreateTracker(con); + tracker.tickStart(con.getEnergyStored()); + } + } } - } + private void trackerSend(IPowerConduit con, int sent, boolean fromBank) { + if (!fromBank) { + networkPowerTracker.powerSent(sent); + } + if (!Config.detailedPowerTrackingEnabled) { + return; + } + getOrCreateTracker(con).powerSent(sent); + } + private void trackerRecieve(IPowerConduit con, int recieved, boolean fromBank) { + if (!fromBank) { + networkPowerTracker.powerRecieved(recieved); + } + if (!Config.detailedPowerTrackingEnabled) { + return; + } + getOrCreateTracker(con).powerRecieved(recieved); + } + + private void trackerEndTick() { + if (!Config.detailedPowerTrackingEnabled) { + return; + } + for (IPowerConduit con : network.getConduits()) { + if (con.hasExternalConnections()) { + PowerTracker tracker = getOrCreateTracker(con); + tracker.tickEnd(con.getEnergyStored()); + } + } + } + + private PowerTracker getOrCreateTracker(IPowerConduit con) { + PowerTracker result = powerTrackers.get(con); + if (result == null) { + result = new PowerTracker(); + powerTrackers.put(con, result); + } + return result; + } + + private void distributeStorageToConduits() { + if (maxEnergyStored <= 0 || energyStored <= 0) { + for (IPowerConduit con : network.getConduits()) { + con.setEnergyStored(0); + } + return; + } + energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); + + float filledRatio = (float) energyStored / maxEnergyStored; + int energyLeft = energyStored; + int given = 0; + for (IPowerConduit con : network.getConduits()) { + if (energyLeft > 0) { + // NB: use ceil to ensure we dont through away any energy due to + // rounding + // errors + int give = (int) Math.ceil(con.getMaxEnergyStored() * filledRatio); + give = Math.min(give, con.getMaxEnergyStored()); + give = Math.min(give, energyLeft); + con.setEnergyStored(give); + given += give; + energyLeft -= give; + } else { + con.setEnergyStored(0); + } + } + } + + boolean isActive() { + return energyStored > 0; + } + + private void updateNetorkStorage() { + maxEnergyStored = 0; + energyStored = 0; + for (IPowerConduit con : network.getConduits()) { + maxEnergyStored += con.getMaxEnergyStored(); + con.onTick(); + energyStored += con.getEnergyStored(); + } + energyStored = MathHelper.clamp_int(energyStored, 0, maxEnergyStored); + } + + public void receptorsChanged() { + receptorsDirty = true; + } + + private void checkReceptors() { + if (!receptorsDirty) { + return; + } + receptors.clear(); + storageReceptors.clear(); + for (ReceptorEntry rec : network.getPowerReceptors()) { + if (rec.powerInterface.getDelegate() != null && rec.powerInterface.getDelegate() instanceof IPowerStorage) { + storageReceptors.add(rec); + } else { + receptors.add(rec); + } + } + receptorIterator = receptors.listIterator(); + + receptorsDirty = false; + } + + void onNetworkDestroyed() {} + + private static class StarveBuffer { + + int stored; + + public StarveBuffer(int stored) { + this.stored = stored; + } + + void addToStore(float val) { + stored += val; + } + } + + private int minAbs(int amount, int limit) { + if (amount < 0) { + return Math.max(amount, -limit); + } else { + return Math.min(amount, limit); + } + } + + private class CapBankSupply { + + int canExtract; + int canFill; + Set capBanks = new HashSet(); + + double filledRatio; + long stored = 0; + long maxCap = 0; + + List enteries = new ArrayList(); + + CapBankSupply() {} + + void init() { + capBanks.clear(); + enteries.clear(); + canExtract = 0; + canFill = 0; + stored = 0; + maxCap = 0; + + double toBalance = 0; + double maxToBalance = 0; + + for (ReceptorEntry rec : storageReceptors) { + IPowerStorage cb = (IPowerStorage) rec.powerInterface.getDelegate(); + + boolean processed = capBanks.contains(cb.getController()); + + if (!processed) { + stored += cb.getEnergyStoredL(); + maxCap += cb.getMaxEnergyStoredL(); + capBanks.add(cb.getController()); + } + + if (rec.emmiter.getConnectionMode(rec.direction) == ConnectionMode.IN_OUT) { + toBalance += cb.getEnergyStoredL(); + maxToBalance += cb.getMaxEnergyStoredL(); + } + + long canGet = 0; + long canFill = 0; + if (cb.isNetworkControlledIo(rec.direction.getOpposite())) { + if (cb.isOutputEnabled(rec.direction.getOpposite())) { + canGet = Math.min(cb.getEnergyStoredL(), cb.getMaxOutput()); + canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); + canExtract += canGet; + } + + if (cb.isInputEnabled(rec.direction.getOpposite())) { + canFill = Math.min(cb.getMaxEnergyStoredL() - cb.getEnergyStoredL(), cb.getMaxInput()); + canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); + this.canFill += canFill; + } + enteries.add(new CapBankSupplyEntry(cb, (int) canGet, (int) canFill, rec.emmiter, rec.direction)); + } + } + + filledRatio = 0; + if (maxToBalance > 0) { + filledRatio = toBalance / maxToBalance; + } + } + + void balance() { + if (enteries.size() < 2) { + return; + } + init(); + int canRemove = 0; + int canAdd = 0; + for (CapBankSupplyEntry entry : enteries) { + if (entry.emmiter.getConnectionMode(entry.direction) == ConnectionMode.IN_OUT) { + entry.calcToBalance(filledRatio); + if (entry.toBalance < 0) { + canRemove += -entry.toBalance; + } else { + canAdd += entry.toBalance; + } + } + } + + int toalTransferAmount = Math.min(canAdd, canRemove); + + for (int i = 0; i < enteries.size() && toalTransferAmount > 0; i++) { + CapBankSupplyEntry from = enteries.get(i); + if (from.emmiter.getConnectionMode(from.direction) == ConnectionMode.IN_OUT) { + + int amount = from.toBalance; + amount = minAbs(amount, toalTransferAmount); + from.capBank.addEnergy(amount); + toalTransferAmount -= Math.abs(amount); + int toTranfser = Math.abs(amount); + + for (int j = i + 1; j < enteries.size() && toTranfser > 0; j++) { + CapBankSupplyEntry to = enteries.get(j); + if (Math.signum(amount) != Math.signum(to.toBalance)) { + int toAmount = Math.min(toTranfser, Math.abs(to.toBalance)); + to.capBank.addEnergy(toAmount * (int) Math.signum(to.toBalance)); + toTranfser -= toAmount; + } + } + } + } + } + + void remove(int amount) { + if (canExtract <= 0 || amount <= 0) { + return; + } + double ratio = (double) amount / canExtract; + + for (CapBankSupplyEntry entry : enteries) { + long use = (int) Math.ceil(ratio * entry.canExtract); + use = Math.min(use, amount); + use = Math.min(use, entry.canExtract); + entry.capBank.addEnergy((int) -use); + trackerRecieve(entry.emmiter, (int) use, true); + amount -= use; + if (amount == 0) { + return; + } + } + } + + void add(int amount) { + if (canFill <= 0 || amount <= 0) { + return; + } + double ratio = (double) amount / canFill; + + for (CapBankSupplyEntry entry : enteries) { + long add = (int) Math.ceil(ratio * entry.canFill); + add = Math.min(add, entry.canFill); + add = Math.min(add, amount); + entry.capBank.addEnergy((int) add); + trackerSend(entry.emmiter, (int) add, true); + amount -= add; + if (amount == 0) { + return; + } + } + } + } + + private static class CapBankSupplyEntry { + + final IPowerStorage capBank; + final int canExtract; + final int canFill; + int toBalance; + IPowerConduit emmiter; + ForgeDirection direction; + + private CapBankSupplyEntry( + IPowerStorage capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { + this.capBank = capBank; + canExtract = available; + this.canFill = canFill; + this.emmiter = emmiter; + this.direction = direction; + } + + void calcToBalance(double targetRatio) { + if (capBank.isCreative()) { + toBalance = 0; + return; + } + + long targetAmount = (long) Math.floor(capBank.getMaxEnergyStoredL() * targetRatio); + long b = targetAmount - capBank.getEnergyStoredL(); + if (b < 0) { + toBalance = -canExtract; + } else { + toBalance = canFill; + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 1729d5c3..9b3090e1 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -1,29 +1,9 @@ package crazypants.enderio.conduit.power; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -43,502 +23,529 @@ import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class PowerConduit extends AbstractConduit implements IPowerConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - private static ICapacitor[] capacitors; + private static ICapacitor[] capacitors; - static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender"}; + static final String[] POSTFIX = new String[] {"", "Enhanced", "Ender"}; - static ICapacitor[] getCapacitors() { - if(capacitors == null) { - capacitors = new BasicCapacitor[] { - new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), - new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), - new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF), - }; - } - return capacitors; - } - - static ItemStack createItemStackForSubtype(int subtype) { - ItemStack result = new ItemStack(EnderIO.itemPowerConduit, 1, subtype); - return result; - } - - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - for (String pf : POSTFIX) { - ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); - ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); - ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); - ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + static ICapacitor[] getCapacitors() { + if (capacitors == null) { + capacitors = new BasicCapacitor[] { + new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), + new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), + new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF), + }; } - ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); - } + return capacitors; + } - @Override - public int getTextureType() { - return 0; - } + static ItemStack createItemStackForSubtype(int subtype) { + ItemStack result = new ItemStack(EnderIO.itemPowerConduit, 1, subtype); + return result; + } - }); - } + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - public static final float WIDTH = 0.075f; - public static final float HEIGHT = 0.075f; - - public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); - public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); - - public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); - - protected PowerConduitNetwork network; - - private int energyStoredRF; - - private int subtype; - - protected final EnumMap rsModes = new EnumMap(ForgeDirection.class); - protected final EnumMap rsColors = new EnumMap(ForgeDirection.class); - - protected EnumMap recievedTicks; - - private final Map externalRedstoneSignals = new HashMap(); - - private boolean redstoneStateDirty = true; - - public PowerConduit() { - } - - public PowerConduit(int meta) { - this.subtype = meta; - } - - @Override - public boolean getConnectionsDirty() { - return connectionsDirty; - } - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); - if(ConduitUtil.isProbeEquipped(player)) { - if(!player.worldObj.isRemote) { - new PacketConduitProbe().sendInfoMessage(player, this); - } - return true; - } else if(col != null && res.component != null && isColorBandRendered(res.component.dir)) { - setExtractionSignalColor(res.component.dir, col); - return true; - } else if(ToolUtil.isToolEquipped(player)) { - if(!getBundle().getEntity().getWorldObj().isRemote) { - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; + @Override + public void registerIcons(IIconRegister register) { + for (String pf : POSTFIX) { + ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); + ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); + ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + } + ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + public static final float WIDTH = 0.075f; + public static final float HEIGHT = 0.075f; + + public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); + public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); + + public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); + + protected PowerConduitNetwork network; + + private int energyStoredRF; + + private int subtype; + + protected final EnumMap rsModes = + new EnumMap(ForgeDirection.class); + protected final EnumMap rsColors = + new EnumMap(ForgeDirection.class); + + protected EnumMap recievedTicks; + + private final Map externalRedstoneSignals = new HashMap(); + + private boolean redstoneStateDirty = true; + + public PowerConduit() {} + + public PowerConduit(int meta) { + this.subtype = meta; + } + + @Override + public boolean getConnectionsDirty() { + return connectionsDirty; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if (ConduitUtil.isProbeEquipped(player)) { + if (!player.worldObj.isRemote) { + new PacketConduitProbe().sendInfoMessage(player, this); } - // Attempt to join networks - return ConduitUtil.joinConduits(this, faceHit); - } else if(externalConnections.contains(connDir)) { - setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; - } else if(containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); + } else if (col != null && res.component != null && isColorBandRendered(res.component.dir)) { + setExtractionSignalColor(res.component.dir, col); return true; - } + } else if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + // Attempt to join networks + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + return true; + } + } + } } - } - } - return false; - } - - private boolean isColorBandRendered(ForgeDirection dir) { - return getConnectionMode(dir) != ConnectionMode.DISABLED && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE; - } - - @Override - public ICapacitor getCapacitor() { - return getCapacitors()[subtype]; - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - rsModes.put(dir, mode); - setClientStateDirty(); - } - - @Override - public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { - RedstoneControlMode res = rsModes.get(dir); - if(res == null) { - res = RedstoneControlMode.IGNORE; - } - return res; - } - - @Override - public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { - rsColors.put(dir, col); - setClientStateDirty(); - } - - @Override - public DyeColor getExtractionSignalColor(ForgeDirection dir) { - DyeColor res = rsColors.get(dir); - if(res == null) { - res = DyeColor.RED; - } - return res; - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); - setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); - dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setShort("subtype", (short) subtype); - nbtRoot.setInteger("energyStoredRF", energyStoredRF); - - for (Entry entry : rsModes.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord); - } + return false; } - for (Entry entry : rsColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord); - } + private boolean isColorBandRendered(ForgeDirection dir) { + return getConnectionMode(dir) != ConnectionMode.DISABLED + && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE; } - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - subtype = nbtRoot.getShort("subtype"); - - if(nbtRoot.hasKey("energyStored")) { - nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); + @Override + public ICapacitor getCapacitor() { + return getCapacitors()[subtype]; } - setEnergyStored(nbtRoot.getInteger("energyStoredRF")); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "pRsMode." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < RedstoneControlMode.values().length) { - rsModes.put(dir, RedstoneControlMode.values()[ord]); + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + rsModes.put(dir, mode); + setClientStateDirty(); + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = rsModes.get(dir); + if (res == null) { + res = RedstoneControlMode.IGNORE; } - } - key = "pRsCol." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - rsColors.put(dir, DyeColor.values()[ord]); + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + rsColors.put(dir, col); + setClientStateDirty(); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor res = rsColors.get(dir); + if (res == null) { + res = DyeColor.RED; } - } - } - } - - @Override - public void onTick() { - } - - @Override - public int getEnergyStored() { - return energyStoredRF; - } - - @Override - public void setEnergyStored(int energyStored) { - energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); - } - - - private boolean isRedstoneEnabled(ForgeDirection dir) { - boolean result; - RedstoneControlMode mode = getExtractionRedstoneMode(dir); - if(mode == RedstoneControlMode.NEVER) { - return false; - } - if(mode == RedstoneControlMode.IGNORE) { - return true; + return res; } - DyeColor col = getExtractionSignalColor(dir); - int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - int exSig = getExternalRedstoneSignalForDir(dir); - boolean res; - if(mode == RedstoneControlMode.OFF) { - //if checking for no signal, must be no signal from both - res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); - } else { - //if checking for a signal, either is fine - res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); - } - return res; - } - - private int getExternalRedstoneSignalForDir(ForgeDirection dir) { - if(redstoneStateDirty) { - externalRedstoneSignals.clear(); - redstoneStateDirty = false; - } - Integer cached = externalRedstoneSignals.get(dir); - int result; - if(cached == null) { - TileEntity te = getBundle().getEntity(); - result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); - externalRedstoneSignals.put(dir, result); - } else { - result = cached; - } - return result; - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - if(mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { - return 0; - } - return getCapacitor().getMaxEnergyReceived(); - } - - @Override - public int getMaxEnergyExtracted(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - if(mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { - return 0; - } - if(recievedRfThisTick(dir)) { - return 0; - } - return getCapacitor().getMaxEnergyExtracted(); - } - - private boolean recievedRfThisTick(ForgeDirection dir) { - if(recievedTicks == null || dir == null || recievedTicks.get(dir) == null || getBundle() == null || getBundle().getWorld() == null) { - return false; + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); } - long curTick = getBundle().getWorld().getTotalWorldTime(); - long recT = recievedTicks.get(dir); - if(curTick - recT <= 5) { - return true; + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort( + "extractionSignalColor", (short) getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort( + "extractionRedstoneMode", (short) getExtractionRedstoneMode(dir).ordinal()); } - return false; - } - @Override - public boolean onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - if(network != null && network.powerManager != null) { - network.powerManager.receptorsChanged(); - } - return super.onNeighborBlockChange(blockId); - } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("subtype", (short) subtype); + nbtRoot.setInteger("energyStoredRF", energyStoredRF); - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - recievedTicks = null; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { - return 0; - } - int freeSpace = getMaxEnergyStored() - getEnergyStored(); - int result = (int) Math.min(maxReceive, freeSpace); - if(!simulate && result > 0) { - setEnergyStored(getEnergyStored() + result); - - if(getBundle() != null) { - if(recievedTicks == null) { - recievedTicks = new EnumMap(ForgeDirection.class); + for (Entry entry : rsModes.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord); + } } - recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); - } - } - return result; - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return true; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - this.network = (PowerConduitNetwork) network; - return true; - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - IPowerInterface rec = getExternalPowerReceptor(direction); - - return rec != null && rec.canConduitConnect(direction); - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - boolean res = super.canConnectToConduit(direction, conduit); - if(!res) { - return false; - } - if(Config.powerConduitCanDifferentTiersConnect) { - return res; - } - if( !(conduit instanceof IPowerConduit)) { - return false; - } - IPowerConduit pc = (IPowerConduit)conduit; - return pc.getMaxEnergyStored() == getMaxEnergyStored(); - } - - @Override - public void externalConnectionAdded(ForgeDirection direction) { - super.externalConnectionAdded(direction); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.powerReceptorAdded(this, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, - getExternalPowerReceptor(direction)); - } - } - - @Override - public void externalConnectionRemoved(ForgeDirection direction) { - super.externalConnectionRemoved(direction); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.powerReceptorRemoved(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); - } - } - - @Override - public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) { - TileEntity te = bundle.getEntity(); - World world = te.getWorldObj(); - if(world == null) { - return null; - } - TileEntity test = world.getTileEntity(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); - if(test == null) { - return null; - } - if(test instanceof IConduitBundle) { - return null; - } - return PowerHandlerUtil.create(test); - } - - @Override - public ItemStack createItem() { - return createItemStackForSubtype(subtype); - } - - @Override - public Class getBaseConduitType() { - return IPowerConduit.class; - } - - // Rendering - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); - } - if(COLOR_CONTROLLER_ID.equals(component.data)) { - return IconUtil.whiteTexture; - } - return ICONS.get(ICON_KEY + POSTFIX[subtype]); - } - - @Override - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_KEY_INPUT); - } - - @Override - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_KEY_OUTPUT); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - @Override - public Collection createCollidables(CacheKey key) { - Collection baseCollidables = super.createCollidables(key); - if(key.dir == ForgeDirection.UNKNOWN) { - return baseCollidables; + for (Entry entry : rsColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord); + } + } } - BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); - CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + subtype = nbtRoot.getShort("subtype"); - List result = new ArrayList(); - result.addAll(baseCollidables); - result.add(cc); + if (nbtRoot.hasKey("energyStored")) { + nbtRoot.setInteger("energyStoredRF", (int) (nbtRoot.getFloat("energyStored") * 10)); + } + setEnergyStored(nbtRoot.getInteger("energyStoredRF")); - return result; - } + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "pRsMode." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < RedstoneControlMode.values().length) { + rsModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "pRsCol." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + rsColors.put(dir, DyeColor.values()[ord]); + } + } + } + } - @Override - public int getMaxEnergyStored() { - return getCapacitors()[subtype].getMaxEnergyStored(); - } + @Override + public void onTick() {} - @Override - public boolean displayPower() { - return true; - } + @Override + public int getEnergyStored() { + return energyStoredRF; + } + + @Override + public void setEnergyStored(int energyStored) { + energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); + } + + private boolean isRedstoneEnabled(ForgeDirection dir) { + boolean result; + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if (mode == RedstoneControlMode.NEVER) { + return false; + } + if (mode == RedstoneControlMode.IGNORE) { + return true; + } + + DyeColor col = getExtractionSignalColor(dir); + int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); + int exSig = getExternalRedstoneSignalForDir(dir); + boolean res; + if (mode == RedstoneControlMode.OFF) { + // if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); + } else { + // if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); + } + return res; + } + + private int getExternalRedstoneSignalForDir(ForgeDirection dir) { + if (redstoneStateDirty) { + externalRedstoneSignals.clear(); + redstoneStateDirty = false; + } + Integer cached = externalRedstoneSignals.get(dir); + int result; + if (cached == null) { + TileEntity te = getBundle().getEntity(); + result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); + externalRedstoneSignals.put(dir, result); + } else { + result = cached; + } + return result; + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if (mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); + } + + @Override + public int getMaxEnergyExtracted(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if (mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + if (recievedRfThisTick(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyExtracted(); + } + + private boolean recievedRfThisTick(ForgeDirection dir) { + if (recievedTicks == null + || dir == null + || recievedTicks.get(dir) == null + || getBundle() == null + || getBundle().getWorld() == null) { + return false; + } + + long curTick = getBundle().getWorld().getTotalWorldTime(); + long recT = recievedTicks.get(dir); + if (curTick - recT <= 5) { + return true; + } + return false; + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + if (network != null && network.powerManager != null) { + network.powerManager.receptorsChanged(); + } + return super.onNeighborBlockChange(blockId); + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + recievedTicks = null; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { + return 0; + } + int freeSpace = getMaxEnergyStored() - getEnergyStored(); + int result = (int) Math.min(maxReceive, freeSpace); + if (!simulate && result > 0) { + setEnergyStored(getEnergyStored() + result); + + if (getBundle() != null) { + if (recievedTicks == null) { + recievedTicks = new EnumMap(ForgeDirection.class); + } + recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); + } + } + return result; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (PowerConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IPowerInterface rec = getExternalPowerReceptor(direction); + + return rec != null && rec.canConduitConnect(direction); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + boolean res = super.canConnectToConduit(direction, conduit); + if (!res) { + return false; + } + if (Config.powerConduitCanDifferentTiersConnect) { + return res; + } + if (!(conduit instanceof IPowerConduit)) { + return false; + } + IPowerConduit pc = (IPowerConduit) conduit; + return pc.getMaxEnergyStored() == getMaxEnergyStored(); + } + + @Override + public void externalConnectionAdded(ForgeDirection direction) { + super.externalConnectionAdded(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorAdded( + this, + direction, + te.xCoord + direction.offsetX, + te.yCoord + direction.offsetY, + te.zCoord + direction.offsetZ, + getExternalPowerReceptor(direction)); + } + } + + @Override + public void externalConnectionRemoved(ForgeDirection direction) { + super.externalConnectionRemoved(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorRemoved( + te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + } + } + + @Override + public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) { + TileEntity te = bundle.getEntity(); + World world = te.getWorldObj(); + if (world == null) { + return null; + } + TileEntity test = world.getTileEntity( + te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + if (test == null) { + return null; + } + if (test instanceof IConduitBundle) { + return null; + } + return PowerHandlerUtil.create(test); + } + + @Override + public ItemStack createItem() { + return createItemStackForSubtype(subtype); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + // Rendering + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); + } + if (COLOR_CONTROLLER_ID.equals(component.data)) { + return IconUtil.whiteTexture; + } + return ICONS.get(ICON_KEY + POSTFIX[subtype]); + } + + @Override + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_KEY_INPUT); + } + + @Override + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_KEY_OUTPUT); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if (key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; + } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; + } + + @Override + public int getMaxEnergyStored() { + return getCapacitors()[subtype].getMaxEnergyStored(); + } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java index 1c73ba98..c6c5cf9f 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java @@ -1,171 +1,168 @@ package crazypants.enderio.conduit.power; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.power.IPowerInterface; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.power.IPowerInterface; - public class PowerConduitNetwork extends AbstractConduitNetwork { - // ---------------------------------------------------------------------- + // ---------------------------------------------------------------------- - public NetworkPowerManager powerManager; + public NetworkPowerManager powerManager; - private final Map powerReceptors = new HashMap(); + private final Map powerReceptors = new HashMap(); - public PowerConduitNetwork() { - super(IPowerConduit.class, IPowerConduit.class); - } - - @Override - public void init(IConduitBundle tile, Collection connections, World world) { - super.init(tile, connections, world); - powerManager = new NetworkPowerManager(this, world); - powerManager.receptorsChanged(); - } - - @Override - public void destroyNetwork() { - for (IPowerConduit con : conduits) { - con.setActive(false); - } - if(powerManager != null) { - powerManager.onNetworkDestroyed(); - } - super.destroyNetwork(); - } - - public NetworkPowerManager getPowerManager() { - return powerManager; - } - - @Override - public void addConduit(IPowerConduit con) { - super.addConduit(con); - Set externalDirs = con.getExternalConnections(); - for (ForgeDirection dir : externalDirs) { - IPowerInterface pr = con.getExternalPowerReceptor(dir); - if(pr != null) { - TileEntity te = con.getBundle().getEntity(); - powerReceptorAdded(con, dir, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, pr); - } - } - if(powerManager != null) { - con.setActive(powerManager.isActive()); - } - } - - public void powerReceptorAdded(IPowerConduit powerConduit, ForgeDirection direction, int x, int y, int z, IPowerInterface powerReceptor) { - if(powerReceptor == null) { - return; - } - BlockCoord location = new BlockCoord(x, y, z); - ReceptorKey key = new ReceptorKey(location, direction); - ReceptorEntry re = powerReceptors.get(key); - if(re == null) { - re = new ReceptorEntry(powerReceptor, location, powerConduit, direction); - powerReceptors.put(key, re); - } - if(powerManager != null) { - powerManager.receptorsChanged(); - } - } - - public void powerReceptorRemoved(int x, int y, int z) { - BlockCoord bc = new BlockCoord(x, y, z); - List remove = new ArrayList(); - for (ReceptorKey key : powerReceptors.keySet()) { - if(key != null && key.coord.equals(bc)) { - remove.add(key); - } - } - for (ReceptorKey key : remove) { - powerReceptors.remove(key); - } - powerManager.receptorsChanged(); - } - - public Collection getPowerReceptors() { - return powerReceptors.values(); - } - - @Override - public void doNetworkTick() { - powerManager.applyRecievedPower(); - } - - public static class ReceptorEntry { - - IPowerConduit emmiter; - BlockCoord coord; - ForgeDirection direction; - - IPowerInterface powerInterface; - - public ReceptorEntry(IPowerInterface powerReceptor, BlockCoord coord, IPowerConduit emmiter, ForgeDirection direction) { - powerInterface = powerReceptor; - this.coord = coord; - this.emmiter = emmiter; - this.direction = direction; - } - - } - - private static class ReceptorKey { - BlockCoord coord; - ForgeDirection direction; - - ReceptorKey(BlockCoord coord, ForgeDirection direction) { - this.coord = coord; - this.direction = direction; + public PowerConduitNetwork() { + super(IPowerConduit.class, IPowerConduit.class); } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((coord == null) ? 0 : coord.hashCode()); - result = prime * result + ((direction == null) ? 0 : direction.hashCode()); - return result; + public void init(IConduitBundle tile, Collection connections, World world) { + super.init(tile, connections, world); + powerManager = new NetworkPowerManager(this, world); + powerManager.receptorsChanged(); } @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - ReceptorKey other = (ReceptorKey) obj; - if(coord == null) { - if(other.coord != null) { - return false; + public void destroyNetwork() { + for (IPowerConduit con : conduits) { + con.setActive(false); } - } else if(!coord.equals(other.coord)) { - return false; - } - if(direction != other.direction) { - return false; - } - return true; + if (powerManager != null) { + powerManager.onNetworkDestroyed(); + } + super.destroyNetwork(); } - } + public NetworkPowerManager getPowerManager() { + return powerManager; + } + @Override + public void addConduit(IPowerConduit con) { + super.addConduit(con); + Set externalDirs = con.getExternalConnections(); + for (ForgeDirection dir : externalDirs) { + IPowerInterface pr = con.getExternalPowerReceptor(dir); + if (pr != null) { + TileEntity te = con.getBundle().getEntity(); + powerReceptorAdded( + con, dir, te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, pr); + } + } + if (powerManager != null) { + con.setActive(powerManager.isActive()); + } + } + + public void powerReceptorAdded( + IPowerConduit powerConduit, ForgeDirection direction, int x, int y, int z, IPowerInterface powerReceptor) { + if (powerReceptor == null) { + return; + } + BlockCoord location = new BlockCoord(x, y, z); + ReceptorKey key = new ReceptorKey(location, direction); + ReceptorEntry re = powerReceptors.get(key); + if (re == null) { + re = new ReceptorEntry(powerReceptor, location, powerConduit, direction); + powerReceptors.put(key, re); + } + if (powerManager != null) { + powerManager.receptorsChanged(); + } + } + + public void powerReceptorRemoved(int x, int y, int z) { + BlockCoord bc = new BlockCoord(x, y, z); + List remove = new ArrayList(); + for (ReceptorKey key : powerReceptors.keySet()) { + if (key != null && key.coord.equals(bc)) { + remove.add(key); + } + } + for (ReceptorKey key : remove) { + powerReceptors.remove(key); + } + powerManager.receptorsChanged(); + } + + public Collection getPowerReceptors() { + return powerReceptors.values(); + } + + @Override + public void doNetworkTick() { + powerManager.applyRecievedPower(); + } + + public static class ReceptorEntry { + + IPowerConduit emmiter; + BlockCoord coord; + ForgeDirection direction; + + IPowerInterface powerInterface; + + public ReceptorEntry( + IPowerInterface powerReceptor, BlockCoord coord, IPowerConduit emmiter, ForgeDirection direction) { + powerInterface = powerReceptor; + this.coord = coord; + this.emmiter = emmiter; + this.direction = direction; + } + } + + private static class ReceptorKey { + BlockCoord coord; + ForgeDirection direction; + + ReceptorKey(BlockCoord coord, ForgeDirection direction) { + this.coord = coord; + this.direction = direction; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((coord == null) ? 0 : coord.hashCode()); + result = prime * result + ((direction == null) ? 0 : direction.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + ReceptorKey other = (ReceptorKey) obj; + if (coord == null) { + if (other.coord != null) { + return false; + } + } else if (!coord.equals(other.coord)) { + return false; + } + if (direction != other.direction) { + return false; + } + return true; + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java index 7be0b6c0..5f755b53 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitRenderer.java @@ -1,15 +1,9 @@ package crazypants.enderio.conduit.power; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -19,60 +13,74 @@ import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; import crazypants.enderio.machine.RedstoneControlMode; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class PowerConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit instanceof IPowerConduit; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - - if(!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { - return; - } - IPowerConduit pc = (IPowerConduit) conduit; - for (ForgeDirection dir : conduit.getExternalConnections()) { - IIcon tex = null; - if(conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { - tex = pc.getTextureForInputMode(); - } else if(conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { - tex = pc.getTextureForOutputMode(); - } - if(tex != null) { - Offset offset = te.getOffset(IPowerConduit.class, dir); - ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); - } + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof IPowerConduit; } - } + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + super.renderEntity(conduitBundleRenderer, te, conduit, x, y, z, partialTick, worldLight, rb); - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { - if(IPowerConduit.COLOR_CONTROLLER_ID.equals(component.data)) { - IPowerConduit pc = (IPowerConduit) conduit; - ConnectionMode conMode = pc.getConnectionMode(component.dir); - if(conduit.containsExternalConnection(component.dir) && pc.getExtractionRedstoneMode(component.dir) != RedstoneControlMode.IGNORE - && conMode != ConnectionMode.DISABLED) { - int c = ((IPowerConduit) conduit).getExtractionSignalColor(component.dir).getColor(); - Tessellator tessellator = Tessellator.instance; - tessellator.setColorOpaque_I(c); - - Offset offset = conduit.getBundle().getOffset(IPowerConduit.class, component.dir); - BoundingBox bound = component.bound; - if(conMode != ConnectionMode.IN_OUT) { - Vector3d trans = ForgeDirectionOffsets.offsetScaled(component.dir, -0.075); - bound = bound.translate(trans); + if (!conduit.hasConnectionMode(ConnectionMode.INPUT) && !conduit.hasConnectionMode(ConnectionMode.OUTPUT)) { + return; + } + IPowerConduit pc = (IPowerConduit) conduit; + for (ForgeDirection dir : conduit.getExternalConnections()) { + IIcon tex = null; + if (conduit.getConnectionMode(dir) == ConnectionMode.INPUT) { + tex = pc.getTextureForInputMode(); + } else if (conduit.getConnectionMode(dir) == ConnectionMode.OUTPUT) { + tex = pc.getTextureForOutputMode(); + } + if (tex != null) { + Offset offset = te.getOffset(IPowerConduit.class, dir); + ConnectionModeGeometry.renderModeConnector(dir, offset, tex, true); + } + } + } + + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { + if (IPowerConduit.COLOR_CONTROLLER_ID.equals(component.data)) { + IPowerConduit pc = (IPowerConduit) conduit; + ConnectionMode conMode = pc.getConnectionMode(component.dir); + if (conduit.containsExternalConnection(component.dir) + && pc.getExtractionRedstoneMode(component.dir) != RedstoneControlMode.IGNORE + && conMode != ConnectionMode.DISABLED) { + int c = ((IPowerConduit) conduit) + .getExtractionSignalColor(component.dir) + .getColor(); + Tessellator tessellator = Tessellator.instance; + tessellator.setColorOpaque_I(c); + + Offset offset = conduit.getBundle().getOffset(IPowerConduit.class, component.dir); + BoundingBox bound = component.bound; + if (conMode != ConnectionMode.IN_OUT) { + Vector3d trans = ForgeDirectionOffsets.offsetScaled(component.dir, -0.075); + bound = bound.translate(trans); + } + CubeRenderer.render(bound, tex); + tessellator.setColorOpaque(255, 255, 255); + } + } else { + super.renderConduit(tex, conduit, component, selfIllum); } - CubeRenderer.render(bound, tex); - tessellator.setColorOpaque(255, 255, 255); - } - } else { - super.renderConduit(tex, conduit, component, selfIllum); } - } } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java index e039996c..2a13d8f7 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java @@ -2,51 +2,49 @@ package crazypants.enderio.conduit.power; import crazypants.enderio.power.PerTickIntAverageCalculator; - public class PowerTracker { - private long previousStorageLevel = -1; + private long previousStorageLevel = -1; - private final PerTickIntAverageCalculator recTracker = new PerTickIntAverageCalculator(); + private final PerTickIntAverageCalculator recTracker = new PerTickIntAverageCalculator(); - private final PerTickIntAverageCalculator sentTracker = new PerTickIntAverageCalculator(); + private final PerTickIntAverageCalculator sentTracker = new PerTickIntAverageCalculator(); - private int sentThisTick = 0; + private int sentThisTick = 0; - private int recievedThisTick = 0; + private int recievedThisTick = 0; - public void tickStart(long storedEnergy) { - long curStorage = storedEnergy; + public void tickStart(long storedEnergy) { + long curStorage = storedEnergy; - if(previousStorageLevel > -1) { - long recieved = curStorage - previousStorageLevel; - recieved = Math.max(0, recieved); - recievedThisTick += recieved; + if (previousStorageLevel > -1) { + long recieved = curStorage - previousStorageLevel; + recieved = Math.max(0, recieved); + recievedThisTick += recieved; + } } - } - public void powerRecieved(int power) { - recievedThisTick += power; - } + public void powerRecieved(int power) { + recievedThisTick += power; + } - public void powerSent(int power) { - sentThisTick += power; - } + public void powerSent(int power) { + sentThisTick += power; + } - public void tickEnd(long storedEnergy) { - previousStorageLevel = storedEnergy; - sentTracker.tick(sentThisTick); - recTracker.tick(recievedThisTick); - recievedThisTick = 0; - sentThisTick = 0; - } + public void tickEnd(long storedEnergy) { + previousStorageLevel = storedEnergy; + sentTracker.tick(sentThisTick); + recTracker.tick(recievedThisTick); + recievedThisTick = 0; + sentThisTick = 0; + } - public float getAverageRfTickRecieved() { - return recTracker.getAverage(); - } - - public float getAverageRfTickSent() { - return sentTracker.getAverage(); - } + public float getAverageRfTickRecieved() { + return recTracker.getAverage(); + } + public float getAverageRfTickSent() { + return sentTracker.getAverage(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java index c8e30d36..d5912fbb 100644 --- a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java @@ -1,75 +1,79 @@ package crazypants.enderio.conduit.power.endergy; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.ICapacitor; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemPowerConduitEndergy extends ItemPowerConduit { - private static String PREFIX; - private static String POSTFIX; + private static String PREFIX; + private static String POSTFIX; - static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crude", "enderio:itemPowerConduitCrude"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Iron", "enderio:itemPowerConduitIron"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Aluminum", "enderio:itemPowerConduitAluminum"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Gold", "enderio:itemPowerConduitGold"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Copper", "enderio:itemPowerConduitCopper"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Silver", "enderio:itemPowerConduitSilver"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Electrum", "enderio:itemPowerConduitElectrum"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "EnergeticSilver", "enderio:itemPowerConduitEnergeticSilver"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crystalline", "enderio:itemPowerConduitCrystalline"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "CrystallinePinkSlime", "enderio:itemPowerConduitCrystallinePinkSlime"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Melodic", "enderio:itemPowerConduitMelodic"), - new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Stellar", "enderio:itemPowerConduitStellar"), + static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crude", "enderio:itemPowerConduitCrude"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Iron", "enderio:itemPowerConduitIron"), + new ItemConduitSubtype( + ModObject.itemPowerConduitEndergy.name() + "Aluminum", "enderio:itemPowerConduitAluminum"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Gold", "enderio:itemPowerConduitGold"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Copper", "enderio:itemPowerConduitCopper"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Silver", "enderio:itemPowerConduitSilver"), + new ItemConduitSubtype( + ModObject.itemPowerConduitEndergy.name() + "Electrum", "enderio:itemPowerConduitElectrum"), + new ItemConduitSubtype( + ModObject.itemPowerConduitEndergy.name() + "EnergeticSilver", + "enderio:itemPowerConduitEnergeticSilver"), + new ItemConduitSubtype( + ModObject.itemPowerConduitEndergy.name() + "Crystalline", "enderio:itemPowerConduitCrystalline"), + new ItemConduitSubtype( + ModObject.itemPowerConduitEndergy.name() + "CrystallinePinkSlime", + "enderio:itemPowerConduitCrystallinePinkSlime"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Melodic", "enderio:itemPowerConduitMelodic"), + new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Stellar", "enderio:itemPowerConduitStellar"), + }; - }; - - public static ItemPowerConduitEndergy create() { - ItemPowerConduitEndergy result = new ItemPowerConduitEndergy(); - result.init(); - return result; - } - - protected ItemPowerConduitEndergy() { - super(ModObject.itemPowerConduitEndergy, subtypes); - } - - @Override - public Class getBaseConduitType() { - return IPowerConduit.class; - } - - @Override - public IConduit createConduit(ItemStack stack, EntityPlayer player) { - return new PowerConduitEndergy(stack.getItemDamage()); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - if(PREFIX == null) { - POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; + public static ItemPowerConduitEndergy create() { + ItemPowerConduitEndergy result = new ItemPowerConduitEndergy(); + result.init(); + return result; } - ICapacitor cap = PowerConduitEndergy.getCapacitors()[itemStack.getItemDamage()]; - list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); - } - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + protected ItemPowerConduitEndergy() { + super(ModObject.itemPowerConduitEndergy, subtypes); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + return new PowerConduitEndergy(stack.getItemDamage()); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + if (PREFIX == null) { + POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; + } + ICapacitor cap = PowerConduitEndergy.getCapacitors()[itemStack.getItemDamage()]; + list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java index c7c5a67a..96c6615d 100644 --- a/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java @@ -1,31 +1,12 @@ package crazypants.enderio.conduit.power.endergy; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; +import static crazypants.enderio.config.Config.powerConduitEndergyTiers; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -46,514 +27,551 @@ import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; - -import static crazypants.enderio.config.Config.powerConduitEndergyTiers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class PowerConduitEndergy extends PowerConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - private static ICapacitor[] capacitors; + private static ICapacitor[] capacitors; - static final String[] POSTFIX = new String[] { "Crude", "Iron", "Aluminum", "Gold", "Copper", "Silver", "Electrum", "EnergeticSilver", "Crystalline", "CrystallinePinkSlime", "Melodic", "Stellar"}; + static final String[] POSTFIX = new String[] { + "Crude", + "Iron", + "Aluminum", + "Gold", + "Copper", + "Silver", + "Electrum", + "EnergeticSilver", + "Crystalline", + "CrystallinePinkSlime", + "Melodic", + "Stellar" + }; - static ICapacitor[] getCapacitors() { - if(capacitors == null) { - capacitors = new BasicCapacitor[] { - - new BasicCapacitor(powerConduitEndergyTiers[0]), - new BasicCapacitor(powerConduitEndergyTiers[1]), - new BasicCapacitor(powerConduitEndergyTiers[2]), - new BasicCapacitor(powerConduitEndergyTiers[3]), - new BasicCapacitor(powerConduitEndergyTiers[4]), - new BasicCapacitor(powerConduitEndergyTiers[5]), - new BasicCapacitor(powerConduitEndergyTiers[6]), - new BasicCapacitor(powerConduitEndergyTiers[7]), - new BasicCapacitor(powerConduitEndergyTiers[8]), - new BasicCapacitor(powerConduitEndergyTiers[9]), - new BasicCapacitor(powerConduitEndergyTiers[10]), - new BasicCapacitor(powerConduitEndergyTiers[11]) - }; - } - return capacitors; - } - - static ItemStack createItemStackForSubtype(int subtype) { - ItemStack result = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, subtype); - return result; - } - - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - for (String pf : POSTFIX) { - ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); - ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); - ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); - ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + static ICapacitor[] getCapacitors() { + if (capacitors == null) { + capacitors = new BasicCapacitor[] { + new BasicCapacitor(powerConduitEndergyTiers[0]), + new BasicCapacitor(powerConduitEndergyTiers[1]), + new BasicCapacitor(powerConduitEndergyTiers[2]), + new BasicCapacitor(powerConduitEndergyTiers[3]), + new BasicCapacitor(powerConduitEndergyTiers[4]), + new BasicCapacitor(powerConduitEndergyTiers[5]), + new BasicCapacitor(powerConduitEndergyTiers[6]), + new BasicCapacitor(powerConduitEndergyTiers[7]), + new BasicCapacitor(powerConduitEndergyTiers[8]), + new BasicCapacitor(powerConduitEndergyTiers[9]), + new BasicCapacitor(powerConduitEndergyTiers[10]), + new BasicCapacitor(powerConduitEndergyTiers[11]) + }; } - ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); - } + return capacitors; + } - @Override - public int getTextureType() { - return 0; - } + static ItemStack createItemStackForSubtype(int subtype) { + ItemStack result = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, subtype); + return result; + } - }); - } + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - public static final float WIDTH = 0.075f; - public static final float HEIGHT = 0.075f; - - public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); - public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); - - public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); - - protected PowerConduitNetwork network; - - private int energyStoredRF; - - private int subtype; - - protected final EnumMap rsModes = new EnumMap(ForgeDirection.class); - protected final EnumMap rsColors = new EnumMap(ForgeDirection.class); - - protected EnumMap recievedTicks; - - private final Map externalRedstoneSignals = new HashMap(); - - private boolean redstoneStateDirty = true; - - public PowerConduitEndergy() { - } - - public PowerConduitEndergy(int meta) { - this.subtype = meta; - } - - @Override - public boolean getConnectionsDirty() { - return connectionsDirty; - } - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); - if(ConduitUtil.isProbeEquipped(player)) { - if(!player.worldObj.isRemote) { - new PacketConduitProbe().sendInfoMessage(player, this); - } - return true; - } else if(col != null && res.component != null && isColorBandRendered(res.component.dir)) { - setExtractionSignalColor(res.component.dir, col); - return true; - } else if(ToolUtil.isToolEquipped(player)) { - if(!getBundle().getEntity().getWorldObj().isRemote) { - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); - return true; + @Override + public void registerIcons(IIconRegister register) { + for (String pf : POSTFIX) { + ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf)); + ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT)); + ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT)); + ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf)); + } + ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY)); + } + + @Override + public int getTextureType() { + return 0; + } + }); + } + + public static final float WIDTH = 0.075f; + public static final float HEIGHT = 0.075f; + + public static final Vector3d MIN = new Vector3d(0.5f - WIDTH, 0.5 - HEIGHT, 0.5 - WIDTH); + public static final Vector3d MAX = new Vector3d(MIN.x + WIDTH, MIN.y + HEIGHT, MIN.z + WIDTH); + + public static final BoundingBox BOUNDS = new BoundingBox(MIN, MAX); + + protected PowerConduitNetwork network; + + private int energyStoredRF; + + private int subtype; + + protected final EnumMap rsModes = + new EnumMap(ForgeDirection.class); + protected final EnumMap rsColors = + new EnumMap(ForgeDirection.class); + + protected EnumMap recievedTicks; + + private final Map externalRedstoneSignals = new HashMap(); + + private boolean redstoneStateDirty = true; + + public PowerConduitEndergy() {} + + public PowerConduitEndergy(int meta) { + this.subtype = meta; + } + + @Override + public boolean getConnectionsDirty() { + return connectionsDirty; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if (ConduitUtil.isProbeEquipped(player)) { + if (!player.worldObj.isRemote) { + new PacketConduitProbe().sendInfoMessage(player, this); } - // Attempt to join networks - return ConduitUtil.joinConduits(this, faceHit); - } else if(externalConnections.contains(connDir)) { - setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; - } else if(containsConduitConnection(connDir)) { - ConduitUtil.disconectConduits(this, connDir); + } else if (col != null && res.component != null && isColorBandRendered(res.component.dir)) { + setExtractionSignalColor(res.component.dir, col); return true; - } + } else if (ToolUtil.isToolEquipped(player)) { + if (!getBundle().getEntity().getWorldObj().isRemote) { + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + if (getConnectionMode(faceHit) == ConnectionMode.DISABLED) { + setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + return true; + } + // Attempt to join networks + return ConduitUtil.joinConduits(this, faceHit); + } else if (externalConnections.contains(connDir)) { + setConnectionMode(connDir, getNextConnectionMode(connDir)); + return true; + } else if (containsConduitConnection(connDir)) { + ConduitUtil.disconectConduits(this, connDir); + return true; + } + } + } } - } - } - return false; - } - - private boolean isColorBandRendered(ForgeDirection dir) { - return getConnectionMode(dir) != ConnectionMode.DISABLED && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE; - } - - @Override - public ICapacitor getCapacitor() { - return getCapacitors()[subtype]; - } - - @Override - public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { - rsModes.put(dir, mode); - setClientStateDirty(); - } - - @Override - public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { - RedstoneControlMode res = rsModes.get(dir); - if(res == null) { - res = RedstoneControlMode.IGNORE; - } - return res; - } - - @Override - public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { - rsColors.put(dir, col); - setClientStateDirty(); - } - - @Override - public DyeColor getExtractionSignalColor(ForgeDirection dir) { - DyeColor res = rsColors.get(dir); - if(res == null) { - res = DyeColor.RED; - } - return res; - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); - setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); - dataRoot.setShort("extractionRedstoneMode", (short)getExtractionRedstoneMode(dir).ordinal()); - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setShort("subtype", (short) subtype); - nbtRoot.setInteger("energyStoredRF", energyStoredRF); - - for (Entry entry : rsModes.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord); - } + return false; } - for (Entry entry : rsColors.entrySet()) { - if(entry.getValue() != null) { - short ord = (short) entry.getValue().ordinal(); - nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord); - } + private boolean isColorBandRendered(ForgeDirection dir) { + return getConnectionMode(dir) != ConnectionMode.DISABLED + && getExtractionRedstoneMode(dir) != RedstoneControlMode.IGNORE; } - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - subtype = nbtRoot.getShort("subtype"); - - if(nbtRoot.hasKey("energyStored")) { - nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); + @Override + public ICapacitor getCapacitor() { + return getCapacitors()[subtype]; } - setEnergyStored(nbtRoot.getInteger("energyStoredRF")); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "pRsMode." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < RedstoneControlMode.values().length) { - rsModes.put(dir, RedstoneControlMode.values()[ord]); + @Override + public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { + rsModes.put(dir, mode); + setClientStateDirty(); + } + + @Override + public RedstoneControlMode getExtractionRedstoneMode(ForgeDirection dir) { + RedstoneControlMode res = rsModes.get(dir); + if (res == null) { + res = RedstoneControlMode.IGNORE; } - } - key = "pRsCol." + dir.name(); - if(nbtRoot.hasKey(key)) { - short ord = nbtRoot.getShort(key); - if(ord >= 0 && ord < DyeColor.values().length) { - rsColors.put(dir, DyeColor.values()[ord]); + return res; + } + + @Override + public void setExtractionSignalColor(ForgeDirection dir, DyeColor col) { + rsColors.put(dir, col); + setClientStateDirty(); + } + + @Override + public DyeColor getExtractionSignalColor(ForgeDirection dir) { + DyeColor res = rsColors.get(dir); + if (res == null) { + res = DyeColor.RED; } - } - } - } - - @Override - public void onTick() { - } - - @Override - public int getEnergyStored() { - return energyStoredRF; - } - - @Override - public void setEnergyStored(int energyStored) { - energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); - } - - - private boolean isRedstoneEnabled(ForgeDirection dir) { - boolean result; - RedstoneControlMode mode = getExtractionRedstoneMode(dir); - if(mode == RedstoneControlMode.NEVER) { - return false; - } - if(mode == RedstoneControlMode.IGNORE) { - return true; + return res; } - DyeColor col = getExtractionSignalColor(dir); - int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - int exSig = getExternalRedstoneSignalForDir(dir); - boolean res; - if(mode == RedstoneControlMode.OFF) { - //if checking for no signal, must be no signal from both - res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); - } else { - //if checking for a signal, either is fine - res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); - } - return res; - } - - private int getExternalRedstoneSignalForDir(ForgeDirection dir) { - if(redstoneStateDirty) { - externalRedstoneSignals.clear(); - redstoneStateDirty = false; - } - Integer cached = externalRedstoneSignals.get(dir); - int result; - if(cached == null) { - TileEntity te = getBundle().getEntity(); - result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); - externalRedstoneSignals.put(dir, result); - } else { - result = cached; - } - return result; - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - if(mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { - return 0; - } - return getCapacitor().getMaxEnergyReceived(); - } - - @Override - public int getMaxEnergyExtracted(ForgeDirection dir) { - ConnectionMode mode = getConnectionMode(dir); - if(mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { - return 0; - } - if(recievedRfThisTick(dir)) { - return 0; - } - return getCapacitor().getMaxEnergyExtracted(); - } - - private boolean recievedRfThisTick(ForgeDirection dir) { - if(recievedTicks == null || dir == null || recievedTicks.get(dir) == null || getBundle() == null || getBundle().getWorld() == null) { - return false; + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); } - long curTick = getBundle().getWorld().getTotalWorldTime(); - long recT = recievedTicks.get(dir); - if(curTick - recT <= 5) { - return true; + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort( + "extractionSignalColor", (short) getExtractionSignalColor(dir).ordinal()); + dataRoot.setShort( + "extractionRedstoneMode", (short) getExtractionRedstoneMode(dir).ordinal()); } - return false; - } - @Override - public boolean onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - if(network != null && network.powerManager != null) { - network.powerManager.receptorsChanged(); - } - return super.onNeighborBlockChange(blockId); - } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setShort("subtype", (short) subtype); + nbtRoot.setInteger("energyStoredRF", energyStoredRF); - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - recievedTicks = null; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { - return 0; - } - int freeSpace = getMaxEnergyStored() - getEnergyStored(); - int result = (int) Math.min(maxReceive, freeSpace); - if(!simulate && result > 0) { - setEnergyStored(getEnergyStored() + result); - - if(getBundle() != null) { - if(recievedTicks == null) { - recievedTicks = new EnumMap(ForgeDirection.class); + for (Entry entry : rsModes.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsMode." + entry.getKey().name(), ord); + } } - recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); - } - } - return result; - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return true; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - this.network = (PowerConduitNetwork) network; - return true; - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - IPowerInterface rec = getExternalPowerReceptor(direction); - - return rec != null && rec.canConduitConnect(direction); - } - - @Override - public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - boolean res = super.canConnectToConduit(direction, conduit); - if(!res) { - return false; - } - if(Config.powerConduitCanDifferentTiersConnect) { - return res; - } - if( !(conduit instanceof IPowerConduit)) { - return false; - } - IPowerConduit pc = (IPowerConduit)conduit; - return pc.getMaxEnergyStored() == getMaxEnergyStored(); - } - - @Override - public void externalConnectionAdded(ForgeDirection direction) { - super.externalConnectionAdded(direction); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.powerReceptorAdded(this, direction, te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ, - getExternalPowerReceptor(direction)); - } - } - - @Override - public void externalConnectionRemoved(ForgeDirection direction) { - super.externalConnectionRemoved(direction); - if(network != null) { - TileEntity te = bundle.getEntity(); - network.powerReceptorRemoved(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); - } - } - - @Override - public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) { - TileEntity te = bundle.getEntity(); - World world = te.getWorldObj(); - if(world == null) { - return null; - } - TileEntity test = world.getTileEntity(te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); - if(test == null) { - return null; - } - if(test instanceof IConduitBundle) { - return null; - } - return PowerHandlerUtil.create(test); - } - - @Override - public ItemStack createItem() { - return createItemStackForSubtype(subtype); - } - - @Override - public Class getBaseConduitType() { - return IPowerConduit.class; - } - - // Rendering - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); - } - if(COLOR_CONTROLLER_ID.equals(component.data)) { - return IconUtil.whiteTexture; - } - return ICONS.get(ICON_KEY + POSTFIX[subtype]); - } - - @Override - public IIcon getTextureForInputMode() { - return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]); - } - - @Override - public IIcon getTextureForOutputMode() { - return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - @Override - public Collection createCollidables(CacheKey key) { - Collection baseCollidables = super.createCollidables(key); - if(key.dir == ForgeDirection.UNKNOWN) { - return baseCollidables; + for (Entry entry : rsColors.entrySet()) { + if (entry.getValue() != null) { + short ord = (short) entry.getValue().ordinal(); + nbtRoot.setShort("pRsCol." + entry.getKey().name(), ord); + } + } } - BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); - CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + subtype = nbtRoot.getShort("subtype"); - List result = new ArrayList(); - result.addAll(baseCollidables); - result.add(cc); + if (nbtRoot.hasKey("energyStored")) { + nbtRoot.setInteger("energyStoredRF", (int) (nbtRoot.getFloat("energyStored") * 10)); + } + setEnergyStored(nbtRoot.getInteger("energyStoredRF")); - return result; - } + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "pRsMode." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < RedstoneControlMode.values().length) { + rsModes.put(dir, RedstoneControlMode.values()[ord]); + } + } + key = "pRsCol." + dir.name(); + if (nbtRoot.hasKey(key)) { + short ord = nbtRoot.getShort(key); + if (ord >= 0 && ord < DyeColor.values().length) { + rsColors.put(dir, DyeColor.values()[ord]); + } + } + } + } - @Override - public int getMaxEnergyStored() { - return getCapacitors()[subtype].getMaxEnergyStored(); - } + @Override + public void onTick() {} - @Override - public boolean displayPower() { - return true; - } + @Override + public int getEnergyStored() { + return energyStoredRF; + } + + @Override + public void setEnergyStored(int energyStored) { + energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); + } + + private boolean isRedstoneEnabled(ForgeDirection dir) { + boolean result; + RedstoneControlMode mode = getExtractionRedstoneMode(dir); + if (mode == RedstoneControlMode.NEVER) { + return false; + } + if (mode == RedstoneControlMode.IGNORE) { + return true; + } + + DyeColor col = getExtractionSignalColor(dir); + int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); + int exSig = getExternalRedstoneSignalForDir(dir); + boolean res; + if (mode == RedstoneControlMode.OFF) { + // if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); + } else { + // if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); + } + return res; + } + + private int getExternalRedstoneSignalForDir(ForgeDirection dir) { + if (redstoneStateDirty) { + externalRedstoneSignals.clear(); + redstoneStateDirty = false; + } + Integer cached = externalRedstoneSignals.get(dir); + int result; + if (cached == null) { + TileEntity te = getBundle().getEntity(); + result = te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord); + externalRedstoneSignals.put(dir, result); + } else { + result = cached; + } + return result; + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if (mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); + } + + @Override + public int getMaxEnergyExtracted(ForgeDirection dir) { + ConnectionMode mode = getConnectionMode(dir); + if (mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { + return 0; + } + if (recievedRfThisTick(dir)) { + return 0; + } + return getCapacitor().getMaxEnergyExtracted(); + } + + private boolean recievedRfThisTick(ForgeDirection dir) { + if (recievedTicks == null + || dir == null + || recievedTicks.get(dir) == null + || getBundle() == null + || getBundle().getWorld() == null) { + return false; + } + + long curTick = getBundle().getWorld().getTotalWorldTime(); + long recT = recievedTicks.get(dir); + if (curTick - recT <= 5) { + return true; + } + return false; + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + if (network != null && network.powerManager != null) { + network.powerManager.receptorsChanged(); + } + return super.onNeighborBlockChange(blockId); + } + + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + recievedTicks = null; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { + return 0; + } + int freeSpace = getMaxEnergyStored() - getEnergyStored(); + int result = (int) Math.min(maxReceive, freeSpace); + if (!simulate && result > 0) { + setEnergyStored(getEnergyStored() + result); + + if (getBundle() != null) { + if (recievedTicks == null) { + recievedTicks = new EnumMap(ForgeDirection.class); + } + recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); + } + } + return result; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (PowerConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + IPowerInterface rec = getExternalPowerReceptor(direction); + + return rec != null && rec.canConduitConnect(direction); + } + + @Override + public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { + boolean res = super.canConnectToConduit(direction, conduit); + if (!res) { + return false; + } + if (Config.powerConduitCanDifferentTiersConnect) { + return res; + } + if (!(conduit instanceof IPowerConduit)) { + return false; + } + IPowerConduit pc = (IPowerConduit) conduit; + return pc.getMaxEnergyStored() == getMaxEnergyStored(); + } + + @Override + public void externalConnectionAdded(ForgeDirection direction) { + super.externalConnectionAdded(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorAdded( + this, + direction, + te.xCoord + direction.offsetX, + te.yCoord + direction.offsetY, + te.zCoord + direction.offsetZ, + getExternalPowerReceptor(direction)); + } + } + + @Override + public void externalConnectionRemoved(ForgeDirection direction) { + super.externalConnectionRemoved(direction); + if (network != null) { + TileEntity te = bundle.getEntity(); + network.powerReceptorRemoved( + te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + } + } + + @Override + public IPowerInterface getExternalPowerReceptor(ForgeDirection direction) { + TileEntity te = bundle.getEntity(); + World world = te.getWorldObj(); + if (world == null) { + return null; + } + TileEntity test = world.getTileEntity( + te.xCoord + direction.offsetX, te.yCoord + direction.offsetY, te.zCoord + direction.offsetZ); + if (test == null) { + return null; + } + if (test instanceof IConduitBundle) { + return null; + } + return PowerHandlerUtil.create(test); + } + + @Override + public ItemStack createItem() { + return createItemStackForSubtype(subtype); + } + + @Override + public Class getBaseConduitType() { + return IPowerConduit.class; + } + + // Rendering + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return ICONS.get(ICON_CORE_KEY + POSTFIX[subtype]); + } + if (COLOR_CONTROLLER_ID.equals(component.data)) { + return IconUtil.whiteTexture; + } + return ICONS.get(ICON_KEY + POSTFIX[subtype]); + } + + @Override + public IIcon getTextureForInputMode() { + return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]); + } + + @Override + public IIcon getTextureForOutputMode() { + return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if (key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; + } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IPowerConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; + } + + @Override + public int getMaxEnergyStored() { + return getCapacitors()[subtype].getMaxEnergyStored(); + } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java b/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java index 68533745..975f7a7e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ConduitBundledRedstoneProvider.java @@ -1,39 +1,38 @@ package crazypants.enderio.conduit.redstone; -import java.util.Set; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduitBundle; import dan200.computercraft.api.ComputerCraftAPI; import dan200.computercraft.api.redstone.IBundledRedstoneProvider; +import java.util.Set; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class ConduitBundledRedstoneProvider implements IBundledRedstoneProvider { - @Override - public int getBundledRedstoneOutput(World world, int x, int y, int z, int side) { - TileEntity inputTE = world.getTileEntity(x, y, z); - if (inputTE != null && inputTE instanceof IConduitBundle) { - IConduitBundle bundle = ((IConduitBundle) inputTE); - if (bundle.hasType(IInsulatedRedstoneConduit.class)) { - IInsulatedRedstoneConduit conduit = bundle.getConduit(IInsulatedRedstoneConduit.class); - Set networkOutputs = conduit.getNetworkOutputs(ForgeDirection.UNKNOWN); - int out = 0; - for (Signal signal : networkOutputs) { - int index = signal.color.ordinal(); - if (signal.strength != 0) { - out |= (1 << 15 - index); - } + @Override + public int getBundledRedstoneOutput(World world, int x, int y, int z, int side) { + TileEntity inputTE = world.getTileEntity(x, y, z); + if (inputTE != null && inputTE instanceof IConduitBundle) { + IConduitBundle bundle = ((IConduitBundle) inputTE); + if (bundle.hasType(IInsulatedRedstoneConduit.class)) { + IInsulatedRedstoneConduit conduit = bundle.getConduit(IInsulatedRedstoneConduit.class); + Set networkOutputs = conduit.getNetworkOutputs(ForgeDirection.UNKNOWN); + int out = 0; + for (Signal signal : networkOutputs) { + int index = signal.color.ordinal(); + if (signal.strength != 0) { + out |= (1 << 15 - index); + } + } + return out; + } + return 0; } - return out; - } - return 0; + return -1; } - return -1; - } - public static void register() { - ComputerCraftAPI.registerBundledRedstoneProvider(new ConduitBundledRedstoneProvider()); - } + public static void register() { + ComputerCraftAPI.registerBundledRedstoneProvider(new ConduitBundledRedstoneProvider()); + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java index eb9cf66e..cb096b74 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java @@ -1,31 +1,28 @@ package crazypants.enderio.conduit.redstone; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.conduit.ConnectionMode; +import net.minecraftforge.common.util.ForgeDirection; public interface IInsulatedRedstoneConduit extends IRedstoneConduit { - static final String KEY_INS_CONDUIT_ICON = "enderio:redstoneInsulatedConduit"; - static final String KEY_INS_CORE_OFF_ICON = "enderio:redstoneInsulatedConduitCoreOff"; - static final String KEY_INS_CORE_ON_ICON = "enderio:redstoneInsulatedConduitCoreOn"; + static final String KEY_INS_CONDUIT_ICON = "enderio:redstoneInsulatedConduit"; + static final String KEY_INS_CORE_OFF_ICON = "enderio:redstoneInsulatedConduitCoreOff"; + static final String KEY_INS_CORE_ON_ICON = "enderio:redstoneInsulatedConduitCoreOn"; - public static final String COLOR_CONTROLLER_ID = "ColorController"; + public static final String COLOR_CONTROLLER_ID = "ColorController"; - void onInputsChanged(ForgeDirection side, int[] inputValues); + void onInputsChanged(ForgeDirection side, int[] inputValues); - void onInputChanged(ForgeDirection side, int inputValue); + void onInputChanged(ForgeDirection side, int inputValue); - void forceConnectionMode(ForgeDirection dir, ConnectionMode mode); + void forceConnectionMode(ForgeDirection dir, ConnectionMode mode); - void setSignalColor(ForgeDirection dir, DyeColor col); + void setSignalColor(ForgeDirection dir, DyeColor col); - boolean isSpecialConnection(ForgeDirection dir); + boolean isSpecialConnection(ForgeDirection dir); - boolean isOutputStrong(ForgeDirection dir); - - void setOutputStrength(ForgeDirection dir, boolean isStrong); + boolean isOutputStrong(ForgeDirection dir); + void setOutputStrength(ForgeDirection dir, boolean isStrong); } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java index 769b986f..321b6e68 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java @@ -1,42 +1,39 @@ package crazypants.enderio.conduit.redstone; +import com.enderio.core.common.util.DyeColor; +import crazypants.enderio.conduit.IConduit; import java.util.Set; - import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.DyeColor; - -import crazypants.enderio.conduit.IConduit; - public interface IRedstoneConduit extends IConduit { - public static final String KEY_CONDUIT_ICON = "enderio:redstoneConduit"; - public static final String KEY_TRANSMISSION_ICON = "enderio:redstoneConduitTransmission"; - public static final String KEY_CORE_OFF_ICON = "enderio:redstoneConduitCoreOff"; - public static final String KEY_CORE_ON_ICON = "enderio:redstoneConduitCoreOn"; + public static final String KEY_CONDUIT_ICON = "enderio:redstoneConduit"; + public static final String KEY_TRANSMISSION_ICON = "enderio:redstoneConduitTransmission"; + public static final String KEY_CORE_OFF_ICON = "enderio:redstoneConduitCoreOff"; + public static final String KEY_CORE_ON_ICON = "enderio:redstoneConduitCoreOn"; - // External redstone interface + // External redstone interface - int isProvidingStrongPower(ForgeDirection toDirection); + int isProvidingStrongPower(ForgeDirection toDirection); - int isProvidingWeakPower(ForgeDirection toDirection); + int isProvidingWeakPower(ForgeDirection toDirection); - Set getNetworkInputs(); + Set getNetworkInputs(); - Set getNetworkInputs(ForgeDirection side); + Set getNetworkInputs(ForgeDirection side); - Set getNetworkOutputs(ForgeDirection side); + Set getNetworkOutputs(ForgeDirection side); - DyeColor getSignalColor(ForgeDirection dir); + DyeColor getSignalColor(ForgeDirection dir); - void updateNetwork(); + void updateNetwork(); - // MFR RedNet + // MFR RedNet - int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side); + int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side); - int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet); + int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet); - void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues); + void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues); } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index d3900ac7..f32995c2 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -1,32 +1,10 @@ package crazypants.enderio.conduit.redstone; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.tileentity.IRedstoneControl; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -40,554 +18,593 @@ import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.tool.ToolUtil; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsulatedRedstoneConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { - - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(KEY_INS_CORE_OFF_ICON, register.registerIcon(KEY_INS_CORE_OFF_ICON)); - ICONS.put(KEY_INS_CORE_ON_ICON, register.registerIcon(KEY_INS_CORE_ON_ICON)); - ICONS.put(KEY_INS_CONDUIT_ICON, register.registerIcon(KEY_INS_CONDUIT_ICON)); - } - - @Override - public int getTextureType() { - return 0; - } - - }); - } - - private static final List CONECTABLE_BLOCKS = Arrays.asList(Blocks.redstone_lamp, Blocks.lit_redstone_lamp, Blocks.redstone_torch, - Blocks.redstone_wire, Blocks.redstone_block, Blocks.dispenser, Blocks.lever, Blocks.wooden_button, Blocks.stone_button, Blocks.wooden_pressure_plate, - Blocks.stone_pressure_plate, Blocks.dropper, Blocks.daylight_detector, Blocks.command_block, Blocks.golden_rail, Blocks.trapped_chest, Blocks.piston, - Blocks.sticky_piston, Blocks.noteblock); - - private static Map, Boolean> CONNECTABLE_CLASSES = null; - - public static void addConnectableBlock(NBTTagCompound nbt) { - if(nbt == null) { - Log.warn("InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null NBT"); - return; - } - boolean connectable = true; - if(nbt.hasKey("isConnectable")) { - connectable = nbt.getBoolean("isConnectable"); - } - String className = nbt.getString("className"); - addConnectableInterface(className, connectable); - } - - public static void addConnectableBlock(Block block) { - if(block == null) { - Log.warn("InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null Block"); - return; - } - CONECTABLE_BLOCKS.add(block); - } - - public static void addConnectableInterface(String className, boolean connectable) { - try { - Class clz = Class.forName(className); - addConnectableInterface(clz, connectable); - } catch (Exception e) { - Log.warn("InsulatedRedstoneConduit: An attempt was made to register " + className + " as connectable but it could not be loaded"); - } - } - - public static void addConnectableInterface(Class clazz, boolean connectable) { - if(clazz == null) { - Log.warn("InsulatedRedstoneConduit: An attempt was made to register a null class as a connectable"); - return; - } - getConnectableInterfaces().put(clazz, connectable); - } - - private static Map, Boolean> getConnectableInterfaces() { - if(CONNECTABLE_CLASSES == null) { - CONNECTABLE_CLASSES = new HashMap, Boolean>(); - CONNECTABLE_CLASSES.put(IRedstoneControl.class, false); - try { - Class conInterface = Class.forName("powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection"); - CONNECTABLE_CLASSES.put(conInterface, false); - } catch (Throwable e) { - //NO-OP - } - try { - Class ccInterface = Class.forName("dan200.computercraft.shared.computer.blocks.IComputerTile"); - CONNECTABLE_CLASSES.put(ccInterface, true); - } catch (Throwable e) { - //NO-OP - } - } - return CONNECTABLE_CLASSES; - } - - private Map forcedConnections = new HashMap(); - - private Map signalColors = new HashMap(); - - private Map signalStrengths = new HashMap(); - - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - - World world = getBundle().getEntity().getWorldObj(); - if(!world.isRemote) { - - DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); - if(col != null && res.component != null) { - setSignalColor(res.component.dir, col); - return true; - } else if(ToolUtil.isToolEquipped(player)) { - - if(res != null && res.component != null) { - ForgeDirection connDir = res.component.dir; - ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); - - boolean colorHit = false; - if(all != null && containsExternalConnection(connDir)) { - for (RaytraceResult rtr : all) { - if(rtr != null && rtr.component != null && COLOR_CONTROLLER_ID.equals(rtr.component.data)) { - colorHit = true; - } - } - } - - if(colorHit) { - setSignalColor(connDir, DyeColor.getNext(getSignalColor(connDir))); - return true; - - } else if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { - - BlockCoord loc = getLocation().getLocation(faceHit); - Block id = world.getBlock(loc.x, loc.y, loc.z); - if(id == EnderIO.blockConduitBundle) { - IRedstoneConduit neighbour = ConduitUtil.getConduit(world, loc.x, loc.y, loc.z, IRedstoneConduit.class); - if(neighbour != null && neighbour.getConnectionMode(faceHit.getOpposite()) == ConnectionMode.DISABLED) { - neighbour.setConnectionMode(faceHit.getOpposite(), ConnectionMode.NOT_SET); - } - setConnectionMode(faceHit, ConnectionMode.NOT_SET); - return ConduitUtil.joinConduits(this, faceHit); - } - forceConnectionMode(faceHit, ConnectionMode.IN_OUT); - return true; - - } else if(externalConnections.contains(connDir)) { - if(network != null) { - network.destroyNetwork(); - } - externalConnectionRemoved(connDir); - forceConnectionMode(connDir, ConnectionMode.DISABLED); - return true; - - } else if(containsConduitConnection(connDir)) { - BlockCoord loc = getLocation().getLocation(connDir); - IRedstoneConduit neighbour = ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IRedstoneConduit.class); - if(neighbour != null) { - if(network != null) { - network.destroyNetwork(); - } - if(neighbour.getNetwork() != null) { - neighbour.getNetwork().destroyNetwork(); - } - neighbour.conduitConnectionRemoved(connDir.getOpposite()); - conduitConnectionRemoved(connDir); - neighbour.connectionsChanged(); - connectionsChanged(); - updateNetwork(); - neighbour.updateNetwork(); - return true; + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(KEY_INS_CORE_OFF_ICON, register.registerIcon(KEY_INS_CORE_OFF_ICON)); + ICONS.put(KEY_INS_CORE_ON_ICON, register.registerIcon(KEY_INS_CORE_ON_ICON)); + ICONS.put(KEY_INS_CONDUIT_ICON, register.registerIcon(KEY_INS_CONDUIT_ICON)); } - } + @Override + public int getTextureType() { + return 0; + } + }); + } + + private static final List CONECTABLE_BLOCKS = Arrays.asList( + Blocks.redstone_lamp, + Blocks.lit_redstone_lamp, + Blocks.redstone_torch, + Blocks.redstone_wire, + Blocks.redstone_block, + Blocks.dispenser, + Blocks.lever, + Blocks.wooden_button, + Blocks.stone_button, + Blocks.wooden_pressure_plate, + Blocks.stone_pressure_plate, + Blocks.dropper, + Blocks.daylight_detector, + Blocks.command_block, + Blocks.golden_rail, + Blocks.trapped_chest, + Blocks.piston, + Blocks.sticky_piston, + Blocks.noteblock); + + private static Map, Boolean> CONNECTABLE_CLASSES = null; + + public static void addConnectableBlock(NBTTagCompound nbt) { + if (nbt == null) { + Log.warn( + "InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null NBT"); + return; } - } - } - return false; - } - - @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); - setOutputStrength(dir, dataRoot.getBoolean("signalStrong")); - } - - @Override - protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { - dataRoot.setShort("signalColor", (short) getSignalColor(dir).ordinal()); - dataRoot.setBoolean("signalStrong", isOutputStrong(dir)); - } - - @Override - public void forceConnectionMode(ForgeDirection dir, ConnectionMode mode) { - if(mode == ConnectionMode.IN_OUT) { - - setConnectionMode(dir, mode); - forcedConnections.put(dir, mode); - onAddedToBundle(); - Set newSignals = getNetworkInputs(dir); - if(network != null) { - network.addSignals(newSignals); - network.notifyNeigborsOfSignals(); - } - - } else { - - Set signals = getNetworkInputs(dir); - setConnectionMode(dir, mode); - forcedConnections.put(dir, mode); - onAddedToBundle(); - if(network != null) { - network.removeSignals(signals); - network.notifyNeigborsOfSignals(); - } - - } - } - - @Override - public ConnectionMode getNextConnectionMode(ForgeDirection dir) { - if(getConnectionMode(dir) == ConnectionMode.IN_OUT) { - return ConnectionMode.DISABLED; - } - return ConnectionMode.IN_OUT; - } - - @Override - public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { - if(getConnectionMode(dir) == ConnectionMode.IN_OUT) { - return ConnectionMode.DISABLED; - } - return ConnectionMode.IN_OUT; - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); - } - - @Override - public Class getCollidableType() { - return IInsulatedRedstoneConduit.class; - } - - @Override - public void onInputsChanged(ForgeDirection side, int[] inputValues) { - } - - @Override - public void onInputChanged(ForgeDirection side, int inputValue) { - } - - @Override - public DyeColor getSignalColor(ForgeDirection dir) { - DyeColor res = signalColors.get(dir); - if(res == null) { - return DyeColor.RED; - } - return res; - } - - @Override - public void setSignalColor(ForgeDirection dir, DyeColor col) { - Set toRemove = getNetworkInputs(dir); - signalColors.put(dir, col); - Set toAdd = getNetworkInputs(dir); - if(network != null) { - network.removeSignals(toRemove); - network.addSignals(toAdd); - network.notifyNeigborsOfSignals(); - } - setClientStateDirty(); - } - - @Override - public boolean isOutputStrong(ForgeDirection dir) { - if(signalStrengths.containsKey(dir)) { - return signalStrengths.get(dir); - } - return false; - } - - @Override - public void setOutputStrength(ForgeDirection dir, boolean isStrong) { - if(isOutputStrong(dir) != isStrong) { - if(isStrong) { - signalStrengths.put(dir, isStrong); - } else { - signalStrengths.remove(dir); - } - if(network != null) { - network.notifyNeigborsOfSignals(); - } - } - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionState) { - if(ignoreConnectionState) { //you can always force an external connection - return true; - } - if(forcedConnections.get(direction) == ConnectionMode.DISABLED) { - return false; - } else if(forcedConnections.get(direction) == ConnectionMode.IN_OUT) { - return true; - } - //Not set so figure it out - BlockCoord loc = getLocation().getLocation(direction); - World world = getBundle().getEntity().getWorldObj(); - Block block = world.getBlock(loc.x, loc.y, loc.z); - TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); - - if(block == null || block == EnderIO.blockConduitBundle) { - return false; - } - - if(CONECTABLE_BLOCKS.contains(block)) { - return true; - } - - if (block instanceof IRedstoneConnectable) { - return ((IRedstoneConnectable) block).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction); - } - - if (te instanceof IRedstoneConnectable) { - return ((IRedstoneConnectable) te).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction); + boolean connectable = true; + if (nbt.hasKey("isConnectable")) { + connectable = nbt.getBoolean("isConnectable"); + } + String className = nbt.getString("className"); + addConnectableInterface(className, connectable); } - Map, Boolean> connectableInterfaces = getConnectableInterfaces(); - for(Class connectable : connectableInterfaces.keySet()) { - if((te != null && connectable.isAssignableFrom(te.getClass())) || (connectable.isAssignableFrom(block.getClass()))) { - return true; - } - } - - return false; - } - - @Override - public boolean isSpecialConnection(ForgeDirection dir){ - BlockCoord loc = getLocation().getLocation(dir); - Block block = getBundle().getEntity().getWorldObj().getBlock(loc.x, loc.y, loc.z); - World world = getBundle().getEntity().getWorldObj(); - TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); - - Map, Boolean> connectableInterfaces = getConnectableInterfaces(); - for (Class connectable : connectableInterfaces.keySet()) { - if((te != null && connectable.isAssignableFrom(te.getClass())) || (block != null && connectable.isAssignableFrom(block.getClass()))) { - return connectableInterfaces.get(connectable); - } + public static void addConnectableBlock(Block block) { + if (block == null) { + Log.warn( + "InsulatedRedstoneConduit: An attempt was made to register a redstone connectable using a null Block"); + return; + } + CONECTABLE_BLOCKS.add(block); } - return false; - } - - @Override - public int isProvidingWeakPower(ForgeDirection toDirection) { - if(getConnectionMode(toDirection.getOpposite()) != ConnectionMode.IN_OUT) { - return 0; - } - return super.isProvidingWeakPower(toDirection); - } - - @Override - public int isProvidingStrongPower(ForgeDirection toDirection) { - if(isOutputStrong(toDirection.getOpposite())) { - return isProvidingWeakPower(toDirection); - } else { - return 0; - } - } - - @Override - public void externalConnectionAdded(ForgeDirection fromDirection) { - super.externalConnectionAdded(fromDirection); - setConnectionMode(fromDirection, ConnectionMode.IN_OUT); - } - - @Override - public void externalConnectionRemoved(ForgeDirection fromDirection) { - super.externalConnectionRemoved(fromDirection); - setConnectionMode(fromDirection, ConnectionMode.NOT_SET); - } - - @Override - public Set getNetworkOutputs(ForgeDirection side) { - if(side == null || side == ForgeDirection.UNKNOWN) { - return super.getNetworkOutputs(side); + public static void addConnectableInterface(String className, boolean connectable) { + try { + Class clz = Class.forName(className); + addConnectableInterface(clz, connectable); + } catch (Exception e) { + Log.warn("InsulatedRedstoneConduit: An attempt was made to register " + className + + " as connectable but it could not be loaded"); + } } - ConnectionMode mode = getConnectionMode(side); - if(network == null || mode != ConnectionMode.IN_OUT) { - return Collections.emptySet(); - } - Set allSigs = network.getSignals(); - if(allSigs.isEmpty()) { - return allSigs; + public static void addConnectableInterface(Class clazz, boolean connectable) { + if (clazz == null) { + Log.warn("InsulatedRedstoneConduit: An attempt was made to register a null class as a connectable"); + return; + } + getConnectableInterfaces().put(clazz, connectable); } - DyeColor col = getSignalColor(side); - Set result = new HashSet(); - for (Signal signal : allSigs) { - if(signal.color == col) { - result.add(signal); - } + private static Map, Boolean> getConnectableInterfaces() { + if (CONNECTABLE_CLASSES == null) { + CONNECTABLE_CLASSES = new HashMap, Boolean>(); + CONNECTABLE_CLASSES.put(IRedstoneControl.class, false); + try { + Class conInterface = + Class.forName("powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection"); + CONNECTABLE_CLASSES.put(conInterface, false); + } catch (Throwable e) { + // NO-OP + } + try { + Class ccInterface = Class.forName("dan200.computercraft.shared.computer.blocks.IComputerTile"); + CONNECTABLE_CLASSES.put(ccInterface, true); + } catch (Throwable e) { + // NO-OP + } + } + return CONNECTABLE_CLASSES; } - return result; - } + private Map forcedConnections = new HashMap(); - @Override - public ConnectionMode getConnectionMode(ForgeDirection dir) { - ConnectionMode res = conectionModes.get(dir); - if(res == null) { - return ConnectionMode.NOT_SET; - } - return res; - } + private Map signalColors = new HashMap(); - @Override - protected boolean acceptSignalsForDir(ForgeDirection dir) { - return getConnectionMode(dir) == ConnectionMode.IN_OUT && super.acceptSignalsForDir(dir); - } + private Map signalStrengths = new HashMap(); - @Override - public Collection createCollidables(CacheKey key) { - Collection baseCollidables = super.createCollidables(key); - if(key.dir == ForgeDirection.UNKNOWN) { - return baseCollidables; + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + + World world = getBundle().getEntity().getWorldObj(); + if (!world.isRemote) { + + DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); + if (col != null && res.component != null) { + setSignalColor(res.component.dir, col); + return true; + } else if (ToolUtil.isToolEquipped(player)) { + + if (res != null && res.component != null) { + ForgeDirection connDir = res.component.dir; + ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); + + boolean colorHit = false; + if (all != null && containsExternalConnection(connDir)) { + for (RaytraceResult rtr : all) { + if (rtr != null + && rtr.component != null + && COLOR_CONTROLLER_ID.equals(rtr.component.data)) { + colorHit = true; + } + } + } + + if (colorHit) { + setSignalColor(connDir, DyeColor.getNext(getSignalColor(connDir))); + return true; + + } else if (connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { + + BlockCoord loc = getLocation().getLocation(faceHit); + Block id = world.getBlock(loc.x, loc.y, loc.z); + if (id == EnderIO.blockConduitBundle) { + IRedstoneConduit neighbour = + ConduitUtil.getConduit(world, loc.x, loc.y, loc.z, IRedstoneConduit.class); + if (neighbour != null + && neighbour.getConnectionMode(faceHit.getOpposite()) == ConnectionMode.DISABLED) { + neighbour.setConnectionMode(faceHit.getOpposite(), ConnectionMode.NOT_SET); + } + setConnectionMode(faceHit, ConnectionMode.NOT_SET); + return ConduitUtil.joinConduits(this, faceHit); + } + forceConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; + + } else if (externalConnections.contains(connDir)) { + if (network != null) { + network.destroyNetwork(); + } + externalConnectionRemoved(connDir); + forceConnectionMode(connDir, ConnectionMode.DISABLED); + return true; + + } else if (containsConduitConnection(connDir)) { + BlockCoord loc = getLocation().getLocation(connDir); + IRedstoneConduit neighbour = ConduitUtil.getConduit( + getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IRedstoneConduit.class); + if (neighbour != null) { + if (network != null) { + network.destroyNetwork(); + } + if (neighbour.getNetwork() != null) { + neighbour.getNetwork().destroyNetwork(); + } + neighbour.conduitConnectionRemoved(connDir.getOpposite()); + conduitConnectionRemoved(connDir); + neighbour.connectionsChanged(); + connectionsChanged(); + updateNetwork(); + neighbour.updateNetwork(); + return true; + } + } + } + } + } + return false; } - BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); - CollidableComponent cc = new CollidableComponent(IRedstoneConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); - - List result = new ArrayList(); - result.addAll(baseCollidables); - result.add(cc); - - return result; - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return isActive() ? ICONS.get(KEY_INS_CORE_ON_ICON) : ICONS.get(KEY_INS_CORE_OFF_ICON); + @Override + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); + setOutputStrength(dir, dataRoot.getBoolean("signalStrong")); } - if(COLOR_CONTROLLER_ID.equals(component.data)) { - return IconUtil.whiteTexture; + + @Override + protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { + dataRoot.setShort("signalColor", (short) getSignalColor(dir).ordinal()); + dataRoot.setBoolean("signalStrong", isOutputStrong(dir)); } - return ICONS.get(KEY_INS_CONDUIT_ICON); - } - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return isActive() ? RedstoneConduit.ICONS.get(KEY_TRANSMISSION_ICON) : RedstoneConduit.ICONS.get(KEY_CONDUIT_ICON); - } + @Override + public void forceConnectionMode(ForgeDirection dir, ConnectionMode mode) { + if (mode == ConnectionMode.IN_OUT) { - @Override - protected boolean renderStub(ForgeDirection dir) { - return false; - } + setConnectionMode(dir, mode); + forcedConnections.put(dir, mode); + onAddedToBundle(); + Set newSignals = getNetworkInputs(dir); + if (network != null) { + network.addSignals(newSignals); + network.notifyNeigborsOfSignals(); + } - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - - if(forcedConnections.size() >= 0) { - byte[] modes = new byte[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - ConnectionMode mode = forcedConnections.get(dir); - if(mode != null) { - modes[i] = (byte) mode.ordinal(); } else { - modes[i] = -1; + + Set signals = getNetworkInputs(dir); + setConnectionMode(dir, mode); + forcedConnections.put(dir, mode); + onAddedToBundle(); + if (network != null) { + network.removeSignals(signals); + network.notifyNeigborsOfSignals(); + } } - i++; - } - nbtRoot.setByteArray("forcedConnections", modes); } - if(signalColors.size() >= 0) { - byte[] modes = new byte[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - DyeColor col = signalColors.get(dir); - if(col != null) { - modes[i] = (byte) col.ordinal(); + @Override + public ConnectionMode getNextConnectionMode(ForgeDirection dir) { + if (getConnectionMode(dir) == ConnectionMode.IN_OUT) { + return ConnectionMode.DISABLED; + } + return ConnectionMode.IN_OUT; + } + + @Override + public ConnectionMode getPreviousConnectionMode(ForgeDirection dir) { + if (getConnectionMode(dir) == ConnectionMode.IN_OUT) { + return ConnectionMode.DISABLED; + } + return ConnectionMode.IN_OUT; + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); + } + + @Override + public Class getCollidableType() { + return IInsulatedRedstoneConduit.class; + } + + @Override + public void onInputsChanged(ForgeDirection side, int[] inputValues) {} + + @Override + public void onInputChanged(ForgeDirection side, int inputValue) {} + + @Override + public DyeColor getSignalColor(ForgeDirection dir) { + DyeColor res = signalColors.get(dir); + if (res == null) { + return DyeColor.RED; + } + return res; + } + + @Override + public void setSignalColor(ForgeDirection dir, DyeColor col) { + Set toRemove = getNetworkInputs(dir); + signalColors.put(dir, col); + Set toAdd = getNetworkInputs(dir); + if (network != null) { + network.removeSignals(toRemove); + network.addSignals(toAdd); + network.notifyNeigborsOfSignals(); + } + setClientStateDirty(); + } + + @Override + public boolean isOutputStrong(ForgeDirection dir) { + if (signalStrengths.containsKey(dir)) { + return signalStrengths.get(dir); + } + return false; + } + + @Override + public void setOutputStrength(ForgeDirection dir, boolean isStrong) { + if (isOutputStrong(dir) != isStrong) { + if (isStrong) { + signalStrengths.put(dir, isStrong); + } else { + signalStrengths.remove(dir); + } + if (network != null) { + network.notifyNeigborsOfSignals(); + } + } + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionState) { + if (ignoreConnectionState) { // you can always force an external connection + return true; + } + if (forcedConnections.get(direction) == ConnectionMode.DISABLED) { + return false; + } else if (forcedConnections.get(direction) == ConnectionMode.IN_OUT) { + return true; + } + // Not set so figure it out + BlockCoord loc = getLocation().getLocation(direction); + World world = getBundle().getEntity().getWorldObj(); + Block block = world.getBlock(loc.x, loc.y, loc.z); + TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); + + if (block == null || block == EnderIO.blockConduitBundle) { + return false; + } + + if (CONECTABLE_BLOCKS.contains(block)) { + return true; + } + + if (block instanceof IRedstoneConnectable) { + return ((IRedstoneConnectable) block).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction); + } + + if (te instanceof IRedstoneConnectable) { + return ((IRedstoneConnectable) te).shouldRedstoneConduitConnect(world, loc.x, loc.y, loc.z, direction); + } + + Map, Boolean> connectableInterfaces = getConnectableInterfaces(); + for (Class connectable : connectableInterfaces.keySet()) { + if ((te != null && connectable.isAssignableFrom(te.getClass())) + || (connectable.isAssignableFrom(block.getClass()))) { + return true; + } + } + + return false; + } + + @Override + public boolean isSpecialConnection(ForgeDirection dir) { + BlockCoord loc = getLocation().getLocation(dir); + Block block = getBundle().getEntity().getWorldObj().getBlock(loc.x, loc.y, loc.z); + World world = getBundle().getEntity().getWorldObj(); + TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); + + Map, Boolean> connectableInterfaces = getConnectableInterfaces(); + for (Class connectable : connectableInterfaces.keySet()) { + if ((te != null && connectable.isAssignableFrom(te.getClass())) + || (block != null && connectable.isAssignableFrom(block.getClass()))) { + return connectableInterfaces.get(connectable); + } + } + + return false; + } + + @Override + public int isProvidingWeakPower(ForgeDirection toDirection) { + if (getConnectionMode(toDirection.getOpposite()) != ConnectionMode.IN_OUT) { + return 0; + } + return super.isProvidingWeakPower(toDirection); + } + + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { + if (isOutputStrong(toDirection.getOpposite())) { + return isProvidingWeakPower(toDirection); } else { - modes[i] = -1; + return 0; } - i++; - } - nbtRoot.setByteArray("signalColors", modes); } - if(signalStrengths.size() >= 0) { - byte[] modes = new byte[6]; - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - boolean isStrong = isOutputStrong(dir); - if(isStrong) { - modes[i] = 1; - } else { - modes[i] = 0; - } - i++; - } - nbtRoot.setByteArray("signalStrengths", modes); + @Override + public void externalConnectionAdded(ForgeDirection fromDirection) { + super.externalConnectionAdded(fromDirection); + setConnectionMode(fromDirection, ConnectionMode.IN_OUT); } - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - - forcedConnections.clear(); - byte[] modes = nbtRoot.getByteArray("forcedConnections"); - if(modes != null && modes.length == 6) { - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(modes[i] >= 0) { - forcedConnections.put(dir, ConnectionMode.values()[modes[i]]); - } - i++; - } + @Override + public void externalConnectionRemoved(ForgeDirection fromDirection) { + super.externalConnectionRemoved(fromDirection); + setConnectionMode(fromDirection, ConnectionMode.NOT_SET); } - signalColors.clear(); - byte[] cols = nbtRoot.getByteArray("signalColors"); - if(cols != null && cols.length == 6) { - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(cols[i] >= 0) { - signalColors.put(dir, DyeColor.values()[cols[i]]); + @Override + public Set getNetworkOutputs(ForgeDirection side) { + if (side == null || side == ForgeDirection.UNKNOWN) { + return super.getNetworkOutputs(side); } - i++; - } + + ConnectionMode mode = getConnectionMode(side); + if (network == null || mode != ConnectionMode.IN_OUT) { + return Collections.emptySet(); + } + Set allSigs = network.getSignals(); + if (allSigs.isEmpty()) { + return allSigs; + } + + DyeColor col = getSignalColor(side); + Set result = new HashSet(); + for (Signal signal : allSigs) { + if (signal.color == col) { + result.add(signal); + } + } + + return result; } - signalStrengths.clear(); - byte[] strengths = nbtRoot.getByteArray("signalStrengths"); - if(strengths != null && strengths.length == 6) { - int i = 0; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(strengths[i] > 0) { - signalStrengths.put(dir, true); + @Override + public ConnectionMode getConnectionMode(ForgeDirection dir) { + ConnectionMode res = conectionModes.get(dir); + if (res == null) { + return ConnectionMode.NOT_SET; } - i++; - } + return res; } - } + @Override + protected boolean acceptSignalsForDir(ForgeDirection dir) { + return getConnectionMode(dir) == ConnectionMode.IN_OUT && super.acceptSignalsForDir(dir); + } + @Override + public Collection createCollidables(CacheKey key) { + Collection baseCollidables = super.createCollidables(key); + if (key.dir == ForgeDirection.UNKNOWN) { + return baseCollidables; + } + + BoundingBox bb = ConduitGeometryUtil.instance.createBoundsForConnectionController(key.dir, key.offset); + CollidableComponent cc = new CollidableComponent(IRedstoneConduit.class, bb, key.dir, COLOR_CONTROLLER_ID); + + List result = new ArrayList(); + result.addAll(baseCollidables); + result.add(cc); + + return result; + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return isActive() ? ICONS.get(KEY_INS_CORE_ON_ICON) : ICONS.get(KEY_INS_CORE_OFF_ICON); + } + if (COLOR_CONTROLLER_ID.equals(component.data)) { + return IconUtil.whiteTexture; + } + return ICONS.get(KEY_INS_CONDUIT_ICON); + } + + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return isActive() + ? RedstoneConduit.ICONS.get(KEY_TRANSMISSION_ICON) + : RedstoneConduit.ICONS.get(KEY_CONDUIT_ICON); + } + + @Override + protected boolean renderStub(ForgeDirection dir) { + return false; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + + if (forcedConnections.size() >= 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + ConnectionMode mode = forcedConnections.get(dir); + if (mode != null) { + modes[i] = (byte) mode.ordinal(); + } else { + modes[i] = -1; + } + i++; + } + nbtRoot.setByteArray("forcedConnections", modes); + } + + if (signalColors.size() >= 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + DyeColor col = signalColors.get(dir); + if (col != null) { + modes[i] = (byte) col.ordinal(); + } else { + modes[i] = -1; + } + i++; + } + nbtRoot.setByteArray("signalColors", modes); + } + + if (signalStrengths.size() >= 0) { + byte[] modes = new byte[6]; + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + boolean isStrong = isOutputStrong(dir); + if (isStrong) { + modes[i] = 1; + } else { + modes[i] = 0; + } + i++; + } + nbtRoot.setByteArray("signalStrengths", modes); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + + forcedConnections.clear(); + byte[] modes = nbtRoot.getByteArray("forcedConnections"); + if (modes != null && modes.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (modes[i] >= 0) { + forcedConnections.put(dir, ConnectionMode.values()[modes[i]]); + } + i++; + } + } + + signalColors.clear(); + byte[] cols = nbtRoot.getByteArray("signalColors"); + if (cols != null && cols.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (cols[i] >= 0) { + signalColors.put(dir, DyeColor.values()[cols[i]]); + } + i++; + } + } + + signalStrengths.clear(); + byte[] strengths = nbtRoot.getByteArray("signalStrengths"); + if (strengths != null && strengths.length == 6) { + int i = 0; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (strengths[i] > 0) { + signalStrengths.put(dir, true); + } + i++; + } + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java index 9921484a..cf8d4047 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduitRenderer.java @@ -1,35 +1,34 @@ package crazypants.enderio.conduit.redstone; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; - import com.enderio.core.client.render.CubeRenderer; - import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; public class InsulatedRedstoneConduitRenderer extends DefaultConduitRenderer { - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit instanceof IInsulatedRedstoneConduit; - } - - @Override - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { - if(IInsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(component.data)) { - if(conduit.containsExternalConnection(component.dir) - && !((IInsulatedRedstoneConduit) conduit).isSpecialConnection(component.dir)) { - int c = ((IInsulatedRedstoneConduit) conduit).getSignalColor(component.dir).getColor(); - Tessellator tessellator = Tessellator.instance; - tessellator.setColorOpaque_I(c); - CubeRenderer.render(component.bound, tex); - tessellator.setColorOpaque(255, 255, 255); - } - } else { - super.renderConduit(tex, conduit, component, selfIllum); + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit instanceof IInsulatedRedstoneConduit; } - } + @Override + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float selfIllum) { + if (IInsulatedRedstoneConduit.COLOR_CONTROLLER_ID.equals(component.data)) { + if (conduit.containsExternalConnection(component.dir) + && !((IInsulatedRedstoneConduit) conduit).isSpecialConnection(component.dir)) { + int c = ((IInsulatedRedstoneConduit) conduit) + .getSignalColor(component.dir) + .getColor(); + Tessellator tessellator = Tessellator.instance; + tessellator.setColorOpaque_I(c); + CubeRenderer.render(component.bound, tex); + tessellator.setColorOpaque(255, 255, 255); + } + } else { + super.renderConduit(tex, conduit, component, selfIllum); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index 705636d8..1a4e522b 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -1,50 +1,50 @@ package crazypants.enderio.conduit.redstone; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class ItemRedstoneConduit extends AbstractItemConduit { - private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { - new ItemConduitSubtype(ModObject.itemRedstoneConduit.name(), "enderio:itemRedstoneConduit"), - new ItemConduitSubtype(ModObject.itemRedstoneConduit.name() + "Switch", "enderio:itemRedstoneSwitch"), - new ItemConduitSubtype(ModObject.itemRedstoneConduit.name() + "Insulated", "enderio:itemRedstoneInsulatedConduit") + private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { + new ItemConduitSubtype(ModObject.itemRedstoneConduit.name(), "enderio:itemRedstoneConduit"), + new ItemConduitSubtype(ModObject.itemRedstoneConduit.name() + "Switch", "enderio:itemRedstoneSwitch"), + new ItemConduitSubtype( + ModObject.itemRedstoneConduit.name() + "Insulated", "enderio:itemRedstoneInsulatedConduit") + }; - }; - - public static ItemRedstoneConduit create() { - ItemRedstoneConduit result = new ItemRedstoneConduit(); - result.init(); - return result; - } - - protected ItemRedstoneConduit() { - super(ModObject.itemRedstoneConduit, subtypes); - } - - @Override - public Class getBaseConduitType() { - return IRedstoneConduit.class; - } - - @Override - public IConduit createConduit(ItemStack stack, EntityPlayer player) { - if(stack.getItemDamage() == 0) { - return new RedstoneConduit(); + public static ItemRedstoneConduit create() { + ItemRedstoneConduit result = new ItemRedstoneConduit(); + result.init(); + return result; } - if(stack.getItemDamage() == 1) { - return new RedstoneSwitch(); - } else { - return new InsulatedRedstoneConduit(); - } - } - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + protected ItemRedstoneConduit() { + super(ModObject.itemRedstoneConduit, subtypes); + } + + @Override + public Class getBaseConduitType() { + return IRedstoneConduit.class; + } + + @Override + public IConduit createConduit(ItemStack stack, EntityPlayer player) { + if (stack.getItemDamage() == 0) { + return new RedstoneConduit(); + } + if (stack.getItemDamage() == 1) { + return new RedstoneSwitch(); + } else { + return new InsulatedRedstoneConduit(); + } + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index 03c759ca..57379c80 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -1,29 +1,10 @@ package crazypants.enderio.conduit.redstone; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; @@ -35,347 +16,374 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import dan200.computercraft.api.ComputerCraftAPI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit { - static final Map ICONS = new HashMap(); + static final Map ICONS = new HashMap(); - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(KEY_CORE_OFF_ICON, register.registerIcon(KEY_CORE_OFF_ICON)); - ICONS.put(KEY_CORE_ON_ICON, register.registerIcon(KEY_CORE_ON_ICON)); - ICONS.put(KEY_CONDUIT_ICON, register.registerIcon(KEY_CONDUIT_ICON)); - ICONS.put(KEY_TRANSMISSION_ICON, register.registerIcon(KEY_TRANSMISSION_ICON)); - } + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(KEY_CORE_OFF_ICON, register.registerIcon(KEY_CORE_OFF_ICON)); + ICONS.put(KEY_CORE_ON_ICON, register.registerIcon(KEY_CORE_ON_ICON)); + ICONS.put(KEY_CONDUIT_ICON, register.registerIcon(KEY_CONDUIT_ICON)); + ICONS.put(KEY_TRANSMISSION_ICON, register.registerIcon(KEY_TRANSMISSION_ICON)); + } - @Override - public int getTextureType() { + @Override + public int getTextureType() { + return 0; + } + }); + } + + protected RedstoneConduitNetwork network; + + protected final List> externalSignals = new ArrayList>(); + + protected boolean neighbourDirty = true; + + @SuppressWarnings("unused") + public RedstoneConduit() { + for (ForgeDirection ignored : ForgeDirection.VALID_DIRECTIONS) { + externalSignals.add(new HashSet()); + } + } + + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemRedstoneConduit, 1, 0); + } + + @Override + public Class getBaseConduitType() { + return IRedstoneConduit.class; + } + + @Override + public AbstractConduitNetwork getNetwork() { + return network; + } + + @Override + public boolean setNetwork(AbstractConduitNetwork network) { + this.network = (RedstoneConduitNetwork) network; + return true; + } + + @Override + public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { + return false; + } + + @Override + public void updateNetwork() { + World world = getBundle().getEntity().getWorldObj(); + if (world != null) { + updateNetwork(world); + } + } + + @Override + public void onChunkUnload(World worldObj) { + RedstoneConduitNetwork network = (RedstoneConduitNetwork) getNetwork(); + if (network != null) { + Set oldSignals = Sets.newHashSet(network.getSignals()); + List conduits = Lists.newArrayList(network.getConduits()); + super.onChunkUnload(worldObj); + network.afterChunkUnload(conduits, oldSignals); + } + } + + protected boolean acceptSignalsForDir(ForgeDirection dir) { + BlockCoord loc = getLocation().getLocation(dir); + return ConduitUtil.getConduit( + getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IRedstoneConduit.class) + == null; + } + + @Override + public Set getNetworkInputs() { + return getNetworkInputs(null); + } + + @Override + public Set getNetworkInputs(ForgeDirection side) { + if (network != null) { + network.setNetworkEnabled(false); + } + + Set res = new HashSet(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if ((side == null || dir == side) && acceptSignalsForDir(dir)) { + int input = getExternalPowerLevel(dir); + if (input > 1) { // need to degrade external signals by one as they + // enter + BlockCoord loc = getLocation().getLocation(dir); + Signal signal = new Signal(loc.x, loc.y, loc.z, dir, input - 1, getSignalColor(dir)); + res.add(signal); + } + + if (Loader.isModLoaded("MineFactoryReloaded")) { + // Add stored RedNet input. See onInputsChanged below for more information. + res.addAll(externalSignals.get(dir.ordinal())); + + // Manually check if neighbors are outputting bundled redstone signals. + // This is required to directly support other blocks implementing the + // RedNet API, without requiring a piece of RedNet cable in-between. + int[] bundledInput = getExternalBundledPowerLevel(dir); + if (bundledInput != null) { + BlockCoord loc = getLocation().getLocation(dir); + for (int subnet = 0; subnet < bundledInput.length; ++subnet) { + if (bundledInput[subnet] > 1) { // force signal strength reduction to avoid cycles + int color = convertColorForRedNet(subnet); + Signal signal = new Signal( + loc.x, loc.y, loc.z, dir, bundledInput[subnet] - 1, DyeColor.fromIndex(color)); + res.add(signal); + } + } + } + } + if (Loader.isModLoaded("ComputerCraft") && canConnectToExternal(dir, false)) { + BlockCoord loc = getLocation().getLocation(dir); + int bundledInput = getComputerCraftBundledPowerLevel(dir); + if (bundledInput >= 0) { + for (int i = 0; i < 16; i++) { + int color = bundledInput >>> i & 1; + Signal signal = new Signal( + loc.x, + loc.y, + loc.z, + dir, + color == 1 ? 16 : 0, + DyeColor.fromIndex(Math.max(0, 15 - i))); + res.add(signal); + } + } + } + } + } + + if (network != null) { + network.setNetworkEnabled(true); + } + + return res; + } + + @Override + public DyeColor getSignalColor(ForgeDirection dir) { + return DyeColor.RED; + } + + @Override + public Set getNetworkOutputs(ForgeDirection side) { + if (network == null) { + return Collections.emptySet(); + } + return network.getSignals(); + } + + @Override + public boolean onNeighborBlockChange(Block blockId) { + World world = getBundle().getEntity().getWorldObj(); + if (world.isRemote) { + return false; + } + boolean res = super.onNeighborBlockChange(blockId); + if (network == null || network.updatingNetwork) { + return false; + } + neighbourDirty |= blockId != EnderIO.blockConduitBundle; + return res; + } + + @Override + public void updateEntity(World world) { + super.updateEntity(world); + if (!world.isRemote && neighbourDirty) { + network.destroyNetwork(); + updateNetwork(world); + neighbourDirty = false; + } + } + + // returns 16 for string power inputs + protected int getExternalPowerLevel(ForgeDirection dir) { + World world = getBundle().getEntity().getWorldObj(); + BlockCoord loc = getLocation(); + loc = loc.getLocation(dir); + + int strong = world.isBlockProvidingPowerTo(loc.x, loc.y, loc.z, dir.ordinal()); + if (strong > 0) { + return 16; + } + + int res = world.getIndirectPowerLevelTo(loc.x, loc.y, loc.z, dir.ordinal()); + if (res < 15 && world.getBlock(loc.x, loc.y, loc.z) == Blocks.redstone_wire) { + int wireIn = world.getBlockMetadata(loc.x, loc.y, loc.z); + res = Math.max(res, wireIn); + } + return res; + } + + protected int[] getExternalBundledPowerLevel(ForgeDirection dir) { + World world = getBundle().getEntity().getWorldObj(); + BlockCoord loc = getLocation(); + loc = loc.getLocation(dir); + + Block block = world.getBlock(loc.x, loc.y, loc.z); + if (block instanceof IRedNetOutputNode) { + return ((IRedNetOutputNode) block).getOutputValues(world, loc.x, loc.y, loc.z, dir.getOpposite()); + } + + return null; + } + + @Method(modid = "ComputerCraft") + protected int getComputerCraftBundledPowerLevel(ForgeDirection dir) { + BlockCoord loc = getLocation().getLocation(dir); + return ComputerCraftAPI.getBundledRedstoneOutput( + getBundle().getWorld(), loc.x, loc.y, loc.z, dir.getOpposite().ordinal()); + } + + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { return 0; - } - - }); - } - - protected RedstoneConduitNetwork network; - - protected final List> externalSignals = new ArrayList>(); - - protected boolean neighbourDirty = true; - - @SuppressWarnings("unused") - public RedstoneConduit() { - for (ForgeDirection ignored : ForgeDirection.VALID_DIRECTIONS) { - externalSignals.add(new HashSet()); - } - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemRedstoneConduit, 1, 0); - } - - @Override - public Class getBaseConduitType() { - return IRedstoneConduit.class; - } - - @Override - public AbstractConduitNetwork getNetwork() { - return network; - } - - @Override - public boolean setNetwork(AbstractConduitNetwork network) { - this.network = (RedstoneConduitNetwork) network; - return true; - } - - @Override - public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - return false; - } - - @Override - public void updateNetwork() { - World world = getBundle().getEntity().getWorldObj(); - if(world != null) { - updateNetwork(world); - } - } - - @Override - public void onChunkUnload(World worldObj) { - RedstoneConduitNetwork network = (RedstoneConduitNetwork) getNetwork(); - if (network != null) { - Set oldSignals = Sets.newHashSet(network.getSignals()); - List conduits = Lists.newArrayList(network.getConduits()); - super.onChunkUnload(worldObj); - network.afterChunkUnload(conduits, oldSignals); - } - } - - protected boolean acceptSignalsForDir(ForgeDirection dir) { - BlockCoord loc = getLocation().getLocation(dir); - return ConduitUtil.getConduit(getBundle().getEntity().getWorldObj(), loc.x, loc.y, loc.z, IRedstoneConduit.class) == null; - } - - @Override - public Set getNetworkInputs() { - return getNetworkInputs(null); - } - - @Override - public Set getNetworkInputs(ForgeDirection side) { - if(network != null) { - network.setNetworkEnabled(false); } - Set res = new HashSet(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if((side == null || dir == side) && acceptSignalsForDir(dir)) { - int input = getExternalPowerLevel(dir); - if(input > 1) { // need to degrade external signals by one as they - // enter - BlockCoord loc = getLocation().getLocation(dir); - Signal signal = new Signal(loc.x, loc.y, loc.z, dir, input - 1, getSignalColor(dir)); - res.add(signal); + @Override + public int isProvidingWeakPower(ForgeDirection toDirection) { + if (network == null || !network.isNetworkEnabled()) { + return 0; } + int result = 0; + for (Signal signal : getNetworkOutputs(toDirection.getOpposite())) { + result = Math.max(result, signal.strength); + } + return result; + } - if (Loader.isModLoaded("MineFactoryReloaded")) { - // Add stored RedNet input. See onInputsChanged below for more information. - res.addAll(externalSignals.get(dir.ordinal())); + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (component.dir == ForgeDirection.UNKNOWN) { + return isActive() ? ICONS.get(KEY_CORE_ON_ICON) : ICONS.get(KEY_CORE_OFF_ICON); + } + return isActive() ? ICONS.get(KEY_TRANSMISSION_ICON) : ICONS.get(KEY_CONDUIT_ICON); + } - // Manually check if neighbors are outputting bundled redstone signals. - // This is required to directly support other blocks implementing the - // RedNet API, without requiring a piece of RedNet cable in-between. - int[] bundledInput = getExternalBundledPowerLevel(dir); - if(bundledInput != null) { - BlockCoord loc = getLocation().getLocation(dir); - for (int subnet = 0; subnet < bundledInput.length; ++subnet) { - if(bundledInput[subnet] > 1) { // force signal strength reduction to avoid cycles - int color = convertColorForRedNet(subnet); - Signal signal = new Signal(loc.x, loc.y, loc.z, dir, bundledInput[subnet] - 1, DyeColor.fromIndex(color)); - res.add(signal); - } + @Override + public IIcon getTransmitionTextureForState(CollidableComponent component) { + return null; + } + + @Override + public String toString() { + return "RedstoneConduit [network=" + network + " connections=" + conduitConnections + " active=" + active + "]"; + } + + @Override + public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side) { + int[] result = new int[16]; + + Set outs = network != null ? network.getSignals() : null; + if (outs != null) { + BlockCoord loc = getLocation().getLocation(side); + for (Signal s : outs) { + // Avoid "feedback loops", i.e. don't report an output on a side where + // we have an input (otherwise a RedNet cable connected to a conduit + // will keep a signal high, even if the original source vanishes). + // Note that it's still possible to get loops if there are two + // connections between a conduit set and a RedNet network. I'm not + // sure there's anything we could do to avoid this, though, nor am I + // convinced we should. + if (s.dir != side || s.x != loc.x || s.y != loc.y || s.z != loc.z) { + int subnet = convertColorForRedNet(s.color.ordinal()); + result[subnet] = s.strength; + } } - } } - if (Loader.isModLoaded("ComputerCraft") && canConnectToExternal(dir, false)) { - BlockCoord loc = getLocation().getLocation(dir); - int bundledInput = getComputerCraftBundledPowerLevel(dir); - if(bundledInput >= 0){ - for(int i = 0; i < 16; i++) { - int color = bundledInput >>> i & 1; - Signal signal = new Signal(loc.x, loc.y, loc.z, dir, color == 1 ? 16 : 0, DyeColor.fromIndex(Math.max(0, 15 - i))); - res.add(signal); + + return result; + } + + @Override + public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet) { + Set outs = network != null ? network.getSignals() : null; + if (outs != null) { + BlockCoord loc = getLocation().getLocation(side); + int color = convertColorForRedNet(subnet); + for (Signal s : outs) { + // Avoid "feedback loops", see comment in getOutputValues. + if (s.dir != side || s.x != loc.x || s.y != loc.y || s.z != loc.z) { + if (s.color.ordinal() == color) { + return s.strength; + } + } } - } } - } + + return 0; } - if(network != null) { - network.setNetworkEnabled(true); - } + @Override + public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues) { + // Check if anything changed, if so mark neighbor dirty to trigger an + // update in the next tick. We have to iterate over the colors in the + // outer loop to make sure we check all of them, because for channels + // with zero signal strength no signals are stored. + Set inputs = getNetworkInputs(side); + externalSignals.get(side.ordinal()).clear(); + BlockCoord loc = getLocation().getLocation(side); + for (int subnet = 0; subnet < inputValues.length; ++subnet) { + int color = convertColorForRedNet(subnet); + int newInput = inputValues[subnet]; + int oldInput = 0; + for (Signal input : inputs) { + if (input.color.ordinal() == color) { + oldInput = input.strength; + break; + } + } - return res; - } + neighbourDirty |= oldInput != newInput; - @Override - public DyeColor getSignalColor(ForgeDirection dir) { - return DyeColor.RED; - } - - @Override - public Set getNetworkOutputs(ForgeDirection side) { - if(network == null) { - return Collections.emptySet(); - } - return network.getSignals(); - } - - @Override - public boolean onNeighborBlockChange(Block blockId) { - World world = getBundle().getEntity().getWorldObj(); - if(world.isRemote) { - return false; - } - boolean res = super.onNeighborBlockChange(blockId); - if(network == null || network.updatingNetwork) { - return false; - } - neighbourDirty |= blockId != EnderIO.blockConduitBundle; - return res; - } - - @Override - public void updateEntity(World world) { - super.updateEntity(world); - if(!world.isRemote && neighbourDirty) { - network.destroyNetwork(); - updateNetwork(world); - neighbourDirty = false; - } - } - - //returns 16 for string power inputs - protected int getExternalPowerLevel(ForgeDirection dir) { - World world = getBundle().getEntity().getWorldObj(); - BlockCoord loc = getLocation(); - loc = loc.getLocation(dir); - - int strong = world.isBlockProvidingPowerTo(loc.x, loc.y, loc.z, dir.ordinal()); - if(strong > 0) { - return 16; - } - - int res = world.getIndirectPowerLevelTo(loc.x, loc.y, loc.z, dir.ordinal()); - if(res < 15 && world.getBlock(loc.x, loc.y, loc.z) == Blocks.redstone_wire) { - int wireIn = world.getBlockMetadata(loc.x, loc.y, loc.z); - res = Math.max(res, wireIn); - } - return res; - } - - protected int[] getExternalBundledPowerLevel(ForgeDirection dir) { - World world = getBundle().getEntity().getWorldObj(); - BlockCoord loc = getLocation(); - loc = loc.getLocation(dir); - - Block block = world.getBlock(loc.x, loc.y, loc.z); - if(block instanceof IRedNetOutputNode) { - return ((IRedNetOutputNode) block).getOutputValues(world, loc.x, loc.y, loc.z, dir.getOpposite()); - } - - return null; - } - - @Method(modid = "ComputerCraft") - protected int getComputerCraftBundledPowerLevel(ForgeDirection dir) { - BlockCoord loc = getLocation().getLocation(dir); - return ComputerCraftAPI.getBundledRedstoneOutput(getBundle().getWorld(), loc.x,loc.y,loc.z, dir.getOpposite().ordinal()); - } - - @Override - public int isProvidingStrongPower(ForgeDirection toDirection) { - return 0; - } - - @Override - public int isProvidingWeakPower(ForgeDirection toDirection) { - if(network == null || !network.isNetworkEnabled()) { - return 0; - } - int result = 0; - for (Signal signal : getNetworkOutputs(toDirection.getOpposite())) { - result = Math.max(result, signal.strength); - } - return result; - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(component.dir == ForgeDirection.UNKNOWN) { - return isActive() ? ICONS.get(KEY_CORE_ON_ICON) : ICONS.get(KEY_CORE_OFF_ICON); - } - return isActive() ? ICONS.get(KEY_TRANSMISSION_ICON) : ICONS.get(KEY_CONDUIT_ICON); - } - - @Override - public IIcon getTransmitionTextureForState(CollidableComponent component) { - return null; - } - - @Override - public String toString() { - return "RedstoneConduit [network=" + network + " connections=" + conduitConnections + " active=" + active + "]"; - } - - @Override - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side) { - int[] result = new int[16]; - - Set outs = network != null ? network.getSignals() : null; - if(outs != null) { - BlockCoord loc = getLocation().getLocation(side); - for (Signal s : outs) { - // Avoid "feedback loops", i.e. don't report an output on a side where - // we have an input (otherwise a RedNet cable connected to a conduit - // will keep a signal high, even if the original source vanishes). - // Note that it's still possible to get loops if there are two - // connections between a conduit set and a RedNet network. I'm not - // sure there's anything we could do to avoid this, though, nor am I - // convinced we should. - if(s.dir != side || s.x != loc.x || s.y != loc.y || s.z != loc.z) { - int subnet = convertColorForRedNet(s.color.ordinal()); - result[subnet] = s.strength; + // Store external inputs to allow regenerating the global list of signals + // in getNetworkInputs. This is required for RedNet cables to work, e.g. + if (newInput > 1) { // force signal strength reduction to avoid cycles + externalSignals + .get(side.ordinal()) + .add(new Signal(loc.x, loc.y, loc.z, side, newInput - 1, DyeColor.fromIndex(color))); + } } - } } - return result; - } - - @Override - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet) { - Set outs = network != null ? network.getSignals() : null; - if(outs != null) { - BlockCoord loc = getLocation().getLocation(side); - int color = convertColorForRedNet(subnet); - for (Signal s : outs) { - // Avoid "feedback loops", see comment in getOutputValues. - if(s.dir != side || s.x != loc.x || s.y != loc.y || s.z != loc.z) { - if(s.color.ordinal() == color) { - return s.strength; - } - } - } + @Override + public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { + return false; } - return 0; - } - - @Override - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues) { - // Check if anything changed, if so mark neighbor dirty to trigger an - // update in the next tick. We have to iterate over the colors in the - // outer loop to make sure we check all of them, because for channels - // with zero signal strength no signals are stored. - Set inputs = getNetworkInputs(side); - externalSignals.get(side.ordinal()).clear(); - BlockCoord loc = getLocation().getLocation(side); - for (int subnet = 0; subnet < inputValues.length; ++subnet) { - int color = convertColorForRedNet(subnet); - int newInput = inputValues[subnet]; - int oldInput = 0; - for (Signal input : inputs) { - if(input.color.ordinal() == color) { - oldInput = input.strength; - break; - } - } - - neighbourDirty |= oldInput != newInput; - - // Store external inputs to allow regenerating the global list of signals - // in getNetworkInputs. This is required for RedNet cables to work, e.g. - if(newInput > 1) { // force signal strength reduction to avoid cycles - externalSignals.get(side.ordinal()).add(new Signal(loc.x, loc.y, loc.z, side, newInput - 1, DyeColor.fromIndex(color))); - } + // RedNet refers to colors in inverse order... + private static int convertColorForRedNet(int colorOrSubnet) { + return 15 - colorOrSubnet; } - } - - @Override - public boolean onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ) { - return false; - } - - // RedNet refers to colors in inverse order... - private static int convertColorForRedNet(int colorOrSubnet) { - return 15 - colorOrSubnet; - } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java index 380c8953..5915932f 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java @@ -1,243 +1,244 @@ package crazypants.enderio.conduit.redstone; +import com.enderio.core.common.util.BlockCoord; +import com.google.common.collect.Sets; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.AbstractConduitNetwork; +import crazypants.enderio.conduit.IConduitBundle; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.google.common.collect.Sets; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.AbstractConduitNetwork; -import crazypants.enderio.conduit.IConduitBundle; - public class RedstoneConduitNetwork extends AbstractConduitNetwork { - private final Set signals = new HashSet(); + private final Set signals = new HashSet(); - boolean updatingNetwork = false; + boolean updatingNetwork = false; - private boolean networkEnabled = true; + private boolean networkEnabled = true; - public RedstoneConduitNetwork() { - super(IRedstoneConduit.class, IRedstoneConduit.class); - } - - @Override - public void init(IConduitBundle tile, Collection connections, World world) { - super.init(tile, connections, world); - updatingNetwork = true; - notifyNeigborsOfSignals(); - updatingNetwork = false; - } - - @Override - public void destroyNetwork() { - updatingNetwork = true; - for (IRedstoneConduit con : conduits) { - con.setActive(false); + public RedstoneConduitNetwork() { + super(IRedstoneConduit.class, IRedstoneConduit.class); } - // Notify neighbours that all signals have been lost - List copy = new ArrayList(signals); - signals.clear(); - for (Signal s : copy) { - notifyNeigborsOfSignalUpdate(s); + + @Override + public void init(IConduitBundle tile, Collection connections, World world) { + super.init(tile, connections, world); + updatingNetwork = true; + notifyNeigborsOfSignals(); + updatingNetwork = false; } - updatingNetwork = false; - super.destroyNetwork(); - } - @Override - public void addConduit(IRedstoneConduit con) { - updatingNetwork = true; - super.addConduit(con); - Set newInputs = con.getNetworkInputs(); - signals.addAll(newInputs); - // Notify existing nodes of new signals - for (Signal signal : newInputs) { - notifyNeigborsOfSignalUpdate(signal); - } - // and new nodes neighbours of all signals - for (Signal signal : signals) { - notifyConduitNeighbours(con, signal); - } - updatingNetwork = false; - } - - public Set getSignals() { - if (networkEnabled) { - return signals; - } else { - return Collections.emptySet(); - } - } - - // Need to disable the network when determining the strength of external - // signals - // to avoid feed back looops - void setNetworkEnabled(boolean enabled) { - networkEnabled = enabled; - } - - public boolean isNetworkEnabled() { - return networkEnabled; - } - - public void addSignals(Set newSignals) { - for (Signal signal : newSignals) { - addSignal(signal); - } - } - - public void addSignal(Signal signal) { - updatingNetwork = true; - signals.add(signal); - notifyNetworkOfUpdate(); - notifyNeigborsOfSignalUpdate(signal); - updatingNetwork = false; - } - - public void removeSignals(Set remove) { - for (Signal signal : remove) { - removeSignal(signal); - } - } - - public void removeSignal(Signal signal) { - updatingNetwork = true; - signals.remove(signal); - notifyNetworkOfUpdate(); - notifyNeigborsOfSignalUpdate(signal); - updatingNetwork = false; - } - - public void replaceSignal(Signal oldSig, Signal newSig) { - updatingNetwork = true; - signals.remove(oldSig); - signals.add(newSig); - notifyNetworkOfUpdate(); - notifyNeigborsOfSignalUpdate(newSig); - updatingNetwork = false; - } - - @Override - public void notifyNetworkOfUpdate() { - for (IRedstoneConduit con : conduits) { - con.setActive(false); - for (Signal s : getSignals()) { - if (s.strength > 0) { - con.setActive(true); - break; + @Override + public void destroyNetwork() { + updatingNetwork = true; + for (IRedstoneConduit con : conduits) { + con.setActive(false); } - } - } - super.notifyNetworkOfUpdate(); - } - - @Override - public String toString() { - return "RedstoneConduitNetwork [signals=" + signalsString() + ", conduits=" + conduitsString() + "]"; - } - - private String conduitsString() { - StringBuilder sb = new StringBuilder(); - for (IRedstoneConduit con : conduits) { - TileEntity te = con.getBundle().getEntity(); - sb.append("<").append(te.xCoord).append(",").append(te.yCoord).append(",").append(te.zCoord).append(">"); - } - return sb.toString(); - } - - String signalsString() { - StringBuilder sb = new StringBuilder(); - for (Signal s : signals) { - sb.append("<"); - sb.append(s); - sb.append(">"); - - } - return sb.toString(); - } - - public void notifyNeigborsOfSignals() { - for (Signal signal : signals) { - notifyNeigborsOfSignalUpdate(signal); - } - } - - public void notifyNeigborsOfSignalUpdate(Signal signal) { - ArrayList conduitsCopy = new ArrayList(conduits); - for (IRedstoneConduit con : conduitsCopy) { - notifyConduitNeighbours(con, signal); - } - } - - private void notifyConduitNeighbours(IRedstoneConduit con, Signal signal) { - if (con.getBundle() == null) { - System.out.println("RedstoneConduitNetwork.notifyNeigborsOfSignalUpdate: NULL BUNDLE!!!!"); - return; - } - TileEntity te = con.getBundle().getEntity(); - - World worldObj = te.getWorldObj(); - - BlockCoord bc1 = new BlockCoord(te); - - if (!worldObj.blockExists(te.xCoord, te.yCoord, te.zCoord)) { - return; + // Notify neighbours that all signals have been lost + List copy = new ArrayList(signals); + signals.clear(); + for (Signal s : copy) { + notifyNeigborsOfSignalUpdate(s); + } + updatingNetwork = false; + super.destroyNetwork(); } - // Done manually to avoid orphaning chunks - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord bc2 = bc1.getLocation(dir); - if (worldObj.blockExists(bc2.x, bc2.y, bc2.z)) { - worldObj.notifyBlockOfNeighborChange(bc2.x, bc2.y, bc2.z, EnderIO.blockConduitBundle); - if (signal != null && bc2.getBlock(worldObj).isNormalCube()) { - for (ForgeDirection dir2 : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord bc3 = bc2.getLocation(dir2); - if (!bc3.equals(bc1) && worldObj.blockExists(bc3.x, bc3.y, bc3.z)) { - worldObj.notifyBlockOfNeighborChange(bc3.x, bc3.y, bc3.z, EnderIO.blockConduitBundle); + @Override + public void addConduit(IRedstoneConduit con) { + updatingNetwork = true; + super.addConduit(con); + Set newInputs = con.getNetworkInputs(); + signals.addAll(newInputs); + // Notify existing nodes of new signals + for (Signal signal : newInputs) { + notifyNeigborsOfSignalUpdate(signal); + } + // and new nodes neighbours of all signals + for (Signal signal : signals) { + notifyConduitNeighbours(con, signal); + } + updatingNetwork = false; + } + + public Set getSignals() { + if (networkEnabled) { + return signals; + } else { + return Collections.emptySet(); + } + } + + // Need to disable the network when determining the strength of external + // signals + // to avoid feed back looops + void setNetworkEnabled(boolean enabled) { + networkEnabled = enabled; + } + + public boolean isNetworkEnabled() { + return networkEnabled; + } + + public void addSignals(Set newSignals) { + for (Signal signal : newSignals) { + addSignal(signal); + } + } + + public void addSignal(Signal signal) { + updatingNetwork = true; + signals.add(signal); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(signal); + updatingNetwork = false; + } + + public void removeSignals(Set remove) { + for (Signal signal : remove) { + removeSignal(signal); + } + } + + public void removeSignal(Signal signal) { + updatingNetwork = true; + signals.remove(signal); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(signal); + updatingNetwork = false; + } + + public void replaceSignal(Signal oldSig, Signal newSig) { + updatingNetwork = true; + signals.remove(oldSig); + signals.add(newSig); + notifyNetworkOfUpdate(); + notifyNeigborsOfSignalUpdate(newSig); + updatingNetwork = false; + } + + @Override + public void notifyNetworkOfUpdate() { + for (IRedstoneConduit con : conduits) { + con.setActive(false); + for (Signal s : getSignals()) { + if (s.strength > 0) { + con.setActive(true); + break; + } } - } } - } + super.notifyNetworkOfUpdate(); } - } - /** - * This is a bit of a hack...avoids the network searching for inputs from - * unloaded chunks by only filtering out the invalid signals from the unloaded - * chunk. - * - * @param conduits - * @param oldSignals - */ - public void afterChunkUnload(List conduits, Set oldSignals) { - World world = null; - for (IRedstoneConduit c : conduits) { - if (world == null) { - world = c.getBundle().getWorld(); - } - BlockCoord loc = c.getLocation(); - if (world.blockExists(loc.x, loc.y, loc.z)) { - this.conduits.add(c); - c.setNetwork(this); - } + @Override + public String toString() { + return "RedstoneConduitNetwork [signals=" + signalsString() + ", conduits=" + conduitsString() + "]"; } - Set valid = Sets.newHashSet(); - for (Signal s : oldSignals) { - if (world.blockExists(s.x, s.y, s.z)) { - valid.add(s); - } - } - this.addSignals(valid); - } + private String conduitsString() { + StringBuilder sb = new StringBuilder(); + for (IRedstoneConduit con : conduits) { + TileEntity te = con.getBundle().getEntity(); + sb.append("<") + .append(te.xCoord) + .append(",") + .append(te.yCoord) + .append(",") + .append(te.zCoord) + .append(">"); + } + return sb.toString(); + } + + String signalsString() { + StringBuilder sb = new StringBuilder(); + for (Signal s : signals) { + sb.append("<"); + sb.append(s); + sb.append(">"); + } + return sb.toString(); + } + + public void notifyNeigborsOfSignals() { + for (Signal signal : signals) { + notifyNeigborsOfSignalUpdate(signal); + } + } + + public void notifyNeigborsOfSignalUpdate(Signal signal) { + ArrayList conduitsCopy = new ArrayList(conduits); + for (IRedstoneConduit con : conduitsCopy) { + notifyConduitNeighbours(con, signal); + } + } + + private void notifyConduitNeighbours(IRedstoneConduit con, Signal signal) { + if (con.getBundle() == null) { + System.out.println("RedstoneConduitNetwork.notifyNeigborsOfSignalUpdate: NULL BUNDLE!!!!"); + return; + } + TileEntity te = con.getBundle().getEntity(); + + World worldObj = te.getWorldObj(); + + BlockCoord bc1 = new BlockCoord(te); + + if (!worldObj.blockExists(te.xCoord, te.yCoord, te.zCoord)) { + return; + } + + // Done manually to avoid orphaning chunks + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord bc2 = bc1.getLocation(dir); + if (worldObj.blockExists(bc2.x, bc2.y, bc2.z)) { + worldObj.notifyBlockOfNeighborChange(bc2.x, bc2.y, bc2.z, EnderIO.blockConduitBundle); + if (signal != null && bc2.getBlock(worldObj).isNormalCube()) { + for (ForgeDirection dir2 : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord bc3 = bc2.getLocation(dir2); + if (!bc3.equals(bc1) && worldObj.blockExists(bc3.x, bc3.y, bc3.z)) { + worldObj.notifyBlockOfNeighborChange(bc3.x, bc3.y, bc3.z, EnderIO.blockConduitBundle); + } + } + } + } + } + } + + /** + * This is a bit of a hack...avoids the network searching for inputs from + * unloaded chunks by only filtering out the invalid signals from the unloaded + * chunk. + * + * @param conduits + * @param oldSignals + */ + public void afterChunkUnload(List conduits, Set oldSignals) { + World world = null; + for (IRedstoneConduit c : conduits) { + if (world == null) { + world = c.getBundle().getWorld(); + } + BlockCoord loc = c.getLocation(); + if (world.blockExists(loc.x, loc.y, loc.z)) { + this.conduits.add(c); + c.setNetwork(this); + } + } + Set valid = Sets.newHashSet(); + for (Signal s : oldSignals) { + if (world.blockExists(s.x, s.y, s.z)) { + valid.add(s); + } + } + this.addSignals(valid); + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java index 5a83b440..4223380b 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitch.java @@ -1,8 +1,19 @@ package crazypants.enderio.conduit.redstone; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.RaytraceResult; +import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitGeometryUtil; +import crazypants.enderio.conduit.geom.Offset; import java.util.List; import java.util.Set; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,133 +22,122 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.RaytraceResult; -import crazypants.enderio.conduit.geom.CollidableComponent; -import crazypants.enderio.conduit.geom.ConduitGeometryUtil; -import crazypants.enderio.conduit.geom.Offset; - public class RedstoneSwitch extends RedstoneConduit { - static final String SWITCH_TAG = "switch"; - public static final String SWITHC_ICON_OFF_KEY = "enderio:redstoneConduitSwitchOff"; - public static final String SWITCH_ICON_ON_KEY = "enderio:redstoneConduitSwitchOn"; + static final String SWITCH_TAG = "switch"; + public static final String SWITHC_ICON_OFF_KEY = "enderio:redstoneConduitSwitchOff"; + public static final String SWITCH_ICON_ON_KEY = "enderio:redstoneConduitSwitchOn"; - private boolean isOn; + private boolean isOn; - @SideOnly(Side.CLIENT) - public static void initIcons() { - IconUtil.addIconProvider(new IconUtil.IIconProvider() { + @SideOnly(Side.CLIENT) + public static void initIcons() { + IconUtil.addIconProvider(new IconUtil.IIconProvider() { - @Override - public void registerIcons(IIconRegister register) { - ICONS.put(RedstoneSwitch.SWITHC_ICON_OFF_KEY, register.registerIcon(SWITHC_ICON_OFF_KEY)); - ICONS.put(RedstoneSwitch.SWITCH_ICON_ON_KEY, register.registerIcon(SWITCH_ICON_ON_KEY)); - } + @Override + public void registerIcons(IIconRegister register) { + ICONS.put(RedstoneSwitch.SWITHC_ICON_OFF_KEY, register.registerIcon(SWITHC_ICON_OFF_KEY)); + ICONS.put(RedstoneSwitch.SWITCH_ICON_ON_KEY, register.registerIcon(SWITCH_ICON_ON_KEY)); + } - @Override - public int getTextureType() { - return 0; - } - - }); - } - - @Override - public ItemStack createItem() { - return new ItemStack(EnderIO.itemRedstoneConduit, 1, 1); - } - - @Override - public int isProvidingStrongPower(ForgeDirection toDirection) { - if(network == null || !network.isNetworkEnabled()) { - return 0; - } - return isOn ? 15 : 0; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setBoolean("switchOn", isOn); - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { - super.readFromNBT(nbtRoot, nbtVersion); - isOn = nbtRoot.getBoolean("switchOn"); - } - - IIcon getSwitchIcon() { - return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); - } - - @Override - public IIcon getTextureForState(CollidableComponent component) { - if(SWITCH_TAG.equals(component.data)) { - return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); - } - return super.getTextureForState(component); - } - - @Override - public List getCollidableComponents() { - if(collidables != null && !collidablesDirty) { - return collidables; + @Override + public int getTextureType() { + return 0; + } + }); } - Offset o = getBundle().getOffset(getBaseConduitType(), ForgeDirection.UNKNOWN); - Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, o); - - List result = super.getCollidableComponents(); - BoundingBox[] aabb = RedstoneSwitchBounds.getInstance().getAABB(); - - for (BoundingBox bb : aabb) { - result.add(new CollidableComponent(IRedstoneConduit.class, bb.translate(trans), ForgeDirection.UNKNOWN, SWITCH_TAG)); + @Override + public ItemStack createItem() { + return new ItemStack(EnderIO.itemRedstoneConduit, 1, 1); } - return result; - } + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { + if (network == null || !network.isNetworkEnabled()) { + return 0; + } + return isOn ? 15 : 0; + } - @Override - public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - if(res != null && res.component != null && res.component.data != null && res.component.data.equals(SWITCH_TAG)) { - toggleSwitch(); - return true; + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + super.writeToNBT(nbtRoot); + nbtRoot.setBoolean("switchOn", isOn); } - return false; - } - private void toggleSwitch() { - isOn = !isOn; - if(network == null) { - return; + @Override + public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { + super.readFromNBT(nbtRoot, nbtVersion); + isOn = nbtRoot.getBoolean("switchOn"); } - TileEntity te = bundle.getEntity(); - Signal signal = new Signal(te.xCoord, te.yCoord, te.zCoord, ForgeDirection.UNKNOWN, 15, DyeColor.RED); - if(isOn) { - network.addSignal(signal); - } else { - network.removeSignal(signal); - } - } - @Override - public Set getNetworkInputs() { - Set res = super.getNetworkInputs(); - if(isOn) { - BlockCoord loc = getLocation(); - Signal signal = new Signal(loc.x, loc.y, loc.z, ForgeDirection.UNKNOWN, 15, DyeColor.RED); - res.add(signal); + IIcon getSwitchIcon() { + return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); + } + + @Override + public IIcon getTextureForState(CollidableComponent component) { + if (SWITCH_TAG.equals(component.data)) { + return isOn ? ICONS.get(SWITCH_ICON_ON_KEY) : ICONS.get(SWITHC_ICON_OFF_KEY); + } + return super.getTextureForState(component); + } + + @Override + public List getCollidableComponents() { + if (collidables != null && !collidablesDirty) { + return collidables; + } + + Offset o = getBundle().getOffset(getBaseConduitType(), ForgeDirection.UNKNOWN); + Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, o); + + List result = super.getCollidableComponents(); + BoundingBox[] aabb = RedstoneSwitchBounds.getInstance().getAABB(); + + for (BoundingBox bb : aabb) { + result.add(new CollidableComponent( + IRedstoneConduit.class, bb.translate(trans), ForgeDirection.UNKNOWN, SWITCH_TAG)); + } + + return result; + } + + @Override + public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { + if (res != null + && res.component != null + && res.component.data != null + && res.component.data.equals(SWITCH_TAG)) { + toggleSwitch(); + return true; + } + return false; + } + + private void toggleSwitch() { + isOn = !isOn; + if (network == null) { + return; + } + TileEntity te = bundle.getEntity(); + Signal signal = new Signal(te.xCoord, te.yCoord, te.zCoord, ForgeDirection.UNKNOWN, 15, DyeColor.RED); + if (isOn) { + network.addSignal(signal); + } else { + network.removeSignal(signal); + } + } + + @Override + public Set getNetworkInputs() { + Set res = super.getNetworkInputs(); + if (isOn) { + BlockCoord loc = getLocation(); + Signal signal = new Signal(loc.x, loc.y, loc.z, ForgeDirection.UNKNOWN, 15, DyeColor.RED); + res.add(signal); + } + return res; } - return res; - } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java index ec1ed35b..07547046 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java @@ -4,62 +4,66 @@ import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.VertexRotation; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.config.Config; public class RedstoneSwitchBounds { - private static RedstoneSwitchBounds instance; + private static RedstoneSwitchBounds instance; - public static final RedstoneSwitchBounds getInstance() { - if(instance == null) { - instance = new RedstoneSwitchBounds(); - } - return instance; - } - - final VertexTransform[] xForms; - final BoundingBox switchBounds; - final BoundingBox connectorBounds; - - private final BoundingBox[] aabb; - - RedstoneSwitchBounds() { - - float conduitScale = (float) Config.conduitScale; - - float size = Math.max(0.2f, conduitScale * 0.5f); - float halfWidth = size / 3; - float halfHeight = size / 2; - - //float DEPTH = 0.05f; - float halfDepth = 0.025f; - float distance = Math.max(0.25f, conduitScale * 0.3f); - - BoundingBox bb = new BoundingBox(0.5 - halfWidth, 0.5 - halfHeight, 0.5 - halfDepth, 0.5 + halfWidth, 0.5 + halfHeight, 0.5 + halfDepth); - switchBounds = bb.translate(0, 0, distance); - - float connectorHalfWidth = (float) Math.max(0.015, conduitScale * 0.05); - connectorBounds = new BoundingBox(0.5 - connectorHalfWidth, 0.5 - connectorHalfWidth, 0.5 - connectorHalfWidth, 0.5 + connectorHalfWidth, - 0.5 + connectorHalfWidth, 0.5 + distance); - - Vector3d axis = new Vector3d(0, 1, 0); - Vector3d p = new Vector3d(0.5, 0.5, 0.5); - xForms = new VertexTransform[4]; - double angle = Math.toRadians(45); - for (int i = 0; i < xForms.length; i++) { - xForms[i] = new VertexRotation(angle, axis, p); - angle += Math.toRadians(90); + public static final RedstoneSwitchBounds getInstance() { + if (instance == null) { + instance = new RedstoneSwitchBounds(); + } + return instance; } - aabb = new BoundingBox[xForms.length]; - for (int i = 0; i < xForms.length; i++) { - aabb[i] = switchBounds.transform(xForms[i]); + final VertexTransform[] xForms; + final BoundingBox switchBounds; + final BoundingBox connectorBounds; + + private final BoundingBox[] aabb; + + RedstoneSwitchBounds() { + + float conduitScale = (float) Config.conduitScale; + + float size = Math.max(0.2f, conduitScale * 0.5f); + float halfWidth = size / 3; + float halfHeight = size / 2; + + // float DEPTH = 0.05f; + float halfDepth = 0.025f; + float distance = Math.max(0.25f, conduitScale * 0.3f); + + BoundingBox bb = new BoundingBox( + 0.5 - halfWidth, 0.5 - halfHeight, 0.5 - halfDepth, 0.5 + halfWidth, 0.5 + halfHeight, 0.5 + halfDepth); + switchBounds = bb.translate(0, 0, distance); + + float connectorHalfWidth = (float) Math.max(0.015, conduitScale * 0.05); + connectorBounds = new BoundingBox( + 0.5 - connectorHalfWidth, + 0.5 - connectorHalfWidth, + 0.5 - connectorHalfWidth, + 0.5 + connectorHalfWidth, + 0.5 + connectorHalfWidth, + 0.5 + distance); + + Vector3d axis = new Vector3d(0, 1, 0); + Vector3d p = new Vector3d(0.5, 0.5, 0.5); + xForms = new VertexTransform[4]; + double angle = Math.toRadians(45); + for (int i = 0; i < xForms.length; i++) { + xForms[i] = new VertexRotation(angle, axis, p); + angle += Math.toRadians(90); + } + + aabb = new BoundingBox[xForms.length]; + for (int i = 0; i < xForms.length; i++) { + aabb[i] = switchBounds.transform(xForms[i]); + } } - } - - public BoundingBox[] getAABB() { - return aabb; - } + public BoundingBox[] getAABB() { + return aabb; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index e7ea4a07..fcb78617 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -1,15 +1,9 @@ package crazypants.enderio.conduit.redstone; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; @@ -18,65 +12,75 @@ import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class RedstoneSwitchRenderer extends DefaultConduitRenderer { - private static final RedstoneSwitchRenderer instance = new RedstoneSwitchRenderer(); + private static final RedstoneSwitchRenderer instance = new RedstoneSwitchRenderer(); - public static RedstoneSwitchRenderer getInstance() { - return instance; - } - - private final VertexTransform[] xForms; - private final BoundingBox switchBounds; - private final BoundingBox connectorBounds; - - private RedstoneSwitchRenderer() { - xForms = RedstoneSwitchBounds.getInstance().xForms; - switchBounds = RedstoneSwitchBounds.getInstance().switchBounds; - connectorBounds = RedstoneSwitchBounds.getInstance().connectorBounds; - } - - @Override - public boolean isRendererForConduit(IConduit conduit) { - return conduit.getClass() == RedstoneSwitch.class; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle bundle, IConduit conduit, double x, double y, double z, - float partialTick, - float worldLight, RenderBlocks rb) { - - super.renderEntity(conduitBundleRenderer, bundle, conduit, x, y, z, partialTick, worldLight, rb); - - RedstoneSwitch sw = (RedstoneSwitch) conduit; - - Tessellator tessellator = Tessellator.instance; - float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(null)); - tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum); - - IIcon[] icons = new IIcon[6]; - for (int i = 0; i < icons.length; i++) { - icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL); - } - icons[3] = sw.getSwitchIcon(); - - Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, bundle.getOffset(IRedstoneConduit.class, ForgeDirection.UNKNOWN)); - BoundingBox bb = switchBounds.translate(trans); - - for (VertexTransform tf : xForms) { - CubeRenderer.render(bb, icons, tf,null); - } - bb = connectorBounds.translate(trans); - for (VertexTransform tf : xForms) { - CubeRenderer.render(bb, icons[0], tf); + public static RedstoneSwitchRenderer getInstance() { + return instance; } - } + private final VertexTransform[] xForms; + private final BoundingBox switchBounds; + private final BoundingBox connectorBounds; - @Override - protected boolean renderComponent(CollidableComponent component) { - return !RedstoneSwitch.SWITCH_TAG.equals(component.data); - } + private RedstoneSwitchRenderer() { + xForms = RedstoneSwitchBounds.getInstance().xForms; + switchBounds = RedstoneSwitchBounds.getInstance().switchBounds; + connectorBounds = RedstoneSwitchBounds.getInstance().connectorBounds; + } + @Override + public boolean isRendererForConduit(IConduit conduit) { + return conduit.getClass() == RedstoneSwitch.class; + } + + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle bundle, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { + + super.renderEntity(conduitBundleRenderer, bundle, conduit, x, y, z, partialTick, worldLight, rb); + + RedstoneSwitch sw = (RedstoneSwitch) conduit; + + Tessellator tessellator = Tessellator.instance; + float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(null)); + tessellator.setColorOpaque_F(selfIllum, selfIllum, selfIllum); + + IIcon[] icons = new IIcon[6]; + for (int i = 0; i < icons.length; i++) { + icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL); + } + icons[3] = sw.getSwitchIcon(); + + Vector3d trans = ConduitGeometryUtil.instance.getTranslation( + ForgeDirection.UNKNOWN, bundle.getOffset(IRedstoneConduit.class, ForgeDirection.UNKNOWN)); + BoundingBox bb = switchBounds.translate(trans); + + for (VertexTransform tf : xForms) { + CubeRenderer.render(bb, icons, tf, null); + } + bb = connectorBounds.translate(trans); + for (VertexTransform tf : xForms) { + CubeRenderer.render(bb, icons[0], tf); + } + } + + @Override + protected boolean renderComponent(CollidableComponent component) { + return !RedstoneSwitch.SWITCH_TAG.equals(component.data); + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/Signal.java b/src/main/java/crazypants/enderio/conduit/redstone/Signal.java index 62d06199..4fce0bbb 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/Signal.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/Signal.java @@ -1,76 +1,75 @@ package crazypants.enderio.conduit.redstone; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; +import net.minecraftforge.common.util.ForgeDirection; public class Signal { - public final int x; - public final int y; - public final int z; - public final ForgeDirection dir; - public final int strength; - public final DyeColor color; + public final int x; + public final int y; + public final int z; + public final ForgeDirection dir; + public final int strength; + public final DyeColor color; - public Signal(int x, int y, int z, ForgeDirection dir, int strength, DyeColor color) { - this.x = x; - this.y = y; - this.z = z; - this.dir = dir; - this.strength = strength; - this.color = color; - } + public Signal(int x, int y, int z, ForgeDirection dir, int strength, DyeColor color) { + this.x = x; + this.y = y; + this.z = z; + this.dir = dir; + this.strength = strength; + this.color = color; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((color == null) ? 0 : color.hashCode()); - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - result = prime * result + strength; - result = prime * result + x; - result = prime * result + y; - result = prime * result + z; - return result; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((color == null) ? 0 : color.hashCode()); + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + strength; + result = prime * result + x; + result = prime * result + y; + result = prime * result + z; + return result; + } - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + Signal other = (Signal) obj; + if (color != other.color) { + return false; + } + if (dir != other.dir) { + return false; + } + if (strength != other.strength) { + return false; + } + if (x != other.x) { + return false; + } + if (y != other.y) { + return false; + } + if (z != other.z) { + return false; + } + return true; } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - Signal other = (Signal) obj; - if(color != other.color) { - return false; - } - if(dir != other.dir) { - return false; - } - if(strength != other.strength) { - return false; - } - if(x != other.x) { - return false; - } - if(y != other.y) { - return false; - } - if(z != other.z) { - return false; - } - return true; - } - - @Override - public String toString() { - return "Signal [x=" + x + " y=" + y + " z=" + z + " side= " + dir + " strength=" + strength + " color=" + color + "]"; - } + @Override + public String toString() { + return "Signal [x=" + x + " y=" + y + " z=" + z + " side= " + dir + " strength=" + strength + " color=" + color + + "]"; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java index 20d43194..cf456d0a 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java @@ -2,87 +2,86 @@ package crazypants.enderio.conduit.redstone; import java.util.HashSet; import java.util.Set; - import net.minecraftforge.common.util.ForgeDirection; public class SignalSource { - public final Signal signal; + public final Signal signal; - public final ForgeDirection fromDirection; + public final ForgeDirection fromDirection; - public SignalSource(Signal signal, ForgeDirection fromDirection) { - this.signal = signal; - this.fromDirection = fromDirection; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((fromDirection == null) ? 0 : fromDirection.hashCode()); - result = prime * result + ((signal == null) ? 0 : signal.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; + public SignalSource(Signal signal, ForgeDirection fromDirection) { + this.signal = signal; + this.fromDirection = fromDirection; } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - SignalSource other = (SignalSource) obj; - if(fromDirection != other.fromDirection) { - return false; - } - if(signal == null) { - if(other.signal != null) { - return false; - } - } else if(!signal.equals(other.signal)) { - return false; - } - return true; - } - @Override - public String toString() { - return "SignalSource [signal=" + signal + ", fromDirection=" + fromDirection + "]"; - } - - public static int[] toIntArray(Set sources) { - // Each source is 5 ints - int[] result = new int[sources.size() * 5]; - int i = 0; - for (SignalSource ss : sources) { - result[i] = ss.signal.x; - i++; - result[i] = ss.signal.y; - i++; - result[i] = ss.signal.z; - i++; - result[i] = ss.signal.strength; - i++; - result[i] = ss.signal.color.ordinal(); - i++; - result[i] = ss.fromDirection.ordinal(); - i++; + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((fromDirection == null) ? 0 : fromDirection.hashCode()); + result = prime * result + ((signal == null) ? 0 : signal.hashCode()); + return result; } - return result; - } - public static Set fromIntArray(int[] enc) { - Set result = new HashSet(); - for (int i = 0; i < enc.length; i += 5) { - // Signal sig = new Signal(enc[i], enc[i + 1], enc[i + 2], enc[i + 3], ForgeDirection.UNKNOWN,14, SignalColor.values()[enc[i + 4]]); - // result.add(new SignalSource(sig, ForgeDirection.values()[enc[i + 4]])); + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + SignalSource other = (SignalSource) obj; + if (fromDirection != other.fromDirection) { + return false; + } + if (signal == null) { + if (other.signal != null) { + return false; + } + } else if (!signal.equals(other.signal)) { + return false; + } + return true; } - return result; - } + @Override + public String toString() { + return "SignalSource [signal=" + signal + ", fromDirection=" + fromDirection + "]"; + } + + public static int[] toIntArray(Set sources) { + // Each source is 5 ints + int[] result = new int[sources.size() * 5]; + int i = 0; + for (SignalSource ss : sources) { + result[i] = ss.signal.x; + i++; + result[i] = ss.signal.y; + i++; + result[i] = ss.signal.z; + i++; + result[i] = ss.signal.strength; + i++; + result[i] = ss.signal.color.ordinal(); + i++; + result[i] = ss.fromDirection.ordinal(); + i++; + } + return result; + } + + public static Set fromIntArray(int[] enc) { + Set result = new HashSet(); + for (int i = 0; i < enc.length; i += 5) { + // Signal sig = new Signal(enc[i], enc[i + 1], enc[i + 2], enc[i + 3], ForgeDirection.UNKNOWN,14, + // SignalColor.values()[enc[i + 4]]); + // result.add(new SignalSource(sig, ForgeDirection.values()[enc[i + 4]])); + } + return result; + } } diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index 67b2a23a..58785d82 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -1,29 +1,5 @@ package crazypants.enderio.conduit.render; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.IconUtil; @@ -31,7 +7,6 @@ import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.IBlockAccessWrapper; import com.google.common.collect.Lists; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,293 +26,318 @@ import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.config.Config; import crazypants.util.RenderPassHelper; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { - public ConduitBundleRenderer(float conduitScale) { - } - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - IConduitBundle bundle = (IConduitBundle) te; - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - if(bundle.hasFacade() && bundle.getFacadeId().isOpaqueCube() && !ConduitUtil.isFacadeHidden(bundle, player)) { - return; - } - - float brightness = -1; - for (IConduit con : bundle.getConduits()) { - if(ConduitUtil.renderConduit(player, con)) { - ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); - if(renderer.isDynamic()) { - if(brightness == -1) { - BlockCoord loc = bundle.getLocation(); - brightness = bundle.getEntity().getWorldObj().getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0); - - RenderUtil.bindBlockTexture(); - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glShadeModel(GL11.GL_SMOOTH); - - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - - Tessellator.instance.startDrawingQuads(); - } - renderer.renderDynamicEntity(this, bundle, con, x, y, z, partialTick, brightness); + public ConduitBundleRenderer(float conduitScale) {} + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + IConduitBundle bundle = (IConduitBundle) te; + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (bundle.hasFacade() && bundle.getFacadeId().isOpaqueCube() && !ConduitUtil.isFacadeHidden(bundle, player)) { + return; } - } - } - if(brightness != -1) { - Tessellator.instance.draw(); + float brightness = -1; + for (IConduit con : bundle.getConduits()) { + if (ConduitUtil.renderConduit(player, con)) { + ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); + if (renderer.isDynamic()) { + if (brightness == -1) { + BlockCoord loc = bundle.getLocation(); + brightness = + bundle.getEntity().getWorldObj().getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glPopMatrix(); - GL11.glPopAttrib(); - GL11.glPopAttrib(); - } + RenderUtil.bindBlockTexture(); - } + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glShadeModel(GL11.GL_SMOOTH); - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rb) { + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); - int pass = RenderPassHelper.getBlockRenderPass(); - if(pass == 1) { - // If the MC renderer is told that an alpha pass is required ( see - // BlockConduitBundle.getRenderBlockPass() ) put nothing is actually added - // to the tessellator in this pass then the renderer will crash. We can't - // selectively enable the alpha pass based on state so the only work - // around is to ensure we always render something in this pass. Throwing - // in a polygon with a 0 area does the job - // See: https://github.com/MinecraftForge/MinecraftForge/issues/981 - Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); - Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); - Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); - Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); - } - - IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - - boolean renderedFacade = renderFacade(x, y, z, pass, rb, bundle, player); - boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player); - - if(renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) { - BlockCoord loc = bundle.getLocation(); - float brightness; - if(!Config.updateLightingWhenHidingFacades && bundle.hasFacade() && ConduitUtil.isFacadeHidden(bundle, player)) { - brightness = 15 << 20 | 15 << 4; - } else { - brightness = bundle.getEntity().getWorldObj().getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0); - } - renderConduits(bundle, x, y, z, 0, brightness, rb); - return true; - } - - return renderedFacade || (bundle.hasFacade() && !bundle.getFacadeId().isOpaqueCube()); - } - - private boolean renderFacade(int x, int y, int z, int pass, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) { - boolean res = false; - if(bundle.hasFacade()) { - res = true; - Block facadeId = bundle.getFacadeId(); - if(ConduitUtil.isFacadeHidden(bundle, player)) { - Tessellator.instance.setColorOpaque_F(1, 1, 1); - bundle.setFacadeId(null, false); - bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME); - - BlockConduitFacade facb = EnderIO.blockConduitFacade; - facb.setBlockOverride(bundle); - facb.setBlockBounds(0, 0, 0, 1, 1, 1); - if(!rb.hasOverrideBlockTexture()) { - rb.setRenderBoundsFromBlock(facb); - rb.renderStandardBlock(facb, x, y, z); - } - facb.setBlockOverride(null); - bundle.setFacadeId(facadeId, false); - } else if (facadeId != null) { - bundle.setFacadeRenderAs(FacadeRenderState.FULL); - boolean isFacadeOpaque = facadeId.isOpaqueCube(); - - if ((isFacadeOpaque && pass == 0) || (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && pass == 1))) { - IBlockAccess origBa = rb.blockAccess; - rb.blockAccess = new FacadeAccessWrapper(origBa); - try { - rb.renderBlockByRenderType(facadeId, x, y, z); - } catch (Exception e) { - //just in case the paint source wont render safely in this way - rb.setOverrideBlockTexture(IconUtil.errorTexture); - rb.renderStandardBlock(Blocks.stone, x, y, z); - rb.setOverrideBlockTexture(null); - } - - rb.blockAccess = origBa; - } - - res = isFacadeOpaque; - } - - } else { - bundle.setFacadeRenderAs(FacadeRenderState.NONE); - } - return res; - } - - public void renderConduits(IConduitBundle bundle, double x, double y, double z, float partialTick, float brightness, RenderBlocks rb) { - - Tessellator tessellator = Tessellator.instance; - tessellator.setColorOpaque_F(1, 1, 1); - tessellator.addTranslation((float) x, (float) y, (float) z); - - // Conduits - Set externals = new HashSet(); - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - - List wireBounds = new ArrayList(); - - for (IConduit con : bundle.getConduits()) { - - if(ConduitUtil.renderConduit(player, con)) { - ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); - renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); - Set extCons = con.getExternalConnections(); - for (ForgeDirection dir : extCons) { - if(con.getConnectionMode(dir) != ConnectionMode.DISABLED && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { - externals.add(dir); - } - } - } else if(con != null) { - Collection components = con.getCollidableComponents(); - for (CollidableComponent component : components) { - wireBounds.add(component.bound); - } - } - } - - // Internal conectors between conduits - List connectors = bundle.getConnectors(); - List rendered = Lists.newArrayList(); - for (CollidableComponent component : connectors) { - if(component.conduitType != null) { - IConduit conduit = bundle.getConduit(component.conduitType); - if(conduit != null) { - if(ConduitUtil.renderConduit(player, component.conduitType)) { - if(rb.hasOverrideBlockTexture()) { - List results = EnderIO.blockConduitBundle.doRayTraceAll(bundle.getWorld(), MathHelper.floor_double(x), - MathHelper.floor_double(y), MathHelper.floor_double(z), EnderIO.proxy.getClientPlayer()); - for (RaytraceResult r : results) { - // the connectors can be rendered multiple times and this makes the break texture look funky - if(r.component.conduitType == component.conduitType && !rendered.contains(r.component)) { - rendered.add(r.component); - CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); + Tessellator.instance.startDrawingQuads(); + } + renderer.renderDynamicEntity(this, bundle, con, x, y, z, partialTick, brightness); } - } - } else { - tessellator.setBrightness((int) (brightness)); - CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); } - } else { - wireBounds.add(component.bound); - } } - } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - CubeRenderer.render(component.bound, tex); - } - } - //render these after the 'normal' conduits so help with proper blending - for (BoundingBox wireBound : wireBounds) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); - CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); - } + if (brightness != -1) { + Tessellator.instance.draw(); - Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); - // External connection terminations - if(rb.overrideBlockTexture == null) { - for (ForgeDirection dir : externals) { - renderExternalConnection(dir); - } - } - tessellator.addTranslation(-(float) x, -(float) y, -(float) z); - - } - - private void renderExternalConnection(ForgeDirection dir) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL); - BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir); - for (BoundingBox bb : bbs) { - CubeRenderer.render(bb, tex, true); - } - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - } - - @Override - public int getRenderId() { - return BlockConduitBundle.rendererId; - } - - public static class FacadeAccessWrapper extends IBlockAccessWrapper { - - public FacadeAccessWrapper(IBlockAccess ba) { - super(ba); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glPopMatrix(); + GL11.glPopAttrib(); + GL11.glPopAttrib(); + } } @Override - public Block getBlock(int x, int y, int z) { - Block res = super.getBlock(x, y, z); - if(res == EnderIO.blockConduitBundle) { - TileEntity te = getTileEntity(x, y, z); - if(te instanceof TileConduitBundle) { - TileConduitBundle tcb = (TileConduitBundle) te; - Block fac = tcb.getFacadeId(); - if(fac != null) { - res = fac; - } + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rb) { + + int pass = RenderPassHelper.getBlockRenderPass(); + if (pass == 1) { + // If the MC renderer is told that an alpha pass is required ( see + // BlockConduitBundle.getRenderBlockPass() ) put nothing is actually added + // to the tessellator in this pass then the renderer will crash. We can't + // selectively enable the alpha pass based on state so the only work + // around is to ensure we always render something in this pass. Throwing + // in a polygon with a 0 area does the job + // See: https://github.com/MinecraftForge/MinecraftForge/issues/981 + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + Tessellator.instance.addVertexWithUV(x, y, z, 0, 0); + } + + IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + + boolean renderedFacade = renderFacade(x, y, z, pass, rb, bundle, player); + boolean renderConduit = !renderedFacade || ConduitUtil.isFacadeHidden(bundle, player); + + if (renderConduit && (pass == 0 || rb.overrideBlockTexture != null)) { + BlockCoord loc = bundle.getLocation(); + float brightness; + if (!Config.updateLightingWhenHidingFacades + && bundle.hasFacade() + && ConduitUtil.isFacadeHidden(bundle, player)) { + brightness = 15 << 20 | 15 << 4; + } else { + brightness = bundle.getEntity().getWorldObj().getLightBrightnessForSkyBlocks(loc.x, loc.y, loc.z, 0); + } + renderConduits(bundle, x, y, z, 0, brightness, rb); + return true; + } + + return renderedFacade || (bundle.hasFacade() && !bundle.getFacadeId().isOpaqueCube()); + } + + private boolean renderFacade( + int x, int y, int z, int pass, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) { + boolean res = false; + if (bundle.hasFacade()) { + res = true; + Block facadeId = bundle.getFacadeId(); + if (ConduitUtil.isFacadeHidden(bundle, player)) { + Tessellator.instance.setColorOpaque_F(1, 1, 1); + bundle.setFacadeId(null, false); + bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME); + + BlockConduitFacade facb = EnderIO.blockConduitFacade; + facb.setBlockOverride(bundle); + facb.setBlockBounds(0, 0, 0, 1, 1, 1); + if (!rb.hasOverrideBlockTexture()) { + rb.setRenderBoundsFromBlock(facb); + rb.renderStandardBlock(facb, x, y, z); + } + facb.setBlockOverride(null); + bundle.setFacadeId(facadeId, false); + } else if (facadeId != null) { + bundle.setFacadeRenderAs(FacadeRenderState.FULL); + boolean isFacadeOpaque = facadeId.isOpaqueCube(); + + if ((isFacadeOpaque && pass == 0) || (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && pass == 1))) { + IBlockAccess origBa = rb.blockAccess; + rb.blockAccess = new FacadeAccessWrapper(origBa); + try { + rb.renderBlockByRenderType(facadeId, x, y, z); + } catch (Exception e) { + // just in case the paint source wont render safely in this way + rb.setOverrideBlockTexture(IconUtil.errorTexture); + rb.renderStandardBlock(Blocks.stone, x, y, z); + rb.setOverrideBlockTexture(null); + } + + rb.blockAccess = origBa; + } + + res = isFacadeOpaque; + } + + } else { + bundle.setFacadeRenderAs(FacadeRenderState.NONE); + } + return res; + } + + public void renderConduits( + IConduitBundle bundle, double x, double y, double z, float partialTick, float brightness, RenderBlocks rb) { + + Tessellator tessellator = Tessellator.instance; + tessellator.setColorOpaque_F(1, 1, 1); + tessellator.addTranslation((float) x, (float) y, (float) z); + + // Conduits + Set externals = new HashSet(); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + + List wireBounds = new ArrayList(); + + for (IConduit con : bundle.getConduits()) { + + if (ConduitUtil.renderConduit(player, con)) { + ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); + renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); + Set extCons = con.getExternalConnections(); + for (ForgeDirection dir : extCons) { + if (con.getConnectionMode(dir) != ConnectionMode.DISABLED + && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { + externals.add(dir); + } + } + } else if (con != null) { + Collection components = con.getCollidableComponents(); + for (CollidableComponent component : components) { + wireBounds.add(component.bound); + } + } + } + + // Internal conectors between conduits + List connectors = bundle.getConnectors(); + List rendered = Lists.newArrayList(); + for (CollidableComponent component : connectors) { + if (component.conduitType != null) { + IConduit conduit = bundle.getConduit(component.conduitType); + if (conduit != null) { + if (ConduitUtil.renderConduit(player, component.conduitType)) { + if (rb.hasOverrideBlockTexture()) { + List results = EnderIO.blockConduitBundle.doRayTraceAll( + bundle.getWorld(), + MathHelper.floor_double(x), + MathHelper.floor_double(y), + MathHelper.floor_double(z), + EnderIO.proxy.getClientPlayer()); + for (RaytraceResult r : results) { + // the connectors can be rendered multiple times and this makes the break texture look + // funky + if (r.component.conduitType == component.conduitType + && !rendered.contains(r.component)) { + rendered.add(r.component); + CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); + } + } + } else { + tessellator.setBrightness((int) (brightness)); + CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); + } + } else { + wireBounds.add(component.bound); + } + } + + } else if (ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + CubeRenderer.render(component.bound, tex); + } + } + // render these after the 'normal' conduits so help with proper blending + for (BoundingBox wireBound : wireBounds) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); + CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); + } + + Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); + // External connection terminations + if (rb.overrideBlockTexture == null) { + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); + } + } + tessellator.addTranslation(-(float) x, -(float) y, -(float) z); + } + + private void renderExternalConnection(ForgeDirection dir) { + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL); + BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir); + for (BoundingBox bb : bbs) { + CubeRenderer.render(bb, tex, true); } - } - return res; } @Override - @SideOnly(Side.CLIENT) - public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { - return wrapped.getLightBrightnessForSkyBlocks(var1, var2, var3, var4); + public boolean shouldRender3DInInventory(int modelId) { + return false; } @Override - public int getBlockMetadata(int x, int y, int z) { - Block block = super.getBlock(x, y, z); - if(block == EnderIO.blockConduitBundle) { - TileEntity te = getTileEntity(x, y, z); - if(te instanceof TileConduitBundle) { - TileConduitBundle tcb = (TileConduitBundle) te; - Block fac = tcb.getFacadeId(); - if(fac != null) { - return tcb.getFacadeMetadata(); - } - } - } - return super.getBlockMetadata(x, y, z); + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} + + @Override + public int getRenderId() { + return BlockConduitBundle.rendererId; } - } + public static class FacadeAccessWrapper extends IBlockAccessWrapper { + public FacadeAccessWrapper(IBlockAccess ba) { + super(ba); + } + + @Override + public Block getBlock(int x, int y, int z) { + Block res = super.getBlock(x, y, z); + if (res == EnderIO.blockConduitBundle) { + TileEntity te = getTileEntity(x, y, z); + if (te instanceof TileConduitBundle) { + TileConduitBundle tcb = (TileConduitBundle) te; + Block fac = tcb.getFacadeId(); + if (fac != null) { + res = fac; + } + } + } + return res; + } + + @Override + @SideOnly(Side.CLIENT) + public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { + return wrapped.getLightBrightnessForSkyBlocks(var1, var2, var3, var4); + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + Block block = super.getBlock(x, y, z); + if (block == EnderIO.blockConduitBundle) { + TileEntity te = getTileEntity(x, y, z); + if (te instanceof TileConduitBundle) { + TileConduitBundle tcb = (TileConduitBundle) te; + Block fac = tcb.getFacadeId(); + if (fac != null) { + return tcb.getFacadeMetadata(); + } + } + } + return super.getBlockMetadata(x, y, z); + } + } } diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java index 0c170d06..7f8a4a3d 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitRenderer.java @@ -1,19 +1,33 @@ package crazypants.enderio.conduit.render; -import net.minecraft.client.renderer.RenderBlocks; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import net.minecraft.client.renderer.RenderBlocks; public interface ConduitRenderer { - boolean isRendererForConduit(IConduit conduit); + boolean isRendererForConduit(IConduit conduit); - void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb); + void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit con, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb); - boolean isDynamic(); - - void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y, double z, float partialTick, - float worldLight); + boolean isDynamic(); + void renderDynamicEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit con, + double x, + double y, + double z, + float partialTick, + float worldLight); } diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index d3a9a9df..c7cbd8ad 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -1,337 +1,367 @@ package crazypants.enderio.conduit.render; -import java.util.Collection; -import java.util.List; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; +import static com.enderio.core.client.render.CubeRenderer.*; +import static net.minecraftforge.common.util.ForgeDirection.*; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vertex; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; - -import static com.enderio.core.client.render.CubeRenderer.*; -import static net.minecraftforge.common.util.ForgeDirection.*; +import java.util.Collection; +import java.util.List; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class DefaultConduitRenderer implements ConduitRenderer { - protected float transmissionScaleFactor; + protected float transmissionScaleFactor; - @Override - public boolean isRendererForConduit(IConduit conduit) { - return true; - } - - @Override - public void renderEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit conduit, double x, double y, double z, float partialTick, - float worldLight, RenderBlocks rb) { - - Collection components = conduit.getCollidableComponents(); - Tessellator tessellator = Tessellator.instance; - - transmissionScaleFactor = conduit.getTransmitionGeometryScale(); - - IIcon tex; - - if(!rb.hasOverrideBlockTexture()) { - for (CollidableComponent component : components) { - if(renderComponent(component)) { - float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(component)); - if(isNSEWUD(component.dir) && - conduit.getTransmitionTextureForState(component) != null) { - tessellator.setBrightness((int) (worldLight)); - tex = conduit.getTransmitionTextureForState(component); - renderTransmission(conduit, tex, component, selfIllum); - } - - tex = conduit.getTextureForState(component); - if(tex != null) { - tessellator.setBrightness((int) (worldLight)); - renderConduit(tex, conduit, component, selfIllum); - } - } - } + @Override + public boolean isRendererForConduit(IConduit conduit) { + return true; } - } - @Override - public void renderDynamicEntity(ConduitBundleRenderer conduitBundleRenderer, IConduitBundle te, IConduit con, double x, double y, double z, - float partialTick, float worldLight) { + @Override + public void renderEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit conduit, + double x, + double y, + double z, + float partialTick, + float worldLight, + RenderBlocks rb) { - } - - protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - - if(isNSEWUD(component.dir)) { - - float scaleFactor = 0.75f; - float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; - float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; - float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; - - BoundingBox cube = component.bound; - BoundingBox bb = cube.scale(xLen, yLen, zLen); - drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false, conduit.shouldMirrorTexture()); - - if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + Collection components = conduit.getCollidableComponents(); Tessellator tessellator = Tessellator.instance; - for (Vertex c : corners) { - addVecWithUV(c.xyz, c.uv.x, c.uv.y); + + transmissionScaleFactor = conduit.getTransmitionGeometryScale(); + + IIcon tex; + + if (!rb.hasOverrideBlockTexture()) { + for (CollidableComponent component : components) { + if (renderComponent(component)) { + float selfIllum = Math.max(worldLight, conduit.getSelfIlluminationForState(component)); + if (isNSEWUD(component.dir) && conduit.getTransmitionTextureForState(component) != null) { + tessellator.setBrightness((int) (worldLight)); + tex = conduit.getTransmitionTextureForState(component); + renderTransmission(conduit, tex, component, selfIllum); + } + + tex = conduit.getTextureForState(component); + if (tex != null) { + tessellator.setBrightness((int) (worldLight)); + renderConduit(tex, conduit, component, selfIllum); + } + } + } } - } - - } else { - drawSection(component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); } - } + @Override + public void renderDynamicEntity( + ConduitBundleRenderer conduitBundleRenderer, + IConduitBundle te, + IConduit con, + double x, + double y, + double z, + float partialTick, + float worldLight) {} - protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { - // RoundedSegmentRenderer.renderSegment(component.dir, component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), - // conduit.getConectionMode(component.dir) == ConnectionMode.DISABLED); + protected void renderConduit(IIcon tex, IConduit conduit, CollidableComponent component, float brightness) { - float scaleFactor = 0.6f; - float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; - float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; - float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; + if (isNSEWUD(component.dir)) { - BoundingBox cube = component.bound; - BoundingBox bb = cube.scale(xLen, yLen, zLen); - drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); - } + float scaleFactor = 0.75f; + float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; + float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; + float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; - protected boolean renderComponent(CollidableComponent component) { - return true; - } + BoundingBox cube = component.bound; + BoundingBox bb = cube.scale(xLen, yLen, zLen); + drawSection( + bb, + tex.getMinU(), + tex.getMaxU(), + tex.getMinV(), + tex.getMaxV(), + component.dir, + false, + conduit.shouldMirrorTexture()); - protected boolean isNSEWUD(ForgeDirection dir) { - return dir == NORTH || dir == SOUTH || dir == EAST || dir == WEST || dir == UP || dir == DOWN; - } - - protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir, boolean isTransmission) { - drawSection(bound, minU, maxU, minV, maxV, dir, isTransmission, true); - } - - protected void drawSection(BoundingBox bound, float minU, float maxU, float minV, float maxV, ForgeDirection dir, - boolean isTransmission, boolean mirrorTexture) { - - Tessellator tessellator = Tessellator.instance; - - if(isTransmission) { - setVerticesForTransmission(bound, dir); - } else { - setupVertices(bound); - } - - if (mirrorTexture && (dir == NORTH || dir == UP || dir == EAST)) { - // maintain consistent texture dir relative to the center of the conduit - float tmp = minU; - minU = maxU; - maxU = tmp; - } - - boolean rotateSides = dir == UP || dir == DOWN; - boolean rotateTopBottom = dir == NORTH || dir == SOUTH; - float cm; - if(dir != NORTH && dir != SOUTH) { - tessellator.setNormal(0, 0, -1); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.NORTH); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateSides) { - addVecWithUV(verts[1], maxU, maxV); - addVecWithUV(verts[0], maxU, minV); - addVecWithUV(verts[3], minU, minV); - addVecWithUV(verts[2], minU, maxV); - } else { - addVecWithUV(verts[1], minU, minV); - addVecWithUV(verts[0], maxU, minV); - addVecWithUV(verts[3], maxU, maxV); - addVecWithUV(verts[2], minU, maxV); - } - if(dir == WEST || dir == EAST) { - float tmp = minU; - minU = maxU; - maxU = tmp; - } - tessellator.setNormal(0, 0, 1); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.SOUTH); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateSides) { - addVecWithUV(verts[4], maxU, maxV); - addVecWithUV(verts[5], maxU, minV); - addVecWithUV(verts[6], minU, minV); - addVecWithUV(verts[7], minU, maxV); - } else { - addVecWithUV(verts[4], minU, minV); - addVecWithUV(verts[5], maxU, minV); - addVecWithUV(verts[6], maxU, maxV); - addVecWithUV(verts[7], minU, maxV); - } - if(dir == WEST || dir == EAST) { - float tmp = minU; - minU = maxU; - maxU = tmp; - } - } - - if(dir != UP && dir != DOWN) { - - tessellator.setNormal(0, 1, 0); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.UP); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateTopBottom) { - addVecWithUV(verts[6], maxU, maxV); - addVecWithUV(verts[2], minU, maxV); - addVecWithUV(verts[3], minU, minV); - addVecWithUV(verts[7], maxU, minV); - } else { - addVecWithUV(verts[6], minU, minV); - addVecWithUV(verts[2], minU, maxV); - addVecWithUV(verts[3], maxU, maxV); - addVecWithUV(verts[7], maxU, minV); - } - - tessellator.setNormal(0, -1, 0); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.DOWN); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateTopBottom) { - addVecWithUV(verts[0], minU, minV); - addVecWithUV(verts[1], minU, maxV); - addVecWithUV(verts[5], maxU, maxV); - addVecWithUV(verts[4], maxU, minV); - } else { - addVecWithUV(verts[0], maxU, maxV); - addVecWithUV(verts[1], minU, maxV); - addVecWithUV(verts[5], minU, minV); - addVecWithUV(verts[4], maxU, minV); - } - } - - if(dir != EAST && dir != WEST) { - - tessellator.setNormal(1, 0, 0); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.EAST); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateSides) { - addVecWithUV(verts[2], minU, maxV); - addVecWithUV(verts[6], minU, minV); - addVecWithUV(verts[5], maxU, minV); - addVecWithUV(verts[1], maxU, maxV); - } else { - addVecWithUV(verts[2], minU, maxV); - addVecWithUV(verts[6], maxU, maxV); - addVecWithUV(verts[5], maxU, minV); - addVecWithUV(verts[1], minU, minV); - } - - tessellator.setNormal(-1, 0, 0); - if(!isTransmission) { - cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.WEST); - tessellator.setColorOpaque_F(cm, cm, cm); - } - if(rotateSides) { - addVecWithUV(verts[0], maxU, maxV); - addVecWithUV(verts[4], maxU, minV); - addVecWithUV(verts[7], minU, minV); - addVecWithUV(verts[3], minU, maxV); - } else { - addVecWithUV(verts[0], minU, minV); - addVecWithUV(verts[4], maxU, minV); - addVecWithUV(verts[7], maxU, maxV); - addVecWithUV(verts[3], minU, maxV); - } - } - tessellator.setColorOpaque_F(1, 1, 1); - } - - protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection dir) { - float xs = dir.offsetX == 0 ? transmissionScaleFactor : 1; - float ys = dir.offsetY == 0 ? transmissionScaleFactor : 1; - float zs = dir.offsetZ == 0 ? transmissionScaleFactor : 1; - setupVertices(bound.scale(xs, ys, zs)); - } - - // TODO: This is a really hacky, imprecise and slow way to do this - public BoundingBox[] toCubes(BoundingBox bb) { - - // NB This on handles the really simple conduit case! - - float width = bb.maxX - bb.minX; - float height = bb.maxY - bb.minY; - float depth = bb.maxZ - bb.minZ; - - if(width > 0 && height > 0 && depth > 0) { - if(width / depth > 1.5f || depth / width > 1.5f) { - // split horizontally - if(width > depth) { - int numSplits = Math.round(width / depth); - float newWidth = width / numSplits; - BoundingBox[] result = new BoundingBox[numSplits]; - float lastMax = bb.minX; - for (int i = 0; i < numSplits; i++) { - float max = lastMax + newWidth; - result[i] = new BoundingBox(lastMax, bb.minY, bb.minZ, max, bb.maxY, bb.maxZ); - lastMax = max; - } - return result; + if (conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + List corners = component.bound.getCornersWithUvForFace( + component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); + Tessellator tessellator = Tessellator.instance; + for (Vertex c : corners) { + addVecWithUV(c.xyz, c.uv.x, c.uv.y); + } + } } else { - - int numSplits = Math.round(depth / width); - float newWidth = depth / numSplits; - BoundingBox[] result = new BoundingBox[numSplits]; - float lastMax = bb.minZ; - for (int i = 0; i < numSplits; i++) { - float max = lastMax + newWidth; - result[i] = new BoundingBox(bb.minX, bb.minY, lastMax, bb.maxX, bb.maxY, max); - lastMax = max; - } - return result; - + drawSection( + component.bound, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, true); } - - } else if(height / width > 1.5) { - - int numSplits = Math.round(height / width); - float newWidth = height / numSplits; - BoundingBox[] result = new BoundingBox[numSplits]; - float lastMax = bb.minY; - for (int i = 0; i < numSplits; i++) { - float max = lastMax + newWidth; - result[i] = new BoundingBox(bb.minX, lastMax, bb.minZ, bb.maxX, max, bb.maxZ); - lastMax = max; - } - return result; - - } } - return new BoundingBox[] { bb }; - } + protected void renderTransmission(IConduit conduit, IIcon tex, CollidableComponent component, float selfIllum) { + // RoundedSegmentRenderer.renderSegment(component.dir, component.bound, tex.getMinU(), tex.getMaxU(), + // tex.getMinV(), tex.getMaxV(), + // conduit.getConectionMode(component.dir) == ConnectionMode.DISABLED); - @Override - public boolean isDynamic() { - return false; - } + float scaleFactor = 0.6f; + float xLen = Math.abs(component.dir.offsetX) == 1 ? 1 : scaleFactor; + float yLen = Math.abs(component.dir.offsetY) == 1 ? 1 : scaleFactor; + float zLen = Math.abs(component.dir.offsetZ) == 1 ? 1 : scaleFactor; + BoundingBox cube = component.bound; + BoundingBox bb = cube.scale(xLen, yLen, zLen); + drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); + } + + protected boolean renderComponent(CollidableComponent component) { + return true; + } + + protected boolean isNSEWUD(ForgeDirection dir) { + return dir == NORTH || dir == SOUTH || dir == EAST || dir == WEST || dir == UP || dir == DOWN; + } + + protected void drawSection( + BoundingBox bound, + float minU, + float maxU, + float minV, + float maxV, + ForgeDirection dir, + boolean isTransmission) { + drawSection(bound, minU, maxU, minV, maxV, dir, isTransmission, true); + } + + protected void drawSection( + BoundingBox bound, + float minU, + float maxU, + float minV, + float maxV, + ForgeDirection dir, + boolean isTransmission, + boolean mirrorTexture) { + + Tessellator tessellator = Tessellator.instance; + + if (isTransmission) { + setVerticesForTransmission(bound, dir); + } else { + setupVertices(bound); + } + + if (mirrorTexture && (dir == NORTH || dir == UP || dir == EAST)) { + // maintain consistent texture dir relative to the center of the conduit + float tmp = minU; + minU = maxU; + maxU = tmp; + } + + boolean rotateSides = dir == UP || dir == DOWN; + boolean rotateTopBottom = dir == NORTH || dir == SOUTH; + float cm; + if (dir != NORTH && dir != SOUTH) { + tessellator.setNormal(0, 0, -1); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.NORTH); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateSides) { + addVecWithUV(verts[1], maxU, maxV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], minU, minV); + addVecWithUV(verts[2], minU, maxV); + } else { + addVecWithUV(verts[1], minU, minV); + addVecWithUV(verts[0], maxU, minV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + } + if (dir == WEST || dir == EAST) { + float tmp = minU; + minU = maxU; + maxU = tmp; + } + tessellator.setNormal(0, 0, 1); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.SOUTH); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateSides) { + addVecWithUV(verts[4], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[7], minU, maxV); + } else { + addVecWithUV(verts[4], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[7], minU, maxV); + } + if (dir == WEST || dir == EAST) { + float tmp = minU; + minU = maxU; + maxU = tmp; + } + } + + if (dir != UP && dir != DOWN) { + + tessellator.setNormal(0, 1, 0); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.UP); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateTopBottom) { + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], minU, minV); + addVecWithUV(verts[7], maxU, minV); + } else { + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[3], maxU, maxV); + addVecWithUV(verts[7], maxU, minV); + } + + tessellator.setNormal(0, -1, 0); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.DOWN); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateTopBottom) { + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], maxU, maxV); + addVecWithUV(verts[4], maxU, minV); + } else { + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[1], minU, maxV); + addVecWithUV(verts[5], minU, minV); + addVecWithUV(verts[4], maxU, minV); + } + } + + if (dir != EAST && dir != WEST) { + + tessellator.setNormal(1, 0, 0); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.EAST); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateSides) { + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], minU, minV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], maxU, maxV); + } else { + addVecWithUV(verts[2], minU, maxV); + addVecWithUV(verts[6], maxU, maxV); + addVecWithUV(verts[5], maxU, minV); + addVecWithUV(verts[1], minU, minV); + } + + tessellator.setNormal(-1, 0, 0); + if (!isTransmission) { + cm = RenderUtil.getColorMultiplierForFace(ForgeDirection.WEST); + tessellator.setColorOpaque_F(cm, cm, cm); + } + if (rotateSides) { + addVecWithUV(verts[0], maxU, maxV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], minU, minV); + addVecWithUV(verts[3], minU, maxV); + } else { + addVecWithUV(verts[0], minU, minV); + addVecWithUV(verts[4], maxU, minV); + addVecWithUV(verts[7], maxU, maxV); + addVecWithUV(verts[3], minU, maxV); + } + } + tessellator.setColorOpaque_F(1, 1, 1); + } + + protected void setVerticesForTransmission(BoundingBox bound, ForgeDirection dir) { + float xs = dir.offsetX == 0 ? transmissionScaleFactor : 1; + float ys = dir.offsetY == 0 ? transmissionScaleFactor : 1; + float zs = dir.offsetZ == 0 ? transmissionScaleFactor : 1; + setupVertices(bound.scale(xs, ys, zs)); + } + + // TODO: This is a really hacky, imprecise and slow way to do this + public BoundingBox[] toCubes(BoundingBox bb) { + + // NB This on handles the really simple conduit case! + + float width = bb.maxX - bb.minX; + float height = bb.maxY - bb.minY; + float depth = bb.maxZ - bb.minZ; + + if (width > 0 && height > 0 && depth > 0) { + if (width / depth > 1.5f || depth / width > 1.5f) { + // split horizontally + if (width > depth) { + int numSplits = Math.round(width / depth); + float newWidth = width / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minX; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(lastMax, bb.minY, bb.minZ, max, bb.maxY, bb.maxZ); + lastMax = max; + } + return result; + + } else { + + int numSplits = Math.round(depth / width); + float newWidth = depth / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minZ; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(bb.minX, bb.minY, lastMax, bb.maxX, bb.maxY, max); + lastMax = max; + } + return result; + } + + } else if (height / width > 1.5) { + + int numSplits = Math.round(height / width); + float newWidth = height / numSplits; + BoundingBox[] result = new BoundingBox[numSplits]; + float lastMax = bb.minY; + for (int i = 0; i < numSplits; i++) { + float max = lastMax + newWidth; + result[i] = new BoundingBox(bb.minX, lastMax, bb.minZ, bb.maxX, max, bb.maxZ); + lastMax = max; + } + return result; + } + } + + return new BoundingBox[] {bb}; + } + + @Override + public boolean isDynamic() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java index 3d9cf032..76a03363 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java @@ -1,68 +1,68 @@ package crazypants.enderio.conduit.render; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; - public class ItemConduitRenderer implements IItemRenderer { - private final BoundingBox bb; + private final BoundingBox bb; - public ItemConduitRenderer() { - float scale = 0.8f; - bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - RenderBlocks renderBlocks = (RenderBlocks) data[0]; - if(type == ItemRenderType.INVENTORY) { - GL11.glTranslatef(0, -0.1f, 0); - renderToInventory(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED) { - renderEquipped(item, renderBlocks); - } else if(type == ItemRenderType.ENTITY) { - renderEntity(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glTranslatef(0.3f, 0.2f, 0); - GL11.glScalef(1.25f, 1.25f, 1.25f); - renderEntity(item, renderBlocks); - } else { - System.out.println("ItemConduitRenderer.renderItem: Unsupported render type"); + public ItemConduitRenderer() { + float scale = 0.8f; + bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); } - } - private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { - GL11.glPushMatrix(); - GL11.glScalef(0.5f, 0.5f, 0.5f); - renderToInventory(item, renderBlocks); - GL11.glPopMatrix(); - } + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY + || type == ItemRenderType.EQUIPPED + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } - private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { - renderToInventory(item, renderBlocks); - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } - private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(bb, item.getItem().getIconFromDamage(item.getItemDamage())); - Tessellator.instance.draw(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + if (type == ItemRenderType.INVENTORY) { + GL11.glTranslatef(0, -0.1f, 0); + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + renderEquipped(item, renderBlocks); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslatef(0.3f, 0.2f, 0); + GL11.glScalef(1.25f, 1.25f, 1.25f); + renderEntity(item, renderBlocks); + } else { + System.out.println("ItemConduitRenderer.renderItem: Unsupported render type"); + } + } + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } + + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(bb, item.getItem().getIconFromDamage(item.getItemDamage())); + Tessellator.instance.draw(); + } } diff --git a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java index a92919cc..8cb6128b 100644 --- a/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/RoundedSegmentRenderer.java @@ -1,9 +1,7 @@ package crazypants.enderio.conduit.render; -import java.util.List; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraftforge.common.util.ForgeDirection; +import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.vecmath.Matrix4d; @@ -11,198 +9,200 @@ import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector3f; import com.enderio.core.common.vecmath.Vertex; - import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.geom.Offsets; import crazypants.enderio.conduit.geom.Offsets.Axis; - -import static com.enderio.core.common.util.ForgeDirectionOffsets.offsetScaled; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import java.util.List; +import net.minecraft.client.renderer.Tessellator; +import net.minecraftforge.common.util.ForgeDirection; public class RoundedSegmentRenderer { - private static final int NUM_VERTICES = 16; - private static Vertex[][] DIR_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; - private static Vertex[][] DIR_STUB_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; - private static Vertex[][] DIR_STUB_CAPS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static final int NUM_VERTICES = 16; + private static Vertex[][] DIR_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static Vertex[][] DIR_STUB_COORDS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; + private static Vertex[][] DIR_STUB_CAPS = new Vertex[ForgeDirection.VALID_DIRECTIONS.length][]; - private static final Vector3d REF_TRANS = new Vector3d(0.5, 0.5, 0.5); + private static final Vector3d REF_TRANS = new Vector3d(0.5, 0.5, 0.5); - static { - double circ = ConduitGeometryUtil.WIDTH * 0.7; + static { + double circ = ConduitGeometryUtil.WIDTH * 0.7; - double halfLength = 0.25; - createDirectionSegments(DIR_COORDS, circ, halfLength); + double halfLength = 0.25; + createDirectionSegments(DIR_COORDS, circ, halfLength); - halfLength = ConduitGeometryUtil.STUB_WIDTH / 2 + ConduitGeometryUtil.CORE_BOUNDS.sizeX() / 4; - createDirectionSegments(DIR_STUB_COORDS, circ, halfLength); + halfLength = ConduitGeometryUtil.STUB_WIDTH / 2 + ConduitGeometryUtil.CORE_BOUNDS.sizeX() / 4; + createDirectionSegments(DIR_STUB_COORDS, circ, halfLength); - createCaps(DIR_STUB_CAPS, circ, halfLength); - - } - - private static void createDirectionSegments(Vertex[][] segments, double circ, double halfLength) { - Vertex[] refCoords = createUnitSectionQuads(NUM_VERTICES, -halfLength, halfLength); - - createSegmentsForDirections(segments, circ, halfLength, refCoords); - } - - private static void createCaps(Vertex[][] segments, double circ, double halfLength) { - Vertex[] refCrossSection = createUnitCrossSection(0, 0, halfLength, 16, 0); - - Vertex center = new Vertex(new Vector3d(0, 0, halfLength), new Vector3f(0, 0, 1), new Vector2f(0.5f, 0.5f)); - - Vertex[] refCoords = new Vertex[refCrossSection.length * 4]; - int index = 0; - for (int i = 0; i < refCrossSection.length; i++) { - refCoords[index] = new Vertex(center); - refCoords[index + 1] = new Vertex(refCrossSection[i]); - - int next = i + 1; - if(next >= refCrossSection.length - 1) { - next = 0; - } - refCoords[index + 2] = new Vertex(refCrossSection[next]); - refCoords[index + 3] = new Vertex(center); - index += 4; + createCaps(DIR_STUB_CAPS, circ, halfLength); } - createSegmentsForDirections(segments, circ, halfLength, refCoords); + private static void createDirectionSegments(Vertex[][] segments, double circ, double halfLength) { + Vertex[] refCoords = createUnitSectionQuads(NUM_VERTICES, -halfLength, halfLength); - } - - private static void createSegmentsForDirections(Vertex[][] segments, double circ, double halfLength, Vertex[] refCoords) { - for (Vertex coord : refCoords) { - coord.xyz.x = coord.xyz.x * circ; - coord.xyz.y = coord.xyz.y * circ; - } - Matrix4d rotMat = new Matrix4d(); - rotMat.setIdentity(); - rotMat.setTranslation(REF_TRANS); - - segments[SOUTH.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.SOUTH, halfLength)); - - rotMat.makeRotationY(Math.PI); - rotMat.setTranslation(REF_TRANS); - segments[ForgeDirection.NORTH.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.NORTH, halfLength)); - - rotMat.makeRotationY(Math.PI / 2); - rotMat.setTranslation(REF_TRANS); - segments[ForgeDirection.EAST.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.EAST, halfLength)); - - rotMat.makeRotationY(-Math.PI / 2); - rotMat.setTranslation(REF_TRANS); - segments[ForgeDirection.WEST.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.WEST, halfLength)); - - rotMat.makeRotationX(-Math.PI / 2); - rotMat.setTranslation(REF_TRANS); - segments[ForgeDirection.UP.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.UP, halfLength)); - - rotMat.makeRotationX(Math.PI / 2); - rotMat.setTranslation(REF_TRANS); - segments[ForgeDirection.DOWN.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.DOWN, halfLength)); - } - - private static Vertex[] xformCoords(Vertex[] refCoords, Matrix4d rotMat, Vector3d trans) { - Vertex[] res = new Vertex[refCoords.length]; - for (int i = 0; i < res.length; i++) { - res[i] = new Vertex(refCoords[i]); - res[i].transform(rotMat); - res[i].translate(trans); - } - return res; - } - - private static Vertex[] xformCoords(List refCoords, Matrix4d rotMat, Vector3d trans) { - Vertex[] res = new Vertex[refCoords.size()]; - for (int i = 0; i < res.length; i++) { - res[i] = new Vertex(refCoords.get(i)); - res[i].transform(rotMat); - res[i].translate(trans); - } - return res; - } - - public static Vertex[] createUnitCrossSection(double xOffset, double yOffset, double zOffset, int numCoords, int u) { - - Vertex[] crossSection = new Vertex[numCoords]; - - double angle = 0; - double inc = (Math.PI * 2) / (crossSection.length - 1); - for (int i = 0; i < crossSection.length; i++) { - double x = Math.cos(angle) * 0.5; - double y = Math.sin(angle) * 0.5; - angle += inc; - crossSection[i] = new Vertex(); - crossSection[i].setXYZ(xOffset + x, yOffset + y, zOffset); - crossSection[i].setNormal(x, y, 0); - crossSection[i].setUV(u, y + 0.5); - } - return crossSection; - - } - - public static void renderSegment(ForgeDirection dir, BoundingBox bounds, float minU, float maxU, float minV, float maxV, boolean isStub) { - float uScale = maxU - minU; - float vScale = maxV - minV; - - Vector3d offset = calcOffset(dir, bounds); - - Tessellator tes = Tessellator.instance; - Vertex[] coords; - if(isStub) { - coords = DIR_STUB_COORDS[dir.ordinal()]; - } else { - coords = DIR_COORDS[dir.ordinal()]; + createSegmentsForDirections(segments, circ, halfLength, refCoords); } - for (Vertex coord : coords) { - double u = minU + (coord.uv.x * uScale); - double v = minV + (coord.uv.y * vScale); - tes.setNormal(coord.normal.x, coord.normal.y, coord.normal.z); - tes.addVertexWithUV(offset.x + coord.xyz.x, offset.y + coord.xyz.y, offset.z + coord.xyz.z, u, v); + private static void createCaps(Vertex[][] segments, double circ, double halfLength) { + Vertex[] refCrossSection = createUnitCrossSection(0, 0, halfLength, 16, 0); + + Vertex center = new Vertex(new Vector3d(0, 0, halfLength), new Vector3f(0, 0, 1), new Vector2f(0.5f, 0.5f)); + + Vertex[] refCoords = new Vertex[refCrossSection.length * 4]; + int index = 0; + for (int i = 0; i < refCrossSection.length; i++) { + refCoords[index] = new Vertex(center); + refCoords[index + 1] = new Vertex(refCrossSection[i]); + + int next = i + 1; + if (next >= refCrossSection.length - 1) { + next = 0; + } + refCoords[index + 2] = new Vertex(refCrossSection[next]); + refCoords[index + 3] = new Vertex(center); + index += 4; + } + + createSegmentsForDirections(segments, circ, halfLength, refCoords); } - if(isStub) { - coords = DIR_STUB_CAPS[dir.ordinal()]; - for (Vertex coord : coords) { - double u = minU + (coord.uv.x * uScale); - double v = minV + (coord.uv.y * vScale); - tes.setNormal(coord.normal.x, coord.normal.y, coord.normal.z); - tes.addVertexWithUV(offset.x + coord.xyz.x, offset.y + coord.xyz.y, offset.z + coord.xyz.z, u, v); - } + private static void createSegmentsForDirections( + Vertex[][] segments, double circ, double halfLength, Vertex[] refCoords) { + for (Vertex coord : refCoords) { + coord.xyz.x = coord.xyz.x * circ; + coord.xyz.y = coord.xyz.y * circ; + } + Matrix4d rotMat = new Matrix4d(); + rotMat.setIdentity(); + rotMat.setTranslation(REF_TRANS); + + segments[SOUTH.ordinal()] = xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.SOUTH, halfLength)); + + rotMat.makeRotationY(Math.PI); + rotMat.setTranslation(REF_TRANS); + segments[ForgeDirection.NORTH.ordinal()] = + xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.NORTH, halfLength)); + + rotMat.makeRotationY(Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + segments[ForgeDirection.EAST.ordinal()] = + xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.EAST, halfLength)); + + rotMat.makeRotationY(-Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + segments[ForgeDirection.WEST.ordinal()] = + xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.WEST, halfLength)); + + rotMat.makeRotationX(-Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + segments[ForgeDirection.UP.ordinal()] = + xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.UP, halfLength)); + + rotMat.makeRotationX(Math.PI / 2); + rotMat.setTranslation(REF_TRANS); + segments[ForgeDirection.DOWN.ordinal()] = + xformCoords(refCoords, rotMat, offsetScaled(ForgeDirection.DOWN, halfLength)); } - } - private static Vector3d calcOffset(ForgeDirection dir, BoundingBox bounds) { - Vector3d res = new Vector3d(); - Vector3d center = bounds.getCenter(); - Axis axis = Offsets.getAxisForDir(dir); - if(axis == Axis.X) { - res.set(0, center.y - REF_TRANS.y, center.z - REF_TRANS.z); - } else if(axis == Axis.Y) { - res.set(center.x - REF_TRANS.x, 0, center.z - REF_TRANS.z); - } else if(axis == Axis.Z) { - res.set(center.x - REF_TRANS.x, center.y - REF_TRANS.y, 0); + private static Vertex[] xformCoords(Vertex[] refCoords, Matrix4d rotMat, Vector3d trans) { + Vertex[] res = new Vertex[refCoords.length]; + for (int i = 0; i < res.length; i++) { + res[i] = new Vertex(refCoords[i]); + res[i].transform(rotMat); + res[i].translate(trans); + } + return res; } - return res; - } - public static Vertex[] createUnitSectionQuads(int numCoords, double minZ, double maxZ) { - - Vertex[] z0 = createUnitCrossSection(0, 0, minZ, numCoords + 1, 0); - Vertex[] z1 = createUnitCrossSection(0, 0, maxZ, numCoords + 1, 1); - - Vertex[] result = new Vertex[numCoords * 4]; - for (int i = 0; i < numCoords; i++) { - int index = i * 4; - result[index] = new Vertex(z0[i]); - result[index + 1] = new Vertex(z0[i + 1]); - result[index + 2] = new Vertex(z1[i + 1]); - result[index + 3] = new Vertex(z1[i]); + private static Vertex[] xformCoords(List refCoords, Matrix4d rotMat, Vector3d trans) { + Vertex[] res = new Vertex[refCoords.size()]; + for (int i = 0; i < res.length; i++) { + res[i] = new Vertex(refCoords.get(i)); + res[i].transform(rotMat); + res[i].translate(trans); + } + return res; } - return result; - } + public static Vertex[] createUnitCrossSection( + double xOffset, double yOffset, double zOffset, int numCoords, int u) { + Vertex[] crossSection = new Vertex[numCoords]; + + double angle = 0; + double inc = (Math.PI * 2) / (crossSection.length - 1); + for (int i = 0; i < crossSection.length; i++) { + double x = Math.cos(angle) * 0.5; + double y = Math.sin(angle) * 0.5; + angle += inc; + crossSection[i] = new Vertex(); + crossSection[i].setXYZ(xOffset + x, yOffset + y, zOffset); + crossSection[i].setNormal(x, y, 0); + crossSection[i].setUV(u, y + 0.5); + } + return crossSection; + } + + public static void renderSegment( + ForgeDirection dir, BoundingBox bounds, float minU, float maxU, float minV, float maxV, boolean isStub) { + float uScale = maxU - minU; + float vScale = maxV - minV; + + Vector3d offset = calcOffset(dir, bounds); + + Tessellator tes = Tessellator.instance; + Vertex[] coords; + if (isStub) { + coords = DIR_STUB_COORDS[dir.ordinal()]; + } else { + coords = DIR_COORDS[dir.ordinal()]; + } + + for (Vertex coord : coords) { + double u = minU + (coord.uv.x * uScale); + double v = minV + (coord.uv.y * vScale); + tes.setNormal(coord.normal.x, coord.normal.y, coord.normal.z); + tes.addVertexWithUV(offset.x + coord.xyz.x, offset.y + coord.xyz.y, offset.z + coord.xyz.z, u, v); + } + + if (isStub) { + coords = DIR_STUB_CAPS[dir.ordinal()]; + for (Vertex coord : coords) { + double u = minU + (coord.uv.x * uScale); + double v = minV + (coord.uv.y * vScale); + tes.setNormal(coord.normal.x, coord.normal.y, coord.normal.z); + tes.addVertexWithUV(offset.x + coord.xyz.x, offset.y + coord.xyz.y, offset.z + coord.xyz.z, u, v); + } + } + } + + private static Vector3d calcOffset(ForgeDirection dir, BoundingBox bounds) { + Vector3d res = new Vector3d(); + Vector3d center = bounds.getCenter(); + Axis axis = Offsets.getAxisForDir(dir); + if (axis == Axis.X) { + res.set(0, center.y - REF_TRANS.y, center.z - REF_TRANS.z); + } else if (axis == Axis.Y) { + res.set(center.x - REF_TRANS.x, 0, center.z - REF_TRANS.z); + } else if (axis == Axis.Z) { + res.set(center.x - REF_TRANS.x, center.y - REF_TRANS.y, 0); + } + return res; + } + + public static Vertex[] createUnitSectionQuads(int numCoords, double minZ, double maxZ) { + + Vertex[] z0 = createUnitCrossSection(0, 0, minZ, numCoords + 1, 0); + Vertex[] z1 = createUnitCrossSection(0, 0, maxZ, numCoords + 1, 1); + + Vertex[] result = new Vertex[numCoords * 4]; + for (int i = 0; i < numCoords; i++) { + int index = i * 4; + result[index] = new Vertex(z0[i]); + result[index + 1] = new Vertex(z0[i + 1]); + result[index + 2] = new Vertex(z1[i + 1]); + result[index + 3] = new Vertex(z1[i]); + } + return result; + } } diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 09cd67e7..68480c36 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -1,17 +1,7 @@ package crazypants.enderio.config; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; - import com.enderio.core.common.event.ConfigFileChangedEvent; import com.enderio.core.common.vecmath.VecmathUtil; - import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -22,1545 +12,2836 @@ import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.enderio.network.PacketHandler; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; public final class Config { - public static class Section { - public final String name; - public final String lang; + public static class Section { + public final String name; + public final String lang; - public Section(String name, String lang) { - this.name = name; - this.lang = lang; - register(); + public Section(String name, String lang) { + this.name = name; + this.lang = lang; + register(); + } + + private void register() { + sections.add(this); + } + + public String lc() { + return name.toLowerCase(Locale.US); + } } - private void register() { - sections.add(this); + public static final List
    sections; + + static { + sections = new ArrayList
    (); } - public String lc() { - return name.toLowerCase(Locale.US); - } - } - - public static final List
    sections; - - static { - sections = new ArrayList
    (); - } - - public static Configuration config; - - public static final Section sectionPower = new Section("Power Settings", "power"); - public static final Section sectionRecipe = new Section("Recipe Settings", "recipe"); - public static final Section sectionItems = new Section("Item Enabling", "item"); - public static final Section sectionEfficiency = new Section("Efficiency Settings", "efficiency"); - public static final Section sectionPersonal = new Section("Personal Settings", "personal"); - public static final Section sectionAnchor = new Section("Anchor Settings", "anchor"); - public static final Section sectionStaff = new Section("Staff Settings", "staff"); - public static final Section sectionDarkSteel = new Section("Dark Steel", "darksteel"); - public static final Section sectionFarm = new Section("Farm Settings", "farm"); - public static final Section sectionAesthetic = new Section("Aesthetic Settings", "aesthetic"); - public static final Section sectionAdvanced = new Section("Advanced Settings", "advanced"); - public static final Section sectionMagnet = new Section("Magnet Settings", "magnet"); - public static final Section sectionFluid = new Section("Fluid Settings", "fluid"); - public static final Section sectionSpawner = new Section("PoweredSpawner Settings", "spawner"); - public static final Section sectionKiller = new Section("Killer Joe Settings", "killerjoe"); - public static final Section sectionSoulBinder = new Section("Soul Binder Settings", "soulBinder"); - public static final Section sectionAttractor = new Section("Mob Attractor Settings", "attractor"); - public static final Section sectionLootConfig = new Section("Loot Config", "lootconfig"); - public static final Section sectionMobConfig = new Section("Mob Config", "mobconfig"); - public static final Section sectionRailConfig = new Section("Rail", "railconfig"); - public static final Section sectionEnchantments = new Section("Enchantments", "enchantments"); - public static final Section sectionWeather = new Section("Weather", "weather"); - public static final Section sectionTelepad = new Section("Telepad", "telepad"); - public static final Section sectionInventoryPanel = new Section("InventoryPanel", "inventorypanel"); - public static final Section sectionMisc = new Section("Misc", "misc"); - - public static final double DEFAULT_CONDUIT_SCALE = 0.6; - - public static boolean reinforcedObsidianEnabled = true; - public static boolean reinforcedObsidianUseDarkSteelBlocks = false; - - public static boolean useAlternateBinderRecipe = false; - - public static boolean useAlternateTesseractModel = false; - - public static boolean photovoltaicCellEnabled = true; - - public static boolean reservoirEnabled = true; - - public static double conduitScale = DEFAULT_CONDUIT_SCALE; - - public static int numConduitsPerRecipe = 8; - - public static boolean transceiverEnabled = true; - public static double transceiverEnergyLoss = 0.1; - public static int transceiverUpkeepCostRF = 10; - public static int transceiverBucketTransmissionCostRF = 100; - public static int transceiverMaxIoRF = 20480; - public static boolean transceiverUseEasyRecipe = false; - - public static File configDirectory; - - public static boolean useHardRecipes = false; - public static boolean addPeacefulRecipes = false; - public static boolean allowExternalTickSpeedup = true; - public static boolean crateSyntheticRecipes = true; - - public static boolean useSteelInChassi = false; - - public static boolean detailedPowerTrackingEnabled = false; - - public static boolean useSneakMouseWheelYetaWrench = true; - public static boolean useSneakRightClickYetaWrench = false; - public static int yetaWrenchOverlayMode = 0; - - public static boolean itemConduitUsePhyscialDistance = false; - - public static int stellarEnderFluidConduitExtractRate = 20_000; - public static int stellarEnderFluidConduitMaxIoRate = 80_000; - public static int melodicEnderFluidConduitExtractRate = 10_000; - public static int melodicEnderFluidConduitMaxIoRate = 40_000; - public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000; - public static int crystallinePinkSlimeEnderFluidConduitMaxIoRate = 8_000; - public static int crystallineEnderFluidConduitExtractRate = 1_000; - public static int crystallineEnderFluidConduitMaxIoRate = 4_000; - public static int enderFluidConduitExtractRate = 200; - public static int enderFluidConduitMaxIoRate = 800; - public static int advancedFluidConduitExtractRate = 100; - public static int advancedFluidConduitMaxIoRate = 400; - public static int fluidConduitExtractRate = 50; - public static int fluidConduitMaxIoRate = 200; - - public static int gasConduitExtractRate = 200; - public static int gasConduitMaxIoRate = 800; - - public static boolean updateLightingWhenHidingFacades = false; - - public static boolean travelAnchorEnabled = true; - public static int travelAnchorMaxDistance = 48; - public static int travelAnchorCooldown = 0; - public static boolean travelAnchorSneak = true; - public static boolean travelAnchorSkipWarning = true; - - public static int travelStaffMaxDistance = 128; - public static float travelStaffPowerPerBlockRF = 250; - - public static int travelStaffMaxBlinkDistance = 16; - public static int travelStaffBlinkPauseTicks = 10; - - public static boolean travelStaffEnabled = true; - public static boolean travelStaffBlinkEnabled = true; - public static boolean travelStaffBlinkThroughSolidBlocksEnabled = true; - public static boolean travelStaffBlinkThroughClearBlocksEnabled = true; - public static boolean travelStaffBlinkThroughUnbreakableBlocksEnabled = false; - public static String[] travelStaffBlinkBlackList = new String[] { - "minecraft:bedrock", - "Thaumcraft:blockWarded" - }; - public static float travelAnchorZoomScale = 0.2f; - public static boolean travelStaffSearchOptimize = true; - - public static int enderIoRange = 8; - public static boolean enderIoMeAccessEnabled = true; - - public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.7, 0.85, 0.95}; - public static int darkSteelPowerStorageBase = 100000; - public static int darkSteelPowerStorageLevelOne = 150000; - public static int darkSteelPowerStorageLevelTwo = 250000; - public static int darkSteelPowerStorageLevelThree = 1000000; - public static int darkSteelPowerStorageLevelFour = 2500000; + public static Configuration config; + + public static final Section sectionPower = new Section("Power Settings", "power"); + public static final Section sectionRecipe = new Section("Recipe Settings", "recipe"); + public static final Section sectionItems = new Section("Item Enabling", "item"); + public static final Section sectionEfficiency = new Section("Efficiency Settings", "efficiency"); + public static final Section sectionPersonal = new Section("Personal Settings", "personal"); + public static final Section sectionAnchor = new Section("Anchor Settings", "anchor"); + public static final Section sectionStaff = new Section("Staff Settings", "staff"); + public static final Section sectionDarkSteel = new Section("Dark Steel", "darksteel"); + public static final Section sectionFarm = new Section("Farm Settings", "farm"); + public static final Section sectionAesthetic = new Section("Aesthetic Settings", "aesthetic"); + public static final Section sectionAdvanced = new Section("Advanced Settings", "advanced"); + public static final Section sectionMagnet = new Section("Magnet Settings", "magnet"); + public static final Section sectionFluid = new Section("Fluid Settings", "fluid"); + public static final Section sectionSpawner = new Section("PoweredSpawner Settings", "spawner"); + public static final Section sectionKiller = new Section("Killer Joe Settings", "killerjoe"); + public static final Section sectionSoulBinder = new Section("Soul Binder Settings", "soulBinder"); + public static final Section sectionAttractor = new Section("Mob Attractor Settings", "attractor"); + public static final Section sectionLootConfig = new Section("Loot Config", "lootconfig"); + public static final Section sectionMobConfig = new Section("Mob Config", "mobconfig"); + public static final Section sectionRailConfig = new Section("Rail", "railconfig"); + public static final Section sectionEnchantments = new Section("Enchantments", "enchantments"); + public static final Section sectionWeather = new Section("Weather", "weather"); + public static final Section sectionTelepad = new Section("Telepad", "telepad"); + public static final Section sectionInventoryPanel = new Section("InventoryPanel", "inventorypanel"); + public static final Section sectionMisc = new Section("Misc", "misc"); + + public static final double DEFAULT_CONDUIT_SCALE = 0.6; + + public static boolean reinforcedObsidianEnabled = true; + public static boolean reinforcedObsidianUseDarkSteelBlocks = false; + + public static boolean useAlternateBinderRecipe = false; + + public static boolean useAlternateTesseractModel = false; + + public static boolean photovoltaicCellEnabled = true; + + public static boolean reservoirEnabled = true; + + public static double conduitScale = DEFAULT_CONDUIT_SCALE; + + public static int numConduitsPerRecipe = 8; + + public static boolean transceiverEnabled = true; + public static double transceiverEnergyLoss = 0.1; + public static int transceiverUpkeepCostRF = 10; + public static int transceiverBucketTransmissionCostRF = 100; + public static int transceiverMaxIoRF = 20480; + public static boolean transceiverUseEasyRecipe = false; + + public static File configDirectory; + + public static boolean useHardRecipes = false; + public static boolean addPeacefulRecipes = false; + public static boolean allowExternalTickSpeedup = true; + public static boolean crateSyntheticRecipes = true; + + public static boolean useSteelInChassi = false; + + public static boolean detailedPowerTrackingEnabled = false; + + public static boolean useSneakMouseWheelYetaWrench = true; + public static boolean useSneakRightClickYetaWrench = false; + public static int yetaWrenchOverlayMode = 0; + + public static boolean itemConduitUsePhyscialDistance = false; + + public static int stellarEnderFluidConduitExtractRate = 20_000; + public static int stellarEnderFluidConduitMaxIoRate = 80_000; + public static int melodicEnderFluidConduitExtractRate = 10_000; + public static int melodicEnderFluidConduitMaxIoRate = 40_000; + public static int crystallinePinkSlimeEnderFluidConduitExtractRate = 2_000; + public static int crystallinePinkSlimeEnderFluidConduitMaxIoRate = 8_000; + public static int crystallineEnderFluidConduitExtractRate = 1_000; + public static int crystallineEnderFluidConduitMaxIoRate = 4_000; + public static int enderFluidConduitExtractRate = 200; + public static int enderFluidConduitMaxIoRate = 800; + public static int advancedFluidConduitExtractRate = 100; + public static int advancedFluidConduitMaxIoRate = 400; + public static int fluidConduitExtractRate = 50; + public static int fluidConduitMaxIoRate = 200; + + public static int gasConduitExtractRate = 200; + public static int gasConduitMaxIoRate = 800; + + public static boolean updateLightingWhenHidingFacades = false; + + public static boolean travelAnchorEnabled = true; + public static int travelAnchorMaxDistance = 48; + public static int travelAnchorCooldown = 0; + public static boolean travelAnchorSneak = true; + public static boolean travelAnchorSkipWarning = true; + + public static int travelStaffMaxDistance = 128; + public static float travelStaffPowerPerBlockRF = 250; + + public static int travelStaffMaxBlinkDistance = 16; + public static int travelStaffBlinkPauseTicks = 10; + + public static boolean travelStaffEnabled = true; + public static boolean travelStaffBlinkEnabled = true; + public static boolean travelStaffBlinkThroughSolidBlocksEnabled = true; + public static boolean travelStaffBlinkThroughClearBlocksEnabled = true; + public static boolean travelStaffBlinkThroughUnbreakableBlocksEnabled = false; + public static String[] travelStaffBlinkBlackList = new String[] {"minecraft:bedrock", "Thaumcraft:blockWarded"}; + public static float travelAnchorZoomScale = 0.2f; + public static boolean travelStaffSearchOptimize = true; + + public static int enderIoRange = 8; + public static boolean enderIoMeAccessEnabled = true; + + public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.7, 0.85, 0.95}; + public static int darkSteelPowerStorageBase = 100000; + public static int darkSteelPowerStorageLevelOne = 150000; + public static int darkSteelPowerStorageLevelTwo = 250000; + public static int darkSteelPowerStorageLevelThree = 1000000; + public static int darkSteelPowerStorageLevelFour = 2500000; + + public static float darkSteelSpeedOneWalkModifier = 0.1f; + public static float darkSteelSpeedTwoWalkMultiplier = 0.2f; + public static float darkSteelSpeedThreeWalkMultiplier = 0.3f; + + public static float darkSteelSpeedOneSprintModifier = 0.1f; + public static float darkSteelSpeedTwoSprintMultiplier = 0.3f; + public static float darkSteelSpeedThreeSprintMultiplier = 0.5f; - - public static float darkSteelSpeedOneWalkModifier = 0.1f; - public static float darkSteelSpeedTwoWalkMultiplier = 0.2f; - public static float darkSteelSpeedThreeWalkMultiplier = 0.3f; - - public static float darkSteelSpeedOneSprintModifier = 0.1f; - public static float darkSteelSpeedTwoSprintMultiplier = 0.3f; - public static float darkSteelSpeedThreeSprintMultiplier = 0.5f; - - public static int darkSteelSpeedOneCost = 10; - public static int darkSteelSpeedTwoCost = 15; - public static int darkSteelSpeedThreeCost = 20; - - - public static double darkSteelBootsJumpModifier = 1.5; - public static int darkSteelJumpOneCost = 10; - public static int darkSteelJumpTwoCost = 15; - public static int darkSteelJumpThreeCost = 20; - - public static boolean slotZeroPlacesEight = true; - - public static int darkSteelWalkPowerCost = darkSteelPowerStorageLevelTwo / 3000; - public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4; - public static boolean darkSteelDrainPowerFromInventory = false; - public static int darkSteelBootsJumpPowerCost = 150; - public static int darkSteelFallDistanceCost = 75; - - public static float darkSteelSwordWitherSkullChance = 0.05f; - public static float darkSteelSwordWitherSkullLootingModifier = 0.05f; - public static float darkSteelSwordSkullChance = 0.1f; - public static float darkSteelSwordSkullLootingModifier = 0.075f; - public static float vanillaSwordSkullLootingModifier = 0.05f; - public static float vanillaSwordSkullChance = 0.05f; - public static float ticCleaverSkullDropChance = 0.1f; - public static float ticBeheadingSkullModifier = 0.075f; - public static float fakePlayerSkullChance = 0.5f; - - public static int darkSteelSwordPowerUsePerHit = 750; - public static double darkSteelSwordEnderPearlDropChance = 1; - public static double darkSteelSwordEnderPearlDropChancePerLooting = 0.5; - - public static int darkSteelPickEffeciencyObsidian = 50; - public static int darkSteelPickPowerUseObsidian = 10000; - public static float darkSteelPickApplyObsidianEffeciencyAtHardess = 40; - public static int darkSteelPickPowerUsePerDamagePoint = 750; - public static float darkSteelPickEffeciencyBoostWhenPowered = 2; - public static boolean darkSteelPickMinesTiCArdite = true; - - public static int darkSteelAxePowerUsePerDamagePoint = 750; - public static int darkSteelAxePowerUsePerDamagePointMultiHarvest = 1500; - public static float darkSteelAxeEffeciencyBoostWhenPowered = 2; - public static float darkSteelAxeSpeedPenaltyMultiHarvest = 4; - - public static int darkSteelShearsDurabilityFactor = 5; - public static int darkSteelShearsPowerUsePerDamagePoint = 250; - public static float darkSteelShearsEffeciencyBoostWhenPowered = 2.0f; - public static int darkSteelShearsBlockAreaBoostWhenPowered = 2; - public static float darkSteelShearsEntityAreaBoostWhenPowered = 3.0f; - - public static int darkSteelUpgradeVibrantCost = 10; - public static int darkSteelUpgradePowerOneCost = 10; - public static int darkSteelUpgradePowerTwoCost = 15; - public static int darkSteelUpgradePowerThreeCost = 20; - public static int darkSteelUpgradePowerFourCost = 25; - - public static int darkSteelGliderCost = 10; - public static double darkSteelGliderHorizontalSpeed = 0.03; - public static double darkSteelGliderVerticalSpeed = -0.05; - public static double darkSteelGliderVerticalSpeedSprinting = -0.15; - - public static int darkSteelGogglesOfRevealingCost = 10; - - public static int darkSteelApiaristArmorCost = 10; - - public static int darkSteelSwimCost = 10; - - public static int darkSteelNightVisionCost = 10; - - public static int darkSteelSoundLocatorCost = 10; - public static int darkSteelSoundLocatorRange = 40; - public static int darkSteelSoundLocatorLifespan = 40; - - public static int darkSteelTravelCost = 30; - public static int darkSteelSpoonCost = 10; - - public static int darkSteelSolarOneGen = 10; - public static int darkSteelSolarOneCost = 15; - public static int darkSteelSolarTwoGen = 40; - public static int darkSteelSolarTwoCost = 30; - public static int darkSteelSolarThreeGen = 160; - public static int darkSteelSolarThreeCost = 40; - - public static boolean darkSteelSolarChargeOthers = true; - - public static float darkSteelAnvilDamageChance = 0.024f; - - public static float darkSteelLadderSpeedBoost = 0.06f; - - public static int hootchPowerPerCycleRF = 60; - public static int hootchPowerTotalBurnTime = 6000; - public static int rocketFuelPowerPerCycleRF = 160; - public static int rocketFuelPowerTotalBurnTime = 7000; - public static int fireWaterPowerPerCycleRF = 80; - public static int fireWaterPowerTotalBurnTime = 15000; - public static int vatPowerUserPerTickRF = 20; - - public static int maxPhotovoltaicOutputRF = 10; - public static int maxPhotovoltaicAdvancedOutputRF = 40; - public static int maxPhotovoltaicVibrantOutputRF = 160; - - public static int zombieGeneratorRfPerTick = 80; - public static int zombieGeneratorTicksPerBucketFuel = 12000; - - public static int frankenzombieGeneratorRfPerTick = 120; - public static int frankenzombieGeneratorTicksPerBucketFuel = 12000; - - public static int enderGeneratorRfPerTick = 360; - public static int enderGeneratorTicksPerBucketFuel = 96000; - - public static double[] zombieGeneratorsEnergyMultipliers = {1f,2f,3f,5f,8f,13f,21f}; - public static double[] zombieGeneratorsBurnTimeMultipliers = {0.5f,1f/1.5f}; - - public static int stirlingGeneratorBaseRfPerTick = 20; - public static float stirlingGeneratorEnergyMultiplierT1 = 1f; - public static float stirlingGeneratorEnergyMultiplierT2 = 2f; - public static float stirlingGeneratorEnergyMultiplierT3 = 4f; - public static float stirlingGeneratorBurnTimeMultiplierT1 = 1f / 2f; - public static float stirlingGeneratorBurnTimeMultiplierT2 = 1f / 1.5f; - public static float stirlingGeneratorBurnTimeMultiplierT3 = 1f / 1.5f; - - public static double[] stirlingGeneratorEnergyMultipliers = {1f,2f,3f,5f,8f,13f,21f}; - public static double[] stirlingGeneratorBurnTimeMultipliers = {0.5f,1f/1.5f}; - - - public static boolean combustionGeneratorUseOpaqueModel = true; - - public static boolean addFuelTooltipsToAllFluidContainers = true; - public static boolean addFurnaceFuelTootip = true; - public static boolean addDurabilityTootip = true; - - public static int farmContinuousEnergyUseRF = 40; - public static int farmActionEnergyUseRF = 500; - public static int farmAxeActionEnergyUseRF = 1000; - public static int farmBonemealActionEnergyUseRF = 160; - public static int farmBonemealTryEnergyUseRF = 80; - - public static int farmDefaultSize = 3; - public static int farmBonusSize = 2; - public static boolean farmAxeDamageOnLeafBreak = false; - public static float farmToolTakeDamageChance = 1; - public static boolean disableFarmNotification = false; - public static boolean farmEssenceBerriesEnabled = true; - public static boolean farmManaBeansEnabled = false; - public static boolean farmHarvestJungleWhenCocoa = false; - public static String[] hoeStrings = new String[] { - "minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe", - "MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", - "MekanismTools:SteelHoe", - "Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold", - "Railcraft:tool.steel.hoe", - "TConstruct:mattock", - "appliedenergistics2:item.ToolCertusQuartzHoe", "appliedenergistics2:item.ToolNetherQuartzHoe", - "ProjRed|Exploration:projectred.exploration.hoeruby", "ProjRed|Exploration:projectred.exploration.hoesapphire", - "ProjRed|Exploration:projectred.exploration.hoeperidot", - "magicalcrops:magicalcrops_AccioHoe", "magicalcrops:magicalcrops_CrucioHoe", "magicalcrops:magicalcrops_ImperioHoe", - // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", - "magicalcrops:magicalcropsarmor_AccioHoe", "magicalcrops:magicalcropsarmor_CrucioHoe", - "magicalcrops:magicalcropsarmor_ImperioHoe", - "BiomesOPlenty:hoeAmethyst", "BiomesOPlenty:hoeMud", - "Eln:Eln.Copper Hoe", - "Thaumcraft:ItemHoeThaumium", "Thaumcraft:ItemHoeElemental", "Thaumcraft:ItemHoeVoid", - "ThermalFoundation:tool.hoeInvar", "ThermalFoundation:tool.hoeCopper", "ThermalFoundation:tool.hoeBronze", "ThermalFoundation:tool.hoeSilver", - "ThermalFoundation:tool.hoeElectrum", "ThermalFoundation:tool.hoeTin", "ThermalFoundation:tool.hoeLead", "ThermalFoundation:tool.hoeNickel", - "ThermalFoundation:tool.hoePlatinum", - "TwilightForest:item.steeleafHoe", "TwilightForest:item.ironwoodHoe", - "IC2:itemToolBronzeHoe" - }; - public static List farmHoes = new ArrayList(); - public static int farmSaplingReserveAmount = 8; - - public static int magnetPowerUsePerSecondRF = 1; - public static int magnetPowerCapacityRF = 100000; - public static int magnetRange = 5; - public static String[] magnetBlacklist = new String[] { "appliedenergistics2:item.ItemCrystalSeed", "Botania:livingrock", - "Botania:manaTablet" }; - public static int magnetMaxItems = 20; - - public static boolean magnetAllowInMainInventory = false; - public static boolean magnetAllowInBaublesSlot = true; - public static boolean magnetAllowDeactivatedInBaublesSlot = false; - public static boolean magnetAllowPowerExtraction = false; - public static String magnetBaublesType = "AMULET"; - - public static boolean useCombustionGenModel = false; - - public static int crafterRfPerCraft = 2500; - - public static int capacitorBankMaxIoRF = 5000; - public static int capacitorBankMaxStorageRF = 5000000; - - public static int capacitorBankTierOneMaxIoRF = 1000; - public static int capacitorBankTierOneMaxStorageRF = 1000000; - - public static int capacitorBankTierTwoMaxIoRF = 5000; - public static int capacitorBankTierTwoMaxStorageRF = 5000000; - - public static int capacitorBankTierThreeMaxIoRF = 25000; - public static int capacitorBankTierThreeMaxStorageRF = 25000000; - - public static int poweredSpawnerMinDelayTicks = 200; - public static int poweredSpawnerMaxDelayTicks = 800; - public static int poweredSpawnerLevelOnePowerPerTickRF = 160; - public static int poweredSpawnerLevelTwoPowerPerTickRF = 500; - public static int poweredSpawnerLevelThreePowerPerTickRF = 1500; - public static int poweredSpawnerLevelFourPowerPerTickRF = 4500; - public static int poweredSpawnerLevelFivePowerPerTickRF = 2000; - public static int poweredSpawnerLevelSixPowerPerTickRF = 1000; - public static int poweredSpawnerLevelSevenPowerPerTickRF = 500; - public static int poweredSpawnerLevelEightPowerPerTickRF = 160; - public static int poweredSpawnerLevelNinePowerPerTickRF = 500; - public static int poweredSpawnerLevelTenPowerPerTickRF = 1500; - public static int poweredSpawnerMaxPlayerDistance = 0; - public static int poweredSpawnerDespawnTimeSeconds = 120; - public static int poweredSpawnerSpawnCount = 4; - public static int poweredSpawnerSpawnRange = 4; - public static int poweredSpawnerMaxNearbyEntities = 6; - public static int poweredSpawnerMaxSpawnTries = 3; - public static boolean poweredSpawnerUseVanillaSpawChecks = false; - public static double brokenSpawnerDropChance = 1; - public static String[] brokenSpawnerToolBlacklist = new String[] { - "RotaryCraft:rotarycraft_item_bedpick" - }; - public static int powerSpawnerAddSpawnerCost = 30; - - public static int painterEnergyPerTaskRF = 2000; - - public static int vacuumChestRange = 6; - - public static boolean useModMetals = true; - - public static int wirelessChargerRange = 24; - - public static long nutrientFoodBoostDelay = 400; - - public static int enchanterBaseLevelCost = 4; - - public static boolean machineSoundsEnabled = true; - - public static float machineSoundVolume = 1.0f; - - public static int killerJoeNutrientUsePerAttackMb = 5; - public static double killerJoeAttackHeight = 2; - public static double killerJoeAttackWidth = 2; - public static double killerJoeAttackLength = 4; - public static double killerJoeHooverXpWidth = 5; - public static double killerJoeHooverXpLength = 10; - public static int killerJoeMaxXpLevel = Integer.MAX_VALUE; - public static boolean killerJoeMustSee = false; - public static boolean killerPvPoffDisablesSwing = false; - public static boolean killerPvPoffIsIgnored = false; - - public static boolean allowTileEntitiesAsPaintSource = true; - - public static boolean isGasConduitEnabled = true; - public static boolean enableMEConduits = true; - public static boolean enableOCConduits = true; - public static boolean enableOCConduitsAnimatedTexture = true; - - public static String[] soulVesselBlackList = new String[0]; - public static boolean soulVesselCapturesBosses = false; - - public static int soulBinderLevelOnePowerPerTickRF = 500; - public static int soulBinderLevelTwoPowerPerTickRF = 1000; - public static int soulBinderLevelThreePowerPerTickRF = 2000; - public static int soulBinderLevelFourPowerPerTickRF = 4000; - public static int soulBinderLevelFivePowerPerTickRF = 8000; - public static int soulBinderLevelSixPowerPerTickRF = 16000; - public static int soulBinderLevelSevenPowerPerTickRF = 32000; - public static int soulBinderLevelEightPowerPerTickRF = 500; - public static int soulBinderLevelNinePowerPerTickRF = 1000; - public static int soulBinderLevelTenPowerPerTickRF = 2000; - public static int soulBinderBrokenSpawnerRF = 2500000; - public static int soulBinderBrokenSpawnerLevels = 15; - public static int soulBinderReanimationRF = 100000; - public static int soulBinderReanimationLevels = 10; - public static int soulBinderEnderCystalRF = 100000; - public static int soulBinderEnderCystalLevels = 10; - public static int soulBinderPrecientCystalRF = 100000; - public static int soulBinderPrecientCystalLevels = 10; - public static int soulBinderAttractorCystalRF = 100000; - public static int soulBinderAttractorCystalLevels = 10; - public static int soulBinderEnderRailRF = 100000; - public static int soulBinderEnderRailLevels = 10; - public static int soulBinderMaxXpLevel = 40; - - public static boolean powerConduitCanDifferentTiersConnect = false; - public static int powerConduitTierOneRF = 640; - public static int powerConduitTierTwoRF = 5120; - public static int powerConduitTierThreeRF = 20480; - public static int[] powerConduitEndergyTiers = {20, 40, 80, 160, 320, 1280, 2560, 10240, 40960, 81920, 327680, 2000000000}; - public static boolean powerConduitOutputMJ = true; - - public static int sliceAndSpliceLevelOnePowerPerTickRF = 80; - public static int sliceAndSpliceLevelTwoPowerPerTickRF = 160; - public static int sliceAndSpliceLevelThreePowerPerTickRF = 320; - public static int sliceAndSpliceLevelFourPowerPerTickRF = 640; - public static int sliceAndSpliceLevelFivePowerPerTickRF = 1280; - public static int sliceAndSpliceLevelSixPowerPerTickRF = 2560; - public static int sliceAndSpliceLevelSevenPowerPerTickRF = 5120; - public static int sliceAndSpliceLevelEightPowerPerTickRF = 80; - public static int sliceAndSpliceLevelNinePowerPerTickRF = 160; - public static int sliceAndSpliceLevelTenPowerPerTickRF = 320; - - public static boolean soulBinderRequiresEndermanSkull = true; - - public static int attractorRangeLevelOne = 16; - public static int attractorPowerPerTickLevelOne = 20; - public static int attractorRangeLevelTwo = 32; - public static int attractorPowerPerTickLevelTwo = 40; - public static int attractorRangeLevelThree = 64; - public static int attractorPowerPerTickLevelThree = 80; - - public static int spawnGuardRangeLevelOne = 64; - public static int spawnGuardPowerPerTickLevelOne = 80; - public static int spawnGuardRangeLevelTwo = 96; - public static int spawnGuardPowerPerTickLevelTwo = 300; - public static int spawnGuardRangeLevelThree = 160; - public static int spawnGuardPowerPerTickLevelThree = 800; - public static boolean spawnGuardStopAllSlimesDebug = false; - public static boolean spawnGuardStopAllSquidSpawning = false; - - public static int weatherObeliskClearFluid = 2000; - public static int weatherObeliskRainFluid = 500; - public static int weatherObeliskThunderFluid = 1000; - - //Loot Defaults - public static boolean lootDarkSteel = true; - public static boolean lootItemConduitProbe = true; - public static boolean lootQuartz = true; - public static boolean lootNetherWart = true; - public static boolean lootEnderPearl = true; - public static boolean lootElectricSteel = true; - public static boolean lootRedstoneAlloy = true; - public static boolean lootPhasedIron = true; - public static boolean lootPhasedGold = true; - public static boolean lootTravelStaff = true; - public static boolean lootTheEnder = true; - public static boolean lootDarkSteelBoots = true; - - public static boolean dumpMobNames = false; - - public static boolean enderRailEnabled = true; - public static int enderRailPowerRequireCrossDimensions = 10000; - public static int enderRailPowerRequiredPerBlock = 10; - public static boolean enderRailCapSameDimensionPowerAtCrossDimensionCost = true; - public static int enderRailTicksBeforeForceSpawningLinkedCarts = 60; - public static boolean enderRailTeleportPlayers = false; - - public static int xpObeliskMaxXpLevel = Integer.MAX_VALUE; - public static String xpJuiceName = "xpjuice"; - - public static boolean clearGlassSameTexture = false; - public static boolean clearGlassConnectToFusedQuartz = false; - - public static int enchantmentSoulBoundId = -1; - public static int enchantmentSoulBoundWeight = 1; - public static boolean enchantmentSoulBoundEnabled = true; - - public static boolean replaceWitherSkeletons = true; - - public static boolean enableWaterFromBottles = true; - - public static boolean telepadLockDimension = true; - public static boolean telepadLockCoords = true; - public static int telepadPowerCoefficient = 100000; - public static int telepadPowerInterdimensional = 100000; - public static int telepadPowerPerTickRF = 1000; - public static int telepadPowerStorageRF = 100000; - - public static boolean inventoryPanelFree = false;; - public static float inventoryPanelPowerPerMB = 800.0f; - public static float inventoryPanelScanCostPerSlot = 0.1f; - public static float inventoryPanelExtractCostPerItem = 12.0f; - public static float inventoryPanelExtractCostPerOperation = 32.0f; - - - - public static void load(FMLPreInitializationEvent event) { - PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); - - FMLCommonHandler.instance().bus().register(new Config()); - configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.DOMAIN); - if(!configDirectory.exists()) { - configDirectory.mkdir(); + public static int darkSteelSpeedOneCost = 10; + public static int darkSteelSpeedTwoCost = 15; + public static int darkSteelSpeedThreeCost = 20; + + public static double darkSteelBootsJumpModifier = 1.5; + public static int darkSteelJumpOneCost = 10; + public static int darkSteelJumpTwoCost = 15; + public static int darkSteelJumpThreeCost = 20; + + public static boolean slotZeroPlacesEight = true; + + public static int darkSteelWalkPowerCost = darkSteelPowerStorageLevelTwo / 3000; + public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4; + public static boolean darkSteelDrainPowerFromInventory = false; + public static int darkSteelBootsJumpPowerCost = 150; + public static int darkSteelFallDistanceCost = 75; + + public static float darkSteelSwordWitherSkullChance = 0.05f; + public static float darkSteelSwordWitherSkullLootingModifier = 0.05f; + public static float darkSteelSwordSkullChance = 0.1f; + public static float darkSteelSwordSkullLootingModifier = 0.075f; + public static float vanillaSwordSkullLootingModifier = 0.05f; + public static float vanillaSwordSkullChance = 0.05f; + public static float ticCleaverSkullDropChance = 0.1f; + public static float ticBeheadingSkullModifier = 0.075f; + public static float fakePlayerSkullChance = 0.5f; + + public static int darkSteelSwordPowerUsePerHit = 750; + public static double darkSteelSwordEnderPearlDropChance = 1; + public static double darkSteelSwordEnderPearlDropChancePerLooting = 0.5; + + public static int darkSteelPickEffeciencyObsidian = 50; + public static int darkSteelPickPowerUseObsidian = 10000; + public static float darkSteelPickApplyObsidianEffeciencyAtHardess = 40; + public static int darkSteelPickPowerUsePerDamagePoint = 750; + public static float darkSteelPickEffeciencyBoostWhenPowered = 2; + public static boolean darkSteelPickMinesTiCArdite = true; + + public static int darkSteelAxePowerUsePerDamagePoint = 750; + public static int darkSteelAxePowerUsePerDamagePointMultiHarvest = 1500; + public static float darkSteelAxeEffeciencyBoostWhenPowered = 2; + public static float darkSteelAxeSpeedPenaltyMultiHarvest = 4; + + public static int darkSteelShearsDurabilityFactor = 5; + public static int darkSteelShearsPowerUsePerDamagePoint = 250; + public static float darkSteelShearsEffeciencyBoostWhenPowered = 2.0f; + public static int darkSteelShearsBlockAreaBoostWhenPowered = 2; + public static float darkSteelShearsEntityAreaBoostWhenPowered = 3.0f; + + public static int darkSteelUpgradeVibrantCost = 10; + public static int darkSteelUpgradePowerOneCost = 10; + public static int darkSteelUpgradePowerTwoCost = 15; + public static int darkSteelUpgradePowerThreeCost = 20; + public static int darkSteelUpgradePowerFourCost = 25; + + public static int darkSteelGliderCost = 10; + public static double darkSteelGliderHorizontalSpeed = 0.03; + public static double darkSteelGliderVerticalSpeed = -0.05; + public static double darkSteelGliderVerticalSpeedSprinting = -0.15; + + public static int darkSteelGogglesOfRevealingCost = 10; + + public static int darkSteelApiaristArmorCost = 10; + + public static int darkSteelSwimCost = 10; + + public static int darkSteelNightVisionCost = 10; + + public static int darkSteelSoundLocatorCost = 10; + public static int darkSteelSoundLocatorRange = 40; + public static int darkSteelSoundLocatorLifespan = 40; + + public static int darkSteelTravelCost = 30; + public static int darkSteelSpoonCost = 10; + + public static int darkSteelSolarOneGen = 10; + public static int darkSteelSolarOneCost = 15; + public static int darkSteelSolarTwoGen = 40; + public static int darkSteelSolarTwoCost = 30; + public static int darkSteelSolarThreeGen = 160; + public static int darkSteelSolarThreeCost = 40; + + public static boolean darkSteelSolarChargeOthers = true; + + public static float darkSteelAnvilDamageChance = 0.024f; + + public static float darkSteelLadderSpeedBoost = 0.06f; + + public static int hootchPowerPerCycleRF = 60; + public static int hootchPowerTotalBurnTime = 6000; + public static int rocketFuelPowerPerCycleRF = 160; + public static int rocketFuelPowerTotalBurnTime = 7000; + public static int fireWaterPowerPerCycleRF = 80; + public static int fireWaterPowerTotalBurnTime = 15000; + public static int vatPowerUserPerTickRF = 20; + + public static int maxPhotovoltaicOutputRF = 10; + public static int maxPhotovoltaicAdvancedOutputRF = 40; + public static int maxPhotovoltaicVibrantOutputRF = 160; + + public static int zombieGeneratorRfPerTick = 80; + public static int zombieGeneratorTicksPerBucketFuel = 12000; + + public static int frankenzombieGeneratorRfPerTick = 120; + public static int frankenzombieGeneratorTicksPerBucketFuel = 12000; + + public static int enderGeneratorRfPerTick = 360; + public static int enderGeneratorTicksPerBucketFuel = 96000; + + public static double[] zombieGeneratorsEnergyMultipliers = {1f, 2f, 3f, 5f, 8f, 13f, 21f}; + public static double[] zombieGeneratorsBurnTimeMultipliers = {0.5f, 1f / 1.5f}; + + public static int stirlingGeneratorBaseRfPerTick = 20; + public static float stirlingGeneratorEnergyMultiplierT1 = 1f; + public static float stirlingGeneratorEnergyMultiplierT2 = 2f; + public static float stirlingGeneratorEnergyMultiplierT3 = 4f; + public static float stirlingGeneratorBurnTimeMultiplierT1 = 1f / 2f; + public static float stirlingGeneratorBurnTimeMultiplierT2 = 1f / 1.5f; + public static float stirlingGeneratorBurnTimeMultiplierT3 = 1f / 1.5f; + + public static double[] stirlingGeneratorEnergyMultipliers = {1f, 2f, 3f, 5f, 8f, 13f, 21f}; + public static double[] stirlingGeneratorBurnTimeMultipliers = {0.5f, 1f / 1.5f}; + + public static boolean combustionGeneratorUseOpaqueModel = true; + + public static boolean addFuelTooltipsToAllFluidContainers = true; + public static boolean addFurnaceFuelTootip = true; + public static boolean addDurabilityTootip = true; + + public static int farmContinuousEnergyUseRF = 40; + public static int farmActionEnergyUseRF = 500; + public static int farmAxeActionEnergyUseRF = 1000; + public static int farmBonemealActionEnergyUseRF = 160; + public static int farmBonemealTryEnergyUseRF = 80; + + public static int farmDefaultSize = 3; + public static int farmBonusSize = 2; + public static boolean farmAxeDamageOnLeafBreak = false; + public static float farmToolTakeDamageChance = 1; + public static boolean disableFarmNotification = false; + public static boolean farmEssenceBerriesEnabled = true; + public static boolean farmManaBeansEnabled = false; + public static boolean farmHarvestJungleWhenCocoa = false; + public static String[] hoeStrings = new String[] { + "minecraft:wooden_hoe", + "minecraft:stone_hoe", + "minecraft:iron_hoe", + "minecraft:diamond_hoe", + "minecraft:golden_hoe", + "MekanismTools:ObsidianHoe", + "MekanismTools:LapisLazuliHoe", + "MekanismTools:OsmiumHoe", + "MekanismTools:BronzeHoe", + "MekanismTools:GlowstoneHoe", + "MekanismTools:SteelHoe", + "Steamcraft:hoeBrass", + "Steamcraft:hoeGildedGold", + "Railcraft:tool.steel.hoe", + "TConstruct:mattock", + "appliedenergistics2:item.ToolCertusQuartzHoe", + "appliedenergistics2:item.ToolNetherQuartzHoe", + "ProjRed|Exploration:projectred.exploration.hoeruby", + "ProjRed|Exploration:projectred.exploration.hoesapphire", + "ProjRed|Exploration:projectred.exploration.hoeperidot", + "magicalcrops:magicalcrops_AccioHoe", + "magicalcrops:magicalcrops_CrucioHoe", + "magicalcrops:magicalcrops_ImperioHoe", + // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", + "magicalcrops:magicalcropsarmor_AccioHoe", + "magicalcrops:magicalcropsarmor_CrucioHoe", + "magicalcrops:magicalcropsarmor_ImperioHoe", + "BiomesOPlenty:hoeAmethyst", + "BiomesOPlenty:hoeMud", + "Eln:Eln.Copper Hoe", + "Thaumcraft:ItemHoeThaumium", + "Thaumcraft:ItemHoeElemental", + "Thaumcraft:ItemHoeVoid", + "ThermalFoundation:tool.hoeInvar", + "ThermalFoundation:tool.hoeCopper", + "ThermalFoundation:tool.hoeBronze", + "ThermalFoundation:tool.hoeSilver", + "ThermalFoundation:tool.hoeElectrum", + "ThermalFoundation:tool.hoeTin", + "ThermalFoundation:tool.hoeLead", + "ThermalFoundation:tool.hoeNickel", + "ThermalFoundation:tool.hoePlatinum", + "TwilightForest:item.steeleafHoe", + "TwilightForest:item.ironwoodHoe", + "IC2:itemToolBronzeHoe" + }; + public static List farmHoes = new ArrayList(); + public static int farmSaplingReserveAmount = 8; + + public static int magnetPowerUsePerSecondRF = 1; + public static int magnetPowerCapacityRF = 100000; + public static int magnetRange = 5; + public static String[] magnetBlacklist = + new String[] {"appliedenergistics2:item.ItemCrystalSeed", "Botania:livingrock", "Botania:manaTablet"}; + public static int magnetMaxItems = 20; + + public static boolean magnetAllowInMainInventory = false; + public static boolean magnetAllowInBaublesSlot = true; + public static boolean magnetAllowDeactivatedInBaublesSlot = false; + public static boolean magnetAllowPowerExtraction = false; + public static String magnetBaublesType = "AMULET"; + + public static boolean useCombustionGenModel = false; + + public static int crafterRfPerCraft = 2500; + + public static int capacitorBankMaxIoRF = 5000; + public static int capacitorBankMaxStorageRF = 5000000; + + public static int capacitorBankTierOneMaxIoRF = 1000; + public static int capacitorBankTierOneMaxStorageRF = 1000000; + + public static int capacitorBankTierTwoMaxIoRF = 5000; + public static int capacitorBankTierTwoMaxStorageRF = 5000000; + + public static int capacitorBankTierThreeMaxIoRF = 25000; + public static int capacitorBankTierThreeMaxStorageRF = 25000000; + + public static int poweredSpawnerMinDelayTicks = 200; + public static int poweredSpawnerMaxDelayTicks = 800; + public static int poweredSpawnerLevelOnePowerPerTickRF = 160; + public static int poweredSpawnerLevelTwoPowerPerTickRF = 500; + public static int poweredSpawnerLevelThreePowerPerTickRF = 1500; + public static int poweredSpawnerLevelFourPowerPerTickRF = 4500; + public static int poweredSpawnerLevelFivePowerPerTickRF = 2000; + public static int poweredSpawnerLevelSixPowerPerTickRF = 1000; + public static int poweredSpawnerLevelSevenPowerPerTickRF = 500; + public static int poweredSpawnerLevelEightPowerPerTickRF = 160; + public static int poweredSpawnerLevelNinePowerPerTickRF = 500; + public static int poweredSpawnerLevelTenPowerPerTickRF = 1500; + public static int poweredSpawnerMaxPlayerDistance = 0; + public static int poweredSpawnerDespawnTimeSeconds = 120; + public static int poweredSpawnerSpawnCount = 4; + public static int poweredSpawnerSpawnRange = 4; + public static int poweredSpawnerMaxNearbyEntities = 6; + public static int poweredSpawnerMaxSpawnTries = 3; + public static boolean poweredSpawnerUseVanillaSpawChecks = false; + public static double brokenSpawnerDropChance = 1; + public static String[] brokenSpawnerToolBlacklist = new String[] {"RotaryCraft:rotarycraft_item_bedpick"}; + public static int powerSpawnerAddSpawnerCost = 30; + + public static int painterEnergyPerTaskRF = 2000; + + public static int vacuumChestRange = 6; + + public static boolean useModMetals = true; + + public static int wirelessChargerRange = 24; + + public static long nutrientFoodBoostDelay = 400; + + public static int enchanterBaseLevelCost = 4; + + public static boolean machineSoundsEnabled = true; + + public static float machineSoundVolume = 1.0f; + + public static int killerJoeNutrientUsePerAttackMb = 5; + public static double killerJoeAttackHeight = 2; + public static double killerJoeAttackWidth = 2; + public static double killerJoeAttackLength = 4; + public static double killerJoeHooverXpWidth = 5; + public static double killerJoeHooverXpLength = 10; + public static int killerJoeMaxXpLevel = Integer.MAX_VALUE; + public static boolean killerJoeMustSee = false; + public static boolean killerPvPoffDisablesSwing = false; + public static boolean killerPvPoffIsIgnored = false; + + public static boolean allowTileEntitiesAsPaintSource = true; + + public static boolean isGasConduitEnabled = true; + public static boolean enableMEConduits = true; + public static boolean enableOCConduits = true; + public static boolean enableOCConduitsAnimatedTexture = true; + + public static String[] soulVesselBlackList = new String[0]; + public static boolean soulVesselCapturesBosses = false; + + public static int soulBinderLevelOnePowerPerTickRF = 500; + public static int soulBinderLevelTwoPowerPerTickRF = 1000; + public static int soulBinderLevelThreePowerPerTickRF = 2000; + public static int soulBinderLevelFourPowerPerTickRF = 4000; + public static int soulBinderLevelFivePowerPerTickRF = 8000; + public static int soulBinderLevelSixPowerPerTickRF = 16000; + public static int soulBinderLevelSevenPowerPerTickRF = 32000; + public static int soulBinderLevelEightPowerPerTickRF = 500; + public static int soulBinderLevelNinePowerPerTickRF = 1000; + public static int soulBinderLevelTenPowerPerTickRF = 2000; + public static int soulBinderBrokenSpawnerRF = 2500000; + public static int soulBinderBrokenSpawnerLevels = 15; + public static int soulBinderReanimationRF = 100000; + public static int soulBinderReanimationLevels = 10; + public static int soulBinderEnderCystalRF = 100000; + public static int soulBinderEnderCystalLevels = 10; + public static int soulBinderPrecientCystalRF = 100000; + public static int soulBinderPrecientCystalLevels = 10; + public static int soulBinderAttractorCystalRF = 100000; + public static int soulBinderAttractorCystalLevels = 10; + public static int soulBinderEnderRailRF = 100000; + public static int soulBinderEnderRailLevels = 10; + public static int soulBinderMaxXpLevel = 40; + + public static boolean powerConduitCanDifferentTiersConnect = false; + public static int powerConduitTierOneRF = 640; + public static int powerConduitTierTwoRF = 5120; + public static int powerConduitTierThreeRF = 20480; + public static int[] powerConduitEndergyTiers = { + 20, 40, 80, 160, 320, 1280, 2560, 10240, 40960, 81920, 327680, 2000000000 + }; + public static boolean powerConduitOutputMJ = true; + + public static int sliceAndSpliceLevelOnePowerPerTickRF = 80; + public static int sliceAndSpliceLevelTwoPowerPerTickRF = 160; + public static int sliceAndSpliceLevelThreePowerPerTickRF = 320; + public static int sliceAndSpliceLevelFourPowerPerTickRF = 640; + public static int sliceAndSpliceLevelFivePowerPerTickRF = 1280; + public static int sliceAndSpliceLevelSixPowerPerTickRF = 2560; + public static int sliceAndSpliceLevelSevenPowerPerTickRF = 5120; + public static int sliceAndSpliceLevelEightPowerPerTickRF = 80; + public static int sliceAndSpliceLevelNinePowerPerTickRF = 160; + public static int sliceAndSpliceLevelTenPowerPerTickRF = 320; + + public static boolean soulBinderRequiresEndermanSkull = true; + + public static int attractorRangeLevelOne = 16; + public static int attractorPowerPerTickLevelOne = 20; + public static int attractorRangeLevelTwo = 32; + public static int attractorPowerPerTickLevelTwo = 40; + public static int attractorRangeLevelThree = 64; + public static int attractorPowerPerTickLevelThree = 80; + + public static int spawnGuardRangeLevelOne = 64; + public static int spawnGuardPowerPerTickLevelOne = 80; + public static int spawnGuardRangeLevelTwo = 96; + public static int spawnGuardPowerPerTickLevelTwo = 300; + public static int spawnGuardRangeLevelThree = 160; + public static int spawnGuardPowerPerTickLevelThree = 800; + public static boolean spawnGuardStopAllSlimesDebug = false; + public static boolean spawnGuardStopAllSquidSpawning = false; + + public static int weatherObeliskClearFluid = 2000; + public static int weatherObeliskRainFluid = 500; + public static int weatherObeliskThunderFluid = 1000; + + // Loot Defaults + public static boolean lootDarkSteel = true; + public static boolean lootItemConduitProbe = true; + public static boolean lootQuartz = true; + public static boolean lootNetherWart = true; + public static boolean lootEnderPearl = true; + public static boolean lootElectricSteel = true; + public static boolean lootRedstoneAlloy = true; + public static boolean lootPhasedIron = true; + public static boolean lootPhasedGold = true; + public static boolean lootTravelStaff = true; + public static boolean lootTheEnder = true; + public static boolean lootDarkSteelBoots = true; + + public static boolean dumpMobNames = false; + + public static boolean enderRailEnabled = true; + public static int enderRailPowerRequireCrossDimensions = 10000; + public static int enderRailPowerRequiredPerBlock = 10; + public static boolean enderRailCapSameDimensionPowerAtCrossDimensionCost = true; + public static int enderRailTicksBeforeForceSpawningLinkedCarts = 60; + public static boolean enderRailTeleportPlayers = false; + + public static int xpObeliskMaxXpLevel = Integer.MAX_VALUE; + public static String xpJuiceName = "xpjuice"; + + public static boolean clearGlassSameTexture = false; + public static boolean clearGlassConnectToFusedQuartz = false; + + public static int enchantmentSoulBoundId = -1; + public static int enchantmentSoulBoundWeight = 1; + public static boolean enchantmentSoulBoundEnabled = true; + + public static boolean replaceWitherSkeletons = true; + + public static boolean enableWaterFromBottles = true; + + public static boolean telepadLockDimension = true; + public static boolean telepadLockCoords = true; + public static int telepadPowerCoefficient = 100000; + public static int telepadPowerInterdimensional = 100000; + public static int telepadPowerPerTickRF = 1000; + public static int telepadPowerStorageRF = 100000; + + public static boolean inventoryPanelFree = false; + ; + public static float inventoryPanelPowerPerMB = 800.0f; + public static float inventoryPanelScanCostPerSlot = 0.1f; + public static float inventoryPanelExtractCostPerItem = 12.0f; + public static float inventoryPanelExtractCostPerOperation = 32.0f; + + public static void load(FMLPreInitializationEvent event) { + PacketHandler.INSTANCE.registerMessage( + PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); + + FMLCommonHandler.instance().bus().register(new Config()); + configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.DOMAIN); + if (!configDirectory.exists()) { + configDirectory.mkdir(); + } + + File configFile = new File(configDirectory, "EnderIO.cfg"); + config = new Configuration(configFile); + syncConfig(false); } - File configFile = new File(configDirectory, "EnderIO.cfg"); - config = new Configuration(configFile); - syncConfig(false); - } - - public static void syncConfig(boolean load) { - try { - if (load) { - config.load(); - } - Config.processConfig(config); - } catch (Exception e) { - Log.error("EnderIO has a problem loading it's configuration"); - e.printStackTrace(); - } finally { - if(config.hasChanged()) { - config.save(); - } + public static void syncConfig(boolean load) { + try { + if (load) { + config.load(); + } + Config.processConfig(config); + } catch (Exception e) { + Log.error("EnderIO has a problem loading it's configuration"); + e.printStackTrace(); + } finally { + if (config.hasChanged()) { + config.save(); + } + } } - } - @SubscribeEvent - public void onConfigChanged(OnConfigChangedEvent event) { - if (event.modID.equals(EnderIO.MODID)) { - Log.info("Updating config..."); - syncConfig(false); - init(); - postInit(); + @SubscribeEvent + public void onConfigChanged(OnConfigChangedEvent event) { + if (event.modID.equals(EnderIO.MODID)) { + Log.info("Updating config..."); + syncConfig(false); + init(); + postInit(); + } } - } - @SubscribeEvent - public void onConfigFileChanged(ConfigFileChangedEvent event) { - if (event.modID.equals(EnderIO.MODID)) { - Log.info("Updating config..."); - syncConfig(true); - event.setSuccessful(); - init(); - postInit(); + @SubscribeEvent + public void onConfigFileChanged(ConfigFileChangedEvent event) { + if (event.modID.equals(EnderIO.MODID)) { + Log.info("Updating config..."); + syncConfig(true); + event.setSuccessful(); + init(); + postInit(); + } } - } - @SubscribeEvent - public void onPlayerLoggon(PlayerLoggedInEvent evt) { - PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); - } - - public static void processConfig(Configuration config) { - - capacitorBankMaxIoRF = config.get(sectionPower.name, "capacitorBankMaxIoRF", capacitorBankMaxIoRF, "The maximum IO for a single capacitor in RF/t") - .getInt(capacitorBankMaxIoRF); - capacitorBankMaxStorageRF = config.get(sectionPower.name, "capacitorBankMaxStorageRF", capacitorBankMaxStorageRF, - "The maximum storage for a single capacitor in RF") - .getInt(capacitorBankMaxStorageRF); - - capacitorBankTierOneMaxIoRF = config.get(sectionPower.name, "capacitorBankTierOneMaxIoRF", capacitorBankTierOneMaxIoRF, - "The maximum IO for a single tier one capacitor in RF/t") - .getInt(capacitorBankTierOneMaxIoRF); - capacitorBankTierOneMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierOneMaxStorageRF", capacitorBankTierOneMaxStorageRF, - "The maximum storage for a single tier one capacitor in RF") - .getInt(capacitorBankTierOneMaxStorageRF); - - capacitorBankTierTwoMaxIoRF = config.get(sectionPower.name, "capacitorBankTierTwoMaxIoRF", capacitorBankTierTwoMaxIoRF, - "The maximum IO for a single tier two capacitor in RF/t") - .getInt(capacitorBankTierTwoMaxIoRF); - capacitorBankTierTwoMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierTwoMaxStorageRF", capacitorBankTierTwoMaxStorageRF, - "The maximum storage for a single tier two capacitor in RF") - .getInt(capacitorBankTierTwoMaxStorageRF); - - capacitorBankTierThreeMaxIoRF = config.get(sectionPower.name, "capacitorBankTierThreeMaxIoRF", capacitorBankTierThreeMaxIoRF, - "The maximum IO for a single tier three capacitor in RF/t") - .getInt(capacitorBankTierThreeMaxIoRF); - capacitorBankTierThreeMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierThreeMaxStorageRF", capacitorBankTierThreeMaxStorageRF, - "The maximum storage for a single tier three capacitor in RF") - .getInt(capacitorBankTierThreeMaxStorageRF); - - powerConduitTierOneRF = config.get(sectionPower.name, "powerConduitTierOneRF", powerConduitTierOneRF, "The maximum IO for the tier 1 power conduit") - .getInt(powerConduitTierOneRF); - powerConduitTierTwoRF = config.get(sectionPower.name, "powerConduitTierTwoRF", powerConduitTierTwoRF, "The maximum IO for the tier 2 power conduit") - .getInt(powerConduitTierTwoRF); - powerConduitTierThreeRF = config.get(sectionPower.name, "powerConduitTierThreeRF", powerConduitTierThreeRF, "The maximum IO for the tier 3 power conduit") - .getInt(powerConduitTierThreeRF); - powerConduitEndergyTiers = config.get(sectionPower.name, "powerConduitTiersEndergy", powerConduitEndergyTiers, "The maximum IO for the endergy power conduit") - .getIntList(); - - powerConduitCanDifferentTiersConnect = config - .getBoolean("powerConduitCanDifferentTiersConnect", sectionPower.name, powerConduitCanDifferentTiersConnect, - "If set to false power conduits of different tiers cannot be connected. in this case a block such as a cap. bank is needed to bridge different tiered networks"); - powerConduitOutputMJ = config.getBoolean("powerConduitOutputMJ", sectionPower.name, powerConduitOutputMJ, "When set to true power conduits will output MJ if RF is not supported"); - - - painterEnergyPerTaskRF = config.get(sectionPower.name, "painterEnergyPerTaskRF", painterEnergyPerTaskRF, - "The total amount of RF required to paint one block") - .getInt(painterEnergyPerTaskRF); - - useHardRecipes = config.get(sectionRecipe.name, "useHardRecipes", useHardRecipes, "When enabled machines cost significantly more.") - .getBoolean(useHardRecipes); - addPeacefulRecipes = config.get(sectionRecipe.name, "addPeacefulRecipes", addPeacefulRecipes, "When enabled peaceful recipes are added for soulbinder based crafting components.") - .getBoolean(addPeacefulRecipes); - soulBinderRequiresEndermanSkull = config.getBoolean("soulBinderRequiresEndermanSkull", sectionRecipe.name, soulBinderRequiresEndermanSkull, - "When true the Soul Binder requires an Enderman Skull to craft"); - allowTileEntitiesAsPaintSource = config.get(sectionRecipe.name, "allowTileEntitiesAsPaintSource", allowTileEntitiesAsPaintSource, - "When enabled blocks with tile entities (e.g. machines) can be used as paint targets.") - .getBoolean(allowTileEntitiesAsPaintSource); - useSteelInChassi = config.get(sectionRecipe.name, "useSteelInChassi", useSteelInChassi, "When enabled machine chassis will require steel instead of iron.") - .getBoolean(useSteelInChassi); - numConduitsPerRecipe = config.get(sectionRecipe.name, "numConduitsPerRecipe", numConduitsPerRecipe, - "The number of conduits crafted per recipe.").getInt(numConduitsPerRecipe); - transceiverUseEasyRecipe= config.get(sectionRecipe.name, "transceiverUseEasyRecipe", transceiverUseEasyRecipe, "When enabled the dim trans. will use a cheaper recipe") - .getBoolean(useHardRecipes); - crateSyntheticRecipes = config - .get( - sectionRecipe.name, - "crateSyntheticRecipes", - crateSyntheticRecipes, - "Automatically create alloy smelter recipes with double and triple inputs and different slot allocations (1+1+1, 2+1, 1+2, 3 and 2) for single-input recipes.") - .getBoolean(crateSyntheticRecipes); - - allowExternalTickSpeedup = config.get(sectionMisc.name, "allowExternalTickSpeedup", allowExternalTickSpeedup, - "Allows machines to run faster if another mod speeds up the tickrate. Running at higher tickrates is " - + "unsupported. Disable this if you run into any kind of problem.") - .getBoolean(allowExternalTickSpeedup); - - enchanterBaseLevelCost = config.get(sectionRecipe.name, "enchanterBaseLevelCost", enchanterBaseLevelCost, - "Base level cost added to all recipes in the enchanter.").getInt(enchanterBaseLevelCost); - - photovoltaicCellEnabled = config.get(sectionItems.name, "photovoltaicCellEnabled", photovoltaicCellEnabled, - "If set to false: Photovoltaic Cells will not be craftable.") - .getBoolean(photovoltaicCellEnabled); - - reservoirEnabled= config.get(sectionItems.name, "reservoirEnabled", reservoirEnabled, - "If set to false reservoirs will not be craftable.") - .getBoolean(reservoirEnabled); - - transceiverEnabled = config.get(sectionItems.name, "transceiverEnabled", transceiverEnabled, - "If set to false: Dimensional Transceivers will not be craftable.") - .getBoolean(transceiverEnabled); - - maxPhotovoltaicOutputRF = config.get(sectionPower.name, "maxPhotovoltaicOutputRF", maxPhotovoltaicOutputRF, - "Maximum output in RF/t of the Photovoltaic Panels.").getInt(maxPhotovoltaicOutputRF); - maxPhotovoltaicAdvancedOutputRF = config.get(sectionPower.name, "maxPhotovoltaicAdvancedOutputRF", maxPhotovoltaicAdvancedOutputRF, - "Maximum output in RF/t of the Advanced Photovoltaic Panels.").getInt(maxPhotovoltaicAdvancedOutputRF); - - useAlternateBinderRecipe = config.get(sectionRecipe.name, "useAlternateBinderRecipe", false, "Create conduit binder in crafting table instead of furnace") - .getBoolean(useAlternateBinderRecipe); - - conduitScale = config.get(sectionAesthetic.name, "conduitScale", DEFAULT_CONDUIT_SCALE, - "Valid values are between 0-1, smallest conduits at 0, largest at 1.\n" + - "In SMP, all clients must be using the same value as the server.").getDouble(DEFAULT_CONDUIT_SCALE); - conduitScale = VecmathUtil.clamp(conduitScale, 0, 1); - - wirelessChargerRange = config.get(sectionEfficiency.name, "wirelessChargerRange", wirelessChargerRange, - "The range of the wireless charger").getInt(wirelessChargerRange); - - fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate, - "Number of liters per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); - - fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); - - advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, - "Number of liters per tick extracted by pressurized fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); - - advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to an pressurized fluid conduit.").getInt(advancedFluidConduitMaxIoRate); - - enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, - "Number of liters per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); - - enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); - - crystallineEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "crystallineEnderFluidConduitExtractRate", crystallineEnderFluidConduitExtractRate, - "Number of liters per tick extracted by crystalline ender fluid conduits auto extracting").getInt(crystallineEnderFluidConduitExtractRate); - - crystallineEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "crystallineEnderFluidConduitMaxIoRate", crystallineEnderFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to a crystalline ender fluid conduit.").getInt(crystallineEnderFluidConduitMaxIoRate); - - crystallinePinkSlimeEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "crystallinePinkSlimeEnderFluidConduitExtractRate", crystallinePinkSlimeEnderFluidConduitExtractRate, - "Number of liters per tick extracted by crystalline pink slime ender fluid conduits auto extracting").getInt(crystallinePinkSlimeEnderFluidConduitExtractRate); - - crystallinePinkSlimeEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "crystallinePinkSlimeEnderFluidConduitMaxIoRate", crystallinePinkSlimeEnderFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to a crystalline pink slime ender fluid conduit.").getInt(crystallinePinkSlimeEnderFluidConduitMaxIoRate); - - melodicEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "melodicEnderFluidConduitExtractRate", melodicEnderFluidConduitExtractRate, - "Number of liters per tick extracted by melodic ender fluid conduits auto extracting").getInt(melodicEnderFluidConduitExtractRate); - - melodicEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "melodicEnderFluidConduitMaxIoRate", melodicEnderFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to a melodic ender fluid conduit.").getInt(melodicEnderFluidConduitMaxIoRate); - - stellarEnderFluidConduitExtractRate = config.get(sectionEfficiency.name, "stellarEnderFluidConduitExtractRate", stellarEnderFluidConduitExtractRate, - "Number of liters per tick extracted by stellar ender fluid conduits auto extracting").getInt(stellarEnderFluidConduitExtractRate); - - stellarEnderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "stellarEnderFluidConduitMaxIoRate", stellarEnderFluidConduitMaxIoRate, - "Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.").getInt(stellarEnderFluidConduitMaxIoRate); - - gasConduitExtractRate = config.get(sectionEfficiency.name, "gasConduitExtractRate", gasConduitExtractRate, - "Amount of gas per tick extracted by gas conduits auto extracting").getInt(gasConduitExtractRate); - - gasConduitMaxIoRate = config.get(sectionEfficiency.name, "gasConduitMaxIoRate", gasConduitMaxIoRate, - "Amount of gas per tick that can pass through a single connection to a gas conduit.").getInt(gasConduitMaxIoRate); - - useAlternateTesseractModel = config.get(sectionAesthetic.name, "useAlternateTransceiverModel", useAlternateTesseractModel, - "Use TheKazador's alternative model for the Dimensional Transceiver") - .getBoolean(false); - transceiverEnergyLoss = config.get(sectionPower.name, "transceiverEnergyLoss", transceiverEnergyLoss, - "Amount of energy lost when transferred by Dimensional Transceiver; 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss); - transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF, - "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF); - transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF, - "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); - transceiverBucketTransmissionCostRF = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCostRF", transceiverBucketTransmissionCostRF, - "The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver.").getInt(transceiverBucketTransmissionCostRF); - - vatPowerUserPerTickRF = config.get(sectionPower.name, "vatPowerUserPerTickRF", vatPowerUserPerTickRF, - "Power use (RF/t) used by the vat.").getInt(vatPowerUserPerTickRF); - - detailedPowerTrackingEnabled = config - .get( - sectionAdvanced.name, - "perInterfacePowerTrackingEnabled", - detailedPowerTrackingEnabled, - "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.") - .getBoolean(detailedPowerTrackingEnabled); - - useSneakMouseWheelYetaWrench = config.get(sectionPersonal.name, "useSneakMouseWheelYetaWrench", useSneakMouseWheelYetaWrench, - "If true, shift-mouse wheel will change the conduit display mode when the YetaWrench is equipped.") - .getBoolean(useSneakMouseWheelYetaWrench); - - useSneakRightClickYetaWrench = config.get(sectionPersonal.name, "useSneakRightClickYetaWrench", useSneakRightClickYetaWrench, - "If true, shift-clicking the YetaWrench on a null or non wrenchable object will change the conduit display mode.").getBoolean( - useSneakRightClickYetaWrench); - - yetaWrenchOverlayMode = config.getInt("yetaWrenchOverlayMode",sectionPersonal.name, yetaWrenchOverlayMode, 0, 2, - "What kind of overlay to use when holding the yeta wrench\n\n" - + "0 - Sideways scrolling in ceter of screen\n" - + "1 - Vertical icon bar in bottom right\n" - + "2 - Old-style group of icons in bottom right"); - - machineSoundsEnabled = config.get(sectionPersonal.name, "useMachineSounds", machineSoundsEnabled, "If true, machines will make sounds.").getBoolean( - machineSoundsEnabled); - - machineSoundVolume = (float) config.get(sectionPersonal.name, "machineSoundVolume", machineSoundVolume, "Volume of machine sounds.").getDouble( - machineSoundVolume); - - itemConduitUsePhyscialDistance = config.get(sectionEfficiency.name, "itemConduitUsePhyscialDistance", itemConduitUsePhyscialDistance, "If true, " + - "'line of sight' distance rather than conduit path distance is used to calculate priorities.") - .getBoolean(itemConduitUsePhyscialDistance); - - vacuumChestRange = config.get(sectionEfficiency.name, "vacumChestRange", vacuumChestRange, "The range of the vacuum chest").getInt(vacuumChestRange); - - reinforcedObsidianEnabled = config.get(sectionItems.name, "reinforcedObsidianEnabled", reinforcedObsidianEnabled, - "When set to false reinforced obsidian is not craftable.").getBoolean(reinforcedObsidianEnabled); - reinforcedObsidianUseDarkSteelBlocks = config.get(sectionRecipe.name, "reinforcedObsidianUseDarkSteelBlocks", reinforcedObsidianUseDarkSteelBlocks, - "When set to true four dark steel blocks are required instead of ingots when making reinforced obsidian.").getBoolean(reinforcedObsidianUseDarkSteelBlocks); - - travelAnchorEnabled = config.get(sectionItems.name, "travelAnchorEnabled", travelAnchorEnabled, - "When set to false: the travel anchor will not be craftable.").getBoolean(travelAnchorEnabled); - - travelAnchorMaxDistance = config.get(sectionAnchor.name, "travelAnchorMaxDistance", travelAnchorMaxDistance, - "Maximum number of blocks that can be traveled from one travel anchor to another.").getInt(travelAnchorMaxDistance); - - travelAnchorCooldown = config.get(sectionAnchor.name, "travelAnchorCooldown", travelAnchorCooldown, - "Number of ticks cooldown between activations (1 sec = 20 ticks)").getInt(travelAnchorCooldown); - - travelAnchorSneak = config.get(sectionAnchor.name, "travelAnchorSneak", travelAnchorSneak, - "Add sneak as an option to activate travel anchors").getBoolean(travelAnchorSneak); - - travelAnchorSkipWarning = config.get(sectionAnchor.name, "travelAnchorSkipWarning", travelAnchorSkipWarning, - "Travel Anchors send a chat warning when skipping inaccessible anchors").getBoolean(travelAnchorSkipWarning); - - travelStaffMaxDistance = config.get(sectionStaff.name, "travelStaffMaxDistance", travelStaffMaxDistance, - "Maximum number of blocks that can be traveled using the Staff of Traveling.").getInt(travelStaffMaxDistance); - travelStaffPowerPerBlockRF = (float) config.get(sectionStaff.name, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF, - "Number of RF required per block traveled using the Staff of Traveling.").getDouble(travelStaffPowerPerBlockRF); - - travelStaffMaxBlinkDistance = config.get(sectionStaff.name, "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance, - "Max number of blocks teleported when shift clicking the staff.").getInt(travelStaffMaxBlinkDistance); - - travelStaffBlinkPauseTicks = config.get(sectionStaff.name, "travelStaffBlinkPauseTicks", travelStaffBlinkPauseTicks, - "Minimum number of ticks between 'blinks'. Values of 10 or less allow a limited sort of flight.").getInt(travelStaffBlinkPauseTicks); - - travelStaffEnabled = config.get(sectionStaff.name, "travelStaffEnabled", travelAnchorEnabled, - "If set to false: the travel staff will not be craftable.").getBoolean(travelStaffEnabled); - travelStaffBlinkEnabled = config.get(sectionStaff.name, "travelStaffBlinkEnabled", travelStaffBlinkEnabled, - "If set to false: the travel staff can not be used to shift-right click teleport, or blink.").getBoolean(travelStaffBlinkEnabled); - travelStaffBlinkThroughSolidBlocksEnabled = config.get(sectionStaff.name, "travelStaffBlinkThroughSolidBlocksEnabled", - travelStaffBlinkThroughSolidBlocksEnabled, - "If set to false: the travel staff can be used to blink through any block.").getBoolean(travelStaffBlinkThroughSolidBlocksEnabled); - travelStaffBlinkThroughClearBlocksEnabled = config - .get(sectionItems.name, "travelStaffBlinkThroughClearBlocksEnabled", travelStaffBlinkThroughClearBlocksEnabled, - "If travelStaffBlinkThroughSolidBlocksEnabled is set to false and this is true: the travel " + - "staff can only be used to blink through transparent or partial blocks (e.g. torches). " + - "If both are false: only air blocks may be teleported through.") - .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); - travelStaffBlinkThroughUnbreakableBlocksEnabled = config.get(sectionItems.name, "travelStaffBlinkThroughUnbreakableBlocksEnabled", - travelStaffBlinkThroughUnbreakableBlocksEnabled, "Allows the travel staff to blink through unbreakable blocks such as warded blocks and bedrock.") - .getBoolean(); - travelStaffBlinkBlackList = config.getStringList("travelStaffBlinkBlackList", sectionStaff.name, travelStaffBlinkBlackList, - "Lists the blocks that cannot be teleported through in the form 'modID:blockName'"); - travelAnchorZoomScale = config.getFloat("travelAnchorZoomScale", sectionStaff.name, travelAnchorZoomScale, 0, 1, - "Set the max zoomed size of a travel anchor as an aprox. percentage of screen height"); - travelStaffSearchOptimize = config.get(sectionStaff.name, "travelStaffSearchOptimize", travelStaffSearchOptimize, - "If set to true: blinking by travel staff has reduced search branch. " + - "You can now teleport onto the roof. " + - "This config is experimental, so if you encounter any strange behavior, please report to GTNH developer.") - .getBoolean(travelStaffSearchOptimize); - - - enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange, - "Range accessible (in blocks) when using the Ender IO.").getInt(enderIoRange); - - enderIoMeAccessEnabled = config.get(sectionPersonal.name, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, - "If false: you will not be able to access a ME access or crafting terminal using the Ender IO.").getBoolean(enderIoMeAccessEnabled); - - updateLightingWhenHidingFacades = config.get(sectionEfficiency.name, "updateLightingWhenHidingFacades", updateLightingWhenHidingFacades, - "When true: correct lighting is recalculated (client side) for conduit bundles when transitioning to" - + " from being hidden behind a facade. This produces " - + "better quality rendering but can result in frame stutters when switching to/from a wrench.") - .getBoolean(updateLightingWhenHidingFacades); - - darkSteelPowerDamgeAbsorptionRatios = config - .get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios, - "A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered.") - .getDoubleList(); - darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, - "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); - darkSteelPowerStorageLevelOne = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelOne", darkSteelPowerStorageLevelOne, - "Amount of power stored by dark steel items with a level 1 upgrade.").getInt(darkSteelPowerStorageLevelOne); - darkSteelPowerStorageLevelTwo = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelTwo", darkSteelPowerStorageLevelTwo, - "Amount of power stored by dark steel items with a level 2 upgrade.").getInt(darkSteelPowerStorageLevelTwo); - darkSteelPowerStorageLevelThree = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelThree", darkSteelPowerStorageLevelThree, - "Amount of power stored by dark steel items with a level 3 upgrade.").getInt(darkSteelPowerStorageLevelThree); - darkSteelPowerStorageLevelFour = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelFour", darkSteelPowerStorageLevelFour, - "Amount of power stored by dark steel items with a level 4 upgrade.").getInt(darkSteelPowerStorageLevelFour); - - darkSteelUpgradeVibrantCost = config.get(sectionDarkSteel.name, "darkSteelUpgradeVibrantCost", darkSteelUpgradeVibrantCost, - "Number of levels required for the 'Empowered.").getInt(darkSteelUpgradeVibrantCost); - darkSteelUpgradePowerOneCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerOneCost", darkSteelUpgradePowerOneCost, - "Number of levels required for the 'Power 1.").getInt(darkSteelUpgradePowerOneCost); - darkSteelUpgradePowerTwoCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerTwoCost", darkSteelUpgradePowerTwoCost, - "Number of levels required for the 'Power 2.").getInt(darkSteelUpgradePowerTwoCost); - darkSteelUpgradePowerThreeCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerThreeCost", darkSteelUpgradePowerThreeCost, - "Number of levels required for the 'Power 3' upgrade.").getInt(darkSteelUpgradePowerThreeCost); - darkSteelUpgradePowerFourCost = config.get(sectionDarkSteel.name, "darkSteelUpgradePowerFourCost", darkSteelUpgradePowerFourCost, - "Number of levels required for the 'Power 4' upgrade.").getInt(darkSteelUpgradePowerFourCost); - - darkSteelJumpOneCost = config.get(sectionDarkSteel.name, "darkSteelJumpOneCost", darkSteelJumpOneCost, - "Number of levels required for the 'Jump 1' upgrade.").getInt(darkSteelJumpOneCost); - darkSteelJumpTwoCost = config.get(sectionDarkSteel.name, "darkSteelJumpTwoCost", darkSteelJumpTwoCost, - "Number of levels required for the 'Jump 2' upgrade.").getInt(darkSteelJumpTwoCost); - darkSteelJumpThreeCost = config.get(sectionDarkSteel.name, "darkSteelJumpThreeCost", darkSteelJumpThreeCost, - "Number of levels required for the 'Jump 3' upgrade.").getInt(darkSteelJumpThreeCost); - - darkSteelSpeedOneCost = config.get(sectionDarkSteel.name, "darkSteelSpeedOneCost", darkSteelSpeedOneCost, - "Number of levels required for the 'Speed 1' upgrade.").getInt(darkSteelSpeedOneCost); - darkSteelSpeedTwoCost = config.get(sectionDarkSteel.name, "darkSteelSpeedTwoCost", darkSteelSpeedTwoCost, - "Number of levels required for the 'Speed 2' upgrade.").getInt(darkSteelSpeedTwoCost); - darkSteelSpeedThreeCost = config.get(sectionDarkSteel.name, "darkSteelSpeedThreeCost", darkSteelSpeedThreeCost, - "Number of levels required for the 'Speed 3' upgrade.").getInt(darkSteelSpeedThreeCost); - - slotZeroPlacesEight = config.get(sectionDarkSteel.name, "shouldSlotZeroWrap", slotZeroPlacesEight, "Should the dark steel placement, when in the first (0th) slot, place the item in the last slot. If false, will place what's in the second slot.").getBoolean(); - - darkSteelSpeedOneWalkModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedOneWalkModifier", darkSteelSpeedOneWalkModifier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedOneWalkModifier); - darkSteelSpeedTwoWalkMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedTwoWalkMultiplier", darkSteelSpeedTwoWalkMultiplier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedTwoWalkMultiplier); - darkSteelSpeedThreeWalkMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedThreeWalkMultiplier", darkSteelSpeedThreeWalkMultiplier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedThreeWalkMultiplier); - - darkSteelSpeedOneSprintModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedOneSprintModifier", darkSteelSpeedOneSprintModifier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedOneSprintModifier); - darkSteelSpeedTwoSprintMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedTwoSprintMultiplier", darkSteelSpeedTwoSprintMultiplier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedTwoSprintMultiplier); - darkSteelSpeedThreeSprintMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedThreeSprintMultiplier", darkSteelSpeedThreeSprintMultiplier, - "Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedThreeSprintMultiplier); - - darkSteelBootsJumpModifier = config.get(sectionDarkSteel.name, "darkSteelBootsJumpModifier", darkSteelBootsJumpModifier, - "Jump height modifier applied when jumping with Dark Steel Boots equipped").getDouble(darkSteelBootsJumpModifier); - - darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorage", darkSteelPowerStorageBase, - "Amount of power stored (RF) per crystal in the armor items recipe.").getInt(darkSteelPowerStorageBase); - darkSteelWalkPowerCost = config.get(sectionDarkSteel.name, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, - "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); - darkSteelSprintPowerCost = config.get(sectionDarkSteel.name, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, - "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelSprintPowerCost); - darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel.name, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, - "If true, dark steel armor will drain power stored (RF) in power containers in the players inventory.").getBoolean(darkSteelDrainPowerFromInventory); - - darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, - "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); - - darkSteelFallDistanceCost = config.get(sectionDarkSteel.name, "darkSteelFallDistanceCost", darkSteelFallDistanceCost, - "Amount of power used (RF) per block height of fall distance damage negated.").getInt(darkSteelFallDistanceCost); - - darkSteelSwimCost = config.get(sectionDarkSteel.name, "darkSteelSwimCost", darkSteelSwimCost, - "Number of levels required for the 'Swim' upgrade.").getInt(darkSteelSwimCost); - - darkSteelNightVisionCost = config.get(sectionDarkSteel.name, "darkSteelNightVisionCost", darkSteelNightVisionCost, - "Number of levels required for the 'Night Vision' upgrade.").getInt(darkSteelNightVisionCost); - - darkSteelGliderCost = config.get(sectionDarkSteel.name, "darkSteelGliderCost", darkSteelGliderCost, - "Number of levels required for the 'Glider' upgrade.").getInt(darkSteelGliderCost); - darkSteelGliderHorizontalSpeed = config.get(sectionDarkSteel.name, "darkSteelGliderHorizontalSpeed", darkSteelGliderHorizontalSpeed, - "Horizontal movement speed modifier when gliding.").getDouble(darkSteelGliderHorizontalSpeed); - darkSteelGliderVerticalSpeed = config.get(sectionDarkSteel.name, "darkSteelGliderVerticalSpeed", darkSteelGliderVerticalSpeed, - "Rate of altitude loss when gliding.").getDouble(darkSteelGliderVerticalSpeed); - darkSteelGliderVerticalSpeedSprinting = config.get(sectionDarkSteel.name, "darkSteelGliderVerticalSpeedSprinting", darkSteelGliderVerticalSpeedSprinting, - "Rate of altitude loss when sprinting and gliding.").getDouble(darkSteelGliderVerticalSpeedSprinting); - - darkSteelSoundLocatorCost = config.get(sectionDarkSteel.name, "darkSteelSoundLocatorCost", darkSteelSoundLocatorCost, - "Number of levels required for the 'Sound Locator' upgrade.").getInt(darkSteelSoundLocatorCost); - darkSteelSoundLocatorRange = config.get(sectionDarkSteel.name, "darkSteelSoundLocatorRange", darkSteelSoundLocatorRange, - "Range of the 'Sound Locator' upgrade.").getInt(darkSteelSoundLocatorRange); - darkSteelSoundLocatorLifespan = config.get(sectionDarkSteel.name, "darkSteelSoundLocatorLifespan", darkSteelSoundLocatorLifespan, - "Number of ticks the 'Sound Locator' icons are displayed for.").getInt(darkSteelSoundLocatorLifespan); - - darkSteelGogglesOfRevealingCost= config.get(sectionDarkSteel.name, "darkSteelGogglesOfRevealingCost", darkSteelGogglesOfRevealingCost, - "Number of levels required for the Goggles of Revealing upgrade.").getInt(darkSteelGogglesOfRevealingCost); - - darkSteelApiaristArmorCost= config.get(sectionDarkSteel.name, "darkSteelApiaristArmorCost", darkSteelApiaristArmorCost, - "Number of levels required for the Apiarist Armor upgrade.").getInt(darkSteelApiaristArmorCost); - - darkSteelTravelCost = config.get(sectionDarkSteel.name, "darkSteelTravelCost", darkSteelTravelCost, - "Number of levels required for the 'Travel' upgrade.").getInt(darkSteelTravelCost); - - darkSteelSpoonCost = config.get(sectionDarkSteel.name, "darkSteelSpoonCost", darkSteelSpoonCost, - "Number of levels required for the 'Spoon' upgrade.").getInt(darkSteelSpoonCost); - - darkSteelSolarOneCost = config.get(sectionDarkSteel.name, "darkSteelSolarOneCost", darkSteelSolarOneCost, - "Cost in XP levels of the Solar I upgrade.").getInt(); - darkSteelSolarOneGen = config.get(sectionDarkSteel.name, "darkSteelSolarOneGen", darkSteelSolarOneGen, - "RF per SECOND generated by the Solar I upgrade. Split between all equipped DS armors.").getInt(); - - darkSteelSolarTwoCost = config.get(sectionDarkSteel.name, "darkSteelSolarTwoCost", darkSteelSolarTwoCost, - "Cost in XP levels of the Solar II upgrade.").getInt(); - darkSteelSolarTwoGen = config.get(sectionDarkSteel.name, "darkSteelSolarTwoGen", darkSteelSolarTwoGen, - "RF per SECOND generated by the Solar II upgrade. Split between all equipped DS armors.").getInt(); - darkSteelSolarChargeOthers = config.get(sectionDarkSteel.name, "darkSteelSolarChargeOthers", darkSteelSolarChargeOthers, - "If enabled allows the solar upgrade to charge non-darksteel armors that the player is wearing.").getBoolean(); - - darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, - "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordSkullChance); - darkSteelSwordSkullLootingModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullLootingModifier", darkSteelSwordSkullLootingModifier, - "The chance per looting level that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordSkullLootingModifier); - - darkSteelSwordWitherSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordWitherSkullChance", darkSteelSwordWitherSkullChance, - "The base chance that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordWitherSkullChance); - darkSteelSwordWitherSkullLootingModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSwordWitherSkullLootingModifie", - darkSteelSwordWitherSkullLootingModifier, - "The chance per looting level that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordWitherSkullLootingModifier); - - vanillaSwordSkullChance = (float) config.get(sectionDarkSteel.name, "vanillaSwordSkullChance", vanillaSwordSkullChance, - "The base chance that a skull will be dropped when using a non dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - vanillaSwordSkullChance); - vanillaSwordSkullLootingModifier = (float) config.get(sectionPersonal.name, "vanillaSwordSkullLootingModifier", vanillaSwordSkullLootingModifier, - "The chance per looting level that a skull will be dropped when using a non-dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - vanillaSwordSkullLootingModifier); - - ticCleaverSkullDropChance = (float) config.get(sectionDarkSteel.name, "ticCleaverSkullDropChance", ticCleaverSkullDropChance, - "The base chance that an Enderman Skull will be dropped when using TiC Cleaver").getDouble( - ticCleaverSkullDropChance); - ticBeheadingSkullModifier = (float) config.get(sectionPersonal.name, "ticBeheadingSkullModifier", ticBeheadingSkullModifier, - "The chance per level of Beheading that a skull will be dropped when using a TiC weapon").getDouble( - ticBeheadingSkullModifier); - - fakePlayerSkullChance = (float) config - .get( - sectionDarkSteel.name, - "fakePlayerSkullChance", - fakePlayerSkullChance, - "The ratio of skull drops when a mob is killed by a 'FakePlayer', such as Killer Joe. When set to 0 no skulls will drop, at 1 the rate of skull drops is not modified") - .getDouble( - fakePlayerSkullChance); - - darkSteelSwordPowerUsePerHit = config.get(sectionDarkSteel.name, "darkSteelSwordPowerUsePerHit", darkSteelSwordPowerUsePerHit, - "The amount of power (RF) used per hit.").getInt(darkSteelSwordPowerUsePerHit); - darkSteelSwordEnderPearlDropChance = config.get(sectionDarkSteel.name, "darkSteelSwordEnderPearlDropChance", darkSteelSwordEnderPearlDropChance, - "The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( - darkSteelSwordEnderPearlDropChance); - darkSteelSwordEnderPearlDropChancePerLooting = config.get(sectionDarkSteel.name, "darkSteelSwordEnderPearlDropChancePerLooting", - darkSteelSwordEnderPearlDropChancePerLooting, - "The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)") - .getDouble( - darkSteelSwordEnderPearlDropChancePerLooting); - - darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel.name, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, - "The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian); - darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, - "The efficiency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); - darkSteelPickApplyObsidianEffeciencyAtHardess = (float) config.get(sectionDarkSteel.name, "darkSteelPickApplyObsidianEffeciencyAtHardess", - darkSteelPickApplyObsidianEffeciencyAtHardess, - "If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value.").getDouble( - darkSteelPickApplyObsidianEffeciencyAtHardess); - darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, - "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); - darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyBoostWhenPowered", - darkSteelPickEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); - darkSteelPickMinesTiCArdite = config.getBoolean("darkSteelPickMinesTiCArdite", sectionDarkSteel.name, darkSteelPickMinesTiCArdite, - "When true the dark steel pick will be able to mine TiC Ardite and Cobalt"); - - darkSteelAxePowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelAxePowerUsePerDamagePoint", darkSteelAxePowerUsePerDamagePoint, - "Power use (RF) per damage/durability point avoided.").getInt(darkSteelAxePowerUsePerDamagePoint); - darkSteelAxePowerUsePerDamagePointMultiHarvest = config.get(sectionDarkSteel.name, "darkSteelPickAxeUsePerDamagePointMultiHarvest", - darkSteelAxePowerUsePerDamagePointMultiHarvest, - "Power use (RF) per damage/durability point avoided when shift-harvesting multiple logs").getInt(darkSteelAxePowerUsePerDamagePointMultiHarvest); - darkSteelAxeSpeedPenaltyMultiHarvest = (float) config.get(sectionDarkSteel.name, "darkSteelAxeSpeedPenaltyMultiHarvest", - darkSteelAxeSpeedPenaltyMultiHarvest, - "How much slower shift-harvesting logs is.").getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); - darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelAxeEffeciencyBoostWhenPowered", - darkSteelAxeEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); - - darkSteelShearsDurabilityFactor = config.get(sectionDarkSteel.name, "darkSteelShearsDurabilityFactor", darkSteelShearsDurabilityFactor, - "How much more durable as vanilla shears they are.").getInt(darkSteelShearsDurabilityFactor); - darkSteelShearsPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelShearsPowerUsePerDamagePoint", darkSteelShearsPowerUsePerDamagePoint, - "Power use (RF) per damage/durability point avoided.").getInt(darkSteelShearsPowerUsePerDamagePoint); - darkSteelShearsEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelShearsEffeciencyBoostWhenPowered", - darkSteelShearsEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelShearsEffeciencyBoostWhenPowered); - darkSteelShearsBlockAreaBoostWhenPowered = config.get(sectionDarkSteel.name, "darkSteelShearsBlockAreaBoostWhenPowered", darkSteelShearsBlockAreaBoostWhenPowered, - "The increase in effected area (radius) when powered and used on blocks.").getInt(darkSteelShearsBlockAreaBoostWhenPowered); - darkSteelShearsEntityAreaBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelShearsEntityAreaBoostWhenPowered", - darkSteelShearsEntityAreaBoostWhenPowered, "The increase in effected area (radius) when powered and used on sheep.").getDouble(darkSteelShearsEntityAreaBoostWhenPowered); - - darkSteelAnvilDamageChance = (float) config.get(sectionDarkSteel.name, "darkSteelAnvilDamageChance", darkSteelAnvilDamageChance, "Chance that the dark steel anvil will take damage after repairing something.").getDouble(); - - darkSteelLadderSpeedBoost = (float) config.get(sectionDarkSteel.name, "darkSteelLadderSpeedBoost", darkSteelLadderSpeedBoost, "Speed boost, in blocks per tick, that the DS ladder gives over the vanilla ladder.").getDouble(); - - hootchPowerPerCycleRF = config.get(sectionPower.name, "hootchPowerPerCycleRF", hootchPowerPerCycleRF, - "The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60").getInt(hootchPowerPerCycleRF); - hootchPowerTotalBurnTime = config.get(sectionPower.name, "hootchPowerTotalBurnTime", hootchPowerTotalBurnTime, - "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(hootchPowerTotalBurnTime); - - rocketFuelPowerPerCycleRF = config.get(sectionPower.name, "rocketFuelPowerPerCycleRF", rocketFuelPowerPerCycleRF, - "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6").getInt(rocketFuelPowerPerCycleRF); - rocketFuelPowerTotalBurnTime = config.get(sectionPower.name, "rocketFuelPowerTotalBurnTime", rocketFuelPowerTotalBurnTime, - "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(rocketFuelPowerTotalBurnTime); - - fireWaterPowerPerCycleRF = config.get(sectionPower.name, "fireWaterPowerPerCycleRF", fireWaterPowerPerCycleRF, - "The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60").getInt(fireWaterPowerPerCycleRF); - fireWaterPowerTotalBurnTime = config.get(sectionPower.name, "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, - "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(fireWaterPowerTotalBurnTime); - - zombieGeneratorRfPerTick = config.get(sectionPower.name, "zombieGeneratorRfPerTick", zombieGeneratorRfPerTick, - "The amount of power generated per tick.").getInt(zombieGeneratorRfPerTick); - zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, - "The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel); - - frankenzombieGeneratorRfPerTick = config.get(sectionPower.name, "frankenzombieGeneratorRfPerTick", frankenzombieGeneratorRfPerTick, - "The amount of power generated per tick.").getInt(frankenzombieGeneratorRfPerTick); - frankenzombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "frankenzombieGeneratorTicksPerMbFuel", frankenzombieGeneratorTicksPerBucketFuel, - "The number of ticks one bucket of fuel lasts.").getInt(frankenzombieGeneratorTicksPerBucketFuel); - - enderGeneratorRfPerTick = config.get(sectionPower.name, "enderGeneratorRfPerTick", enderGeneratorRfPerTick, - "The amount of power generated per tick.").getInt(enderGeneratorRfPerTick); - enderGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "enderGeneratorTicksPerMbFuel", enderGeneratorTicksPerBucketFuel, - "The number of ticks one bucket of fuel lasts.").getInt(enderGeneratorTicksPerBucketFuel); - - zombieGeneratorsEnergyMultipliers = config.get(sectionPower.name, "zombieGeneratorsEnergyMultipliers", - zombieGeneratorsEnergyMultipliers, "Energy multipliers for the Zombie-Type Generators").getDoubleList(); - - zombieGeneratorsBurnTimeMultipliers = config.get(sectionPower.name, "zombieGeneratorsBurnTimeMultipliers", - zombieGeneratorsBurnTimeMultipliers, "Burn time multipliers for the Zombie-Type Generators").getDoubleList(); - - - stirlingGeneratorBaseRfPerTick = config.get(sectionPower.name, "stirlingGeneratorBaseRfPerTick", stirlingGeneratorBaseRfPerTick, - "The amount of power generated per tick.").getInt(stirlingGeneratorBaseRfPerTick); - - stirlingGeneratorEnergyMultiplierT1 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT1", - stirlingGeneratorEnergyMultiplierT1, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 1 machine").getDouble(); - stirlingGeneratorEnergyMultiplierT2 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT2", - stirlingGeneratorEnergyMultiplierT2, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 2 machine").getDouble(); - stirlingGeneratorEnergyMultiplierT3 = (float) config.get(sectionPower.name, "stirlingGeneratorEnergyMultiplierT3", - stirlingGeneratorEnergyMultiplierT3, "[Deprecated]Energy multiplier for the Stirling Generator, Tier 3 machine").getDouble(); - - stirlingGeneratorEnergyMultipliers = config.get(sectionPower.name, "stirlingGeneratorEnergyMultipliers", - stirlingGeneratorEnergyMultipliers, "Energy multipliers for the Stirling Generator").getDoubleList(); - - stirlingGeneratorBurnTimeMultiplierT1 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT1", - stirlingGeneratorBurnTimeMultiplierT1, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 1 machine").getDouble(); - stirlingGeneratorBurnTimeMultiplierT2 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT2", - stirlingGeneratorBurnTimeMultiplierT2, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 2 machine").getDouble(); - stirlingGeneratorBurnTimeMultiplierT3 = (float) config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultiplierT3", - stirlingGeneratorBurnTimeMultiplierT3, "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 3 machine").getDouble(); - - stirlingGeneratorBurnTimeMultipliers = config.get(sectionPower.name, "stirlingGeneratorBurnTimeMultipliers", - stirlingGeneratorBurnTimeMultipliers, "Burn time multipliers for the Stirling Generator").getDoubleList(); - - - addFuelTooltipsToAllFluidContainers = config.get(sectionPersonal.name, "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, - "If true, the RF/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.").getBoolean( - addFuelTooltipsToAllFluidContainers); - addDurabilityTootip = config.get(sectionPersonal.name, "addDurabilityTootip", addFuelTooltipsToAllFluidContainers, - "If true, adds durability tooltips to tools and armor").getBoolean( - addDurabilityTootip); - addFurnaceFuelTootip = config.get(sectionPersonal.name, "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, - "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip); - - farmContinuousEnergyUseRF = config.get(sectionFarm.name, "farmContinuousEnergyUseRF", farmContinuousEnergyUseRF, - "The amount of power used by a farm per tick ").getInt(farmContinuousEnergyUseRF); - farmActionEnergyUseRF = config.get(sectionFarm.name, "farmActionEnergyUseRF", farmActionEnergyUseRF, - "The amount of power used by a farm per action (eg plant, till, harvest) ").getInt(farmActionEnergyUseRF); - farmAxeActionEnergyUseRF = config.get(sectionFarm.name, "farmAxeActionEnergyUseRF", farmAxeActionEnergyUseRF, - "The amount of power used by a farm per wood block 'chopped'").getInt(farmAxeActionEnergyUseRF); - - farmBonemealActionEnergyUseRF = config.get(sectionFarm.name, "farmBonemealActionEnergyUseRF", farmBonemealActionEnergyUseRF, - "The amount of power used by a farm per bone meal used").getInt(farmBonemealActionEnergyUseRF); - farmBonemealTryEnergyUseRF = config.get(sectionFarm.name, "farmBonemealTryEnergyUseRF", farmBonemealTryEnergyUseRF, - "The amount of power used by a farm per bone meal try").getInt(farmBonemealTryEnergyUseRF); - - farmDefaultSize = config.get(sectionFarm.name, "farmDefaultSize", farmDefaultSize, - "The number of blocks a farm will extend from its center").getInt(farmDefaultSize); - farmBonusSize = config.get(sectionFarm.name, "farmBonusSize", farmBonusSize, - "The extra number of blocks a farm will extend from its center per upgrade").getInt(farmBonusSize); - - farmAxeDamageOnLeafBreak = config.get(sectionFarm.name, "farmAxeDamageOnLeafBreak", farmAxeDamageOnLeafBreak, - "Should axes in a farm take damage when breaking leaves?").getBoolean(farmAxeDamageOnLeafBreak); - farmToolTakeDamageChance = (float) config.get(sectionFarm.name, "farmToolTakeDamageChance", farmToolTakeDamageChance, - "The chance that a tool in the farm will take damage.").getDouble(farmToolTakeDamageChance); - - disableFarmNotification = config.get(sectionFarm.name, "disableFarmNotifications", disableFarmNotification, - "Disable the notification text above the farm block.").getBoolean(); - - farmEssenceBerriesEnabled = config.get(sectionFarm.name, "farmEssenceBerriesEnabled", farmEssenceBerriesEnabled, - "This setting controls whether essence berry bushes from TiC can be harvested by the farm.").getBoolean(); - - farmManaBeansEnabled = config.get(sectionFarm.name, "farmManaBeansEnabled", farmManaBeansEnabled, - "This setting controls whether mana beans from Thaumcraft can be harvested by the farm.").getBoolean(); - - farmHarvestJungleWhenCocoa = config.get(sectionFarm.name, "farmHarvestJungleWhenCocoa", farmHarvestJungleWhenCocoa, - "If this is enabled the farm will harvest jungle wood even if it has cocoa beans in its inventory.").getBoolean(); - - hoeStrings = config.get(sectionFarm.name, "farmHoes", hoeStrings, - "Use this to specify items that can be hoes in the farming station. Use the registry name (eg. modid:name).").getStringList(); - - farmSaplingReserveAmount = config.get(sectionFarm.name, "farmSaplingReserveAmount", farmSaplingReserveAmount, - "The amount of saplings the farm has to have in reserve to switch to shearing all leaves. If there are less " + - "saplings in store, it will only shear part the leaves and break the others for spalings. Set this to 0 to " + - "always shear all leaves.").getInt(farmSaplingReserveAmount); - - combustionGeneratorUseOpaqueModel = config.get(sectionAesthetic.name, "combustionGeneratorUseOpaqueModel", combustionGeneratorUseOpaqueModel, - "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ").getBoolean(combustionGeneratorUseOpaqueModel); - - magnetPowerUsePerSecondRF = config.get(sectionMagnet.name, "magnetPowerUsePerTickRF", magnetPowerUsePerSecondRF, - "The amount of RF power used per tick when the magnet is active").getInt(magnetPowerUsePerSecondRF); - magnetPowerCapacityRF = config.get(sectionMagnet.name, "magnetPowerCapacityRF", magnetPowerCapacityRF, - "Amount of RF power stored in a fully charged magnet").getInt(magnetPowerCapacityRF); - magnetRange = config.get(sectionMagnet.name, "magnetRange", magnetRange, - "Range of the magnet in blocks.").getInt(magnetRange); - magnetMaxItems = config.get(sectionMagnet.name, "magnetMaxItems", magnetMaxItems, - "Maximum number of items the magnet can effect at a time. (-1 for unlimited)").getInt(magnetMaxItems); - - magnetBlacklist = config.getStringList("magnetBlacklist", sectionMagnet.name, magnetBlacklist, - "These items will not be picked up by the magnet."); - - magnetAllowInMainInventory = config.get(sectionMagnet.name, "magnetAllowInMainInventory", magnetAllowInMainInventory, - "If true the magnet will also work in the main inventory, not just the hotbar").getBoolean(magnetAllowInMainInventory); - - magnetAllowInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowInBaublesSlot", magnetAllowInBaublesSlot, - "If true the magnet can be put into the 'amulet' Baubles slot (requires Baubles to be installed)").getBoolean(magnetAllowInBaublesSlot); - magnetAllowDeactivatedInBaublesSlot = config.get(sectionMagnet.name, "magnetAllowDeactivatedInBaublesSlot", magnetAllowDeactivatedInBaublesSlot, - "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot); - - magnetAllowPowerExtraction = config.get(sectionMagnet.name, "magnetAllowPowerExtraction", magnetAllowPowerExtraction, - "If true the magnet can be used as a battery.").getBoolean(magnetAllowPowerExtraction); - - magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType, - "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); - - useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, - "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); - - crafterRfPerCraft = config.get("AutoCrafter Settings", "crafterRfPerCraft", crafterRfPerCraft, - "RF used per autocrafted recipe").getInt(crafterRfPerCraft); - - poweredSpawnerMinDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMinDelayTicks", poweredSpawnerMinDelayTicks, - "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMinDelayTicks); - poweredSpawnerMaxDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMaxDelayTicks", poweredSpawnerMaxDelayTicks, - "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMaxDelayTicks); - poweredSpawnerLevelOnePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelOnePowerPerTickRF", poweredSpawnerLevelOnePowerPerTickRF, - "RF per tick for a level 1 (non-upgraded) spawner. See PoweredSpanerConfig_Core.json for mob type multipliers").getInt(poweredSpawnerLevelOnePowerPerTickRF); - poweredSpawnerLevelTwoPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelTwoPowerPerTickRF", poweredSpawnerLevelTwoPowerPerTickRF, - "RF per tick for a level 2 spawner").getInt(poweredSpawnerLevelTwoPowerPerTickRF); - poweredSpawnerLevelThreePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTickRF", - poweredSpawnerLevelThreePowerPerTickRF, - "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF); - poweredSpawnerLevelFourPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFourPowerPerTickRF", - poweredSpawnerLevelFourPowerPerTickRF, - "RF per tick for a level 4 spawner").getInt(poweredSpawnerLevelFourPowerPerTickRF); - poweredSpawnerLevelFivePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelFivePowerPerTickRF", - poweredSpawnerLevelFivePowerPerTickRF, - "RF per tick for a level 5 spawner").getInt(poweredSpawnerLevelFivePowerPerTickRF); - poweredSpawnerLevelSixPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSixPowerPerTickRF", - poweredSpawnerLevelSixPowerPerTickRF, - "RF per tick for a level 6 spawner").getInt(poweredSpawnerLevelSixPowerPerTickRF); - poweredSpawnerLevelSevenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelSevenPowerPerTickRF", - poweredSpawnerLevelSevenPowerPerTickRF, - "RF per tick for a level 7 spawner").getInt(poweredSpawnerLevelSevenPowerPerTickRF); - poweredSpawnerLevelEightPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelEightPowerPerTickRF", - poweredSpawnerLevelEightPowerPerTickRF, - "RF per tick for a level 1 spawner").getInt(poweredSpawnerLevelEightPowerPerTickRF); - poweredSpawnerLevelNinePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelNinePowerPerTickRF", - poweredSpawnerLevelNinePowerPerTickRF, - "RF per tick for a level 2 spawner").getInt(poweredSpawnerLevelNinePowerPerTickRF); - poweredSpawnerLevelTenPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelTenPowerPerTickRF", - poweredSpawnerLevelTenPowerPerTickRF, - "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelTenPowerPerTickRF); - poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance, - "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance); - poweredSpawnerDespawnTimeSeconds = config.get(sectionSpawner.name, "poweredSpawnerDespawnTimeSeconds" , poweredSpawnerDespawnTimeSeconds, - "Number of seconds in which spawned entities are protected from despawning").getInt(poweredSpawnerDespawnTimeSeconds); - poweredSpawnerSpawnCount = config.get(sectionSpawner.name, "poweredSpawnerSpawnCount" , poweredSpawnerSpawnCount, - "Number of entities to spawn each time").getInt(poweredSpawnerSpawnCount); - poweredSpawnerSpawnRange = config.get(sectionSpawner.name, "poweredSpawnerSpawnRange" , poweredSpawnerSpawnRange, - "Spawning range in X/Z").getInt(poweredSpawnerSpawnRange); - poweredSpawnerMaxNearbyEntities = config.get(sectionSpawner.name, "poweredSpawnerMaxNearbyEntities" , poweredSpawnerMaxNearbyEntities, - "Max number of entities in the nearby area until no more are spawned. A zero value will remove this check").getInt(poweredSpawnerMaxNearbyEntities); - poweredSpawnerMaxSpawnTries = config.get(sectionSpawner.name, "poweredSpawnerMaxSpawnTries" , poweredSpawnerMaxSpawnTries, - "Number of tries to find a suitable spawning location").getInt(poweredSpawnerMaxSpawnTries); - poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, - "If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs").getBoolean(poweredSpawnerUseVanillaSpawChecks); - brokenSpawnerDropChance = (float) config.get(sectionSpawner.name, "brokenSpawnerDropChance", brokenSpawnerDropChance, - "The chance a broken spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance").getDouble(brokenSpawnerDropChance); - brokenSpawnerToolBlacklist = config.getStringList("brokenSpawnerToolBlacklist", sectionSpawner.name, brokenSpawnerToolBlacklist, - "When a spawner is broken with these tools they will not drop a broken spawner"); - - powerSpawnerAddSpawnerCost = config.get(sectionSpawner.name, "powerSpawnerAddSpawnerCost", powerSpawnerAddSpawnerCost, - "The number of levels it costs to add a broken spawner").getInt(powerSpawnerAddSpawnerCost); - - useModMetals = config.get(sectionRecipe.name, "useModMetals", useModMetals, - "If true copper and tin will be used in recipes when registered in the ore dictionary").getBoolean(useModMetals); - - nutrientFoodBoostDelay = config.get(sectionFluid.name, "nutrientFluidFoodBoostDelay", nutrientFoodBoostDelay, - "The delay in ticks between when nutrient distillation boosts your food value.").getInt((int) nutrientFoodBoostDelay); - - killerJoeNutrientUsePerAttackMb = config.get(sectionKiller.name, "killerJoeNutrientUsePerAttackMb", killerJoeNutrientUsePerAttackMb, - "The number of millibuckets of nutrient fluid used per attack.").getInt(killerJoeNutrientUsePerAttackMb); - - killerJoeAttackHeight = config.get(sectionKiller.name, "killerJoeAttackHeight", killerJoeAttackHeight, - "The reach of attacks above and bellow Joe.").getDouble(killerJoeAttackHeight); - killerJoeAttackWidth = config.get(sectionKiller.name, "killerJoeAttackWidth", killerJoeAttackWidth, - "The reach of attacks to each side of Joe.").getDouble(killerJoeAttackWidth); - killerJoeAttackLength = config.get(sectionKiller.name, "killerJoeAttackLength", killerJoeAttackLength, - "The reach of attacks in front of Joe.").getDouble(killerJoeAttackLength); - killerJoeHooverXpLength = config.get(sectionKiller.name, "killerJoeHooverXpLength", killerJoeHooverXpLength, - "The distance from which XP will be gathered to each side of Joe.").getDouble(killerJoeHooverXpLength); - killerJoeHooverXpWidth = config.get(sectionKiller.name, "killerJoeHooverXpWidth", killerJoeHooverXpWidth, - "The distance from which XP will be gathered in front of Joe.").getDouble(killerJoeHooverXpWidth); - killerJoeMaxXpLevel = config.get(sectionMisc.name, "killerJoeMaxXpLevel", killerJoeMaxXpLevel, "Maximum level of XP the killer joe can contain.").getInt(); - - killerJoeMustSee = config.get(sectionKiller.name, "killerJoeMustSee", killerJoeMustSee, "Set whether the Killer Joe can attack through blocks.").getBoolean(); - killerPvPoffDisablesSwing = config - .get(sectionKiller.name, "killerPvPoffDisablesSwing", killerPvPoffDisablesSwing, - "Set whether the Killer Joe swings even if PvP is off (that swing will do nothing unless killerPvPoffIsIgnored is enabled).") - .getBoolean(); - killerPvPoffIsIgnored = config - .get(sectionKiller.name, "killerPvPoffIsIgnored", killerPvPoffIsIgnored, - "Set whether the Killer Joe ignores PvP settings and always hits players (killerPvPoffDisablesSwing must be off for this to work).") - .getBoolean(); - - // Add deprecated comment - config.getString("isGasConduitEnabled", sectionItems.name, "auto", "Deprecated option. Use boolean \"gasConduitsEnabled\" below."); - isGasConduitEnabled = config.getBoolean("gasConduitEnabled", sectionItems.name, isGasConduitEnabled, - "If true, gas conduits will be enabled if the Mekanism Gas API is found. False to forcibly disable."); - enableMEConduits = config.getBoolean("enableMEConduits", sectionItems.name, enableMEConduits, "Allows ME conduits. Only has an effect with AE2 installed."); - enableOCConduits = config.getBoolean("enableOCConduits", sectionItems.name, enableOCConduits, - "Allows OC conduits. Only has an effect with OpenComputers installed."); - enableOCConduitsAnimatedTexture = config.getBoolean("enableOCConduitsAnimatedTexture", sectionItems.name, - enableOCConduitsAnimatedTexture, "Use the animated texture for OC conduits."); - - soulVesselBlackList = config.getStringList("soulVesselBlackList", sectionSoulBinder.name, soulVesselBlackList, - "Entities listed here will can not be captured in a Soul Vial"); - - soulVesselCapturesBosses = config.getBoolean("soulVesselCapturesBosses", sectionSoulBinder.name, soulVesselCapturesBosses, - "When set to false, any mob with a 'boss bar' won't be able to be captured in the Soul Vial"); - - soulBinderLevelOnePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTickRF", soulBinderLevelOnePowerPerTickRF, - "The number of RF/t consumed by an unupgraded soul binder.").getInt(soulBinderLevelOnePowerPerTickRF); - soulBinderLevelTwoPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTickRF", soulBinderLevelTwoPowerPerTickRF, - "The number of RF/t consumed by a soul binder with a double layer capacitor or a endergetic capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF); - soulBinderLevelThreePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTickRF", soulBinderLevelThreePowerPerTickRF, - "The number of RF/t consumed by a soul binder with an octadic capacitor or a endergised upgrade.").getInt(soulBinderLevelThreePowerPerTickRF); - soulBinderLevelFourPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFourPowerPerTickRF", soulBinderLevelFourPowerPerTickRF, - "The number of RF/t consumed by a soul binder with an crystalline capacitor upgrade.").getInt(soulBinderLevelFourPowerPerTickRF); - soulBinderLevelFivePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelFivePowerPerTickRF", soulBinderLevelFivePowerPerTickRF, - "The number of RF/t consumed by a soul binder with an melodic capacitor upgrade.").getInt(soulBinderLevelFivePowerPerTickRF); - soulBinderLevelSixPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSixPowerPerTickRF", soulBinderLevelSixPowerPerTickRF, - "The number of RF/t consumed by a soul binder with an stellar capacitor upgrade.").getInt(soulBinderLevelSixPowerPerTickRF); - soulBinderLevelSevenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelSevenPowerPerTickRF", soulBinderLevelSevenPowerPerTickRF, - "The number of RF/t consumed by a soul binder with an totemic capacitor upgrade.").getInt(soulBinderLevelSevenPowerPerTickRF); - soulBinderLevelEightPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelEightPowerPerTickRF", soulBinderLevelEightPowerPerTickRF, - "The number of RF/t consumed by a soul binder with an silver capacitor upgrade.").getInt(soulBinderLevelEightPowerPerTickRF); - soulBinderLevelNinePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelNinePowerPerTickRF", soulBinderLevelNinePowerPerTickRF, - "The number of RF/t consumed by a soul binder with an endergetic capacitor upgrade.").getInt(soulBinderLevelNinePowerPerTickRF); - soulBinderLevelTenPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTenPowerPerTickRF", soulBinderLevelTenPowerPerTickRF, - "The number of RF/t consumed by a soul binder with an endergised capacitor upgrade.").getInt(soulBinderLevelTenPowerPerTickRF); - soulBinderBrokenSpawnerRF = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerRF", soulBinderBrokenSpawnerRF, - "The number of RF required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerRF); - soulBinderReanimationRF = config.get(sectionSoulBinder.name, "soulBinderReanimationRF", soulBinderReanimationRF, - "The number of RF required to to re-animated a mob head.").getInt(soulBinderReanimationRF); - soulBinderEnderCystalRF = config.get(sectionSoulBinder.name, "soulBinderEnderCystalRF", soulBinderEnderCystalRF, - "The number of RF required to create an ender crystal.").getInt(soulBinderEnderCystalRF); - soulBinderPrecientCystalRF = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalRF", soulBinderPrecientCystalRF, - "The number of RF required to create an precient crystal.").getInt(soulBinderPrecientCystalRF); - soulBinderAttractorCystalRF = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalRF", soulBinderAttractorCystalRF, - "The number of RF required to create an attractor crystal.").getInt(soulBinderAttractorCystalRF); - soulBinderEnderRailRF = config.get(sectionSoulBinder.name, "soulBinderEnderRailRF", soulBinderEnderRailRF, - "The number of RF required to create an ender rail.").getInt(soulBinderEnderRailRF); - - soulBinderAttractorCystalLevels = config.get(sectionSoulBinder.name, "soulBinderAttractorCystalLevels", soulBinderAttractorCystalLevels, - "The number of levels required to create an attractor crystal.").getInt(soulBinderAttractorCystalLevels); - soulBinderEnderCystalLevels = config.get(sectionSoulBinder.name, "soulBinderEnderCystalLevels", soulBinderEnderCystalLevels, - "The number of levels required to create an ender crystal.").getInt(soulBinderEnderCystalLevels); - soulBinderPrecientCystalLevels = config.get(sectionSoulBinder.name, "soulBinderPrecientCystalLevels", soulBinderPrecientCystalLevels, - "The number of levels required to create an precient crystal.").getInt(soulBinderPrecientCystalLevels); - soulBinderReanimationLevels = config.get(sectionSoulBinder.name, "soulBinderReanimationLevels", soulBinderReanimationLevels, - "The number of levels required to re-animate a mob head.").getInt(soulBinderReanimationLevels); - soulBinderBrokenSpawnerLevels = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerLevels", soulBinderBrokenSpawnerLevels, - "The number of levels required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerLevels); - soulBinderEnderRailLevels = config.get(sectionSoulBinder.name, "soulBinderEnderRailLevels", soulBinderEnderRailLevels, - "The number of levels required to create an ender rail.").getInt(soulBinderEnderRailLevels); - - soulBinderMaxXpLevel = config.get(sectionSoulBinder.name, "soulBinderMaxXPLevel", soulBinderMaxXpLevel, "Maximum level of XP the soul binder can contain.").getInt(); - - - sliceAndSpliceLevelOnePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelOnePowerPerTickRF", sliceAndSpliceLevelOnePowerPerTickRF, - "The number of RF/t consumed by an unupgraded Slice'N'Splice").getInt(sliceAndSpliceLevelOnePowerPerTickRF); - sliceAndSpliceLevelTwoPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelTwoPowerPerTickRF", sliceAndSpliceLevelTwoPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade.").getInt(sliceAndSpliceLevelTwoPowerPerTickRF); - sliceAndSpliceLevelThreePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelThreePowerPerTickRF", sliceAndSpliceLevelThreePowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade.").getInt(sliceAndSpliceLevelThreePowerPerTickRF); - sliceAndSpliceLevelFourPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFourPowerPerTickRF", sliceAndSpliceLevelFourPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an crystalline capacitor upgrade.").getInt(sliceAndSpliceLevelFourPowerPerTickRF); - sliceAndSpliceLevelFivePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelFivePowerPerTickRF", sliceAndSpliceLevelFivePowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an melodic capacitor upgrade.").getInt(sliceAndSpliceLevelFivePowerPerTickRF); - sliceAndSpliceLevelSixPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSixPowerPerTickRF", sliceAndSpliceLevelSixPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an stellar capacitor upgrade.").getInt(sliceAndSpliceLevelSixPowerPerTickRF); - sliceAndSpliceLevelSevenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelSevenPowerPerTickRF", sliceAndSpliceLevelSevenPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an totemic capacitor upgrade.").getInt(sliceAndSpliceLevelSevenPowerPerTickRF); - sliceAndSpliceLevelEightPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelEightPowerPerTickRF", sliceAndSpliceLevelEightPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an silver capacitor upgrade.").getInt(sliceAndSpliceLevelEightPowerPerTickRF); - sliceAndSpliceLevelNinePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelNinePowerPerTickRF", sliceAndSpliceLevelNinePowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an endergetic capacitor upgrade.").getInt(sliceAndSpliceLevelNinePowerPerTickRF); - sliceAndSpliceLevelTenPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelTenPowerPerTickRF", sliceAndSpliceLevelTenPowerPerTickRF, - "The number of RF/t consumed by a Slice'N'Splice with an endergised capacitor upgrade.").getInt(sliceAndSpliceLevelTenPowerPerTickRF); - - - attractorRangeLevelOne = config.get(sectionAttractor.name, "attractorRangeLevelOne", attractorRangeLevelOne, - "The range of the mob attractor with no upgrades").getInt(attractorRangeLevelOne); - attractorRangeLevelTwo = config.get(sectionAttractor.name, "attractorRangeLevelTwo", attractorRangeLevelTwo, - "The range of the mob attractor with a double layer capacitor upgrade").getInt(attractorRangeLevelTwo); - attractorRangeLevelThree = config.get(sectionAttractor.name, "attractorRangeLevelThree", attractorRangeLevelThree, - "The range of the mob attractor with an octadic capacitor upgrade").getInt(attractorRangeLevelThree); - attractorPowerPerTickLevelOne = config.get(sectionAttractor.name, "attractorPowerPerTickLevelOne", attractorPowerPerTickLevelOne, - "The RF/t power use of a levele 1 mob attractor").getInt(attractorPowerPerTickLevelOne); - attractorPowerPerTickLevelTwo = config.get(sectionAttractor.name, "attractorPowerPerTickLevelTwo", attractorPowerPerTickLevelTwo, - "The RF/t power use of a levele 2 mob attractor").getInt(attractorPowerPerTickLevelTwo); - attractorPowerPerTickLevelThree = config.get(sectionAttractor.name, "attractorPowerPerTickLevelThree", attractorPowerPerTickLevelThree, - "The RF/t power use of a levele 3 mob attractor").getInt(attractorPowerPerTickLevelThree); - - - spawnGuardRangeLevelOne = config.get(sectionAttractor.name, "spawnGuardRangeLevelOne", spawnGuardRangeLevelOne, - "The range of the spawn guard with no upgrades").getInt(spawnGuardRangeLevelOne); - spawnGuardRangeLevelTwo = config.get(sectionAttractor.name, "spawnGuardRangeLevelTwo", spawnGuardRangeLevelTwo, - "The range of the spawn guard with a double layer capacitor upgrade").getInt(spawnGuardRangeLevelTwo); - spawnGuardRangeLevelThree = config.get(sectionAttractor.name, "spawnGuardRangeLevelThree", spawnGuardRangeLevelThree, - "The range of the spawn guard with an octadic capacitor upgrade").getInt(spawnGuardRangeLevelThree); - spawnGuardPowerPerTickLevelOne = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelOne", spawnGuardPowerPerTickLevelOne, - "The RF/t power use of a levele 1 spawn guard").getInt(spawnGuardPowerPerTickLevelOne); - spawnGuardPowerPerTickLevelTwo = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelTwo", spawnGuardPowerPerTickLevelTwo, - "The RF/t power use of a levele 2 spawn guard").getInt(spawnGuardPowerPerTickLevelTwo); - spawnGuardPowerPerTickLevelThree = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelThree", spawnGuardPowerPerTickLevelThree, - "The RF/t power use of a levele 3 spawn guard").getInt(spawnGuardPowerPerTickLevelThree); - spawnGuardStopAllSlimesDebug = config.getBoolean("spawnGuardStopAllSlimesDebug", sectionAttractor.name, spawnGuardStopAllSlimesDebug, - "When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds."); - spawnGuardStopAllSquidSpawning = config.getBoolean("spawnGuardStopAllSquidSpawning", sectionAttractor.name, spawnGuardStopAllSquidSpawning, - "When true no squid will be spawned."); - - weatherObeliskClearFluid = config.get(sectionWeather.name, "weatherObeliskClearFluid", weatherObeliskClearFluid, - "The fluid required (in mB) to set the world to clear weather").getInt(); - weatherObeliskRainFluid = config.get(sectionWeather.name, "weatherObeliskRainFluid", weatherObeliskRainFluid, - "The fluid required (in mB) to set the world to rainy weather").getInt(); - weatherObeliskThunderFluid = config.get(sectionWeather.name, "weatherObeliskThunderFluid", weatherObeliskThunderFluid, - "The fluid required (in mB) to set the world to thundering weather").getInt(); - - // Loot Config - lootDarkSteel = config.getBoolean("lootDarkSteel", sectionLootConfig.name, lootDarkSteel, "Adds Darksteel Ingots to loot tables"); - lootItemConduitProbe = config.getBoolean("lootItemConduitProbe", sectionLootConfig.name, lootItemConduitProbe, "Adds ItemConduitProbe to loot tables"); - lootQuartz = config.getBoolean("lootQuartz", sectionLootConfig.name, lootQuartz, "Adds quartz to loot tables"); - lootNetherWart = config.getBoolean("lootNetherWart", sectionLootConfig.name, lootNetherWart, "Adds nether wart to loot tables"); - lootEnderPearl = config.getBoolean("lootEnderPearl", sectionLootConfig.name, lootEnderPearl, "Adds ender pearls to loot tables"); - lootElectricSteel = config.getBoolean("lootElectricSteel", sectionLootConfig.name, lootElectricSteel, "Adds Electric Steel Ingots to loot tables"); - lootRedstoneAlloy = config.getBoolean("lootRedstoneAlloy", sectionLootConfig.name, lootRedstoneAlloy, "Adds Redstone Alloy Ingots to loot tables"); - lootPhasedIron = config.getBoolean("lootPhasedIron", sectionLootConfig.name, lootPhasedIron, "Adds Phased Iron Ingots to loot tables"); - lootPhasedGold = config.getBoolean("lootPhasedGold", sectionLootConfig.name, lootPhasedGold, "Adds Phased Gold Ingots to loot tables"); - lootTravelStaff = config.getBoolean("lootTravelStaff", sectionLootConfig.name, lootTravelStaff, "Adds Travel Staff to loot tables"); - lootTheEnder = config.getBoolean("lootTheEnder", sectionLootConfig.name, lootTheEnder, "Adds The Ender to loot tables"); - lootDarkSteelBoots = config.getBoolean("lootDarkSteelBoots", sectionLootConfig.name, lootDarkSteelBoots, "Adds Darksteel Boots to loot tables"); - - enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Whether Ender Rails are enabled"); - enderRailPowerRequireCrossDimensions = config.get(sectionRailConfig.name, "enderRailPowerRequireCrossDimensions", enderRailPowerRequireCrossDimensions, - "The amount of power required to transport a cart across dimensions").getInt(enderRailPowerRequireCrossDimensions); - enderRailPowerRequiredPerBlock = config.get(sectionRailConfig.name, "enderRailPowerRequiredPerBlock", enderRailPowerRequiredPerBlock, - "The amount of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); - enderRailCapSameDimensionPowerAtCrossDimensionCost = config.getBoolean("enderRailCapSameDimensionPowerAtCrossDimensionCost", sectionRailConfig.name, enderRailCapSameDimensionPowerAtCrossDimensionCost, - "When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost"); - enderRailTicksBeforeForceSpawningLinkedCarts = config.get(sectionRailConfig.name, "enderRailTicksBeforeForceSpawningLinkedCarts", enderRailTicksBeforeForceSpawningLinkedCarts, - "The number of ticks to wait for the track to clear before force spawning the next cart in a (RailCraft) linked set").getInt(enderRailTicksBeforeForceSpawningLinkedCarts); - enderRailTeleportPlayers = config.getBoolean("enderRailTeleportPlayers", sectionRailConfig.name, enderRailTeleportPlayers, "If true player in minecarts will be teleported. WARN: WIP, seems to cause a memory leak."); - - dumpMobNames = config.getBoolean("dumpMobNames", sectionMobConfig.name, dumpMobNames, - "When set to true a list of all registered mobs will be dumped to config/enderio/mobTypes.txt The names are in the format required by EIOs mob blacklists."); - - xpObeliskMaxXpLevel = config.get(sectionMisc.name, "xpObeliskMaxXpLevel", xpObeliskMaxXpLevel, "Maximum level of XP the xp obelisk can contain.").getInt(); - xpJuiceName = config.getString("xpJuiceName", sectionMisc.name, xpJuiceName, "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match with OpenBlocks when installed"); - - clearGlassSameTexture = config.getBoolean("clearGlassSameTexture", sectionMisc.name, clearGlassSameTexture, "If true, quite clear glass will use the fused quartz border texture for the block instead of the white border."); - clearGlassConnectToFusedQuartz = config.getBoolean("clearGlassConnectToFusedQuartz", sectionMisc.name, clearGlassConnectToFusedQuartz, "If true, quite clear glass will connect textures with fused quartz."); - - enchantmentSoulBoundEnabled = config.getBoolean("enchantmentSoulBoundEnabled", sectionEnchantments.name, enchantmentSoulBoundEnabled, - "If false the soul bound enchantment will not be available"); - enchantmentSoulBoundId = config.get(sectionEnchantments.name, "enchantmentSoulBoundId", enchantmentSoulBoundId, - "The id of the enchantment. If set to -1 the lowest unassigned id will be used.").getInt(enchantmentSoulBoundId); - enchantmentSoulBoundWeight = config.get(sectionEnchantments.name, "enchantmentSoulBoundWeight", enchantmentSoulBoundWeight, - "The chance of getting this enchantment in the enchantment table").getInt(enchantmentSoulBoundWeight); - - replaceWitherSkeletons = config.get(sectionMisc.name, "replaceWitherSkeletons", replaceWitherSkeletons, - "Separates wither and normal skeletons into different entities, enables the powered spawner to treat them differently [EXPERIMENTAL - MAY CAUSE ISSUES WITH OTHER MODS]").getBoolean(); - - enableWaterFromBottles = config - .get(sectionMisc.name, "enableWaterFromBottles", enableWaterFromBottles, - "Enables emptying vanilla water bottles without breaking the bottle. In combination with a water source block this allows duping of water without cost.") - .getBoolean(); - - telepadLockDimension = config.get(sectionTelepad.name, "lockDimension", telepadLockDimension, - "If true, the dimension cannot be set via the GUI, the coord selector must be used.").getBoolean(); - telepadLockCoords = config.get(sectionTelepad.name, "lockCoords", telepadLockCoords, - "If true, the coordinates cannot be set via the GUI, the coord selector must be used.").getBoolean(); - telepadPowerCoefficient = config.get(sectionTelepad.name, "powerCoefficient", telepadPowerCoefficient, - "Power for a teleport is calculated by the formula:\npower = [this value] * ln(0.005*distance + 1)").getInt(); - telepadPowerInterdimensional = config.get(sectionTelepad.name, "powerInterdimensional", telepadPowerInterdimensional, - "The amount of RF required for an interdimensional teleport.").getInt(); - telepadPowerPerTickRF = config.get(sectionTelepad.name, "telepadPowerPerTickRF", telepadPowerPerTickRF, - "The number of RF/t consumed by a telepad.").getInt(); - telepadPowerStorageRF = config.get(sectionTelepad.name, "telepadPowerStorageRF", telepadPowerStorageRF, - "The amount of RF a telepad can store.").getInt(); - - inventoryPanelFree = config.getBoolean("inventoryPanelFree", sectionInventoryPanel.name, inventoryPanelFree, "If true, the inv panel will not accept fluids and will be active permanently."); - inventoryPanelPowerPerMB = config.getFloat("powerPerMB", sectionInventoryPanel.name, inventoryPanelPowerPerMB, 1.0f, 10000.0f, - "Internal power generated per mB. The default of 800/mB matches the RF generation of the Zombie generator. A panel tries to refill only once every second - setting this value too low slows down the scanning speed."); - inventoryPanelScanCostPerSlot = config.getFloat("scanCostPerSlot", sectionInventoryPanel.name, inventoryPanelScanCostPerSlot, 0.0f, 10.0f, - "Internal power used for scanning a slot"); - inventoryPanelExtractCostPerItem = config.getFloat("extractCostPerItem", sectionInventoryPanel.name, inventoryPanelExtractCostPerItem, 0.0f, 10.0f, - "Internal power used per item extracted (not a stack of items)"); - inventoryPanelExtractCostPerOperation = config.getFloat("extractCostPerOperation", sectionInventoryPanel.name, inventoryPanelExtractCostPerOperation, 0.0f, - 10000.0f, "Internal power used per extract operation (independent of stack size)"); - } - - public static void checkYetaAccess() { - if(!useSneakMouseWheelYetaWrench && !useSneakRightClickYetaWrench) { - Log.warn("Both useSneakMouseWheelYetaWrench and useSneakRightClickYetaWrench are set to false. Enabling right click."); - useSneakRightClickYetaWrench = true; + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); } - } - public static void init() { - } + public static void processConfig(Configuration config) { - public static void postInit() { - for (String s : hoeStrings) { - ItemStack hoe = getStackForString(s); - if(hoe != null) { - farmHoes.add(hoe); - } + capacitorBankMaxIoRF = config.get( + sectionPower.name, + "capacitorBankMaxIoRF", + capacitorBankMaxIoRF, + "The maximum IO for a single capacitor in RF/t") + .getInt(capacitorBankMaxIoRF); + capacitorBankMaxStorageRF = config.get( + sectionPower.name, + "capacitorBankMaxStorageRF", + capacitorBankMaxStorageRF, + "The maximum storage for a single capacitor in RF") + .getInt(capacitorBankMaxStorageRF); + + capacitorBankTierOneMaxIoRF = config.get( + sectionPower.name, + "capacitorBankTierOneMaxIoRF", + capacitorBankTierOneMaxIoRF, + "The maximum IO for a single tier one capacitor in RF/t") + .getInt(capacitorBankTierOneMaxIoRF); + capacitorBankTierOneMaxStorageRF = config.get( + sectionPower.name, + "capacitorBankTierOneMaxStorageRF", + capacitorBankTierOneMaxStorageRF, + "The maximum storage for a single tier one capacitor in RF") + .getInt(capacitorBankTierOneMaxStorageRF); + + capacitorBankTierTwoMaxIoRF = config.get( + sectionPower.name, + "capacitorBankTierTwoMaxIoRF", + capacitorBankTierTwoMaxIoRF, + "The maximum IO for a single tier two capacitor in RF/t") + .getInt(capacitorBankTierTwoMaxIoRF); + capacitorBankTierTwoMaxStorageRF = config.get( + sectionPower.name, + "capacitorBankTierTwoMaxStorageRF", + capacitorBankTierTwoMaxStorageRF, + "The maximum storage for a single tier two capacitor in RF") + .getInt(capacitorBankTierTwoMaxStorageRF); + + capacitorBankTierThreeMaxIoRF = config.get( + sectionPower.name, + "capacitorBankTierThreeMaxIoRF", + capacitorBankTierThreeMaxIoRF, + "The maximum IO for a single tier three capacitor in RF/t") + .getInt(capacitorBankTierThreeMaxIoRF); + capacitorBankTierThreeMaxStorageRF = config.get( + sectionPower.name, + "capacitorBankTierThreeMaxStorageRF", + capacitorBankTierThreeMaxStorageRF, + "The maximum storage for a single tier three capacitor in RF") + .getInt(capacitorBankTierThreeMaxStorageRF); + + powerConduitTierOneRF = config.get( + sectionPower.name, + "powerConduitTierOneRF", + powerConduitTierOneRF, + "The maximum IO for the tier 1 power conduit") + .getInt(powerConduitTierOneRF); + powerConduitTierTwoRF = config.get( + sectionPower.name, + "powerConduitTierTwoRF", + powerConduitTierTwoRF, + "The maximum IO for the tier 2 power conduit") + .getInt(powerConduitTierTwoRF); + powerConduitTierThreeRF = config.get( + sectionPower.name, + "powerConduitTierThreeRF", + powerConduitTierThreeRF, + "The maximum IO for the tier 3 power conduit") + .getInt(powerConduitTierThreeRF); + powerConduitEndergyTiers = config.get( + sectionPower.name, + "powerConduitTiersEndergy", + powerConduitEndergyTiers, + "The maximum IO for the endergy power conduit") + .getIntList(); + + powerConduitCanDifferentTiersConnect = config.getBoolean( + "powerConduitCanDifferentTiersConnect", + sectionPower.name, + powerConduitCanDifferentTiersConnect, + "If set to false power conduits of different tiers cannot be connected. in this case a block such as a cap. bank is needed to bridge different tiered networks"); + powerConduitOutputMJ = config.getBoolean( + "powerConduitOutputMJ", + sectionPower.name, + powerConduitOutputMJ, + "When set to true power conduits will output MJ if RF is not supported"); + + painterEnergyPerTaskRF = config.get( + sectionPower.name, + "painterEnergyPerTaskRF", + painterEnergyPerTaskRF, + "The total amount of RF required to paint one block") + .getInt(painterEnergyPerTaskRF); + + useHardRecipes = config.get( + sectionRecipe.name, + "useHardRecipes", + useHardRecipes, + "When enabled machines cost significantly more.") + .getBoolean(useHardRecipes); + addPeacefulRecipes = config.get( + sectionRecipe.name, + "addPeacefulRecipes", + addPeacefulRecipes, + "When enabled peaceful recipes are added for soulbinder based crafting components.") + .getBoolean(addPeacefulRecipes); + soulBinderRequiresEndermanSkull = config.getBoolean( + "soulBinderRequiresEndermanSkull", + sectionRecipe.name, + soulBinderRequiresEndermanSkull, + "When true the Soul Binder requires an Enderman Skull to craft"); + allowTileEntitiesAsPaintSource = config.get( + sectionRecipe.name, + "allowTileEntitiesAsPaintSource", + allowTileEntitiesAsPaintSource, + "When enabled blocks with tile entities (e.g. machines) can be used as paint targets.") + .getBoolean(allowTileEntitiesAsPaintSource); + useSteelInChassi = config.get( + sectionRecipe.name, + "useSteelInChassi", + useSteelInChassi, + "When enabled machine chassis will require steel instead of iron.") + .getBoolean(useSteelInChassi); + numConduitsPerRecipe = config.get( + sectionRecipe.name, + "numConduitsPerRecipe", + numConduitsPerRecipe, + "The number of conduits crafted per recipe.") + .getInt(numConduitsPerRecipe); + transceiverUseEasyRecipe = config.get( + sectionRecipe.name, + "transceiverUseEasyRecipe", + transceiverUseEasyRecipe, + "When enabled the dim trans. will use a cheaper recipe") + .getBoolean(useHardRecipes); + crateSyntheticRecipes = config.get( + sectionRecipe.name, + "crateSyntheticRecipes", + crateSyntheticRecipes, + "Automatically create alloy smelter recipes with double and triple inputs and different slot allocations (1+1+1, 2+1, 1+2, 3 and 2) for single-input recipes.") + .getBoolean(crateSyntheticRecipes); + + allowExternalTickSpeedup = config.get( + sectionMisc.name, + "allowExternalTickSpeedup", + allowExternalTickSpeedup, + "Allows machines to run faster if another mod speeds up the tickrate. Running at higher tickrates is " + + "unsupported. Disable this if you run into any kind of problem.") + .getBoolean(allowExternalTickSpeedup); + + enchanterBaseLevelCost = config.get( + sectionRecipe.name, + "enchanterBaseLevelCost", + enchanterBaseLevelCost, + "Base level cost added to all recipes in the enchanter.") + .getInt(enchanterBaseLevelCost); + + photovoltaicCellEnabled = config.get( + sectionItems.name, + "photovoltaicCellEnabled", + photovoltaicCellEnabled, + "If set to false: Photovoltaic Cells will not be craftable.") + .getBoolean(photovoltaicCellEnabled); + + reservoirEnabled = config.get( + sectionItems.name, + "reservoirEnabled", + reservoirEnabled, + "If set to false reservoirs will not be craftable.") + .getBoolean(reservoirEnabled); + + transceiverEnabled = config.get( + sectionItems.name, + "transceiverEnabled", + transceiverEnabled, + "If set to false: Dimensional Transceivers will not be craftable.") + .getBoolean(transceiverEnabled); + + maxPhotovoltaicOutputRF = config.get( + sectionPower.name, + "maxPhotovoltaicOutputRF", + maxPhotovoltaicOutputRF, + "Maximum output in RF/t of the Photovoltaic Panels.") + .getInt(maxPhotovoltaicOutputRF); + maxPhotovoltaicAdvancedOutputRF = config.get( + sectionPower.name, + "maxPhotovoltaicAdvancedOutputRF", + maxPhotovoltaicAdvancedOutputRF, + "Maximum output in RF/t of the Advanced Photovoltaic Panels.") + .getInt(maxPhotovoltaicAdvancedOutputRF); + + useAlternateBinderRecipe = config.get( + sectionRecipe.name, + "useAlternateBinderRecipe", + false, + "Create conduit binder in crafting table instead of furnace") + .getBoolean(useAlternateBinderRecipe); + + conduitScale = config.get( + sectionAesthetic.name, + "conduitScale", + DEFAULT_CONDUIT_SCALE, + "Valid values are between 0-1, smallest conduits at 0, largest at 1.\n" + + "In SMP, all clients must be using the same value as the server.") + .getDouble(DEFAULT_CONDUIT_SCALE); + conduitScale = VecmathUtil.clamp(conduitScale, 0, 1); + + wirelessChargerRange = config.get( + sectionEfficiency.name, + "wirelessChargerRange", + wirelessChargerRange, + "The range of the wireless charger") + .getInt(wirelessChargerRange); + + fluidConduitExtractRate = config.get( + sectionEfficiency.name, + "fluidConduitExtractRate", + fluidConduitExtractRate, + "Number of liters per tick extracted by a fluid conduits auto extracting") + .getInt(fluidConduitExtractRate); + + fluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "fluidConduitMaxIoRate", + fluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a fluid conduit.") + .getInt(fluidConduitMaxIoRate); + + advancedFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "advancedFluidConduitExtractRate", + advancedFluidConduitExtractRate, + "Number of liters per tick extracted by pressurized fluid conduits auto extracting") + .getInt(advancedFluidConduitExtractRate); + + advancedFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "advancedFluidConduitMaxIoRate", + advancedFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to an pressurized fluid conduit.") + .getInt(advancedFluidConduitMaxIoRate); + + enderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "enderFluidConduitExtractRate", + enderFluidConduitExtractRate, + "Number of liters per tick extracted by ender fluid conduits auto extracting") + .getInt(enderFluidConduitExtractRate); + + enderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "enderFluidConduitMaxIoRate", + enderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to an ender fluid conduit.") + .getInt(enderFluidConduitMaxIoRate); + + crystallineEnderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "crystallineEnderFluidConduitExtractRate", + crystallineEnderFluidConduitExtractRate, + "Number of liters per tick extracted by crystalline ender fluid conduits auto extracting") + .getInt(crystallineEnderFluidConduitExtractRate); + + crystallineEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "crystallineEnderFluidConduitMaxIoRate", + crystallineEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a crystalline ender fluid conduit.") + .getInt(crystallineEnderFluidConduitMaxIoRate); + + crystallinePinkSlimeEnderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "crystallinePinkSlimeEnderFluidConduitExtractRate", + crystallinePinkSlimeEnderFluidConduitExtractRate, + "Number of liters per tick extracted by crystalline pink slime ender fluid conduits auto extracting") + .getInt(crystallinePinkSlimeEnderFluidConduitExtractRate); + + crystallinePinkSlimeEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "crystallinePinkSlimeEnderFluidConduitMaxIoRate", + crystallinePinkSlimeEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a crystalline pink slime ender fluid conduit.") + .getInt(crystallinePinkSlimeEnderFluidConduitMaxIoRate); + + melodicEnderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "melodicEnderFluidConduitExtractRate", + melodicEnderFluidConduitExtractRate, + "Number of liters per tick extracted by melodic ender fluid conduits auto extracting") + .getInt(melodicEnderFluidConduitExtractRate); + + melodicEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "melodicEnderFluidConduitMaxIoRate", + melodicEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a melodic ender fluid conduit.") + .getInt(melodicEnderFluidConduitMaxIoRate); + + stellarEnderFluidConduitExtractRate = config.get( + sectionEfficiency.name, + "stellarEnderFluidConduitExtractRate", + stellarEnderFluidConduitExtractRate, + "Number of liters per tick extracted by stellar ender fluid conduits auto extracting") + .getInt(stellarEnderFluidConduitExtractRate); + + stellarEnderFluidConduitMaxIoRate = config.get( + sectionEfficiency.name, + "stellarEnderFluidConduitMaxIoRate", + stellarEnderFluidConduitMaxIoRate, + "Number of liters per tick that can pass through a single connection to a stellar ender fluid conduit.") + .getInt(stellarEnderFluidConduitMaxIoRate); + + gasConduitExtractRate = config.get( + sectionEfficiency.name, + "gasConduitExtractRate", + gasConduitExtractRate, + "Amount of gas per tick extracted by gas conduits auto extracting") + .getInt(gasConduitExtractRate); + + gasConduitMaxIoRate = config.get( + sectionEfficiency.name, + "gasConduitMaxIoRate", + gasConduitMaxIoRate, + "Amount of gas per tick that can pass through a single connection to a gas conduit.") + .getInt(gasConduitMaxIoRate); + + useAlternateTesseractModel = config.get( + sectionAesthetic.name, + "useAlternateTransceiverModel", + useAlternateTesseractModel, + "Use TheKazador's alternative model for the Dimensional Transceiver") + .getBoolean(false); + transceiverEnergyLoss = config.get( + sectionPower.name, + "transceiverEnergyLoss", + transceiverEnergyLoss, + "Amount of energy lost when transferred by Dimensional Transceiver; 0 is no loss, 1 is 100% loss") + .getDouble(transceiverEnergyLoss); + transceiverUpkeepCostRF = config.get( + sectionPower.name, + "transceiverUpkeepCostRF", + transceiverUpkeepCostRF, + "Number of RF/t required to keep a Dimensional Transceiver connection open") + .getInt(transceiverUpkeepCostRF); + transceiverMaxIoRF = config.get( + sectionPower.name, + "transceiverMaxIoRF", + transceiverMaxIoRF, + "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative") + .getInt(transceiverMaxIoRF); + transceiverBucketTransmissionCostRF = config.get( + sectionEfficiency.name, + "transceiverBucketTransmissionCostRF", + transceiverBucketTransmissionCostRF, + "The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver.") + .getInt(transceiverBucketTransmissionCostRF); + + vatPowerUserPerTickRF = config.get( + sectionPower.name, + "vatPowerUserPerTickRF", + vatPowerUserPerTickRF, + "Power use (RF/t) used by the vat.") + .getInt(vatPowerUserPerTickRF); + + detailedPowerTrackingEnabled = config.get( + sectionAdvanced.name, + "perInterfacePowerTrackingEnabled", + detailedPowerTrackingEnabled, + "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.") + .getBoolean(detailedPowerTrackingEnabled); + + useSneakMouseWheelYetaWrench = config.get( + sectionPersonal.name, + "useSneakMouseWheelYetaWrench", + useSneakMouseWheelYetaWrench, + "If true, shift-mouse wheel will change the conduit display mode when the YetaWrench is equipped.") + .getBoolean(useSneakMouseWheelYetaWrench); + + useSneakRightClickYetaWrench = config.get( + sectionPersonal.name, + "useSneakRightClickYetaWrench", + useSneakRightClickYetaWrench, + "If true, shift-clicking the YetaWrench on a null or non wrenchable object will change the conduit display mode.") + .getBoolean(useSneakRightClickYetaWrench); + + yetaWrenchOverlayMode = config.getInt( + "yetaWrenchOverlayMode", + sectionPersonal.name, + yetaWrenchOverlayMode, + 0, + 2, + "What kind of overlay to use when holding the yeta wrench\n\n" + + "0 - Sideways scrolling in ceter of screen\n" + + "1 - Vertical icon bar in bottom right\n" + + "2 - Old-style group of icons in bottom right"); + + machineSoundsEnabled = config.get( + sectionPersonal.name, + "useMachineSounds", + machineSoundsEnabled, + "If true, machines will make sounds.") + .getBoolean(machineSoundsEnabled); + + machineSoundVolume = (float) + config.get(sectionPersonal.name, "machineSoundVolume", machineSoundVolume, "Volume of machine sounds.") + .getDouble(machineSoundVolume); + + itemConduitUsePhyscialDistance = config.get( + sectionEfficiency.name, + "itemConduitUsePhyscialDistance", + itemConduitUsePhyscialDistance, + "If true, " + + "'line of sight' distance rather than conduit path distance is used to calculate priorities.") + .getBoolean(itemConduitUsePhyscialDistance); + + vacuumChestRange = config.get( + sectionEfficiency.name, "vacumChestRange", vacuumChestRange, "The range of the vacuum chest") + .getInt(vacuumChestRange); + + reinforcedObsidianEnabled = config.get( + sectionItems.name, + "reinforcedObsidianEnabled", + reinforcedObsidianEnabled, + "When set to false reinforced obsidian is not craftable.") + .getBoolean(reinforcedObsidianEnabled); + reinforcedObsidianUseDarkSteelBlocks = config.get( + sectionRecipe.name, + "reinforcedObsidianUseDarkSteelBlocks", + reinforcedObsidianUseDarkSteelBlocks, + "When set to true four dark steel blocks are required instead of ingots when making reinforced obsidian.") + .getBoolean(reinforcedObsidianUseDarkSteelBlocks); + + travelAnchorEnabled = config.get( + sectionItems.name, + "travelAnchorEnabled", + travelAnchorEnabled, + "When set to false: the travel anchor will not be craftable.") + .getBoolean(travelAnchorEnabled); + + travelAnchorMaxDistance = config.get( + sectionAnchor.name, + "travelAnchorMaxDistance", + travelAnchorMaxDistance, + "Maximum number of blocks that can be traveled from one travel anchor to another.") + .getInt(travelAnchorMaxDistance); + + travelAnchorCooldown = config.get( + sectionAnchor.name, + "travelAnchorCooldown", + travelAnchorCooldown, + "Number of ticks cooldown between activations (1 sec = 20 ticks)") + .getInt(travelAnchorCooldown); + + travelAnchorSneak = config.get( + sectionAnchor.name, + "travelAnchorSneak", + travelAnchorSneak, + "Add sneak as an option to activate travel anchors") + .getBoolean(travelAnchorSneak); + + travelAnchorSkipWarning = config.get( + sectionAnchor.name, + "travelAnchorSkipWarning", + travelAnchorSkipWarning, + "Travel Anchors send a chat warning when skipping inaccessible anchors") + .getBoolean(travelAnchorSkipWarning); + + travelStaffMaxDistance = config.get( + sectionStaff.name, + "travelStaffMaxDistance", + travelStaffMaxDistance, + "Maximum number of blocks that can be traveled using the Staff of Traveling.") + .getInt(travelStaffMaxDistance); + travelStaffPowerPerBlockRF = (float) config.get( + sectionStaff.name, + "travelStaffPowerPerBlockRF", + travelStaffPowerPerBlockRF, + "Number of RF required per block traveled using the Staff of Traveling.") + .getDouble(travelStaffPowerPerBlockRF); + + travelStaffMaxBlinkDistance = config.get( + sectionStaff.name, + "travelStaffMaxBlinkDistance", + travelStaffMaxBlinkDistance, + "Max number of blocks teleported when shift clicking the staff.") + .getInt(travelStaffMaxBlinkDistance); + + travelStaffBlinkPauseTicks = config.get( + sectionStaff.name, + "travelStaffBlinkPauseTicks", + travelStaffBlinkPauseTicks, + "Minimum number of ticks between 'blinks'. Values of 10 or less allow a limited sort of flight.") + .getInt(travelStaffBlinkPauseTicks); + + travelStaffEnabled = config.get( + sectionStaff.name, + "travelStaffEnabled", + travelAnchorEnabled, + "If set to false: the travel staff will not be craftable.") + .getBoolean(travelStaffEnabled); + travelStaffBlinkEnabled = config.get( + sectionStaff.name, + "travelStaffBlinkEnabled", + travelStaffBlinkEnabled, + "If set to false: the travel staff can not be used to shift-right click teleport, or blink.") + .getBoolean(travelStaffBlinkEnabled); + travelStaffBlinkThroughSolidBlocksEnabled = config.get( + sectionStaff.name, + "travelStaffBlinkThroughSolidBlocksEnabled", + travelStaffBlinkThroughSolidBlocksEnabled, + "If set to false: the travel staff can be used to blink through any block.") + .getBoolean(travelStaffBlinkThroughSolidBlocksEnabled); + travelStaffBlinkThroughClearBlocksEnabled = config.get( + sectionItems.name, + "travelStaffBlinkThroughClearBlocksEnabled", + travelStaffBlinkThroughClearBlocksEnabled, + "If travelStaffBlinkThroughSolidBlocksEnabled is set to false and this is true: the travel " + + "staff can only be used to blink through transparent or partial blocks (e.g. torches). " + + "If both are false: only air blocks may be teleported through.") + .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); + travelStaffBlinkThroughUnbreakableBlocksEnabled = config.get( + sectionItems.name, + "travelStaffBlinkThroughUnbreakableBlocksEnabled", + travelStaffBlinkThroughUnbreakableBlocksEnabled, + "Allows the travel staff to blink through unbreakable blocks such as warded blocks and bedrock.") + .getBoolean(); + travelStaffBlinkBlackList = config.getStringList( + "travelStaffBlinkBlackList", + sectionStaff.name, + travelStaffBlinkBlackList, + "Lists the blocks that cannot be teleported through in the form 'modID:blockName'"); + travelAnchorZoomScale = config.getFloat( + "travelAnchorZoomScale", + sectionStaff.name, + travelAnchorZoomScale, + 0, + 1, + "Set the max zoomed size of a travel anchor as an aprox. percentage of screen height"); + travelStaffSearchOptimize = config.get( + sectionStaff.name, + "travelStaffSearchOptimize", + travelStaffSearchOptimize, + "If set to true: blinking by travel staff has reduced search branch. " + + "You can now teleport onto the roof. " + + "This config is experimental, so if you encounter any strange behavior, please report to GTNH developer.") + .getBoolean(travelStaffSearchOptimize); + + enderIoRange = config.get( + sectionEfficiency.name, + "enderIoRange", + enderIoRange, + "Range accessible (in blocks) when using the Ender IO.") + .getInt(enderIoRange); + + enderIoMeAccessEnabled = config.get( + sectionPersonal.name, + "enderIoMeAccessEnabled", + enderIoMeAccessEnabled, + "If false: you will not be able to access a ME access or crafting terminal using the Ender IO.") + .getBoolean(enderIoMeAccessEnabled); + + updateLightingWhenHidingFacades = config.get( + sectionEfficiency.name, + "updateLightingWhenHidingFacades", + updateLightingWhenHidingFacades, + "When true: correct lighting is recalculated (client side) for conduit bundles when transitioning to" + + " from being hidden behind a facade. This produces " + + "better quality rendering but can result in frame stutters when switching to/from a wrench.") + .getBoolean(updateLightingWhenHidingFacades); + + darkSteelPowerDamgeAbsorptionRatios = config.get( + sectionDarkSteel.name, + "darkSteelPowerDamgeAbsorptionRatios", + darkSteelPowerDamgeAbsorptionRatios, + "A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered.") + .getDoubleList(); + darkSteelPowerStorageBase = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorageBase", + darkSteelPowerStorageBase, + "Base amount of power stored by dark steel items.") + .getInt(darkSteelPowerStorageBase); + darkSteelPowerStorageLevelOne = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorageLevelOne", + darkSteelPowerStorageLevelOne, + "Amount of power stored by dark steel items with a level 1 upgrade.") + .getInt(darkSteelPowerStorageLevelOne); + darkSteelPowerStorageLevelTwo = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorageLevelTwo", + darkSteelPowerStorageLevelTwo, + "Amount of power stored by dark steel items with a level 2 upgrade.") + .getInt(darkSteelPowerStorageLevelTwo); + darkSteelPowerStorageLevelThree = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorageLevelThree", + darkSteelPowerStorageLevelThree, + "Amount of power stored by dark steel items with a level 3 upgrade.") + .getInt(darkSteelPowerStorageLevelThree); + darkSteelPowerStorageLevelFour = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorageLevelFour", + darkSteelPowerStorageLevelFour, + "Amount of power stored by dark steel items with a level 4 upgrade.") + .getInt(darkSteelPowerStorageLevelFour); + + darkSteelUpgradeVibrantCost = config.get( + sectionDarkSteel.name, + "darkSteelUpgradeVibrantCost", + darkSteelUpgradeVibrantCost, + "Number of levels required for the 'Empowered.") + .getInt(darkSteelUpgradeVibrantCost); + darkSteelUpgradePowerOneCost = config.get( + sectionDarkSteel.name, + "darkSteelUpgradePowerOneCost", + darkSteelUpgradePowerOneCost, + "Number of levels required for the 'Power 1.") + .getInt(darkSteelUpgradePowerOneCost); + darkSteelUpgradePowerTwoCost = config.get( + sectionDarkSteel.name, + "darkSteelUpgradePowerTwoCost", + darkSteelUpgradePowerTwoCost, + "Number of levels required for the 'Power 2.") + .getInt(darkSteelUpgradePowerTwoCost); + darkSteelUpgradePowerThreeCost = config.get( + sectionDarkSteel.name, + "darkSteelUpgradePowerThreeCost", + darkSteelUpgradePowerThreeCost, + "Number of levels required for the 'Power 3' upgrade.") + .getInt(darkSteelUpgradePowerThreeCost); + darkSteelUpgradePowerFourCost = config.get( + sectionDarkSteel.name, + "darkSteelUpgradePowerFourCost", + darkSteelUpgradePowerFourCost, + "Number of levels required for the 'Power 4' upgrade.") + .getInt(darkSteelUpgradePowerFourCost); + + darkSteelJumpOneCost = config.get( + sectionDarkSteel.name, + "darkSteelJumpOneCost", + darkSteelJumpOneCost, + "Number of levels required for the 'Jump 1' upgrade.") + .getInt(darkSteelJumpOneCost); + darkSteelJumpTwoCost = config.get( + sectionDarkSteel.name, + "darkSteelJumpTwoCost", + darkSteelJumpTwoCost, + "Number of levels required for the 'Jump 2' upgrade.") + .getInt(darkSteelJumpTwoCost); + darkSteelJumpThreeCost = config.get( + sectionDarkSteel.name, + "darkSteelJumpThreeCost", + darkSteelJumpThreeCost, + "Number of levels required for the 'Jump 3' upgrade.") + .getInt(darkSteelJumpThreeCost); + + darkSteelSpeedOneCost = config.get( + sectionDarkSteel.name, + "darkSteelSpeedOneCost", + darkSteelSpeedOneCost, + "Number of levels required for the 'Speed 1' upgrade.") + .getInt(darkSteelSpeedOneCost); + darkSteelSpeedTwoCost = config.get( + sectionDarkSteel.name, + "darkSteelSpeedTwoCost", + darkSteelSpeedTwoCost, + "Number of levels required for the 'Speed 2' upgrade.") + .getInt(darkSteelSpeedTwoCost); + darkSteelSpeedThreeCost = config.get( + sectionDarkSteel.name, + "darkSteelSpeedThreeCost", + darkSteelSpeedThreeCost, + "Number of levels required for the 'Speed 3' upgrade.") + .getInt(darkSteelSpeedThreeCost); + + slotZeroPlacesEight = config.get( + sectionDarkSteel.name, + "shouldSlotZeroWrap", + slotZeroPlacesEight, + "Should the dark steel placement, when in the first (0th) slot, place the item in the last slot. If false, will place what's in the second slot.") + .getBoolean(); + + darkSteelSpeedOneWalkModifier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedOneWalkModifier", + darkSteelSpeedOneWalkModifier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedOneWalkModifier); + darkSteelSpeedTwoWalkMultiplier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedTwoWalkMultiplier", + darkSteelSpeedTwoWalkMultiplier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedTwoWalkMultiplier); + darkSteelSpeedThreeWalkMultiplier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedThreeWalkMultiplier", + darkSteelSpeedThreeWalkMultiplier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedThreeWalkMultiplier); + + darkSteelSpeedOneSprintModifier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedOneSprintModifier", + darkSteelSpeedOneSprintModifier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedOneSprintModifier); + darkSteelSpeedTwoSprintMultiplier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedTwoSprintMultiplier", + darkSteelSpeedTwoSprintMultiplier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedTwoSprintMultiplier); + darkSteelSpeedThreeSprintMultiplier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSpeedThreeSprintMultiplier", + darkSteelSpeedThreeSprintMultiplier, + "Speed modifier applied when walking in the Dark Steel Boots with Speed I.") + .getDouble(darkSteelSpeedThreeSprintMultiplier); + + darkSteelBootsJumpModifier = config.get( + sectionDarkSteel.name, + "darkSteelBootsJumpModifier", + darkSteelBootsJumpModifier, + "Jump height modifier applied when jumping with Dark Steel Boots equipped") + .getDouble(darkSteelBootsJumpModifier); + + darkSteelPowerStorageBase = config.get( + sectionDarkSteel.name, + "darkSteelPowerStorage", + darkSteelPowerStorageBase, + "Amount of power stored (RF) per crystal in the armor items recipe.") + .getInt(darkSteelPowerStorageBase); + darkSteelWalkPowerCost = config.get( + sectionDarkSteel.name, + "darkSteelWalkPowerCost", + darkSteelWalkPowerCost, + "Amount of power stored (RF) per block walked when wearing the dark steel boots.") + .getInt(darkSteelWalkPowerCost); + darkSteelSprintPowerCost = config.get( + sectionDarkSteel.name, + "darkSteelSprintPowerCost", + darkSteelWalkPowerCost, + "Amount of power stored (RF) per block walked when wearing the dark steel boots.") + .getInt(darkSteelSprintPowerCost); + darkSteelDrainPowerFromInventory = config.get( + sectionDarkSteel.name, + "darkSteelDrainPowerFromInventory", + darkSteelDrainPowerFromInventory, + "If true, dark steel armor will drain power stored (RF) in power containers in the players inventory.") + .getBoolean(darkSteelDrainPowerFromInventory); + + darkSteelBootsJumpPowerCost = config.get( + sectionDarkSteel.name, + "darkSteelBootsJumpPowerCost", + darkSteelBootsJumpPowerCost, + "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc") + .getInt(darkSteelBootsJumpPowerCost); + + darkSteelFallDistanceCost = config.get( + sectionDarkSteel.name, + "darkSteelFallDistanceCost", + darkSteelFallDistanceCost, + "Amount of power used (RF) per block height of fall distance damage negated.") + .getInt(darkSteelFallDistanceCost); + + darkSteelSwimCost = config.get( + sectionDarkSteel.name, + "darkSteelSwimCost", + darkSteelSwimCost, + "Number of levels required for the 'Swim' upgrade.") + .getInt(darkSteelSwimCost); + + darkSteelNightVisionCost = config.get( + sectionDarkSteel.name, + "darkSteelNightVisionCost", + darkSteelNightVisionCost, + "Number of levels required for the 'Night Vision' upgrade.") + .getInt(darkSteelNightVisionCost); + + darkSteelGliderCost = config.get( + sectionDarkSteel.name, + "darkSteelGliderCost", + darkSteelGliderCost, + "Number of levels required for the 'Glider' upgrade.") + .getInt(darkSteelGliderCost); + darkSteelGliderHorizontalSpeed = config.get( + sectionDarkSteel.name, + "darkSteelGliderHorizontalSpeed", + darkSteelGliderHorizontalSpeed, + "Horizontal movement speed modifier when gliding.") + .getDouble(darkSteelGliderHorizontalSpeed); + darkSteelGliderVerticalSpeed = config.get( + sectionDarkSteel.name, + "darkSteelGliderVerticalSpeed", + darkSteelGliderVerticalSpeed, + "Rate of altitude loss when gliding.") + .getDouble(darkSteelGliderVerticalSpeed); + darkSteelGliderVerticalSpeedSprinting = config.get( + sectionDarkSteel.name, + "darkSteelGliderVerticalSpeedSprinting", + darkSteelGliderVerticalSpeedSprinting, + "Rate of altitude loss when sprinting and gliding.") + .getDouble(darkSteelGliderVerticalSpeedSprinting); + + darkSteelSoundLocatorCost = config.get( + sectionDarkSteel.name, + "darkSteelSoundLocatorCost", + darkSteelSoundLocatorCost, + "Number of levels required for the 'Sound Locator' upgrade.") + .getInt(darkSteelSoundLocatorCost); + darkSteelSoundLocatorRange = config.get( + sectionDarkSteel.name, + "darkSteelSoundLocatorRange", + darkSteelSoundLocatorRange, + "Range of the 'Sound Locator' upgrade.") + .getInt(darkSteelSoundLocatorRange); + darkSteelSoundLocatorLifespan = config.get( + sectionDarkSteel.name, + "darkSteelSoundLocatorLifespan", + darkSteelSoundLocatorLifespan, + "Number of ticks the 'Sound Locator' icons are displayed for.") + .getInt(darkSteelSoundLocatorLifespan); + + darkSteelGogglesOfRevealingCost = config.get( + sectionDarkSteel.name, + "darkSteelGogglesOfRevealingCost", + darkSteelGogglesOfRevealingCost, + "Number of levels required for the Goggles of Revealing upgrade.") + .getInt(darkSteelGogglesOfRevealingCost); + + darkSteelApiaristArmorCost = config.get( + sectionDarkSteel.name, + "darkSteelApiaristArmorCost", + darkSteelApiaristArmorCost, + "Number of levels required for the Apiarist Armor upgrade.") + .getInt(darkSteelApiaristArmorCost); + + darkSteelTravelCost = config.get( + sectionDarkSteel.name, + "darkSteelTravelCost", + darkSteelTravelCost, + "Number of levels required for the 'Travel' upgrade.") + .getInt(darkSteelTravelCost); + + darkSteelSpoonCost = config.get( + sectionDarkSteel.name, + "darkSteelSpoonCost", + darkSteelSpoonCost, + "Number of levels required for the 'Spoon' upgrade.") + .getInt(darkSteelSpoonCost); + + darkSteelSolarOneCost = config.get( + sectionDarkSteel.name, + "darkSteelSolarOneCost", + darkSteelSolarOneCost, + "Cost in XP levels of the Solar I upgrade.") + .getInt(); + darkSteelSolarOneGen = config.get( + sectionDarkSteel.name, + "darkSteelSolarOneGen", + darkSteelSolarOneGen, + "RF per SECOND generated by the Solar I upgrade. Split between all equipped DS armors.") + .getInt(); + + darkSteelSolarTwoCost = config.get( + sectionDarkSteel.name, + "darkSteelSolarTwoCost", + darkSteelSolarTwoCost, + "Cost in XP levels of the Solar II upgrade.") + .getInt(); + darkSteelSolarTwoGen = config.get( + sectionDarkSteel.name, + "darkSteelSolarTwoGen", + darkSteelSolarTwoGen, + "RF per SECOND generated by the Solar II upgrade. Split between all equipped DS armors.") + .getInt(); + darkSteelSolarChargeOthers = config.get( + sectionDarkSteel.name, + "darkSteelSolarChargeOthers", + darkSteelSolarChargeOthers, + "If enabled allows the solar upgrade to charge non-darksteel armors that the player is wearing.") + .getBoolean(); + + darkSteelSwordSkullChance = (float) config.get( + sectionDarkSteel.name, + "darkSteelSwordSkullChance", + darkSteelSwordSkullChance, + "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordSkullChance); + darkSteelSwordSkullLootingModifier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSwordSkullLootingModifier", + darkSteelSwordSkullLootingModifier, + "The chance per looting level that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordSkullLootingModifier); + + darkSteelSwordWitherSkullChance = (float) config.get( + sectionDarkSteel.name, + "darkSteelSwordWitherSkullChance", + darkSteelSwordWitherSkullChance, + "The base chance that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordWitherSkullChance); + darkSteelSwordWitherSkullLootingModifier = (float) config.get( + sectionDarkSteel.name, + "darkSteelSwordWitherSkullLootingModifie", + darkSteelSwordWitherSkullLootingModifier, + "The chance per looting level that a wither skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordWitherSkullLootingModifier); + + vanillaSwordSkullChance = (float) config.get( + sectionDarkSteel.name, + "vanillaSwordSkullChance", + vanillaSwordSkullChance, + "The base chance that a skull will be dropped when using a non dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(vanillaSwordSkullChance); + vanillaSwordSkullLootingModifier = (float) config.get( + sectionPersonal.name, + "vanillaSwordSkullLootingModifier", + vanillaSwordSkullLootingModifier, + "The chance per looting level that a skull will be dropped when using a non-dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(vanillaSwordSkullLootingModifier); + + ticCleaverSkullDropChance = (float) config.get( + sectionDarkSteel.name, + "ticCleaverSkullDropChance", + ticCleaverSkullDropChance, + "The base chance that an Enderman Skull will be dropped when using TiC Cleaver") + .getDouble(ticCleaverSkullDropChance); + ticBeheadingSkullModifier = (float) config.get( + sectionPersonal.name, + "ticBeheadingSkullModifier", + ticBeheadingSkullModifier, + "The chance per level of Beheading that a skull will be dropped when using a TiC weapon") + .getDouble(ticBeheadingSkullModifier); + + fakePlayerSkullChance = (float) config.get( + sectionDarkSteel.name, + "fakePlayerSkullChance", + fakePlayerSkullChance, + "The ratio of skull drops when a mob is killed by a 'FakePlayer', such as Killer Joe. When set to 0 no skulls will drop, at 1 the rate of skull drops is not modified") + .getDouble(fakePlayerSkullChance); + + darkSteelSwordPowerUsePerHit = config.get( + sectionDarkSteel.name, + "darkSteelSwordPowerUsePerHit", + darkSteelSwordPowerUsePerHit, + "The amount of power (RF) used per hit.") + .getInt(darkSteelSwordPowerUsePerHit); + darkSteelSwordEnderPearlDropChance = config.get( + sectionDarkSteel.name, + "darkSteelSwordEnderPearlDropChance", + darkSteelSwordEnderPearlDropChance, + "The chance that an ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordEnderPearlDropChance); + darkSteelSwordEnderPearlDropChancePerLooting = config.get( + sectionDarkSteel.name, + "darkSteelSwordEnderPearlDropChancePerLooting", + darkSteelSwordEnderPearlDropChancePerLooting, + "The chance for each looting level that an additional ender pearl will be dropped when using a dark steel sword (0 = no chance, 1 = 100% chance)") + .getDouble(darkSteelSwordEnderPearlDropChancePerLooting); + + darkSteelPickPowerUseObsidian = config.get( + sectionDarkSteel.name, + "darkSteelPickPowerUseObsidian", + darkSteelPickPowerUseObsidian, + "The amount of power (RF) used to break an obsidian block.") + .getInt(darkSteelPickPowerUseObsidian); + darkSteelPickEffeciencyObsidian = config.get( + sectionDarkSteel.name, + "darkSteelPickEffeciencyObsidian", + darkSteelPickEffeciencyObsidian, + "The efficiency when breaking obsidian with a powered Dark Pickaxe.") + .getInt(darkSteelPickEffeciencyObsidian); + darkSteelPickApplyObsidianEffeciencyAtHardess = (float) config.get( + sectionDarkSteel.name, + "darkSteelPickApplyObsidianEffeciencyAtHardess", + darkSteelPickApplyObsidianEffeciencyAtHardess, + "If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value.") + .getDouble(darkSteelPickApplyObsidianEffeciencyAtHardess); + darkSteelPickPowerUsePerDamagePoint = config.get( + sectionDarkSteel.name, + "darkSteelPickPowerUsePerDamagePoint", + darkSteelPickPowerUsePerDamagePoint, + "Power use (RF) per damage/durability point avoided.") + .getInt(darkSteelPickPowerUsePerDamagePoint); + darkSteelPickEffeciencyBoostWhenPowered = (float) config.get( + sectionDarkSteel.name, + "darkSteelPickEffeciencyBoostWhenPowered", + darkSteelPickEffeciencyBoostWhenPowered, + "The increase in efficiency when powered.") + .getDouble(darkSteelPickEffeciencyBoostWhenPowered); + darkSteelPickMinesTiCArdite = config.getBoolean( + "darkSteelPickMinesTiCArdite", + sectionDarkSteel.name, + darkSteelPickMinesTiCArdite, + "When true the dark steel pick will be able to mine TiC Ardite and Cobalt"); + + darkSteelAxePowerUsePerDamagePoint = config.get( + sectionDarkSteel.name, + "darkSteelAxePowerUsePerDamagePoint", + darkSteelAxePowerUsePerDamagePoint, + "Power use (RF) per damage/durability point avoided.") + .getInt(darkSteelAxePowerUsePerDamagePoint); + darkSteelAxePowerUsePerDamagePointMultiHarvest = config.get( + sectionDarkSteel.name, + "darkSteelPickAxeUsePerDamagePointMultiHarvest", + darkSteelAxePowerUsePerDamagePointMultiHarvest, + "Power use (RF) per damage/durability point avoided when shift-harvesting multiple logs") + .getInt(darkSteelAxePowerUsePerDamagePointMultiHarvest); + darkSteelAxeSpeedPenaltyMultiHarvest = (float) config.get( + sectionDarkSteel.name, + "darkSteelAxeSpeedPenaltyMultiHarvest", + darkSteelAxeSpeedPenaltyMultiHarvest, + "How much slower shift-harvesting logs is.") + .getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); + darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get( + sectionDarkSteel.name, + "darkSteelAxeEffeciencyBoostWhenPowered", + darkSteelAxeEffeciencyBoostWhenPowered, + "The increase in efficiency when powered.") + .getDouble(darkSteelAxeEffeciencyBoostWhenPowered); + + darkSteelShearsDurabilityFactor = config.get( + sectionDarkSteel.name, + "darkSteelShearsDurabilityFactor", + darkSteelShearsDurabilityFactor, + "How much more durable as vanilla shears they are.") + .getInt(darkSteelShearsDurabilityFactor); + darkSteelShearsPowerUsePerDamagePoint = config.get( + sectionDarkSteel.name, + "darkSteelShearsPowerUsePerDamagePoint", + darkSteelShearsPowerUsePerDamagePoint, + "Power use (RF) per damage/durability point avoided.") + .getInt(darkSteelShearsPowerUsePerDamagePoint); + darkSteelShearsEffeciencyBoostWhenPowered = (float) config.get( + sectionDarkSteel.name, + "darkSteelShearsEffeciencyBoostWhenPowered", + darkSteelShearsEffeciencyBoostWhenPowered, + "The increase in efficiency when powered.") + .getDouble(darkSteelShearsEffeciencyBoostWhenPowered); + darkSteelShearsBlockAreaBoostWhenPowered = config.get( + sectionDarkSteel.name, + "darkSteelShearsBlockAreaBoostWhenPowered", + darkSteelShearsBlockAreaBoostWhenPowered, + "The increase in effected area (radius) when powered and used on blocks.") + .getInt(darkSteelShearsBlockAreaBoostWhenPowered); + darkSteelShearsEntityAreaBoostWhenPowered = (float) config.get( + sectionDarkSteel.name, + "darkSteelShearsEntityAreaBoostWhenPowered", + darkSteelShearsEntityAreaBoostWhenPowered, + "The increase in effected area (radius) when powered and used on sheep.") + .getDouble(darkSteelShearsEntityAreaBoostWhenPowered); + + darkSteelAnvilDamageChance = (float) config.get( + sectionDarkSteel.name, + "darkSteelAnvilDamageChance", + darkSteelAnvilDamageChance, + "Chance that the dark steel anvil will take damage after repairing something.") + .getDouble(); + + darkSteelLadderSpeedBoost = (float) config.get( + sectionDarkSteel.name, + "darkSteelLadderSpeedBoost", + darkSteelLadderSpeedBoost, + "Speed boost, in blocks per tick, that the DS ladder gives over the vanilla ladder.") + .getDouble(); + + hootchPowerPerCycleRF = config.get( + sectionPower.name, + "hootchPowerPerCycleRF", + hootchPowerPerCycleRF, + "The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60") + .getInt(hootchPowerPerCycleRF); + hootchPowerTotalBurnTime = config.get( + sectionPower.name, + "hootchPowerTotalBurnTime", + hootchPowerTotalBurnTime, + "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000") + .getInt(hootchPowerTotalBurnTime); + + rocketFuelPowerPerCycleRF = config.get( + sectionPower.name, + "rocketFuelPowerPerCycleRF", + rocketFuelPowerPerCycleRF, + "The amount of power generated per BC engine cycle. Examples: BC Oil = 3, BC Fuel = 6") + .getInt(rocketFuelPowerPerCycleRF); + rocketFuelPowerTotalBurnTime = config.get( + sectionPower.name, + "rocketFuelPowerTotalBurnTime", + rocketFuelPowerTotalBurnTime, + "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000") + .getInt(rocketFuelPowerTotalBurnTime); + + fireWaterPowerPerCycleRF = config.get( + sectionPower.name, + "fireWaterPowerPerCycleRF", + fireWaterPowerPerCycleRF, + "The amount of power generated per BC engine cycle. Examples: BC Oil = 30, BC Fuel = 60") + .getInt(fireWaterPowerPerCycleRF); + fireWaterPowerTotalBurnTime = config.get( + sectionPower.name, + "fireWaterPowerTotalBurnTime", + fireWaterPowerTotalBurnTime, + "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000") + .getInt(fireWaterPowerTotalBurnTime); + + zombieGeneratorRfPerTick = config.get( + sectionPower.name, + "zombieGeneratorRfPerTick", + zombieGeneratorRfPerTick, + "The amount of power generated per tick.") + .getInt(zombieGeneratorRfPerTick); + zombieGeneratorTicksPerBucketFuel = config.get( + sectionPower.name, + "zombieGeneratorTicksPerMbFuel", + zombieGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.") + .getInt(zombieGeneratorTicksPerBucketFuel); + + frankenzombieGeneratorRfPerTick = config.get( + sectionPower.name, + "frankenzombieGeneratorRfPerTick", + frankenzombieGeneratorRfPerTick, + "The amount of power generated per tick.") + .getInt(frankenzombieGeneratorRfPerTick); + frankenzombieGeneratorTicksPerBucketFuel = config.get( + sectionPower.name, + "frankenzombieGeneratorTicksPerMbFuel", + frankenzombieGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.") + .getInt(frankenzombieGeneratorTicksPerBucketFuel); + + enderGeneratorRfPerTick = config.get( + sectionPower.name, + "enderGeneratorRfPerTick", + enderGeneratorRfPerTick, + "The amount of power generated per tick.") + .getInt(enderGeneratorRfPerTick); + enderGeneratorTicksPerBucketFuel = config.get( + sectionPower.name, + "enderGeneratorTicksPerMbFuel", + enderGeneratorTicksPerBucketFuel, + "The number of ticks one bucket of fuel lasts.") + .getInt(enderGeneratorTicksPerBucketFuel); + + zombieGeneratorsEnergyMultipliers = config.get( + sectionPower.name, + "zombieGeneratorsEnergyMultipliers", + zombieGeneratorsEnergyMultipliers, + "Energy multipliers for the Zombie-Type Generators") + .getDoubleList(); + + zombieGeneratorsBurnTimeMultipliers = config.get( + sectionPower.name, + "zombieGeneratorsBurnTimeMultipliers", + zombieGeneratorsBurnTimeMultipliers, + "Burn time multipliers for the Zombie-Type Generators") + .getDoubleList(); + + stirlingGeneratorBaseRfPerTick = config.get( + sectionPower.name, + "stirlingGeneratorBaseRfPerTick", + stirlingGeneratorBaseRfPerTick, + "The amount of power generated per tick.") + .getInt(stirlingGeneratorBaseRfPerTick); + + stirlingGeneratorEnergyMultiplierT1 = (float) config.get( + sectionPower.name, + "stirlingGeneratorEnergyMultiplierT1", + stirlingGeneratorEnergyMultiplierT1, + "[Deprecated]Energy multiplier for the Stirling Generator, Tier 1 machine") + .getDouble(); + stirlingGeneratorEnergyMultiplierT2 = (float) config.get( + sectionPower.name, + "stirlingGeneratorEnergyMultiplierT2", + stirlingGeneratorEnergyMultiplierT2, + "[Deprecated]Energy multiplier for the Stirling Generator, Tier 2 machine") + .getDouble(); + stirlingGeneratorEnergyMultiplierT3 = (float) config.get( + sectionPower.name, + "stirlingGeneratorEnergyMultiplierT3", + stirlingGeneratorEnergyMultiplierT3, + "[Deprecated]Energy multiplier for the Stirling Generator, Tier 3 machine") + .getDouble(); + + stirlingGeneratorEnergyMultipliers = config.get( + sectionPower.name, + "stirlingGeneratorEnergyMultipliers", + stirlingGeneratorEnergyMultipliers, + "Energy multipliers for the Stirling Generator") + .getDoubleList(); + + stirlingGeneratorBurnTimeMultiplierT1 = (float) config.get( + sectionPower.name, + "stirlingGeneratorBurnTimeMultiplierT1", + stirlingGeneratorBurnTimeMultiplierT1, + "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 1 machine") + .getDouble(); + stirlingGeneratorBurnTimeMultiplierT2 = (float) config.get( + sectionPower.name, + "stirlingGeneratorBurnTimeMultiplierT2", + stirlingGeneratorBurnTimeMultiplierT2, + "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 2 machine") + .getDouble(); + stirlingGeneratorBurnTimeMultiplierT3 = (float) config.get( + sectionPower.name, + "stirlingGeneratorBurnTimeMultiplierT3", + stirlingGeneratorBurnTimeMultiplierT3, + "[Deprecated]Burn time multiplier for the Stirling Generator, Tier 3 machine") + .getDouble(); + + stirlingGeneratorBurnTimeMultipliers = config.get( + sectionPower.name, + "stirlingGeneratorBurnTimeMultipliers", + stirlingGeneratorBurnTimeMultipliers, + "Burn time multipliers for the Stirling Generator") + .getDoubleList(); + + addFuelTooltipsToAllFluidContainers = config.get( + sectionPersonal.name, + "addFuelTooltipsToAllFluidContainers", + addFuelTooltipsToAllFluidContainers, + "If true, the RF/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.") + .getBoolean(addFuelTooltipsToAllFluidContainers); + addDurabilityTootip = config.get( + sectionPersonal.name, + "addDurabilityTootip", + addFuelTooltipsToAllFluidContainers, + "If true, adds durability tooltips to tools and armor") + .getBoolean(addDurabilityTootip); + addFurnaceFuelTootip = config.get( + sectionPersonal.name, + "addFurnaceFuelTootip", + addFuelTooltipsToAllFluidContainers, + "If true, adds burn duration tooltips to furnace fuels") + .getBoolean(addFurnaceFuelTootip); + + farmContinuousEnergyUseRF = config.get( + sectionFarm.name, + "farmContinuousEnergyUseRF", + farmContinuousEnergyUseRF, + "The amount of power used by a farm per tick ") + .getInt(farmContinuousEnergyUseRF); + farmActionEnergyUseRF = config.get( + sectionFarm.name, + "farmActionEnergyUseRF", + farmActionEnergyUseRF, + "The amount of power used by a farm per action (eg plant, till, harvest) ") + .getInt(farmActionEnergyUseRF); + farmAxeActionEnergyUseRF = config.get( + sectionFarm.name, + "farmAxeActionEnergyUseRF", + farmAxeActionEnergyUseRF, + "The amount of power used by a farm per wood block 'chopped'") + .getInt(farmAxeActionEnergyUseRF); + + farmBonemealActionEnergyUseRF = config.get( + sectionFarm.name, + "farmBonemealActionEnergyUseRF", + farmBonemealActionEnergyUseRF, + "The amount of power used by a farm per bone meal used") + .getInt(farmBonemealActionEnergyUseRF); + farmBonemealTryEnergyUseRF = config.get( + sectionFarm.name, + "farmBonemealTryEnergyUseRF", + farmBonemealTryEnergyUseRF, + "The amount of power used by a farm per bone meal try") + .getInt(farmBonemealTryEnergyUseRF); + + farmDefaultSize = config.get( + sectionFarm.name, + "farmDefaultSize", + farmDefaultSize, + "The number of blocks a farm will extend from its center") + .getInt(farmDefaultSize); + farmBonusSize = config.get( + sectionFarm.name, + "farmBonusSize", + farmBonusSize, + "The extra number of blocks a farm will extend from its center per upgrade") + .getInt(farmBonusSize); + + farmAxeDamageOnLeafBreak = config.get( + sectionFarm.name, + "farmAxeDamageOnLeafBreak", + farmAxeDamageOnLeafBreak, + "Should axes in a farm take damage when breaking leaves?") + .getBoolean(farmAxeDamageOnLeafBreak); + farmToolTakeDamageChance = (float) config.get( + sectionFarm.name, + "farmToolTakeDamageChance", + farmToolTakeDamageChance, + "The chance that a tool in the farm will take damage.") + .getDouble(farmToolTakeDamageChance); + + disableFarmNotification = config.get( + sectionFarm.name, + "disableFarmNotifications", + disableFarmNotification, + "Disable the notification text above the farm block.") + .getBoolean(); + + farmEssenceBerriesEnabled = config.get( + sectionFarm.name, + "farmEssenceBerriesEnabled", + farmEssenceBerriesEnabled, + "This setting controls whether essence berry bushes from TiC can be harvested by the farm.") + .getBoolean(); + + farmManaBeansEnabled = config.get( + sectionFarm.name, + "farmManaBeansEnabled", + farmManaBeansEnabled, + "This setting controls whether mana beans from Thaumcraft can be harvested by the farm.") + .getBoolean(); + + farmHarvestJungleWhenCocoa = config.get( + sectionFarm.name, + "farmHarvestJungleWhenCocoa", + farmHarvestJungleWhenCocoa, + "If this is enabled the farm will harvest jungle wood even if it has cocoa beans in its inventory.") + .getBoolean(); + + hoeStrings = config.get( + sectionFarm.name, + "farmHoes", + hoeStrings, + "Use this to specify items that can be hoes in the farming station. Use the registry name (eg. modid:name).") + .getStringList(); + + farmSaplingReserveAmount = config.get( + sectionFarm.name, + "farmSaplingReserveAmount", + farmSaplingReserveAmount, + "The amount of saplings the farm has to have in reserve to switch to shearing all leaves. If there are less " + + "saplings in store, it will only shear part the leaves and break the others for spalings. Set this to 0 to " + + "always shear all leaves.") + .getInt(farmSaplingReserveAmount); + + combustionGeneratorUseOpaqueModel = config.get( + sectionAesthetic.name, + "combustionGeneratorUseOpaqueModel", + combustionGeneratorUseOpaqueModel, + "If set to true: fluid will not be shown in combustion generator tanks. Improves FPS. ") + .getBoolean(combustionGeneratorUseOpaqueModel); + + magnetPowerUsePerSecondRF = config.get( + sectionMagnet.name, + "magnetPowerUsePerTickRF", + magnetPowerUsePerSecondRF, + "The amount of RF power used per tick when the magnet is active") + .getInt(magnetPowerUsePerSecondRF); + magnetPowerCapacityRF = config.get( + sectionMagnet.name, + "magnetPowerCapacityRF", + magnetPowerCapacityRF, + "Amount of RF power stored in a fully charged magnet") + .getInt(magnetPowerCapacityRF); + magnetRange = config.get(sectionMagnet.name, "magnetRange", magnetRange, "Range of the magnet in blocks.") + .getInt(magnetRange); + magnetMaxItems = config.get( + sectionMagnet.name, + "magnetMaxItems", + magnetMaxItems, + "Maximum number of items the magnet can effect at a time. (-1 for unlimited)") + .getInt(magnetMaxItems); + + magnetBlacklist = config.getStringList( + "magnetBlacklist", + sectionMagnet.name, + magnetBlacklist, + "These items will not be picked up by the magnet."); + + magnetAllowInMainInventory = config.get( + sectionMagnet.name, + "magnetAllowInMainInventory", + magnetAllowInMainInventory, + "If true the magnet will also work in the main inventory, not just the hotbar") + .getBoolean(magnetAllowInMainInventory); + + magnetAllowInBaublesSlot = config.get( + sectionMagnet.name, + "magnetAllowInBaublesSlot", + magnetAllowInBaublesSlot, + "If true the magnet can be put into the 'amulet' Baubles slot (requires Baubles to be installed)") + .getBoolean(magnetAllowInBaublesSlot); + magnetAllowDeactivatedInBaublesSlot = config.get( + sectionMagnet.name, + "magnetAllowDeactivatedInBaublesSlot", + magnetAllowDeactivatedInBaublesSlot, + "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)") + .getBoolean(magnetAllowDeactivatedInBaublesSlot); + + magnetAllowPowerExtraction = config.get( + sectionMagnet.name, + "magnetAllowPowerExtraction", + magnetAllowPowerExtraction, + "If true the magnet can be used as a battery.") + .getBoolean(magnetAllowPowerExtraction); + + magnetBaublesType = config.get( + sectionMagnet.name, + "magnetBaublesType", + magnetBaublesType, + "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)") + .getString(); + + useCombustionGenModel = config.get( + sectionAesthetic.name, + "useCombustionGenModel", + useCombustionGenModel, + "If set to true: WIP Combustion Generator model will be used") + .getBoolean(useCombustionGenModel); + + crafterRfPerCraft = config.get( + "AutoCrafter Settings", + "crafterRfPerCraft", + crafterRfPerCraft, + "RF used per autocrafted recipe") + .getInt(crafterRfPerCraft); + + poweredSpawnerMinDelayTicks = config.get( + sectionSpawner.name, + "poweredSpawnerMinDelayTicks", + poweredSpawnerMinDelayTicks, + "Min tick delay between spawns for a non-upgraded spawner") + .getInt(poweredSpawnerMinDelayTicks); + poweredSpawnerMaxDelayTicks = config.get( + sectionSpawner.name, + "poweredSpawnerMaxDelayTicks", + poweredSpawnerMaxDelayTicks, + "Min tick delay between spawns for a non-upgraded spawner") + .getInt(poweredSpawnerMaxDelayTicks); + poweredSpawnerLevelOnePowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelOnePowerPerTickRF", + poweredSpawnerLevelOnePowerPerTickRF, + "RF per tick for a level 1 (non-upgraded) spawner. See PoweredSpanerConfig_Core.json for mob type multipliers") + .getInt(poweredSpawnerLevelOnePowerPerTickRF); + poweredSpawnerLevelTwoPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelTwoPowerPerTickRF", + poweredSpawnerLevelTwoPowerPerTickRF, + "RF per tick for a level 2 spawner") + .getInt(poweredSpawnerLevelTwoPowerPerTickRF); + poweredSpawnerLevelThreePowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelThreePowerPerTickRF", + poweredSpawnerLevelThreePowerPerTickRF, + "RF per tick for a level 3 spawner") + .getInt(poweredSpawnerLevelThreePowerPerTickRF); + poweredSpawnerLevelFourPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelFourPowerPerTickRF", + poweredSpawnerLevelFourPowerPerTickRF, + "RF per tick for a level 4 spawner") + .getInt(poweredSpawnerLevelFourPowerPerTickRF); + poweredSpawnerLevelFivePowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelFivePowerPerTickRF", + poweredSpawnerLevelFivePowerPerTickRF, + "RF per tick for a level 5 spawner") + .getInt(poweredSpawnerLevelFivePowerPerTickRF); + poweredSpawnerLevelSixPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelSixPowerPerTickRF", + poweredSpawnerLevelSixPowerPerTickRF, + "RF per tick for a level 6 spawner") + .getInt(poweredSpawnerLevelSixPowerPerTickRF); + poweredSpawnerLevelSevenPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelSevenPowerPerTickRF", + poweredSpawnerLevelSevenPowerPerTickRF, + "RF per tick for a level 7 spawner") + .getInt(poweredSpawnerLevelSevenPowerPerTickRF); + poweredSpawnerLevelEightPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelEightPowerPerTickRF", + poweredSpawnerLevelEightPowerPerTickRF, + "RF per tick for a level 1 spawner") + .getInt(poweredSpawnerLevelEightPowerPerTickRF); + poweredSpawnerLevelNinePowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelNinePowerPerTickRF", + poweredSpawnerLevelNinePowerPerTickRF, + "RF per tick for a level 2 spawner") + .getInt(poweredSpawnerLevelNinePowerPerTickRF); + poweredSpawnerLevelTenPowerPerTickRF = config.get( + sectionSpawner.name, + "poweredSpawnerLevelTenPowerPerTickRF", + poweredSpawnerLevelTenPowerPerTickRF, + "RF per tick for a level 3 spawner") + .getInt(poweredSpawnerLevelTenPowerPerTickRF); + poweredSpawnerMaxPlayerDistance = config.get( + sectionSpawner.name, + "poweredSpawnerMaxPlayerDistance", + poweredSpawnerMaxPlayerDistance, + "Max distance of the closest player for the spawner to be active. A zero value will remove the player check") + .getInt(poweredSpawnerMaxPlayerDistance); + poweredSpawnerDespawnTimeSeconds = config.get( + sectionSpawner.name, + "poweredSpawnerDespawnTimeSeconds", + poweredSpawnerDespawnTimeSeconds, + "Number of seconds in which spawned entities are protected from despawning") + .getInt(poweredSpawnerDespawnTimeSeconds); + poweredSpawnerSpawnCount = config.get( + sectionSpawner.name, + "poweredSpawnerSpawnCount", + poweredSpawnerSpawnCount, + "Number of entities to spawn each time") + .getInt(poweredSpawnerSpawnCount); + poweredSpawnerSpawnRange = config.get( + sectionSpawner.name, + "poweredSpawnerSpawnRange", + poweredSpawnerSpawnRange, + "Spawning range in X/Z") + .getInt(poweredSpawnerSpawnRange); + poweredSpawnerMaxNearbyEntities = config.get( + sectionSpawner.name, + "poweredSpawnerMaxNearbyEntities", + poweredSpawnerMaxNearbyEntities, + "Max number of entities in the nearby area until no more are spawned. A zero value will remove this check") + .getInt(poweredSpawnerMaxNearbyEntities); + poweredSpawnerMaxSpawnTries = config.get( + sectionSpawner.name, + "poweredSpawnerMaxSpawnTries", + poweredSpawnerMaxSpawnTries, + "Number of tries to find a suitable spawning location") + .getInt(poweredSpawnerMaxSpawnTries); + poweredSpawnerUseVanillaSpawChecks = config.get( + sectionSpawner.name, + "poweredSpawnerUseVanillaSpawChecks", + poweredSpawnerUseVanillaSpawChecks, + "If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs") + .getBoolean(poweredSpawnerUseVanillaSpawChecks); + brokenSpawnerDropChance = (float) config.get( + sectionSpawner.name, + "brokenSpawnerDropChance", + brokenSpawnerDropChance, + "The chance a broken spawner will be dropped when a spawner is broken. 1 = 100% chance, 0 = 0% chance") + .getDouble(brokenSpawnerDropChance); + brokenSpawnerToolBlacklist = config.getStringList( + "brokenSpawnerToolBlacklist", + sectionSpawner.name, + brokenSpawnerToolBlacklist, + "When a spawner is broken with these tools they will not drop a broken spawner"); + + powerSpawnerAddSpawnerCost = config.get( + sectionSpawner.name, + "powerSpawnerAddSpawnerCost", + powerSpawnerAddSpawnerCost, + "The number of levels it costs to add a broken spawner") + .getInt(powerSpawnerAddSpawnerCost); + + useModMetals = config.get( + sectionRecipe.name, + "useModMetals", + useModMetals, + "If true copper and tin will be used in recipes when registered in the ore dictionary") + .getBoolean(useModMetals); + + nutrientFoodBoostDelay = config.get( + sectionFluid.name, + "nutrientFluidFoodBoostDelay", + nutrientFoodBoostDelay, + "The delay in ticks between when nutrient distillation boosts your food value.") + .getInt((int) nutrientFoodBoostDelay); + + killerJoeNutrientUsePerAttackMb = config.get( + sectionKiller.name, + "killerJoeNutrientUsePerAttackMb", + killerJoeNutrientUsePerAttackMb, + "The number of millibuckets of nutrient fluid used per attack.") + .getInt(killerJoeNutrientUsePerAttackMb); + + killerJoeAttackHeight = config.get( + sectionKiller.name, + "killerJoeAttackHeight", + killerJoeAttackHeight, + "The reach of attacks above and bellow Joe.") + .getDouble(killerJoeAttackHeight); + killerJoeAttackWidth = config.get( + sectionKiller.name, + "killerJoeAttackWidth", + killerJoeAttackWidth, + "The reach of attacks to each side of Joe.") + .getDouble(killerJoeAttackWidth); + killerJoeAttackLength = config.get( + sectionKiller.name, + "killerJoeAttackLength", + killerJoeAttackLength, + "The reach of attacks in front of Joe.") + .getDouble(killerJoeAttackLength); + killerJoeHooverXpLength = config.get( + sectionKiller.name, + "killerJoeHooverXpLength", + killerJoeHooverXpLength, + "The distance from which XP will be gathered to each side of Joe.") + .getDouble(killerJoeHooverXpLength); + killerJoeHooverXpWidth = config.get( + sectionKiller.name, + "killerJoeHooverXpWidth", + killerJoeHooverXpWidth, + "The distance from which XP will be gathered in front of Joe.") + .getDouble(killerJoeHooverXpWidth); + killerJoeMaxXpLevel = config.get( + sectionMisc.name, + "killerJoeMaxXpLevel", + killerJoeMaxXpLevel, + "Maximum level of XP the killer joe can contain.") + .getInt(); + + killerJoeMustSee = config.get( + sectionKiller.name, + "killerJoeMustSee", + killerJoeMustSee, + "Set whether the Killer Joe can attack through blocks.") + .getBoolean(); + killerPvPoffDisablesSwing = config.get( + sectionKiller.name, + "killerPvPoffDisablesSwing", + killerPvPoffDisablesSwing, + "Set whether the Killer Joe swings even if PvP is off (that swing will do nothing unless killerPvPoffIsIgnored is enabled).") + .getBoolean(); + killerPvPoffIsIgnored = config.get( + sectionKiller.name, + "killerPvPoffIsIgnored", + killerPvPoffIsIgnored, + "Set whether the Killer Joe ignores PvP settings and always hits players (killerPvPoffDisablesSwing must be off for this to work).") + .getBoolean(); + + // Add deprecated comment + config.getString( + "isGasConduitEnabled", + sectionItems.name, + "auto", + "Deprecated option. Use boolean \"gasConduitsEnabled\" below."); + isGasConduitEnabled = config.getBoolean( + "gasConduitEnabled", + sectionItems.name, + isGasConduitEnabled, + "If true, gas conduits will be enabled if the Mekanism Gas API is found. False to forcibly disable."); + enableMEConduits = config.getBoolean( + "enableMEConduits", + sectionItems.name, + enableMEConduits, + "Allows ME conduits. Only has an effect with AE2 installed."); + enableOCConduits = config.getBoolean( + "enableOCConduits", + sectionItems.name, + enableOCConduits, + "Allows OC conduits. Only has an effect with OpenComputers installed."); + enableOCConduitsAnimatedTexture = config.getBoolean( + "enableOCConduitsAnimatedTexture", + sectionItems.name, + enableOCConduitsAnimatedTexture, + "Use the animated texture for OC conduits."); + + soulVesselBlackList = config.getStringList( + "soulVesselBlackList", + sectionSoulBinder.name, + soulVesselBlackList, + "Entities listed here will can not be captured in a Soul Vial"); + + soulVesselCapturesBosses = config.getBoolean( + "soulVesselCapturesBosses", + sectionSoulBinder.name, + soulVesselCapturesBosses, + "When set to false, any mob with a 'boss bar' won't be able to be captured in the Soul Vial"); + + soulBinderLevelOnePowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelOnePowerPerTickRF", + soulBinderLevelOnePowerPerTickRF, + "The number of RF/t consumed by an unupgraded soul binder.") + .getInt(soulBinderLevelOnePowerPerTickRF); + soulBinderLevelTwoPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelTwoPowerPerTickRF", + soulBinderLevelTwoPowerPerTickRF, + "The number of RF/t consumed by a soul binder with a double layer capacitor or a endergetic capacitor upgrade.") + .getInt(soulBinderLevelTwoPowerPerTickRF); + soulBinderLevelThreePowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelThreePowerPerTickRF", + soulBinderLevelThreePowerPerTickRF, + "The number of RF/t consumed by a soul binder with an octadic capacitor or a endergised upgrade.") + .getInt(soulBinderLevelThreePowerPerTickRF); + soulBinderLevelFourPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelFourPowerPerTickRF", + soulBinderLevelFourPowerPerTickRF, + "The number of RF/t consumed by a soul binder with an crystalline capacitor upgrade.") + .getInt(soulBinderLevelFourPowerPerTickRF); + soulBinderLevelFivePowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelFivePowerPerTickRF", + soulBinderLevelFivePowerPerTickRF, + "The number of RF/t consumed by a soul binder with an melodic capacitor upgrade.") + .getInt(soulBinderLevelFivePowerPerTickRF); + soulBinderLevelSixPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelSixPowerPerTickRF", + soulBinderLevelSixPowerPerTickRF, + "The number of RF/t consumed by a soul binder with an stellar capacitor upgrade.") + .getInt(soulBinderLevelSixPowerPerTickRF); + soulBinderLevelSevenPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelSevenPowerPerTickRF", + soulBinderLevelSevenPowerPerTickRF, + "The number of RF/t consumed by a soul binder with an totemic capacitor upgrade.") + .getInt(soulBinderLevelSevenPowerPerTickRF); + soulBinderLevelEightPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelEightPowerPerTickRF", + soulBinderLevelEightPowerPerTickRF, + "The number of RF/t consumed by a soul binder with an silver capacitor upgrade.") + .getInt(soulBinderLevelEightPowerPerTickRF); + soulBinderLevelNinePowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelNinePowerPerTickRF", + soulBinderLevelNinePowerPerTickRF, + "The number of RF/t consumed by a soul binder with an endergetic capacitor upgrade.") + .getInt(soulBinderLevelNinePowerPerTickRF); + soulBinderLevelTenPowerPerTickRF = config.get( + sectionSoulBinder.name, + "soulBinderLevelTenPowerPerTickRF", + soulBinderLevelTenPowerPerTickRF, + "The number of RF/t consumed by a soul binder with an endergised capacitor upgrade.") + .getInt(soulBinderLevelTenPowerPerTickRF); + soulBinderBrokenSpawnerRF = config.get( + sectionSoulBinder.name, + "soulBinderBrokenSpawnerRF", + soulBinderBrokenSpawnerRF, + "The number of RF required to change the type of a broken spawner.") + .getInt(soulBinderBrokenSpawnerRF); + soulBinderReanimationRF = config.get( + sectionSoulBinder.name, + "soulBinderReanimationRF", + soulBinderReanimationRF, + "The number of RF required to to re-animated a mob head.") + .getInt(soulBinderReanimationRF); + soulBinderEnderCystalRF = config.get( + sectionSoulBinder.name, + "soulBinderEnderCystalRF", + soulBinderEnderCystalRF, + "The number of RF required to create an ender crystal.") + .getInt(soulBinderEnderCystalRF); + soulBinderPrecientCystalRF = config.get( + sectionSoulBinder.name, + "soulBinderPrecientCystalRF", + soulBinderPrecientCystalRF, + "The number of RF required to create an precient crystal.") + .getInt(soulBinderPrecientCystalRF); + soulBinderAttractorCystalRF = config.get( + sectionSoulBinder.name, + "soulBinderAttractorCystalRF", + soulBinderAttractorCystalRF, + "The number of RF required to create an attractor crystal.") + .getInt(soulBinderAttractorCystalRF); + soulBinderEnderRailRF = config.get( + sectionSoulBinder.name, + "soulBinderEnderRailRF", + soulBinderEnderRailRF, + "The number of RF required to create an ender rail.") + .getInt(soulBinderEnderRailRF); + + soulBinderAttractorCystalLevels = config.get( + sectionSoulBinder.name, + "soulBinderAttractorCystalLevels", + soulBinderAttractorCystalLevels, + "The number of levels required to create an attractor crystal.") + .getInt(soulBinderAttractorCystalLevels); + soulBinderEnderCystalLevels = config.get( + sectionSoulBinder.name, + "soulBinderEnderCystalLevels", + soulBinderEnderCystalLevels, + "The number of levels required to create an ender crystal.") + .getInt(soulBinderEnderCystalLevels); + soulBinderPrecientCystalLevels = config.get( + sectionSoulBinder.name, + "soulBinderPrecientCystalLevels", + soulBinderPrecientCystalLevels, + "The number of levels required to create an precient crystal.") + .getInt(soulBinderPrecientCystalLevels); + soulBinderReanimationLevels = config.get( + sectionSoulBinder.name, + "soulBinderReanimationLevels", + soulBinderReanimationLevels, + "The number of levels required to re-animate a mob head.") + .getInt(soulBinderReanimationLevels); + soulBinderBrokenSpawnerLevels = config.get( + sectionSoulBinder.name, + "soulBinderBrokenSpawnerLevels", + soulBinderBrokenSpawnerLevels, + "The number of levels required to change the type of a broken spawner.") + .getInt(soulBinderBrokenSpawnerLevels); + soulBinderEnderRailLevels = config.get( + sectionSoulBinder.name, + "soulBinderEnderRailLevels", + soulBinderEnderRailLevels, + "The number of levels required to create an ender rail.") + .getInt(soulBinderEnderRailLevels); + + soulBinderMaxXpLevel = config.get( + sectionSoulBinder.name, + "soulBinderMaxXPLevel", + soulBinderMaxXpLevel, + "Maximum level of XP the soul binder can contain.") + .getInt(); + + sliceAndSpliceLevelOnePowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelOnePowerPerTickRF", + sliceAndSpliceLevelOnePowerPerTickRF, + "The number of RF/t consumed by an unupgraded Slice'N'Splice") + .getInt(sliceAndSpliceLevelOnePowerPerTickRF); + sliceAndSpliceLevelTwoPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelTwoPowerPerTickRF", + sliceAndSpliceLevelTwoPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade.") + .getInt(sliceAndSpliceLevelTwoPowerPerTickRF); + sliceAndSpliceLevelThreePowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelThreePowerPerTickRF", + sliceAndSpliceLevelThreePowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade.") + .getInt(sliceAndSpliceLevelThreePowerPerTickRF); + sliceAndSpliceLevelFourPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelFourPowerPerTickRF", + sliceAndSpliceLevelFourPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an crystalline capacitor upgrade.") + .getInt(sliceAndSpliceLevelFourPowerPerTickRF); + sliceAndSpliceLevelFivePowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelFivePowerPerTickRF", + sliceAndSpliceLevelFivePowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an melodic capacitor upgrade.") + .getInt(sliceAndSpliceLevelFivePowerPerTickRF); + sliceAndSpliceLevelSixPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelSixPowerPerTickRF", + sliceAndSpliceLevelSixPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an stellar capacitor upgrade.") + .getInt(sliceAndSpliceLevelSixPowerPerTickRF); + sliceAndSpliceLevelSevenPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelSevenPowerPerTickRF", + sliceAndSpliceLevelSevenPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an totemic capacitor upgrade.") + .getInt(sliceAndSpliceLevelSevenPowerPerTickRF); + sliceAndSpliceLevelEightPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelEightPowerPerTickRF", + sliceAndSpliceLevelEightPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an silver capacitor upgrade.") + .getInt(sliceAndSpliceLevelEightPowerPerTickRF); + sliceAndSpliceLevelNinePowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelNinePowerPerTickRF", + sliceAndSpliceLevelNinePowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an endergetic capacitor upgrade.") + .getInt(sliceAndSpliceLevelNinePowerPerTickRF); + sliceAndSpliceLevelTenPowerPerTickRF = config.get( + sectionPower.name, + "sliceAndSpliceLevelTenPowerPerTickRF", + sliceAndSpliceLevelTenPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an endergised capacitor upgrade.") + .getInt(sliceAndSpliceLevelTenPowerPerTickRF); + + attractorRangeLevelOne = config.get( + sectionAttractor.name, + "attractorRangeLevelOne", + attractorRangeLevelOne, + "The range of the mob attractor with no upgrades") + .getInt(attractorRangeLevelOne); + attractorRangeLevelTwo = config.get( + sectionAttractor.name, + "attractorRangeLevelTwo", + attractorRangeLevelTwo, + "The range of the mob attractor with a double layer capacitor upgrade") + .getInt(attractorRangeLevelTwo); + attractorRangeLevelThree = config.get( + sectionAttractor.name, + "attractorRangeLevelThree", + attractorRangeLevelThree, + "The range of the mob attractor with an octadic capacitor upgrade") + .getInt(attractorRangeLevelThree); + attractorPowerPerTickLevelOne = config.get( + sectionAttractor.name, + "attractorPowerPerTickLevelOne", + attractorPowerPerTickLevelOne, + "The RF/t power use of a levele 1 mob attractor") + .getInt(attractorPowerPerTickLevelOne); + attractorPowerPerTickLevelTwo = config.get( + sectionAttractor.name, + "attractorPowerPerTickLevelTwo", + attractorPowerPerTickLevelTwo, + "The RF/t power use of a levele 2 mob attractor") + .getInt(attractorPowerPerTickLevelTwo); + attractorPowerPerTickLevelThree = config.get( + sectionAttractor.name, + "attractorPowerPerTickLevelThree", + attractorPowerPerTickLevelThree, + "The RF/t power use of a levele 3 mob attractor") + .getInt(attractorPowerPerTickLevelThree); + + spawnGuardRangeLevelOne = config.get( + sectionAttractor.name, + "spawnGuardRangeLevelOne", + spawnGuardRangeLevelOne, + "The range of the spawn guard with no upgrades") + .getInt(spawnGuardRangeLevelOne); + spawnGuardRangeLevelTwo = config.get( + sectionAttractor.name, + "spawnGuardRangeLevelTwo", + spawnGuardRangeLevelTwo, + "The range of the spawn guard with a double layer capacitor upgrade") + .getInt(spawnGuardRangeLevelTwo); + spawnGuardRangeLevelThree = config.get( + sectionAttractor.name, + "spawnGuardRangeLevelThree", + spawnGuardRangeLevelThree, + "The range of the spawn guard with an octadic capacitor upgrade") + .getInt(spawnGuardRangeLevelThree); + spawnGuardPowerPerTickLevelOne = config.get( + sectionAttractor.name, + "spawnGuardPowerPerTickLevelOne", + spawnGuardPowerPerTickLevelOne, + "The RF/t power use of a levele 1 spawn guard") + .getInt(spawnGuardPowerPerTickLevelOne); + spawnGuardPowerPerTickLevelTwo = config.get( + sectionAttractor.name, + "spawnGuardPowerPerTickLevelTwo", + spawnGuardPowerPerTickLevelTwo, + "The RF/t power use of a levele 2 spawn guard") + .getInt(spawnGuardPowerPerTickLevelTwo); + spawnGuardPowerPerTickLevelThree = config.get( + sectionAttractor.name, + "spawnGuardPowerPerTickLevelThree", + spawnGuardPowerPerTickLevelThree, + "The RF/t power use of a levele 3 spawn guard") + .getInt(spawnGuardPowerPerTickLevelThree); + spawnGuardStopAllSlimesDebug = config.getBoolean( + "spawnGuardStopAllSlimesDebug", + sectionAttractor.name, + spawnGuardStopAllSlimesDebug, + "When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds."); + spawnGuardStopAllSquidSpawning = config.getBoolean( + "spawnGuardStopAllSquidSpawning", + sectionAttractor.name, + spawnGuardStopAllSquidSpawning, + "When true no squid will be spawned."); + + weatherObeliskClearFluid = config.get( + sectionWeather.name, + "weatherObeliskClearFluid", + weatherObeliskClearFluid, + "The fluid required (in mB) to set the world to clear weather") + .getInt(); + weatherObeliskRainFluid = config.get( + sectionWeather.name, + "weatherObeliskRainFluid", + weatherObeliskRainFluid, + "The fluid required (in mB) to set the world to rainy weather") + .getInt(); + weatherObeliskThunderFluid = config.get( + sectionWeather.name, + "weatherObeliskThunderFluid", + weatherObeliskThunderFluid, + "The fluid required (in mB) to set the world to thundering weather") + .getInt(); + + // Loot Config + lootDarkSteel = config.getBoolean( + "lootDarkSteel", sectionLootConfig.name, lootDarkSteel, "Adds Darksteel Ingots to loot tables"); + lootItemConduitProbe = config.getBoolean( + "lootItemConduitProbe", + sectionLootConfig.name, + lootItemConduitProbe, + "Adds ItemConduitProbe to loot tables"); + lootQuartz = config.getBoolean("lootQuartz", sectionLootConfig.name, lootQuartz, "Adds quartz to loot tables"); + lootNetherWart = config.getBoolean( + "lootNetherWart", sectionLootConfig.name, lootNetherWart, "Adds nether wart to loot tables"); + lootEnderPearl = config.getBoolean( + "lootEnderPearl", sectionLootConfig.name, lootEnderPearl, "Adds ender pearls to loot tables"); + lootElectricSteel = config.getBoolean( + "lootElectricSteel", + sectionLootConfig.name, + lootElectricSteel, + "Adds Electric Steel Ingots to loot tables"); + lootRedstoneAlloy = config.getBoolean( + "lootRedstoneAlloy", + sectionLootConfig.name, + lootRedstoneAlloy, + "Adds Redstone Alloy Ingots to loot tables"); + lootPhasedIron = config.getBoolean( + "lootPhasedIron", sectionLootConfig.name, lootPhasedIron, "Adds Phased Iron Ingots to loot tables"); + lootPhasedGold = config.getBoolean( + "lootPhasedGold", sectionLootConfig.name, lootPhasedGold, "Adds Phased Gold Ingots to loot tables"); + lootTravelStaff = config.getBoolean( + "lootTravelStaff", sectionLootConfig.name, lootTravelStaff, "Adds Travel Staff to loot tables"); + lootTheEnder = config.getBoolean( + "lootTheEnder", sectionLootConfig.name, lootTheEnder, "Adds The Ender to loot tables"); + lootDarkSteelBoots = config.getBoolean( + "lootDarkSteelBoots", + sectionLootConfig.name, + lootDarkSteelBoots, + "Adds Darksteel Boots to loot tables"); + + enderRailEnabled = config.getBoolean( + "enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Whether Ender Rails are enabled"); + enderRailPowerRequireCrossDimensions = config.get( + sectionRailConfig.name, + "enderRailPowerRequireCrossDimensions", + enderRailPowerRequireCrossDimensions, + "The amount of power required to transport a cart across dimensions") + .getInt(enderRailPowerRequireCrossDimensions); + enderRailPowerRequiredPerBlock = config.get( + sectionRailConfig.name, + "enderRailPowerRequiredPerBlock", + enderRailPowerRequiredPerBlock, + "The amount of power required to teleport a cart per block in the same dimension") + .getInt(enderRailPowerRequiredPerBlock); + enderRailCapSameDimensionPowerAtCrossDimensionCost = config.getBoolean( + "enderRailCapSameDimensionPowerAtCrossDimensionCost", + sectionRailConfig.name, + enderRailCapSameDimensionPowerAtCrossDimensionCost, + "When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost"); + enderRailTicksBeforeForceSpawningLinkedCarts = config.get( + sectionRailConfig.name, + "enderRailTicksBeforeForceSpawningLinkedCarts", + enderRailTicksBeforeForceSpawningLinkedCarts, + "The number of ticks to wait for the track to clear before force spawning the next cart in a (RailCraft) linked set") + .getInt(enderRailTicksBeforeForceSpawningLinkedCarts); + enderRailTeleportPlayers = config.getBoolean( + "enderRailTeleportPlayers", + sectionRailConfig.name, + enderRailTeleportPlayers, + "If true player in minecarts will be teleported. WARN: WIP, seems to cause a memory leak."); + + dumpMobNames = config.getBoolean( + "dumpMobNames", + sectionMobConfig.name, + dumpMobNames, + "When set to true a list of all registered mobs will be dumped to config/enderio/mobTypes.txt The names are in the format required by EIOs mob blacklists."); + + xpObeliskMaxXpLevel = config.get( + sectionMisc.name, + "xpObeliskMaxXpLevel", + xpObeliskMaxXpLevel, + "Maximum level of XP the xp obelisk can contain.") + .getInt(); + xpJuiceName = config.getString( + "xpJuiceName", + sectionMisc.name, + xpJuiceName, + "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match with OpenBlocks when installed"); + + clearGlassSameTexture = config.getBoolean( + "clearGlassSameTexture", + sectionMisc.name, + clearGlassSameTexture, + "If true, quite clear glass will use the fused quartz border texture for the block instead of the white border."); + clearGlassConnectToFusedQuartz = config.getBoolean( + "clearGlassConnectToFusedQuartz", + sectionMisc.name, + clearGlassConnectToFusedQuartz, + "If true, quite clear glass will connect textures with fused quartz."); + + enchantmentSoulBoundEnabled = config.getBoolean( + "enchantmentSoulBoundEnabled", + sectionEnchantments.name, + enchantmentSoulBoundEnabled, + "If false the soul bound enchantment will not be available"); + enchantmentSoulBoundId = config.get( + sectionEnchantments.name, + "enchantmentSoulBoundId", + enchantmentSoulBoundId, + "The id of the enchantment. If set to -1 the lowest unassigned id will be used.") + .getInt(enchantmentSoulBoundId); + enchantmentSoulBoundWeight = config.get( + sectionEnchantments.name, + "enchantmentSoulBoundWeight", + enchantmentSoulBoundWeight, + "The chance of getting this enchantment in the enchantment table") + .getInt(enchantmentSoulBoundWeight); + + replaceWitherSkeletons = config.get( + sectionMisc.name, + "replaceWitherSkeletons", + replaceWitherSkeletons, + "Separates wither and normal skeletons into different entities, enables the powered spawner to treat them differently [EXPERIMENTAL - MAY CAUSE ISSUES WITH OTHER MODS]") + .getBoolean(); + + enableWaterFromBottles = config.get( + sectionMisc.name, + "enableWaterFromBottles", + enableWaterFromBottles, + "Enables emptying vanilla water bottles without breaking the bottle. In combination with a water source block this allows duping of water without cost.") + .getBoolean(); + + telepadLockDimension = config.get( + sectionTelepad.name, + "lockDimension", + telepadLockDimension, + "If true, the dimension cannot be set via the GUI, the coord selector must be used.") + .getBoolean(); + telepadLockCoords = config.get( + sectionTelepad.name, + "lockCoords", + telepadLockCoords, + "If true, the coordinates cannot be set via the GUI, the coord selector must be used.") + .getBoolean(); + telepadPowerCoefficient = config.get( + sectionTelepad.name, + "powerCoefficient", + telepadPowerCoefficient, + "Power for a teleport is calculated by the formula:\npower = [this value] * ln(0.005*distance + 1)") + .getInt(); + telepadPowerInterdimensional = config.get( + sectionTelepad.name, + "powerInterdimensional", + telepadPowerInterdimensional, + "The amount of RF required for an interdimensional teleport.") + .getInt(); + telepadPowerPerTickRF = config.get( + sectionTelepad.name, + "telepadPowerPerTickRF", + telepadPowerPerTickRF, + "The number of RF/t consumed by a telepad.") + .getInt(); + telepadPowerStorageRF = config.get( + sectionTelepad.name, + "telepadPowerStorageRF", + telepadPowerStorageRF, + "The amount of RF a telepad can store.") + .getInt(); + + inventoryPanelFree = config.getBoolean( + "inventoryPanelFree", + sectionInventoryPanel.name, + inventoryPanelFree, + "If true, the inv panel will not accept fluids and will be active permanently."); + inventoryPanelPowerPerMB = config.getFloat( + "powerPerMB", + sectionInventoryPanel.name, + inventoryPanelPowerPerMB, + 1.0f, + 10000.0f, + "Internal power generated per mB. The default of 800/mB matches the RF generation of the Zombie generator. A panel tries to refill only once every second - setting this value too low slows down the scanning speed."); + inventoryPanelScanCostPerSlot = config.getFloat( + "scanCostPerSlot", + sectionInventoryPanel.name, + inventoryPanelScanCostPerSlot, + 0.0f, + 10.0f, + "Internal power used for scanning a slot"); + inventoryPanelExtractCostPerItem = config.getFloat( + "extractCostPerItem", + sectionInventoryPanel.name, + inventoryPanelExtractCostPerItem, + 0.0f, + 10.0f, + "Internal power used per item extracted (not a stack of items)"); + inventoryPanelExtractCostPerOperation = config.getFloat( + "extractCostPerOperation", + sectionInventoryPanel.name, + inventoryPanelExtractCostPerOperation, + 0.0f, + 10000.0f, + "Internal power used per extract operation (independent of stack size)"); } - } - public static ItemStack getStackForString(String s) { - String[] nameAndMeta = s.split(";"); - int meta = nameAndMeta.length == 1 ? 0 : Integer.parseInt(nameAndMeta[1]); - String[] data = nameAndMeta[0].split(":"); - ItemStack stack = GameRegistry.findItemStack(data[0], data[1], 1); - if(stack == null) { - return null; + public static void checkYetaAccess() { + if (!useSneakMouseWheelYetaWrench && !useSneakRightClickYetaWrench) { + Log.warn( + "Both useSneakMouseWheelYetaWrench and useSneakRightClickYetaWrench are set to false. Enabling right click."); + useSneakRightClickYetaWrench = true; + } } - stack.setItemDamage(meta); - return stack; - } - private Config() { - } + public static void init() {} + + public static void postInit() { + for (String s : hoeStrings) { + ItemStack hoe = getStackForString(s); + if (hoe != null) { + farmHoes.add(hoe); + } + } + } + + public static ItemStack getStackForString(String s) { + String[] nameAndMeta = s.split(";"); + int meta = nameAndMeta.length == 1 ? 0 : Integer.parseInt(nameAndMeta[1]); + String[] data = nameAndMeta[0].split(":"); + ItemStack stack = GameRegistry.findItemStack(data[0], data[1], 1); + if (stack == null) { + return null; + } + stack.setItemDamage(meta); + return stack; + } + + private Config() {} } diff --git a/src/main/java/crazypants/enderio/config/ConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/ConfigFactoryEIO.java index 025758e1..a1840db5 100644 --- a/src/main/java/crazypants/enderio/config/ConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/ConfigFactoryEIO.java @@ -1,30 +1,29 @@ package crazypants.enderio.config; +import cpw.mods.fml.client.IModGuiFactory; import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; -public class ConfigFactoryEIO implements IModGuiFactory{ +public class ConfigFactoryEIO implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) { - ; - } + @Override + public void initialize(Minecraft minecraftInstance) { + ; + } - @Override - public Class mainConfigGuiClass() { - return GuiConfigFactoryEIO.class; - } + @Override + public Class mainConfigGuiClass() { + return GuiConfigFactoryEIO.class; + } - @Override - public Set runtimeGuiCategories() { - return null; - } + @Override + public Set runtimeGuiCategories() { + return null; + } - @Override - public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { - return null; - } + @Override + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { + return null; + } } diff --git a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java index d49176aa..88dcf523 100644 --- a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java @@ -1,33 +1,39 @@ package crazypants.enderio.config; -import java.util.ArrayList; -import java.util.List; +import static crazypants.enderio.config.Config.config; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigCategory; -import net.minecraftforge.common.config.ConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config.Section; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigCategory; +import net.minecraftforge.common.config.ConfigElement; -import static crazypants.enderio.config.Config.config; - -@SuppressWarnings({ "rawtypes" }) +@SuppressWarnings({"rawtypes"}) public class GuiConfigFactoryEIO extends GuiConfig { - public GuiConfigFactoryEIO(GuiScreen parentScreen) { - super(parentScreen, getConfigElements(parentScreen), EnderIO.MODID, false, false, EnderIO.lang.localize("config.title")); - } - - private static List getConfigElements(GuiScreen parent) { - List list = new ArrayList(); - String prefix = EnderIO.lang.addPrefix("config."); - - for (Section section : Config.sections) { - list.add(new ConfigElement(config.getCategory(section.lc()).setLanguageKey(prefix + section.lang))); + public GuiConfigFactoryEIO(GuiScreen parentScreen) { + super( + parentScreen, + getConfigElements(parentScreen), + EnderIO.MODID, + false, + false, + EnderIO.lang.localize("config.title")); } - return list; - } + private static List getConfigElements(GuiScreen parent) { + List list = new ArrayList(); + String prefix = EnderIO.lang.addPrefix("config."); + + for (Section section : Config.sections) { + list.add(new ConfigElement( + config.getCategory(section.lc()).setLanguageKey(prefix + section.lang))); + } + + return list; + } } diff --git a/src/main/java/crazypants/enderio/config/PacketConfigSync.java b/src/main/java/crazypants/enderio/config/PacketConfigSync.java index 49fdc12a..fc9f67c7 100644 --- a/src/main/java/crazypants/enderio/config/PacketConfigSync.java +++ b/src/main/java/crazypants/enderio/config/PacketConfigSync.java @@ -1,9 +1,9 @@ package crazypants.enderio.config; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; /** * Syncs some configs that are only used clientside, but must use the serverside @@ -11,40 +11,40 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; */ public class PacketConfigSync implements IMessage, IMessageHandler { - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(Config.travelAnchorEnabled); - buf.writeInt(Config.travelAnchorMaxDistance); - buf.writeBoolean(Config.travelStaffEnabled); - buf.writeBoolean(Config.travelStaffBlinkEnabled); - buf.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled); - buf.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled); - buf.writeInt(Config.travelStaffBlinkPauseTicks); - buf.writeInt(Config.travelStaffMaxDistance); - buf.writeInt(Config.travelStaffMaxBlinkDistance); - buf.writeFloat(Config.travelStaffPowerPerBlockRF); - buf.writeBoolean(Config.telepadLockCoords); - buf.writeBoolean(Config.telepadLockDimension); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(Config.travelAnchorEnabled); + buf.writeInt(Config.travelAnchorMaxDistance); + buf.writeBoolean(Config.travelStaffEnabled); + buf.writeBoolean(Config.travelStaffBlinkEnabled); + buf.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled); + buf.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled); + buf.writeInt(Config.travelStaffBlinkPauseTicks); + buf.writeInt(Config.travelStaffMaxDistance); + buf.writeInt(Config.travelStaffMaxBlinkDistance); + buf.writeFloat(Config.travelStaffPowerPerBlockRF); + buf.writeBoolean(Config.telepadLockCoords); + buf.writeBoolean(Config.telepadLockDimension); + } - @Override - public void fromBytes(ByteBuf data) { - Config.travelAnchorEnabled = data.readBoolean(); - Config.travelAnchorMaxDistance = data.readInt(); - Config.travelStaffEnabled = data.readBoolean(); - Config.travelStaffBlinkEnabled = data.readBoolean(); - Config.travelStaffBlinkThroughSolidBlocksEnabled = data.readBoolean(); - Config.travelStaffBlinkThroughClearBlocksEnabled = data.readBoolean(); - Config.travelStaffBlinkPauseTicks = data.readInt(); - Config.travelStaffMaxDistance = data.readInt(); - Config.travelStaffMaxBlinkDistance = data.readInt(); - Config.travelStaffPowerPerBlockRF = data.readFloat(); - Config.telepadLockCoords = data.readBoolean(); - Config.telepadLockDimension = data.readBoolean(); - } + @Override + public void fromBytes(ByteBuf data) { + Config.travelAnchorEnabled = data.readBoolean(); + Config.travelAnchorMaxDistance = data.readInt(); + Config.travelStaffEnabled = data.readBoolean(); + Config.travelStaffBlinkEnabled = data.readBoolean(); + Config.travelStaffBlinkThroughSolidBlocksEnabled = data.readBoolean(); + Config.travelStaffBlinkThroughClearBlocksEnabled = data.readBoolean(); + Config.travelStaffBlinkPauseTicks = data.readInt(); + Config.travelStaffMaxDistance = data.readInt(); + Config.travelStaffMaxBlinkDistance = data.readInt(); + Config.travelStaffPowerPerBlockRF = data.readFloat(); + Config.telepadLockCoords = data.readBoolean(); + Config.telepadLockDimension = data.readBoolean(); + } - @Override - public IMessage onMessage(PacketConfigSync message, MessageContext ctx) { - return null; - } + @Override + public IMessage onMessage(PacketConfigSync message, MessageContext ctx) { + return null; + } } diff --git a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java index 44b20229..4831c95e 100644 --- a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java +++ b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java @@ -1,7 +1,12 @@ package crazypants.enderio.enchantment; +import com.enderio.core.api.common.enchant.IAdvancedEnchant; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.util.GalacticraftUtil; import java.util.ListIterator; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; @@ -17,177 +22,167 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import com.enderio.core.api.common.enchant.IAdvancedEnchant; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; -import crazypants.util.BaublesUtil; -import crazypants.util.GalacticraftUtil; - public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchant { - public static EnchantmentSoulBound create(int id) { - EnchantmentSoulBound res = new EnchantmentSoulBound(id); - MinecraftForge.EVENT_BUS.register(res); - return res; - } - - private final int id; - - private EnchantmentSoulBound(int id) { - super(id, Config.enchantmentSoulBoundWeight, EnumEnchantmentType.all); - this.id = id; - setName("enderio.soulBound"); - } - - @Override - public int getMaxEnchantability(int level) { - return super.getMaxEnchantability(level) + 30; - } - - @Override - public int getMinEnchantability(int level) { - return super.getMinEnchantability(level); - } - - @Override - public int getMaxLevel() { - return 1; - } - - /* - * This is called the moment the player dies and drops his stuff. - * - * We go early, so we can get our items before other mods put them into some - * grave. Also remove them from the list so they won't get duped. If the - * inventory overflows, e.g. because everything there and the armor is - * soulbound, let the remainder be dropped/graved. - */ - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerDeath(PlayerDropsEvent evt) { - if (evt.entityPlayer == null || evt.entityPlayer instanceof FakePlayer || evt.isCanceled()) { - return; - } - if(evt.entityPlayer.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { - return; + public static EnchantmentSoulBound create(int id) { + EnchantmentSoulBound res = new EnchantmentSoulBound(id); + MinecraftForge.EVENT_BUS.register(res); + return res; } - ListIterator iter = evt.drops.listIterator(); - while (iter.hasNext()) { - EntityItem ei = iter.next(); - ItemStack item = ei.getEntityItem(); - if(isSoulBound(item)) { - if (addToPlayerInventory(evt.entityPlayer, item)) { - iter.remove(); + private final int id; + + private EnchantmentSoulBound(int id) { + super(id, Config.enchantmentSoulBoundWeight, EnumEnchantmentType.all); + this.id = id; + setName("enderio.soulBound"); + } + + @Override + public int getMaxEnchantability(int level) { + return super.getMaxEnchantability(level) + 30; + } + + @Override + public int getMinEnchantability(int level) { + return super.getMinEnchantability(level); + } + + @Override + public int getMaxLevel() { + return 1; + } + + /* + * This is called the moment the player dies and drops his stuff. + * + * We go early, so we can get our items before other mods put them into some + * grave. Also remove them from the list so they won't get duped. If the + * inventory overflows, e.g. because everything there and the armor is + * soulbound, let the remainder be dropped/graved. + */ + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void onPlayerDeath(PlayerDropsEvent evt) { + if (evt.entityPlayer == null || evt.entityPlayer instanceof FakePlayer || evt.isCanceled()) { + return; } - } - } - - // Note: Baubles will also add its items to evt.drops, but later. We cannot - // wait for that because gravestone mods also listen to this event. So we have - // to fetch Baubles items ourselves here. - // For the same reason we cannot put the items into Baubles slots. - /*IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer); - if (baubles != null) { - for (int i = 0; i < baubles.getSizeInventory(); i++) { - ItemStack item = baubles.getStackInSlot(i); - if(isSoulBound(item)) { - if (addToPlayerInventory(evt.entityPlayer, item)) { - baubles.setInventorySlotContents(i, null); - } + if (evt.entityPlayer.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { + return; } - } - }*/ - // Galacticraft. Again we are too early for those items. We just dump the - // stuff into the normal inventory to not have to keep a separate list. - if (evt.entityPlayer instanceof EntityPlayerMP) { - IInventory galacticraft = GalacticraftUtil.getGCInventoryForPlayer((EntityPlayerMP) evt.entityPlayer); - if (galacticraft != null) { - for (int i = 0; i < galacticraft.getSizeInventory(); i++) { - ItemStack item = galacticraft.getStackInSlot(i); - if (isSoulBound(item)) { - if (addToPlayerInventory(evt.entityPlayer, item)) { - galacticraft.setInventorySlotContents(i, null); + ListIterator iter = evt.drops.listIterator(); + while (iter.hasNext()) { + EntityItem ei = iter.next(); + ItemStack item = ei.getEntityItem(); + if (isSoulBound(item)) { + if (addToPlayerInventory(evt.entityPlayer, item)) { + iter.remove(); + } + } + } + + // Note: Baubles will also add its items to evt.drops, but later. We cannot + // wait for that because gravestone mods also listen to this event. So we have + // to fetch Baubles items ourselves here. + // For the same reason we cannot put the items into Baubles slots. + /*IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer); + if (baubles != null) { + for (int i = 0; i < baubles.getSizeInventory(); i++) { + ItemStack item = baubles.getStackInSlot(i); + if(isSoulBound(item)) { + if (addToPlayerInventory(evt.entityPlayer, item)) { + baubles.setInventorySlotContents(i, null); + } } } + }*/ + + // Galacticraft. Again we are too early for those items. We just dump the + // stuff into the normal inventory to not have to keep a separate list. + if (evt.entityPlayer instanceof EntityPlayerMP) { + IInventory galacticraft = GalacticraftUtil.getGCInventoryForPlayer((EntityPlayerMP) evt.entityPlayer); + if (galacticraft != null) { + for (int i = 0; i < galacticraft.getSizeInventory(); i++) { + ItemStack item = galacticraft.getStackInSlot(i); + if (isSoulBound(item)) { + if (addToPlayerInventory(evt.entityPlayer, item)) { + galacticraft.setInventorySlotContents(i, null); + } + } + } + } } - } } - } - - /* - * This is called when the user presses the "respawn" button. The original - * inventory would be empty, but onPlayerDeath() above placed items in it. - * - * Note: Without other death-modifying mods, the content of the old inventory - * would always fit into the new one (both being empty but for soulbound items - * in the old one) and the old one would be discarded just after this method. - * But better play it safe and assume that an overflow is possible and that - * another mod may move stuff out of the old inventory, too. - */ - @SubscribeEvent - public void onPlayerClone(PlayerEvent.Clone evt) { - if (!evt.wasDeath || evt.isCanceled()) { - return; - } - if(evt.original == null || evt.entityPlayer == null || evt.entityPlayer instanceof FakePlayer) { - return; - } - if(evt.entityPlayer.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { - return; - } - for (int i = 0; i < evt.original.inventory.mainInventory.length; i++) { - ItemStack item = evt.original.inventory.mainInventory[i]; - if(isSoulBound(item)) { - if (addToPlayerInventory(evt.entityPlayer, item)) { - evt.original.inventory.mainInventory[i] = null; + /* + * This is called when the user presses the "respawn" button. The original + * inventory would be empty, but onPlayerDeath() above placed items in it. + * + * Note: Without other death-modifying mods, the content of the old inventory + * would always fit into the new one (both being empty but for soulbound items + * in the old one) and the old one would be discarded just after this method. + * But better play it safe and assume that an overflow is possible and that + * another mod may move stuff out of the old inventory, too. + */ + @SubscribeEvent + public void onPlayerClone(PlayerEvent.Clone evt) { + if (!evt.wasDeath || evt.isCanceled()) { + return; } - } - } - for (int i = 0; i < evt.original.inventory.armorInventory.length; i++) { - ItemStack item = evt.original.inventory.armorInventory[i]; - if(isSoulBound(item)) { - if (addToPlayerInventory(evt.entityPlayer, item)) { - evt.original.inventory.armorInventory[i] = null; + if (evt.original == null || evt.entityPlayer == null || evt.entityPlayer instanceof FakePlayer) { + return; + } + if (evt.entityPlayer.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { + return; + } + for (int i = 0; i < evt.original.inventory.mainInventory.length; i++) { + ItemStack item = evt.original.inventory.mainInventory[i]; + if (isSoulBound(item)) { + if (addToPlayerInventory(evt.entityPlayer, item)) { + evt.original.inventory.mainInventory[i] = null; + } + } + } + for (int i = 0; i < evt.original.inventory.armorInventory.length; i++) { + ItemStack item = evt.original.inventory.armorInventory[i]; + if (isSoulBound(item)) { + if (addToPlayerInventory(evt.entityPlayer, item)) { + evt.original.inventory.armorInventory[i] = null; + } + } } - } - } - } - - private boolean isSoulBound(ItemStack item) { - return EnchantmentHelper.getEnchantmentLevel(id, item) > 0; - } - - private boolean addToPlayerInventory(EntityPlayer entityPlayer, ItemStack item) { - if(item == null || entityPlayer == null) { - return false; - } - if(item.getItem() instanceof ItemArmor) { - ItemArmor arm = (ItemArmor) item.getItem(); - int index = 3 - arm.armorType; - if(entityPlayer.inventory.armorItemInSlot(index) == null) { - entityPlayer.inventory.armorInventory[index] = item; - return true; - } } - InventoryPlayer inv = entityPlayer.inventory; - for (int i = 0; i < inv.mainInventory.length; i++) { - if(inv.mainInventory[i] == null) { - inv.mainInventory[i] = item.copy(); - return true; - } + private boolean isSoulBound(ItemStack item) { + return EnchantmentHelper.getEnchantmentLevel(id, item) > 0; } - return false; - } + private boolean addToPlayerInventory(EntityPlayer entityPlayer, ItemStack item) { + if (item == null || entityPlayer == null) { + return false; + } + if (item.getItem() instanceof ItemArmor) { + ItemArmor arm = (ItemArmor) item.getItem(); + int index = 3 - arm.armorType; + if (entityPlayer.inventory.armorItemInSlot(index) == null) { + entityPlayer.inventory.armorInventory[index] = item; + return true; + } + } - @Override - public String[] getTooltipDetails(ItemStack stack) { - return new String[] { EnderIO.lang.localizeExact("description.enchantment.enderio.soulBound") }; - } + InventoryPlayer inv = entityPlayer.inventory; + for (int i = 0; i < inv.mainInventory.length; i++) { + if (inv.mainInventory[i] == null) { + inv.mainInventory[i] = item.copy(); + return true; + } + } + + return false; + } + + @Override + public String[] getTooltipDetails(ItemStack stack) { + return new String[] {EnderIO.lang.localizeExact("description.enchantment.enderio.soulBound")}; + } } diff --git a/src/main/java/crazypants/enderio/enchantment/Enchantments.java b/src/main/java/crazypants/enderio/enchantment/Enchantments.java index c1718133..8100b081 100644 --- a/src/main/java/crazypants/enderio/enchantment/Enchantments.java +++ b/src/main/java/crazypants/enderio/enchantment/Enchantments.java @@ -1,44 +1,43 @@ package crazypants.enderio.enchantment; -import net.minecraft.enchantment.Enchantment; import crazypants.enderio.Log; import crazypants.enderio.config.Config; +import net.minecraft.enchantment.Enchantment; public class Enchantments { - private static Enchantments instance; + private static Enchantments instance; - public static Enchantments getInstance() { - if(instance == null) { - instance = new Enchantments(); - instance.registerEnchantments(); + public static Enchantments getInstance() { + if (instance == null) { + instance = new Enchantments(); + instance.registerEnchantments(); + } + return instance; } - return instance; - } - private EnchantmentSoulBound soulBound; + private EnchantmentSoulBound soulBound; - private void registerEnchantments() { - if(Config.enchantmentSoulBoundEnabled) { - int id = Config.enchantmentSoulBoundId; - if(id < 0) { - id = getEmptyEnchantId(); - } - if(id < 0) { - Log.error("Could not find an empty enchantment ID to add enchanments"); - return; - } - soulBound = EnchantmentSoulBound.create(id); + private void registerEnchantments() { + if (Config.enchantmentSoulBoundEnabled) { + int id = Config.enchantmentSoulBoundId; + if (id < 0) { + id = getEmptyEnchantId(); + } + if (id < 0) { + Log.error("Could not find an empty enchantment ID to add enchanments"); + return; + } + soulBound = EnchantmentSoulBound.create(id); + } } - } - private int getEmptyEnchantId() { - for (int i = 0; i < Enchantment.enchantmentsList.length; i++) { - if(Enchantment.enchantmentsList[i] == null) { - return i; - } + private int getEmptyEnchantId() { + for (int i = 0; i < Enchantment.enchantmentsList.length; i++) { + if (Enchantment.enchantmentsList[i] == null) { + return i; + } + } + return -1; } - return -1; - } - } diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index f65503cc..d72b1269 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -1,16 +1,6 @@ package crazypants.enderio.enderface; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; @@ -20,105 +10,120 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { - public static BlockEnderIO create() { + public static BlockEnderIO create() { - PacketHandler.INSTANCE.registerMessage(PacketOpenServerGUI.class, PacketOpenServerGUI.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketLockClientContainer.Handler.class, PacketLockClientContainer.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketOpenServerGUI.class, PacketOpenServerGUI.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketLockClientContainer.Handler.class, + PacketLockClientContainer.class, + PacketHandler.nextID(), + Side.CLIENT); - BlockEnderIO result = new BlockEnderIO(); - result.init(); - return result; - } - - @SideOnly(Side.CLIENT) - IIcon frameIcon; - @SideOnly(Side.CLIENT) - IIcon selectedOverlayIcon; - @SideOnly(Side.CLIENT) - IIcon highlightOverlayIcon; - - static int pass; - - private BlockEnderIO() { - super(ModObject.blockEnderIo.unlocalisedName, TileEnderIO.class); - } - - @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return 1; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack item) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnderIO) { - TileEnderIO eio = (TileEnderIO) te; - eio.initUiPitch = -player.rotationPitch; - eio.initUiYaw = -player.rotationYaw + 180; - eio.lastUiPitch = eio.initUiPitch; - eio.lastUiYaw = eio.initUiYaw; - if(player instanceof EntityPlayer) { - eio.setPlacedBy((EntityPlayer) player); - } - world.markBlockForUpdate(x, y, z); + BlockEnderIO result = new BlockEnderIO(); + result.init(); + return result; } - } - @Override - public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if(ta.canUiBeAccessed(entityPlayer)) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } else { - BlockTravelAnchor.sendPrivateChatMessage(entityPlayer, ta.getOwner()); - } - return true; + @SideOnly(Side.CLIENT) + IIcon frameIcon; + + @SideOnly(Side.CLIENT) + IIcon selectedOverlayIcon; + + @SideOnly(Side.CLIENT) + IIcon highlightOverlayIcon; + + static int pass; + + private BlockEnderIO() { + super(ModObject.blockEnderIo.unlocalisedName, TileEnderIO.class); } - return false; - } - @Override - public boolean renderAsNormalBlock() { - return false; - } + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; + } - @Override - public boolean isOpaqueCube() { - return false; - } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack item) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEnderIO) { + TileEnderIO eio = (TileEnderIO) te; + eio.initUiPitch = -player.rotationPitch; + eio.initUiYaw = -player.rotationYaw + 180; + eio.lastUiPitch = eio.initUiPitch; + eio.lastUiYaw = eio.initUiYaw; + if (player instanceof EntityPlayer) { + eio.setPlacedBy((EntityPlayer) player); + } + world.markBlockForUpdate(x, y, z); + } + } - @Override - public int getRenderType() { - return -1; - } + @Override + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (ta.canUiBeAccessed(entityPlayer)) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); + } else { + BlockTravelAnchor.sendPrivateChatMessage(entityPlayer, ta.getOwner()); + } + return true; + } + return false; + } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return 13; - } + @Override + public boolean renderAsNormalBlock() { + return false; + } - @Override - public int getLightOpacity() { - return 100; - } + @Override + public boolean isOpaqueCube() { + return false; + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - frameIcon = iIconRegister.registerIcon("enderio:enderIOFrame"); - highlightOverlayIcon = iIconRegister.registerIcon("enderio:enderIOHighlight"); - selectedOverlayIcon = iIconRegister.registerIcon("enderio:enderIOSelected"); - } + @Override + public int getRenderType() { + return -1; + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + return 13; + } + + @Override + public int getLightOpacity() { + return 100; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + frameIcon = iIconRegister.registerIcon("enderio:enderIOFrame"); + highlightOverlayIcon = iIconRegister.registerIcon("enderio:enderIOHighlight"); + selectedOverlayIcon = iIconRegister.registerIcon("enderio:enderIOSelected"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/enderface/ContainerWrapper.java b/src/main/java/crazypants/enderio/enderface/ContainerWrapper.java index 96555f2c..af883409 100644 --- a/src/main/java/crazypants/enderio/enderface/ContainerWrapper.java +++ b/src/main/java/crazypants/enderio/enderface/ContainerWrapper.java @@ -4,109 +4,109 @@ import net.minecraft.inventory.Slot; public class ContainerWrapper extends net.minecraft.inventory.Container { - public net.minecraft.inventory.Container wrapped; + public net.minecraft.inventory.Container wrapped; - public ContainerWrapper(net.minecraft.inventory.Container wrapped) { - this.wrapped = wrapped; - this.inventoryItemStacks = wrapped.inventoryItemStacks; - this.inventorySlots = wrapped.inventorySlots; - this.windowId = wrapped.windowId; - } + public ContainerWrapper(net.minecraft.inventory.Container wrapped) { + this.wrapped = wrapped; + this.inventoryItemStacks = wrapped.inventoryItemStacks; + this.inventorySlots = wrapped.inventorySlots; + this.windowId = wrapped.windowId; + } - @Override - public boolean canDragIntoSlot(Slot par1Slot) { - return wrapped.canDragIntoSlot(par1Slot); - } + @Override + public boolean canDragIntoSlot(Slot par1Slot) { + return wrapped.canDragIntoSlot(par1Slot); + } - @Override - public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer arg0) { - return true; - } + @Override + public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer arg0) { + return true; + } - @Override - public net.minecraft.inventory.Slot getSlot(int arg0) { - return wrapped.getSlot(arg0); - } + @Override + public net.minecraft.inventory.Slot getSlot(int arg0) { + return wrapped.getSlot(arg0); + } - @SuppressWarnings("rawtypes") - @Override - public java.util.List getInventory() { - return wrapped.getInventory(); - } + @SuppressWarnings("rawtypes") + @Override + public java.util.List getInventory() { + return wrapped.getInventory(); + } - @Override - public boolean enchantItem(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { - return wrapped.enchantItem(arg0, arg1); - } + @Override + public boolean enchantItem(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { + return wrapped.enchantItem(arg0, arg1); + } - @Override - public net.minecraft.item.ItemStack slotClick(int arg0, int arg1, int arg2, net.minecraft.entity.player.EntityPlayer arg3) { - return wrapped.slotClick(arg0, arg1, arg2, arg3); - } + @Override + public net.minecraft.item.ItemStack slotClick( + int arg0, int arg1, int arg2, net.minecraft.entity.player.EntityPlayer arg3) { + return wrapped.slotClick(arg0, arg1, arg2, arg3); + } - @Override - public boolean func_94530_a(net.minecraft.item.ItemStack arg0, net.minecraft.inventory.Slot arg1) { - return wrapped.func_94530_a(arg0, arg1); - } + @Override + public boolean func_94530_a(net.minecraft.item.ItemStack arg0, net.minecraft.inventory.Slot arg1) { + return wrapped.func_94530_a(arg0, arg1); + } - @Override - public void addCraftingToCrafters(net.minecraft.inventory.ICrafting arg0) { - wrapped.addCraftingToCrafters(arg0); - } + @Override + public void addCraftingToCrafters(net.minecraft.inventory.ICrafting arg0) { + wrapped.addCraftingToCrafters(arg0); + } - @Override - public void detectAndSendChanges() { - wrapped.detectAndSendChanges(); - } + @Override + public void detectAndSendChanges() { + wrapped.detectAndSendChanges(); + } - @Override - public void removeCraftingFromCrafters(net.minecraft.inventory.ICrafting arg0) { - wrapped.removeCraftingFromCrafters(arg0); - } + @Override + public void removeCraftingFromCrafters(net.minecraft.inventory.ICrafting arg0) { + wrapped.removeCraftingFromCrafters(arg0); + } - @Override - public net.minecraft.inventory.Slot getSlotFromInventory(net.minecraft.inventory.IInventory arg0, int arg1) { - return wrapped.getSlotFromInventory(arg0, arg1); - } + @Override + public net.minecraft.inventory.Slot getSlotFromInventory(net.minecraft.inventory.IInventory arg0, int arg1) { + return wrapped.getSlotFromInventory(arg0, arg1); + } - @Override - public net.minecraft.item.ItemStack transferStackInSlot(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { - return wrapped.transferStackInSlot(arg0, arg1); - } + @Override + public net.minecraft.item.ItemStack transferStackInSlot(net.minecraft.entity.player.EntityPlayer arg0, int arg1) { + return wrapped.transferStackInSlot(arg0, arg1); + } - @Override - public void onCraftMatrixChanged(net.minecraft.inventory.IInventory arg0) { - wrapped.onCraftMatrixChanged(arg0); - } + @Override + public void onCraftMatrixChanged(net.minecraft.inventory.IInventory arg0) { + wrapped.onCraftMatrixChanged(arg0); + } - @Override - public void putStackInSlot(int arg0, net.minecraft.item.ItemStack arg1) { - wrapped.putStackInSlot(arg0, arg1); - } + @Override + public void putStackInSlot(int arg0, net.minecraft.item.ItemStack arg1) { + wrapped.putStackInSlot(arg0, arg1); + } - @Override - public void putStacksInSlots(net.minecraft.item.ItemStack[] arg0) { - wrapped.putStacksInSlots(arg0); - } + @Override + public void putStacksInSlots(net.minecraft.item.ItemStack[] arg0) { + wrapped.putStacksInSlots(arg0); + } - @Override - public void updateProgressBar(int arg0, int arg1) { - wrapped.updateProgressBar(arg0, arg1); - } + @Override + public void updateProgressBar(int arg0, int arg1) { + wrapped.updateProgressBar(arg0, arg1); + } - @Override - public short getNextTransactionID(net.minecraft.entity.player.InventoryPlayer arg0) { - return wrapped.getNextTransactionID(arg0); - } + @Override + public short getNextTransactionID(net.minecraft.entity.player.InventoryPlayer arg0) { + return wrapped.getNextTransactionID(arg0); + } - @Override - public boolean isPlayerNotUsingContainer(net.minecraft.entity.player.EntityPlayer arg0) { - return wrapped.isPlayerNotUsingContainer(arg0); - } - - @Override - public void setPlayerIsPresent(net.minecraft.entity.player.EntityPlayer arg0, boolean arg1) { - wrapped.setPlayerIsPresent(arg0, arg1); - } + @Override + public boolean isPlayerNotUsingContainer(net.minecraft.entity.player.EntityPlayer arg0) { + return wrapped.isPlayerNotUsingContainer(arg0); + } + @Override + public void setPlayerIsPresent(net.minecraft.entity.player.EntityPlayer arg0, boolean arg1) { + wrapped.setPlayerIsPresent(arg0, arg1); + } } diff --git a/src/main/java/crazypants/enderio/enderface/EnderIOController.java b/src/main/java/crazypants/enderio/enderface/EnderIOController.java index d591ecca..00e2fe3a 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIOController.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIOController.java @@ -1,67 +1,66 @@ package crazypants.enderio.enderface; +import com.enderio.core.common.Handlers.Handler; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import gnu.trove.map.TObjectIntMap; import gnu.trove.map.hash.TObjectIntHashMap; - import java.util.UUID; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerPlayer; import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent; -import com.enderio.core.common.Handlers.Handler; - -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; - @Handler public enum EnderIOController { - INSTANCE; + INSTANCE; - private TObjectIntMap openedContainers = new TObjectIntHashMap(); - private int clientWindowId; - private boolean locked = false; - - public void addContainer(EntityPlayerMP player, Container opened) { - openedContainers.put(player.getGameProfile().getId(), opened.windowId); - } + private TObjectIntMap openedContainers = new TObjectIntHashMap(); + private int clientWindowId; + private boolean locked = false; - void lockAndWaitForChange(int windowId) { - clientWindowId = windowId; - locked = true; - } - - void unlock() { - locked = false; - } - - @SubscribeEvent - public void onContainerTick(PlayerOpenContainerEvent event) { - Container c = event.entityPlayer.openContainer; - if (c != null && !(c instanceof ContainerPlayer) && (c.windowId == clientWindowId || openedContainers.containsValue(c.windowId))) { - event.setResult(Result.ALLOW); + public void addContainer(EntityPlayerMP player, Container opened) { + openedContainers.put(player.getGameProfile().getId(), opened.windowId); } - } - @SubscribeEvent - public void onPlayerTick(PlayerTickEvent event) { - if (event.phase == Phase.END) { - if (event.side.isServer()) { - int windowId = openedContainers.get(event.player.getGameProfile().getId()); - if (event.player.openContainer == null || event.player.openContainer.windowId != windowId) { - openedContainers.remove(event.player.getGameProfile().getId()); - } - } else { - int windowId = event.player.openContainer.windowId; - if (windowId != clientWindowId && locked) { - clientWindowId = windowId; - locked = false; - System.out.println("Unlocked and set windowId to " + clientWindowId); - } - } + void lockAndWaitForChange(int windowId) { + clientWindowId = windowId; + locked = true; + } + + void unlock() { + locked = false; + } + + @SubscribeEvent + public void onContainerTick(PlayerOpenContainerEvent event) { + Container c = event.entityPlayer.openContainer; + if (c != null + && !(c instanceof ContainerPlayer) + && (c.windowId == clientWindowId || openedContainers.containsValue(c.windowId))) { + event.setResult(Result.ALLOW); + } + } + + @SubscribeEvent + public void onPlayerTick(PlayerTickEvent event) { + if (event.phase == Phase.END) { + if (event.side.isServer()) { + int windowId = + openedContainers.get(event.player.getGameProfile().getId()); + if (event.player.openContainer == null || event.player.openContainer.windowId != windowId) { + openedContainers.remove(event.player.getGameProfile().getId()); + } + } else { + int windowId = event.player.openContainer.windowId; + if (windowId != clientWindowId && locked) { + clientWindowId = windowId; + locked = false; + System.out.println("Unlocked and set windowId to " + clientWindowId); + } + } + } } - } } diff --git a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java index 8369f162..82e65302 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java +++ b/src/main/java/crazypants/enderio/enderface/EnderIoRenderer.java @@ -1,5 +1,15 @@ package crazypants.enderio.enderface; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,149 +19,130 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Matrix4d; -import com.enderio.core.common.vecmath.VecmathUtil; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; - @SideOnly(Side.CLIENT) public class EnderIoRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private TravelEntitySpecialRenderer selectionRenderer = new TravelEntitySpecialRenderer() { - protected void renderBlock() { + private TravelEntitySpecialRenderer selectionRenderer = new TravelEntitySpecialRenderer() { + protected void renderBlock() {} + + @Override + public IIcon getSelectedIcon() { + return EnderIO.blockEnderIo.selectedOverlayIcon; + } + + @Override + public IIcon getHighlightIcon() { + return EnderIO.blockEnderIo.highlightOverlayIcon; + } + }; + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { + + EntityLivingBase entityPlayer = Minecraft.getMinecraft().thePlayer; + Matrix4d lookMat = RenderUtil.createBillboardMatrix(te, entityPlayer); + + int brightness = RenderUtil.setTesselatorBrightness(entityPlayer.worldObj, te.xCoord, te.yCoord, te.zCoord); + render(x, y, z, lookMat, brightness); + + selectionRenderer.renderTileEntityAt(te, x, y, z, f); + } + + public void render(double x, double y, double z, Matrix4d lookMat, int brightness) { + + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + + IIcon tex = Items.ender_eye.getIconFromDamage(0); + RenderUtil.bindItemTexture(); + float minU = tex.getMinU(); + float maxU = tex.getMaxU(); + float minV = tex.getMinV(); + float maxV = tex.getMaxV(); + + // GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDepthMask(false); + GL11.glColor3f(1, 1, 1); + RenderUtil.renderBillboard(lookMat, minU, maxU, minV, maxV, 0.8, brightness); + + // Glint + float maxUV = 32; + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + RenderUtil.bindGlintTexture(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float blendFactor = 1F; + GL11.glColor4f(0.5F * blendFactor, 0.25F * blendFactor, 0.8F * blendFactor, 1.0F); + + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float scale = 0.125F; + GL11.glScalef(scale, scale, scale); + float tans = Minecraft.getSystemTime() % 3000L / 3000.0F * 8.0F; + GL11.glTranslatef(tans, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + RenderUtil.renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8, brightness); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + tans = Minecraft.getSystemTime() % 4873L / 4873.0F * 8.0F; + GL11.glTranslatef(-tans, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + RenderUtil.renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8, brightness); + GL11.glPopMatrix(); + + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + + GL11.glColor4f(1, 1, 1, 1.0F); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setBrightness(brightness); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon); + Tessellator.instance.draw(); + GL11.glPopMatrix(); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glDisable(GL11.GL_BLEND); + + GL11.glDepthMask(true); } @Override - public IIcon getSelectedIcon() { - return EnderIO.blockEnderIo.selectedOverlayIcon; + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } @Override - public IIcon getHighlightIcon() { - return EnderIO.blockEnderIo.highlightOverlayIcon; + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - }; + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + Matrix4d lookMat = new Matrix4d(); + lookMat.setIdentity(); - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { - - - EntityLivingBase entityPlayer = Minecraft.getMinecraft().thePlayer; - Matrix4d lookMat = RenderUtil.createBillboardMatrix(te, entityPlayer); - - int brightness = RenderUtil.setTesselatorBrightness(entityPlayer.worldObj, te.xCoord, te.yCoord, te.zCoord); - render(x, y, z, lookMat, brightness); - - selectionRenderer.renderTileEntityAt(te, x, y, z, f); - } - - public void render(double x, double y, double z, Matrix4d lookMat, int brightness) { - - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - - IIcon tex = Items.ender_eye.getIconFromDamage(0); - RenderUtil.bindItemTexture(); - float minU = tex.getMinU(); - float maxU = tex.getMaxU(); - float minV = tex.getMinV(); - float maxV = tex.getMaxV(); - - //GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - GL11.glColor3f(1, 1, 1); - RenderUtil.renderBillboard(lookMat, minU, maxU, minV, maxV, 0.8, brightness); - - // Glint - float maxUV = 32; - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - RenderUtil.bindGlintTexture(); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - float blendFactor = 1F; - GL11.glColor4f(0.5F * blendFactor, 0.25F * blendFactor, 0.8F * blendFactor, 1.0F); - - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - float scale = 0.125F; - GL11.glScalef(scale, scale, scale); - float tans = Minecraft.getSystemTime() % 3000L / 3000.0F * 8.0F; - GL11.glTranslatef(tans, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - RenderUtil.renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8, brightness); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glScalef(scale, scale, scale); - tans = Minecraft.getSystemTime() % 4873L / 4873.0F * 8.0F; - GL11.glTranslatef(-tans, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - RenderUtil.renderBillboard(lookMat, 0, maxUV, 0, maxUV, 0.8, brightness); - GL11.glPopMatrix(); - - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - - GL11.glColor4f(1, 1, 1, 1.0F); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - - RenderUtil.bindBlockTexture(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setBrightness(brightness); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockEnderIo.frameIcon); - Tessellator.instance.draw(); - GL11.glPopMatrix(); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glDisable(GL11.GL_BLEND); - - GL11.glDepthMask(true); - - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - Matrix4d lookMat = new Matrix4d(); - lookMat.setIdentity(); - - lookMat = VecmathUtil.createMatrixAsLookAt(RenderUtil.ZERO_V, new Vector3d(1, 0, 0), RenderUtil.UP_V); - - render(0, 0, 0, lookMat, 0xF000F0); - - } + lookMat = VecmathUtil.createMatrixAsLookAt(RenderUtil.ZERO_V, new Vector3d(1, 0, 0), RenderUtil.UP_V); + render(0, 0, 0, lookMat, 0xF000F0); + } } diff --git a/src/main/java/crazypants/enderio/enderface/EnderfaceRecipes.java b/src/main/java/crazypants/enderio/enderface/EnderfaceRecipes.java index 8592ee77..b5d58ac7 100644 --- a/src/main/java/crazypants/enderio/enderface/EnderfaceRecipes.java +++ b/src/main/java/crazypants/enderio/enderface/EnderfaceRecipes.java @@ -1,18 +1,27 @@ package crazypants.enderio.enderface; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.material.Alloy; import crazypants.util.RecipeUtil; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class EnderfaceRecipes { - public static void addRecipes() { - - ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); - String electricalSteel = Alloy.ELECTRICAL_STEEL.getOreIngot(); - RecipeUtil.addShaped(new ItemStack(EnderIO.blockEnderIo), "sqs", "qeq", "sqs", 's', electricalSteel, 'q', fusedQuartz, 'e', new ItemStack(Items.ender_eye)); - } + public static void addRecipes() { + ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); + String electricalSteel = Alloy.ELECTRICAL_STEEL.getOreIngot(); + RecipeUtil.addShaped( + new ItemStack(EnderIO.blockEnderIo), + "sqs", + "qeq", + "sqs", + 's', + electricalSteel, + 'q', + fusedQuartz, + 'e', + new ItemStack(Items.ender_eye)); + } } diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index 1dbd3ebd..1025ed1e 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -1,10 +1,20 @@ package crazypants.enderio.enderface; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Camera; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.TravelController; +import crazypants.util.RenderPassHelper; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -21,552 +31,549 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.client.ForgeHooksClient; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Camera; -import com.enderio.core.common.vecmath.Matrix4d; -import com.enderio.core.common.vecmath.VecmathUtil; -import com.enderio.core.common.vecmath.Vector3d; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.BlockConduitBundle; -import crazypants.enderio.config.Config; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.TravelController; -import crazypants.util.RenderPassHelper; - public class GuiEnderface extends GuiScreen { - protected static final RenderBlocks RB = new RenderBlocks(); + protected static final RenderBlocks RB = new RenderBlocks(); - private float pitch = -45; - private float yaw = 45; + private float pitch = -45; + private float yaw = 45; - private final EntityPlayer player; - private final World world; - private final int ioX; - private final int ioY; - private final int ioZ; - private boolean chunkLoaded; + private final EntityPlayer player; + private final World world; + private final int ioX; + private final int ioY; + private final int ioZ; + private boolean chunkLoaded; - private List blocks = new ArrayList(); + private List blocks = new ArrayList(); - private int gw; - private int gh; - private int guiLeft; - private int guiTop; - private int finalGw; - private int finalGh; - // private boolean animateInX = true; - private boolean animateInX = false; - private boolean animateInY = false; - // private boolean animating = true; - float animationDuration = 60; + private int gw; + private int gh; + private int guiLeft; + private int guiTop; + private int finalGw; + private int finalGh; + // private boolean animateInX = true; + private boolean animateInX = false; + private boolean animateInY = false; + // private boolean animating = true; + float animationDuration = 60; - private final Vector3d origin = new Vector3d(); - private final Vector3d eye = new Vector3d(); - private final Camera camera = new Camera(); - private final Matrix4d pitchRot = new Matrix4d(); - private final Matrix4d yawRot = new Matrix4d(); + private final Vector3d origin = new Vector3d(); + private final Vector3d eye = new Vector3d(); + private final Camera camera = new Camera(); + private final Matrix4d pitchRot = new Matrix4d(); + private final Matrix4d yawRot = new Matrix4d(); - private float scaleAnimX; + private float scaleAnimX; - private int range; + private int range; - boolean dragging = false; + boolean dragging = false; - private double distance; + private double distance; - private long initTime; + private long initTime; - public GuiEnderface(EntityPlayer player, World world, int ioX, int ioY, int ioZ) { - this.player = player; - this.world = world; - this.ioX = ioX; - this.ioY = ioY; - this.ioZ = ioZ; + public GuiEnderface(EntityPlayer player, World world, int ioX, int ioY, int ioZ) { + this.player = player; + this.world = world; + this.ioX = ioX; + this.ioY = ioY; + this.ioZ = ioZ; - range = Config.enderIoRange; - distance = 10 + (range * 2); + range = Config.enderIoRange; + distance = 10 + (range * 2); - TileEntity te = world.getTileEntity(ioX, ioY, ioZ); - if(te instanceof TileEnderIO) { - pitch = ((TileEnderIO) te).lastUiPitch; - yaw = ((TileEnderIO) te).lastUiYaw; - distance = ((TileEnderIO) te).lastUiDistance; - } - - origin.set(ioX + 0.5, ioY + 0.5, ioZ + 0.5); - pitchRot.setIdentity(); - yawRot.setIdentity(); - - Chunk c = world.getChunkFromBlockCoords(ioX, ioZ); - chunkLoaded = c != null && c.isChunkLoaded; - RB.blockAccess = world; - - blocks.add(new ViewableBlocks(ioX, ioY, ioZ, EnderIO.blockEnderIo)); - - for (int x = ioX - range; x <= ioX + range; x++) { - for (int y = ioY - range; y <= ioY + range; y++) { - for (int z = ioZ - range; z <= ioZ + range; z++) { - Block block = world.getBlock(x, y, z); - blocks.add(new ViewableBlocks(x, y, z, block)); + TileEntity te = world.getTileEntity(ioX, ioY, ioZ); + if (te instanceof TileEnderIO) { + pitch = ((TileEnderIO) te).lastUiPitch; + yaw = ((TileEnderIO) te).lastUiYaw; + distance = ((TileEnderIO) te).lastUiDistance; } - } - } - } - @Override - public void onGuiClosed() { - TileEntity te = world.getTileEntity(ioX, ioY, ioZ); - if(te instanceof TileEnderIO) { - ((TileEnderIO) te).lastUiPitch = pitch; - ((TileEnderIO) te).lastUiYaw = yaw; - ((TileEnderIO) te).lastUiDistance = distance; - } - } + origin.set(ioX + 0.5, ioY + 0.5, ioZ + 0.5); + pitchRot.setIdentity(); + yawRot.setIdentity(); - /** - * Adds the buttons (and other controls) to the screen in question. - */ - @Override - public void initGui() { + Chunk c = world.getChunkFromBlockCoords(ioX, ioZ); + chunkLoaded = c != null && c.isChunkLoaded; + RB.blockAccess = world; - finalGw = width * 1; - finalGh = height * 1; - // gw = finalGw - 1; - // gh = finalGh - 1; - gw = finalGw; - gh = finalGh; - // gw = 0; - // gh = 0; - guiLeft = (width - gw) / 2; - guiTop = (height - gh) / 2; + blocks.add(new ViewableBlocks(ioX, ioY, ioZ, EnderIO.blockEnderIo)); - initTime = EnderIO.proxy.getTickCount(); - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - /** - * Handles mouse input. - */ - @Override - public void handleMouseInput() { - super.handleMouseInput(); - - if(Mouse.getEventButton() == 0) { - dragging = Mouse.getEventButtonState(); - } - - if(dragging) { - - double dx = (Mouse.getEventDX() / (double) mc.displayWidth); - double dy = (Mouse.getEventDY() / (double) mc.displayHeight); - if(Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - distance -= dy * 15; - } else { - yaw -= dx * 180; - pitch += dy * 180; - pitch = (float) VecmathUtil.clamp(pitch, -80, 80); - } - } - - distance -= Mouse.getDWheel() * 0.01; - distance = VecmathUtil.clamp(distance, 0.1, 20); - - long elapsed = EnderIO.proxy.getTickCount() - initTime; - - if(Mouse.getEventButton() == 1 && !Mouse.getEventButtonState() && camera.isValid() && elapsed > 10) { - - int x = Mouse.getEventX(); - int y = Mouse.getEventY(); - Vector3d start = new Vector3d(); - Vector3d end = new Vector3d(); - if(camera.getRayForPixel(x, y, start, end)) { - end.scale(distance * 2); - end.add(start); - doSelection(start, end); - } - - } - - } - - private void doSelection(Vector3d start, Vector3d end) { - start.add(origin); - end.add(origin); - MovingObjectPosition hit = player.worldObj.rayTraceBlocks(Vec3.createVectorHelper(start.x, start.y, start.z), Vec3.createVectorHelper(end.x, end.y, end.z), - false); - - if (hit != null) { - Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ); - if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) { - block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0); - } else { - openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec); - } - } - - } - - public static MovingObjectPosition getClosestHit(Vec3 origin, Collection candidates) { - double minLengthSquared = Double.POSITIVE_INFINITY; - MovingObjectPosition closest = null; - - for (MovingObjectPosition hit : candidates) { - if(hit != null) { - double lengthSquared = hit.hitVec.squareDistanceTo(origin); - if(lengthSquared < minLengthSquared) { - minLengthSquared = lengthSquared; - closest = hit; + for (int x = ioX - range; x <= ioX + range; x++) { + for (int y = ioY - range; y <= ioY + range; y++) { + for (int z = ioZ - range; z <= ioZ + range; z++) { + Block block = world.getBlock(x, y, z); + blocks.add(new ViewableBlocks(x, y, z, block)); + } + } } - } } - return closest; - } - /** - * Draws the screen and all the components in it. - */ - @Override - public void drawScreen(int par1, int par2, float partialTick) { - - animateBackground(partialTick); - drawDefaultBackground(); - - RenderHelper.disableStandardItemLighting(); - RenderHelper.enableGUIStandardItemLighting(); - drawEnderfaceBackground(); - - if(!updateCamera(partialTick)) { - return; + @Override + public void onGuiClosed() { + TileEntity te = world.getTileEntity(ioX, ioY, ioZ); + if (te instanceof TileEnderIO) { + ((TileEnderIO) te).lastUiPitch = pitch; + ((TileEnderIO) te).lastUiYaw = yaw; + ((TileEnderIO) te).lastUiDistance = distance; + } } - applyCamera(partialTick); - if(!animateInX && !animateInY) { + /** + * Adds the buttons (and other controls) to the screen in question. + */ + @Override + public void initGui() { - if(chunkLoaded) { + finalGw = width * 1; + finalGh = height * 1; + // gw = finalGw - 1; + // gh = finalGh - 1; + gw = finalGw; + gh = finalGh; + // gw = 0; + // gh = 0; + guiLeft = (width - gw) / 2; + guiTop = (height - gh) / 2; - //TODO: Need to depth sort transparent passes + initTime = EnderIO.proxy.getTickCount(); + } - TravelController.instance.setSelectionEnabled(false); + @Override + public boolean doesGuiPauseGame() { + return false; + } - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glEnable(GL11.GL_DEPTH_TEST); + /** + * Handles mouse input. + */ + @Override + public void handleMouseInput() { + super.handleMouseInput(); + + if (Mouse.getEventButton() == 0) { + dragging = Mouse.getEventButtonState(); + } + + if (dragging) { + + double dx = (Mouse.getEventDX() / (double) mc.displayWidth); + double dy = (Mouse.getEventDY() / (double) mc.displayHeight); + if (Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { + distance -= dy * 15; + } else { + yaw -= dx * 180; + pitch += dy * 180; + pitch = (float) VecmathUtil.clamp(pitch, -80, 80); + } + } + + distance -= Mouse.getDWheel() * 0.01; + distance = VecmathUtil.clamp(distance, 0.1, 20); + + long elapsed = EnderIO.proxy.getTickCount() - initTime; + + if (Mouse.getEventButton() == 1 && !Mouse.getEventButtonState() && camera.isValid() && elapsed > 10) { + + int x = Mouse.getEventX(); + int y = Mouse.getEventY(); + Vector3d start = new Vector3d(); + Vector3d end = new Vector3d(); + if (camera.getRayForPixel(x, y, start, end)) { + end.scale(distance * 2); + end.add(start); + doSelection(start, end); + } + } + } + + private void doSelection(Vector3d start, Vector3d end) { + start.add(origin); + end.add(origin); + MovingObjectPosition hit = player.worldObj.rayTraceBlocks( + Vec3.createVectorHelper(start.x, start.y, start.z), + Vec3.createVectorHelper(end.x, end.y, end.z), + false); + + if (hit != null) { + Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ); + if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) { + block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0); + } else { + openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec); + } + } + } + + public static MovingObjectPosition getClosestHit(Vec3 origin, Collection candidates) { + double minLengthSquared = Double.POSITIVE_INFINITY; + MovingObjectPosition closest = null; + + for (MovingObjectPosition hit : candidates) { + if (hit != null) { + double lengthSquared = hit.hitVec.squareDistanceTo(origin); + if (lengthSquared < minLengthSquared) { + minLengthSquared = lengthSquared; + closest = hit; + } + } + } + return closest; + } + + /** + * Draws the screen and all the components in it. + */ + @Override + public void drawScreen(int par1, int par2, float partialTick) { + + animateBackground(partialTick); + drawDefaultBackground(); RenderHelper.disableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + drawEnderfaceBackground(); + + if (!updateCamera(partialTick)) { + return; + } + applyCamera(partialTick); + + if (!animateInX && !animateInY) { + + if (chunkLoaded) { + + // TODO: Need to depth sort transparent passes + + TravelController.instance.setSelectionEnabled(false); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_DEPTH_TEST); + + RenderHelper.disableStandardItemLighting(); + mc.entityRenderer.enableLightmap(0); + RenderUtil.bindBlockTexture(); + + Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); + for (int pass = 0; pass < 2; pass++) { + + RenderPassHelper.setBlockRenderPass(pass); + setGlStateForPass(pass); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); + + for (ViewableBlocks ug : blocks) { + if (ug.block.canRenderInPass(pass)) { + RB.setRenderBounds(0, 0, 0, 1, 1, 1); + RB.renderBlockByRenderType(ug.block, ug.bc.x, ug.bc.y, ug.bc.z); + } + } + Tessellator.instance.draw(); + Tessellator.instance.setTranslation(0, 0, 0); + RenderPassHelper.clearBlockRenderPass(); + } + + RenderHelper.enableStandardItemLighting(); + + TileEntityRendererDispatcher.instance.field_147558_l = origin.x - eye.x; + TileEntityRendererDispatcher.instance.field_147560_j = origin.y - eye.y; + TileEntityRendererDispatcher.instance.field_147561_k = origin.z - eye.z; + + TileEntityRendererDispatcher.staticPlayerX = origin.x - eye.x; + TileEntityRendererDispatcher.staticPlayerY = origin.y - eye.y; + TileEntityRendererDispatcher.staticPlayerZ = origin.z - eye.z; + + for (int pass = 0; pass < 2; pass++) { + + RenderPassHelper.setEntityRenderPass(pass); + setGlStateForPass(pass); + + for (ViewableBlocks ug : blocks) { + TileEntity tile = world.getTileEntity(ug.bc.x, ug.bc.y, ug.bc.z); + if (tile != null) { + Vector3d at = new Vector3d(eye.x - 0.5, eye.y - 0.5, eye.z - 0.5); + at.x += ug.bc.x - ioX; + at.y += ug.bc.y - ioY; + at.z += ug.bc.z - ioZ; + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, at.x, at.y, at.z, 0); + GL11.glPopAttrib(); + } + } + RenderPassHelper.clearEntityRenderPass(); + } + setGlStateForPass(0); + TravelController.instance.setSelectionEnabled(true); + + } else { + drawCenteredString( + Minecraft.getMinecraft().fontRenderer, + "EnderIO chunk not loaded.", + width / 2, + height / 2 - 32, + 0xFFFFFFFF); + } + } + + drawEffectOverlay(partialTick); + } + + private void setGlStateForPass(int pass) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + if (pass == 0) { + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + } else { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthMask(false); + } + } + + private boolean updateCamera(float partialTick) { + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + int vpx = guiLeft * scaledresolution.getScaleFactor(); + int vpy = guiTop * scaledresolution.getScaleFactor(); + int vpw = (int) ((float) gw / width * mc.displayWidth); + int vph = (int) ((float) gh / height * mc.displayHeight); + if (vpw <= 0 || vph <= 0) { + return false; + } + + camera.setViewport(vpx, vpy, vpw, vph); + camera.setProjectionMatrixAsPerspective(30, 0.05, 50, vpw, vph); + + eye.set(0, 0, distance); + pitchRot.makeRotationX(Math.toRadians(pitch)); + yawRot.makeRotationY(Math.toRadians(yaw)); + pitchRot.transform(eye); + yawRot.transform(eye); + camera.setViewMatrixAsLookAt(eye, RenderUtil.ZERO_V, RenderUtil.UP_V); + return camera.isValid(); + } + + private void applyCamera(float partialTick) { + Rectangle vp = camera.getViewport(); + GL11.glViewport(vp.x, vp.y, vp.width, vp.height); + GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); + GL11.glMatrixMode(GL11.GL_PROJECTION); + RenderUtil.loadMatrix(camera.getTransposeProjectionMatrix()); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + RenderUtil.loadMatrix(camera.getTransposeViewMatrix()); + + scaleAnimX += (partialTick * 0.25); + float v = 0.4f; + float sf = 1.0F * (1 + v / 32); + GL11.glRotatef((scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); + GL11.glScalef(sf, 1.0F, 1.0f); + GL11.glRotatef(-(scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); + + GL11.glTranslatef(-(float) eye.x, -(float) eye.y, -(float) eye.z); + } + + private float portalFade = 1; + + private void drawEffectOverlay(float partialTick) { + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glLoadIdentity(); + GL11.glOrtho( + 0.0D, + scaledresolution.getScaledWidth_double(), + scaledresolution.getScaledHeight_double(), + 0.0D, + 1000.0D, + 3000.0D); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glLoadIdentity(); + GL11.glTranslatef(0.0F, 0.0F, -2000.0F); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glDepthMask(false); + + RenderHelper.disableStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); + + GL11.glDisable(GL11.GL_LIGHTING); + mc.entityRenderer.disableLightmap(0); + + portalFade -= (partialTick * (1f / animationDuration)); + portalFade = Math.max(0, portalFade); + if (portalFade >= 0) { + drawRect( + scaledresolution.getScaledWidth(), + scaledresolution.getScaledHeight(), + 0, + 0.3f, + 0.16f, + Math.max(0.3f, portalFade)); + } + + GL11.glEnable(GL11.GL_LIGHTING); mc.entityRenderer.enableLightmap(0); + + renderPortalOverlay( + 0.8f - (0.2f * (1 - portalFade)), + scaledresolution.getScaledWidth(), + scaledresolution.getScaledHeight()); + + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + + /** + * Renders the portal overlay. Args: portalStrength, width, height + */ + protected void renderPortalOverlay(float par1, int par2, int par3) { + if (par1 < 1.0F) { + par1 *= par1; + par1 *= par1; + par1 = par1 * 0.9F + 0.1F; + } + GL11.glColor4f(1.0F, 1.0F, 1.0F, par1); RenderUtil.bindBlockTexture(); + IIcon icon = Blocks.portal.getBlockTextureFromSide(1); + float f1 = icon.getMinU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxU(); + float f4 = icon.getMaxV(); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0D, par3, -90.0D, f1, f4); + tessellator.addVertexWithUV(par2, par3, -90.0D, f3, f4); + tessellator.addVertexWithUV(par2, 0.0D, -90.0D, f3, f2); + tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, f1, f2); + tessellator.draw(); + } - Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); - for (int pass = 0; pass < 2; pass++) { + private boolean animating() { + return gw < finalGw || gh < finalGh; + } - RenderPassHelper.setBlockRenderPass(pass); - setGlStateForPass(pass); + private void drawRect(int width, int height, float r, float g, float b, float a) { + Tessellator tessellator = Tessellator.instance; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor4f(r, g, b, a); + tessellator.startDrawingQuads(); + tessellator.addVertex(0.0D, height, 0.0D); + tessellator.addVertex(width, height, 0.0D); + tessellator.addVertex(width, 0.0D, 0.0D); + tessellator.addVertex(0.0D, 0.0D, 0.0D); + tessellator.draw(); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); + private void animateBackground(float partialTick) { - for (ViewableBlocks ug : blocks) { - if(ug.block.canRenderInPass(pass)) { - RB.setRenderBounds(0, 0, 0, 1, 1, 1); - RB.renderBlockByRenderType(ug.block, ug.bc.x, ug.bc.y, ug.bc.z); - } - } - Tessellator.instance.draw(); - Tessellator.instance.setTranslation(0, 0, 0); - RenderPassHelper.clearBlockRenderPass(); + if (!animating()) { + return; } - RenderHelper.enableStandardItemLighting(); + // if (animateInX) { + // animationDuration *= 0.8; + // } + int mag = (int) ((width / (animationDuration * 0.5f)) * partialTick); + int mag2 = mag * 2; - TileEntityRendererDispatcher.instance.field_147558_l = origin.x - eye.x; - TileEntityRendererDispatcher.instance.field_147560_j = origin.y - eye.y; - TileEntityRendererDispatcher.instance.field_147561_k = origin.z - eye.z; + int ymag = (int) ((height / (animationDuration * 0.5f)) * partialTick); + // int ymag = mag; + int ymag2 = ymag * 2; - TileEntityRendererDispatcher.staticPlayerX = origin.x - eye.x; - TileEntityRendererDispatcher.staticPlayerY = origin.y - eye.y; - TileEntityRendererDispatcher.staticPlayerZ = origin.z - eye.z; - - for (int pass = 0; pass < 2; pass++) { - - RenderPassHelper.setEntityRenderPass(pass); - setGlStateForPass(pass); - - for (ViewableBlocks ug : blocks) { - TileEntity tile = world.getTileEntity(ug.bc.x, ug.bc.y, ug.bc.z); - if(tile != null) { - Vector3d at = new Vector3d(eye.x - 0.5, eye.y - 0.5, eye.z - 0.5); - at.x += ug.bc.x - ioX; - at.y += ug.bc.y - ioY; - at.z += ug.bc.z - ioZ; - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, at.x, at.y, at.z, 0); - GL11.glPopAttrib(); + if (animateInX) { + gw -= mag2; + guiLeft += mag; + if (gw <= 0) { + animateInX = false; + // animateInY = false; } - } - RenderPassHelper.clearEntityRenderPass(); + } else { + gw += mag2; + guiLeft -= mag; } - setGlStateForPass(0); - TravelController.instance.setSelectionEnabled(true); - } else { - drawCenteredString(Minecraft.getMinecraft().fontRenderer, "EnderIO chunk not loaded.", width / 2, height / 2 - 32, 0xFFFFFFFF); - } + if (animateInY) { + gh -= ymag2; + guiTop += ymag; + if (gh <= 0) { + animateInY = false; + // animateInX= false; + } + } else { + gh += ymag2; + guiTop -= ymag; + } + + gw = Math.min(gw, finalGw); + gh = Math.min(gh, finalGh); + guiLeft = Math.max((width - finalGw) / 2, guiLeft); + guiTop = Math.max((height - finalGh) / 2, guiTop); } - drawEffectOverlay(partialTick); - } + private void drawEnderfaceBackground() { - private void setGlStateForPass(int pass) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - if(pass == 0) { - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - } else { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthMask(false); + int w = gw; + int h = gh; + int left = guiLeft; + int top = guiTop; + int cx = left + w / 2; + int cy = top + h / 2; + + // black outline + drawRect(left, top, left + w, top + h, 0xFF000000); + left += 1; + top += 1; + w -= 2; + h -= 2; + + // border + int topH = 0xFFFFFFFF; + int botH = 0xFF555555; + int rightH = 0xFF555555; + int leftH = 0xFFFFFFFF; + if (animateInX) { + leftH = 0xFF555555; + rightH = 0xFFFFFFFF; + } + if (animateInY) { + topH = 0xFF555555; + botH = 0xFFFFFFFF; + } + + left += 1; + top += 1; + w -= 2; + h -= 2; + drawRect(left, top, left + w, top + h, 0xFF00331C); } - } - - private boolean updateCamera(float partialTick) { - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - int vpx = guiLeft * scaledresolution.getScaleFactor(); - int vpy = guiTop * scaledresolution.getScaleFactor(); - int vpw = (int) ((float) gw / width * mc.displayWidth); - int vph = (int) ((float) gh / height * mc.displayHeight); - if(vpw <= 0 || vph <= 0) { - return false; + void openInterface(int x, int y, int z, int side, Vec3 hitVec) { + Vec3 relativeHit = Vec3.createVectorHelper(hitVec.xCoord - x, hitVec.yCoord - y, hitVec.zCoord - z); + PacketOpenServerGUI p = new PacketOpenServerGUI(x, y, z, side, relativeHit); + PacketHandler.INSTANCE.sendToServer(p); } - camera.setViewport(vpx, vpy, vpw, vph); - camera.setProjectionMatrixAsPerspective(30, 0.05, 50, vpw, vph); + static class ViewableBlocks { + BlockCoord bc; + Block block; - eye.set(0, 0, distance); - pitchRot.makeRotationX(Math.toRadians(pitch)); - yawRot.makeRotationY(Math.toRadians(yaw)); - pitchRot.transform(eye); - yawRot.transform(eye); - camera.setViewMatrixAsLookAt(eye, RenderUtil.ZERO_V, RenderUtil.UP_V); - return camera.isValid(); - } - - private void applyCamera(float partialTick) { - Rectangle vp = camera.getViewport(); - GL11.glViewport(vp.x, vp.y, vp.width, vp.height); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - RenderUtil.loadMatrix(camera.getTransposeProjectionMatrix()); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - RenderUtil.loadMatrix(camera.getTransposeViewMatrix()); - - scaleAnimX += (partialTick * 0.25); - float v = 0.4f; - float sf = 1.0F * (1 + v / 32); - GL11.glRotatef((scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); - GL11.glScalef(sf, 1.0F, 1.0f); - GL11.glRotatef(-(scaleAnimX + partialTick) * 7, 0.0F, 1.0F, 1.0F); - - GL11.glTranslatef(-(float) eye.x, -(float) eye.y, -(float) eye.z); - } - - private float portalFade = 1; - - private void drawEffectOverlay(float partialTick) { - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, scaledresolution.getScaledWidth_double(), scaledresolution.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(0.0F, 0.0F, -2000.0F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glDepthMask(false); - - RenderHelper.disableStandardItemLighting(); - RenderHelper.enableGUIStandardItemLighting(); - - GL11.glDisable(GL11.GL_LIGHTING); - mc.entityRenderer.disableLightmap(0); - - portalFade -= (partialTick * (1f / animationDuration)); - portalFade = Math.max(0, portalFade); - if(portalFade >= 0) { - drawRect(scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), 0, 0.3f, 0.16f, Math.max(0.3f, portalFade)); + private ViewableBlocks(int x, int y, int z, Block block) { + super(); + bc = new BlockCoord(x, y, z); + this.block = block; + } } - - GL11.glEnable(GL11.GL_LIGHTING); - mc.entityRenderer.enableLightmap(0); - - renderPortalOverlay(0.8f - (0.2f * (1 - portalFade)), scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight()); - - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - } - - /** - * Renders the portal overlay. Args: portalStrength, width, height - */ - protected void renderPortalOverlay(float par1, int par2, int par3) { - if(par1 < 1.0F) { - par1 *= par1; - par1 *= par1; - par1 = par1 * 0.9F + 0.1F; - } - GL11.glColor4f(1.0F, 1.0F, 1.0F, par1); - RenderUtil.bindBlockTexture(); - IIcon icon = Blocks.portal.getBlockTextureFromSide(1); - float f1 = icon.getMinU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxU(); - float f4 = icon.getMaxV(); - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(0.0D, par3, -90.0D, f1, f4); - tessellator.addVertexWithUV(par2, par3, -90.0D, f3, f4); - tessellator.addVertexWithUV(par2, 0.0D, -90.0D, f3, f2); - tessellator.addVertexWithUV(0.0D, 0.0D, -90.0D, f1, f2); - tessellator.draw(); - } - - private boolean animating() { - return gw < finalGw || gh < finalGh; - } - - private void drawRect(int width, int height, float r, float g, - float b, float a) { - Tessellator tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glColor4f(r, g, b, a); - tessellator.startDrawingQuads(); - tessellator.addVertex(0.0D, height, 0.0D); - tessellator.addVertex(width, height, 0.0D); - tessellator.addVertex(width, 0.0D, 0.0D); - tessellator.addVertex(0.0D, 0.0D, 0.0D); - tessellator.draw(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - } - - private void animateBackground(float partialTick) { - - if(!animating()) { - return; - } - - // if (animateInX) { - // animationDuration *= 0.8; - // } - int mag = (int) ((width / (animationDuration * 0.5f)) * partialTick); - int mag2 = mag * 2; - - int ymag = (int) ((height / (animationDuration * 0.5f)) * partialTick); - // int ymag = mag; - int ymag2 = ymag * 2; - - if(animateInX) { - gw -= mag2; - guiLeft += mag; - if(gw <= 0) { - animateInX = false; - // animateInY = false; - } - } else { - gw += mag2; - guiLeft -= mag; - } - - if(animateInY) { - gh -= ymag2; - guiTop += ymag; - if(gh <= 0) { - animateInY = false; - // animateInX= false; - } - } else { - gh += ymag2; - guiTop -= ymag; - } - - gw = Math.min(gw, finalGw); - gh = Math.min(gh, finalGh); - guiLeft = Math.max((width - finalGw) / 2, guiLeft); - guiTop = Math.max((height - finalGh) / 2, guiTop); - - } - - private void drawEnderfaceBackground() { - - int w = gw; - int h = gh; - int left = guiLeft; - int top = guiTop; - int cx = left + w / 2; - int cy = top + h / 2; - - // black outline - drawRect(left, top, left + w, top + h, 0xFF000000); - left += 1; - top += 1; - w -= 2; - h -= 2; - - // border - int topH = 0xFFFFFFFF; - int botH = 0xFF555555; - int rightH = 0xFF555555; - int leftH = 0xFFFFFFFF; - if(animateInX) { - leftH = 0xFF555555; - rightH = 0xFFFFFFFF; - } - if(animateInY) { - topH = 0xFF555555; - botH = 0xFFFFFFFF; - } - - left += 1; - top += 1; - w -= 2; - h -= 2; - drawRect(left, top, left + w, top + h, 0xFF00331C); - - } - - void openInterface(int x, int y, int z, int side, Vec3 hitVec) { - Vec3 relativeHit = Vec3.createVectorHelper(hitVec.xCoord - x, hitVec.yCoord - y, hitVec.zCoord - z); - PacketOpenServerGUI p = new PacketOpenServerGUI(x, y, z, side, relativeHit); - PacketHandler.INSTANCE.sendToServer(p); - } - - static class ViewableBlocks { - BlockCoord bc; - Block block; - - private ViewableBlocks(int x, int y, int z, Block block) { - super(); - bc = new BlockCoord(x, y, z); - this.block = block; - } - - } } diff --git a/src/main/java/crazypants/enderio/enderface/ItemEnderface.java b/src/main/java/crazypants/enderio/enderface/ItemEnderface.java index 02ba5e63..e25257bc 100644 --- a/src/main/java/crazypants/enderio/enderface/ItemEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/ItemEnderface.java @@ -1,11 +1,5 @@ package crazypants.enderio.enderface; -import net.minecraft.client.renderer.texture.IIconRegister; -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 cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -13,109 +7,116 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import net.minecraft.client.renderer.texture.IIconRegister; +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; public class ItemEnderface extends Item implements IGuiHandler { - public static final String KEY_IO_SET = "enderFaceIoSet"; - public static final String KEY_IO_X = "enderFaceIoX"; - public static final String KEY_IO_Y = "enderFaceIoY"; - public static final String KEY_IO_Z = "enderFaceIoZ"; - public static final String KEY_DIMENSION = "enderFaceDimension"; + public static final String KEY_IO_SET = "enderFaceIoSet"; + public static final String KEY_IO_X = "enderFaceIoX"; + public static final String KEY_IO_Y = "enderFaceIoY"; + public static final String KEY_IO_Z = "enderFaceIoZ"; + public static final String KEY_DIMENSION = "enderFaceDimension"; - public static ItemEnderface create() { - ItemEnderface result = new ItemEnderface(); - result.init(); - return result; - } + public static ItemEnderface create() { + ItemEnderface result = new ItemEnderface(); + result.init(); + return result; + } - protected ItemEnderface() { - setCreativeTab(null); - setUnlocalizedName("enderio." + ModObject.itemEnderface.name()); - setMaxStackSize(1); - } + protected ItemEnderface() { + setCreativeTab(null); + setUnlocalizedName("enderio." + ModObject.itemEnderface.name()); + setMaxStackSize(1); + } - protected void init() { - GameRegistry.registerItem(this, ModObject.itemEnderface.unlocalisedName); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENDERFACE, this); - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemEnderface.unlocalisedName); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENDERFACE, this); + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:enderface"); - } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:enderface"); + } - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack, int pass) { - return true; - } + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + return true; + } - @Override - public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { - super.onCreated(itemStack, world, entityPlayer); - NBTTagCompound nbttagcompound = new NBTTagCompound(); - nbttagcompound.setBoolean(KEY_IO_SET, false); - nbttagcompound.setInteger(KEY_IO_X, -1); - nbttagcompound.setInteger(KEY_IO_Y, -1); - nbttagcompound.setInteger(KEY_IO_Z, -1); - nbttagcompound.setInteger(KEY_DIMENSION, -1); - itemStack.setTagCompound(nbttagcompound); - } + @Override + public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { + super.onCreated(itemStack, world, entityPlayer); + NBTTagCompound nbttagcompound = new NBTTagCompound(); + nbttagcompound.setBoolean(KEY_IO_SET, false); + nbttagcompound.setInteger(KEY_IO_X, -1); + nbttagcompound.setInteger(KEY_IO_Y, -1); + nbttagcompound.setInteger(KEY_IO_Z, -1); + nbttagcompound.setInteger(KEY_DIMENSION, -1); + itemStack.setTagCompound(nbttagcompound); + } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiEnderface(player, world, x, y, z); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, final EntityPlayer entityPlayer) { - -// if(!world.isRemote) { -// return itemStack; -// } -// -// NBTTagCompound tag = itemStack.getTagCompound(); -// boolean tagsSet = tag != null && tag.getBoolean(KEY_IO_SET); -// -// if(tag != null && tag.getBoolean(KEY_IO_SET)) { -// -// int x = tag.getInteger(KEY_IO_X); -// int y = tag.getInteger(KEY_IO_Y); -// int z = tag.getInteger(KEY_IO_Z); -// int dimension = tag.getInteger(KEY_DIMENSION); -// -// if(world.provider.dimensionId != dimension) { -// ChatMessageComponent c = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.wrongDimension")); -// entityPlayer.sendChatToPlayer(c); -// return itemStack; -// } -// -// Chunk c = world.getChunkFromBlockCoords(x, z); -// if(c == null || !c.isChunkLoaded) { -// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.tooFar")); -// entityPlayer.sendChatToPlayer(cm); -// return itemStack; -// } -// int blockId = world.getBlockId(x, y, z); -// if(blockId != EnderIO.blockEnderIo.blockID) { -// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.destroyed")); -// entityPlayer.sendChatToPlayer(cm); -// return itemStack; -// } -// entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, x, y, z); -// return itemStack; -// } -// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.noSync")); -// entityPlayer.sendChatToPlayer(cm); - return itemStack; - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiEnderface(player, world, x, y, z); + } + @Override + public ItemStack onItemRightClick(ItemStack itemStack, World world, final EntityPlayer entityPlayer) { + // if(!world.isRemote) { + // return itemStack; + // } + // + // NBTTagCompound tag = itemStack.getTagCompound(); + // boolean tagsSet = tag != null && tag.getBoolean(KEY_IO_SET); + // + // if(tag != null && tag.getBoolean(KEY_IO_SET)) { + // + // int x = tag.getInteger(KEY_IO_X); + // int y = tag.getInteger(KEY_IO_Y); + // int z = tag.getInteger(KEY_IO_Z); + // int dimension = tag.getInteger(KEY_DIMENSION); + // + // if(world.provider.dimensionId != dimension) { + // ChatMessageComponent c = + // ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.wrongDimension")); + // entityPlayer.sendChatToPlayer(c); + // return itemStack; + // } + // + // Chunk c = world.getChunkFromBlockCoords(x, z); + // if(c == null || !c.isChunkLoaded) { + // ChatMessageComponent cm = + // ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.tooFar")); + // entityPlayer.sendChatToPlayer(cm); + // return itemStack; + // } + // int blockId = world.getBlockId(x, y, z); + // if(blockId != EnderIO.blockEnderIo.blockID) { + // ChatMessageComponent cm = + // ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.destroyed")); + // entityPlayer.sendChatToPlayer(cm); + // return itemStack; + // } + // entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, x, y, z); + // return itemStack; + // } + // ChatMessageComponent cm = + // ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.noSync")); + // entityPlayer.sendChatToPlayer(cm); + return itemStack; + } } diff --git a/src/main/java/crazypants/enderio/enderface/PacketLockClientContainer.java b/src/main/java/crazypants/enderio/enderface/PacketLockClientContainer.java index 171d12ed..1c8dd173 100644 --- a/src/main/java/crazypants/enderio/enderface/PacketLockClientContainer.java +++ b/src/main/java/crazypants/enderio/enderface/PacketLockClientContainer.java @@ -1,46 +1,45 @@ package crazypants.enderio.enderface; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; public class PacketLockClientContainer implements IMessage { - private int windowId; - private boolean lock = true; - - public PacketLockClientContainer() { - this.lock = false; - } - - public PacketLockClientContainer(int windowId) { - this.windowId = windowId; - } - - @Override - public void fromBytes(ByteBuf buf) { - this.windowId = buf.readInt(); - this.lock = buf.readBoolean(); - } + private int windowId; + private boolean lock = true; - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(windowId); - buf.writeBoolean(lock); - } + public PacketLockClientContainer() { + this.lock = false; + } - public static class Handler implements IMessageHandler { + public PacketLockClientContainer(int windowId) { + this.windowId = windowId; + } @Override - public IMessage onMessage(PacketLockClientContainer message, MessageContext ctx) { - if (message.lock) { - EnderIOController.INSTANCE.lockAndWaitForChange(message.windowId); - } else { - EnderIOController.INSTANCE.unlock(); - } - return null; + public void fromBytes(ByteBuf buf) { + this.windowId = buf.readInt(); + this.lock = buf.readBoolean(); } - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(windowId); + buf.writeBoolean(lock); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketLockClientContainer message, MessageContext ctx) { + if (message.lock) { + EnderIOController.INSTANCE.lockAndWaitForChange(message.windowId); + } else { + EnderIOController.INSTANCE.unlock(); + } + return null; + } + } } diff --git a/src/main/java/crazypants/enderio/enderface/PacketOpenServerGUI.java b/src/main/java/crazypants/enderio/enderface/PacketOpenServerGUI.java index 5ce00920..b9ca7206 100644 --- a/src/main/java/crazypants/enderio/enderface/PacketOpenServerGUI.java +++ b/src/main/java/crazypants/enderio/enderface/PacketOpenServerGUI.java @@ -1,67 +1,75 @@ package crazypants.enderio.enderface; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.util.Vec3; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.util.Vec3; public class PacketOpenServerGUI implements IMessage, IMessageHandler { - int x; - int y; - int z; - int side; - Vec3 hitVec; + int x; + int y; + int z; + int side; + Vec3 hitVec; - public PacketOpenServerGUI() { - } + public PacketOpenServerGUI() {} - public PacketOpenServerGUI(int x, int y, int z, int side, Vec3 hitVec) { - this.x = x; - this.y = y; - this.z = z; - this.side = side; - this.hitVec = hitVec; - } - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeInt(x); - buffer.writeInt(y); - buffer.writeInt(z); - buffer.writeInt(side); - buffer.writeDouble(hitVec.xCoord); - buffer.writeDouble(hitVec.yCoord); - buffer.writeDouble(hitVec.zCoord); - } - - @Override - public void fromBytes(ByteBuf buffer) { - x = buffer.readInt(); - y = buffer.readInt(); - z = buffer.readInt(); - side = buffer.readInt(); - hitVec = Vec3.createVectorHelper(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()); - } - - public IMessage onMessage(PacketOpenServerGUI message, MessageContext ctx) { - EntityPlayerMP player = (EntityPlayerMP) ctx.getServerHandler().playerEntity; - Container c = player.openContainer; - - PacketHandler.INSTANCE.sendTo(new PacketLockClientContainer(player.openContainer.windowId), player); - Vec3 hitVec = message.hitVec; - player.theItemInWorldManager.activateBlockOrUseItem(player, player.worldObj, null, message.x, message.y, message.z, message.side, (float) hitVec.xCoord, - (float) hitVec.yCoord, (float) hitVec.zCoord); - player.theItemInWorldManager.thisPlayerMP = player; - if (c != player.openContainer) { - EnderIOController.INSTANCE.addContainer(player, player.openContainer); - } else { - PacketHandler.INSTANCE.sendTo(new PacketLockClientContainer(), player); + public PacketOpenServerGUI(int x, int y, int z, int side, Vec3 hitVec) { + this.x = x; + this.y = y; + this.z = z; + this.side = side; + this.hitVec = hitVec; + } + + @Override + public void toBytes(ByteBuf buffer) { + buffer.writeInt(x); + buffer.writeInt(y); + buffer.writeInt(z); + buffer.writeInt(side); + buffer.writeDouble(hitVec.xCoord); + buffer.writeDouble(hitVec.yCoord); + buffer.writeDouble(hitVec.zCoord); + } + + @Override + public void fromBytes(ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + side = buffer.readInt(); + hitVec = Vec3.createVectorHelper(buffer.readDouble(), buffer.readDouble(), buffer.readDouble()); + } + + public IMessage onMessage(PacketOpenServerGUI message, MessageContext ctx) { + EntityPlayerMP player = (EntityPlayerMP) ctx.getServerHandler().playerEntity; + Container c = player.openContainer; + + PacketHandler.INSTANCE.sendTo(new PacketLockClientContainer(player.openContainer.windowId), player); + Vec3 hitVec = message.hitVec; + player.theItemInWorldManager.activateBlockOrUseItem( + player, + player.worldObj, + null, + message.x, + message.y, + message.z, + message.side, + (float) hitVec.xCoord, + (float) hitVec.yCoord, + (float) hitVec.zCoord); + player.theItemInWorldManager.thisPlayerMP = player; + if (c != player.openContainer) { + EnderIOController.INSTANCE.addContainer(player, player.openContainer); + } else { + PacketHandler.INSTANCE.sendTo(new PacketLockClientContainer(), player); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java index a59d10b9..0dc68bc7 100644 --- a/src/main/java/crazypants/enderio/enderface/TileEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/TileEnderIO.java @@ -1,45 +1,44 @@ package crazypants.enderio.enderface; -import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import net.minecraft.nbt.NBTTagCompound; public class TileEnderIO extends TileTravelAnchor { - float lastUiPitch = -45; - float lastUiYaw = 45; - double lastUiDistance = 10; + float lastUiPitch = -45; + float lastUiYaw = 45; + double lastUiDistance = 10; - float initUiPitch = -45; - float initUiYaw = 45; + float initUiPitch = -45; + float initUiYaw = 45; - @Override - @SideOnly(Side.CLIENT) - public double getMaxRenderDistanceSquared() { - return TravelController.instance.getMaxTravelDistanceSq(); - } + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() { + return TravelController.instance.getMaxTravelDistanceSq(); + } - @Override - public boolean shouldRenderInPass(int passNo) { - return passNo == 1; - } + @Override + public boolean shouldRenderInPass(int passNo) { + return passNo == 1; + } - @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - initUiPitch = par1nbtTagCompound.getFloat("defaultUiPitch"); - initUiYaw = par1nbtTagCompound.getFloat("defaultUiYaw"); - lastUiPitch = initUiPitch; - lastUiYaw = initUiYaw; - } - - @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); - par1nbtTagCompound.setFloat("defaultUiPitch", initUiPitch); - par1nbtTagCompound.setFloat("defaultUiYaw", initUiYaw); - } + @Override + public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { + super.readCustomNBT(par1nbtTagCompound); + initUiPitch = par1nbtTagCompound.getFloat("defaultUiPitch"); + initUiYaw = par1nbtTagCompound.getFloat("defaultUiYaw"); + lastUiPitch = initUiPitch; + lastUiYaw = initUiYaw; + } + @Override + public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { + super.writeCustomNBT(par1nbtTagCompound); + par1nbtTagCompound.setFloat("defaultUiPitch", initUiPitch); + par1nbtTagCompound.setFloat("defaultUiYaw", initUiYaw); + } } diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 20f8e26f..eb61949b 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -1,7 +1,8 @@ package crazypants.enderio.entity; +import com.enderio.core.common.util.EntityUtil; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.Calendar; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; @@ -16,79 +17,79 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import com.enderio.core.common.util.EntityUtil; - -import cpw.mods.fml.common.registry.GameRegistry; - public class EntityWitherSkeleton extends EntitySkeleton { - public EntityWitherSkeleton(World world) { - super(world); - } - - public EntityWitherSkeleton(EntitySkeleton entity) { - this(entity.worldObj); - this.copyLocationAndAnglesFrom(entity); - for (int i = 0; i < entity.getLastActiveItems().length; i++) { - this.setCurrentItemOrArmor(i, entity.getEquipmentInSlot(i)); - } - } - - @Override - public void setFire(int p_70015_1_) { - } - - @Override - public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) { - this.getEntityAttribute(SharedMonsterAttributes.followRange) - .applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); - this.setSkeletonType(1); - this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); - this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); - this.setCombatTask(); - this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); - - if(this.getEquipmentInSlot(4) == null) { - Calendar calendar = this.worldObj.getCurrentDate(); - - if(calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) { - this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); - this.equipmentDropChances[4] = 0.0F; - } + public EntityWitherSkeleton(World world) { + super(world); } - return entityData; - } - - @Override - public int getSkeletonType() { - return 1; - } - - @Override - public void onDeath(DamageSource source) { - super.onDeath(source); - if(source.damageType.equals("player")) { - EntityPlayer player = (EntityPlayer) source.getEntity(); - ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && stack.hasTagCompound()) { - Item cleaver = GameRegistry.findItem("TConstruct", "cleaver"); - int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if(stack.getItem() == cleaver) { - beheading += 2; + public EntityWitherSkeleton(EntitySkeleton entity) { + this(entity.worldObj); + this.copyLocationAndAnglesFrom(entity); + for (int i = 0; i < entity.getLastActiveItems().length; i++) { + this.setCurrentItemOrArmor(i, entity.getEquipmentInSlot(i)); } - if(beheading > 0 && worldObj.rand.nextInt(100) < beheading * 10) { - EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(Items.skull, 1, 1), posX, posY, posZ); - } - } } - if(source.getEntity() instanceof EntityLivingBase) { - int lootingLevel = EnchantmentHelper.getLootingModifier((EntityLivingBase) source.getEntity()); - if(worldObj.rand.nextInt(Math.max(1, 1 - lootingLevel)) == 0) { - Item necroticBone = GameRegistry.findItem("TConstruct", "materials"); - if(necroticBone != null) { - EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(necroticBone, 1, 8), posX, posY, posZ); + + @Override + public void setFire(int p_70015_1_) {} + + @Override + public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) { + this.getEntityAttribute(SharedMonsterAttributes.followRange) + .applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); + this.setSkeletonType(1); + this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); + this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); + this.setCombatTask(); + this.setCanPickUpLoot( + this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); + + if (this.getEquipmentInSlot(4) == null) { + Calendar calendar = this.worldObj.getCurrentDate(); + + if (calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) { + this.setCurrentItemOrArmor( + 4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); + this.equipmentDropChances[4] = 0.0F; + } + } + + return entityData; + } + + @Override + public int getSkeletonType() { + return 1; + } + + @Override + public void onDeath(DamageSource source) { + super.onDeath(source); + if (source.damageType.equals("player")) { + EntityPlayer player = (EntityPlayer) source.getEntity(); + ItemStack stack = player.getCurrentEquippedItem(); + if (stack != null && stack.hasTagCompound()) { + Item cleaver = GameRegistry.findItem("TConstruct", "cleaver"); + int beheading = + stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (stack.getItem() == cleaver) { + beheading += 2; + } + if (beheading > 0 && worldObj.rand.nextInt(100) < beheading * 10) { + EntityUtil.spawnItemInWorldWithRandomMotion( + worldObj, new ItemStack(Items.skull, 1, 1), posX, posY, posZ); + } + } + } + if (source.getEntity() instanceof EntityLivingBase) { + int lootingLevel = EnchantmentHelper.getLootingModifier((EntityLivingBase) source.getEntity()); + if (worldObj.rand.nextInt(Math.max(1, 1 - lootingLevel)) == 0) { + Item necroticBone = GameRegistry.findItem("TConstruct", "materials"); + if (necroticBone != null) { + EntityUtil.spawnItemInWorldWithRandomMotion( + worldObj, new ItemStack(necroticBone, 1, 8), posX, posY, posZ); + } + } } - } } - } } diff --git a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java index 1dbec581..edb00e48 100644 --- a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java +++ b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java @@ -1,41 +1,42 @@ package crazypants.enderio.entity; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.EntityRegistry; +import crazypants.enderio.EnderIO; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.EntityRegistry; -import crazypants.enderio.EnderIO; public class SkeletonHandler { - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void skeletonJoinWorld(LivingSpawnEvent event) { - if(!event.world.isRemote && isWitherSkele(event.entity)) { - event.entity.setDead(); - event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(LivingSpawnEvent event) { + if (!event.world.isRemote && isWitherSkele(event.entity)) { + event.entity.setDead(); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + } } - } - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void skeletonJoinWorld(EntityJoinWorldEvent event) { - if(!event.world.isRemote && isWitherSkele(event.entity) && !event.entity.isDead) { - event.setCanceled(true); - event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(EntityJoinWorldEvent event) { + if (!event.world.isRemote && isWitherSkele(event.entity) && !event.entity.isDead) { + event.setCanceled(true); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + } } - } - private boolean isWitherSkele(Entity entity) { - return entity.getClass() == EntitySkeleton.class && ((EntitySkeleton) entity).getSkeletonType() == 1; - } + private boolean isWitherSkele(Entity entity) { + return entity.getClass() == EntitySkeleton.class && ((EntitySkeleton) entity).getSkeletonType() == 1; + } - public static void registerSkeleton(EnderIO mod) { - int entityID = EntityRegistry.findGlobalUniqueEntityId(); - EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class, "witherSkeleton", entityID, 0x00003D, 0x751947); - EntityRegistry.registerModEntity(EntityWitherSkeleton.class, "witherSkeleton", entityID, mod, 64, 3, true); - MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); - } + public static void registerSkeleton(EnderIO mod) { + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID( + EntityWitherSkeleton.class, "witherSkeleton", entityID, 0x00003D, 0x751947); + EntityRegistry.registerModEntity(EntityWitherSkeleton.class, "witherSkeleton", entityID, mod, 64, 3, true); + MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + } } diff --git a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java index c706e568..a123e3c8 100644 --- a/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java +++ b/src/main/java/crazypants/enderio/fluid/BlockFluidEio.java @@ -1,13 +1,10 @@ package crazypants.enderio.fluid; -import java.util.Random; - -import org.apache.commons.lang3.StringUtils; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; +import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -22,233 +19,225 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; +import org.apache.commons.lang3.StringUtils; public class BlockFluidEio extends BlockFluidClassic { - public static class FireWater extends BlockFluidEio { + public static class FireWater extends BlockFluidEio { - protected FireWater(Fluid fluid, Material material) { - super(fluid, material); - } + protected FireWater(Fluid fluid, Material material) { + super(fluid, material); + } - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (!world.isRemote){ - entity.setFire(50); - super.onEntityCollidedWithBlock(world, x, y, z, entity); - } - } + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote) { + entity.setFire(50); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + } - @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return true; - } + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } - @Override - public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { - return true; - } + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } - @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return 60; - } - - } - - public static class Hootch extends BlockFluidEio { - - protected Hootch(Fluid fluid, Material material) { - super(fluid, material); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (!world.isRemote && entity instanceof EntityLivingBase) - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); - super.onEntityCollidedWithBlock(world, x, y, z, entity); - - } - - @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return true; - } - - @Override - public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return 1; - } - - @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return 60; - } - - } - - public static class RocketFuel extends BlockFluidEio { - - protected RocketFuel(Fluid fluid, Material material) { - super(fluid, material); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (!world.isRemote && entity instanceof EntityLivingBase) - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); - - super.onEntityCollidedWithBlock(world, x, y, z, entity); - - } - - @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return true; - } - - @Override - public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return 1; - } - - @Override - public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { - return 60; - } - - } - - public static class NutrientDistillation extends BlockFluidEio { - - private static final String EIO_LAST_FOOD_BOOST = "eioLastFoodBoost"; - - protected NutrientDistillation(Fluid fluid, Material material) { - super(fluid, material); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (!world.isRemote && entity instanceof EntityLivingBase) { - long time = entity.worldObj.getTotalWorldTime(); - EntityPlayerMP player = (EntityPlayerMP) entity; - if(time % Config.nutrientFoodBoostDelay == 0 && player.getEntityData().getLong(EIO_LAST_FOOD_BOOST) != time) { - player.getFoodStats().addStats(1, 0.1f); - player.getEntityData().setLong(EIO_LAST_FOOD_BOOST, time); - } - super.onEntityCollidedWithBlock(world, x, y, z, entity); - } - - } - - } - - public static class CloudSeedConcentrated extends BlockFluidEio { - - protected CloudSeedConcentrated(Fluid fluid, Material material) { - super(fluid, material); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (!world.isRemote && entity instanceof EntityLivingBase) { - ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 40, 0, true)); - } - super.onEntityCollidedWithBlock(world, x, y, z, entity); - - } - - } - - public static class VapourOfLevity extends BlockFluidEio { - - private static final int[] COLORS = { 0x0c82d0, 0x90c8ec, 0x5174ed, 0x0d2f65, 0x4accee }; - - protected VapourOfLevity(Fluid fluid, Material material, int fogColor) { - super(fluid, material); - } - - @Override - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { - if (entity instanceof EntityPlayer || (!world.isRemote && entity instanceof EntityLivingBase)) { - ((EntityLivingBase) entity).motionY += 0.1; - } - super.onEntityCollidedWithBlock(world, x, y, z, entity); - - } - - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - if (rand.nextFloat() < .5f) { - int col = COLORS[rand.nextInt(COLORS.length)]; - world.spawnParticle("reddust", x, y, z, (col >> 16 & 255) / 255d, (col >> 8 & 255) / 255d, (col & 255) / 255d); - } - } - - } - - - public static BlockFluidEio create(Fluid fluid, Material material) { - BlockFluidEio res = new BlockFluidEio(fluid, material); - res.init(); - fluid.setBlock(res); - return res; - } - - protected Fluid fluid; - - protected BlockFluidEio(Fluid fluid, Material material) { - super(fluid, material); - this.fluid = fluid; - setBlockName(fluid.getUnlocalizedName()); - } - - protected void init() { - GameRegistry.registerBlock(this, "block" + StringUtils.capitalize(fluidName)); - } - - @SideOnly(Side.CLIENT) - protected IIcon[] icons; - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side != 0 && side != 1 ? this.icons[1] : this.icons[0]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - icons = new IIcon[] { iconRegister.registerIcon("enderio:" + fluidName + "_still"), - iconRegister.registerIcon("enderio:" + fluidName + "_flow") }; - - fluid.setIcons(icons[0], icons[1]); - } - - @Override - public boolean canDisplace(IBlockAccess world, int x, int y, int z) { - if(world.getBlock(x, y, z).getMaterial().isLiquid()) { - return false; + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } } - return super.canDisplace(world, x, y, z); - } - @Override - public boolean displaceIfPossible(World world, int x, int y, int z) { - if(world.getBlock(x, y, z).getMaterial().isLiquid()) { - return false; + public static class Hootch extends BlockFluidEio { + + protected Hootch(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 150, 0, true)); + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } } - return super.displaceIfPossible(world, x, y, z); - } -} \ No newline at end of file + public static class RocketFuel extends BlockFluidEio { + + protected RocketFuel(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 150, 3, true)); + + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + + @Override + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return true; + } + + @Override + public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 1; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { + return 60; + } + } + + public static class NutrientDistillation extends BlockFluidEio { + + private static final String EIO_LAST_FOOD_BOOST = "eioLastFoodBoost"; + + protected NutrientDistillation(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + long time = entity.worldObj.getTotalWorldTime(); + EntityPlayerMP player = (EntityPlayerMP) entity; + if (time % Config.nutrientFoodBoostDelay == 0 + && player.getEntityData().getLong(EIO_LAST_FOOD_BOOST) != time) { + player.getFoodStats().addStats(1, 0.1f); + player.getEntityData().setLong(EIO_LAST_FOOD_BOOST, time); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + } + } + + public static class CloudSeedConcentrated extends BlockFluidEio { + + protected CloudSeedConcentrated(Fluid fluid, Material material) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (!world.isRemote && entity instanceof EntityLivingBase) { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 40, 0, true)); + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + } + + public static class VapourOfLevity extends BlockFluidEio { + + private static final int[] COLORS = {0x0c82d0, 0x90c8ec, 0x5174ed, 0x0d2f65, 0x4accee}; + + protected VapourOfLevity(Fluid fluid, Material material, int fogColor) { + super(fluid, material); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + if (entity instanceof EntityPlayer || (!world.isRemote && entity instanceof EntityLivingBase)) { + ((EntityLivingBase) entity).motionY += 0.1; + } + super.onEntityCollidedWithBlock(world, x, y, z, entity); + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if (rand.nextFloat() < .5f) { + int col = COLORS[rand.nextInt(COLORS.length)]; + world.spawnParticle( + "reddust", x, y, z, (col >> 16 & 255) / 255d, (col >> 8 & 255) / 255d, (col & 255) / 255d); + } + } + } + + public static BlockFluidEio create(Fluid fluid, Material material) { + BlockFluidEio res = new BlockFluidEio(fluid, material); + res.init(); + fluid.setBlock(res); + return res; + } + + protected Fluid fluid; + + protected BlockFluidEio(Fluid fluid, Material material) { + super(fluid, material); + this.fluid = fluid; + setBlockName(fluid.getUnlocalizedName()); + } + + protected void init() { + GameRegistry.registerBlock(this, "block" + StringUtils.capitalize(fluidName)); + } + + @SideOnly(Side.CLIENT) + protected IIcon[] icons; + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return side != 0 && side != 1 ? this.icons[1] : this.icons[0]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + icons = new IIcon[] { + iconRegister.registerIcon("enderio:" + fluidName + "_still"), + iconRegister.registerIcon("enderio:" + fluidName + "_flow") + }; + + fluid.setIcons(icons[0], icons[1]); + } + + @Override + public boolean canDisplace(IBlockAccess world, int x, int y, int z) { + if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + return false; + } + return super.canDisplace(world, x, y, z); + } + + @Override + public boolean displaceIfPossible(World world, int x, int y, int z) { + if (world.getBlock(x, y, z).getMaterial().isLiquid()) { + return false; + } + return super.displaceIfPossible(world, x, y, z); + } +} diff --git a/src/main/java/crazypants/enderio/fluid/BucketHandler.java b/src/main/java/crazypants/enderio/fluid/BucketHandler.java index 063f52a6..1db121b4 100644 --- a/src/main/java/crazypants/enderio/fluid/BucketHandler.java +++ b/src/main/java/crazypants/enderio/fluid/BucketHandler.java @@ -1,8 +1,9 @@ package crazypants.enderio.fluid; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.HashMap; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -11,75 +12,73 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class BucketHandler { - public static BucketHandler instance = new BucketHandler(); + public static BucketHandler instance = new BucketHandler(); - static { - MinecraftForge.EVENT_BUS.register(instance); - } - - private Map buckets = new HashMap(); - - private BucketHandler() { - } - - public void registerFluid(Block fluidBlock, Item fullBucket) { - buckets.put(fluidBlock, fullBucket); - } - - @SubscribeEvent - public void onBucketFill(FillBucketEvent event) { - // no instanceof check, someone may subclass the vanilla bucket - if (event.current != null && event.current.getItem() == Items.bucket && event.current.stackSize > 0) { - ItemStack res = getFilledBucket(event.world, event.target); - if (res != null) { - event.result = res; - event.setResult(Result.ALLOW); - } + static { + MinecraftForge.EVENT_BUS.register(instance); } - } - private ItemStack getFilledBucket(World world, MovingObjectPosition pos) { + private Map buckets = new HashMap(); - Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - Item bucket = buckets.get(block); - if(bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { - world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - return new ItemStack(bucket); - } else { - return null; + private BucketHandler() {} + + public void registerFluid(Block fluidBlock, Item fullBucket) { + buckets.put(fluidBlock, fullBucket); } - } - // @SubscribeEvent - // public void addFuelTooltip(ItemTooltipEvent evt) { - // ItemStack stack = evt.itemStack; - // if(stack == null) { - // return; - // } - // - // if(Config.addFuelTooltipsToAllFluidContainers || stack.getItem() instanceof ItemBucketEio) { - // FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); - // if(fluidStack == null) { - // return; - // } - // addTooltipForFluid(evt.toolTip, fluidStack.getFluid()); - // } - // } - // - // protected void addTooltipForFluid(List list, Fluid fluid) { - // if(fluid != null) { - // Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); - // if(fuel != null) { - // list.add(EnderIO.lang.localize("fuel.tooltip.heading")); - // list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); - // list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + EnderIO.lang.localize("fuel.tooltip.burnTime")); - // } - // } - // } + @SubscribeEvent + public void onBucketFill(FillBucketEvent event) { + // no instanceof check, someone may subclass the vanilla bucket + if (event.current != null && event.current.getItem() == Items.bucket && event.current.stackSize > 0) { + ItemStack res = getFilledBucket(event.world, event.target); + if (res != null) { + event.result = res; + event.setResult(Result.ALLOW); + } + } + } + + private ItemStack getFilledBucket(World world, MovingObjectPosition pos) { + + Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Item bucket = buckets.get(block); + if (bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { + world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); + return new ItemStack(bucket); + } else { + return null; + } + } + + // @SubscribeEvent + // public void addFuelTooltip(ItemTooltipEvent evt) { + // ItemStack stack = evt.itemStack; + // if(stack == null) { + // return; + // } + // + // if(Config.addFuelTooltipsToAllFluidContainers || stack.getItem() instanceof ItemBucketEio) { + // FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); + // if(fluidStack == null) { + // return; + // } + // addTooltipForFluid(evt.toolTip, fluidStack.getFluid()); + // } + // } + // + // protected void addTooltipForFluid(List list, Fluid fluid) { + // if(fluid != null) { + // Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); + // if(fuel != null) { + // list.add(EnderIO.lang.localize("fuel.tooltip.heading")); + // list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); + // list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + + // EnderIO.lang.localize("fuel.tooltip.burnTime")); + // } + // } + // } } diff --git a/src/main/java/crazypants/enderio/fluid/BuildCraftFluidRegister.java b/src/main/java/crazypants/enderio/fluid/BuildCraftFluidRegister.java index 6c83201c..0d92b9c7 100644 --- a/src/main/java/crazypants/enderio/fluid/BuildCraftFluidRegister.java +++ b/src/main/java/crazypants/enderio/fluid/BuildCraftFluidRegister.java @@ -1,91 +1,88 @@ package crazypants.enderio.fluid; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.ICoolant; import buildcraft.api.fuels.IFuel; import crazypants.enderio.fluid.FluidFuelRegister.CoolantImpl; import crazypants.enderio.fluid.FluidFuelRegister.FuelImpl; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; public class BuildCraftFluidRegister implements IFluidRegister { - public BuildCraftFluidRegister() throws Exception { - //Make it go splat in object construction if an older version of - //build craft is installed - Class.forName("buildcraft.api.fuels.BuildcraftFuelRegistry"); - } - - @Override - public void addCoolant(Fluid fluid, float degreesCoolingPerMB) { - if(BuildcraftFuelRegistry.coolant != null && BuildcraftFuelRegistry.coolant.getCoolant(fluid) == null) { - BuildcraftFuelRegistry.coolant.addCoolant(fluid, degreesCoolingPerMB); - } - } - - @Override - public IFluidCoolant getCoolant(Fluid fluid) { - if(fluid != null && BuildcraftFuelRegistry.coolant != null) { - ICoolant bcCool = BuildcraftFuelRegistry.coolant.getCoolant(fluid); - if(bcCool != null) { - return new CoolantBC(bcCool); - } - } - return null; - } - - @Override - public IFluidCoolant getCoolant(FluidStack fluid) { - if(fluid == null || fluid.getFluid() == null) { - return null; - } - return getCoolant(fluid.getFluid()); - } - - @Override - public void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime) { - if(BuildcraftFuelRegistry.fuel != null && BuildcraftFuelRegistry.fuel.getFuel(fluid) == null) { - BuildcraftFuelRegistry.fuel.addFuel(fluid, powerPerCycleRF, totalBurnTime); - } - } - - @Override - public IFluidFuel getFuel(Fluid fluid) { - if(fluid == null) { - return null; - } - if(BuildcraftFuelRegistry.fuel != null) { - IFuel bcFuel = BuildcraftFuelRegistry.fuel.getFuel(fluid); - if(bcFuel != null) { - return new FuelBC(bcFuel); - } - } - return null; - } - - @Override - public IFluidFuel getFuel(FluidStack fluid) { - if(fluid == null || fluid.getFluid() == null) { - return null; - } - return getFuel(fluid.getFluid()); - } - - private static class FuelBC extends FuelImpl { - - FuelBC(IFuel fuel) { - super(fuel.getFluid(), fuel.getPowerPerCycle(), fuel.getTotalBurningTime()); + public BuildCraftFluidRegister() throws Exception { + // Make it go splat in object construction if an older version of + // build craft is installed + Class.forName("buildcraft.api.fuels.BuildcraftFuelRegistry"); } - } - - private static class CoolantBC extends CoolantImpl { - - CoolantBC(ICoolant coolant) { - //NB: in the current BC impl the temperature to getDegreesCoolingPerMB is ignored - super(coolant.getFluid(), coolant.getDegreesCoolingPerMB(100)); + @Override + public void addCoolant(Fluid fluid, float degreesCoolingPerMB) { + if (BuildcraftFuelRegistry.coolant != null && BuildcraftFuelRegistry.coolant.getCoolant(fluid) == null) { + BuildcraftFuelRegistry.coolant.addCoolant(fluid, degreesCoolingPerMB); + } } - } + @Override + public IFluidCoolant getCoolant(Fluid fluid) { + if (fluid != null && BuildcraftFuelRegistry.coolant != null) { + ICoolant bcCool = BuildcraftFuelRegistry.coolant.getCoolant(fluid); + if (bcCool != null) { + return new CoolantBC(bcCool); + } + } + return null; + } + @Override + public IFluidCoolant getCoolant(FluidStack fluid) { + if (fluid == null || fluid.getFluid() == null) { + return null; + } + return getCoolant(fluid.getFluid()); + } + + @Override + public void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime) { + if (BuildcraftFuelRegistry.fuel != null && BuildcraftFuelRegistry.fuel.getFuel(fluid) == null) { + BuildcraftFuelRegistry.fuel.addFuel(fluid, powerPerCycleRF, totalBurnTime); + } + } + + @Override + public IFluidFuel getFuel(Fluid fluid) { + if (fluid == null) { + return null; + } + if (BuildcraftFuelRegistry.fuel != null) { + IFuel bcFuel = BuildcraftFuelRegistry.fuel.getFuel(fluid); + if (bcFuel != null) { + return new FuelBC(bcFuel); + } + } + return null; + } + + @Override + public IFluidFuel getFuel(FluidStack fluid) { + if (fluid == null || fluid.getFluid() == null) { + return null; + } + return getFuel(fluid.getFluid()); + } + + private static class FuelBC extends FuelImpl { + + FuelBC(IFuel fuel) { + super(fuel.getFluid(), fuel.getPowerPerCycle(), fuel.getTotalBurningTime()); + } + } + + private static class CoolantBC extends CoolantImpl { + + CoolantBC(ICoolant coolant) { + // NB: in the current BC impl the temperature to getDegreesCoolingPerMB is ignored + super(coolant.getFluid(), coolant.getDegreesCoolingPerMB(100)); + } + } } diff --git a/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java b/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java index ea48921b..ea816df3 100644 --- a/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java +++ b/src/main/java/crazypants/enderio/fluid/FluidFuelRegister.java @@ -1,203 +1,203 @@ package crazypants.enderio.fluid; +import cpw.mods.fml.common.Loader; +import crazypants.enderio.Log; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.Loader; -import crazypants.enderio.Log; public class FluidFuelRegister implements IFluidRegister { - public static final FluidFuelRegister instance = new FluidFuelRegister(); + public static final FluidFuelRegister instance = new FluidFuelRegister(); - private static final String KEY_FLUID_NAME = "fluidName"; - private static final String KEY_POWER_PER_CYCLE = "powerPerCycle"; - private static final String KEY_TOTAL_BURN_TIME = "totalBurnTime"; - private static final String KEY_COOLING_PER_MB = "coolingPerMb"; + private static final String KEY_FLUID_NAME = "fluidName"; + private static final String KEY_POWER_PER_CYCLE = "powerPerCycle"; + private static final String KEY_TOTAL_BURN_TIME = "totalBurnTime"; + private static final String KEY_COOLING_PER_MB = "coolingPerMb"; - private final Map coolants = new HashMap(); - private final Map fuels = new HashMap(); + private final Map coolants = new HashMap(); + private final Map fuels = new HashMap(); - private final List otherRegisters = new ArrayList(); + private final List otherRegisters = new ArrayList(); - private FluidFuelRegister() { - addCoolant(FluidRegistry.WATER, 0.0023f); - if(Loader.isModLoaded("BuildCraft|Energy")) { - try { - IFluidRegister reg = (IFluidRegister) Class.forName("crazypants.enderio.fluid.BuildCraftFluidRegister").newInstance(); - otherRegisters.add(reg); - } catch (Exception e) { - Log.error("FluidFuelRegister: Error occured registering build craft fuels: " + e); - } - } - } - - public void addCoolant(NBTTagCompound tag) { - if(tag == null) { - return; - } - if(!tag.hasKey(KEY_FLUID_NAME)) { - return; - } - if(!tag.hasKey(KEY_COOLING_PER_MB)) { - return; - } - addCoolant(tag.getString(KEY_FLUID_NAME), tag.getFloat(KEY_COOLING_PER_MB)); - } - - public void addCoolant(String fluidName, float degreesCoolingPerMB) { - addCoolant(FluidRegistry.getFluid(fluidName), degreesCoolingPerMB); - } - - @Override - public void addCoolant(Fluid fluid, float degreesCoolingPerMB) { - if(fluid == null || coolants.get(fluid.getName()) != null) { - return; - } - coolants.put(fluid.getName(), new CoolantImpl(fluid, degreesCoolingPerMB)); - for (IFluidRegister reg : otherRegisters) { - reg.addCoolant(fluid, degreesCoolingPerMB); - } - } - - - @Override - public IFluidCoolant getCoolant(Fluid fluid) { - if(fluid == null) { - return null; - } - IFluidCoolant res = coolants.get(fluid.getName()); - if(res == null && !coolants.containsKey(fluid.getName())) { - for (IFluidRegister reg : otherRegisters) { - res = reg.getCoolant(fluid); - if(res != null) { - break; + private FluidFuelRegister() { + addCoolant(FluidRegistry.WATER, 0.0023f); + if (Loader.isModLoaded("BuildCraft|Energy")) { + try { + IFluidRegister reg = (IFluidRegister) Class.forName("crazypants.enderio.fluid.BuildCraftFluidRegister") + .newInstance(); + otherRegisters.add(reg); + } catch (Exception e) { + Log.error("FluidFuelRegister: Error occured registering build craft fuels: " + e); + } } - } - coolants.put(fluid.getName(), res); } - return res; - } - @Override - public IFluidCoolant getCoolant(FluidStack fluid) { - if(fluid == null || fluid.getFluid() == null) { - return null; - } - return getCoolant(fluid.getFluid()); - } - - public void addFuel(NBTTagCompound tag) { - if(tag == null) { - return; - } - if(!tag.hasKey(KEY_FLUID_NAME)) { - return; - } - if(!tag.hasKey(KEY_POWER_PER_CYCLE)) { - return; - } - if(!tag.hasKey(KEY_TOTAL_BURN_TIME)) { - return; - } - addFuel(tag.getString(KEY_FLUID_NAME), tag.getInteger(KEY_POWER_PER_CYCLE), tag.getInteger(KEY_TOTAL_BURN_TIME)); - } - - public void addFuel(String fluidName, int powerPerCycleRF, int totalBurnTime) { - addFuel(FluidRegistry.getFluid(fluidName), powerPerCycleRF, totalBurnTime); - } - - @Override - public void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime) { - if(fluid == null || fuels.get(fluid.getName()) != null) { - return; - } - fuels.put(fluid.getName(), new FuelImpl(fluid, powerPerCycleRF, totalBurnTime)); - for (IFluidRegister reg : otherRegisters) { - reg.addFuel(fluid, powerPerCycleRF, totalBurnTime); - } - } - - @Override - public IFluidFuel getFuel(Fluid fluid) { - if(fluid == null) { - return null; - } - IFluidFuel res = fuels.get(fluid.getName()); - if(res == null && !fuels.containsKey(fluid.getName())) { - for (IFluidRegister reg : otherRegisters) { - res = reg.getFuel(fluid); - if(res != null) { - break; + public void addCoolant(NBTTagCompound tag) { + if (tag == null) { + return; } - } - fuels.put(fluid.getName(), res); + if (!tag.hasKey(KEY_FLUID_NAME)) { + return; + } + if (!tag.hasKey(KEY_COOLING_PER_MB)) { + return; + } + addCoolant(tag.getString(KEY_FLUID_NAME), tag.getFloat(KEY_COOLING_PER_MB)); } - return res; - } - @Override - public IFluidFuel getFuel(FluidStack fluid) { - if(fluid == null || fluid.getFluid() == null) { - return null; - } - return getFuel(fluid.getFluid()); - } - - public static class FuelImpl implements IFluidFuel { - - private final Fluid fluid; - private final int powerPerCycle; - private final int totalBurningTime; - - public FuelImpl(Fluid fluid, int powerPerCycle, int totalBurningTime) { - this.fluid = fluid; - this.powerPerCycle = powerPerCycle; - this.totalBurningTime = totalBurningTime; + public void addCoolant(String fluidName, float degreesCoolingPerMB) { + addCoolant(FluidRegistry.getFluid(fluidName), degreesCoolingPerMB); } @Override - public Fluid getFluid() { - return fluid; + public void addCoolant(Fluid fluid, float degreesCoolingPerMB) { + if (fluid == null || coolants.get(fluid.getName()) != null) { + return; + } + coolants.put(fluid.getName(), new CoolantImpl(fluid, degreesCoolingPerMB)); + for (IFluidRegister reg : otherRegisters) { + reg.addCoolant(fluid, degreesCoolingPerMB); + } } @Override - public int getTotalBurningTime() { - return totalBurningTime; + public IFluidCoolant getCoolant(Fluid fluid) { + if (fluid == null) { + return null; + } + IFluidCoolant res = coolants.get(fluid.getName()); + if (res == null && !coolants.containsKey(fluid.getName())) { + for (IFluidRegister reg : otherRegisters) { + res = reg.getCoolant(fluid); + if (res != null) { + break; + } + } + coolants.put(fluid.getName(), res); + } + return res; } @Override - public int getPowerPerCycle() { - return powerPerCycle; + public IFluidCoolant getCoolant(FluidStack fluid) { + if (fluid == null || fluid.getFluid() == null) { + return null; + } + return getCoolant(fluid.getFluid()); } - } + public void addFuel(NBTTagCompound tag) { + if (tag == null) { + return; + } + if (!tag.hasKey(KEY_FLUID_NAME)) { + return; + } + if (!tag.hasKey(KEY_POWER_PER_CYCLE)) { + return; + } + if (!tag.hasKey(KEY_TOTAL_BURN_TIME)) { + return; + } + addFuel( + tag.getString(KEY_FLUID_NAME), + tag.getInteger(KEY_POWER_PER_CYCLE), + tag.getInteger(KEY_TOTAL_BURN_TIME)); + } - public static class CoolantImpl implements IFluidCoolant { - - private final Fluid fluid; - private final float degreesCoolingPerMB; - - public CoolantImpl(Fluid fluid, float degreesCoolingPerMB) { - this.fluid = fluid; - this.degreesCoolingPerMB = degreesCoolingPerMB; + public void addFuel(String fluidName, int powerPerCycleRF, int totalBurnTime) { + addFuel(FluidRegistry.getFluid(fluidName), powerPerCycleRF, totalBurnTime); } @Override - public Fluid getFluid() { - return fluid; + public void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime) { + if (fluid == null || fuels.get(fluid.getName()) != null) { + return; + } + fuels.put(fluid.getName(), new FuelImpl(fluid, powerPerCycleRF, totalBurnTime)); + for (IFluidRegister reg : otherRegisters) { + reg.addFuel(fluid, powerPerCycleRF, totalBurnTime); + } } @Override - public float getDegreesCoolingPerMB(float heat) { - return degreesCoolingPerMB; + public IFluidFuel getFuel(Fluid fluid) { + if (fluid == null) { + return null; + } + IFluidFuel res = fuels.get(fluid.getName()); + if (res == null && !fuels.containsKey(fluid.getName())) { + for (IFluidRegister reg : otherRegisters) { + res = reg.getFuel(fluid); + if (res != null) { + break; + } + } + fuels.put(fluid.getName(), res); + } + return res; } - } + @Override + public IFluidFuel getFuel(FluidStack fluid) { + if (fluid == null || fluid.getFluid() == null) { + return null; + } + return getFuel(fluid.getFluid()); + } + + public static class FuelImpl implements IFluidFuel { + + private final Fluid fluid; + private final int powerPerCycle; + private final int totalBurningTime; + + public FuelImpl(Fluid fluid, int powerPerCycle, int totalBurningTime) { + this.fluid = fluid; + this.powerPerCycle = powerPerCycle; + this.totalBurningTime = totalBurningTime; + } + + @Override + public Fluid getFluid() { + return fluid; + } + + @Override + public int getTotalBurningTime() { + return totalBurningTime; + } + + @Override + public int getPowerPerCycle() { + return powerPerCycle; + } + } + + public static class CoolantImpl implements IFluidCoolant { + + private final Fluid fluid; + private final float degreesCoolingPerMB; + + public CoolantImpl(Fluid fluid, float degreesCoolingPerMB) { + this.fluid = fluid; + this.degreesCoolingPerMB = degreesCoolingPerMB; + } + + @Override + public Fluid getFluid() { + return fluid; + } + + @Override + public float getDegreesCoolingPerMB(float heat) { + return degreesCoolingPerMB; + } + } } diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index 5917e5e3..08a9a172 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -5,25 +5,24 @@ import net.minecraftforge.fluids.IFluidTank; public class Fluids { - public static final String NUTRIENT_DISTILLATION = "nutrient_distillation"; - public static final String HOOTCH = "hootch"; - public static final String ROCKET_FUEL = "rocket_fuel"; - public static final String FIRE_WATER = "fire_water"; - public static final String LIQUID_SUNSHINE = "liquid_sunshine"; - public static final String CLOUD_SEED = "cloud_seed"; - public static final String CLOUD_SEED_CONCENTRATED = "cloud_seed_concentrated"; - public static final String ENDER_DISTILLATION = "ender_distillation"; - public static final String VAPOR_OF_LEVITY = "vapor_of_levity"; + public static final String NUTRIENT_DISTILLATION = "nutrient_distillation"; + public static final String HOOTCH = "hootch"; + public static final String ROCKET_FUEL = "rocket_fuel"; + public static final String FIRE_WATER = "fire_water"; + public static final String LIQUID_SUNSHINE = "liquid_sunshine"; + public static final String CLOUD_SEED = "cloud_seed"; + public static final String CLOUD_SEED_CONCENTRATED = "cloud_seed_concentrated"; + public static final String ENDER_DISTILLATION = "ender_distillation"; + public static final String VAPOR_OF_LEVITY = "vapor_of_levity"; - public static String toCapactityString(IFluidTank tank) { - if(tank == null) { - return "0/0 " + MB(); - } - return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); - } - - public static String MB() { - return EnderIO.lang.localize("fluid.millibucket.abr"); - } + public static String toCapactityString(IFluidTank tank) { + if (tank == null) { + return "0/0 " + MB(); + } + return tank.getFluidAmount() + "/" + tank.getCapacity() + " " + MB(); + } + public static String MB() { + return EnderIO.lang.localize("fluid.millibucket.abr"); + } } diff --git a/src/main/java/crazypants/enderio/fluid/IFluidCoolant.java b/src/main/java/crazypants/enderio/fluid/IFluidCoolant.java index 757b9c0c..d624a570 100644 --- a/src/main/java/crazypants/enderio/fluid/IFluidCoolant.java +++ b/src/main/java/crazypants/enderio/fluid/IFluidCoolant.java @@ -4,8 +4,7 @@ import net.minecraftforge.fluids.Fluid; public interface IFluidCoolant { - Fluid getFluid(); + Fluid getFluid(); - float getDegreesCoolingPerMB(float heat); - + float getDegreesCoolingPerMB(float heat); } diff --git a/src/main/java/crazypants/enderio/fluid/IFluidFuel.java b/src/main/java/crazypants/enderio/fluid/IFluidFuel.java index 857b6e8d..45d2a1cc 100644 --- a/src/main/java/crazypants/enderio/fluid/IFluidFuel.java +++ b/src/main/java/crazypants/enderio/fluid/IFluidFuel.java @@ -4,9 +4,9 @@ import net.minecraftforge.fluids.Fluid; public interface IFluidFuel { - Fluid getFluid(); + Fluid getFluid(); - int getTotalBurningTime(); + int getTotalBurningTime(); - int getPowerPerCycle(); + int getPowerPerCycle(); } diff --git a/src/main/java/crazypants/enderio/fluid/IFluidRegister.java b/src/main/java/crazypants/enderio/fluid/IFluidRegister.java index 37600444..bc2fdfd8 100644 --- a/src/main/java/crazypants/enderio/fluid/IFluidRegister.java +++ b/src/main/java/crazypants/enderio/fluid/IFluidRegister.java @@ -5,16 +5,15 @@ import net.minecraftforge.fluids.FluidStack; public interface IFluidRegister { - IFluidFuel getFuel(FluidStack fluid); + IFluidFuel getFuel(FluidStack fluid); - IFluidFuel getFuel(Fluid fluid); + IFluidFuel getFuel(Fluid fluid); - void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime); + void addFuel(Fluid fluid, int powerPerCycleRF, int totalBurnTime); - IFluidCoolant getCoolant(FluidStack fluid); + IFluidCoolant getCoolant(FluidStack fluid); - IFluidCoolant getCoolant(Fluid fluid); - - void addCoolant(Fluid fluid, float degreesCoolingPerMB); + IFluidCoolant getCoolant(Fluid fluid); + void addCoolant(Fluid fluid, float degreesCoolingPerMB); } diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index 35bda744..04d630ee 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -1,5 +1,7 @@ package crazypants.enderio.fluid; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -7,37 +9,33 @@ import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; - import org.apache.commons.lang3.StringUtils; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIOTab; - public class ItemBucketEio extends ItemBucket { - public static ItemBucketEio create(Fluid fluid) { - ItemBucketEio b = new ItemBucketEio(fluid.getBlock() != null ? fluid.getBlock() : Blocks.air, fluid.getName()); - b.init(); + public static ItemBucketEio create(Fluid fluid) { + ItemBucketEio b = new ItemBucketEio(fluid.getBlock() != null ? fluid.getBlock() : Blocks.air, fluid.getName()); + b.init(); - FluidContainerRegistry.registerFluidContainer(fluid, new ItemStack(b), new ItemStack(Items.bucket)); - BucketHandler.instance.registerFluid(fluid.getBlock(), b); + FluidContainerRegistry.registerFluidContainer(fluid, new ItemStack(b), new ItemStack(Items.bucket)); + BucketHandler.instance.registerFluid(fluid.getBlock(), b); - return b; - } + return b; + } - private String fluidName; + private String fluidName; - protected ItemBucketEio(Block block, String fluidName) { - super(block); - this.fluidName = fluidName; - setCreativeTab(EnderIOTab.tabEnderIO); - setContainerItem(Items.bucket); - String str = "bucket" + StringUtils.capitalize(fluidName); - setUnlocalizedName(str); - setTextureName("enderio:" + str); - } + protected ItemBucketEio(Block block, String fluidName) { + super(block); + this.fluidName = fluidName; + setCreativeTab(EnderIOTab.tabEnderIO); + setContainerItem(Items.bucket); + String str = "bucket" + StringUtils.capitalize(fluidName); + setUnlocalizedName(str); + setTextureName("enderio:" + str); + } - protected void init() { - GameRegistry.registerItem(this, "bucket" + StringUtils.capitalize(fluidName)); - } + protected void init() { + GameRegistry.registerItem(this, "bucket" + StringUtils.capitalize(fluidName)); + } } diff --git a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java index 0e911136..fcf4d14a 100644 --- a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java +++ b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java @@ -1,44 +1,40 @@ package crazypants.enderio.gui; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.inventory.Container; -import net.minecraft.util.ResourceLocation; - import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.inventory.Container; +import net.minecraft.util.ResourceLocation; public abstract class GuiContainerBaseEIO extends GuiContainerBase { - private static final String TEXTURE_PATH = ":textures/gui/23/"; - private static final String TEXTURE_EXT = ".png"; + private static final String TEXTURE_PATH = ":textures/gui/23/"; + private static final String TEXTURE_EXT = ".png"; - private final List guiTextures = new ArrayList(); + private final List guiTextures = new ArrayList(); - public GuiContainerBaseEIO(Container par1Container, String... guiTexture) { - super(par1Container); - for (String string : guiTexture) { - guiTextures.add(getGuiTexture(string)); + public GuiContainerBaseEIO(Container par1Container, String... guiTexture) { + super(par1Container); + for (String string : guiTexture) { + guiTextures.add(getGuiTexture(string)); + } } - } - public void bindGuiTexture() { - bindGuiTexture(0); - } + public void bindGuiTexture() { + bindGuiTexture(0); + } - public void bindGuiTexture(int id) { - RenderUtil.bindTexture(getGuiTexture(id)); - } + public void bindGuiTexture(int id) { + RenderUtil.bindTexture(getGuiTexture(id)); + } - protected ResourceLocation getGuiTexture(int id) { - return guiTextures.size() > id ? guiTextures.get(id) : null; - } - - public static ResourceLocation getGuiTexture(String name) { - return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT); - } + protected ResourceLocation getGuiTexture(int id) { + return guiTextures.size() > id ? guiTextures.get(id) : null; + } + public static ResourceLocation getGuiTexture(String name) { + return new ResourceLocation(EnderIO.DOMAIN + TEXTURE_PATH + name + TEXTURE_EXT); + } } diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 4b75b0c3..2b36c9e6 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -1,200 +1,204 @@ package crazypants.enderio.gui; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.api.client.render.IWidgetMap; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; public enum IconEIO implements IWidgetIcon { + TICK(0, 192), + MINUS(16, 192), + LOCK_UNLOCKED(32, 192), + LOCK_LOCKED(48, 192), + CROSS(64, 192), + PLUS(80, 192), + ARROWS(176, 192), + ADD(112, 240), + SUBTRACT(96, 240), - TICK(0, 192), - MINUS(16, 192), - LOCK_UNLOCKED(32, 192), - LOCK_LOCKED(48, 192), - CROSS(64, 192), - PLUS(80, 192), - ARROWS(176, 192), - ADD(112, 240), - SUBTRACT(96, 240), + WRENCH_OVERLAY_POWER(0, 112), + WRENCH_OVERLAY_POWER_OFF(0 + 48, 112), - WRENCH_OVERLAY_POWER(0, 112), - WRENCH_OVERLAY_POWER_OFF(0 + 48, 112), + WRENCH_OVERLAY_REDSTONE(16, 112), + WRENCH_OVERLAY_REDSTONE_OFF(16 + 48, 112), - WRENCH_OVERLAY_REDSTONE(16, 112), - WRENCH_OVERLAY_REDSTONE_OFF(16 + 48, 112), + WRENCH_OVERLAY_FLUID(0, 128), + WRENCH_OVERLAY_FLUID_OFF(0 + 48, 128), - WRENCH_OVERLAY_FLUID(0, 128), - WRENCH_OVERLAY_FLUID_OFF(0 + 48, 128), + WRENCH_OVERLAY_ITEM(16, 128), + WRENCH_OVERLAY_ITEM_OFF(16 + 48, 128), - WRENCH_OVERLAY_ITEM(16, 128), - WRENCH_OVERLAY_ITEM_OFF(16 + 48, 128), + WRENCH_OVERLAY_GAS(32, 112), + WRENCH_OVERLAY_GAS_OFF(32 + 48, 112), - WRENCH_OVERLAY_GAS(32, 112), - WRENCH_OVERLAY_GAS_OFF(32 + 48, 112), + WRENCH_OVERLAY_ME(32, 128), + WRENCH_OVERLAY_ME_OFF(32 + 48, 128), - WRENCH_OVERLAY_ME(32, 128), - WRENCH_OVERLAY_ME_OFF(32 + 48, 128), + WRENCH_OVERLAY_OC(96, 112), + WRENCH_OVERLAY_OC_OFF(96, 128), - WRENCH_OVERLAY_OC(96, 112), - WRENCH_OVERLAY_OC_OFF(96, 128), + PROBE_OVERLAY_PROBE(112, 192, 16, 16), + PROBE_OVERLAY_COPY(128, 192, 16, 16), + PROBE_OVERLAY_PROBE_OFF(144, 192, 16, 16), + PROBE_OVERLAY_COPY_OFF(160, 192, 16, 16), - PROBE_OVERLAY_PROBE(112, 192, 16, 16), - PROBE_OVERLAY_COPY(128, 192, 16, 16), - PROBE_OVERLAY_PROBE_OFF(144, 192, 16, 16), - PROBE_OVERLAY_COPY_OFF(160, 192, 16, 16), + ACTIVE_TAB(205, 0, 19, 24), + INACTIVE_TAB(237, 0, 19, 24), - ACTIVE_TAB(205, 0, 19, 24), - INACTIVE_TAB(237, 0, 19, 24), + REDSTONE_MODE_WITHOUT_SIGNAL(64, 224), + REDSTONE_MODE_WITH_SIGNAL(80, 224), + REDSTONE_MODE_ALWAYS(96, 224), + REDSTONE_MODE_NEVER(112, 224), - REDSTONE_MODE_WITHOUT_SIGNAL(64, 224), - REDSTONE_MODE_WITH_SIGNAL(80, 224), - REDSTONE_MODE_ALWAYS(96, 224), - REDSTONE_MODE_NEVER(112, 224), + FILTER_META(160, 224), + FILTER_NBT(176, 224), + FILTER_ORE_DICT(192, 224), + FILTER_WHITELIST(0, 224), + FILTER_BLACKLIST(0, 240), + FILTER_STICKY(16, 240), + FILTER_STICKY_OFF(32, 240), - FILTER_META(160, 224), - FILTER_NBT(176, 224), - FILTER_ORE_DICT(192, 224), - FILTER_WHITELIST(0, 224), - FILTER_BLACKLIST(0, 240), - FILTER_STICKY(16, 240), - FILTER_STICKY_OFF(32, 240), + FILTER_META_OFF(208, 224), + FILTER_NBT_OFF(224, 224), + FILTER_ORE_DICT_OFF(240, 224), - FILTER_META_OFF(208, 224), - FILTER_NBT_OFF(224, 224), - FILTER_ORE_DICT_OFF(240, 224), + FILTER_FUZZY_DISABLED(240, 176), + FILTER_FUZZY_25(224, 176), + FILTER_FUZZY_50(208, 176), + FILTER_FUZZY_75(192, 176), + FILTER_FUZZY_99(176, 176), - FILTER_FUZZY_DISABLED(240, 176), - FILTER_FUZZY_25(224, 176), - FILTER_FUZZY_50(208, 176), - FILTER_FUZZY_75(192, 176), - FILTER_FUZZY_99(176, 176), + @Deprecated + INPUT_OLD(128, 197 + 32, 30, 14), + @Deprecated + OUTPUT_OLD(128, 180 + 32, 30, 14), - @Deprecated - INPUT_OLD(128, 197 + 32, 30, 14), - @Deprecated - OUTPUT_OLD(128, 180 + 32, 30, 14), + INPUT(32, 176, 16, 8), + OUTPUT(48, 176, 16, 8), + INPUT_OUTPUT(32, 176, 32, 8), + DISABLED(64, 176), + LOOP(80, 176), + LOOP_OFF(96, 176), - INPUT(32, 176, 16, 8), - OUTPUT(48, 176, 16, 8), - INPUT_OUTPUT(32, 176, 32, 8), - DISABLED(64, 176), - LOOP(80, 176), - LOOP_OFF(96, 176), + ROUND_ROBIN(64, 240), + ROUND_ROBIN_OFF(80, 240), - ROUND_ROBIN(64, 240), - ROUND_ROBIN_OFF(80, 240), + IO_CONFIG_UP(16, 224), + IO_CONFIG_DOWN(32, 224), + IO_WHATSIT(128, 208), - IO_CONFIG_UP(16, 224), - IO_CONFIG_DOWN(32, 224), - IO_WHATSIT(128, 208), + RECIPE(0, 224), - RECIPE(0, 224), + SOUND(176, 208), - SOUND(176, 208), + XP(128, 224), + XP_PLUS(144, 224), - XP(128, 224), - XP_PLUS(144, 224), + SINGLE_PLUS(240, 192), + DOUBLE_PLUS(224, 192), + TRIPLE_PLUS(208, 192), + SINGLE_MINUS(240, 208), + DOUBLE_MINUS(224, 208), + TRIPLE_MINUS(208, 208), - SINGLE_PLUS(240, 192), - DOUBLE_PLUS(224, 192), - TRIPLE_PLUS(208, 192), - SINGLE_MINUS(240, 208), - DOUBLE_MINUS(224, 208), - TRIPLE_MINUS(208, 208), + ENDER_RAIL(192, 208), - ENDER_RAIL(192, 208), + FILTER(192, 192), - FILTER(192, 192), + ITEM_STACK(144, 208), + ITEM_SINGLE(160, 208), - ITEM_STACK(144, 208), - ITEM_SINGLE(160, 208), + SUN(160, 240), + RAIN(176, 240), + THUNDER(192, 240), - SUN(160, 240), - RAIN(176, 240), - THUNDER(192, 240), + SORT_DIR_DOWN(0, 176), + SORT_DIR_UP(16, 176), - SORT_DIR_DOWN(0, 176), - SORT_DIR_UP(16, 176), + SORT_NAME_DOWN(208, 240, SORT_DIR_DOWN), + SORT_NAME_UP(208, 240, SORT_DIR_UP), + SORT_SIZE_DOWN(224, 240, SORT_DIR_DOWN), + SORT_SIZE_UP(224, 240, SORT_DIR_UP), + SORT_MOD_DOWN(240, 240, SORT_DIR_DOWN), + SORT_MOD_UP(240, 240, SORT_DIR_UP), - SORT_NAME_DOWN(208, 240, SORT_DIR_DOWN), - SORT_NAME_UP(208, 240, SORT_DIR_UP), - SORT_SIZE_DOWN(224, 240, SORT_DIR_DOWN), - SORT_SIZE_UP(224, 240, SORT_DIR_UP), - SORT_MOD_DOWN(240, 240, SORT_DIR_DOWN), - SORT_MOD_UP(240, 240, SORT_DIR_UP), + VISIBLE_NO(224, 160), + VISIBLE_YES(240, 160); - VISIBLE_NO(224, 160), - VISIBLE_YES(240, 160); + // Texture size is actually 512 but everything is aligned to a 256 grid + private static final int TEX_SIZE = 256; - // Texture size is actually 512 but everything is aligned to a 256 grid - private static final int TEX_SIZE = 256; + public final int x; + public final int y; + public final int width; + public final int height; + public final IconEIO overlay; - public final int x; - public final int y; - public final int width; - public final int height; - public final IconEIO overlay; + public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); - public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); + public static final IWidgetMap map = new IWidgetMap.WidgetMapImpl(TEX_SIZE, TEXTURE) { + @Override + public void render( + IWidgetIcon widget, + double x, + double y, + double width, + double height, + double zLevel, + boolean doDraw, + boolean flipY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + super.render(widget, x, y, width, height, zLevel, doDraw, flipY); + } + }; - public static final IWidgetMap map = new IWidgetMap.WidgetMapImpl(TEX_SIZE, TEXTURE) { - @Override - public void render(IWidgetIcon widget, double x, double y, double width, double height, double zLevel, boolean doDraw, - boolean flipY) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - super.render(widget, x, y, width, height, zLevel, doDraw, flipY); + IconEIO(int x, int y) { + this(x, y, null); } - }; - IconEIO(int x, int y) { - this(x, y, null); - } + IconEIO(int x, int y, IconEIO overlay) { + this(x, y, 16, 16, overlay); + } - IconEIO(int x, int y, IconEIO overlay) { - this(x, y, 16, 16, overlay); - } + IconEIO(int x, int y, int width, int height) { + this(x, y, width, height, null); + } - IconEIO(int x, int y, int width, int height) { - this(x, y, width, height, null); - } + private IconEIO(int x, int y, int width, int height, IconEIO overlay) { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + this.overlay = overlay; + } - private IconEIO(int x, int y, int width, int height, IconEIO overlay) { - this.x = x; - this.y = y; - this.width = width; - this.height = height; - this.overlay = overlay; - } + @Override + public IWidgetMap getMap() { + return map; + } - @Override - public IWidgetMap getMap() { - return map; - } + @Override + public int getX() { + return x; + } - @Override - public int getX() { - return x; - } + @Override + public int getY() { + return y; + } - @Override - public int getY() { - return y; - } + @Override + public int getWidth() { + return width; + } - @Override - public int getWidth() { - return width; - } + @Override + public int getHeight() { + return height; + } - @Override - public int getHeight() { - return height; - } - - @Override - public IconEIO getOverlay() { - return overlay; - } + @Override + public IconEIO getOverlay() { + return overlay; + } } diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index 24db2dbb..f3fb61e4 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -1,12 +1,31 @@ package crazypants.enderio.gui; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.IBlockAccessWrapper; +import com.enderio.core.common.vecmath.Camera; +import com.enderio.core.common.vecmath.Matrix4d; +import com.enderio.core.common.vecmath.VecmathUtil; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector4f; +import com.enderio.core.common.vecmath.Vertex; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.PacketIoMode; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.TravelController; +import crazypants.util.RenderPassHelper; import java.awt.Color; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -20,521 +39,503 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL14; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.IBlockAccessWrapper; -import com.enderio.core.common.vecmath.Camera; -import com.enderio.core.common.vecmath.Matrix4d; -import com.enderio.core.common.vecmath.VecmathUtil; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector4f; -import com.enderio.core.common.vecmath.Vertex; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.IIoConfigurable; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.PacketIoMode; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.TravelController; -import crazypants.util.RenderPassHelper; - public class IoConfigRenderer { - protected static final RenderBlocks RB = new RenderBlocks(); + protected static final RenderBlocks RB = new RenderBlocks(); - private boolean dragging = false; - private float pitch = 0; - private float yaw =0; - private double distance; - private long initTime; + private boolean dragging = false; + private float pitch = 0; + private float yaw = 0; + private double distance; + private long initTime; - private Minecraft mc = Minecraft.getMinecraft(); - private World world = mc.thePlayer.worldObj; + private Minecraft mc = Minecraft.getMinecraft(); + private World world = mc.thePlayer.worldObj; - private final Vector3d origin = new Vector3d(); - private final Vector3d eye = new Vector3d(); - private final Camera camera = new Camera(); - private final Matrix4d pitchRot = new Matrix4d(); - private final Matrix4d yawRot = new Matrix4d(); + private final Vector3d origin = new Vector3d(); + private final Vector3d eye = new Vector3d(); + private final Camera camera = new Camera(); + private final Matrix4d pitchRot = new Matrix4d(); + private final Matrix4d yawRot = new Matrix4d(); - public BlockCoord originBC; + public BlockCoord originBC; - private List configurables = new ArrayList(); - private List neighbours = new ArrayList(); + private List configurables = new ArrayList(); + private List neighbours = new ArrayList(); - private SelectedFace selection; + private SelectedFace selection; - private boolean renderNeighbours = true; - private boolean inNeigButBounds = false; + private boolean renderNeighbours = true; + private boolean inNeigButBounds = false; - public IoConfigRenderer(IIoConfigurable configuarble) { - this(Collections.singletonList(configuarble.getLocation())); - } - - public IoConfigRenderer(List configurables) { - this.configurables.addAll(configurables); - - Vector3d c; - Vector3d size; - if(configurables.size() == 1) { - BlockCoord bc = configurables.get(0); - c = new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); - size = new Vector3d(1,1,1); - } else { - Vector3d min = new Vector3d(Double.MAX_VALUE,Double.MAX_VALUE,Double.MAX_VALUE); - Vector3d max = new Vector3d(-Double.MAX_VALUE,-Double.MAX_VALUE,-Double.MAX_VALUE); - for(BlockCoord bc : configurables) { - min.set(Math.min(bc.x, min.x),Math.min(bc.y, min.y),Math.min(bc.z, min.z)); - max.set(Math.max(bc.x, max.x),Math.max(bc.y, max.y),Math.max(bc.z, max.z)); - } - size = new Vector3d(max); - size.sub(min); - size.scale(0.5); - c = new Vector3d(min.x + size.x, min.y + size.y,min.z + size.z); - size.scale(2); + public IoConfigRenderer(IIoConfigurable configuarble) { + this(Collections.singletonList(configuarble.getLocation())); } - originBC = new BlockCoord((int) c.x, (int) c.y, (int) c.z); - origin.set(c); - pitchRot.setIdentity(); - yawRot.setIdentity(); + public IoConfigRenderer(List configurables) { + this.configurables.addAll(configurables); - pitch = -mc.thePlayer.rotationPitch; - yaw = 180 - mc.thePlayer.rotationYaw; - - distance = Math.max(Math.max(size.x, size.y), size.z) + 4; - - for(BlockCoord bc : configurables) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord loc = bc.getLocation(dir); - if(!configurables.contains(loc)) { - neighbours.add(loc); + Vector3d c; + Vector3d size; + if (configurables.size() == 1) { + BlockCoord bc = configurables.get(0); + c = new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); + size = new Vector3d(1, 1, 1); + } else { + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (BlockCoord bc : configurables) { + min.set(Math.min(bc.x, min.x), Math.min(bc.y, min.y), Math.min(bc.z, min.z)); + max.set(Math.max(bc.x, max.x), Math.max(bc.y, max.y), Math.max(bc.z, max.z)); + } + size = new Vector3d(max); + size.sub(min); + size.scale(0.5); + c = new Vector3d(min.x + size.x, min.y + size.y, min.z + size.z); + size.scale(2); } - } - } - world = mc.thePlayer.worldObj; - RB.blockAccess = new InnerBA(); - } + originBC = new BlockCoord((int) c.x, (int) c.y, (int) c.z); + origin.set(c); + pitchRot.setIdentity(); + yawRot.setIdentity(); - public void init() { - initTime = System.currentTimeMillis(); - } + pitch = -mc.thePlayer.rotationPitch; + yaw = 180 - mc.thePlayer.rotationYaw; - public SelectedFace getSelection() { - return selection; - } + distance = Math.max(Math.max(size.x, size.y), size.z) + 4; - public void handleMouseInput() { - - if(Mouse.getEventButton() == 0) { - dragging = Mouse.getEventButtonState(); - } - - if(dragging) { - - double dx = (Mouse.getEventDX() / (double) mc.displayWidth); - double dy = (Mouse.getEventDY() / (double) mc.displayHeight); - if(Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - distance -= dy * 15; - } else { - yaw -= 4 * dx * 180; - pitch += 2 * dy * 180; - pitch = (float) VecmathUtil.clamp(pitch, -80, 80); - } - } - - distance -= Mouse.getEventDWheel() * 0.01; - distance = VecmathUtil.clamp(distance, 0.01, 200); - - long elapsed = System.currentTimeMillis() - initTime; - - int x = Mouse.getEventX(); - int y = Mouse.getEventY(); - Vector3d start = new Vector3d(); - Vector3d end = new Vector3d(); - if(camera.getRayForPixel(x, y, start, end)) { - end.scale(distance * 2); - end.add(start); - updateSelection(start, end); - } - - if(!Mouse.getEventButtonState() && camera.isValid() && elapsed > 500) { - if(Mouse.getEventButton() == 1) { - if(selection != null) { - selection.config.toggleIoModeForFace(selection.face); - PacketHandler.INSTANCE.sendToServer(new PacketIoMode(selection.config,selection.face)); + for (BlockCoord bc : configurables) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord loc = bc.getLocation(dir); + if (!configurables.contains(loc)) { + neighbours.add(loc); + } + } } - } else if(Mouse.getEventButton() == 0 && inNeigButBounds) { - renderNeighbours = !renderNeighbours; - } + + world = mc.thePlayer.worldObj; + RB.blockAccess = new InnerBA(); } - } - private void updateSelection(Vector3d start, Vector3d end) { - start.add(origin); - end.add(origin); - List hits = new ArrayList(); + public void init() { + initTime = System.currentTimeMillis(); + } - for (BlockCoord bc : configurables) { - Block block = world.getBlock(bc.x, bc.y, bc.z); - if(block != null) { - MovingObjectPosition hit = block.collisionRayTrace(world, bc.x, bc.y, bc.z, Vec3.createVectorHelper(start.x, start.y, start.z), - Vec3.createVectorHelper(end.x, end.y, end.z)); - if(hit != null) { - hits.add(hit); + public SelectedFace getSelection() { + return selection; + } + + public void handleMouseInput() { + + if (Mouse.getEventButton() == 0) { + dragging = Mouse.getEventButtonState(); } - } - } - selection = null; - MovingObjectPosition hit = getClosestHit(Vec3.createVectorHelper(start.x, start.y, start.z), hits); - if(hit != null) { - TileEntity te = world.getTileEntity(hit.blockX, hit.blockY, hit.blockZ); - if(te instanceof IIoConfigurable) { - IIoConfigurable configuarble = (IIoConfigurable) te; - ForgeDirection face = ForgeDirection.getOrientation(hit.sideHit); - selection = new SelectedFace(configuarble, face); - } - } - } - public static MovingObjectPosition getClosestHit(Vec3 origin, Collection candidates) { - double minLengthSquared = Double.POSITIVE_INFINITY; - MovingObjectPosition closest = null; + if (dragging) { - for (MovingObjectPosition hit : candidates) { - if(hit != null) { - double lengthSquared = hit.hitVec.squareDistanceTo(origin); - if(lengthSquared < minLengthSquared) { - minLengthSquared = lengthSquared; - closest = hit; + double dx = (Mouse.getEventDX() / (double) mc.displayWidth); + double dy = (Mouse.getEventDY() / (double) mc.displayHeight); + if (Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { + distance -= dy * 15; + } else { + yaw -= 4 * dx * 180; + pitch += 2 * dy * 180; + pitch = (float) VecmathUtil.clamp(pitch, -80, 80); + } } - } - } - return closest; - } - public void drawScreen(int par1, int par2, float partialTick, Rectangle vp, Rectangle parentBounds) { + distance -= Mouse.getEventDWheel() * 0.01; + distance = VecmathUtil.clamp(distance, 0.01, 200); - if(!updateCamera(partialTick, vp.x, vp.y, vp.width, vp.height)) { - return; - } - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - applyCamera(partialTick); - TravelController.instance.setSelectionEnabled(false); - renderScene(); - TravelController.instance.setSelectionEnabled(true); - renderSelection(); + long elapsed = System.currentTimeMillis() - initTime; - renderOverlay(par1, par2); - GL11.glPopAttrib(); - } + int x = Mouse.getEventX(); + int y = Mouse.getEventY(); + Vector3d start = new Vector3d(); + Vector3d end = new Vector3d(); + if (camera.getRayForPixel(x, y, start, end)) { + end.scale(distance * 2); + end.add(start); + updateSelection(start, end); + } - private void renderSelection() { - if(selection == null) { - return; + if (!Mouse.getEventButtonState() && camera.isValid() && elapsed > 500) { + if (Mouse.getEventButton() == 1) { + if (selection != null) { + selection.config.toggleIoModeForFace(selection.face); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(selection.config, selection.face)); + } + } else if (Mouse.getEventButton() == 0 && inNeigButBounds) { + renderNeighbours = !renderNeighbours; + } + } } - BoundingBox bb = new BoundingBox(selection.config.getLocation()); + private void updateSelection(Vector3d start, Vector3d end) { + start.add(origin); + end.add(origin); + List hits = new ArrayList(); - IIcon icon = EnderIO.blockAlloySmelter.selectedFaceIcon; - List corners = bb.getCornersWithUvForFace(selection.face,icon.getMinU(),icon.getMaxU(),icon.getMinV(),icon.getMaxV()); - - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_LIGHTING); - RenderUtil.bindBlockTexture(); - GL11.glColor3f(1,1,1); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setColorOpaque_F(1, 1, 1); - Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); - Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); - RenderUtil.addVerticesToTesselator(corners); - Tessellator.instance.draw(); - Tessellator.instance.setTranslation(0,0,0); - - } - - private void renderOverlay(int mx, int my) { - Rectangle vp = camera.getViewport(); - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - - int vpx = vp.x / scaledresolution.getScaleFactor(); - int vph = vp.height / scaledresolution.getScaleFactor(); - int vpw = vp.width/ scaledresolution.getScaleFactor(); - int vpy = (int)((float)(vp.y + vp.height - 4)/(float)scaledresolution.getScaleFactor()); - - GL11.glViewport(0, 0, mc.displayWidth, mc.displayHeight); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glLoadIdentity(); - GL11.glOrtho(0.0D, scaledresolution.getScaledWidth_double(), scaledresolution.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glTranslatef(vpx, vpy, -2000.0F); - - GL11.glDisable(GL11.GL_LIGHTING); - - int x = vpw - 16; - int y = vph - 16; - - mx -= vpx; - my -= vpy; - - if(mx >= x && mx <= x + IconEIO.IO_WHATSIT.width && - my >= y && my <= y + IconEIO.IO_WHATSIT.height) { - RenderUtil.renderQuad2D(x, y, 0, IconEIO.IO_WHATSIT.width, IconEIO.IO_WHATSIT.height, new Vector4f(0.4f,0.4f,0.4f,0.6f)); - inNeigButBounds = true; - } else { - inNeigButBounds = false; + for (BlockCoord bc : configurables) { + Block block = world.getBlock(bc.x, bc.y, bc.z); + if (block != null) { + MovingObjectPosition hit = block.collisionRayTrace( + world, + bc.x, + bc.y, + bc.z, + Vec3.createVectorHelper(start.x, start.y, start.z), + Vec3.createVectorHelper(end.x, end.y, end.z)); + if (hit != null) { + hits.add(hit); + } + } + } + selection = null; + MovingObjectPosition hit = getClosestHit(Vec3.createVectorHelper(start.x, start.y, start.z), hits); + if (hit != null) { + TileEntity te = world.getTileEntity(hit.blockX, hit.blockY, hit.blockZ); + if (te instanceof IIoConfigurable) { + IIoConfigurable configuarble = (IIoConfigurable) te; + ForgeDirection face = ForgeDirection.getOrientation(hit.sideHit); + selection = new SelectedFace(configuarble, face); + } + } } - GL11.glColor3f(1, 1, 1); - IconEIO.map.render(IconEIO.IO_WHATSIT, x, y, true); + public static MovingObjectPosition getClosestHit(Vec3 origin, Collection candidates) { + double minLengthSquared = Double.POSITIVE_INFINITY; + MovingObjectPosition closest = null; - if(selection != null) { - IconEIO ioIcon = null; - // INPUT - IoMode mode = selection.config.getIoMode(selection.face); - if(mode == IoMode.PULL) { - ioIcon = IconEIO.INPUT; - } else if(mode == IoMode.PUSH) { - ioIcon = IconEIO.OUTPUT; - } else if(mode == IoMode.PUSH_PULL) { - ioIcon = IconEIO.INPUT_OUTPUT; - } else if(mode == IoMode.DISABLED) { - ioIcon = IconEIO.DISABLED; - } - - y = vph - mc.fontRenderer.FONT_HEIGHT - 2; - mc.fontRenderer.drawString(getLabelForMode(mode), 4, y, ColorUtil.getRGB(Color.white)); - if(ioIcon != null) { - int w = mc.fontRenderer.getStringWidth(mode.getLocalisedName()); - double xd = (w - ioIcon.width)/2; - xd = Math.max(0, w); - xd /=2; - xd += 4; - xd /= scaledresolution.getScaleFactor(); - ioIcon.getMap().render(ioIcon, xd, y - mc.fontRenderer.FONT_HEIGHT - 2,true); - } - } - } - - protected String getLabelForMode(IoMode mode) { - return mode.getLocalisedName(); - } - - private void renderScene() { - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - RenderHelper.disableStandardItemLighting(); - mc.entityRenderer.disableLightmap(0); - RenderUtil.bindBlockTexture(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); - - Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); - for (int pass = 0; pass < 1; pass++) { - setGlStateForPass(pass, false); - doWorldRenderPass(trans, configurables, pass); - if(renderNeighbours) { - setGlStateForPass(pass, true); - doWorldRenderPass(trans, neighbours, pass); - } + for (MovingObjectPosition hit : candidates) { + if (hit != null) { + double lengthSquared = hit.hitVec.squareDistanceTo(origin); + if (lengthSquared < minLengthSquared) { + minLengthSquared = lengthSquared; + closest = hit; + } + } + } + return closest; } - RenderHelper.enableStandardItemLighting(); - GL11.glEnable(GL11.GL_LIGHTING); - TileEntityRendererDispatcher.instance.field_147558_l = origin.x - eye.x; - TileEntityRendererDispatcher.instance.field_147560_j = origin.y - eye.y; - TileEntityRendererDispatcher.instance.field_147561_k = origin.z - eye.z; - TileEntityRendererDispatcher.staticPlayerX = origin.x - eye.x; - TileEntityRendererDispatcher.staticPlayerY = origin.y - eye.y; - TileEntityRendererDispatcher.staticPlayerZ = origin.z - eye.z; + public void drawScreen(int par1, int par2, float partialTick, Rectangle vp, Rectangle parentBounds) { - for (int pass = 0; pass < 2; pass++) { - setGlStateForPass(pass, false); - doTileEntityRenderPass(configurables, pass); - if(renderNeighbours) { - setGlStateForPass(pass, true); - doTileEntityRenderPass(neighbours, pass); - } - } - setGlStateForPass(0, false); - } - - private void doTileEntityRenderPass(List blocks, int pass) { - RenderPassHelper.setEntityRenderPass(pass); - for (BlockCoord bc : blocks) { - TileEntity tile = world.getTileEntity(bc.x, bc.y, bc.z); - if(tile != null) { - Vector3d at = new Vector3d(eye.x, eye.y, eye.z); - at.x += bc.x - origin.x; - at.y += bc.y - origin.y; - at.z += bc.z - origin.z; + if (!updateCamera(partialTick, vp.x, vp.y, vp.width, vp.height)) { + return; + } GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, at.x, at.y, at.z, 0); + applyCamera(partialTick); + TravelController.instance.setSelectionEnabled(false); + renderScene(); + TravelController.instance.setSelectionEnabled(true); + renderSelection(); + + renderOverlay(par1, par2); GL11.glPopAttrib(); - } } - RenderPassHelper.clearEntityRenderPass(); - } - private void doWorldRenderPass(Vector3d trans, List blocks, int pass) { - RenderPassHelper.setBlockRenderPass(pass); - - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - - for(BlockCoord bc : blocks) { - Block block = world.getBlock(bc.x, bc.y, bc.z); - if(block != null) { - if(block.canRenderInPass(pass)) { - RB.renderAllFaces = true; - RB.setRenderAllFaces(true); - RB.setRenderBounds(0, 0, 0, 1, 1, 1); - try { - RB.renderBlockByRenderType(block, bc.x, bc.y, bc.z); - } catch (Exception e) { - //Ignore, things might blow up in rendering due to the modified block access - //but this is about as good as we can do - } + private void renderSelection() { + if (selection == null) { + return; } - } + + BoundingBox bb = new BoundingBox(selection.config.getLocation()); + + IIcon icon = EnderIO.blockAlloySmelter.selectedFaceIcon; + List corners = bb.getCornersWithUvForFace( + selection.face, icon.getMinU(), icon.getMaxU(), icon.getMinV(), icon.getMaxV()); + + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_LIGHTING); + RenderUtil.bindBlockTexture(); + GL11.glColor3f(1, 1, 1); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorOpaque_F(1, 1, 1); + Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); + Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); + RenderUtil.addVerticesToTesselator(corners); + Tessellator.instance.draw(); + Tessellator.instance.setTranslation(0, 0, 0); } - Tessellator.instance.draw(); - Tessellator.instance.setTranslation(0, 0, 0); - RenderPassHelper.clearBlockRenderPass(); - } + private void renderOverlay(int mx, int my) { + Rectangle vp = camera.getViewport(); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - private void setGlStateForPass(int pass, boolean isNeighbour) { + int vpx = vp.x / scaledresolution.getScaleFactor(); + int vph = vp.height / scaledresolution.getScaleFactor(); + int vpw = vp.width / scaledresolution.getScaleFactor(); + int vpy = (int) ((float) (vp.y + vp.height - 4) / (float) scaledresolution.getScaleFactor()); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - if(isNeighbour) { + GL11.glViewport(0, 0, mc.displayWidth, mc.displayHeight); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glLoadIdentity(); + GL11.glOrtho( + 0.0D, + scaledresolution.getScaledWidth_double(), + scaledresolution.getScaledHeight_double(), + 0.0D, + 1000.0D, + 3000.0D); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glLoadIdentity(); + GL11.glTranslatef(vpx, vpy, -2000.0F); - float alpha = 0.8f; - if(pass == 0) { - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + + int x = vpw - 16; + int y = vph - 16; + + mx -= vpx; + my -= vpy; + + if (mx >= x && mx <= x + IconEIO.IO_WHATSIT.width && my >= y && my <= y + IconEIO.IO_WHATSIT.height) { + RenderUtil.renderQuad2D( + x, y, 0, IconEIO.IO_WHATSIT.width, IconEIO.IO_WHATSIT.height, new Vector4f(0.4f, 0.4f, 0.4f, 0.6f)); + inNeigButBounds = true; + } else { + inNeigButBounds = false; + } + + GL11.glColor3f(1, 1, 1); + IconEIO.map.render(IconEIO.IO_WHATSIT, x, y, true); + + if (selection != null) { + IconEIO ioIcon = null; + // INPUT + IoMode mode = selection.config.getIoMode(selection.face); + if (mode == IoMode.PULL) { + ioIcon = IconEIO.INPUT; + } else if (mode == IoMode.PUSH) { + ioIcon = IconEIO.OUTPUT; + } else if (mode == IoMode.PUSH_PULL) { + ioIcon = IconEIO.INPUT_OUTPUT; + } else if (mode == IoMode.DISABLED) { + ioIcon = IconEIO.DISABLED; + } + + y = vph - mc.fontRenderer.FONT_HEIGHT - 2; + mc.fontRenderer.drawString(getLabelForMode(mode), 4, y, ColorUtil.getRGB(Color.white)); + if (ioIcon != null) { + int w = mc.fontRenderer.getStringWidth(mode.getLocalisedName()); + double xd = (w - ioIcon.width) / 2; + xd = Math.max(0, w); + xd /= 2; + xd += 4; + xd /= scaledresolution.getScaleFactor(); + ioIcon.getMap().render(ioIcon, xd, y - mc.fontRenderer.FONT_HEIGHT - 2, true); + } + } + } + + protected String getLabelForMode(IoMode mode) { + return mode.getLocalisedName(); + } + + private void renderScene() { GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glBlendFunc(GL11.GL_CONSTANT_ALPHA, GL11.GL_CONSTANT_COLOR); - GL14.glBlendColor(1.0f, 1.0f, 1.0f, alpha); - GL11.glDepthMask(true); - } else { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_CONSTANT_COLOR); - GL14.glBlendColor(1.0f, 1.0f, 1.0f, 0.8f); - GL14.glBlendColor(1.0f, 1.0f, 1.0f, alpha); - GL11.glDepthMask(false); - } - return; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + RenderHelper.disableStandardItemLighting(); + mc.entityRenderer.disableLightmap(0); + RenderUtil.bindBlockTexture(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_ALPHA_TEST); + + Vector3d trans = new Vector3d((-origin.x) + eye.x, (-origin.y) + eye.y, (-origin.z) + eye.z); + for (int pass = 0; pass < 1; pass++) { + setGlStateForPass(pass, false); + doWorldRenderPass(trans, configurables, pass); + if (renderNeighbours) { + setGlStateForPass(pass, true); + doWorldRenderPass(trans, neighbours, pass); + } + } + + RenderHelper.enableStandardItemLighting(); + GL11.glEnable(GL11.GL_LIGHTING); + TileEntityRendererDispatcher.instance.field_147558_l = origin.x - eye.x; + TileEntityRendererDispatcher.instance.field_147560_j = origin.y - eye.y; + TileEntityRendererDispatcher.instance.field_147561_k = origin.z - eye.z; + TileEntityRendererDispatcher.staticPlayerX = origin.x - eye.x; + TileEntityRendererDispatcher.staticPlayerY = origin.y - eye.y; + TileEntityRendererDispatcher.staticPlayerZ = origin.z - eye.z; + + for (int pass = 0; pass < 2; pass++) { + setGlStateForPass(pass, false); + doTileEntityRenderPass(configurables, pass); + if (renderNeighbours) { + setGlStateForPass(pass, true); + doTileEntityRenderPass(neighbours, pass); + } + } + setGlStateForPass(0, false); } - if(pass == 0) { - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - } else { - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthMask(false); + private void doTileEntityRenderPass(List blocks, int pass) { + RenderPassHelper.setEntityRenderPass(pass); + for (BlockCoord bc : blocks) { + TileEntity tile = world.getTileEntity(bc.x, bc.y, bc.z); + if (tile != null) { + Vector3d at = new Vector3d(eye.x, eye.y, eye.z); + at.x += bc.x - origin.x; + at.y += bc.y - origin.y; + at.z += bc.z - origin.z; + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, at.x, at.y, at.z, 0); + GL11.glPopAttrib(); + } + } + RenderPassHelper.clearEntityRenderPass(); } - } + private void doWorldRenderPass(Vector3d trans, List blocks, int pass) { + RenderPassHelper.setBlockRenderPass(pass); - private boolean updateCamera(float partialTick, int vpx, int vpy, int vpw, int vph) { - if(vpw <= 0 || vph <= 0) { - return false; - } - camera.setViewport(vpx, vpy, vpw, vph); - camera.setProjectionMatrixAsPerspective(30, 0.05, 50, vpw, vph); - eye.set(0, 0, distance); - pitchRot.makeRotationX(Math.toRadians(pitch)); - yawRot.makeRotationY(Math.toRadians(yaw)); - pitchRot.transform(eye); - yawRot.transform(eye); - camera.setViewMatrixAsLookAt(eye, RenderUtil.ZERO_V, RenderUtil.UP_V); - return camera.isValid(); - } + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setTranslation(trans.x, trans.y, trans.z); + Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - private void applyCamera(float partialTick) { - Rectangle vp = camera.getViewport(); - GL11.glViewport(vp.x, vp.y, vp.width, vp.height); - GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - GL11.glMatrixMode(GL11.GL_PROJECTION); - RenderUtil.loadMatrix(camera.getTransposeProjectionMatrix()); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - RenderUtil.loadMatrix(camera.getTransposeViewMatrix()); - GL11.glTranslatef(-(float) eye.x, -(float) eye.y, -(float) eye.z); + for (BlockCoord bc : blocks) { + Block block = world.getBlock(bc.x, bc.y, bc.z); + if (block != null) { + if (block.canRenderInPass(pass)) { + RB.renderAllFaces = true; + RB.setRenderAllFaces(true); + RB.setRenderBounds(0, 0, 0, 1, 1, 1); + try { + RB.renderBlockByRenderType(block, bc.x, bc.y, bc.z); + } catch (Exception e) { + // Ignore, things might blow up in rendering due to the modified block access + // but this is about as good as we can do + } + } + } + } - } - - public static class SelectedFace { - - public IIoConfigurable config; - public ForgeDirection face; - - public SelectedFace(IIoConfigurable config, ForgeDirection face) { - super(); - this.config = config; - this.face = face; + Tessellator.instance.draw(); + Tessellator.instance.setTranslation(0, 0, 0); + RenderPassHelper.clearBlockRenderPass(); } - @Override - public String toString() { - return "SelectedFace [config=" + config + ", face=" + face + "]"; + private void setGlStateForPass(int pass, boolean isNeighbour) { + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + if (isNeighbour) { + + float alpha = 0.8f; + if (pass == 0) { + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glBlendFunc(GL11.GL_CONSTANT_ALPHA, GL11.GL_CONSTANT_COLOR); + GL14.glBlendColor(1.0f, 1.0f, 1.0f, alpha); + GL11.glDepthMask(true); + } else { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_CONSTANT_COLOR); + GL14.glBlendColor(1.0f, 1.0f, 1.0f, 0.8f); + GL14.glBlendColor(1.0f, 1.0f, 1.0f, alpha); + GL11.glDepthMask(false); + } + return; + } + + if (pass == 0) { + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + } else { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthMask(false); + } } - - } - - private class InnerBA extends IBlockAccessWrapper { - - InnerBA() { - super(world); + private boolean updateCamera(float partialTick, int vpx, int vpy, int vpw, int vph) { + if (vpw <= 0 || vph <= 0) { + return false; + } + camera.setViewport(vpx, vpy, vpw, vph); + camera.setProjectionMatrixAsPerspective(30, 0.05, 50, vpw, vph); + eye.set(0, 0, distance); + pitchRot.makeRotationX(Math.toRadians(pitch)); + yawRot.makeRotationY(Math.toRadians(yaw)); + pitchRot.transform(eye); + yawRot.transform(eye); + camera.setViewMatrixAsLookAt(eye, RenderUtil.ZERO_V, RenderUtil.UP_V); + return camera.isValid(); } - @Override - public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { - return false; + private void applyCamera(float partialTick) { + Rectangle vp = camera.getViewport(); + GL11.glViewport(vp.x, vp.y, vp.width, vp.height); + GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); + GL11.glMatrixMode(GL11.GL_PROJECTION); + RenderUtil.loadMatrix(camera.getTransposeProjectionMatrix()); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + RenderUtil.loadMatrix(camera.getTransposeViewMatrix()); + GL11.glTranslatef(-(float) eye.x, -(float) eye.y, -(float) eye.z); } - @Override - public boolean isAirBlock(int var1, int var2, int var3) { - if(!configurables.contains(new BlockCoord(var1,var2,var3))) { - return false; - } - return super.isAirBlock(var1, var2, var3); + public static class SelectedFace { + + public IIoConfigurable config; + public ForgeDirection face; + + public SelectedFace(IIoConfigurable config, ForgeDirection face) { + super(); + this.config = config; + this.face = face; + } + + @Override + public String toString() { + return "SelectedFace [config=" + config + ", face=" + face + "]"; + } } - @Override - @SideOnly(Side.CLIENT) - public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { - return 15 << 20 | 15 << 4; - } + private class InnerBA extends IBlockAccessWrapper { - @Override - public Block getBlock(int var1, int var2, int var3) { - if(!configurables.contains(new BlockCoord(var1,var2,var3))) { - return Blocks.air; - } - return super.getBlock(var1, var2, var3); - } - } + InnerBA() { + super(world); + } + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { + return false; + } + + @Override + public boolean isAirBlock(int var1, int var2, int var3) { + if (!configurables.contains(new BlockCoord(var1, var2, var3))) { + return false; + } + return super.isAirBlock(var1, var2, var3); + } + + @Override + @SideOnly(Side.CLIENT) + public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { + return 15 << 20 | 15 << 4; + } + + @Override + public Block getBlock(int var1, int var2, int var3) { + if (!configurables.contains(new BlockCoord(var1, var2, var3))) { + return Blocks.air; + } + return super.getBlock(var1, var2, var3); + } + } } diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index db32068b..9993137f 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -3,7 +3,6 @@ package crazypants.enderio.gui; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.CycleButton; import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.PacketRedstoneMode; @@ -12,37 +11,37 @@ import crazypants.enderio.network.PacketHandler; public class RedstoneModeButton extends CycleButton { - private IRedstoneModeControlable model; + private IRedstoneModeControlable model; - private BlockCoord bc; + private BlockCoord bc; - private String tooltipKey = "enderio.gui.tooltip.redstoneControlMode"; + private String tooltipKey = "enderio.gui.tooltip.redstoneControlMode"; - public RedstoneModeButton(IGuiScreen gui, int id, int x, int y, IRedstoneModeControlable model) { - this(gui, id, x, y, model, null); - } - - public RedstoneModeButton(IGuiScreen gui, int id, int x, int y, IRedstoneModeControlable model, BlockCoord bc) { - super(gui, id, x, y, RedstoneControlMode.class); - this.model = model; - this.bc = bc; - setMode(model.getRedstoneControlMode()); - } - - public void setMode(RedstoneControlMode newMode) { - if (model == null) { - return; + public RedstoneModeButton(IGuiScreen gui, int id, int x, int y, IRedstoneModeControlable model) { + this(gui, id, x, y, model, null); } - super.setMode(newMode); - model.setRedstoneControlMode(getMode()); - if (bc != null) { - PacketHandler.INSTANCE.sendToServer(new PacketRedstoneMode(model, bc.x, bc.y, bc.z)); - } - setTooltipKey(tooltipKey); // forces our behavior - } - public void setTooltipKey(String key) { - tooltipKey = key; - setToolTip(EnderIO.lang.localizeExact(tooltipKey), getMode().getTooltip()); - } + public RedstoneModeButton(IGuiScreen gui, int id, int x, int y, IRedstoneModeControlable model, BlockCoord bc) { + super(gui, id, x, y, RedstoneControlMode.class); + this.model = model; + this.bc = bc; + setMode(model.getRedstoneControlMode()); + } + + public void setMode(RedstoneControlMode newMode) { + if (model == null) { + return; + } + super.setMode(newMode); + model.setRedstoneControlMode(getMode()); + if (bc != null) { + PacketHandler.INSTANCE.sendToServer(new PacketRedstoneMode(model, bc.x, bc.y, bc.z)); + } + setTooltipKey(tooltipKey); // forces our behavior + } + + public void setTooltipKey(String key) { + tooltipKey = key; + setToolTip(EnderIO.lang.localizeExact(tooltipKey), getMode().getTooltip()); + } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java index b69d5706..e265f8ba 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java @@ -1,76 +1,70 @@ package crazypants.enderio.gui; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityFurnace; - import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; - import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; import crazypants.enderio.machine.power.PowerDisplayUtil; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; public class TooltipHandlerBurnTime implements ITooltipCallback { - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - int time = 0; - TileEntityStirlingGenerator gen = getStirlingGen(itemstack); - if (isStirlingGen(itemstack, gen)) { - int rate = gen.getPowerUsePerTick(); - String msg = String.format("%s %s %s %s %s %s%s", - EnderIO.lang.localize("power.generates"), - PowerDisplayUtil.formatPower((long)gen.getBurnTime(itemstack) * rate), - PowerDisplayUtil.abrevation(), - EnderIO.lang.localize("power.generation_rate"), - PowerDisplayUtil.formatPower(rate), - PowerDisplayUtil.abrevation(), - PowerDisplayUtil.perTickStr()); - list.add(msg); - } else if (Config.addFurnaceFuelTootip && (time = TileEntityFurnace.getItemBurnTime(itemstack)) > 0) { - list.add(EnderIO.lang.localize("tooltip.burntime") + " " + time); + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + int time = 0; + TileEntityStirlingGenerator gen = getStirlingGen(itemstack); + if (isStirlingGen(itemstack, gen)) { + int rate = gen.getPowerUsePerTick(); + String msg = String.format( + "%s %s %s %s %s %s%s", + EnderIO.lang.localize("power.generates"), + PowerDisplayUtil.formatPower((long) gen.getBurnTime(itemstack) * rate), + PowerDisplayUtil.abrevation(), + EnderIO.lang.localize("power.generation_rate"), + PowerDisplayUtil.formatPower(rate), + PowerDisplayUtil.abrevation(), + PowerDisplayUtil.perTickStr()); + + list.add(msg); + } else if (Config.addFurnaceFuelTootip && (time = TileEntityFurnace.getItemBurnTime(itemstack)) > 0) { + list.add(EnderIO.lang.localize("tooltip.burntime") + " " + time); + } } - } - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - } + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - } - - @Override - public boolean shouldHandleItem(ItemStack item) { - int time = TileEntityFurnace.getItemBurnTime(item); - return time > 0 || isStirlingGen(item); - } - - private TileEntityStirlingGenerator getStirlingGen(ItemStack stack) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if (player != null && player.openContainer instanceof StirlingGeneratorContainer) { - AbstractMachineEntity te = ((StirlingGeneratorContainer) player.openContainer).getInv(); - if (te instanceof TileEntityStirlingGenerator) { - return (TileEntityStirlingGenerator) te; - } + @Override + public boolean shouldHandleItem(ItemStack item) { + int time = TileEntityFurnace.getItemBurnTime(item); + return time > 0 || isStirlingGen(item); + } + + private TileEntityStirlingGenerator getStirlingGen(ItemStack stack) { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (player != null && player.openContainer instanceof StirlingGeneratorContainer) { + AbstractMachineEntity te = ((StirlingGeneratorContainer) player.openContainer).getInv(); + if (te instanceof TileEntityStirlingGenerator) { + return (TileEntityStirlingGenerator) te; + } + } + return null; + } + + private boolean isStirlingGen(ItemStack stack) { + return isStirlingGen(stack, getStirlingGen(stack)); + } + + private boolean isStirlingGen(ItemStack stack, TileEntityStirlingGenerator gen) { + return gen == null ? false : gen.getBurnTime(stack) > 0; } - return null; - } - - private boolean isStirlingGen(ItemStack stack) { - return isStirlingGen(stack, getStirlingGen(stack)); - } - - private boolean isStirlingGen(ItemStack stack, TileEntityStirlingGenerator gen) { - return gen == null ? false : gen.getBurnTime(stack) > 0; - } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java index 3a517c95..eb5ad13c 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java @@ -1,57 +1,53 @@ package crazypants.enderio.gui; +import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; +import crazypants.enderio.EnderIO; +import crazypants.enderio.fluid.FluidFuelRegister; +import crazypants.enderio.fluid.IFluidCoolant; +import crazypants.enderio.fluid.IFluidFuel; +import crazypants.enderio.machine.power.PowerDisplayUtil; import java.text.MessageFormat; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.fluid.FluidFuelRegister; -import crazypants.enderio.fluid.IFluidCoolant; -import crazypants.enderio.fluid.IFluidFuel; -import crazypants.enderio.machine.power.PowerDisplayUtil; - public class TooltipHandlerFluid implements ITooltipCallback { - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - } - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - } + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(itemstack); - if (fluid != null) { - IFluidFuel fuel = FluidFuelRegister.instance.getFuel(fluid); - if (fuel != null) { - list.add(EnderIO.lang.localize("fuel.tooltip.heading")); - list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.getPowerPerCycle())); - list.add(EnumChatFormatting.ITALIC + " " + MessageFormat.format(EnderIO.lang.localize("fuel.tooltip.burnTime"), fuel.getTotalBurningTime())); - } else { - IFluidCoolant coolant = FluidFuelRegister.instance.getCoolant(fluid); - if (coolant != null) { - list.add(EnderIO.lang.localize("coolant.tooltip.heading")); - list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerFloat(coolant.getDegreesCoolingPerMB(100) * 1000) + " " - + EnderIO.lang.localize("coolant.tooltip.degreesPerBucket")); + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(itemstack); + if (fluid != null) { + IFluidFuel fuel = FluidFuelRegister.instance.getFuel(fluid); + if (fuel != null) { + list.add(EnderIO.lang.localize("fuel.tooltip.heading")); + list.add( + EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.getPowerPerCycle())); + list.add(EnumChatFormatting.ITALIC + " " + + MessageFormat.format( + EnderIO.lang.localize("fuel.tooltip.burnTime"), fuel.getTotalBurningTime())); + } else { + IFluidCoolant coolant = FluidFuelRegister.instance.getCoolant(fluid); + if (coolant != null) { + list.add(EnderIO.lang.localize("coolant.tooltip.heading")); + list.add(EnumChatFormatting.ITALIC + " " + + PowerDisplayUtil.formatPowerFloat(coolant.getDegreesCoolingPerMB(100) * 1000) + " " + + EnderIO.lang.localize("coolant.tooltip.degreesPerBucket")); + } + } } - } - } - } - - @Override - public boolean shouldHandleItem(ItemStack item) { - return FluidContainerRegistry.getFluidForFilledItem(item) != null; - } + } + @Override + public boolean shouldHandleItem(ItemStack item) { + return FluidContainerRegistry.getFluidForFilledItem(item) != null; + } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java index 87e50403..a4721420 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java @@ -1,50 +1,50 @@ package crazypants.enderio.gui; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.IGrindingMultiplier; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class TooltipHandlerGrinding implements ITooltipCallback { - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - } + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + IGrindingMultiplier ball = CrusherRecipeManager.getInstance().getGrindballFromStack(itemstack); + list.add(EnumChatFormatting.BLUE + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line1")); + list.add(EnumChatFormatting.GRAY + + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line2") + + toPercent(ball.getGrindingMultiplier())); + list.add(EnumChatFormatting.GRAY + + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line3") + + toPercent(ball.getChanceMultiplier())); + list.add(EnumChatFormatting.GRAY + + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line4") + + toPercent(1 - ball.getPowerMultiplier())); + } - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - IGrindingMultiplier ball = CrusherRecipeManager.getInstance().getGrindballFromStack(itemstack); - list.add(EnumChatFormatting.BLUE + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line1")); - list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line2") + toPercent(ball.getGrindingMultiplier())); - list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line3") + toPercent(ball.getChanceMultiplier())); - list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line4") + toPercent(1 - ball.getPowerMultiplier())); - } + private String toPercent(float fl) { + fl = fl * 100; + int per = Math.round(fl); + return " " + per + "%"; + } - private String toPercent(float fl) { - fl = fl * 100; - int per = Math.round(fl); - return " " + per + "%"; - } - - @Override - public boolean shouldHandleItem(ItemStack item) { - return CrusherRecipeManager.getInstance().getGrindballFromStack(item) != null; - } -} \ No newline at end of file + @Override + public boolean shouldHandleItem(ItemStack item) { + return CrusherRecipeManager.getInstance().getGrindballFromStack(item) != null; + } +} diff --git a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java index 149cc34b..03647b6e 100644 --- a/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/ConduitProbeOverlayRenderer.java @@ -1,58 +1,55 @@ package crazypants.enderio.item; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.gui.IconEIO; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.common.MinecraftForge; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.IconEIO; - public class ConduitProbeOverlayRenderer { - //private ItemConduitProbe probe; + // private ItemConduitProbe probe; - public ConduitProbeOverlayRenderer() { - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void renderOverlay(RenderGameOverlayEvent event) { - ItemStack equippedProbe = getEquippedProbe(); - if(equippedProbe != null && event.type == ElementType.ALL) { - doRenderOverlay(event, equippedProbe); + public ConduitProbeOverlayRenderer() { + MinecraftForge.EVENT_BUS.register(this); } - } - private ItemStack getEquippedProbe() { - ItemStack equipped = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); - if(equipped != null && equipped.getItem() == EnderIO.itemConduitProbe) { - return equipped; + @SubscribeEvent + public void renderOverlay(RenderGameOverlayEvent event) { + ItemStack equippedProbe = getEquippedProbe(); + if (equippedProbe != null && event.type == ElementType.ALL) { + doRenderOverlay(event, equippedProbe); + } } - return null; - } - private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) { - IconEIO icon1, icon2; - if(equippedProbe.getItemDamage() == 0) { - icon1 = IconEIO.PROBE_OVERLAY_PROBE; - icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF; - } else { - icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF; - icon2 = IconEIO.PROBE_OVERLAY_COPY; + private ItemStack getEquippedProbe() { + ItemStack equipped = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); + if (equipped != null && equipped.getItem() == EnderIO.itemConduitProbe) { + return equipped; + } + return null; } - ScaledResolution res = event.resolution; - double offsetX = res.getScaledWidth() - 48; - double offsetY = res.getScaledHeight() - 16; - GL11.glColor4f(1, 1, 1, 0.75f); - icon1.getMap().render(icon1, offsetX - 32, offsetY - 32, 32, 32, 0, true); - icon2.getMap().render(icon2, offsetX, offsetY - 32, 32, 32, 0, true); - } + private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedProbe) { + IconEIO icon1, icon2; + if (equippedProbe.getItemDamage() == 0) { + icon1 = IconEIO.PROBE_OVERLAY_PROBE; + icon2 = IconEIO.PROBE_OVERLAY_COPY_OFF; + } else { + icon1 = IconEIO.PROBE_OVERLAY_PROBE_OFF; + icon2 = IconEIO.PROBE_OVERLAY_COPY; + } + ScaledResolution res = event.resolution; + double offsetX = res.getScaledWidth() - 48; + double offsetY = res.getScaledHeight() - 16; + GL11.glColor4f(1, 1, 1, 0.75f); + icon1.getMap().render(icon1, offsetX - 32, offsetY - 32, 32, 32, 0, true); + icon2.getMap().render(icon2, offsetX, offsetY - 32, 32, 32, 0, true); + } } diff --git a/src/main/java/crazypants/enderio/item/IRotatableFacade.java b/src/main/java/crazypants/enderio/item/IRotatableFacade.java index 8d32d708..050bd11e 100644 --- a/src/main/java/crazypants/enderio/item/IRotatableFacade.java +++ b/src/main/java/crazypants/enderio/item/IRotatableFacade.java @@ -4,5 +4,5 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public interface IRotatableFacade { - boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis); + boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis); } diff --git a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java index d2cefd1a..afa891dc 100644 --- a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java @@ -1,20 +1,7 @@ package crazypants.enderio.item; -import java.text.NumberFormat; -import java.util.Collection; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ChatUtil; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,104 +11,126 @@ import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.network.PacketHandler; +import java.text.NumberFormat; +import java.util.Collection; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class ItemConduitProbe extends Item implements IResourceTooltipProvider, IHideFacades { - private static final NumberFormat NF = NumberFormat.getIntegerInstance(); + private static final NumberFormat NF = NumberFormat.getIntegerInstance(); - public static ItemConduitProbe create() { + public static ItemConduitProbe create() { - PacketHandler.INSTANCE.registerMessage(PacketConduitProbe.class, PacketConduitProbe.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketConduitProbeMode.class, PacketConduitProbeMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketConduitProbe.class, PacketConduitProbe.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketConduitProbeMode.class, PacketConduitProbeMode.class, PacketHandler.nextID(), Side.SERVER); - ItemConduitProbe result = new ItemConduitProbe(); - result.init(); - return result; - } - - public static boolean copyPasteSettings(EntityPlayer player, ItemStack stack, IConduitBundle bundle, ForgeDirection dir) { - boolean isCopy = player.isSneaking(); - boolean clearedData = false; - NBTTagCompound nbt = stack.stackTagCompound; - - if(nbt == null) { - nbt = new NBTTagCompound(); - stack.stackTagCompound = nbt; + ItemConduitProbe result = new ItemConduitProbe(); + result.init(); + return result; } - - boolean performedAction = false; - Collection conduits = bundle.getConduits(); - for(IConduit conduit : conduits) { - if(conduit.getExternalConnections().contains(dir)) { - if(isCopy && !clearedData) { - nbt = new NBTTagCompound(); - stack.stackTagCompound = nbt; - clearedData = true; + + public static boolean copyPasteSettings( + EntityPlayer player, ItemStack stack, IConduitBundle bundle, ForgeDirection dir) { + boolean isCopy = player.isSneaking(); + boolean clearedData = false; + NBTTagCompound nbt = stack.stackTagCompound; + + if (nbt == null) { + nbt = new NBTTagCompound(); + stack.stackTagCompound = nbt; } - if(isCopy) { - performedAction |= conduit.writeConnectionSettingsToNBT(dir, nbt); - } else { - performedAction |= conduit.readConduitSettingsFromNBT(dir, nbt); - } - } - } - if(isCopy && performedAction && player.worldObj.isRemote) { - ChatUtil.sendNoSpamClient("Copied conduit settings"); - } - - return performedAction; - } - - protected ItemConduitProbe() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName("enderio." + ModObject.itemConduitProbe.name()); - setMaxStackSize(1); - setHasSubtypes(true); - } - - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, - float par9, float par10) { - - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle)) { - return false; - } - IConduitBundle cb = (IConduitBundle)te; - if(itemStack.getItemDamage() == 0) { - if(PacketConduitProbe.canCreatePacket(world, x, y, z)) { - if(world.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketConduitProbe(x, y, z, side)); + boolean performedAction = false; + Collection conduits = bundle.getConduits(); + for (IConduit conduit : conduits) { + if (conduit.getExternalConnections().contains(dir)) { + if (isCopy && !clearedData) { + nbt = new NBTTagCompound(); + stack.stackTagCompound = nbt; + clearedData = true; + } + if (isCopy) { + performedAction |= conduit.writeConnectionSettingsToNBT(dir, nbt); + } else { + performedAction |= conduit.readConduitSettingsFromNBT(dir, nbt); + } + } } + + if (isCopy && performedAction && player.worldObj.isRemote) { + ChatUtil.sendNoSpamClient("Copied conduit settings"); + } + + return performedAction; + } + + protected ItemConduitProbe() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName("enderio." + ModObject.itemConduitProbe.name()); + setMaxStackSize(1); + setHasSubtypes(true); + } + + @Override + public boolean onItemUse( + ItemStack itemStack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IConduitBundle)) { + return false; + } + IConduitBundle cb = (IConduitBundle) te; + if (itemStack.getItemDamage() == 0) { + if (PacketConduitProbe.canCreatePacket(world, x, y, z)) { + if (world.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketConduitProbe(x, y, z, side)); + } + return true; + } + } + return false; + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemConduitProbe.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:mJReader"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { return true; - } - } - return false; - } + } - protected void init() { - GameRegistry.registerItem(this, ModObject.itemConduitProbe.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:mJReader"); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } - - @Override - public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return true; - } - - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; - } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/ItemEnderFood.java b/src/main/java/crazypants/enderio/item/ItemEnderFood.java index d77dc3da..cb9327de 100644 --- a/src/main/java/crazypants/enderio/item/ItemEnderFood.java +++ b/src/main/java/crazypants/enderio/item/ItemEnderFood.java @@ -1,7 +1,15 @@ package crazypants.enderio.item; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import com.google.common.collect.Lists; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,169 +20,161 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - public class ItemEnderFood extends ItemFood implements IResourceTooltipProvider { - @SideOnly(Side.CLIENT) - public class SpecialFont extends FontRenderer { + @SideOnly(Side.CLIENT) + public class SpecialFont extends FontRenderer { - private FontRenderer wrapped; - private ItemStack stack = EnderFood.ENDERIOS.getStack(); - private int inARow = 0; - - public SpecialFont(FontRenderer wrapped) { - super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false); - this.wrapped = wrapped; + private FontRenderer wrapped; + private ItemStack stack = EnderFood.ENDERIOS.getStack(); + private int inARow = 0; + + public SpecialFont(FontRenderer wrapped) { + super( + Minecraft.getMinecraft().gameSettings, + new ResourceLocation("textures/font/ascii.png"), + Minecraft.getMinecraft().renderEngine, + false); + this.wrapped = wrapped; + } + + @Override + public int drawString(String string, int x, int y, int color, boolean p_85187_5_) { + boolean pop = false; + if (isSmallText(string)) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + GL11.glTranslated(x, y, 0); + GL11.glTranslated(0, -this.FONT_HEIGHT * inARow + FONT_HEIGHT, 0); + inARow++; + pop = true; + } else { + inARow = 0; + } + int ret = wrapped.drawString(string, x, y, color, p_85187_5_); + if (pop) { + GL11.glPopMatrix(); + } + return ret; + } + + @Override + public int getStringWidth(String p_78256_1_) { + int ret = wrapped.getStringWidth(p_78256_1_); + if (isSmallText(p_78256_1_)) { + ret /= 2; + } + return ret; + } + + private boolean isSmallText(String string) { + List lines = Lists.newArrayList(); + SpecialTooltipHandler.addDetailedTooltipFromResources(lines, getUnlocalizedNameForTooltip(stack)); + return lines.contains(EnumChatFormatting.getTextWithoutFormattingCodes(string)); + } + + @Override + public int getCharWidth(char p_78263_1_) { + return wrapped.getCharWidth(p_78263_1_); + } } - + + public enum EnderFood { + ENDERIOS("itemEnderios", 10, 0.8f); + + public final String unlocalisedName; + public final int hunger; + public final float saturation; + + public static final EnderFood[] VALUES = values(); + + private EnderFood(String name, int hunger, float saturation) { + this.unlocalisedName = name; + this.hunger = hunger; + this.saturation = saturation; + } + + public ItemStack getStack() { + return getStack(1); + } + + public ItemStack getStack(int size) { + return new ItemStack(EnderIO.itemEnderFood, size, ordinal()); + } + + public static EnderFood get(ItemStack stack) { + return VALUES[stack.getItemDamage() % VALUES.length]; + } + } + + public static ItemEnderFood create() { + ItemEnderFood ret = new ItemEnderFood(); + GameRegistry.registerItem(ret, ModObject.itemEnderFood.unlocalisedName); + return ret; + } + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + @SideOnly(Side.CLIENT) + private SpecialFont fr; + + public ItemEnderFood() { + super(0, false); + setCreativeTab(EnderIOTab.tabEnderIO); + setMaxStackSize(1); + setHasSubtypes(true); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public int drawString(String string, int x, int y, int color, boolean p_85187_5_) { - boolean pop = false; - if (isSmallText(string)) { - GL11.glPushMatrix(); - GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glTranslated(x, y, 0); - GL11.glTranslated(0, -this.FONT_HEIGHT * inARow + FONT_HEIGHT, 0); - inARow++; - pop = true; - } else { - inARow = 0; - } - int ret = wrapped.drawString(string, x, y, color, p_85187_5_); - if (pop) { - GL11.glPopMatrix(); - } - return ret; - } - - @Override - public int getStringWidth(String p_78256_1_) { - int ret = wrapped.getStringWidth(p_78256_1_); - if (isSmallText(p_78256_1_)) { - ret /= 2; - } - return ret; - } - - private boolean isSmallText(String string) { - List lines = Lists.newArrayList(); - SpecialTooltipHandler.addDetailedTooltipFromResources(lines, getUnlocalizedNameForTooltip(stack)); - return lines.contains(EnumChatFormatting.getTextWithoutFormattingCodes(string)); + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (EnderFood f : EnderFood.VALUES) { + list.add(f.getStack()); + } } @Override - public int getCharWidth(char p_78263_1_) { - return wrapped.getCharWidth(p_78263_1_); - } - } - - public enum EnderFood { - ENDERIOS("itemEnderios", 10, 0.8f); - - public final String unlocalisedName; - public final int hunger; - public final float saturation; - - public static final EnderFood[] VALUES = values(); - - private EnderFood(String name, int hunger, float saturation) { - this.unlocalisedName = name; - this.hunger = hunger; - this.saturation = saturation; + public String getUnlocalizedName(ItemStack p_77667_1_) { + return "enderio." + EnderFood.get(p_77667_1_).unlocalisedName; } - public ItemStack getStack() { - return getStack(1); + @Override + public void registerIcons(IIconRegister register) { + icons = new IIcon[EnderFood.VALUES.length]; + for (EnderFood f : EnderFood.VALUES) { + icons[f.ordinal()] = register.registerIcon("enderio:" + f.unlocalisedName); + } } - public ItemStack getStack(int size) { - return new ItemStack(EnderIO.itemEnderFood, size, ordinal()); + @Override + public IIcon getIconFromDamage(int damage) { + return icons[damage % icons.length]; } - public static EnderFood get(ItemStack stack) { - return VALUES[stack.getItemDamage() % VALUES.length]; + @Override + public int func_150905_g(ItemStack p_150905_1_) { + return EnderFood.get(p_150905_1_).hunger; } - } - public static ItemEnderFood create() { - ItemEnderFood ret = new ItemEnderFood(); - GameRegistry.registerItem(ret, ModObject.itemEnderFood.unlocalisedName); - return ret; - } - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - - @SideOnly(Side.CLIENT) - private SpecialFont fr; - - public ItemEnderFood() { - super(0, false); - setCreativeTab(EnderIOTab.tabEnderIO); - setMaxStackSize(1); - setHasSubtypes(true); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (EnderFood f : EnderFood.VALUES) { - list.add(f.getStack()); + @Override + public float func_150906_h(ItemStack p_150906_1_) { + return EnderFood.get(p_150906_1_).saturation; } - } - - @Override - public String getUnlocalizedName(ItemStack p_77667_1_) { - return "enderio." + EnderFood.get(p_77667_1_).unlocalisedName; - } - - @Override - public void registerIcons(IIconRegister register) { - icons = new IIcon[EnderFood.VALUES.length]; - for (EnderFood f : EnderFood.VALUES) { - icons[f.ordinal()] = register.registerIcon("enderio:" + f.unlocalisedName); + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); } - } - - @Override - public IIcon getIconFromDamage(int damage) { - return icons[damage % icons.length]; - } - @Override - public int func_150905_g(ItemStack p_150905_1_) { - return EnderFood.get(p_150905_1_).hunger; - } - - @Override - public float func_150906_h(ItemStack p_150906_1_) { - return EnderFood.get(p_150906_1_).saturation; - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(itemStack); - } - - @Override - @SideOnly(Side.CLIENT) - public FontRenderer getFontRenderer(ItemStack stack) { - if (fr == null) { - fr = new SpecialFont(Minecraft.getMinecraft().fontRenderer); + @Override + @SideOnly(Side.CLIENT) + public FontRenderer getFontRenderer(ItemStack stack) { + if (fr == null) { + fr = new SpecialFont(Minecraft.getMinecraft().fontRenderer); + } + return fr; } - return fr; - } } diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index ad465390..cf5b6971 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -1,23 +1,10 @@ package crazypants.enderio.item; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import baubles.api.BaubleType; import baubles.api.IBauble; import cofh.api.energy.ItemEnergyContainer; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ItemUtil; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Optional.Method; @@ -30,201 +17,211 @@ import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.util.BaublesUtil; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API") public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipProvider, IBauble { - private static final String ACTIVE_KEY = "magnetActive"; + private static final String ACTIVE_KEY = "magnetActive"; - public static void setActive(ItemStack item, boolean active) { - if(item == null) { - return; - } - NBTTagCompound nbt = ItemUtil.getOrCreateNBT(item); - nbt.setBoolean(ACTIVE_KEY, active); - } - - public static boolean isActive(ItemStack item) { - if(item == null) { - return false; - } - if(item.stackTagCompound == null) { - return false; - } - if(!item.stackTagCompound.hasKey(ACTIVE_KEY)) { - return false; - } - return item.stackTagCompound.getBoolean(ACTIVE_KEY); - } - - public static boolean hasPower(ItemStack itemStack) { - int energyStored = DarkSteelItems.itemMagnet.getEnergyStored(itemStack); - return energyStored > 0 && energyStored >= Config.magnetPowerUsePerSecondRF; - } - - public static void drainPerSecondPower(ItemStack itemStack) { - DarkSteelItems.itemMagnet.extractEnergyInternal(itemStack, Config.magnetPowerUsePerSecondRF, false); - } - - static MagnetController controller = new MagnetController(); - - public static ItemMagnet create() { - ItemMagnet result = new ItemMagnet(); - result.init(); - FMLCommonHandler.instance().bus().register(controller); - return result; - } - - protected ItemMagnet() { - super(Config.magnetPowerCapacityRF, Config.magnetPowerCapacityRF / 100); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemMagnet.unlocalisedName); - setMaxDamage(16); - setMaxStackSize(1); - setHasSubtypes(true); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemMagnet.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:magnet"); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - setFull(is); - par3List.add(is); - - is = new ItemStack(this); - setEnergy(is, 0); - par3List.add(is); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(itemStack, par2EntityPlayer, list, par4); - String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " - + PowerDisplayUtil.abrevation(); - list.add(str); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack item, int pass) { - return isActive(item); - } - - @Override - public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { - setEnergy(itemStack, 0); - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - int res = super.receiveEnergy(container, maxReceive, simulate); - if(res != 0 && !simulate) { - updateDamage(container); - } - return res; - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (Config.magnetAllowPowerExtraction) { - return extractEnergyInternal(container, maxExtract, simulate); - } else { - return 0; - } - } - - public int extractEnergyInternal(ItemStack container, int maxExtract, boolean simulate) { - int res = super.extractEnergy(container, maxExtract, simulate); - if (res != 0 && !simulate) { - updateDamage(container); - } - return res; - } - - void setEnergy(ItemStack container, int energy) { - if(container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); - } - container.stackTagCompound.setInteger("Energy", energy); - updateDamage(container); - } - - void setFull(ItemStack container) { - setEnergy(container, Config.magnetPowerCapacityRF); - } - - private void updateDamage(ItemStack stack) { - float r = (float) getEnergyStored(stack) / getMaxEnergyStored(stack); - int res = 16 - (int) (r * 16); - stack.setItemDamage(res); - } - - @Override - public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { - if(player.isSneaking()) { - setActive(equipped, !isActive(equipped)); - } - return equipped; - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } - - @Override - @Method(modid = "Baubles|API") - public BaubleType getBaubleType(ItemStack itemstack) { - BaubleType t = null; - try { - t = BaubleType.valueOf(Config.magnetBaublesType); - } catch (Exception e) { - //NOP - } - return t != null ? t : BaubleType.AMULET; - } - - @Override - public void onWornTick(ItemStack itemstack, EntityLivingBase player) { - if (player instanceof EntityPlayer && isActive(itemstack) && hasPower(itemstack) && ((EntityPlayer) player).getHealth() > 0f) { - controller.doHoover((EntityPlayer) player); - if(!player.worldObj.isRemote && player.worldObj.getTotalWorldTime() % 20 == 0) { - ItemMagnet.drainPerSecondPower(itemstack); - IInventory baubles = BaublesUtil.instance().getBaubles((EntityPlayer) player); - if(baubles != null) { - baubles.markDirty(); + public static void setActive(ItemStack item, boolean active) { + if (item == null) { + return; } - } + NBTTagCompound nbt = ItemUtil.getOrCreateNBT(item); + nbt.setBoolean(ACTIVE_KEY, active); } - } - @Override - public void onEquipped(ItemStack itemstack, EntityLivingBase player) { - } + public static boolean isActive(ItemStack item) { + if (item == null) { + return false; + } + if (item.stackTagCompound == null) { + return false; + } + if (!item.stackTagCompound.hasKey(ACTIVE_KEY)) { + return false; + } + return item.stackTagCompound.getBoolean(ACTIVE_KEY); + } - @Override - public void onUnequipped(ItemStack itemstack, EntityLivingBase player) { - } + public static boolean hasPower(ItemStack itemStack) { + int energyStored = DarkSteelItems.itemMagnet.getEnergyStored(itemStack); + return energyStored > 0 && energyStored >= Config.magnetPowerUsePerSecondRF; + } - @Override - public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { - return Config.magnetAllowInBaublesSlot && (Config.magnetAllowDeactivatedInBaublesSlot || isActive(itemstack)); - } + public static void drainPerSecondPower(ItemStack itemStack) { + DarkSteelItems.itemMagnet.extractEnergyInternal(itemStack, Config.magnetPowerUsePerSecondRF, false); + } - @Override - public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { - return true; - } + static MagnetController controller = new MagnetController(); + public static ItemMagnet create() { + ItemMagnet result = new ItemMagnet(); + result.init(); + FMLCommonHandler.instance().bus().register(controller); + return result; + } + + protected ItemMagnet() { + super(Config.magnetPowerCapacityRF, Config.magnetPowerCapacityRF / 100); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemMagnet.unlocalisedName); + setMaxDamage(16); + setMaxStackSize(1); + setHasSubtypes(true); + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemMagnet.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:magnet"); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + setFull(is); + par3List.add(is); + + is = new ItemStack(this); + setEnergy(is, 0); + par3List.add(is); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(itemStack, par2EntityPlayer, list, par4); + String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" + + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); + list.add(str); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack item, int pass) { + return isActive(item); + } + + @Override + public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { + setEnergy(itemStack, 0); + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + int res = super.receiveEnergy(container, maxReceive, simulate); + if (res != 0 && !simulate) { + updateDamage(container); + } + return res; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + if (Config.magnetAllowPowerExtraction) { + return extractEnergyInternal(container, maxExtract, simulate); + } else { + return 0; + } + } + + public int extractEnergyInternal(ItemStack container, int maxExtract, boolean simulate) { + int res = super.extractEnergy(container, maxExtract, simulate); + if (res != 0 && !simulate) { + updateDamage(container); + } + return res; + } + + void setEnergy(ItemStack container, int energy) { + if (container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + container.stackTagCompound.setInteger("Energy", energy); + updateDamage(container); + } + + void setFull(ItemStack container) { + setEnergy(container, Config.magnetPowerCapacityRF); + } + + private void updateDamage(ItemStack stack) { + float r = (float) getEnergyStored(stack) / getMaxEnergyStored(stack); + int res = 16 - (int) (r * 16); + stack.setItemDamage(res); + } + + @Override + public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { + if (player.isSneaking()) { + setActive(equipped, !isActive(equipped)); + } + return equipped; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + @Method(modid = "Baubles|API") + public BaubleType getBaubleType(ItemStack itemstack) { + BaubleType t = null; + try { + t = BaubleType.valueOf(Config.magnetBaublesType); + } catch (Exception e) { + // NOP + } + return t != null ? t : BaubleType.AMULET; + } + + @Override + public void onWornTick(ItemStack itemstack, EntityLivingBase player) { + if (player instanceof EntityPlayer + && isActive(itemstack) + && hasPower(itemstack) + && ((EntityPlayer) player).getHealth() > 0f) { + controller.doHoover((EntityPlayer) player); + if (!player.worldObj.isRemote && player.worldObj.getTotalWorldTime() % 20 == 0) { + ItemMagnet.drainPerSecondPower(itemstack); + IInventory baubles = BaublesUtil.instance().getBaubles((EntityPlayer) player); + if (baubles != null) { + baubles.markDirty(); + } + } + } + } + + @Override + public void onEquipped(ItemStack itemstack, EntityLivingBase player) {} + + @Override + public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {} + + @Override + public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { + return Config.magnetAllowInBaublesSlot && (Config.magnetAllowDeactivatedInBaublesSlot || isActive(itemstack)); + } + + @Override + public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index 3932078d..3ef49fbf 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -1,104 +1,280 @@ package crazypants.enderio.item; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; +import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.Material.VIBRANT_CYSTAL; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; +import static crazypants.util.RecipeUtil.addShaped; + import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; - -import static crazypants.enderio.material.Alloy.*; -import static crazypants.enderio.material.endergy.AlloyEndergy.*; -import static crazypants.enderio.material.Material.VIBRANT_CYSTAL; -import static crazypants.util.RecipeUtil.addShaped; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; public class ItemRecipes { - public static void addRecipes() { - ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); - ItemStack diode = new ItemStack(EnderIO.itemFrankenSkull,1,FrankenSkull.GUARDIAN_DIODE.ordinal()); - ItemStack sentient = new ItemStack(EnderIO.itemFrankenSkull,1,FrankenSkull.SENTIENT_ENDER.ordinal()); - String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); - String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); - String vibCry = VIBRANT_CYSTAL.oreDict; - String enAlloy = ENERGETIC_ALLOY.getOreIngot(); - String darkSteel = DARK_STEEL.getOreIngot(); - String soularium = SOULARIUM.getOreIngot(); - String endSteel = END_STEEL.getOreIngot(); - String stellarAlloy = STELLAR_ALLOY.getOreIngot(); + public static void addRecipes() { + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack diode = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.GUARDIAN_DIODE.ordinal()); + ItemStack sentient = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); + String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); + String conductiveIron = CONDUCTIVE_IRON.getOreIngot(); + String vibCry = VIBRANT_CYSTAL.oreDict; + String enAlloy = ENERGETIC_ALLOY.getOreIngot(); + String darkSteel = DARK_STEEL.getOreIngot(); + String soularium = SOULARIUM.getOreIngot(); + String endSteel = END_STEEL.getOreIngot(); + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); - // Wrench - ItemStack wrench = new ItemStack(EnderIO.itemYetaWench, 1, 0); - addShaped(wrench, "s s", " b ", " s ", 's', electricalSteel, 'b', basicGear); + // Wrench + ItemStack wrench = new ItemStack(EnderIO.itemYetaWench, 1, 0); + addShaped(wrench, "s s", " b ", " s ", 's', electricalSteel, 'b', basicGear); - //Magnet - ItemStack magnet = new ItemStack(DarkSteelItems.itemMagnet, 1, 0); - DarkSteelItems.itemMagnet.setEnergy(magnet, 0); - addShaped(magnet, "scc", " v", "scc", 's', electricalSteel, 'c', conductiveIron, 'v', vibCry); + // Magnet + ItemStack magnet = new ItemStack(DarkSteelItems.itemMagnet, 1, 0); + DarkSteelItems.itemMagnet.setEnergy(magnet, 0); + addShaped(magnet, "scc", " v", "scc", 's', electricalSteel, 'c', conductiveIron, 'v', vibCry); - //Dark Steel - addShaped(DarkSteelItems.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel); - addShaped(DarkSteelItems.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel); - addShaped(DarkSteelItems.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); - addShaped(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel); + // Dark Steel + addShaped(DarkSteelItems.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel); + addShaped(DarkSteelItems.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel); + addShaped(DarkSteelItems.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); + addShaped(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel); - //End Steel - addShaped(DarkSteelItems.itemEndSteelHelmet.createItemStack(), "sss", "sds", 's', endSteel, 'd', diode); - addShaped(DarkSteelItems.itemEndSteelChestplate.createItemStack(), "sds", "sss", "sss", 's', endSteel, 'd', diode); - addShaped(DarkSteelItems.itemEndSteelLeggings.createItemStack(), "sss", "sds", "s s", 's', endSteel, 'd', diode); - addShaped(DarkSteelItems.itemEndSteelBoots.createItemStack(), "s s", "sds", 's', endSteel, 'd', diode); + // End Steel + addShaped(DarkSteelItems.itemEndSteelHelmet.createItemStack(), "sss", "sds", 's', endSteel, 'd', diode); + addShaped( + DarkSteelItems.itemEndSteelChestplate.createItemStack(), + "sds", + "sss", + "sss", + 's', + endSteel, + 'd', + diode); + addShaped( + DarkSteelItems.itemEndSteelLeggings.createItemStack(), "sss", "sds", "s s", 's', endSteel, 'd', diode); + addShaped(DarkSteelItems.itemEndSteelBoots.createItemStack(), "s s", "sds", 's', endSteel, 'd', diode); - //Stellar - addShaped(DarkSteelItems.itemStellarHelmet.createItemStack(), "sss", "sds", 's', stellarAlloy, 'd', sentient); - addShaped(DarkSteelItems.itemStellarChestplate.createItemStack(), "sds", "sss", "sss", 's', stellarAlloy, 'd', sentient); - addShaped(DarkSteelItems.itemStellarLeggings.createItemStack(), "sss", "sds", "s s", 's', stellarAlloy, 'd', sentient); - addShaped(DarkSteelItems.itemStellarBoots.createItemStack(), "s s", "sds", 's', stellarAlloy, 'd', sentient); + // Stellar + addShaped(DarkSteelItems.itemStellarHelmet.createItemStack(), "sss", "sds", 's', stellarAlloy, 'd', sentient); + addShaped( + DarkSteelItems.itemStellarChestplate.createItemStack(), + "sds", + "sss", + "sss", + 's', + stellarAlloy, + 'd', + sentient); + addShaped( + DarkSteelItems.itemStellarLeggings.createItemStack(), + "sss", + "sds", + "s s", + 's', + stellarAlloy, + 'd', + sentient); + addShaped(DarkSteelItems.itemStellarBoots.createItemStack(), "s s", "sds", 's', stellarAlloy, 'd', sentient); - ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing, 1, 0); - addShaped(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather); - addShaped(new ItemStack(DarkSteelItems.itemGliderWing, 1, 1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); + ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing, 1, 0); + addShaped(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather); + addShaped(new ItemStack(DarkSteelItems.itemGliderWing, 1, 1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); - addShaped(DarkSteelItems.itemDarkSteelShears.createItemStack(), " s", "s ", 's', darkSteel); + addShaped(DarkSteelItems.itemDarkSteelShears.createItemStack(), " s", "s ", 's', darkSteel); - ItemStack dspp = new ItemStack(EnderIO.blockDarkSteelPressurePlate); - addShaped(dspp, "ss", 's', darkSteel); + ItemStack dspp = new ItemStack(EnderIO.blockDarkSteelPressurePlate); + addShaped(dspp, "ss", 's', darkSteel); - ItemStack dsppSilent = new ItemStack(EnderIO.blockDarkSteelPressurePlate, 1, 1); - GameRegistry.addShapedRecipe(dsppSilent, "p", "w", 'p', dspp, 'w', Blocks.wool); + ItemStack dsppSilent = new ItemStack(EnderIO.blockDarkSteelPressurePlate, 1, 1); + GameRegistry.addShapedRecipe(dsppSilent, "p", "w", 'p', dspp, 'w', Blocks.wool); - //Soul Vessel - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemSoulVessel), " s ", "q q", " q ", 's', soularium, 'q', new ItemStack( - EnderIO.blockFusedQuartz, 1, 0))); + // Soul Vessel + GameRegistry.addRecipe(new ShapedOreRecipe( + new ItemStack(EnderIO.itemSoulVessel), + " s ", + "q q", + " q ", + 's', + soularium, + 'q', + new ItemStack(EnderIO.blockFusedQuartz, 1, 0))); - //XP Rod - addShaped(new ItemStack(EnderIO.itemXpTransfer), " s", " v ", "s ", 's', soularium, 'v', enAlloy); + // XP Rod + addShaped(new ItemStack(EnderIO.itemXpTransfer), " s", " v ", "s ", 's', soularium, 'v', enAlloy); + // DS Tools + addShaped( + DarkSteelItems.itemDarkSteelSword.createItemStack(), + " s ", + " s ", + " w ", + 's', + darkSteel, + 'w', + "stickWood"); + addShaped( + DarkSteelItems.itemDarkSteelSword.createItemStack(), + " s ", + " s ", + " w ", + 's', + darkSteel, + 'w', + "woodStick"); + addShaped( + DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), + "sss", + " w ", + " w ", + 's', + darkSteel, + 'w', + "stickWood"); + addShaped( + DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), + "sss", + " w ", + " w ", + 's', + darkSteel, + 'w', + "woodStick"); + addShaped( + DarkSteelItems.itemDarkSteelAxe.createItemStack(), + "ss ", + "sw ", + " w ", + 's', + darkSteel, + 'w', + "woodStick"); + addShaped( + DarkSteelItems.itemDarkSteelAxe.createItemStack(), + "ss ", + "sw ", + " w ", + 's', + darkSteel, + 'w', + "stickWood"); - // DS Tools - addShaped(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood"); - addShaped(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick"); - addShaped(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood"); - addShaped(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick"); - addShaped(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick"); - addShaped(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood"); + // ES Tools + addShaped( + DarkSteelItems.itemEndSteelSword.createItemStack(), + " s ", + " s ", + " w ", + 's', + endSteel, + 'w', + "stickDarkSteel"); + addShaped( + DarkSteelItems.itemEndSteelSword.createItemStack(), + " s ", + " s ", + " w ", + 's', + endSteel, + 'w', + "itemDarkSteelRod"); + addShaped( + DarkSteelItems.itemEndSteelPickaxe.createItemStack(), + "sss", + " w ", + " w ", + 's', + endSteel, + 'w', + "stickDarkSteel"); + addShaped( + DarkSteelItems.itemEndSteelPickaxe.createItemStack(), + "sss", + " w ", + " w ", + 's', + endSteel, + 'w', + "itemDarkSteelRod"); + addShaped( + DarkSteelItems.itemEndSteelAxe.createItemStack(), + "ss ", + "sw ", + " w ", + 's', + endSteel, + 'w', + "stickDarkSteel"); + addShaped( + DarkSteelItems.itemEndSteelAxe.createItemStack(), + "ss ", + "sw ", + " w ", + 's', + endSteel, + 'w', + "itemDarkSteelRod"); - // ES Tools - addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "stickDarkSteel"); - addShaped(DarkSteelItems.itemEndSteelSword.createItemStack(), " s ", " s ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); - addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "stickDarkSteel"); - addShaped(DarkSteelItems.itemEndSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); - addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "stickDarkSteel"); - addShaped(DarkSteelItems.itemEndSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', endSteel, 'w', "itemDarkSteelRod"); - - // Stellar Tools - addShaped(DarkSteelItems.itemStellarSword.createItemStack(), " s ", " s ", " e ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); - addShaped(DarkSteelItems.itemStellarPickaxe.createItemStack(), "sss", " e ", " w ", 's', stellarAlloy,'e', sentient, 'w', "stickDarkSteel"); - addShaped(DarkSteelItems.itemStellarPickaxe.createItemStack(), "sss", " e ", " w ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); - addShaped(DarkSteelItems.itemStellarAxe.createItemStack(), "ss ", "se ", " w ", 's', stellarAlloy,'e', sentient, 'w', "stickDarkSteel"); - addShaped(DarkSteelItems.itemStellarAxe.createItemStack(), "ss ", "se ", " w ", 's', stellarAlloy,'e', sentient, 'w', "itemDarkSteelRod"); - - } + // Stellar Tools + addShaped( + DarkSteelItems.itemStellarSword.createItemStack(), + " s ", + " s ", + " e ", + 's', + stellarAlloy, + 'e', + sentient, + 'w', + "itemDarkSteelRod"); + addShaped( + DarkSteelItems.itemStellarPickaxe.createItemStack(), + "sss", + " e ", + " w ", + 's', + stellarAlloy, + 'e', + sentient, + 'w', + "stickDarkSteel"); + addShaped( + DarkSteelItems.itemStellarPickaxe.createItemStack(), + "sss", + " e ", + " w ", + 's', + stellarAlloy, + 'e', + sentient, + 'w', + "itemDarkSteelRod"); + addShaped( + DarkSteelItems.itemStellarAxe.createItemStack(), + "ss ", + "se ", + " w ", + 's', + stellarAlloy, + 'e', + sentient, + 'w', + "stickDarkSteel"); + addShaped( + DarkSteelItems.itemStellarAxe.createItemStack(), + "ss ", + "se ", + " w ", + 's', + stellarAlloy, + 'e', + sentient, + 'w', + "itemDarkSteelRod"); + } } diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 16c428ef..eb091b14 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -1,8 +1,17 @@ package crazypants.enderio.item; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.DyeColor; +import com.enderio.core.common.util.EntityUtil; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockWall; @@ -27,379 +36,377 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.EntityUtil; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; - public class ItemSoulVessel extends Item implements IResourceTooltipProvider { - public static ItemSoulVessel create() { - ItemSoulVessel result = new ItemSoulVessel(); - result.init(); - return result; - } - - private IIcon filledIcon; - - private List blackList; - - protected ItemSoulVessel() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemSoulVessel.unlocalisedName); - setMaxStackSize(64); - blackList = new ArrayList(); - for (String ent : Config.soulVesselBlackList) { - blackList.add(ent); - } - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemSoulVessel.unlocalisedName); - } - - public void addEntityToBlackList(String entityName) { - blackList.add(entityName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:soulVessel"); - filledIcon = IIconRegister.registerIcon("enderio:soulVesselFilled"); - } - - @Override - public IIcon getIcon(ItemStack item, int arg1, EntityPlayer arg2, ItemStack arg3, int arg4) { - if(containsSoul(item)) { - return filledIcon; - } - return itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconIndex(ItemStack item) { - if(containsSoul(item)) { - return filledIcon; - } - return itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack item, int pass) { - return containsSoul(item); - } - - @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - - if(world.isRemote) { - return true; - } - if(!containsSoul(itemstack)) { - return false; - } - if(player == null) { - return false; + public static ItemSoulVessel create() { + ItemSoulVessel result = new ItemSoulVessel(); + result.init(); + return result; } - Entity mob; - NBTTagCompound root = itemstack.stackTagCompound; - if(root.hasKey("isStub")) { - String entityId = root.getString("id"); - mob = EntityList.createEntityByName(entityId, world); - } else { - mob = EntityList.createEntityFromNBT(root, world); - } - if (mob == null) { - return true; - } - mob.readFromNBT(root); + private IIcon filledIcon; - Block blk = world.getBlock(x,y,z); - double spawnX = x + Facing.offsetsXForSide[side] + 0.5; - double spawnY = y + Facing.offsetsYForSide[side]; - double spawnZ = z + Facing.offsetsZForSide[side] + 0.5; - if(side == ForgeDirection.UP.ordinal() && (blk instanceof BlockFence || blk instanceof BlockWall)) { - spawnY += 0.5; - } - mob.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0); + private List blackList; - boolean spaceClear = world.checkNoEntityCollision(mob.boundingBox) - && world.getCollidingBoundingBoxes(mob, mob.boundingBox).isEmpty(); - if(!spaceClear) { - return false; - } - - if(itemstack.hasDisplayName() && mob instanceof EntityLiving) { - ((EntityLiving)mob).setCustomNameTag(itemstack.getDisplayName()); - } - - world.spawnEntityInWorld(mob); - if(mob instanceof EntityLiving) { - ((EntityLiving)mob).playLivingSound(); - } - - Entity riddenByEntity = mob.riddenByEntity; - while(riddenByEntity != null) { - riddenByEntity.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0.0F); - world.spawnEntityInWorld(riddenByEntity); - if(riddenByEntity instanceof EntityLiving) { - ((EntityLiving)riddenByEntity).playLivingSound(); - } - riddenByEntity = riddenByEntity.riddenByEntity; - } - - if (!player.capabilities.isCreativeMode) { - if(itemstack.stackSize > 1) { - itemstack.stackSize--; - player.inventory.addItemStackToInventory(new ItemStack(this)); - player.inventoryContainer.detectAndSendChanges(); - } else { - itemstack.setTagCompound(null); - } - } - - return true; - } - - @Override - public boolean itemInteractionForEntity(ItemStack item, EntityPlayer player, EntityLivingBase entity) { - - if(entity.worldObj.isRemote) { - return false; - } - boolean isCreative = player != null && player.capabilities.isCreativeMode; - if(containsSoul(item) && !isCreative) { - return false; - } - if(entity instanceof EntityPlayer) { - return false; - } - if(entity.isDead) { - return false; - } - - String entityId = EntityList.getEntityString(entity); - if(isBlackListed(entityId)) { - return false; - } - - if(!Config.soulVesselCapturesBosses && entity instanceof IBossDisplayData) { - return false; - } - - NBTTagCompound root = new NBTTagCompound(); - root.setString("id", entityId); - entity.writeToNBT(root); - - ItemStack capturedMobVessel = new ItemStack(EnderIO.itemSoulVessel); - capturedMobVessel.setTagCompound(root); - setDisplayNameFromEntityNameTag(capturedMobVessel, entity); - - player.swingItem(); - if(!isCreative) { - entity.setDead(); - if(entity.isDead) { - item.stackSize--; - if (!player.inventory.addItemStackToInventory(capturedMobVessel)) - { - entity.worldObj.spawnEntityInWorld(new EntityItem(entity.worldObj,entity.posX, entity.posY, entity.posZ, capturedMobVessel)); + protected ItemSoulVessel() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemSoulVessel.unlocalisedName); + setMaxStackSize(64); + blackList = new ArrayList(); + for (String ent : Config.soulVesselBlackList) { + blackList.add(ent); } - player.setCurrentItemOrArmor(0, item); - ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); - return true; - } - } else { - if (!player.inventory.addItemStackToInventory(capturedMobVessel)) //Inventory full, drop it in the world! - { - entity.worldObj.spawnEntityInWorld(new EntityItem(entity.worldObj,entity.posX, entity.posY, entity.posZ, capturedMobVessel)); - } - ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); - return true; } - return false; - } - public ItemStack createVesselWithEntityStub(String entityId) { - NBTTagCompound root = new NBTTagCompound(); - root.setString("id", entityId); - root.setBoolean("isStub", true); + protected void init() { + GameRegistry.registerItem(this, ModObject.itemSoulVessel.unlocalisedName); + } - ItemStack res = new ItemStack(this); - res.stackTagCompound = root; - return res; - } + public void addEntityToBlackList(String entityName) { + blackList.add(entityName); + } - public ItemStack createVesselWithEntity(Entity ent) { + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:soulVessel"); + filledIcon = IIconRegister.registerIcon("enderio:soulVesselFilled"); + } - String entityId = EntityList.getEntityString(ent); - NBTTagCompound root = new NBTTagCompound(); - root.setString("id", entityId); - ent.writeToNBT(root); - - ItemStack res = new ItemStack(this); - res.stackTagCompound = root; - - setDisplayNameFromEntityNameTag(res, ent); - return res; - } - - private void setDisplayNameFromEntityNameTag(ItemStack item, Entity ent) { - if(ent instanceof EntityLiving) { - EntityLiving entLiv = (EntityLiving)ent; - if(entLiv.hasCustomNameTag()) { - String name = entLiv.getCustomNameTag(); - if(name.length() > 0) { - item.setStackDisplayName(name); + @Override + public IIcon getIcon(ItemStack item, int arg1, EntityPlayer arg2, ItemStack arg3, int arg4) { + if (containsSoul(item)) { + return filledIcon; } - } + return itemIcon; } - } - public boolean containsSoul(ItemStack item) { - if(item == null) { - return false; - } - if(item.getItem() != this) { - return false; - } - return item.stackTagCompound != null && item.stackTagCompound.hasKey("id"); - } - - public String getMobTypeFromStack(ItemStack item) { - if(!containsSoul(item)) { - return null; - } - if(item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { - return null; - } - return item.stackTagCompound.getString("id"); - } - - /** Support for displaying fluid name of captured Moo Fluids cow */ - private String getFluidNameFromStack(ItemStack item) { - if(!containsSoul(item)) { - return null; - } - if(!item.stackTagCompound.hasKey("FluidName")) { - return null; - } - return item.stackTagCompound.getString("FluidName"); - } - - private DyeColor getColorFromStack(ItemStack item) { - if(!containsSoul(item)) { - return null; - } - if(!item.stackTagCompound.hasKey("Color")) { - return null; - } - int colorIdx = item.stackTagCompound.getInteger("Color"); - if(colorIdx < 0 || colorIdx > 15) { - return null; - } - return DyeColor.values()[15-colorIdx]; - } - - private float getHealthFromStack(ItemStack item) { - if(!containsSoul(item)) { - return Float.NaN; - } - if(!item.stackTagCompound.hasKey("HealF")) { - return Float.NaN; - } - return item.stackTagCompound.getFloat("HealF"); - } - - private NBTTagCompound getAttributeFromStack(ItemStack item, String name) { - if(!containsSoul(item)) { - return null; - } - NBTBase tag = item.stackTagCompound.getTag("Attributes"); - if(tag instanceof NBTTagList) { - NBTTagList attributes = (NBTTagList)tag; - for(int i=0 ; i= 0) { - float maxHealth = getMaxHealthFromStack(par1ItemStack); - String msg = EnderIO.lang.localize("item.itemSoulVessel.tooltip.health"); - if(maxHealth >= 0) { - par3List.add(String.format("%s %3.1f/%3.1f", msg, health, maxHealth)); + Entity mob; + NBTTagCompound root = itemstack.stackTagCompound; + if (root.hasKey("isStub")) { + String entityId = root.getString("id"); + mob = EntityList.createEntityByName(entityId, world); } else { - par3List.add(String.format("%s %3.1f", msg, health)); + mob = EntityList.createEntityFromNBT(root, world); } - } - - String fluidName = getFluidNameFromStack(par1ItemStack); - if(fluidName != null) { - Fluid fluid = FluidRegistry.getFluid(fluidName); - if(fluid != null) { - par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.fluidname") + " " + fluid.getLocalizedName()); + if (mob == null) { + return true; } - } + mob.readFromNBT(root); - DyeColor color = getColorFromStack(par1ItemStack); - if(color != null) { - par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.color") + " " + color.getLocalisedName()); - } + Block blk = world.getBlock(x, y, z); + double spawnX = x + Facing.offsetsXForSide[side] + 0.5; + double spawnY = y + Facing.offsetsYForSide[side]; + double spawnZ = z + Facing.offsetsZForSide[side] + 0.5; + if (side == ForgeDirection.UP.ordinal() && (blk instanceof BlockFence || blk instanceof BlockWall)) { + spawnY += 0.5; + } + mob.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0); + + boolean spaceClear = world.checkNoEntityCollision(mob.boundingBox) + && world.getCollidingBoundingBoxes(mob, mob.boundingBox).isEmpty(); + if (!spaceClear) { + return false; + } + + if (itemstack.hasDisplayName() && mob instanceof EntityLiving) { + ((EntityLiving) mob).setCustomNameTag(itemstack.getDisplayName()); + } + + world.spawnEntityInWorld(mob); + if (mob instanceof EntityLiving) { + ((EntityLiving) mob).playLivingSound(); + } + + Entity riddenByEntity = mob.riddenByEntity; + while (riddenByEntity != null) { + riddenByEntity.setLocationAndAngles(spawnX, spawnY, spawnZ, world.rand.nextFloat() * 360.0F, 0.0F); + world.spawnEntityInWorld(riddenByEntity); + if (riddenByEntity instanceof EntityLiving) { + ((EntityLiving) riddenByEntity).playLivingSound(); + } + riddenByEntity = riddenByEntity.riddenByEntity; + } + + if (!player.capabilities.isCreativeMode) { + if (itemstack.stackSize > 1) { + itemstack.stackSize--; + player.inventory.addItemStackToInventory(new ItemStack(this)); + player.inventoryContainer.detectAndSendChanges(); + } else { + itemstack.setTagCompound(null); + } + } + + return true; } - } + @Override + public boolean itemInteractionForEntity(ItemStack item, EntityPlayer player, EntityLivingBase entity) { + if (entity.worldObj.isRemote) { + return false; + } + boolean isCreative = player != null && player.capabilities.isCreativeMode; + if (containsSoul(item) && !isCreative) { + return false; + } + if (entity instanceof EntityPlayer) { + return false; + } + if (entity.isDead) { + return false; + } + String entityId = EntityList.getEntityString(entity); + if (isBlackListed(entityId)) { + return false; + } + + if (!Config.soulVesselCapturesBosses && entity instanceof IBossDisplayData) { + return false; + } + + NBTTagCompound root = new NBTTagCompound(); + root.setString("id", entityId); + entity.writeToNBT(root); + + ItemStack capturedMobVessel = new ItemStack(EnderIO.itemSoulVessel); + capturedMobVessel.setTagCompound(root); + setDisplayNameFromEntityNameTag(capturedMobVessel, entity); + + player.swingItem(); + if (!isCreative) { + entity.setDead(); + if (entity.isDead) { + item.stackSize--; + if (!player.inventory.addItemStackToInventory(capturedMobVessel)) { + entity.worldObj.spawnEntityInWorld( + new EntityItem(entity.worldObj, entity.posX, entity.posY, entity.posZ, capturedMobVessel)); + } + player.setCurrentItemOrArmor(0, item); + ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); + return true; + } + } else { + if (!player.inventory.addItemStackToInventory(capturedMobVessel)) // Inventory full, drop it in the world! + { + entity.worldObj.spawnEntityInWorld( + new EntityItem(entity.worldObj, entity.posX, entity.posY, entity.posZ, capturedMobVessel)); + } + ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); + return true; + } + return false; + } + + public ItemStack createVesselWithEntityStub(String entityId) { + NBTTagCompound root = new NBTTagCompound(); + root.setString("id", entityId); + root.setBoolean("isStub", true); + + ItemStack res = new ItemStack(this); + res.stackTagCompound = root; + return res; + } + + public ItemStack createVesselWithEntity(Entity ent) { + + String entityId = EntityList.getEntityString(ent); + NBTTagCompound root = new NBTTagCompound(); + root.setString("id", entityId); + ent.writeToNBT(root); + + ItemStack res = new ItemStack(this); + res.stackTagCompound = root; + + setDisplayNameFromEntityNameTag(res, ent); + return res; + } + + private void setDisplayNameFromEntityNameTag(ItemStack item, Entity ent) { + if (ent instanceof EntityLiving) { + EntityLiving entLiv = (EntityLiving) ent; + if (entLiv.hasCustomNameTag()) { + String name = entLiv.getCustomNameTag(); + if (name.length() > 0) { + item.setStackDisplayName(name); + } + } + } + } + + public boolean containsSoul(ItemStack item) { + if (item == null) { + return false; + } + if (item.getItem() != this) { + return false; + } + return item.stackTagCompound != null && item.stackTagCompound.hasKey("id"); + } + + public String getMobTypeFromStack(ItemStack item) { + if (!containsSoul(item)) { + return null; + } + if (item.stackTagCompound == null || !item.stackTagCompound.hasKey("id")) { + return null; + } + return item.stackTagCompound.getString("id"); + } + + /** Support for displaying fluid name of captured Moo Fluids cow */ + private String getFluidNameFromStack(ItemStack item) { + if (!containsSoul(item)) { + return null; + } + if (!item.stackTagCompound.hasKey("FluidName")) { + return null; + } + return item.stackTagCompound.getString("FluidName"); + } + + private DyeColor getColorFromStack(ItemStack item) { + if (!containsSoul(item)) { + return null; + } + if (!item.stackTagCompound.hasKey("Color")) { + return null; + } + int colorIdx = item.stackTagCompound.getInteger("Color"); + if (colorIdx < 0 || colorIdx > 15) { + return null; + } + return DyeColor.values()[15 - colorIdx]; + } + + private float getHealthFromStack(ItemStack item) { + if (!containsSoul(item)) { + return Float.NaN; + } + if (!item.stackTagCompound.hasKey("HealF")) { + return Float.NaN; + } + return item.stackTagCompound.getFloat("HealF"); + } + + private NBTTagCompound getAttributeFromStack(ItemStack item, String name) { + if (!containsSoul(item)) { + return null; + } + NBTBase tag = item.stackTagCompound.getTag("Attributes"); + if (tag instanceof NBTTagList) { + NBTTagList attributes = (NBTTagList) tag; + for (int i = 0; i < attributes.tagCount(); i++) { + NBTTagCompound attrib = attributes.getCompoundTagAt(i); + if (attrib.hasKey("Name") && name.equals(attrib.getString("Name"))) { + return attrib; + } + } + } + return null; + } + + private float getMaxHealthFromStack(ItemStack item) { + NBTTagCompound maxHealthAttrib = getAttributeFromStack(item, "generic.maxHealth"); + if (maxHealthAttrib == null) { + return Float.NaN; + } + if (!maxHealthAttrib.hasKey("Base")) { + return Float.NaN; + } + return maxHealthAttrib.getFloat("Base"); + } + + private boolean isBlackListed(String entityId) { + for (String str : blackList) { + if (str != null && str.equals(entityId)) { + return true; + } + } + return false; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (par1ItemStack != null) { + String mobName = getMobTypeFromStack(par1ItemStack); + if (mobName != null) { + par3List.add(EntityUtil.getDisplayNameForEntity(mobName)); + } else { + par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.empty")); + } + + float health = getHealthFromStack(par1ItemStack); + if (health >= 0) { + float maxHealth = getMaxHealthFromStack(par1ItemStack); + String msg = EnderIO.lang.localize("item.itemSoulVessel.tooltip.health"); + if (maxHealth >= 0) { + par3List.add(String.format("%s %3.1f/%3.1f", msg, health, maxHealth)); + } else { + par3List.add(String.format("%s %3.1f", msg, health)); + } + } + + String fluidName = getFluidNameFromStack(par1ItemStack); + if (fluidName != null) { + Fluid fluid = FluidRegistry.getFluid(fluidName); + if (fluid != null) { + par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.fluidname") + " " + + fluid.getLocalizedName()); + } + } + + DyeColor color = getColorFromStack(par1ItemStack); + if (color != null) { + par3List.add( + EnderIO.lang.localize("item.itemSoulVessel.tooltip.color") + " " + color.getLocalisedName()); + } + } + } } diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index b0a854c6..1190de83 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -1,30 +1,8 @@ package crazypants.enderio.item; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; - -import org.lwjgl.input.Keyboard; - import cofh.api.block.IDismantleable; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -38,167 +16,211 @@ import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import org.lwjgl.input.Keyboard; -public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { +public class ItemYetaWrench extends Item + implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { - public static ItemYetaWrench create() { - if (Config.useSneakMouseWheelYetaWrench) { - PacketHandler.INSTANCE.registerMessage(YetaWrenchPacketProcessor.class, YetaWrenchPacketProcessor.class, PacketHandler.nextID(), Side.SERVER); - } - ItemYetaWrench result = new ItemYetaWrench(); - result = ToolUtil.addInterfaces(result); - //result.init(); - GameRegistry.registerItem(result, ModObject.itemYetaWrench.unlocalisedName); - - return result; - } - - protected ItemYetaWrench() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemYetaWrench.unlocalisedName); - setMaxStackSize(1); - } - - // protected void init() { - // //GameRegistry.registerItem(this, ModObject.itemYetaWrench.unlocalisedName); - // } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:yetaWrench"); - } - - @Override - public boolean onItemUseFirst(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); - boolean ret = false; - if (block != null) { - PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, x, y, z, side, world); - if (MinecraftForge.EVENT_BUS.post(e) || e.getResult() == Result.DENY || e.useBlock == Result.DENY || e.useItem == Result.DENY) { - return false; - } - if (player.isSneaking() && block instanceof IDismantleable && ((IDismantleable) block).canDismantle(player, world, x, y, z)) { - if (!world.isRemote) { - ((IDismantleable) block).dismantleBlock(player, world, x, y, z, false); + public static ItemYetaWrench create() { + if (Config.useSneakMouseWheelYetaWrench) { + PacketHandler.INSTANCE.registerMessage( + YetaWrenchPacketProcessor.class, + YetaWrenchPacketProcessor.class, + PacketHandler.nextID(), + Side.SERVER); } - ret = true; - } else if (!player.isSneaking() && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { - if (block == Blocks.chest) { - // This works around a forge bug where you can rotate double chests to invalid directions - TileEntityChest te = (TileEntityChest) world.getTileEntity(x, y, z); - if (te.adjacentChestXNeg != null || te.adjacentChestXPos != null || te.adjacentChestZNeg != null || te.adjacentChestZPos != null) { - // Render master is always the chest to the negative direction - TileEntityChest masterChest = te.adjacentChestXNeg == null && te.adjacentChestZNeg == null ? te : te.adjacentChestXNeg == null ? te.adjacentChestZNeg: te.adjacentChestXNeg; - if (masterChest != te) { - int meta = world.getBlockMetadata(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord); - world.setBlockMetadataWithNotify(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord, meta ^ 1, 3); - } else { - // If this is the master chest, we can just rotate twice - block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)); + ItemYetaWrench result = new ItemYetaWrench(); + result = ToolUtil.addInterfaces(result); + // result.init(); + GameRegistry.registerItem(result, ModObject.itemYetaWrench.unlocalisedName); + + return result; + } + + protected ItemYetaWrench() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemYetaWrench.unlocalisedName); + setMaxStackSize(1); + } + + // protected void init() { + // //GameRegistry.registerItem(this, ModObject.itemYetaWrench.unlocalisedName); + // } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:yetaWrench"); + } + + @Override + public boolean onItemUseFirst( + 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); + boolean ret = false; + if (block != null) { + PlayerInteractEvent e = new PlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, x, y, z, side, world); + if (MinecraftForge.EVENT_BUS.post(e) + || e.getResult() == Result.DENY + || e.useBlock == Result.DENY + || e.useItem == Result.DENY) { + return false; + } + if (player.isSneaking() + && block instanceof IDismantleable + && ((IDismantleable) block).canDismantle(player, world, x, y, z)) { + if (!world.isRemote) { + ((IDismantleable) block).dismantleBlock(player, world, x, y, z, false); + } + ret = true; + } else if (!player.isSneaking() && block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side))) { + if (block == Blocks.chest) { + // This works around a forge bug where you can rotate double chests to invalid directions + TileEntityChest te = (TileEntityChest) world.getTileEntity(x, y, z); + if (te.adjacentChestXNeg != null + || te.adjacentChestXPos != null + || te.adjacentChestZNeg != null + || te.adjacentChestZPos != null) { + // Render master is always the chest to the negative direction + TileEntityChest masterChest = te.adjacentChestXNeg == null && te.adjacentChestZNeg == null + ? te + : te.adjacentChestXNeg == null ? te.adjacentChestZNeg : te.adjacentChestXNeg; + if (masterChest != te) { + int meta = + world.getBlockMetadata(masterChest.xCoord, masterChest.yCoord, masterChest.zCoord); + world.setBlockMetadataWithNotify( + masterChest.xCoord, masterChest.yCoord, masterChest.zCoord, meta ^ 1, 3); + } else { + // If this is the master chest, we can just rotate twice + block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)); + } + } + } + ret = true; + } else if (block instanceof IRotatableFacade + && !player.isSneaking() + && (block != EnderIO.blockConduitBundle + || ConduitDisplayMode.getDisplayMode(stack) == ConduitDisplayMode.NONE)) { + if (((IRotatableFacade) block).tryRotateFacade(world, x, y, z, ForgeDirection.getOrientation(side))) { + ret = true; + } } - } } - ret = true; - } else if (block instanceof IRotatableFacade && !player.isSneaking() - && (block != EnderIO.blockConduitBundle || ConduitDisplayMode.getDisplayMode(stack) == ConduitDisplayMode.NONE)) { - if (((IRotatableFacade) block).tryRotateFacade(world, x, y, z, ForgeDirection.getOrientation(side))) { - ret = true; + if (ret) { + player.swingItem(); } - } + return ret && !world.isRemote; } - if (ret) { - player.swingItem(); + + @Override + public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { + if (!Config.useSneakRightClickYetaWrench) { + return equipped; + } + if (!player.isSneaking()) { + return equipped; + } + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); + if (curMode == null) { + curMode = ConduitDisplayMode.ALL; + } + ConduitDisplayMode newMode = curMode.next(); + ConduitDisplayMode.setDisplayMode(equipped, newMode); + return equipped; } - return ret && !world.isRemote; - } - @Override - public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { - if (!Config.useSneakRightClickYetaWrench) { - return equipped; + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + Block block = player.worldObj.getBlock(x, y, z); + if (player.isSneaking() && block == EnderIO.blockConduitBundle && player.capabilities.isCreativeMode) { + block.onBlockClicked(player.worldObj, x, y, z, player); + return true; + } + return false; } - if (!player.isSneaking()) { - return equipped; + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; } - ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); - if (curMode == null) { - curMode = ConduitDisplayMode.ALL; + + @Override + public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { + return true; } - ConduitDisplayMode newMode = curMode.next(); - ConduitDisplayMode.setDisplayMode(equipped, newMode); - return equipped; - } - @Override - public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { - Block block = player.worldObj.getBlock(x, y, z); - if (player.isSneaking() && block == EnderIO.blockConduitBundle && player.capabilities.isCreativeMode) { - block.onBlockClicked(player.worldObj, x, y, z, player); - return true; + @Override + public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { + return true; } - return false; - } - @Override - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } + @Override + public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) {} - @Override - public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return true; - } - - @Override - public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { - return true; - } - - @Override - public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { - } - - @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); - return curMode != ConduitDisplayMode.NONE; - } - - @Override - public boolean showOverlay(ItemStack stack, EntityPlayer player) { - return true; - } - - /* IAdvancedTooltipProvider */ - - @SuppressWarnings("rawtypes") - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @SuppressWarnings("rawtypes") - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ArrayList tmp = new ArrayList(); - SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); - String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); - for (String line : tmp) { - list.add(String.format(line, keyName)); + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); + return curMode != ConduitDisplayMode.NONE; } - } - /* InvocationHandler */ + @Override + public boolean showOverlay(ItemStack stack, EntityPlayer player) { + return true; + } - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - System.out.println("ItemYetaWrench.invoke: method = " + method.getName()); - return null; - } + /* IAdvancedTooltipProvider */ + + @SuppressWarnings("rawtypes") + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @SuppressWarnings("rawtypes") + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + ArrayList tmp = new ArrayList(); + SpecialTooltipHandler.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); + String keyName = + Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); + for (String line : tmp) { + list.add(String.format(line, keyName)); + } + } + + /* InvocationHandler */ + + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + System.out.println("ItemYetaWrench.invoke: method = " + method.getName()); + return null; + } } diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 2ffcbc1f..2a6453f2 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -1,16 +1,8 @@ package crazypants.enderio.item; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; +import static crazypants.enderio.item.darksteel.DarkSteelItems.itemMagnet; import com.enderio.core.common.util.ChatUtil; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; @@ -30,223 +22,267 @@ import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import crazypants.util.BaublesUtil; -import static crazypants.enderio.item.darksteel.DarkSteelItems.itemMagnet; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; public class KeyTracker { - public static final KeyTracker instance = new KeyTracker(); - - private final KeyBinding glideKey; - - private final KeyBinding soundDetectorKey; - - private final KeyBinding nightVisionKey; - - private final KeyBinding stepAssistKey; - - private final KeyBinding speedKey; - - private final KeyBinding jumpKey; - - private final KeyBinding gogglesKey; - - private final KeyBinding yetaWrenchMode; - - private final KeyBinding magnetKey; - - public KeyTracker() { - glideKey = new KeyBinding(EnderIO.lang.localize("keybind.glidertoggle"), Keyboard.KEY_G, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(glideKey); - soundDetectorKey = new KeyBinding(EnderIO.lang.localize("keybind.soundlocator"), Keyboard.KEY_L, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(soundDetectorKey); - nightVisionKey = new KeyBinding(EnderIO.lang.localize("keybind.nightvision"), Keyboard.KEY_P, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(nightVisionKey); - gogglesKey = new KeyBinding(EnderIO.lang.localize("keybind.gogglesofrevealing"), Keyboard.KEY_R, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(gogglesKey); - - stepAssistKey = new KeyBinding(EnderIO.lang.localize("keybind.stepassist"), Keyboard.KEY_NONE, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(stepAssistKey); - - speedKey = new KeyBinding(EnderIO.lang.localize("keybind.speed"), Keyboard.KEY_NONE, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(speedKey); - - jumpKey = new KeyBinding(EnderIO.lang.localize("keybind.jump"), Keyboard.KEY_NONE, EnderIO.lang.localize("category.darksteelarmor")); - ClientRegistry.registerKeyBinding(jumpKey); - - yetaWrenchMode = new KeyBinding(EnderIO.lang.localize("keybind.yetawrenchmode"), Keyboard.KEY_Y, EnderIO.lang.localize("category.tools")); - ClientRegistry.registerKeyBinding(yetaWrenchMode); + public static final KeyTracker instance = new KeyTracker(); - magnetKey = new KeyBinding(EnderIO.lang.localize("keybind.magnet"), Keyboard.CHAR_NONE, EnderIO.lang.localize("category.tools")); - ClientRegistry.registerKeyBinding(magnetKey); - } - - @SubscribeEvent - public void onKeyInput(KeyInputEvent event) { - handleGlide(); - handleSoundDetector(); - handleNightVision(); - handleYetaWrench(); - handleGoggles(); - handleStepAssist(); - handleSpeed(); - handleJump(); - handleMagnet(); - } + private final KeyBinding glideKey; - private void sendEnabledChatMessage(String messageBase, boolean isActive) { - String message = messageBase.concat(isActive ? ".enabled" : ".disabled"); - ChatUtil.sendNoSpamClientUnloc(EnderIO.lang, message); - } + private final KeyBinding soundDetectorKey; - private void toggleDarkSteelController(Type type, String messageBase) { - boolean isActive = !DarkSteelController.instance.isActive(Minecraft.getMinecraft().thePlayer, type); - sendEnabledChatMessage(messageBase, isActive); - DarkSteelController.instance.setActive(Minecraft.getMinecraft().thePlayer, type, isActive); - PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(type, isActive)); - } + private final KeyBinding nightVisionKey; - private void handleMagnet() { - if(magnetKey.isPressed()) { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - ItemStack[] inv = player.inventory.mainInventory; - for (int i = 0; i < 9; i++) { - if(inv[i] != null && inv[i].getItem() != null && inv[i].getItem() == itemMagnet) { - boolean isActive = !ItemMagnet.isActive(inv[i]); - PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.INVENTORY, i, isActive)); - return; + private final KeyBinding stepAssistKey; + + private final KeyBinding speedKey; + + private final KeyBinding jumpKey; + + private final KeyBinding gogglesKey; + + private final KeyBinding yetaWrenchMode; + + private final KeyBinding magnetKey; + + public KeyTracker() { + glideKey = new KeyBinding( + EnderIO.lang.localize("keybind.glidertoggle"), + Keyboard.KEY_G, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(glideKey); + soundDetectorKey = new KeyBinding( + EnderIO.lang.localize("keybind.soundlocator"), + Keyboard.KEY_L, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(soundDetectorKey); + nightVisionKey = new KeyBinding( + EnderIO.lang.localize("keybind.nightvision"), + Keyboard.KEY_P, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(nightVisionKey); + gogglesKey = new KeyBinding( + EnderIO.lang.localize("keybind.gogglesofrevealing"), + Keyboard.KEY_R, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(gogglesKey); + + stepAssistKey = new KeyBinding( + EnderIO.lang.localize("keybind.stepassist"), + Keyboard.KEY_NONE, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(stepAssistKey); + + speedKey = new KeyBinding( + EnderIO.lang.localize("keybind.speed"), + Keyboard.KEY_NONE, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(speedKey); + + jumpKey = new KeyBinding( + EnderIO.lang.localize("keybind.jump"), + Keyboard.KEY_NONE, + EnderIO.lang.localize("category.darksteelarmor")); + ClientRegistry.registerKeyBinding(jumpKey); + + yetaWrenchMode = new KeyBinding( + EnderIO.lang.localize("keybind.yetawrenchmode"), + Keyboard.KEY_Y, + EnderIO.lang.localize("category.tools")); + ClientRegistry.registerKeyBinding(yetaWrenchMode); + + magnetKey = new KeyBinding( + EnderIO.lang.localize("keybind.magnet"), Keyboard.CHAR_NONE, EnderIO.lang.localize("category.tools")); + ClientRegistry.registerKeyBinding(magnetKey); + } + + @SubscribeEvent + public void onKeyInput(KeyInputEvent event) { + handleGlide(); + handleSoundDetector(); + handleNightVision(); + handleYetaWrench(); + handleGoggles(); + handleStepAssist(); + handleSpeed(); + handleJump(); + handleMagnet(); + } + + private void sendEnabledChatMessage(String messageBase, boolean isActive) { + String message = messageBase.concat(isActive ? ".enabled" : ".disabled"); + ChatUtil.sendNoSpamClientUnloc(EnderIO.lang, message); + } + + private void toggleDarkSteelController(Type type, String messageBase) { + boolean isActive = !DarkSteelController.instance.isActive(Minecraft.getMinecraft().thePlayer, type); + sendEnabledChatMessage(messageBase, isActive); + DarkSteelController.instance.setActive(Minecraft.getMinecraft().thePlayer, type, isActive); + PacketHandler.INSTANCE.sendToServer(new PacketUpgradeState(type, isActive)); + } + + private void handleMagnet() { + if (magnetKey.isPressed()) { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + ItemStack[] inv = player.inventory.mainInventory; + for (int i = 0; i < 9; i++) { + if (inv[i] != null && inv[i].getItem() != null && inv[i].getItem() == itemMagnet) { + boolean isActive = !ItemMagnet.isActive(inv[i]); + PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.INVENTORY, i, isActive)); + return; + } + } + + IInventory baubles = BaublesUtil.instance().getBaubles(player); + if (baubles != null) { + for (int i = 0; i < baubles.getSizeInventory(); i++) { + ItemStack stack = baubles.getStackInSlot(i); + if (stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) { + boolean isActive = !ItemMagnet.isActive(stack); + PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, isActive)); + return; + } + } + } } - } + } - IInventory baubles = BaublesUtil.instance().getBaubles(player); - if(baubles != null) { - for (int i = 0; i < baubles.getSizeInventory(); i++) { - ItemStack stack = baubles.getStackInSlot(i); - if(stack != null && stack.getItem() != null && stack.getItem() == itemMagnet) { - boolean isActive = !ItemMagnet.isActive(stack); - PacketHandler.INSTANCE.sendToServer(new PacketMagnetState(SlotType.BAUBLES, i, isActive)); + private void handleJump() { + if (!JumpUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { return; - } } - } + if (jumpKey.isPressed()) { + toggleDarkSteelController(Type.JUMP, "darksteel.upgrade.jump"); + } } - } - private void handleJump() { - if(!JumpUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { - return; + private void handleSpeed() { + if (!SpeedUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { + return; + } + if (speedKey.isPressed()) { + toggleDarkSteelController(Type.SPEED, "darksteel.upgrade.speed"); + } } - if(jumpKey.isPressed()) { - toggleDarkSteelController(Type.JUMP, "darksteel.upgrade.jump"); - } - } - private void handleSpeed() { - if(!SpeedUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { - return; + private void handleStepAssist() { + if (!JumpUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { + return; + } + if (stepAssistKey.isPressed()) { + toggleDarkSteelController(Type.STEP_ASSIST, "darksteel.upgrade.stepAssist"); + } } - if(speedKey.isPressed()) { - toggleDarkSteelController(Type.SPEED, "darksteel.upgrade.speed"); - } - } - private void handleStepAssist() { - if(!JumpUpgrade.isEquipped(Minecraft.getMinecraft().thePlayer)) { - return; + private void handleGoggles() { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (!GogglesOfRevealingUpgrade.isUpgradeEquipped(player)) { + return; + } + if (gogglesKey.isPressed()) { + boolean isActive = !DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive(); + sendEnabledChatMessage("darksteel.upgrade.gogglesOfRevealing", isActive); + DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(isActive); + } } - if(stepAssistKey.isPressed()) { - toggleDarkSteelController(Type.STEP_ASSIST, "darksteel.upgrade.stepAssist"); - } - } - private void handleGoggles() { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if(!GogglesOfRevealingUpgrade.isUpgradeEquipped(player)){ - return; - } - if(gogglesKey.isPressed()) { - boolean isActive = !DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive(); - sendEnabledChatMessage("darksteel.upgrade.gogglesOfRevealing", isActive); - DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(isActive); - } - } + private void handleYetaWrench() { + if (!yetaWrenchMode.isPressed()) { + if (yetaWrenchMode.getKeyCode() == 0) { + Config.checkYetaAccess(); + } + return; + } + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return; + } + if (equipped.getItem() instanceof IConduitControl) { + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); + if (curMode == null) { + curMode = ConduitDisplayMode.ALL; + } + ConduitDisplayMode newMode = player.isSneaking() ? curMode.previous() : curMode.next(); + ConduitDisplayMode.setDisplayMode(equipped, newMode); + PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(player.inventory.currentItem, newMode)); + } else if (equipped.getItem() == EnderIO.itemConduitProbe) { - private void handleYetaWrench() { - if(!yetaWrenchMode.isPressed()) { - if (yetaWrenchMode.getKeyCode() == 0) { - Config.checkYetaAccess(); - } - return; + int newMeta = equipped.getItemDamage() == 0 ? 1 : 0; + equipped.setItemDamage(newMeta); + PacketHandler.INSTANCE.sendToServer(new PacketConduitProbeMode()); + player.swingItem(); + } } - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return; - } - if(equipped.getItem() instanceof IConduitControl) { - ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); - if(curMode == null) { - curMode = ConduitDisplayMode.ALL; - } - ConduitDisplayMode newMode = player.isSneaking() ? curMode.previous() : curMode.next(); - ConduitDisplayMode.setDisplayMode(equipped, newMode); - PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(player.inventory.currentItem, newMode)); - } else if(equipped.getItem() == EnderIO.itemConduitProbe) { - - int newMeta = equipped.getItemDamage() == 0 ? 1 : 0; - equipped.setItemDamage(newMeta); - PacketHandler.INSTANCE.sendToServer(new PacketConduitProbeMode()); - player.swingItem(); - - } - } - private void handleSoundDetector() { - if(!isSoundDetectorUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { - SoundDetector.instance.setEnabled(false); - return; + private void handleSoundDetector() { + if (!isSoundDetectorUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { + SoundDetector.instance.setEnabled(false); + return; + } + if (soundDetectorKey.isPressed()) { + boolean isActive = !SoundDetector.instance.isEnabled(); + sendEnabledChatMessage("darksteel.upgrade.sound", isActive); + SoundDetector.instance.setEnabled(isActive); + } } - if(soundDetectorKey.isPressed()) { - boolean isActive = !SoundDetector.instance.isEnabled(); - sendEnabledChatMessage("darksteel.upgrade.sound", isActive); - SoundDetector.instance.setEnabled(isActive); - } - } - private void handleGlide() { - if(!DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { - return; + private void handleGlide() { + if (!DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { + return; + } + if (glideKey.isPressed()) { + toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider"); + } } - if(glideKey.isPressed()) { - toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider"); - } - } - - private void handleNightVision() { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if(!DarkSteelController.instance.isNightVisionUpgradeOrEnchEquipped(player)){ - return; - } - if(nightVisionKey.isPressed()) { - boolean isActive = !DarkSteelController.instance.isNightVisionActive(); - if(isActive) { - player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.DOMAIN + ":ds.nightvision.on", 0.1f, player.worldObj.rand.nextFloat() * 0.4f - 0.2f + 1.0f, false); - } else { - player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.DOMAIN + ":ds.nightvision.off", 0.1f, 1.0f, false); - } - DarkSteelController.instance.setNightVisionActive(isActive); - } - } - public boolean isSoundDetectorUpgradeEquipped(EntityClientPlayerMP player) { - ItemStack helmet = player.getEquipmentInSlot(4); - SoundDetectorUpgrade upgrade = SoundDetectorUpgrade.loadFromItem(helmet); - if(upgrade == null) { - return false; + private void handleNightVision() { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (!DarkSteelController.instance.isNightVisionUpgradeOrEnchEquipped(player)) { + return; + } + if (nightVisionKey.isPressed()) { + boolean isActive = !DarkSteelController.instance.isNightVisionActive(); + if (isActive) { + player.worldObj.playSound( + player.posX, + player.posY, + player.posZ, + EnderIO.DOMAIN + ":ds.nightvision.on", + 0.1f, + player.worldObj.rand.nextFloat() * 0.4f - 0.2f + 1.0f, + false); + } else { + player.worldObj.playSound( + player.posX, + player.posY, + player.posZ, + EnderIO.DOMAIN + ":ds.nightvision.off", + 0.1f, + 1.0f, + false); + } + DarkSteelController.instance.setNightVisionActive(isActive); + } + } + + public boolean isSoundDetectorUpgradeEquipped(EntityClientPlayerMP player) { + ItemStack helmet = player.getEquipmentInSlot(4); + SoundDetectorUpgrade upgrade = SoundDetectorUpgrade.loadFromItem(helmet); + if (upgrade == null) { + return false; + } + return true; + } + + public KeyBinding getYetaWrenchMode() { + return yetaWrenchMode; } - return true; - } - - public KeyBinding getYetaWrenchMode() { - return yetaWrenchMode; - } } diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index e7e41e13..5685950e 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -1,10 +1,18 @@ package crazypants.enderio.item; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import static crazypants.enderio.item.darksteel.DarkSteelItems.itemMagnet; +import static crazypants.util.BotaniaUtil.hasSolegnoliaAround; -import net.minecraft.command.IEntitySelector; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.PacketMagnetState.SlotType; +import crazypants.enderio.network.PacketHandler; +import crazypants.util.BaublesUtil; +import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; @@ -17,219 +25,219 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.PacketMagnetState.SlotType; -import crazypants.enderio.network.PacketHandler; -import crazypants.util.BaublesUtil; -import static crazypants.enderio.item.darksteel.DarkSteelItems.itemMagnet; -import static crazypants.util.BotaniaUtil.hasSolegnoliaAround; public class MagnetController { - public MagnetController() { - PacketHandler.INSTANCE.registerMessage(PacketMagnetState.class, PacketMagnetState.class, PacketHandler.nextID(), Side.SERVER); - } - - - @SubscribeEvent - public void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase != TickEvent.Phase.END) { - return; - } - ActiveMagnet mag = getActiveMagnet(event.player); - if (mag != null && event.player.getHealth() > 0f) { - doHoover(event.player); - if(event.side == Side.SERVER && event.player.worldObj.getTotalWorldTime() % 20 == 0) { - ItemMagnet.drainPerSecondPower(mag.item); - event.player.inventory.setInventorySlotContents(mag.slot, mag.item); - event.player.inventory.markDirty(); - } - } - } - - private ActiveMagnet getActiveMagnet(EntityPlayer player) { - ItemStack[] inv = player.inventory.mainInventory; - int maxSlot = Config.magnetAllowInMainInventory ? 4 * 9 : 9; - for (int i = 0; i < maxSlot;i++) { - if(ItemMagnet.isActive(inv[i]) && ItemMagnet.hasPower(inv[i])) { - return new ActiveMagnet(inv[i], i); - } - } - return null; - } - - private static final double collisionDistanceSq = 1.25 * 1.25; - private static final double speed = 0.035; - private static final double speed4 = speed * 4; - - public void doHoover(EntityPlayer player) { - - if (blacklist == null) { - initBlacklist(); + public MagnetController() { + PacketHandler.INSTANCE.registerMessage( + PacketMagnetState.class, PacketMagnetState.class, PacketHandler.nextID(), Side.SERVER); } - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox( - player.posX - Config.magnetRange, player.posY - Config.magnetRange, player.posZ - Config.magnetRange, - player.posX + Config.magnetRange, player.posY + Config.magnetRange, player.posZ + Config.magnetRange); - - List interestingItems = selectEntitiesWithinAABB(player.worldObj, aabb); - - if (interestingItems != null) { - for (Entity entity : interestingItems) { - double x = player.posX + 0.5D - entity.posX; - double y = player.posY + 1D - entity.posY; - double z = player.posZ + 0.5D - entity.posZ; - - double distance = x * x + y * y + z * z; - if (distance < collisionDistanceSq) { - entity.onCollideWithPlayer(player); - } else { - double distancespeed = speed4 / distance; - entity.motionX += x * distancespeed; - if (y > 0) { - entity.motionY = 0.12; - } else { - entity.motionY += y * speed; - } - entity.motionZ += z * distancespeed; + @SubscribeEvent + public void onPlayerTick(TickEvent.PlayerTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; } - } - } - } - - private static List blacklist = null; - - private static void initBlacklist() { - blacklist = new ArrayList(); - for (String name : Config.magnetBlacklist) { - String[] parts = name.split(":"); - if (parts.length == 2) { - Item item = GameRegistry.findItem(parts[0], parts[1]); - if (item != null) { - blacklist.add(item); - } - } - } - } - - private List selectEntitiesWithinAABB(World world, AxisAlignedBB bb) { - List arraylist = null; - - int itemsRemaining = Config.magnetMaxItems; - if (itemsRemaining <= 0) { - itemsRemaining = Integer.MAX_VALUE; - } - - final int minChunkX = MathHelper.floor_double((bb.minX) / 16.0D); - final int maxChunkX = MathHelper.floor_double((bb.maxX) / 16.0D); - final int minChunkZ = MathHelper.floor_double((bb.minZ) / 16.0D); - final int maxChunkZ = MathHelper.floor_double((bb.maxZ) / 16.0D); - final int minChunkY = MathHelper.floor_double((bb.minY) / 16.0D); - final int maxChunkY = MathHelper.floor_double((bb.maxY) / 16.0D); - - for (int chunkX = minChunkX; chunkX <= maxChunkX; ++chunkX) { - for (int chunkZ = minChunkZ; chunkZ <= maxChunkZ; ++chunkZ) { - Chunk chunk = world.getChunkFromChunkCoords(chunkX, chunkZ); - final int minChunkYClamped = MathHelper.clamp_int(minChunkY, 0, chunk.entityLists.length - 1); - final int maxChunkYClamped = MathHelper.clamp_int(maxChunkY, 0, chunk.entityLists.length - 1); - for (int chunkY = minChunkYClamped; chunkY <= maxChunkYClamped; ++chunkY) { - for (Entity entity : (List) chunk.entityLists[chunkY]) { - if (!entity.isDead) { - boolean gotOne = false; - if (entity instanceof EntityItem && entity.boundingBox.intersectsWith(bb)) { - gotOne = !hasSolegnoliaAround(entity); - if (gotOne && !blacklist.isEmpty()) { - final Item item = ((EntityItem) entity).getEntityItem().getItem(); - for (Item blacklisted : blacklist) { - if (blacklisted == item) { - gotOne = false; - break; - } - } - } - } else if (entity instanceof EntityXPOrb && entity.boundingBox.intersectsWith(bb)) { - gotOne = true; - } - if (gotOne) { - if (arraylist == null) { - arraylist = new ArrayList(Config.magnetMaxItems > 0 ? Config.magnetMaxItems : 20); - } - arraylist.add(entity); - if (itemsRemaining-- <= 0) { - return arraylist; - } - } + ActiveMagnet mag = getActiveMagnet(event.player); + if (mag != null && event.player.getHealth() > 0f) { + doHoover(event.player); + if (event.side == Side.SERVER && event.player.worldObj.getTotalWorldTime() % 20 == 0) { + ItemMagnet.drainPerSecondPower(mag.item); + event.player.inventory.setInventorySlotContents(mag.slot, mag.item); + event.player.inventory.markDirty(); } - } } - } } - return arraylist; - } - - private static class ActiveMagnet { - ItemStack item; - int slot; - - ActiveMagnet(ItemStack item, int slot) { - this.item = item; - this.slot = slot; - } - } - - public static void setMagnetActive(EntityPlayerMP player, SlotType type, int slot, boolean isActive) { - ItemStack stack = null; - IInventory baubles = null; - int dropOff = -1; - switch (type) { - case INVENTORY: - stack = player.inventory.getStackInSlot(slot); - break; - case ARMOR: - return; - case BAUBLES: - baubles = BaublesUtil.instance().getBaubles(player); - if (baubles != null) { - stack = baubles.getStackInSlot(slot); - } - break; - } - if (stack == null || stack.getItem() == null || stack.getItem() != itemMagnet || ItemMagnet.isActive(stack) == isActive) { - return; - } - if (!Config.magnetAllowDeactivatedInBaublesSlot && type == SlotType.BAUBLES && !isActive) { - ItemStack[] inv = player.inventory.mainInventory; - for (int i = 0; i < inv.length && dropOff < 0; i++) { - if (inv[i] == null) { - dropOff = i; + private ActiveMagnet getActiveMagnet(EntityPlayer player) { + ItemStack[] inv = player.inventory.mainInventory; + int maxSlot = Config.magnetAllowInMainInventory ? 4 * 9 : 9; + for (int i = 0; i < maxSlot; i++) { + if (ItemMagnet.isActive(inv[i]) && ItemMagnet.hasPower(inv[i])) { + return new ActiveMagnet(inv[i], i); + } } - } - if (dropOff < 0) { - return; - } + return null; } - ItemMagnet.setActive(stack, isActive); - switch (type) { - case INVENTORY: - player.inventory.setInventorySlotContents(slot, stack); - player.inventory.markDirty(); - break; - case ARMOR: - return; - case BAUBLES: - if (dropOff < 0) { - baubles.setInventorySlotContents(slot, stack); - } else { - baubles.setInventorySlotContents(slot, null); - player.inventory.setInventorySlotContents(dropOff, stack); - } - player.inventory.markDirty(); - break; + + private static final double collisionDistanceSq = 1.25 * 1.25; + private static final double speed = 0.035; + private static final double speed4 = speed * 4; + + public void doHoover(EntityPlayer player) { + + if (blacklist == null) { + initBlacklist(); + } + + AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox( + player.posX - Config.magnetRange, + player.posY - Config.magnetRange, + player.posZ - Config.magnetRange, + player.posX + Config.magnetRange, + player.posY + Config.magnetRange, + player.posZ + Config.magnetRange); + + List interestingItems = selectEntitiesWithinAABB(player.worldObj, aabb); + + if (interestingItems != null) { + for (Entity entity : interestingItems) { + double x = player.posX + 0.5D - entity.posX; + double y = player.posY + 1D - entity.posY; + double z = player.posZ + 0.5D - entity.posZ; + + double distance = x * x + y * y + z * z; + if (distance < collisionDistanceSq) { + entity.onCollideWithPlayer(player); + } else { + double distancespeed = speed4 / distance; + entity.motionX += x * distancespeed; + if (y > 0) { + entity.motionY = 0.12; + } else { + entity.motionY += y * speed; + } + entity.motionZ += z * distancespeed; + } + } + } + } + + private static List blacklist = null; + + private static void initBlacklist() { + blacklist = new ArrayList(); + for (String name : Config.magnetBlacklist) { + String[] parts = name.split(":"); + if (parts.length == 2) { + Item item = GameRegistry.findItem(parts[0], parts[1]); + if (item != null) { + blacklist.add(item); + } + } + } + } + + private List selectEntitiesWithinAABB(World world, AxisAlignedBB bb) { + List arraylist = null; + + int itemsRemaining = Config.magnetMaxItems; + if (itemsRemaining <= 0) { + itemsRemaining = Integer.MAX_VALUE; + } + + final int minChunkX = MathHelper.floor_double((bb.minX) / 16.0D); + final int maxChunkX = MathHelper.floor_double((bb.maxX) / 16.0D); + final int minChunkZ = MathHelper.floor_double((bb.minZ) / 16.0D); + final int maxChunkZ = MathHelper.floor_double((bb.maxZ) / 16.0D); + final int minChunkY = MathHelper.floor_double((bb.minY) / 16.0D); + final int maxChunkY = MathHelper.floor_double((bb.maxY) / 16.0D); + + for (int chunkX = minChunkX; chunkX <= maxChunkX; ++chunkX) { + for (int chunkZ = minChunkZ; chunkZ <= maxChunkZ; ++chunkZ) { + Chunk chunk = world.getChunkFromChunkCoords(chunkX, chunkZ); + final int minChunkYClamped = MathHelper.clamp_int(minChunkY, 0, chunk.entityLists.length - 1); + final int maxChunkYClamped = MathHelper.clamp_int(maxChunkY, 0, chunk.entityLists.length - 1); + for (int chunkY = minChunkYClamped; chunkY <= maxChunkYClamped; ++chunkY) { + for (Entity entity : (List) chunk.entityLists[chunkY]) { + if (!entity.isDead) { + boolean gotOne = false; + if (entity instanceof EntityItem && entity.boundingBox.intersectsWith(bb)) { + gotOne = !hasSolegnoliaAround(entity); + if (gotOne && !blacklist.isEmpty()) { + final Item item = ((EntityItem) entity) + .getEntityItem() + .getItem(); + for (Item blacklisted : blacklist) { + if (blacklisted == item) { + gotOne = false; + break; + } + } + } + } else if (entity instanceof EntityXPOrb && entity.boundingBox.intersectsWith(bb)) { + gotOne = true; + } + if (gotOne) { + if (arraylist == null) { + arraylist = new ArrayList( + Config.magnetMaxItems > 0 ? Config.magnetMaxItems : 20); + } + arraylist.add(entity); + if (itemsRemaining-- <= 0) { + return arraylist; + } + } + } + } + } + } + } + + return arraylist; + } + + private static class ActiveMagnet { + ItemStack item; + int slot; + + ActiveMagnet(ItemStack item, int slot) { + this.item = item; + this.slot = slot; + } + } + + public static void setMagnetActive(EntityPlayerMP player, SlotType type, int slot, boolean isActive) { + ItemStack stack = null; + IInventory baubles = null; + int dropOff = -1; + switch (type) { + case INVENTORY: + stack = player.inventory.getStackInSlot(slot); + break; + case ARMOR: + return; + case BAUBLES: + baubles = BaublesUtil.instance().getBaubles(player); + if (baubles != null) { + stack = baubles.getStackInSlot(slot); + } + break; + } + if (stack == null + || stack.getItem() == null + || stack.getItem() != itemMagnet + || ItemMagnet.isActive(stack) == isActive) { + return; + } + if (!Config.magnetAllowDeactivatedInBaublesSlot && type == SlotType.BAUBLES && !isActive) { + ItemStack[] inv = player.inventory.mainInventory; + for (int i = 0; i < inv.length && dropOff < 0; i++) { + if (inv[i] == null) { + dropOff = i; + } + } + if (dropOff < 0) { + return; + } + } + ItemMagnet.setActive(stack, isActive); + switch (type) { + case INVENTORY: + player.inventory.setInventorySlotContents(slot, stack); + player.inventory.markDirty(); + break; + case ARMOR: + return; + case BAUBLES: + if (dropOff < 0) { + baubles.setInventorySlotContents(slot, stack); + } else { + baubles.setInventorySlotContents(slot, null); + player.inventory.setInventorySlotContents(dropOff, stack); + } + player.inventory.markDirty(); + break; + } } - } } diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index e73ce75a..fce86947 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -1,18 +1,6 @@ package crazypants.enderio.item; -import io.netty.buffer.ByteBuf; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.ChatUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -30,313 +18,326 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.EnergyHandlerPI; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.IInternalPoweredTile; +import io.netty.buffer.ByteBuf; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class PacketConduitProbe implements IMessage, IMessageHandler { - private static final String OF = " " + EnderIO.lang.localize("gui.powerMonitor.of") + " "; - private static final String CON_STORAGE = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading1") + ": "; - private static final String CAP_BANK_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading2") + ": "; - private static final String MACH_BUF_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading3") + ": "; - private static final String AVE_OUT = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading4") + ": "; - private static final String AVE_IN = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading5") + ": "; + private static final String OF = " " + EnderIO.lang.localize("gui.powerMonitor.of") + " "; + private static final String CON_STORAGE = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading1") + ": "; + private static final String CAP_BANK_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading2") + ": "; + private static final String MACH_BUF_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading3") + ": "; + private static final String AVE_OUT = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading4") + ": "; + private static final String AVE_IN = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading5") + ": "; - private static final String NET_HEADING = EnderIO.lang.localize("gui.mjReader.networkHeading"); - private static final String CON_BUF = " " + EnderIO.lang.localize("gui.mjReader.conduitBuffer") + ": "; + private static final String NET_HEADING = EnderIO.lang.localize("gui.mjReader.networkHeading"); + private static final String CON_BUF = " " + EnderIO.lang.localize("gui.mjReader.conduitBuffer") + ": "; - private static final String ITEM_HEADING = EnderIO.lang.localize("gui.mjReader.itemHeading"); - private static final String ITEM_NO_CONNECTIONS = EnderIO.lang.localize("gui.mjReader.itemNoConnections"); + private static final String ITEM_HEADING = EnderIO.lang.localize("gui.mjReader.itemHeading"); + private static final String ITEM_NO_CONNECTIONS = EnderIO.lang.localize("gui.mjReader.itemNoConnections"); - private static final String ENERGY_CONDUIT = EnderIO.lang.localize("itemPowerConduit"); - private static final String REQUEST_RANGE = " " + EnderIO.lang.localize("gui.mjReader.requestRange") + ": ";; - private static final String CUR_REQUEST = " " + EnderIO.lang.localize("gui.mjReader.currentRequest") + ": ";; + private static final String ENERGY_CONDUIT = EnderIO.lang.localize("itemPowerConduit"); + private static final String REQUEST_RANGE = " " + EnderIO.lang.localize("gui.mjReader.requestRange") + ": "; + ; + private static final String CUR_REQUEST = " " + EnderIO.lang.localize("gui.mjReader.currentRequest") + ": "; + ; - public static boolean canCreatePacket(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - if(block == null) { - return false; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileConduitBundle) { - TileConduitBundle tcb = (TileConduitBundle) te; - return tcb.getConduit(IPowerConduit.class) != null || tcb.getConduit(IItemConduit.class) != null; - } - if(te instanceof IInternalPoweredTile) { - return true; - } - return false; - } - - private int x; - private int y; - private int z; - private ForgeDirection side; - - public PacketConduitProbe() { - } - - public PacketConduitProbe(int x2, int y2, int z2, int side2) { - this(x2, y2, z2, ForgeDirection.getOrientation(side2)); - } - - public PacketConduitProbe(int x, int y, int z, ForgeDirection side) { - this.x = x; - this.y = y; - this.z = z; - this.side = side; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeShort(side.ordinal()); - - } - - @Override - public void fromBytes(ByteBuf buffer) { - x = buffer.readInt(); - y = buffer.readInt(); - z = buffer.readInt(); - side = ForgeDirection.getOrientation(buffer.readShort()); - } - - @Override - public IMessage onMessage(PacketConduitProbe message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - World world = player.worldObj; - if(world == null) { - Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); - return null; - } - Block block = world.getBlock(message.x, message.y, message.z); - if(block == null) { - return null; + public static boolean canCreatePacket(World world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + if (block == null) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileConduitBundle) { + TileConduitBundle tcb = (TileConduitBundle) te; + return tcb.getConduit(IPowerConduit.class) != null || tcb.getConduit(IItemConduit.class) != null; + } + if (te instanceof IInternalPoweredTile) { + return true; + } + return false; } - TileEntity te = world.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileConduitBundle) { + private int x; + private int y; + private int z; + private ForgeDirection side; - sendInfoMessage(player, (TileConduitBundle) te); + public PacketConduitProbe() {} - } else if(te instanceof IInternalPowerReceiver) { - IInternalPowerReceiver pr = (IInternalPowerReceiver) te; - sendPowerReciptorInfo(player, block, pr.getEnergyStored(), pr.getMaxEnergyStored(), 0, - 0, EnergyHandlerPI.getPowerRequest(ForgeDirection.NORTH, pr)); - - } - return null; - } - - public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { - - if(tcb.getConduit(IItemConduit.class) != null) { - sendInfoMessage(player, tcb.getConduit(IItemConduit.class), null); + public PacketConduitProbe(int x2, int y2, int z2, int side2) { + this(x2, y2, z2, ForgeDirection.getOrientation(side2)); } - IPowerConduit conduit = tcb.getConduit(IPowerConduit.class); - if(conduit != null) { - sendInfoMessage(player, conduit); + + public PacketConduitProbe(int x, int y, int z, ForgeDirection side) { + this.x = x; + this.y = y; + this.z = z; + this.side = side; } - } - public static void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { - PowerConduitNetwork pcn = (PowerConduitNetwork) conduit.getNetwork(); - NetworkPowerManager pm = pcn.getPowerManager(); - PowerTracker tracker = pm.getTracker(conduit); - if(tracker != null) { - sendPowerConduitInfo(player, conduit, tracker); - } else { - sendInfoMessage(player, pm); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort(side.ordinal()); } - } - public static void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); + @Override + public void fromBytes(ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + side = ForgeDirection.getOrientation(buffer.readShort()); + } - if (conduit.getExternalConnections().isEmpty()) { - sb.append(ITEM_HEADING); - sb.append(" "); - sb.append(ITEM_NO_CONNECTIONS); - sb.append("\n"); - } else { - for (ForgeDirection dir : conduit.getExternalConnections()) { - ConnectionMode mode = conduit.getConnectionMode(dir); + @Override + public IMessage onMessage(PacketConduitProbe message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + World world = player.worldObj; + if (world == null) { + Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); + return null; + } + Block block = world.getBlock(message.x, message.y, message.z); + if (block == null) { + return null; + } - sb.append(ITEM_HEADING); - sb.append(" "); - sb.append(EnderIO.lang.localize("gui.mjReader.connectionDir")); - sb.append(" "); - sb.append(dir); + TileEntity te = world.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileConduitBundle) { + + sendInfoMessage(player, (TileConduitBundle) te); + + } else if (te instanceof IInternalPowerReceiver) { + IInternalPowerReceiver pr = (IInternalPowerReceiver) te; + sendPowerReciptorInfo( + player, + block, + pr.getEnergyStored(), + pr.getMaxEnergyStored(), + 0, + 0, + EnergyHandlerPI.getPowerRequest(ForgeDirection.NORTH, pr)); + } + return null; + } + + public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { + + if (tcb.getConduit(IItemConduit.class) != null) { + sendInfoMessage(player, tcb.getConduit(IItemConduit.class), null); + } + IPowerConduit conduit = tcb.getConduit(IPowerConduit.class); + if (conduit != null) { + sendInfoMessage(player, conduit); + } + } + + public static void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { + PowerConduitNetwork pcn = (PowerConduitNetwork) conduit.getNetwork(); + NetworkPowerManager pm = pcn.getPowerManager(); + PowerTracker tracker = pm.getTracker(conduit); + if (tracker != null) { + sendPowerConduitInfo(player, conduit, tracker); + } else { + sendInfoMessage(player, pm); + } + } + + public static void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { + String color = "\u00A7a "; + StringBuilder sb = new StringBuilder(); + sb.append(color); + + if (conduit.getExternalConnections().isEmpty()) { + sb.append(ITEM_HEADING); + sb.append(" "); + sb.append(ITEM_NO_CONNECTIONS); + sb.append("\n"); + } else { + for (ForgeDirection dir : conduit.getExternalConnections()) { + ConnectionMode mode = conduit.getConnectionMode(dir); + + sb.append(ITEM_HEADING); + sb.append(" "); + sb.append(EnderIO.lang.localize("gui.mjReader.connectionDir")); + sb.append(" "); + sb.append(dir); + sb.append("\n"); + + ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); + if (icn != null && mode.acceptsInput()) { + color = "\u00A79 "; + sb.append(color); + + if (input == null) { + sb.append(EnderIO.lang.localize("gui.mjReader.extractedItems")); + } else { + sb.append(EnderIO.lang.localize("gui.mjReader.extractedItem")); + sb.append(" "); + sb.append(input.getDisplayName()); + } + sb.append(" "); + List targets = + icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), conduit, input); + if (targets.isEmpty()) { + sb.append(" "); + sb.append(EnderIO.lang.localize("gui.mjReader.noOutputs")); + sb.append(".\n"); + } else { + sb.append(" "); + sb.append(EnderIO.lang.localize("gui.mjReader.insertedInto")); + sb.append("\n"); + for (String str : targets) { + sb.append(" - "); + sb.append(str); + sb.append(" "); + sb.append("\n"); + } + } + } + if (icn != null && mode.acceptsOutput()) { + color = "\u00A79 "; + sb.append(color); + + List targets = icn.getInputSourcesFor(conduit, dir, input); + if (targets.isEmpty()) { + if (input == null) { + sb.append(EnderIO.lang.localize("gui.mjReader.noItems")); + } else { + sb.append(EnderIO.lang.localize("gui.mjReader.noItem")); + sb.append(" "); + sb.append(input.getDisplayName()); + } + } else { + if (input == null) { + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItems")); + } else { + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem1")); + sb.append(" "); + sb.append(input.getDisplayName()); + sb.append(" "); + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem2")); + } + sb.append("\n"); + for (String str : targets) { + sb.append(" - "); + sb.append(str); + sb.append("\n"); + } + } + } + } + } + String[] lines = sb.toString().split("\n"); + ChatUtil.sendNoSpam(player, lines); + } + + public static void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { + PowerTracker tracker = pm.getNetworkPowerTracker(); + String color = "\u00A7a "; + StringBuilder sb = new StringBuilder(); + sb.append(color); + sb.append(NET_HEADING); sb.append("\n"); - ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); - if (icn != null && mode.acceptsInput()) { - color = "\u00A79 "; - sb.append(color); + color = "\u00A79 "; + sb.append(color); + sb.append(CON_STORAGE); + sb.append(PowerDisplayUtil.formatPower(pm.getPowerInConduits())); + sb.append(OF); + sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInConduits())); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); + sb.append(CAP_BANK_STOR); + sb.append(PowerDisplayUtil.formatPower(pm.getPowerInCapacitorBanks())); + sb.append(OF); + sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInCapacitorBanks())); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); + sb.append(MACH_BUF_STOR); + sb.append(PowerDisplayUtil.formatPower(pm.getPowerInReceptors())); + sb.append(OF); + sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInReceptors())); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); + sb.append(AVE_OUT); + sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())); + sb.append("\n"); + sb.append(AVE_IN); + sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())); - if (input == null) { - sb.append(EnderIO.lang.localize("gui.mjReader.extractedItems")); - } else { - sb.append(EnderIO.lang.localize("gui.mjReader.extractedItem")); - sb.append(" "); - sb.append(input.getDisplayName()); - } - sb.append(" "); - List targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), conduit, input); - if (targets.isEmpty()) { - sb.append(" "); - sb.append(EnderIO.lang.localize("gui.mjReader.noOutputs")); - sb.append(".\n"); - } else { - sb.append(" "); - sb.append(EnderIO.lang.localize("gui.mjReader.insertedInto")); - sb.append("\n"); - for (String str : targets) { - sb.append(" - "); - sb.append(str); - sb.append(" "); - sb.append("\n"); - } - } - } - if (icn != null && mode.acceptsOutput()) { - color = "\u00A79 "; - sb.append(color); - - List targets = icn.getInputSourcesFor(conduit, dir, input); - if (targets.isEmpty()) { - if (input == null) { - sb.append(EnderIO.lang.localize("gui.mjReader.noItems")); - } else { - sb.append(EnderIO.lang.localize("gui.mjReader.noItem")); - sb.append(" "); - sb.append(input.getDisplayName()); - } - } else { - if (input == null) { - sb.append(EnderIO.lang.localize("gui.mjReader.receiveItems")); - } else { - sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem1")); - sb.append(" "); - sb.append(input.getDisplayName()); - sb.append(" "); - sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem2")); - } - sb.append("\n"); - for (String str : targets) { - sb.append(" - "); - sb.append(str); - sb.append("\n"); - } - } - - } - } + String[] lines = sb.toString().split("\n"); + ChatUtil.sendNoSpam(player, lines); } - String[] lines = sb.toString().split("\n"); - ChatUtil.sendNoSpam(player, lines); - } - public static void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { - PowerTracker tracker = pm.getNetworkPowerTracker(); - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(NET_HEADING); - sb.append("\n"); - - color = "\u00A79 "; - sb.append(color); - sb.append(CON_STORAGE); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInConduits())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInConduits())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(CAP_BANK_STOR); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInCapacitorBanks())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInCapacitorBanks())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(MACH_BUF_STOR); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInReceptors())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInReceptors())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(AVE_OUT); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())); - sb.append("\n"); - sb.append(AVE_IN); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())); - - String[] lines = sb.toString().split("\n"); - ChatUtil.sendNoSpam(player, lines); - } + public static void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { + String color = "\u00A7a "; + StringBuilder sb = new StringBuilder(); + sb.append(color); + sb.append(ENERGY_CONDUIT); - public static void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(ENERGY_CONDUIT); + color = "\u00A79 "; + sb.append(color); + sb.append(CON_BUF); + sb.append(PowerDisplayUtil.formatPower(con.getEnergyStored())); + sb.append(OF); + sb.append(PowerDisplayUtil.formatPower(con.getMaxEnergyStored())); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); + sb.append(AVE_OUT); + sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())); + sb.append("\n"); + sb.append(AVE_IN); + sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())); - color = "\u00A79 "; - sb.append(color); - sb.append(CON_BUF); - sb.append(PowerDisplayUtil.formatPower(con.getEnergyStored())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(con.getMaxEnergyStored())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(AVE_OUT); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickSent())); - sb.append("\n"); - sb.append(AVE_IN); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageRfTickRecieved())); - - String[] lines = sb.toString().split("\n"); - ChatUtil.sendNoSpam(player, lines); - } + String[] lines = sb.toString().split("\n"); + ChatUtil.sendNoSpam(player, lines); + } - private void sendPowerReciptorInfo(EntityPlayer player, Block block, int stored, int maxStored, int minRec, int maxRec, int request) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(block.getLocalizedName()); + private void sendPowerReciptorInfo( + EntityPlayer player, Block block, int stored, int maxStored, int minRec, int maxRec, int request) { + String color = "\u00A7a "; + StringBuilder sb = new StringBuilder(); + sb.append(color); + sb.append(block.getLocalizedName()); - color = "\u00A79 "; - sb.append(color); - sb.append(CON_BUF); - sb.append(PowerDisplayUtil.formatPower(stored)); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(maxStored)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); + color = "\u00A79 "; + sb.append(color); + sb.append(CON_BUF); + sb.append(PowerDisplayUtil.formatPower(stored)); + sb.append(OF); + sb.append(PowerDisplayUtil.formatPower(maxStored)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); - sb.append(REQUEST_RANGE); - sb.append(PowerDisplayUtil.formatPower(minRec)); - sb.append(" - "); - sb.append(PowerDisplayUtil.formatPower(maxRec)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); + sb.append(REQUEST_RANGE); + sb.append(PowerDisplayUtil.formatPower(minRec)); + sb.append(" - "); + sb.append(PowerDisplayUtil.formatPower(maxRec)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append("\n"); - sb.append(CUR_REQUEST); - sb.append(PowerDisplayUtil.formatPower(request)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - - String[] lines = sb.toString().split("\n"); - ChatUtil.sendNoSpam(player, lines); - } + sb.append(CUR_REQUEST); + sb.append(PowerDisplayUtil.formatPower(request)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + String[] lines = sb.toString().split("\n"); + ChatUtil.sendNoSpam(player, lines); + } } diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java b/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java index e386aecf..7e2cfd8b 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbeMode.java @@ -1,33 +1,29 @@ package crazypants.enderio.item; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; -public class PacketConduitProbeMode implements IMessage, IMessageHandler { +public class PacketConduitProbeMode implements IMessage, IMessageHandler { - public PacketConduitProbeMode() { - } + public PacketConduitProbeMode() {} - @Override - public void toBytes(ByteBuf buf) { - } - - @Override - public void fromBytes(ByteBuf buf) { - } + @Override + public void toBytes(ByteBuf buf) {} - @Override - public IMessage onMessage(PacketConduitProbeMode message, MessageContext ctx) { - ItemStack stack = ctx.getServerHandler().playerEntity.inventory.getCurrentItem(); - if(stack != null && stack.getItem() == EnderIO.itemConduitProbe) { - int newMeta = stack.getItemDamage() == 0 ? 1 : 0; - stack.setItemDamage(newMeta); + @Override + public void fromBytes(ByteBuf buf) {} + + @Override + public IMessage onMessage(PacketConduitProbeMode message, MessageContext ctx) { + ItemStack stack = ctx.getServerHandler().playerEntity.inventory.getCurrentItem(); + if (stack != null && stack.getItem() == EnderIO.itemConduitProbe) { + int newMeta = stack.getItemDamage() == 0 ? 1 : 0; + stack.setItemDamage(newMeta); + } + return null; } - return null; - } - } diff --git a/src/main/java/crazypants/enderio/item/PacketMagnetState.java b/src/main/java/crazypants/enderio/item/PacketMagnetState.java index 7aa6814a..e5a7d390 100644 --- a/src/main/java/crazypants/enderio/item/PacketMagnetState.java +++ b/src/main/java/crazypants/enderio/item/PacketMagnetState.java @@ -1,51 +1,49 @@ package crazypants.enderio.item; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; public class PacketMagnetState implements IMessage, IMessageHandler { - public enum SlotType { - INVENTORY, - ARMOR, - BAUBLES - } - - public PacketMagnetState() { - } - - private boolean isActive; - private SlotType type; - private int slot; - - public PacketMagnetState(SlotType slottype, int slot, boolean isActive) { - this.type = slottype; - this.slot = slot; - this.isActive = isActive; - } + public enum SlotType { + INVENTORY, + ARMOR, + BAUBLES + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeShort(type.ordinal()); - buf.writeInt(slot); - buf.writeBoolean(isActive); - } - - @Override - public void fromBytes(ByteBuf buf) { - type = SlotType.values()[buf.readShort()]; - slot = buf.readInt(); - isActive = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketMagnetState message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - MagnetController.setMagnetActive(player, message.type, message.slot, message.isActive); - return null; - } + public PacketMagnetState() {} + private boolean isActive; + private SlotType type; + private int slot; + + public PacketMagnetState(SlotType slottype, int slot, boolean isActive) { + this.type = slottype; + this.slot = slot; + this.isActive = isActive; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(type.ordinal()); + buf.writeInt(slot); + buf.writeBoolean(isActive); + } + + @Override + public void fromBytes(ByteBuf buf) { + type = SlotType.values()[buf.readShort()]; + slot = buf.readInt(); + isActive = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketMagnetState message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + MagnetController.setMagnetActive(player, message.type, message.slot, message.isActive); + return null; + } } diff --git a/src/main/java/crazypants/enderio/item/ToolTickHandler.java b/src/main/java/crazypants/enderio/item/ToolTickHandler.java index 18e48256..fc700dbe 100644 --- a/src/main/java/crazypants/enderio/item/ToolTickHandler.java +++ b/src/main/java/crazypants/enderio/item/ToolTickHandler.java @@ -1,56 +1,55 @@ package crazypants.enderio.item; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.MouseEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.network.PacketHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.MouseEvent; @SideOnly(Side.CLIENT) public class ToolTickHandler { - @SubscribeEvent - public void onMouseEvent(MouseEvent event) { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - if(event.dwheel != 0 && player != null && player.isSneaking()) { - ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null) { - Item item = stack.getItem(); - if (item instanceof IConduitControl) { - changeDisplayMode(stack, player, event.dwheel); - event.setCanceled(true); - } else if (item instanceof ItemConduitProbe) { - changeConduitProbeMode(stack); - event.setCanceled(true); + @SubscribeEvent + public void onMouseEvent(MouseEvent event) { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (event.dwheel != 0 && player != null && player.isSneaking()) { + ItemStack stack = player.getCurrentEquippedItem(); + if (stack != null) { + Item item = stack.getItem(); + if (item instanceof IConduitControl) { + changeDisplayMode(stack, player, event.dwheel); + event.setCanceled(true); + } else if (item instanceof ItemConduitProbe) { + changeConduitProbeMode(stack); + event.setCanceled(true); + } + } } - } } - } - private void changeDisplayMode(ItemStack stack, EntityPlayer player, int dWheel) { - if (!((IConduitControl)stack.getItem()).showOverlay(stack, player)) { - return; + private void changeDisplayMode(ItemStack stack, EntityPlayer player, int dWheel) { + if (!((IConduitControl) stack.getItem()).showOverlay(stack, player)) { + return; + } + ConduitDisplayMode mode = ConduitDisplayMode.getDisplayMode(stack); + if (mode == null) { + mode = ConduitDisplayMode.ALL; + } + mode = dWheel < 0 ? mode.next() : mode.previous(); + ConduitDisplayMode.setDisplayMode(stack, mode); + PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(player.inventory.currentItem, mode)); } - ConduitDisplayMode mode = ConduitDisplayMode.getDisplayMode(stack); - if(mode == null) { - mode = ConduitDisplayMode.ALL; + + private void changeConduitProbeMode(ItemStack stack) { + int newMeta = stack.getItemDamage() == 0 ? 1 : 0; + stack.setItemDamage(newMeta); + PacketHandler.INSTANCE.sendToServer(new PacketConduitProbeMode()); } - mode = dWheel < 0 ? mode.next() : mode.previous(); - ConduitDisplayMode.setDisplayMode(stack, mode); - PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(player.inventory.currentItem, mode)); - } - - private void changeConduitProbeMode(ItemStack stack) { - int newMeta = stack.getItemDamage() == 0 ? 1 : 0; - stack.setItemDamage(newMeta); - PacketHandler.INSTANCE.sendToServer(new PacketConduitProbeMode()); - } - } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index e7070f4d..f634636a 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -1,5 +1,13 @@ package crazypants.enderio.item; +import com.enderio.core.api.client.render.IWidgetIcon; +import com.enderio.core.client.handlers.ClientHandler; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vector4f; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.api.tool.IConduitControl; +import crazypants.enderio.conduit.ConduitDisplayMode; +import crazypants.enderio.config.Config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.Tessellator; @@ -8,167 +16,159 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.common.MinecraftForge; - import org.lwjgl.opengl.GL11; -import com.enderio.core.api.client.render.IWidgetIcon; -import com.enderio.core.client.handlers.ClientHandler; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Vector4f; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.api.tool.IConduitControl; -import crazypants.enderio.conduit.ConduitDisplayMode; -import crazypants.enderio.config.Config; - public class YetaWrenchOverlayRenderer { - - private ConduitDisplayMode cachedMode = ConduitDisplayMode.ALL; - private int displayTickCount; - private long lastTick; - public YetaWrenchOverlayRenderer() { - MinecraftForge.EVENT_BUS.register(this); - } + private ConduitDisplayMode cachedMode = ConduitDisplayMode.ALL; + private int displayTickCount; + private long lastTick; - @SubscribeEvent - public void renderOverlay(RenderGameOverlayEvent event) { - ItemStack equippedWrench = getEquippedWrench(); - if(equippedWrench != null && event.type == ElementType.ALL) { - doRenderOverlay(event, equippedWrench); + public YetaWrenchOverlayRenderer() { + MinecraftForge.EVENT_BUS.register(this); } - } - private ItemStack getEquippedWrench() { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; - ItemStack equipped = player.getCurrentEquippedItem(); - if (equipped != null && equipped.getItem() instanceof IConduitControl) { - return ((IConduitControl) equipped.getItem()).showOverlay(equipped, player) ? equipped : null; + @SubscribeEvent + public void renderOverlay(RenderGameOverlayEvent event) { + ItemStack equippedWrench = getEquippedWrench(); + if (equippedWrench != null && event.type == ElementType.ALL) { + doRenderOverlay(event, equippedWrench); + } } - return null; - } - private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedWrench) { - ConduitDisplayMode mode = ConduitDisplayMode.getDisplayMode(equippedWrench); - - if (mode != cachedMode) { - cachedMode = mode; - displayTickCount = 20; - lastTick = ClientHandler.getTicksElapsed(); + private ItemStack getEquippedWrench() { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped != null && equipped.getItem() instanceof IConduitControl) { + return ((IConduitControl) equipped.getItem()).showOverlay(equipped, player) ? equipped : null; + } + return null; } - - ScaledResolution res = event.resolution; - Tessellator tess = Tessellator.instance; - int modeCount = ConduitDisplayMode.registrySize(); - Iterable renderable = ConduitDisplayMode.getRenderableModes(); - switch (Config.yetaWrenchOverlayMode) { - case 0: - if (displayTickCount > 0) { + private void doRenderOverlay(RenderGameOverlayEvent event, ItemStack equippedWrench) { + ConduitDisplayMode mode = ConduitDisplayMode.getDisplayMode(equippedWrench); - if (lastTick < ClientHandler.getTicksElapsed()) { - lastTick++; - displayTickCount--; + if (mode != cachedMode) { + cachedMode = mode; + displayTickCount = 20; + lastTick = ClientHandler.getTicksElapsed(); } - int x = res.getScaledWidth() / 2 - 8; - int y = res.getScaledHeight() / 2 - 24; + ScaledResolution res = event.resolution; + Tessellator tess = Tessellator.instance; + int modeCount = ConduitDisplayMode.registrySize(); + Iterable renderable = ConduitDisplayMode.getRenderableModes(); - // TODO when I've not been up for 16 hrs, clean this up - IWidgetIcon widget = mode.getWidgetSelected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - widget.getMap().render(widget, x, y, true); - int size = 12; - widget = mode.previous().getWidgetSelected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - widget.getMap().render(widget, x - 18 + (16 - size), y + (16 - size), size, size, 0, true); - widget = mode.next().getWidgetSelected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - widget.getMap().render(widget, x + 18, y + (16 - size), size, size, 0, true); - } else { + switch (Config.yetaWrenchOverlayMode) { + case 0: + if (displayTickCount > 0) { - int x = res.getScaledWidth() - 20; - int y = res.getScaledHeight() - 20; + if (lastTick < ClientHandler.getTicksElapsed()) { + lastTick++; + displayTickCount--; + } - IWidgetIcon widget = mode.getWidgetSelected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - widget.getMap().render(widget, x, y, true); - } - break; - case 1: - int size = 16; - int padding = 2; - - int inset = (int) (size / 1.5); - int offsetX = res.getScaledWidth() - inset - 1; - int offsetY = res.getScaledHeight() - modeCount * (size + padding) - padding; - - inset = size - inset; - - int x = offsetX + 2; - int y = offsetY - (padding * 2); - int height = (modeCount * (size + padding)) + (padding * 3); + int x = res.getScaledWidth() / 2 - 8; + int y = res.getScaledHeight() / 2 - 24; - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - tess.startDrawingQuads(); - tess.setColorRGBA_F(0, 0, 0, 0.2f); - tess.addVertex(x, y, -5); - tess.addVertex(x, y + height, -5); - Vector4f color = new Vector4f(0, 0, 0, 1); - tess.setColorRGBA_F(color.x, color.y, color.z, color.w); - tess.addVertex(x + size, y + height, -5); - tess.addVertex(x + size, y, -5); - tess.draw(); - tess.setColorOpaque_I(0xFFFFFF); - GL11.glShadeModel(GL11.GL_FLAT); - - y += padding * 2; - x -= 2; - - if (mode == ConduitDisplayMode.ALL) { - x -= inset; - } + // TODO when I've not been up for 16 hrs, clean this up + IWidgetIcon widget = mode.getWidgetSelected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + widget.getMap().render(widget, x, y, true); + int size = 12; + widget = mode.previous().getWidgetSelected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + widget.getMap().render(widget, x - 18 + (16 - size), y + (16 - size), size, size, 0, true); + widget = mode.next().getWidgetSelected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + widget.getMap().render(widget, x + 18, y + (16 - size), size, size, 0, true); + } else { - GL11.glEnable(GL11.GL_TEXTURE_2D); - tess.startDrawingQuads(); - for (ConduitDisplayMode toRender : renderable) { - IWidgetIcon widget = mode == ConduitDisplayMode.ALL ? toRender.getWidgetSelected() : toRender.getWidgetUnselected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - if (toRender == mode) { - widget = toRender.getWidgetSelected(); - widget.getMap().render(widget, x - inset, y); - } else { - widget.getMap().render(widget, x, y); + int x = res.getScaledWidth() - 20; + int y = res.getScaledHeight() - 20; + + IWidgetIcon widget = mode.getWidgetSelected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + widget.getMap().render(widget, x, y, true); + } + break; + case 1: + int size = 16; + int padding = 2; + + int inset = (int) (size / 1.5); + int offsetX = res.getScaledWidth() - inset - 1; + int offsetY = res.getScaledHeight() - modeCount * (size + padding) - padding; + + inset = size - inset; + + int x = offsetX + 2; + int y = offsetY - (padding * 2); + int height = (modeCount * (size + padding)) + (padding * 3); + + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + tess.startDrawingQuads(); + tess.setColorRGBA_F(0, 0, 0, 0.2f); + tess.addVertex(x, y, -5); + tess.addVertex(x, y + height, -5); + Vector4f color = new Vector4f(0, 0, 0, 1); + tess.setColorRGBA_F(color.x, color.y, color.z, color.w); + tess.addVertex(x + size, y + height, -5); + tess.addVertex(x + size, y, -5); + tess.draw(); + tess.setColorOpaque_I(0xFFFFFF); + GL11.glShadeModel(GL11.GL_FLAT); + + y += padding * 2; + x -= 2; + + if (mode == ConduitDisplayMode.ALL) { + x -= inset; + } + + GL11.glEnable(GL11.GL_TEXTURE_2D); + tess.startDrawingQuads(); + for (ConduitDisplayMode toRender : renderable) { + IWidgetIcon widget = mode == ConduitDisplayMode.ALL + ? toRender.getWidgetSelected() + : toRender.getWidgetUnselected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + if (toRender == mode) { + widget = toRender.getWidgetSelected(); + widget.getMap().render(widget, x - inset, y); + } else { + widget.getMap().render(widget, x, y); + } + y += size + padding; + } + tess.draw(); + break; + case 2: + offsetX = res.getScaledWidth() - (modeCount * 8) - 16; + y = res.getScaledHeight() - 40; + + x = offsetX; + if (modeCount % 2 == 1) { + x += 8; + } + + int count = 0; + tess.startDrawingQuads(); + for (ConduitDisplayMode toRender : renderable) { + IWidgetIcon widget = mode == ConduitDisplayMode.ALL || toRender == mode + ? toRender.getWidgetSelected() + : toRender.getWidgetUnselected(); + RenderUtil.bindTexture(widget.getMap().getTexture()); + widget.getMap().render(widget, x, y); + x += 16; + if (count == modeCount / 2 - 1) { + x = offsetX; + y += 16; + } + count++; + } + tess.draw(); } - y += size + padding; - } - tess.draw(); - break; - case 2: - - offsetX = res.getScaledWidth() - (modeCount * 8) - 16; - y = res.getScaledHeight() - 40; - - x = offsetX; - if (modeCount % 2 == 1) { - x += 8; - } - - int count = 0; - tess.startDrawingQuads(); - for (ConduitDisplayMode toRender : renderable) { - IWidgetIcon widget = mode == ConduitDisplayMode.ALL || toRender == mode ? toRender.getWidgetSelected() : toRender.getWidgetUnselected(); - RenderUtil.bindTexture(widget.getMap().getTexture()); - widget.getMap().render(widget, x, y); - x += 16; - if (count == modeCount / 2 - 1) { - x = offsetX; - y += 16; - } - count++; - } - tess.draw(); } - } } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java index 835cbb06..2c656666 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchPacketProcessor.java @@ -1,47 +1,46 @@ package crazypants.enderio.item; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.ConduitDisplayMode; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; public class YetaWrenchPacketProcessor implements IMessage, IMessageHandler { - private int slot; - private ConduitDisplayMode mode; + private int slot; + private ConduitDisplayMode mode; - public YetaWrenchPacketProcessor() { - } + public YetaWrenchPacketProcessor() {} - public YetaWrenchPacketProcessor(int slot, ConduitDisplayMode mode) { - this.slot = slot; - this.mode = mode; - } - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeInt(slot); - ByteBufUtils.writeUTF8String(buffer, mode.getName()); - } - - @Override - public void fromBytes(ByteBuf buffer) { - slot = buffer.readInt(); - mode = ConduitDisplayMode.fromName(ByteBufUtils.readUTF8String(buffer)); - } - - @Override - public IMessage onMessage(YetaWrenchPacketProcessor message, MessageContext ctx) { - ItemStack stack = null; - if(message.slot > -1 && message.slot < 9) { - stack = ctx.getServerHandler().playerEntity.inventory.getStackInSlot(message.slot); + public YetaWrenchPacketProcessor(int slot, ConduitDisplayMode mode) { + this.slot = slot; + this.mode = mode; } - if(stack != null) { - ConduitDisplayMode.setDisplayMode(stack, message.mode); + + @Override + public void toBytes(ByteBuf buffer) { + buffer.writeInt(slot); + ByteBufUtils.writeUTF8String(buffer, mode.getName()); + } + + @Override + public void fromBytes(ByteBuf buffer) { + slot = buffer.readInt(); + mode = ConduitDisplayMode.fromName(ByteBufUtils.readUTF8String(buffer)); + } + + @Override + public IMessage onMessage(YetaWrenchPacketProcessor message, MessageContext ctx) { + ItemStack stack = null; + if (message.slot > -1 && message.slot < 9) { + stack = ctx.getServerHandler().playerEntity.inventory.getStackInSlot(message.slot); + } + if (stack != null) { + ConduitDisplayMode.setDisplayMode(stack, message.mode); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index f3fe4b55..e0253d49 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -1,40 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.UUID; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.particle.EntityReddustFX; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovementInput; -import net.minecraftforge.client.event.RenderPlayerEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; - -import org.lwjgl.opengl.GL11; - import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4d; import com.mojang.authlib.GameProfile; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; @@ -54,504 +25,573 @@ import crazypants.enderio.item.darksteel.upgrade.SpeedUpgrade; import crazypants.enderio.item.darksteel.upgrade.SwimUpgrade; import crazypants.enderio.machine.solar.TileEntitySolarPanel; import crazypants.enderio.network.PacketHandler; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovementInput; +import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import org.lwjgl.opengl.GL11; public class DarkSteelController { - public static final DarkSteelController instance = new DarkSteelController(); + public static final DarkSteelController instance = new DarkSteelController(); - private final AttributeModifier[] walkModifiers = new AttributeModifier[] { - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[0], 1), - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[1], 1), - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[2], 1), - }; + private final AttributeModifier[] walkModifiers = new AttributeModifier[] { + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[0], 1), + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[1], 1), + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[2], 1), + }; - private final AttributeModifier[] sprintModifiers = new AttributeModifier[] { - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[0], 1), - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[1], 1), - new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1), - }; + private final AttributeModifier[] sprintModifiers = new AttributeModifier[] { + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[0], 1), + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[1], 1), + new AttributeModifier( + new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1), + }; - private final AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier", - 2, 0); + private final AttributeModifier swordDamageModifierPowered = + new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier", 2, 0); - private boolean wasJumping; - private int jumpCount; - private int ticksSinceLastJump; + private boolean wasJumping; + private int jumpCount; + private int ticksSinceLastJump; - private static final EnumSet DEFAULT_ACTIVE = EnumSet.of(Type.SPEED, Type.STEP_ASSIST, Type.JUMP); + private static final EnumSet DEFAULT_ACTIVE = EnumSet.of(Type.SPEED, Type.STEP_ASSIST, Type.JUMP); - private final Map> allActive = new HashMap>(); + private final Map> allActive = new HashMap>(); - private boolean nightVisionActive = false; - private boolean removeNightvision = false; - - private DarkSteelController() { - PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT); - } - - private EnumSet getActiveSet(EntityPlayer player) { - EnumSet active; - GameProfile gameProfile = player.getGameProfile(); - UUID id = gameProfile == null ? null : gameProfile.getId(); - active = id == null ? null : allActive.get(id); - if(active == null) { - active = DEFAULT_ACTIVE.clone(); - if(id != null) { - allActive.put(id, active); - } - } - return active; - } - - public boolean isActive(EntityPlayer player, Type type) { - return getActiveSet(player).contains(type); - } - - public void setActive(EntityPlayer player, Type type, boolean isActive) { - EnumSet set = getActiveSet(player); - if(isActive) { - set.add(type); - } else { - set.remove(type); - } - } - - public boolean isGlideActive(EntityPlayer player) { - return isActive(player, Type.GLIDE); - } - - public boolean isSpeedActive(EntityPlayer player) { - return isActive(player, Type.SPEED); - } - - public boolean isStepAssistActive(EntityPlayer player) { - return isActive(player, Type.STEP_ASSIST); - } - - public boolean isJumpActive(EntityPlayer player) { - return isActive(player, Type.JUMP); - } - - @SubscribeEvent - public void onPlayerTick(TickEvent.PlayerTickEvent event) { - EntityPlayer player = event.player; - - if(event.phase == Phase.START) { - //boots - updateStepHeightAndFallDistance(player); - - //leggings - updateSpeed(player); - - //sword - updateSword(player); - - updateGlide(player); - - updateSwim(player); - - updateSolar(player); + private boolean nightVisionActive = false; + private boolean removeNightvision = false; + private DarkSteelController() { + PacketHandler.INSTANCE.registerMessage( + PacketDarkSteelPowerPacket.class, + PacketDarkSteelPowerPacket.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketUpgradeState.class, PacketUpgradeState.class, PacketHandler.nextID(), Side.CLIENT); } - } - - private void updateSolar(EntityPlayer player) { - // no processing on client - if (player.worldObj.isRemote) { - return; - } - - ItemStack helm = player.getEquipmentInSlot(4); - SolarUpgrade upgrade = SolarUpgrade.loadFromItem(helm); - if(upgrade == null) { - return; - } - - int RFperSecond = Math.round((float) upgrade.getRFPerSec() * TileEntitySolarPanel.calculateLightRatio(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY + 1), MathHelper.floor_double(player.posZ))); - - int leftover = RFperSecond % 20; - boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover; - - int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0); - - if(toAdd != 0) { - - int nextIndex = player.getEntityData().getInteger("dsarmor:solar") % 4; - - for (int i = 0; i < 4 && toAdd > 0; i++) { - ItemStack stack = player.inventory.armorInventory[nextIndex]; - if(stack != null && (EnergyUpgrade.loadFromItem(stack) != null || (Config.darkSteelSolarChargeOthers && stack.getItem() instanceof IEnergyContainerItem))) { - toAdd -= ((IEnergyContainerItem) stack.getItem()).receiveEnergy(stack, toAdd, false); - } - nextIndex = (nextIndex + 1) % 4; - } - - player.getEntityData().setInteger("dsarmor:solar", nextIndex); - } - } - - private void updateSwim(EntityPlayer player) { - ItemStack boots = player.getEquipmentInSlot(1); - SwimUpgrade upgrade = SwimUpgrade.loadFromItem(boots); - if(upgrade == null) { - return; - } - if(player.isInWater() && !player.capabilities.isFlying) { - player.motionX *= 1.1; - player.motionZ *= 1.1; - } - } - - private void updateGlide(EntityPlayer player) { - if(!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { - return; - } - - if(!player.onGround && player.motionY < 0 && !player.isSneaking() && !player.isInWater()) { - - double horizontalSpeed = Config.darkSteelGliderHorizontalSpeed; - double verticalSpeed = Config.darkSteelGliderVerticalSpeed; - if(player.isSprinting()) { - verticalSpeed = Config.darkSteelGliderVerticalSpeedSprinting; - } - - Vector3d look = Util.getLookVecEio(player); - Vector3d side = new Vector3d(); - side.cross(new Vector3d(0, 1, 0), look); - Vector3d playerPos = new Vector3d(player.prevPosX, player.prevPosY, player.prevPosZ); - Vector3d b = new Vector3d(playerPos); - b.y += 1; - Vector3d c = new Vector3d(playerPos); - c.add(side); - Vector4d plane = new Vector4d(); - VecmathUtil.computePlaneEquation(playerPos, b, c, plane); - double dist = Math.abs(VecmathUtil.distanceFromPointToPlane(plane, new Vector3d(player.posX, player.posY, player.posZ))); - double minDist = 0.15; - if(dist < minDist) { - double dropRate = (minDist * 10) - (dist * 10); - verticalSpeed = verticalSpeed + (verticalSpeed * dropRate * 8); - horizontalSpeed -= (0.02 * dropRate); - } - - double x = Math.cos(Math.toRadians(player.rotationYawHead + 90)) - * horizontalSpeed; - double z = Math.sin(Math.toRadians(player.rotationYawHead + 90)) - * horizontalSpeed; - - player.motionX += x; - player.motionZ += z; - - player.motionY = verticalSpeed; - player.fallDistance = 0f; - - } - - } - - public boolean isGliderUpgradeEquipped(EntityPlayer player) { - ItemStack chestPlate = player.getEquipmentInSlot(3); - GliderUpgrade glideUpgrade = GliderUpgrade.loadFromItem(chestPlate); - if(glideUpgrade == null) { - return false; - } - return true; - } - - private void updateSword(EntityPlayer player) { - if(ItemDarkSteelSword.isEquipped(player)) { - IAttributeInstance attackInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.attackDamage); - attackInst.removeModifier(swordDamageModifierPowered); - - ItemStack sword = player.getCurrentEquippedItem(); - if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnergyUpgrade.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { - attackInst.applyModifier(swordDamageModifierPowered); - } - } - } - - private void updateSpeed(EntityPlayer player) { - if(player.worldObj.isRemote || !player.onGround) { - return; - } - - IAttributeInstance moveInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.movementSpeed); - if(moveInst.getModifier(walkModifiers[0].getID()) != null) { - moveInst.removeModifier(walkModifiers[0]); //any will so as they all have the same UID - } else if(moveInst.getModifier(sprintModifiers[0].getID()) != null) { - moveInst.removeModifier(sprintModifiers[0]); - } - - ItemStack leggings = player.getEquipmentInSlot(2); - SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings); - if(leggings != null && DarkSteelItems.isArmorPart(leggings.getItem(),2) && speedUpgrade != null && isSpeedActive(player)) { - - double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified); - double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; - costModifier = costModifier + (costModifier * speedUpgrade.getWalkMultiplier()); - int cost = (int) (horzMovement * costModifier); - int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings); - - if(totalEnergy > 0) { - usePlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings, cost); - if(player.isSprinting()) { - moveInst.applyModifier(sprintModifiers[speedUpgrade.getLevel() - 1]); - } else { - moveInst.applyModifier(walkModifiers[speedUpgrade.getLevel() - 1]); - } - } - } - } - - private void updateStepHeightAndFallDistance(EntityPlayer player) { - ItemStack boots = player.getEquipmentInSlot(1); - - if(boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) { - int costedDistance = (int) player.fallDistance; - if(costedDistance > 0) { - int energyCost = costedDistance * Config.darkSteelFallDistanceCost; - int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); - if(totalEnergy > 0 && totalEnergy >= energyCost) { - usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, energyCost); - player.fallDistance -= costedDistance; - } - } - } - - JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade != null && boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && isStepAssistActive(player)) { - player.stepHeight = 1.0023F; - } else if(player.stepHeight == 1.0023F) { - player.stepHeight = 0.5001F; - } - } - - void usePlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor, int cost) { - if(cost == 0) { - return; - } - int remaining = cost; - if(Config.darkSteelDrainPowerFromInventory) { - for (ItemStack stack : player.inventory.mainInventory) { - if(stack != null && stack.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); - int used = cont.extractEnergy(stack, remaining, false); - remaining -= used; - if(remaining <= 0) { - return; - } - } - } - } - if(armor != null && remaining > 0) { - ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; - if(stack != null) { - armor.extractEnergy(stack, remaining, false); - } - } - } - - private int getPlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor) { - int res = 0; - - if(Config.darkSteelDrainPowerFromInventory) { - for (ItemStack stack : player.inventory.mainInventory) { - if(stack != null && stack.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); - res += cont.extractEnergy(stack, Integer.MAX_VALUE, true); - } - } - } - if(armor != null) { - ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; - res = armor.getEnergyStored(stack); - } - return res; - } - - @SubscribeEvent - public void onStartTracking(PlayerEvent.StartTracking event) { - if (event.target instanceof EntityPlayerMP) { - for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) { - PacketHandler.sendTo(new PacketUpgradeState(type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), (EntityPlayerMP) event.entityPlayer); - } - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onClientTick(TickEvent.ClientTickEvent event) { - if(event.phase == TickEvent.Phase.END) { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - if (player == null) { - return; - } - updateNightvision(player); - if (player.capabilities.isFlying) { - return; - } - MovementInput input = player.movementInput; - if(input.jump && !wasJumping) { - doJump(player); - } else if(input.jump && jumpCount < 3 && ticksSinceLastJump > 5) { - doJump(player); - } - - wasJumping = !player.onGround; - if(!wasJumping) { - jumpCount = 0; - } - ticksSinceLastJump++; - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { - if (event.entityLiving.getActivePotionEffect(Potion.invisibility) != null) { - return; - } - - EntityPlayer player = event.entityPlayer; - ItemStack[] armors = player.inventory.armorInventory; - - dispatchRenders(armors, event, false); - - float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; - float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; - float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; - - GL11.glPushMatrix(); - if(player.isSneaking()) { - GL11.glTranslatef(0, 0.0625f, 0); - } - GL11.glRotatef(yawOffset, 0, -1, 0); - GL11.glRotatef(yaw - 270, 0, 1, 0); - GL11.glRotatef(pitch, 0, 0, 1); - dispatchRenders(armors, event, true); - GL11.glPopMatrix(); - } - - private void dispatchRenders(ItemStack[] armors, RenderPlayerEvent event, boolean head) { - for (int i = 0; i < armors.length; i++) { - ItemStack stack = armors[i]; - if (stack != null) { - Item item = stack.getItem(); - - if (item instanceof IDarkSteelItem) { - for (IDarkSteelUpgrade upg : DarkSteelRecipeManager.instance.getUpgrades()) { - if (upg.hasUpgrade(stack)) { - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, 1F); - IRenderUpgrade render = upg.getRender(); - if (render != null) { - upg.getRender().render(event, stack, head); - } - GL11.glPopMatrix(); + private EnumSet getActiveSet(EntityPlayer player) { + EnumSet active; + GameProfile gameProfile = player.getGameProfile(); + UUID id = gameProfile == null ? null : gameProfile.getId(); + active = id == null ? null : allActive.get(id); + if (active == null) { + active = DEFAULT_ACTIVE.clone(); + if (id != null) { + allActive.put(id, active); } - } } - } - } - } - - @SideOnly(Side.CLIENT) - private void doJump(EntityClientPlayerMP player) { - if (!isJumpActive(player)) { - return; + return active; } - ItemStack boots = player.getEquipmentInSlot(1); - JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - - if(jumpUpgrade == null || boots == null || !DarkSteelItems.isArmorPart(boots.getItem(), 3)) { - return; + public boolean isActive(EntityPlayer player, Type type) { + return getActiveSet(player).contains(type); } - int requiredPower = Config.darkSteelBootsJumpPowerCost * (int) Math.pow(jumpCount + 1, 2.5); - int availablePower = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); - if(availablePower > 0 && requiredPower <= availablePower && jumpCount < jumpUpgrade.getLevel()) { - jumpCount++; - player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount; - ticksSinceLastJump = 0; - usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower); - player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.jump", 1.0f, player.worldObj.rand.nextFloat() * 0.5f + 0.75f, false); - Random rand = player.worldObj.rand; - for (int i = rand.nextInt(10) + 5; i >= 0; i--) { - EntityReddustFX fx = new EntityReddustFX(player.worldObj, player.posX + (rand.nextDouble() * 0.5 - 0.25), player.posY - player.yOffset, player.posZ - + (rand.nextDouble() * 0.5 - 0.25), 1, 1, 1); - fx.setVelocity(player.motionX + (rand.nextDouble() * 0.5 - 0.25), (player.motionY / 2) + (rand.nextDouble() * -0.05), - player.motionZ + (rand.nextDouble() * 0.5 - 0.25)); - Minecraft.getMinecraft().effectRenderer.addEffect(fx); - } - PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType)); + public void setActive(EntityPlayer player, Type type, boolean isActive) { + EnumSet set = getActiveSet(player); + if (isActive) { + set.add(type); + } else { + set.remove(type); + } } - } - - - private void updateNightvision(EntityPlayer player) { - if(isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { - player.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 210, 0, true)); + public boolean isGlideActive(EntityPlayer player) { + return isActive(player, Type.GLIDE); } - if(!isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { - nightVisionActive = false; - removeNightvision = true; + + public boolean isSpeedActive(EntityPlayer player) { + return isActive(player, Type.SPEED); } - if(removeNightvision) { - player.removePotionEffect(Potion.nightVision.getId()); - removeNightvision = false; + + public boolean isStepAssistActive(EntityPlayer player) { + return isActive(player, Type.STEP_ASSIST); } - } - // --- Thaumic Exploration Night Vision enchant support - - private static int nightVisionEnchID = -6; - - public static int getNightVisionEnchID() { - if (nightVisionEnchID == -6) setNightVisionEnchID(); - return nightVisionEnchID; - } - - private static void setNightVisionEnchID() { - for (Enchantment ench : Enchantment.enchantmentsList) { - if (ench != null && ench.getName().equals("enchantment.nightVision")) { - nightVisionEnchID = ench.effectId; - return; - } - } nightVisionEnchID = -1; - } - - public boolean isNightVisionEnch(ItemStack helmet) { - if (helmet == null) return false; - NBTTagList stackEnch = helmet.getEnchantmentTagList(); - if (getNightVisionEnchID () >= 0 && stackEnch != null) { - for (int i = 0; i < stackEnch.tagCount(); i++) { - int id = stackEnch.getCompoundTagAt(i).getInteger("id"); - if (id == getNightVisionEnchID()) - return true; - } + public boolean isJumpActive(EntityPlayer player) { + return isActive(player, Type.JUMP); } - return false; - } - // --- + @SubscribeEvent + public void onPlayerTick(TickEvent.PlayerTickEvent event) { + EntityPlayer player = event.player; - public boolean isNightVisionUpgradeOrEnchEquipped(EntityPlayer player) { - ItemStack helmet = player.getEquipmentInSlot(4); - return (NightVisionUpgrade.loadFromItem(helmet) != null || isNightVisionEnch(helmet)); - } + if (event.phase == Phase.START) { + // boots + updateStepHeightAndFallDistance(player); - public void setNightVisionActive(boolean isNightVisionActive) { - if(nightVisionActive && !isNightVisionActive) { - removeNightvision = true; + // leggings + updateSpeed(player); + + // sword + updateSword(player); + + updateGlide(player); + + updateSwim(player); + + updateSolar(player); + } } - this.nightVisionActive = isNightVisionActive; - } - public boolean isNightVisionActive() { - return nightVisionActive; - } + private void updateSolar(EntityPlayer player) { + // no processing on client + if (player.worldObj.isRemote) { + return; + } + + ItemStack helm = player.getEquipmentInSlot(4); + SolarUpgrade upgrade = SolarUpgrade.loadFromItem(helm); + if (upgrade == null) { + return; + } + + int RFperSecond = Math.round((float) upgrade.getRFPerSec() + * TileEntitySolarPanel.calculateLightRatio( + player.worldObj, + MathHelper.floor_double(player.posX), + MathHelper.floor_double(player.posY + 1), + MathHelper.floor_double(player.posZ))); + + int leftover = RFperSecond % 20; + boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover; + + int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0); + + if (toAdd != 0) { + + int nextIndex = player.getEntityData().getInteger("dsarmor:solar") % 4; + + for (int i = 0; i < 4 && toAdd > 0; i++) { + ItemStack stack = player.inventory.armorInventory[nextIndex]; + if (stack != null + && (EnergyUpgrade.loadFromItem(stack) != null + || (Config.darkSteelSolarChargeOthers + && stack.getItem() instanceof IEnergyContainerItem))) { + toAdd -= ((IEnergyContainerItem) stack.getItem()).receiveEnergy(stack, toAdd, false); + } + nextIndex = (nextIndex + 1) % 4; + } + + player.getEntityData().setInteger("dsarmor:solar", nextIndex); + } + } + + private void updateSwim(EntityPlayer player) { + ItemStack boots = player.getEquipmentInSlot(1); + SwimUpgrade upgrade = SwimUpgrade.loadFromItem(boots); + if (upgrade == null) { + return; + } + if (player.isInWater() && !player.capabilities.isFlying) { + player.motionX *= 1.1; + player.motionZ *= 1.1; + } + } + + private void updateGlide(EntityPlayer player) { + if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { + return; + } + + if (!player.onGround && player.motionY < 0 && !player.isSneaking() && !player.isInWater()) { + + double horizontalSpeed = Config.darkSteelGliderHorizontalSpeed; + double verticalSpeed = Config.darkSteelGliderVerticalSpeed; + if (player.isSprinting()) { + verticalSpeed = Config.darkSteelGliderVerticalSpeedSprinting; + } + + Vector3d look = Util.getLookVecEio(player); + Vector3d side = new Vector3d(); + side.cross(new Vector3d(0, 1, 0), look); + Vector3d playerPos = new Vector3d(player.prevPosX, player.prevPosY, player.prevPosZ); + Vector3d b = new Vector3d(playerPos); + b.y += 1; + Vector3d c = new Vector3d(playerPos); + c.add(side); + Vector4d plane = new Vector4d(); + VecmathUtil.computePlaneEquation(playerPos, b, c, plane); + double dist = Math.abs( + VecmathUtil.distanceFromPointToPlane(plane, new Vector3d(player.posX, player.posY, player.posZ))); + double minDist = 0.15; + if (dist < minDist) { + double dropRate = (minDist * 10) - (dist * 10); + verticalSpeed = verticalSpeed + (verticalSpeed * dropRate * 8); + horizontalSpeed -= (0.02 * dropRate); + } + + double x = Math.cos(Math.toRadians(player.rotationYawHead + 90)) * horizontalSpeed; + double z = Math.sin(Math.toRadians(player.rotationYawHead + 90)) * horizontalSpeed; + + player.motionX += x; + player.motionZ += z; + + player.motionY = verticalSpeed; + player.fallDistance = 0f; + } + } + + public boolean isGliderUpgradeEquipped(EntityPlayer player) { + ItemStack chestPlate = player.getEquipmentInSlot(3); + GliderUpgrade glideUpgrade = GliderUpgrade.loadFromItem(chestPlate); + if (glideUpgrade == null) { + return false; + } + return true; + } + + private void updateSword(EntityPlayer player) { + if (ItemDarkSteelSword.isEquipped(player)) { + IAttributeInstance attackInst = + player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.attackDamage); + attackInst.removeModifier(swordDamageModifierPowered); + + ItemStack sword = player.getCurrentEquippedItem(); + if (Config.darkSteelSwordPowerUsePerHit <= 0 + || EnergyUpgrade.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { + attackInst.applyModifier(swordDamageModifierPowered); + } + } + } + + private void updateSpeed(EntityPlayer player) { + if (player.worldObj.isRemote || !player.onGround) { + return; + } + + IAttributeInstance moveInst = + player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.movementSpeed); + if (moveInst.getModifier(walkModifiers[0].getID()) != null) { + moveInst.removeModifier(walkModifiers[0]); // any will so as they all have the same UID + } else if (moveInst.getModifier(sprintModifiers[0].getID()) != null) { + moveInst.removeModifier(sprintModifiers[0]); + } + + ItemStack leggings = player.getEquipmentInSlot(2); + SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings); + if (leggings != null + && DarkSteelItems.isArmorPart(leggings.getItem(), 2) + && speedUpgrade != null + && isSpeedActive(player)) { + + double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified); + double costModifier = + player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; + costModifier = costModifier + (costModifier * speedUpgrade.getWalkMultiplier()); + int cost = (int) (horzMovement * costModifier); + int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings); + + if (totalEnergy > 0) { + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings, cost); + if (player.isSprinting()) { + moveInst.applyModifier(sprintModifiers[speedUpgrade.getLevel() - 1]); + } else { + moveInst.applyModifier(walkModifiers[speedUpgrade.getLevel() - 1]); + } + } + } + } + + private void updateStepHeightAndFallDistance(EntityPlayer player) { + ItemStack boots = player.getEquipmentInSlot(1); + + if (boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) { + int costedDistance = (int) player.fallDistance; + if (costedDistance > 0) { + int energyCost = costedDistance * Config.darkSteelFallDistanceCost; + int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); + if (totalEnergy > 0 && totalEnergy >= energyCost) { + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, energyCost); + player.fallDistance -= costedDistance; + } + } + } + + JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); + if (jumpUpgrade != null + && boots != null + && DarkSteelItems.isArmorPart(boots.getItem(), 3) + && isStepAssistActive(player)) { + player.stepHeight = 1.0023F; + } else if (player.stepHeight == 1.0023F) { + player.stepHeight = 0.5001F; + } + } + + void usePlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor, int cost) { + if (cost == 0) { + return; + } + int remaining = cost; + if (Config.darkSteelDrainPowerFromInventory) { + for (ItemStack stack : player.inventory.mainInventory) { + if (stack != null && stack.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); + int used = cont.extractEnergy(stack, remaining, false); + remaining -= used; + if (remaining <= 0) { + return; + } + } + } + } + if (armor != null && remaining > 0) { + ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; + if (stack != null) { + armor.extractEnergy(stack, remaining, false); + } + } + } + + private int getPlayerEnergy(EntityPlayer player, ItemDarkSteelArmor armor) { + int res = 0; + + if (Config.darkSteelDrainPowerFromInventory) { + for (ItemStack stack : player.inventory.mainInventory) { + if (stack != null && stack.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem cont = (IEnergyContainerItem) stack.getItem(); + res += cont.extractEnergy(stack, Integer.MAX_VALUE, true); + } + } + } + if (armor != null) { + ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; + res = armor.getEnergyStored(stack); + } + return res; + } + + @SubscribeEvent + public void onStartTracking(PlayerEvent.StartTracking event) { + if (event.target instanceof EntityPlayerMP) { + for (PacketUpgradeState.Type type : PacketUpgradeState.Type.values()) { + PacketHandler.sendTo( + new PacketUpgradeState( + type, isActive((EntityPlayer) event.target, type), event.target.getEntityId()), + (EntityPlayerMP) event.entityPlayer); + } + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (player == null) { + return; + } + updateNightvision(player); + if (player.capabilities.isFlying) { + return; + } + MovementInput input = player.movementInput; + if (input.jump && !wasJumping) { + doJump(player); + } else if (input.jump && jumpCount < 3 && ticksSinceLastJump > 5) { + doJump(player); + } + + wasJumping = !player.onGround; + if (!wasJumping) { + jumpCount = 0; + } + ticksSinceLastJump++; + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { + if (event.entityLiving.getActivePotionEffect(Potion.invisibility) != null) { + return; + } + + EntityPlayer player = event.entityPlayer; + ItemStack[] armors = player.inventory.armorInventory; + + dispatchRenders(armors, event, false); + + float yaw = player.prevRotationYawHead + + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; + float yawOffset = player.prevRenderYawOffset + + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; + float pitch = + player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; + + GL11.glPushMatrix(); + if (player.isSneaking()) { + GL11.glTranslatef(0, 0.0625f, 0); + } + GL11.glRotatef(yawOffset, 0, -1, 0); + GL11.glRotatef(yaw - 270, 0, 1, 0); + GL11.glRotatef(pitch, 0, 0, 1); + dispatchRenders(armors, event, true); + GL11.glPopMatrix(); + } + + private void dispatchRenders(ItemStack[] armors, RenderPlayerEvent event, boolean head) { + for (int i = 0; i < armors.length; i++) { + ItemStack stack = armors[i]; + if (stack != null) { + Item item = stack.getItem(); + + if (item instanceof IDarkSteelItem) { + for (IDarkSteelUpgrade upg : DarkSteelRecipeManager.instance.getUpgrades()) { + if (upg.hasUpgrade(stack)) { + GL11.glPushMatrix(); + GL11.glColor4f(1F, 1F, 1F, 1F); + IRenderUpgrade render = upg.getRender(); + if (render != null) { + upg.getRender().render(event, stack, head); + } + GL11.glPopMatrix(); + } + } + } + } + } + } + + @SideOnly(Side.CLIENT) + private void doJump(EntityClientPlayerMP player) { + if (!isJumpActive(player)) { + return; + } + + ItemStack boots = player.getEquipmentInSlot(1); + JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); + + if (jumpUpgrade == null || boots == null || !DarkSteelItems.isArmorPart(boots.getItem(), 3)) { + return; + } + + int requiredPower = Config.darkSteelBootsJumpPowerCost * (int) Math.pow(jumpCount + 1, 2.5); + int availablePower = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); + if (availablePower > 0 && requiredPower <= availablePower && jumpCount < jumpUpgrade.getLevel()) { + jumpCount++; + player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount; + ticksSinceLastJump = 0; + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower); + player.worldObj.playSound( + player.posX, + player.posY, + player.posZ, + EnderIO.MODID + ":ds.jump", + 1.0f, + player.worldObj.rand.nextFloat() * 0.5f + 0.75f, + false); + Random rand = player.worldObj.rand; + for (int i = rand.nextInt(10) + 5; i >= 0; i--) { + EntityReddustFX fx = new EntityReddustFX( + player.worldObj, + player.posX + (rand.nextDouble() * 0.5 - 0.25), + player.posY - player.yOffset, + player.posZ + (rand.nextDouble() * 0.5 - 0.25), + 1, + 1, + 1); + fx.setVelocity( + player.motionX + (rand.nextDouble() * 0.5 - 0.25), + (player.motionY / 2) + (rand.nextDouble() * -0.05), + player.motionZ + (rand.nextDouble() * 0.5 - 0.25)); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } + PacketHandler.INSTANCE.sendToServer( + new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType)); + } + } + + private void updateNightvision(EntityPlayer player) { + if (isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { + player.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 210, 0, true)); + } + if (!isNightVisionUpgradeOrEnchEquipped(player) && nightVisionActive) { + nightVisionActive = false; + removeNightvision = true; + } + if (removeNightvision) { + player.removePotionEffect(Potion.nightVision.getId()); + removeNightvision = false; + } + } + + // --- Thaumic Exploration Night Vision enchant support + + private static int nightVisionEnchID = -6; + + public static int getNightVisionEnchID() { + if (nightVisionEnchID == -6) setNightVisionEnchID(); + return nightVisionEnchID; + } + + private static void setNightVisionEnchID() { + for (Enchantment ench : Enchantment.enchantmentsList) { + if (ench != null && ench.getName().equals("enchantment.nightVision")) { + nightVisionEnchID = ench.effectId; + return; + } + } + nightVisionEnchID = -1; + } + + public boolean isNightVisionEnch(ItemStack helmet) { + if (helmet == null) return false; + NBTTagList stackEnch = helmet.getEnchantmentTagList(); + if (getNightVisionEnchID() >= 0 && stackEnch != null) { + for (int i = 0; i < stackEnch.tagCount(); i++) { + int id = stackEnch.getCompoundTagAt(i).getInteger("id"); + if (id == getNightVisionEnchID()) return true; + } + } + return false; + } + + // --- + + public boolean isNightVisionUpgradeOrEnchEquipped(EntityPlayer player) { + ItemStack helmet = player.getEquipmentInSlot(4); + return (NightVisionUpgrade.loadFromItem(helmet) != null || isNightVisionEnch(helmet)); + } + + public void setNightVisionActive(boolean isNightVisionActive) { + if (nightVisionActive && !isNightVisionActive) { + removeNightvision = true; + } + this.nightVisionActive = isNightVisionActive; + } + + public boolean isNightVisionActive() { + return nightVisionActive; + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java index e29b9e79..358cdc5e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java @@ -1,136 +1,145 @@ package crazypants.enderio.item.darksteel; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.ItemMagnet; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.ChestGenHooks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.ItemMagnet; public class DarkSteelItems { - public static ItemGliderWing itemGliderWing; + public static ItemGliderWing itemGliderWing; - public static ItemDarkSteelArmor itemDarkSteelHelmet; - public static ItemDarkSteelArmor itemDarkSteelChestplate; - public static ItemDarkSteelArmor itemDarkSteelLeggings; - public static ItemDarkSteelArmor itemDarkSteelBoots; - public static ItemDarkSteelSword itemDarkSteelSword; - public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; - public static ItemDarkSteelAxe itemDarkSteelAxe; - public static ItemDarkSteelShears itemDarkSteelShears; + public static ItemDarkSteelArmor itemDarkSteelHelmet; + public static ItemDarkSteelArmor itemDarkSteelChestplate; + public static ItemDarkSteelArmor itemDarkSteelLeggings; + public static ItemDarkSteelArmor itemDarkSteelBoots; + public static ItemDarkSteelSword itemDarkSteelSword; + public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; + public static ItemDarkSteelAxe itemDarkSteelAxe; + public static ItemDarkSteelShears itemDarkSteelShears; - public static ItemEndSteelArmor itemEndSteelHelmet; - public static ItemEndSteelArmor itemEndSteelChestplate; - public static ItemEndSteelArmor itemEndSteelLeggings; - public static ItemEndSteelArmor itemEndSteelBoots; - public static ItemEndSteelSword itemEndSteelSword; - public static ItemEndSteelPickaxe itemEndSteelPickaxe; - public static ItemEndSteelAxe itemEndSteelAxe; + public static ItemEndSteelArmor itemEndSteelHelmet; + public static ItemEndSteelArmor itemEndSteelChestplate; + public static ItemEndSteelArmor itemEndSteelLeggings; + public static ItemEndSteelArmor itemEndSteelBoots; + public static ItemEndSteelSword itemEndSteelSword; + public static ItemEndSteelPickaxe itemEndSteelPickaxe; + public static ItemEndSteelAxe itemEndSteelAxe; - public static ItemStellarArmor itemStellarHelmet; - public static ItemStellarArmor itemStellarChestplate; - public static ItemStellarArmor itemStellarLeggings; - public static ItemStellarArmor itemStellarBoots; - public static ItemStellarSword itemStellarSword; - public static ItemStellarPickaxe itemStellarPickaxe; - public static ItemStellarAxe itemStellarAxe; + public static ItemStellarArmor itemStellarHelmet; + public static ItemStellarArmor itemStellarChestplate; + public static ItemStellarArmor itemStellarLeggings; + public static ItemStellarArmor itemStellarBoots; + public static ItemStellarSword itemStellarSword; + public static ItemStellarPickaxe itemStellarPickaxe; + public static ItemStellarAxe itemStellarAxe; - public static ItemMagnet itemMagnet; + public static ItemMagnet itemMagnet; - private DarkSteelItems() { - } + private DarkSteelItems() {} - public static void createDarkSteelArmorItems() { - itemGliderWing = ItemGliderWing.create(); + public static void createDarkSteelArmorItems() { + itemGliderWing = ItemGliderWing.create(); - itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); - itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); - itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); - itemDarkSteelBoots = ItemDarkSteelArmor.create(3); + itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); + itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); + itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); + itemDarkSteelBoots = ItemDarkSteelArmor.create(3); - itemDarkSteelSword = ItemDarkSteelSword.create(); - itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create(); - itemDarkSteelAxe = ItemDarkSteelAxe.create(); - itemDarkSteelShears = ItemDarkSteelShears.create(); + itemDarkSteelSword = ItemDarkSteelSword.create(); + itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create(); + itemDarkSteelAxe = ItemDarkSteelAxe.create(); + itemDarkSteelShears = ItemDarkSteelShears.create(); - itemEndSteelHelmet = ItemEndSteelArmor.create(0); - itemEndSteelChestplate = ItemEndSteelArmor.create(1); - itemEndSteelLeggings = ItemEndSteelArmor.create(2); - itemEndSteelBoots = ItemEndSteelArmor.create(3); + itemEndSteelHelmet = ItemEndSteelArmor.create(0); + itemEndSteelChestplate = ItemEndSteelArmor.create(1); + itemEndSteelLeggings = ItemEndSteelArmor.create(2); + itemEndSteelBoots = ItemEndSteelArmor.create(3); - itemEndSteelSword = ItemEndSteelSword.create(); - itemEndSteelPickaxe = ItemEndSteelPickaxe.create(); - itemEndSteelAxe = ItemEndSteelAxe.create(); + itemEndSteelSword = ItemEndSteelSword.create(); + itemEndSteelPickaxe = ItemEndSteelPickaxe.create(); + itemEndSteelAxe = ItemEndSteelAxe.create(); - itemStellarHelmet = ItemStellarArmor.create(0); - itemStellarChestplate = ItemStellarArmor.create(1); - itemStellarLeggings = ItemStellarArmor.create(2); - itemStellarBoots = ItemStellarArmor.create(3); + itemStellarHelmet = ItemStellarArmor.create(0); + itemStellarChestplate = ItemStellarArmor.create(1); + itemStellarLeggings = ItemStellarArmor.create(2); + itemStellarBoots = ItemStellarArmor.create(3); - itemStellarSword = ItemStellarSword.create(); - itemStellarPickaxe = ItemStellarPickaxe.create(); - itemStellarAxe = ItemStellarAxe.create(); + itemStellarSword = ItemStellarSword.create(); + itemStellarPickaxe = ItemStellarPickaxe.create(); + itemStellarAxe = ItemStellarAxe.create(); - itemMagnet = ItemMagnet.create(); - - } - - public static boolean isArmorPart(Item item, int type){ - switch(type){ - case 0:return item == itemDarkSteelHelmet||item == itemEndSteelHelmet||item == itemStellarHelmet; - case 1:return item == itemDarkSteelChestplate||item == itemEndSteelChestplate||item == itemStellarChestplate; - case 2:return item == itemDarkSteelLeggings||item == itemEndSteelLeggings||item == itemStellarLeggings; - case 3:return item == itemDarkSteelBoots||item == itemEndSteelBoots||item == itemStellarBoots; - default: return false; - } - } - - public static void addLoot() { - if(Config.lootTheEnder) { - ItemStack sword = new ItemStack(itemDarkSteelSword, 1, 0); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); + itemMagnet = ItemMagnet.create(); } - if(Config.lootDarkSteelBoots) { - ItemStack boots = new ItemStack(itemDarkSteelBoots, 1, 0); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + public static boolean isArmorPart(Item item, int type) { + switch (type) { + case 0: + return item == itemDarkSteelHelmet || item == itemEndSteelHelmet || item == itemStellarHelmet; + case 1: + return item == itemDarkSteelChestplate + || item == itemEndSteelChestplate + || item == itemStellarChestplate; + case 2: + return item == itemDarkSteelLeggings || item == itemEndSteelLeggings || item == itemStellarLeggings; + case 3: + return item == itemDarkSteelBoots || item == itemEndSteelBoots || item == itemStellarBoots; + default: + return false; + } } - } - @SideOnly(Side.CLIENT) - public static void registerItemRenderer() { - PoweredItemRenderer dsr = new PoweredItemRenderer(); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelBoots, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelLeggings, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelChestplate, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelHelmet, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelSword, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelPickaxe, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr); - MinecraftForgeClient.registerItemRenderer(itemDarkSteelShears, dsr); + public static void addLoot() { + if (Config.lootTheEnder) { + ItemStack sword = new ItemStack(itemDarkSteelSword, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST) + .addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST) + .addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); + } - MinecraftForgeClient.registerItemRenderer(itemEndSteelBoots, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelLeggings, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelChestplate, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelHelmet, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelSword, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelPickaxe, dsr); - MinecraftForgeClient.registerItemRenderer(itemEndSteelAxe, dsr); + if (Config.lootDarkSteelBoots) { + ItemStack boots = new ItemStack(itemDarkSteelBoots, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH) + .addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + } + } - MinecraftForgeClient.registerItemRenderer(itemStellarBoots, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarLeggings, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarChestplate, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarHelmet, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarSword, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarPickaxe, dsr); - MinecraftForgeClient.registerItemRenderer(itemStellarAxe, dsr); - } + @SideOnly(Side.CLIENT) + public static void registerItemRenderer() { + PoweredItemRenderer dsr = new PoweredItemRenderer(); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelHelmet, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelSword, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelPickaxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelShears, dsr); + + MinecraftForgeClient.registerItemRenderer(itemEndSteelBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelHelmet, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelSword, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelPickaxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemEndSteelAxe, dsr); + + MinecraftForgeClient.registerItemRenderer(itemStellarBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarHelmet, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarSword, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarPickaxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemStellarAxe, dsr); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index ace3363e..3326c080 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -1,22 +1,7 @@ package crazypants.enderio.item.darksteel; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.event.AnvilUpdateEvent; -import net.minecraftforge.oredict.OreDictionary; - import com.enderio.core.common.util.OreDictionaryHelper; import com.google.common.collect.ImmutableList; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; @@ -38,190 +23,199 @@ import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.endergy.AlloyEndergy; import crazypants.enderio.thaumcraft.ThaumcraftCompat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.event.AnvilUpdateEvent; public class DarkSteelRecipeManager { - public static DarkSteelRecipeManager instance = new DarkSteelRecipeManager(); + public static DarkSteelRecipeManager instance = new DarkSteelRecipeManager(); - private List upgrades = new ArrayList(); + private List upgrades = new ArrayList(); - public DarkSteelRecipeManager() { - upgrades.add(EnergyUpgrade.EMPOWERED); - upgrades.add(EnergyUpgrade.EMPOWERED_TWO); - upgrades.add(EnergyUpgrade.EMPOWERED_THREE); - upgrades.add(EnergyUpgrade.EMPOWERED_FOUR); - upgrades.add(EnergyUpgrade.EMPOWERED_FIVE); - upgrades.add(JumpUpgrade.JUMP_ONE); - upgrades.add(JumpUpgrade.JUMP_TWO); - upgrades.add(JumpUpgrade.JUMP_THREE); - upgrades.add(SpeedUpgrade.SPEED_ONE); - upgrades.add(SpeedUpgrade.SPEED_TWO); - upgrades.add(SpeedUpgrade.SPEED_THREE); - upgrades.add(GliderUpgrade.INSTANCE); - upgrades.add(SoundDetectorUpgrade.INSTANCE); - upgrades.add(SwimUpgrade.INSTANCE); - upgrades.add(NightVisionUpgrade.INSTANCE); - upgrades.add(TravelUpgrade.INSTANCE); - upgrades.add(SpoonUpgrade.INSTANCE); - upgrades.add(SolarUpgrade.SOLAR_ONE); - upgrades.add(SolarUpgrade.SOLAR_TWO); - upgrades.add(SolarUpgrade.SOLAR_THREE); - if(Loader.isModLoaded("Thaumcraft")) { - ThaumcraftCompat.loadUpgrades(upgrades); - } - if(Loader.isModLoaded("Forestry")) { - upgrades.add(NaturalistEyeUpgrade.INSTANCE); - upgrades.add(ApiaristArmorUpgrade.HELMET); - upgrades.add(ApiaristArmorUpgrade.CHEST); - upgrades.add(ApiaristArmorUpgrade.LEGS); - upgrades.add(ApiaristArmorUpgrade.BOOTS); - } - } - - @SubscribeEvent - public void handleAnvilEvent(AnvilUpdateEvent evt) { - if(evt.left == null || evt.right == null) { - return; - } - - if(evt.left.getItem() instanceof IStellarItem && OreDictionaryHelper.hasName(evt.right, AlloyEndergy.STELLAR_ALLOY.getOreIngot())) { - handleRepair(evt); - } - - else if(evt.left.getItem() instanceof IEndSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.END_STEEL.getOreIngot())) { - handleRepair(evt); - } - - else if(evt.left.getItem() instanceof IDarkSteelItem && OreDictionaryHelper.hasName(evt.right, Alloy.DARK_STEEL.getOreIngot())) { - handleRepair(evt); - } - - else { - handleUpgrade(evt); - } - } - - private void handleRepair(AnvilUpdateEvent evt) { - ItemStack targetStack = evt.left; - ItemStack ingots = evt.right; - - //repair event - IDarkSteelItem targetItem = (IDarkSteelItem)targetStack.getItem(); - int maxIngots = targetItem.getIngotsRequiredForFullRepair(); - - double damPerc = (double)targetStack.getItemDamage()/ targetStack.getMaxDamage(); - int requiredIngots = (int)Math.ceil(damPerc * maxIngots); - if(ingots.stackSize > requiredIngots) { - return; - } - - int damageAddedPerIngot = (int)Math.ceil((double)targetStack.getMaxDamage()/maxIngots); - int totalDamageRemoved = damageAddedPerIngot * ingots.stackSize; - - ItemStack resultStack = targetStack.copy(); - resultStack.setItemDamage(Math.max(0, resultStack.getItemDamage() - totalDamageRemoved)); - - evt.output = resultStack; - evt.cost = ingots.stackSize + (int)Math.ceil(getEnchantmentRepairCost(resultStack)/2); - } - - private void handleUpgrade(AnvilUpdateEvent evt) { - for (IDarkSteelUpgrade upgrade : upgrades) { - if(upgrade.isUpgradeItem(evt.right) && upgrade.canAddToItem(evt.left)) { - ItemStack res = new ItemStack(evt.left.getItem(), 1, evt.left.getItemDamage()); - if(evt.left.stackTagCompound != null) { - res.stackTagCompound = (NBTTagCompound) evt.left.stackTagCompound.copy(); + public DarkSteelRecipeManager() { + upgrades.add(EnergyUpgrade.EMPOWERED); + upgrades.add(EnergyUpgrade.EMPOWERED_TWO); + upgrades.add(EnergyUpgrade.EMPOWERED_THREE); + upgrades.add(EnergyUpgrade.EMPOWERED_FOUR); + upgrades.add(EnergyUpgrade.EMPOWERED_FIVE); + upgrades.add(JumpUpgrade.JUMP_ONE); + upgrades.add(JumpUpgrade.JUMP_TWO); + upgrades.add(JumpUpgrade.JUMP_THREE); + upgrades.add(SpeedUpgrade.SPEED_ONE); + upgrades.add(SpeedUpgrade.SPEED_TWO); + upgrades.add(SpeedUpgrade.SPEED_THREE); + upgrades.add(GliderUpgrade.INSTANCE); + upgrades.add(SoundDetectorUpgrade.INSTANCE); + upgrades.add(SwimUpgrade.INSTANCE); + upgrades.add(NightVisionUpgrade.INSTANCE); + upgrades.add(TravelUpgrade.INSTANCE); + upgrades.add(SpoonUpgrade.INSTANCE); + upgrades.add(SolarUpgrade.SOLAR_ONE); + upgrades.add(SolarUpgrade.SOLAR_TWO); + upgrades.add(SolarUpgrade.SOLAR_THREE); + if (Loader.isModLoaded("Thaumcraft")) { + ThaumcraftCompat.loadUpgrades(upgrades); } - upgrade.writeToItem(res); - evt.output = res; - evt.cost = upgrade.getLevelCost(); - return; - } - } - } - - public static int getEnchantmentRepairCost(ItemStack itemStack) { - //derived from ContainerRepair - int res = 0; - Map map1 = EnchantmentHelper.getEnchantments(itemStack); - Iterator iter = map1.keySet().iterator(); - while (iter.hasNext()) { - int i1 = ((Integer) iter.next()).intValue(); - Enchantment enchantment = Enchantment.enchantmentsList[i1]; - - int level = ((Integer) map1.get(Integer.valueOf(i1))).intValue(); - if(enchantment.canApply(itemStack)) { - if(level > enchantment.getMaxLevel()) { - level = enchantment.getMaxLevel(); + if (Loader.isModLoaded("Forestry")) { + upgrades.add(NaturalistEyeUpgrade.INSTANCE); + upgrades.add(ApiaristArmorUpgrade.HELMET); + upgrades.add(ApiaristArmorUpgrade.CHEST); + upgrades.add(ApiaristArmorUpgrade.LEGS); + upgrades.add(ApiaristArmorUpgrade.BOOTS); } - int costPerLevel = 0; - switch (enchantment.getWeight()) { - case 1: - costPerLevel = 8; - break; - case 2: - costPerLevel = 4; - case 3: - case 4: - case 6: - case 7: - case 8: - case 9: - default: - break; - case 5: - costPerLevel = 2; - break; - case 10: - costPerLevel = 1; + } + + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if (evt.left == null || evt.right == null) { + return; + } + + if (evt.left.getItem() instanceof IStellarItem + && OreDictionaryHelper.hasName(evt.right, AlloyEndergy.STELLAR_ALLOY.getOreIngot())) { + handleRepair(evt); + } else if (evt.left.getItem() instanceof IEndSteelItem + && OreDictionaryHelper.hasName(evt.right, Alloy.END_STEEL.getOreIngot())) { + handleRepair(evt); + } else if (evt.left.getItem() instanceof IDarkSteelItem + && OreDictionaryHelper.hasName(evt.right, Alloy.DARK_STEEL.getOreIngot())) { + handleRepair(evt); + } else { + handleUpgrade(evt); } - res += costPerLevel * level; - } } - return res; - } - public List getUpgrades() { - return upgrades; - } + private void handleRepair(AnvilUpdateEvent evt) { + ItemStack targetStack = evt.left; + ItemStack ingots = evt.right; - public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - for (IDarkSteelUpgrade upgrade : upgrades) { - if(upgrade.hasUpgrade(itemstack)) { - upgrade.addCommonEntries(itemstack, entityplayer, list, flag); - } + // repair event + IDarkSteelItem targetItem = (IDarkSteelItem) targetStack.getItem(); + int maxIngots = targetItem.getIngotsRequiredForFullRepair(); + + double damPerc = (double) targetStack.getItemDamage() / targetStack.getMaxDamage(); + int requiredIngots = (int) Math.ceil(damPerc * maxIngots); + if (ingots.stackSize > requiredIngots) { + return; + } + + int damageAddedPerIngot = (int) Math.ceil((double) targetStack.getMaxDamage() / maxIngots); + int totalDamageRemoved = damageAddedPerIngot * ingots.stackSize; + + ItemStack resultStack = targetStack.copy(); + resultStack.setItemDamage(Math.max(0, resultStack.getItemDamage() - totalDamageRemoved)); + + evt.output = resultStack; + evt.cost = ingots.stackSize + (int) Math.ceil(getEnchantmentRepairCost(resultStack) / 2); } - } - public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - for (IDarkSteelUpgrade upgrade : upgrades) { - if(upgrade.hasUpgrade(itemstack)) { - upgrade.addBasicEntries(itemstack, entityplayer, list, flag); - } + private void handleUpgrade(AnvilUpdateEvent evt) { + for (IDarkSteelUpgrade upgrade : upgrades) { + if (upgrade.isUpgradeItem(evt.right) && upgrade.canAddToItem(evt.left)) { + ItemStack res = new ItemStack(evt.left.getItem(), 1, evt.left.getItemDamage()); + if (evt.left.stackTagCompound != null) { + res.stackTagCompound = (NBTTagCompound) evt.left.stackTagCompound.copy(); + } + upgrade.writeToItem(res); + evt.output = res; + evt.cost = upgrade.getLevelCost(); + return; + } + } } - } - public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + public static int getEnchantmentRepairCost(ItemStack itemStack) { + // derived from ContainerRepair + int res = 0; + Map map1 = EnchantmentHelper.getEnchantments(itemStack); + Iterator iter = map1.keySet().iterator(); + while (iter.hasNext()) { + int i1 = ((Integer) iter.next()).intValue(); + Enchantment enchantment = Enchantment.enchantmentsList[i1]; - List applyableUpgrades = new ArrayList(); - for (IDarkSteelUpgrade upgrade : upgrades) { - if(upgrade.hasUpgrade(itemstack)) { - upgrade.addDetailedEntries(itemstack, entityplayer, list, flag); - } else if(upgrade.canAddToItem(itemstack)) { - applyableUpgrades.add(upgrade); - } + int level = ((Integer) map1.get(Integer.valueOf(i1))).intValue(); + if (enchantment.canApply(itemStack)) { + if (level > enchantment.getMaxLevel()) { + level = enchantment.getMaxLevel(); + } + int costPerLevel = 0; + switch (enchantment.getWeight()) { + case 1: + costPerLevel = 8; + break; + case 2: + costPerLevel = 4; + case 3: + case 4: + case 6: + case 7: + case 8: + case 9: + default: + break; + case 5: + costPerLevel = 2; + break; + case 10: + costPerLevel = 1; + } + res += costPerLevel * level; + } + } + return res; } - if(!applyableUpgrades.isEmpty()) { - list.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("tooltip.anvilupgrades") + " "); - for (IDarkSteelUpgrade up : applyableUpgrades) { - list.add(EnumChatFormatting.DARK_AQUA + "" + "" + EnderIO.lang.localizeExact(up.getUnlocalizedName() + ".name") + ": "); - list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + " + " + up.getLevelCost() - + " " + EnderIO.lang.localize("item.darkSteel.tooltip.lvs")); - } - } - } - public Iterator recipeIterator() { - return ImmutableList.copyOf(upgrades).iterator(); - } + public List getUpgrades() { + return upgrades; + } + + public void addCommonTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + for (IDarkSteelUpgrade upgrade : upgrades) { + if (upgrade.hasUpgrade(itemstack)) { + upgrade.addCommonEntries(itemstack, entityplayer, list, flag); + } + } + } + + public void addBasicTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + for (IDarkSteelUpgrade upgrade : upgrades) { + if (upgrade.hasUpgrade(itemstack)) { + upgrade.addBasicEntries(itemstack, entityplayer, list, flag); + } + } + } + + public void addAdvancedTooltipEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + List applyableUpgrades = new ArrayList(); + for (IDarkSteelUpgrade upgrade : upgrades) { + if (upgrade.hasUpgrade(itemstack)) { + upgrade.addDetailedEntries(itemstack, entityplayer, list, flag); + } else if (upgrade.canAddToItem(itemstack)) { + applyableUpgrades.add(upgrade); + } + } + if (!applyableUpgrades.isEmpty()) { + list.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("tooltip.anvilupgrades") + " "); + for (IDarkSteelUpgrade up : applyableUpgrades) { + list.add(EnumChatFormatting.DARK_AQUA + "" + "" + + EnderIO.lang.localizeExact(up.getUnlocalizedName() + ".name") + ": "); + list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + + " + " + up.getLevelCost() + " " + EnderIO.lang.localize("item.darkSteel.tooltip.lvs")); + } + } + } + + public Iterator recipeIterator() { + return ImmutableList.copyOf(upgrades).iterator(); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java index 6f1446b7..088da52c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java @@ -5,83 +5,82 @@ import net.minecraft.nbt.NBTTagCompound; public class EnergyContainer { - private int capacityRF; - private int maxReceiveRF; - private int maxExtractRF; + private int capacityRF; + private int maxReceiveRF; + private int maxExtractRF; - public EnergyContainer(int capacityRF, int maxReceiveRF, int maxExtractRF) { - this.capacityRF = capacityRF; - this.maxReceiveRF = maxReceiveRF; - this.maxExtractRF = maxExtractRF; - } - - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if(container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + public EnergyContainer(int capacityRF, int maxReceiveRF, int maxExtractRF) { + this.capacityRF = capacityRF; + this.maxReceiveRF = maxReceiveRF; + this.maxExtractRF = maxExtractRF; } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyReceived = Math.min(capacityRF - energy, Math.min(this.maxReceiveRF, maxReceive)); - if(!simulate) { - energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + + if (container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyReceived = Math.min(capacityRF - energy, Math.min(this.maxReceiveRF, maxReceive)); + + if (!simulate) { + energy += energyReceived; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyReceived; } - return energyReceived; - } - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if(container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + if (container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + int energy = container.stackTagCompound.getInteger("Energy"); + int energyExtracted = Math.min(energy, Math.min(this.maxExtractRF, maxExtract)); + + if (!simulate) { + energy -= energyExtracted; + container.stackTagCompound.setInteger("Energy", energy); + } + return energyExtracted; } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtractRF, maxExtract)); - if(!simulate) { - energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); + public static int getEnergyStored(ItemStack container) { + if (container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { + return 0; + } + return container.stackTagCompound.getInteger("Energy"); } - return energyExtracted; - } - public static int getEnergyStored(ItemStack container) { - if(container == null || container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + public int getMaxEnergyStored(ItemStack container) { + return capacityRF; } - return container.stackTagCompound.getInteger("Energy"); - } - public int getMaxEnergyStored(ItemStack container) { - return capacityRF; - } - - public static void setEnergy(ItemStack container, int energy) { - if(container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + public static void setEnergy(ItemStack container, int energy) { + if (container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + container.stackTagCompound.setInteger("Energy", energy); } - container.stackTagCompound.setInteger("Energy", energy); - } - public void setFull(ItemStack container) { - setEnergy(container, capacityRF); - } - - public boolean isAbsorbDamageWithPower(ItemStack is) { - NBTTagCompound root = is.getTagCompound(); - if(root == null) { - return false; + public void setFull(ItemStack container) { + setEnergy(container, capacityRF); } - return root.getBoolean("absorbWithPower"); - } - public void setAbsorbDamageWithPower(ItemStack is, boolean val) { - NBTTagCompound root = is.getTagCompound(); - if(root == null) { - root = new NBTTagCompound(); - is.setTagCompound(root); + public boolean isAbsorbDamageWithPower(ItemStack is) { + NBTTagCompound root = is.getTagCompound(); + if (root == null) { + return false; + } + return root.getBoolean("absorbWithPower"); } - root.setBoolean("absorbWithPower", val); - } + public void setAbsorbDamageWithPower(ItemStack is, boolean val) { + NBTTagCompound root = is.getTagCompound(); + if (root == null) { + root = new NBTTagCompound(); + is.setTagCompound(root); + } + root.setBoolean("absorbWithPower", val); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java index 3f4d3fcd..d6e9751e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java +++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java @@ -2,14 +2,9 @@ package crazypants.enderio.item.darksteel; public interface IDarkSteelItem { - int getIngotsRequiredForFullRepair(); + int getIngotsRequiredForFullRepair(); - public interface IEndSteelItem extends IDarkSteelItem { - - } - - public interface IStellarItem extends IEndSteelItem { - - } + public interface IEndSteelItem extends IDarkSteelItem {} + public interface IStellarItem extends IEndSteelItem {} } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 3c5832cc..f2156f08 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -1,29 +1,8 @@ package crazypants.enderio.item.darksteel; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.EnumHelper; -import thaumcraft.api.IGoggles; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.nodes.IRevealer; import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; @@ -41,6 +20,24 @@ import crazypants.enderio.item.darksteel.upgrade.NaturalistEyeUpgrade; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; +import java.util.Iterator; +import java.util.List; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.EnumHelper; +import thaumcraft.api.IGoggles; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; @InterfaceList({ @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @@ -49,283 +46,298 @@ import forestry.api.core.IArmorNaturalist; @Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry"), @Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry") }) -public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem, ISpecialArmor, IAdvancedTooltipProvider, IDarkSteelItem, IGoggles, - IRevealer, IVisDiscountGear, IArmorApiarist, IArmorNaturalist { +public class ItemDarkSteelArmor extends ItemArmor + implements IEnergyContainerItem, + ISpecialArmor, + IAdvancedTooltipProvider, + IDarkSteelItem, + IGoggles, + IRevealer, + IVisDiscountGear, + IArmorApiarist, + IArmorNaturalist { - public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 35, new int[] { 2, 6, 5, 2 }, 15); + public static final ArmorMaterial MATERIAL = + EnumHelper.addArmorMaterial("darkSteel", 35, new int[] {2, 6, 5, 2}, 15); - public static final int[] CAPACITY = new int[] { Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase * 2, - Config.darkSteelPowerStorageBase * 2 }; + public static final int[] CAPACITY = new int[] { + Config.darkSteelPowerStorageBase, + Config.darkSteelPowerStorageBase, + Config.darkSteelPowerStorageBase * 2, + Config.darkSteelPowerStorageBase * 2 + }; - public static final int[] RF_PER_DAMAGE_POINT = new int[] { Config.darkSteelPowerStorageBase, Config.darkSteelPowerStorageBase, - Config.darkSteelPowerStorageBase * 2, - Config.darkSteelPowerStorageBase * 2 }; + public static final int[] RF_PER_DAMAGE_POINT = new int[] { + Config.darkSteelPowerStorageBase, + Config.darkSteelPowerStorageBase, + Config.darkSteelPowerStorageBase * 2, + Config.darkSteelPowerStorageBase * 2 + }; - public static final String[] NAMES = new String[] { "helmet", "chestplate", "leggings", "boots" }; + public static final String[] NAMES = new String[] {"helmet", "chestplate", "leggings", "boots"}; - boolean gogglesUgradeActive = true; + boolean gogglesUgradeActive = true; - static { - FMLCommonHandler.instance().bus().register(DarkSteelController.instance); - MinecraftForge.EVENT_BUS.register(DarkSteelController.instance); - MinecraftForge.EVENT_BUS.register(DarkSteelRecipeManager.instance); - } - - public static ItemDarkSteelArmor forArmorType(int armorType) { - switch (armorType) { - case 0: - return DarkSteelItems.itemDarkSteelHelmet; - case 1: - return DarkSteelItems.itemDarkSteelChestplate; - case 2: - return DarkSteelItems.itemDarkSteelLeggings; - case 3: - return DarkSteelItems.itemDarkSteelBoots; - } - return null; - } - - public static int getPoweredProtectionIncrease(int armorType) { - switch (armorType) { - case 0: - return 1; - case 1: - return 2; - case 2: - case 3: - return 1; - } - return 0; - } - - public static ItemDarkSteelArmor create(int armorType) { - ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); - res.init(); - return res; - } - - protected int powerPerDamagePoint; - protected String name; - - public ItemDarkSteelArmor(int armorType) { - this(MATERIAL, "darkSteel", armorType); - powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getDurability(armorType); - - } - - public ItemDarkSteelArmor(ArmorMaterial mat, String name, int armorType) { - super(mat, 0, armorType); - this.name = name; - setCreativeTab(EnderIOTab.tabEnderIO); - String str = name + "_" + NAMES[armorType]; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN+ ":" + str); - - } - - protected void init() { - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - - Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); - while (iter.hasNext()) { - IDarkSteelUpgrade upgrade = iter.next(); - if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { - upgrade.writeToItem(is); - } + static { + FMLCommonHandler.instance().bus().register(DarkSteelController.instance); + MinecraftForge.EVENT_BUS.register(DarkSteelController.instance); + MinecraftForge.EVENT_BUS.register(DarkSteelRecipeManager.instance); } - par3List.add(is); - } - - @Override - public int getIngotsRequiredForFullRepair() { - switch (armorType) { - case 0: - return 5;//EnderIO.itemDarkSteelHelmet; - case 1: - return 8;//EnderIO.itemDarkSteelChestplate; - case 2: - return 7;//EnderIO.itemDarkSteelLeggings; - case 3: - return 4;//EnderIO.itemDarkSteelBoots; + public static ItemDarkSteelArmor forArmorType(int armorType) { + switch (armorType) { + case 0: + return DarkSteelItems.itemDarkSteelHelmet; + case 1: + return DarkSteelItems.itemDarkSteelChestplate; + case 2: + return DarkSteelItems.itemDarkSteelLeggings; + case 3: + return DarkSteelItems.itemDarkSteelBoots; + } + return null; } - return 4; - } - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Config.addDurabilityTootip) { - list.add(ItemUtil.getDurabilityString(itemstack)); + public static int getPoweredProtectionIncrease(int armorType) { + switch (armorType) { + case 0: + return 1; + case 1: + return 2; + case 2: + case 3: + return 1; + } + return 0; } - String str = EnergyUpgrade.getStoredEnergyString(itemstack); - if(str != null) { - list.add(str); + + public static ItemDarkSteelArmor create(int armorType) { + ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); + res.init(); + return res; } - if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line2")); - if(DarkSteelItems.isArmorPart(itemstack.getItem(), 3)) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line2")); - } + + protected int powerPerDamagePoint; + protected String name; + + public ItemDarkSteelArmor(int armorType) { + this(MATERIAL, "darkSteel", armorType); + powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getDurability(armorType); } - DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); - } - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @Override - public String getArmorTexture(ItemStack itemStack, Entity entity, int slot, String layer) { - if(armorType == 2) { - return "enderio:textures/models/armor/"+name+"_layer_2.png"; + public ItemDarkSteelArmor(ArmorMaterial mat, String name, int armorType) { + super(mat, 0, armorType); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name + "_" + NAMES[armorType]; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN + ":" + str); } - return "enderio:textures/models/armor/"+name+"_layer_1.png"; - } - public ItemStack createItemStack() { - return new ItemStack(this); - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if(source.isUnblockable()) { - return new ArmorProperties(0, 0, armor.getMaxDamage() + 1 - armor.getItemDamage()); + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); } - double damageRatio = damageReduceAmount + (getEnergyStored(armor) > 0 ? getPoweredProtectionIncrease(3 - slot) : 0); - damageRatio /= 25D; - ArmorProperties ap = new ArmorProperties(0, damageRatio, armor.getMaxDamage() + 1 - armor.getItemDamage()); - return ap; - } - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - ItemDarkSteelArmor arm = forArmorType(3 - slot); - int powerBonus = getEnergyStored(armor) > 0 ? getPoweredProtectionIncrease(3 - slot) : 0; - return arm.getArmorMaterial().getDamageReductionAmount(3 - slot) + powerBonus; - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); + EnergyUpgrade.setPowerFull(is); - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(damage * powerPerDamagePoint, false); + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); + while (iter.hasNext()) { + IDarkSteelUpgrade upgrade = iter.next(); + if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { + upgrade.writeToItem(is); + } + } - } else { - stack.damageItem(damage, entity); + par3List.add(is); } - if(eu != null) { - eu.writeToItem(stack); + + @Override + public int getIngotsRequiredForFullRepair() { + switch (armorType) { + case 0: + return 5; // EnderIO.itemDarkSteelHelmet; + case 1: + return 8; // EnderIO.itemDarkSteelChestplate; + case 2: + return 7; // EnderIO.itemDarkSteelLeggings; + case 3: + return 4; // EnderIO.itemDarkSteelBoots; + } + return 4; } - } - @Override - public boolean getIsRepairable(ItemStack i1, ItemStack i2) { - return false; - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); - } - - @Override - public int getEnergyStored(ItemStack container) { - return EnergyUpgrade.getEnergyStored(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return EnergyUpgrade.getMaxEnergyStored(container); - } - - //Thaumcraft - - @Override - @Method(modid = "Thaumcraft") - public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - if(itemstack == null || itemstack.getItem() == null || !gogglesUgradeActive) { - return false; + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); } - return GogglesOfRevealingUpgrade.loadFromItem(itemstack) != null; - } - - @Override - @Method(modid = "Thaumcraft") - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - if(itemstack == null || itemstack.getItem() == null || !gogglesUgradeActive) { - return false; + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); } - return GogglesOfRevealingUpgrade.loadFromItem(itemstack) != null; - } - @Override - @Method(modid = "Thaumcraft") - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { - return 0; + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (!Config.addDurabilityTootip) { + list.add(ItemUtil.getDurabilityString(itemstack)); + } + String str = EnergyUpgrade.getStoredEnergyString(itemstack); + if (str != null) { + list.add(str); + } + if (EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_armor.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_armor.tooltip.line2")); + if (DarkSteelItems.isArmorPart(itemstack.getItem(), 3)) { + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_boots.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_boots.tooltip.line2")); + } + } + DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } - return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0; - } - public boolean isGogglesUgradeActive() { - return gogglesUgradeActive; - } - - public void setGogglesUgradeActive(boolean gogglesUgradeActive) { - this.gogglesUgradeActive = gogglesUgradeActive; - } - - // Forestry - - @Override - public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) { - return ApiaristArmorUpgrade.loadFromItem(armor) != null; - } - - @Override - @Method(modid = "Forestry") - public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { - return ApiaristArmorUpgrade.loadFromItem(armor) != null; - } - - @Override - @Method(modid = "Forestry") - public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { - if(armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) { - return false; + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + + @Override + public String getArmorTexture(ItemStack itemStack, Entity entity, int slot, String layer) { + if (armorType == 2) { + return "enderio:textures/models/armor/" + name + "_layer_2.png"; + } + return "enderio:textures/models/armor/" + name + "_layer_1.png"; + } + + public ItemStack createItemStack() { + return new ItemStack(this); + } + + @Override + public ArmorProperties getProperties( + EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new ArmorProperties(0, 0, armor.getMaxDamage() + 1 - armor.getItemDamage()); + } + double damageRatio = + damageReduceAmount + (getEnergyStored(armor) > 0 ? getPoweredProtectionIncrease(3 - slot) : 0); + damageRatio /= 25D; + ArmorProperties ap = new ArmorProperties(0, damageRatio, armor.getMaxDamage() + 1 - armor.getItemDamage()); + return ap; + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + ItemDarkSteelArmor arm = forArmorType(3 - slot); + int powerBonus = getEnergyStored(armor) > 0 ? getPoweredProtectionIncrease(3 - slot) : 0; + return arm.getArmorMaterial().getDamageReductionAmount(3 - slot) + powerBonus; + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if (eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(damage * powerPerDamagePoint, false); + + } else { + stack.damageItem(damage, entity); + } + if (eu != null) { + eu.writeToItem(stack); + } + } + + @Override + public boolean getIsRepairable(ItemStack i1, ItemStack i2) { + return false; + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); + } + + @Override + public int getEnergyStored(ItemStack container) { + return EnergyUpgrade.getEnergyStored(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EnergyUpgrade.getMaxEnergyStored(container); + } + + // Thaumcraft + + @Override + @Method(modid = "Thaumcraft") + public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { + if (itemstack == null || itemstack.getItem() == null || !gogglesUgradeActive) { + return false; + } + return GogglesOfRevealingUpgrade.loadFromItem(itemstack) != null; + } + + @Override + @Method(modid = "Thaumcraft") + public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { + if (itemstack == null || itemstack.getItem() == null || !gogglesUgradeActive) { + return false; + } + return GogglesOfRevealingUpgrade.loadFromItem(itemstack) != null; + } + + @Override + @Method(modid = "Thaumcraft") + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { + return 0; + } + return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0; + } + + public boolean isGogglesUgradeActive() { + return gogglesUgradeActive; + } + + public void setGogglesUgradeActive(boolean gogglesUgradeActive) { + this.gogglesUgradeActive = gogglesUgradeActive; + } + + // Forestry + + @Override + public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) { + return ApiaristArmorUpgrade.loadFromItem(armor) != null; + } + + @Override + @Method(modid = "Forestry") + public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { + return ApiaristArmorUpgrade.loadFromItem(armor) != null; + } + + @Override + @Method(modid = "Forestry") + public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { + if (armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) { + return false; + } + return NaturalistEyeUpgrade.isUpgradeEquipped(player); } - return NaturalistEyeUpgrade.isUpgradeEquipped(player); - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 4aeb5913..dba66f3a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -1,10 +1,23 @@ package crazypants.enderio.item.darksteel; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.machine.farm.farmers.HarvestResult; +import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -23,296 +36,302 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.oredict.OreDictionary; -import cofh.api.energy.IEnergyContainerItem; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ItemUtil; +public class ItemDarkSteelAxe extends ItemAxe + implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; -import crazypants.enderio.machine.farm.farmers.HarvestResult; -import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; - -public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { - - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() instanceof ItemDarkSteelAxe; - } - - public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { - return getStoredPower(player) > requiredPower; - } - - public static int getStoredPower(EntityPlayer player) { - if(!isEquipped(player)) { - return 0; - } - return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()); - } - - public static ItemDarkSteelAxe create() { - ItemDarkSteelAxe res = new ItemDarkSteelAxe(); - MinecraftForge.EVENT_BUS.register(res); - res.init(); - return res; - } - - protected int logOreId = -1; - protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); - protected String name; - - - protected ItemDarkSteelAxe() { - this("darkSteel",ItemDarkSteelSword.MATERIAL); - } - - protected ItemDarkSteelAxe(String name, ToolMaterial mat) { - super(mat); - this.name = name; - setCreativeTab(EnderIOTab.tabEnderIO); - String str = name+"_axe"; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN + ":" + str); - } - - @Override - public int getIngotsRequiredForFullRepair() { - return 3; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - par3List.add(is); - } - - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @Override - public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer player) { - if (!player.worldObj.isRemote && player.isSneaking()) { - Block block = player.worldObj.getBlock(X, Y, Z); - int blockMetadata = player.worldObj.getBlockMetadata(X, Y, Z); - if (isLog(block, blockMetadata)) { - int powerStored = EnergyUpgrade.getEnergyStored(itemstack); - - TreeHarvestUtil harvester = new TreeHarvestUtil(); - HarvestResult res = new HarvestResult(); - BlockCoord bc = new BlockCoord(X, Y, Z); - harvester.harvest(player.worldObj, bc, res); - - List sortedTargets = new ArrayList(res.getHarvestedBlocks()); - harvestComparator.refPoint = bc; - Collections.sort(sortedTargets, harvestComparator); - - int maxBlocks = powerStored / Config.darkSteelAxePowerUsePerDamagePointMultiHarvest; - int numUsedPower = 0; - for (int i = 0; numUsedPower < maxBlocks && i < sortedTargets.size(); i++) { - if (doMultiHarvest(player, player.worldObj, sortedTargets.get(i), block, blockMetadata % 4)) { - numUsedPower++; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; } - return numUsedPower != 0; - } - } - return false; - } - - private boolean doMultiHarvest(EntityPlayer player, World worldObj, BlockCoord bc, Block refBlock, int refMeta) { - - Block block = worldObj.getBlock(bc.x, bc.y, bc.z); - int meta = worldObj.getBlockMetadata(bc.x, bc.y, bc.z); - ItemStack held = player.getCurrentEquippedItem(); - - ArrayList itemDrops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, 0); - float chance = ForgeEventFactory.fireBlockHarvesting(itemDrops, worldObj, refBlock, bc.x, bc.y, bc.z, refMeta, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, held), 1, - EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, held) != 0, player); - - worldObj.setBlockToAir(bc.x, bc.y, bc.z); - boolean usedPower = false; - if (itemDrops != null) { - for (ItemStack stack : itemDrops) { - if (worldObj.rand.nextFloat() <= chance) { - worldObj.spawnEntityInWorld(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); - if (TreeHarvestUtil.canDropApples(block, meta)) { - if (worldObj.rand.nextInt(200) == 0) { - worldObj.spawnEntityInWorld(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); - } - } else if (block == refBlock) { // other wise leaves - extractEnergy(held, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest, false); - usedPower = true; - } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; } - } + return equipped.getItem() instanceof ItemDarkSteelAxe; } - return usedPower; - } - @SubscribeEvent - public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { - if(evt.entityPlayer.isSneaking() && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) && isLog(evt.block, evt.metadata)) { - evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; + public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { + return getStoredPower(player) > requiredPower; } - if(isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) { - evt.newSpeed = 6; + + public static int getStoredPower(EntityPlayer player) { + if (!isEquipped(player)) { + return 0; + } + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()); } - } - @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if (world.isRemote) { - return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + public static ItemDarkSteelAxe create() { + ItemDarkSteelAxe res = new ItemDarkSteelAxe(); + MinecraftForge.EVENT_BUS.register(res); + res.init(); + return res; } - return false; - } - @Override - public void setDamage(ItemStack stack, int newDamage) { - int oldDamage = getDamage(stack); - if (newDamage <= oldDamage) { - super.setDamage(stack, newDamage); - } else { - int damage = newDamage - oldDamage; + protected int logOreId = -1; + protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + protected String name; - if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelAxePowerUsePerDamagePoint)) { - super.setDamage(stack, newDamage); - } + protected ItemDarkSteelAxe() { + this("darkSteel", ItemDarkSteelSword.MATERIAL); } - } - private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(amount, false); - eu.writeToItem(stack); - return true; - } else { - return false; + protected ItemDarkSteelAxe(String name, ToolMaterial mat) { + super(mat); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name + "_axe"; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN + ":" + str); } - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if(ForgeHooks.isToolEffective(stack, block, meta)) { - if(Config.darkSteelPickPowerUsePerDamagePoint <= 0 || getEnergyStored(stack) > 0) { - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + Config.darkSteelAxeEffeciencyBoostWhenPowered; - } - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); - } - return super.getDigSpeed(stack, block, meta); - } - - private boolean isLog(Block block, int meta) { - if(logOreId == -1) { - logOreId = OreDictionary.getOreID("logWood"); - } - int targetOreId = OreDictionary.getOreID(new ItemStack(block, 1, meta)); - //NB: Specifying the wildcard as meta is a work around for forge issue #1103 - int workAroundId = OreDictionary.getOreID(new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); - return targetOreId == logOreId || workAroundId == logOreId; - } - - protected void init() { - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); - } - - @Override - public int getEnergyStored(ItemStack container) { - return EnergyUpgrade.getEnergyStored(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return EnergyUpgrade.getMaxEnergyStored(container); - } - - @Override - public boolean getIsRepairable(ItemStack i1, ItemStack i2) { - //return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); - return false; - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Config.addDurabilityTootip) { - list.add(ItemUtil.getDurabilityString(itemstack)); - } - String str = EnergyUpgrade.getStoredEnergyString(itemstack); - if(str != null) { - list.add(str); - } - if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnderIO.lang.localize("item."+name+"_axe.tooltip.multiHarvest")); - list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelAxeEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); - } - DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); - } - - public ItemStack createItemStack() { - return new ItemStack(this); - } - - private static class MultiHarvestComparator implements Comparator { - - BlockCoord refPoint; @Override - public int compare(BlockCoord arg0, BlockCoord arg1) { - int d1 = refPoint.getDistSq(arg0); - int d2 = refPoint.getDistSq(arg1); - return compare(d1, d1); + public int getIngotsRequiredForFullRepair() { + return 3; } - //NB: Copy of Integer.compare, which i sonly in Java 1.7+ - public static int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + par3List.add(is); } - } + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer player) { + if (!player.worldObj.isRemote && player.isSneaking()) { + Block block = player.worldObj.getBlock(X, Y, Z); + int blockMetadata = player.worldObj.getBlockMetadata(X, Y, Z); + if (isLog(block, blockMetadata)) { + int powerStored = EnergyUpgrade.getEnergyStored(itemstack); + + TreeHarvestUtil harvester = new TreeHarvestUtil(); + HarvestResult res = new HarvestResult(); + BlockCoord bc = new BlockCoord(X, Y, Z); + harvester.harvest(player.worldObj, bc, res); + + List sortedTargets = new ArrayList(res.getHarvestedBlocks()); + harvestComparator.refPoint = bc; + Collections.sort(sortedTargets, harvestComparator); + + int maxBlocks = powerStored / Config.darkSteelAxePowerUsePerDamagePointMultiHarvest; + int numUsedPower = 0; + for (int i = 0; numUsedPower < maxBlocks && i < sortedTargets.size(); i++) { + if (doMultiHarvest(player, player.worldObj, sortedTargets.get(i), block, blockMetadata % 4)) { + numUsedPower++; + } + } + return numUsedPower != 0; + } + } + return false; + } + + private boolean doMultiHarvest(EntityPlayer player, World worldObj, BlockCoord bc, Block refBlock, int refMeta) { + + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + int meta = worldObj.getBlockMetadata(bc.x, bc.y, bc.z); + ItemStack held = player.getCurrentEquippedItem(); + + ArrayList itemDrops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, 0); + float chance = ForgeEventFactory.fireBlockHarvesting( + itemDrops, + worldObj, + refBlock, + bc.x, + bc.y, + bc.z, + refMeta, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, held), + 1, + EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, held) != 0, + player); + + worldObj.setBlockToAir(bc.x, bc.y, bc.z); + boolean usedPower = false; + if (itemDrops != null) { + for (ItemStack stack : itemDrops) { + if (worldObj.rand.nextFloat() <= chance) { + worldObj.spawnEntityInWorld( + new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + if (TreeHarvestUtil.canDropApples(block, meta)) { + if (worldObj.rand.nextInt(200) == 0) { + worldObj.spawnEntityInWorld(new EntityItem( + worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); + } + } else if (block == refBlock) { // other wise leaves + extractEnergy(held, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest, false); + usedPower = true; + } + } + } + } + return usedPower; + } + + @SubscribeEvent + public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { + if (evt.entityPlayer.isSneaking() + && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelAxePowerUsePerDamagePointMultiHarvest) + && isLog(evt.block, evt.metadata)) { + evt.newSpeed = evt.originalSpeed / Config.darkSteelAxeSpeedPenaltyMultiHarvest; + } + if (isEquipped(evt.entityPlayer) && evt.block.getMaterial() == Material.leaves) { + evt.newSpeed = 6; + } + } + + @Override + public boolean onItemUse( + ItemStack item, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + if (world.isRemote) { + return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + } + return false; + } + + @Override + public void setDamage(ItemStack stack, int newDamage) { + int oldDamage = getDamage(stack); + if (newDamage <= oldDamage) { + super.setDamage(stack, newDamage); + } else { + int damage = newDamage - oldDamage; + + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelAxePowerUsePerDamagePoint)) { + super.setDamage(stack, newDamage); + } + } + } + + private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if (eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(amount, false); + eu.writeToItem(stack); + return true; + } else { + return false; + } + } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (ForgeHooks.isToolEffective(stack, block, meta)) { + if (Config.darkSteelPickPowerUsePerDamagePoint <= 0 || getEnergyStored(stack) > 0) { + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + + Config.darkSteelAxeEffeciencyBoostWhenPowered; + } + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); + } + return super.getDigSpeed(stack, block, meta); + } + + private boolean isLog(Block block, int meta) { + if (logOreId == -1) { + logOreId = OreDictionary.getOreID("logWood"); + } + int targetOreId = OreDictionary.getOreID(new ItemStack(block, 1, meta)); + // NB: Specifying the wildcard as meta is a work around for forge issue #1103 + int workAroundId = OreDictionary.getOreID(new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE)); + return targetOreId == logOreId || workAroundId == logOreId; + } + + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); + } + + @Override + public int getEnergyStored(ItemStack container) { + return EnergyUpgrade.getEnergyStored(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EnergyUpgrade.getMaxEnergyStored(container); + } + + @Override + public boolean getIsRepairable(ItemStack i1, ItemStack i2) { + // return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (!Config.addDurabilityTootip) { + list.add(ItemUtil.getDurabilityString(itemstack)); + } + String str = EnergyUpgrade.getStoredEnergyString(itemstack); + if (str != null) { + list.add(str); + } + if (EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnderIO.lang.localize("item." + name + "_axe.tooltip.multiHarvest")); + list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelAxeEffeciencyBoostWhenPowered + " " + + EnderIO.lang.localize("item." + name + "_pickaxe.tooltip.effPowered")); + } + DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); + } + + public ItemStack createItemStack() { + return new ItemStack(this); + } + + private static class MultiHarvestComparator implements Comparator { + + BlockCoord refPoint; + + @Override + public int compare(BlockCoord arg0, BlockCoord arg1) { + int d1 = refPoint.getDistSq(arg0); + int d2 = refPoint.getDistSq(arg1); + return compare(d1, d1); + } + + // NB: Copy of Integer.compare, which i sonly in Java 1.7+ + public static int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 2f50d355..4ba06db9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -1,8 +1,24 @@ package crazypants.enderio.item.darksteel; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.common.util.ItemUtil; +import com.google.common.collect.Sets; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade; +import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.teleport.TravelController; import java.util.List; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -17,330 +33,330 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import cofh.api.energy.IEnergyContainerItem; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.common.util.ItemUtil; -import com.google.common.collect.Sets; +public class ItemDarkSteelPickaxe extends ItemPickaxe + implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.api.teleport.IItemOfTravel; -import crazypants.enderio.api.teleport.TravelSource; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; -import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade; -import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.teleport.TravelController; - -public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { - - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() instanceof ItemDarkSteelPickaxe; } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; + + public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { + if (!isEquipped(player)) { + return false; + } + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; } - return equipped.getItem() instanceof ItemDarkSteelPickaxe; - } - public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { - if(!isEquipped(player)) { - return false; + public static ItemDarkSteelPickaxe create() { + ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; } - return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; - } - public static ItemDarkSteelPickaxe create() { - ItemDarkSteelPickaxe res = new ItemDarkSteelPickaxe(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + private long lastBlickTick = -1; + protected String name; - private long lastBlickTick = -1; - protected String name; - - public ItemDarkSteelPickaxe(String name, ToolMaterial mat) { - super(mat); - this.name = name; - setCreativeTab(EnderIOTab.tabEnderIO); - String str = name+"_pickaxe"; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN + ":" + str); - } - - public ItemDarkSteelPickaxe(){ - this("darkSteel",ItemDarkSteelSword.MATERIAL); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - SpoonUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } - - @Override - public int getIngotsRequiredForFullRepair() { - return 3; - } - - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @Override - public boolean onBlockDestroyed(ItemStack item, World world, Block block, int x, int y, int z, EntityLivingBase entLiving) { - if(block.getBlockHardness(world, x, y, z) != 0.0D) { - if(useObsidianEffeciency(item, block)) { - extractEnergy(item, Config.darkSteelPickPowerUseObsidian, false); - } + public ItemDarkSteelPickaxe(String name, ToolMaterial mat) { + super(mat); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name + "_pickaxe"; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN + ":" + str); + } + + public ItemDarkSteelPickaxe() { + this("darkSteel", ItemDarkSteelSword.MATERIAL); } - return super.onBlockDestroyed(item, world, block, x, y, z, entLiving); - } @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World world, - int x, int y, int z, int side, float par8, float par9, float par10) { - if (!isTravelUpgradeActive(player, item) && world.isRemote) { - return doRightClickItemPlace(player, world, x, y, z, side, par8, - par9, par10); - } - return false; + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + SpoonUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } + + @Override + public int getIngotsRequiredForFullRepair() { + return 3; + } + + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + + @Override + public boolean onBlockDestroyed( + ItemStack item, World world, Block block, int x, int y, int z, EntityLivingBase entLiving) { + if (block.getBlockHardness(world, x, y, z) != 0.0D) { + if (useObsidianEffeciency(item, block)) { + extractEnergy(item, Config.darkSteelPickPowerUseObsidian, false); + } + } + return super.onBlockDestroyed(item, world, block, x, y, z, entLiving); + } + + @Override + public boolean onItemUse( + ItemStack item, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + if (!isTravelUpgradeActive(player, item) && world.isRemote) { + return doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + } + return false; } @SideOnly(Side.CLIENT) - static boolean doRightClickItemPlace(EntityPlayer player, World world, - int x, int y, int z, int side, float par8, float par9, float par10) { - int current = player.inventory.currentItem; - int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; - if (slot < 9 - && player.inventory.mainInventory[slot] != null - && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - /* - * this will not work with buckets unless we don't switch back to - * the current item (the pick); there's probably some client <-> - * server event thing going on with buckets, so our item-switch - * within the same tick would be a problem. - */ - player.inventory.currentItem = slot; - Minecraft mc = Minecraft.getMinecraft(); - boolean result = mc.playerController.onPlayerRightClick( - mc.thePlayer, mc.theWorld, - player.inventory.mainInventory[slot], - mc.objectMouseOver.blockX, mc.objectMouseOver.blockY, - mc.objectMouseOver.blockZ, mc.objectMouseOver.sideHit, - mc.objectMouseOver.hitVec); - player.inventory.currentItem = current; - return (result); - } - return false; - } - - @Override - public void setDamage(ItemStack stack, int newDamage) { - int oldDamage = getDamage(stack); - if (newDamage <= oldDamage) { - super.setDamage(stack, newDamage); - } else { - int damage = newDamage - oldDamage; - - if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelPickPowerUsePerDamagePoint)) { - super.setDamage(stack, newDamage); - } - } - } - - private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(amount, false); - eu.writeToItem(stack); - return true; - } else { - return false; - } - } - - - @Override - public boolean canHarvestBlock(Block block, ItemStack item) { - if(hasSpoonUpgrade(item) && getEnergyStored(item) > 0) { - return block == Blocks.snow_layer ? true : block == Blocks.snow || super.canHarvestBlock(block, item); - } else { - return super.canHarvestBlock(block, item); - } - } - - private boolean hasSpoonUpgrade(ItemStack item) { - return SpoonUpgrade.loadFromItem(item) != null; - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if(useObsidianEffeciency(stack, block)) { - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + Config.darkSteelPickEffeciencyBoostWhenPowered - + Config.darkSteelPickEffeciencyObsidian; - } - if(ForgeHooks.isToolEffective(stack, block, meta)) { - if(Config.darkSteelPickPowerUsePerDamagePoint <= 0 || getEnergyStored(stack) > 0) { - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + Config.darkSteelPickEffeciencyBoostWhenPowered; - } - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); - } - return super.getDigSpeed(stack, block, meta); - } - - @Override - public float func_150893_a(ItemStack item, Block block) { - if(block.getMaterial() == Material.glass) { - return efficiencyOnProperMaterial; - } - return super.func_150893_a(item, block); - } - - private boolean useObsidianEffeciency(ItemStack item, Block block) { - boolean useObsidianSpeed = false; - int energy = getEnergyStored(item); - if(energy > Config.darkSteelPickPowerUseObsidian) { - useObsidianSpeed = block == Blocks.obsidian; - if(!useObsidianSpeed && Config.darkSteelPickApplyObsidianEffeciencyAtHardess > 0) { - try { - useObsidianSpeed = (block != null && block.getBlockHardness(null, -1, -1, -1) >= Config.darkSteelPickApplyObsidianEffeciencyAtHardess); - } catch (Exception e) { - //given we are passing in a null world to getBlockHardness it is possible this could cause an NPE, so just ignore it + static boolean doRightClickItemPlace( + EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { + int current = player.inventory.currentItem; + int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; + if (slot < 9 + && player.inventory.mainInventory[slot] != null + && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + /* + * this will not work with buckets unless we don't switch back to + * the current item (the pick); there's probably some client <-> + * server event thing going on with buckets, so our item-switch + * within the same tick would be a problem. + */ + player.inventory.currentItem = slot; + Minecraft mc = Minecraft.getMinecraft(); + boolean result = mc.playerController.onPlayerRightClick( + mc.thePlayer, + mc.theWorld, + player.inventory.mainInventory[slot], + mc.objectMouseOver.blockX, + mc.objectMouseOver.blockY, + mc.objectMouseOver.blockZ, + mc.objectMouseOver.sideHit, + mc.objectMouseOver.hitVec); + player.inventory.currentItem = current; + return (result); } - } + return false; } - return useObsidianSpeed; - } - @Override - public Set getToolClasses(ItemStack stack) { - Set set = Sets.newHashSet("pickaxe"); - if(hasSpoonUpgrade(stack)) { - set.add("shovel"); - } - return set; - } + @Override + public void setDamage(ItemStack stack, int newDamage) { + int oldDamage = getDamage(stack); + if (newDamage <= oldDamage) { + super.setDamage(stack, newDamage); + } else { + int damage = newDamage - oldDamage; - protected void init() { - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); - } - - @Override - public int getEnergyStored(ItemStack container) { - return EnergyUpgrade.getEnergyStored(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return EnergyUpgrade.getMaxEnergyStored(container); - } - - @Override - public boolean getIsRepairable(ItemStack i1, ItemStack i2) { - return false; - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Config.addDurabilityTootip) { - list.add(ItemUtil.getDurabilityString(itemstack)); - } - String str = EnergyUpgrade.getStoredEnergyString(itemstack); - if(str != null) { - list.add(str); - } - if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); - list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyObsidian + " " - + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effObs") + " "); - list.add(EnumChatFormatting.WHITE + " " + "(" + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.cost") + " " - + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian) + " " - + PowerDisplayUtil.abrevation() + ")"); - } - DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); - } - - public ItemStack createItemStack() { - return new ItemStack(this); - } - - @Override - public boolean isActive(EntityPlayer ep, ItemStack equipped) { - return isTravelUpgradeActive(ep, equipped); - } - - @Override - public void extractInternal(ItemStack equipped, int power) { - extractEnergy(equipped, power, false); - } - - private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { - return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; - } - - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(isTravelUpgradeActive(player, stack)) { - if(world.isRemote) { - if(TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) { - player.swingItem(); - return stack; + if (!absorbDamageWithEnergy(stack, damage * Config.darkSteelPickPowerUsePerDamagePoint)) { + super.setDamage(stack, newDamage); + } } - } - - long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; - if(ticksSinceBlink < 0) { - lastBlickTick = -1; - } - if(Config.travelStaffBlinkEnabled && world.isRemote && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { - if(TravelController.instance.doBlink(stack, player)) { - player.swingItem(); - lastBlickTick = EnderIO.proxy.getTickCount(); - } - } - return stack; } - return super.onItemRightClick(stack, world, player); - } + private boolean absorbDamageWithEnergy(ItemStack stack, int amount) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if (eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(amount, false); + eu.writeToItem(stack); + return true; + } else { + return false; + } + } + @Override + public boolean canHarvestBlock(Block block, ItemStack item) { + if (hasSpoonUpgrade(item) && getEnergyStored(item) > 0) { + return block == Blocks.snow_layer ? true : block == Blocks.snow || super.canHarvestBlock(block, item); + } else { + return super.canHarvestBlock(block, item); + } + } + + private boolean hasSpoonUpgrade(ItemStack item) { + return SpoonUpgrade.loadFromItem(item) != null; + } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (useObsidianEffeciency(stack, block)) { + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + + Config.darkSteelPickEffeciencyBoostWhenPowered + + Config.darkSteelPickEffeciencyObsidian; + } + if (ForgeHooks.isToolEffective(stack, block, meta)) { + if (Config.darkSteelPickPowerUsePerDamagePoint <= 0 || getEnergyStored(stack) > 0) { + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + + Config.darkSteelPickEffeciencyBoostWhenPowered; + } + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); + } + return super.getDigSpeed(stack, block, meta); + } + + @Override + public float func_150893_a(ItemStack item, Block block) { + if (block.getMaterial() == Material.glass) { + return efficiencyOnProperMaterial; + } + return super.func_150893_a(item, block); + } + + private boolean useObsidianEffeciency(ItemStack item, Block block) { + boolean useObsidianSpeed = false; + int energy = getEnergyStored(item); + if (energy > Config.darkSteelPickPowerUseObsidian) { + useObsidianSpeed = block == Blocks.obsidian; + if (!useObsidianSpeed && Config.darkSteelPickApplyObsidianEffeciencyAtHardess > 0) { + try { + useObsidianSpeed = (block != null + && block.getBlockHardness(null, -1, -1, -1) + >= Config.darkSteelPickApplyObsidianEffeciencyAtHardess); + } catch (Exception e) { + // given we are passing in a null world to getBlockHardness it is possible this could cause an NPE, + // so just ignore it + } + } + } + return useObsidianSpeed; + } + + @Override + public Set getToolClasses(ItemStack stack) { + Set set = Sets.newHashSet("pickaxe"); + if (hasSpoonUpgrade(stack)) { + set.add("shovel"); + } + return set; + } + + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); + } + + @Override + public int getEnergyStored(ItemStack container) { + return EnergyUpgrade.getEnergyStored(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EnergyUpgrade.getMaxEnergyStored(container); + } + + @Override + public boolean getIsRepairable(ItemStack i1, ItemStack i2) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (!Config.addDurabilityTootip) { + list.add(ItemUtil.getDurabilityString(itemstack)); + } + String str = EnergyUpgrade.getStoredEnergyString(itemstack); + if (str != null) { + list.add(str); + } + if (EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " + + EnderIO.lang.localize("item." + name + "_pickaxe.tooltip.effPowered")); + list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyObsidian + " " + + EnderIO.lang.localize("item." + name + "_pickaxe.tooltip.effObs") + " "); + list.add(EnumChatFormatting.WHITE + " " + "(" + + EnderIO.lang.localize("item." + name + "_pickaxe.tooltip.cost") + " " + + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian) + " " + + PowerDisplayUtil.abrevation() + ")"); + } + DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); + } + + public ItemStack createItemStack() { + return new ItemStack(this); + } + + @Override + public boolean isActive(EntityPlayer ep, ItemStack equipped) { + return isTravelUpgradeActive(ep, equipped); + } + + @Override + public void extractInternal(ItemStack equipped, int power) { + extractEnergy(equipped, power, false); + } + + private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { + return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (isTravelUpgradeActive(player, stack)) { + if (world.isRemote) { + if (TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) { + player.swingItem(); + return stack; + } + } + + long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; + if (ticksSinceBlink < 0) { + lastBlickTick = -1; + } + if (Config.travelStaffBlinkEnabled + && world.isRemote + && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { + if (TravelController.instance.doBlink(stack, player)) { + player.swingItem(); + lastBlickTick = EnderIO.proxy.getTickCount(); + } + } + return stack; + } + + return super.onItemRightClick(stack, world, player); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index 85142091..175cd2e3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -1,10 +1,22 @@ package crazypants.enderio.item.darksteel; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.machine.farm.farmers.HarvestResult; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; import net.minecraft.creativetab.CreativeTabs; @@ -19,304 +31,301 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; -import cofh.api.energy.IEnergyContainerItem; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ItemUtil; +public class ItemDarkSteelShears extends ItemShears + implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; -import crazypants.enderio.machine.farm.farmers.HarvestResult; - -public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { - - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() instanceof ItemDarkSteelShears; - } - - public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { - return getStoredPower(player) > requiredPower; - } - - public static int getStoredPower(EntityPlayer player) { - if(!isEquipped(player)) { - return 0; - } - return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()); - } - - public static ItemDarkSteelShears create() { - ItemDarkSteelShears res = new ItemDarkSteelShears(); - MinecraftForge.EVENT_BUS.register(res); - res.init(); - return res; - } - - protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); - protected final EntityComparator entityComparator = new EntityComparator(); - protected String name; - - protected ItemDarkSteelShears(String name) { - super(); - this.name = name; - this.setMaxDamage(this.getMaxDamage() * Config.darkSteelShearsDurabilityFactor); - setCreativeTab(EnderIOTab.tabEnderIO); - String str = name+"_shears"; - setUnlocalizedName(str); - setTextureName("enderIO:" + str); - } - - protected ItemDarkSteelShears() { - this("darkSteel"); - } - - @Override - public int getIngotsRequiredForFullRepair() { - return 2; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - par3List.add(is); - } - - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @Override - public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { - if (player.worldObj.isRemote) { - return false; + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() instanceof ItemDarkSteelShears; } - int powerStored = getStoredPower(player); - if (powerStored < Config.darkSteelShearsPowerUsePerDamagePoint) { - return super.onBlockStartBreak(itemstack, x, y, z, player); + public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { + return getStoredPower(player) > requiredPower; } - Block block = player.worldObj.getBlock(x, y, z); - if (block instanceof IShearable && ((IShearable)block).isShearable(itemstack, player.worldObj, x, y, z)) { - BlockCoord bc = new BlockCoord(x, y, z); - HarvestResult res = new HarvestResult(null, bc); + public static int getStoredPower(EntityPlayer player) { + if (!isEquipped(player)) { + return 0; + } + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()); + } - for (int dx = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dx <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dx++) { - for (int dy = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dy <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dy++) { - for (int dz = -Config.darkSteelShearsBlockAreaBoostWhenPowered; dz <= Config.darkSteelShearsBlockAreaBoostWhenPowered; dz++) { - Block block2 = player.worldObj.getBlock(x+dx, y+dy, z+dz); - if (block2 instanceof IShearable && ((IShearable)block2).isShearable(itemstack, player.worldObj, x+dx, y+dy, z+dz)) { - res.getHarvestedBlocks().add(new BlockCoord(x+dx, y+dy, z+dz)); + public static ItemDarkSteelShears create() { + ItemDarkSteelShears res = new ItemDarkSteelShears(); + MinecraftForge.EVENT_BUS.register(res); + res.init(); + return res; + } + + protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + protected final EntityComparator entityComparator = new EntityComparator(); + protected String name; + + protected ItemDarkSteelShears(String name) { + super(); + this.name = name; + this.setMaxDamage(this.getMaxDamage() * Config.darkSteelShearsDurabilityFactor); + setCreativeTab(EnderIOTab.tabEnderIO); + String str = name + "_shears"; + setUnlocalizedName(str); + setTextureName("enderIO:" + str); + } + + protected ItemDarkSteelShears() { + this("darkSteel"); + } + + @Override + public int getIngotsRequiredForFullRepair() { + return 2; + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + par3List.add(is); + } + + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + if (player.worldObj.isRemote) { + return false; + } + + int powerStored = getStoredPower(player); + if (powerStored < Config.darkSteelShearsPowerUsePerDamagePoint) { + return super.onBlockStartBreak(itemstack, x, y, z, player); + } + + Block block = player.worldObj.getBlock(x, y, z); + if (block instanceof IShearable && ((IShearable) block).isShearable(itemstack, player.worldObj, x, y, z)) { + BlockCoord bc = new BlockCoord(x, y, z); + HarvestResult res = new HarvestResult(null, bc); + + for (int dx = -Config.darkSteelShearsBlockAreaBoostWhenPowered; + dx <= Config.darkSteelShearsBlockAreaBoostWhenPowered; + dx++) { + for (int dy = -Config.darkSteelShearsBlockAreaBoostWhenPowered; + dy <= Config.darkSteelShearsBlockAreaBoostWhenPowered; + dy++) { + for (int dz = -Config.darkSteelShearsBlockAreaBoostWhenPowered; + dz <= Config.darkSteelShearsBlockAreaBoostWhenPowered; + dz++) { + Block block2 = player.worldObj.getBlock(x + dx, y + dy, z + dz); + if (block2 instanceof IShearable + && ((IShearable) block2) + .isShearable(itemstack, player.worldObj, x + dx, y + dy, z + dz)) { + res.getHarvestedBlocks().add(new BlockCoord(x + dx, y + dy, z + dz)); + } + } + } + } + + List sortedTargets = new ArrayList(res.getHarvestedBlocks()); + harvestComparator.refPoint = bc; + Collections.sort(sortedTargets, harvestComparator); + + int maxBlocks = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint); + for (int i = 0; i < maxBlocks; i++) { + BlockCoord bc2 = sortedTargets.get(i); + super.onBlockStartBreak(itemstack, bc2.x, bc2.y, bc2.z, player); + if (bc2 != bc) { + player.worldObj.setBlockToAir(bc2.x, bc2.y, bc2.z); + } } - } } - } + return false; + } - List sortedTargets = new ArrayList(res.getHarvestedBlocks()); - harvestComparator.refPoint = bc; - Collections.sort(sortedTargets, harvestComparator); - - int maxBlocks = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint); - for (int i=0 ; i < maxBlocks ; i++) { - BlockCoord bc2 = sortedTargets.get(i); - super.onBlockStartBreak(itemstack, bc2.x, bc2.y, bc2.z, player); - if (bc2 != bc) { - player.worldObj.setBlockToAir(bc2.x, bc2.y, bc2.z); + IEntitySelector selectShearable = new IEntitySelector() { + @Override + public boolean isEntityApplicable(Entity entity) { + return entity instanceof IShearable + && ((IShearable) entity) + .isShearable( + null, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ); } - } - - } - return false; - } - - IEntitySelector selectShearable = new IEntitySelector() { - @Override - public boolean isEntityApplicable(Entity entity) { - return entity instanceof IShearable && ((IShearable)entity).isShearable(null, entity.worldObj, (int)entity.posX, (int)entity.posY, (int)entity.posZ); - } - }; - - @Override - public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) { - if (entity.worldObj.isRemote) { - return false; - } - - int powerStored = getStoredPower(player); - if (powerStored < Config.darkSteelShearsPowerUsePerDamagePoint) { - return super.itemInteractionForEntity(itemstack, player, entity); - } - - if (entity instanceof IShearable) { - AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( - entity.posX - Config.darkSteelShearsEntityAreaBoostWhenPowered, entity.posY - Config.darkSteelShearsEntityAreaBoostWhenPowered, entity.posZ - Config.darkSteelShearsEntityAreaBoostWhenPowered, - entity.posX + Config.darkSteelShearsEntityAreaBoostWhenPowered, entity.posY + Config.darkSteelShearsEntityAreaBoostWhenPowered, entity.posZ + Config.darkSteelShearsEntityAreaBoostWhenPowered); - List sortedTargets = new ArrayList(entity.worldObj.selectEntitiesWithinAABB(IShearable.class, bb, selectShearable)); - entityComparator.refPoint = entity; - Collections.sort(sortedTargets, entityComparator); - - boolean result = false; - int maxSheep = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint); - for (int i=0 ; i < maxSheep ; i++) { - Entity entity2 = sortedTargets.get(i); - if (entity2 instanceof EntityLivingBase && super.itemInteractionForEntity(itemstack, player, (EntityLivingBase) entity2)) { - result = true; - } - } - return result; - } - return false; - } - - - @SubscribeEvent - public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { - if(evt.originalSpeed > 2.0 && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) { - evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered; - } - } - - @Override - public void setDamage(ItemStack stack, int newDamage) { - int oldDamage = getDamage(stack); - if (newDamage <= oldDamage) { - super.setDamage(stack, newDamage); - } - int damage = newDamage - oldDamage; - - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(damage * Config.darkSteelShearsPowerUsePerDamagePoint, false); - } else { - super.setDamage(stack, newDamage); - } - if(eu != null) { - eu.writeToItem(stack); - } - } - - protected void init() { - GameRegistry.registerItem(this, getUnlocalizedName()); - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); - } - - @Override - public int getEnergyStored(ItemStack container) { - return EnergyUpgrade.getEnergyStored(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return EnergyUpgrade.getMaxEnergyStored(container); - } - - @Override - public boolean getIsRepairable(ItemStack i1, ItemStack i2) { - //return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); - return false; - } - - @Override - public int getItemEnchantability() { - return ItemDarkSteelSword.MATERIAL.getEnchantability(); - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Config.addDurabilityTootip) { - list.add(ItemUtil.getDurabilityString(itemstack)); - } - String str = EnergyUpgrade.getStoredEnergyString(itemstack); - if(str != null) { - list.add(str); - } - if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnderIO.lang.localize("item."+name+"_shears.tooltip.multiHarvest")); - list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelShearsEffeciencyBoostWhenPowered + " " - + EnderIO.lang.localize("item."+name+"_pickaxe.tooltip.effPowered")); - } - DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); - } - - public ItemStack createItemStack() { - return new ItemStack(this); - } - - private static class MultiHarvestComparator implements Comparator { - - BlockCoord refPoint; + }; @Override - public int compare(BlockCoord arg0, BlockCoord arg1) { - int d1 = refPoint.getDistSq(arg0); - int d2 = refPoint.getDistSq(arg1); - return compare(d1, d2); + public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity) { + if (entity.worldObj.isRemote) { + return false; + } + + int powerStored = getStoredPower(player); + if (powerStored < Config.darkSteelShearsPowerUsePerDamagePoint) { + return super.itemInteractionForEntity(itemstack, player, entity); + } + + if (entity instanceof IShearable) { + AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( + entity.posX - Config.darkSteelShearsEntityAreaBoostWhenPowered, + entity.posY - Config.darkSteelShearsEntityAreaBoostWhenPowered, + entity.posZ - Config.darkSteelShearsEntityAreaBoostWhenPowered, + entity.posX + Config.darkSteelShearsEntityAreaBoostWhenPowered, + entity.posY + Config.darkSteelShearsEntityAreaBoostWhenPowered, + entity.posZ + Config.darkSteelShearsEntityAreaBoostWhenPowered); + List sortedTargets = new ArrayList( + entity.worldObj.selectEntitiesWithinAABB(IShearable.class, bb, selectShearable)); + entityComparator.refPoint = entity; + Collections.sort(sortedTargets, entityComparator); + + boolean result = false; + int maxSheep = Math.min(sortedTargets.size(), powerStored / Config.darkSteelShearsPowerUsePerDamagePoint); + for (int i = 0; i < maxSheep; i++) { + Entity entity2 = sortedTargets.get(i); + if (entity2 instanceof EntityLivingBase + && super.itemInteractionForEntity(itemstack, player, (EntityLivingBase) entity2)) { + result = true; + } + } + return result; + } + return false; } - // NB: Copy of Integer.compare, which is only in Java 1.7+ - public static int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); + @SubscribeEvent + public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) { + if (evt.originalSpeed > 2.0 + && isEquippedAndPowered(evt.entityPlayer, Config.darkSteelShearsPowerUsePerDamagePoint)) { + evt.newSpeed = evt.originalSpeed * Config.darkSteelShearsEffeciencyBoostWhenPowered; + } } - } - - private static class EntityComparator implements Comparator { - - Entity refPoint; - @Override - public int compare(Entity paramT1, Entity paramT2) { - double distanceSqToEntity1 = refPoint.getDistanceSqToEntity(paramT1); - double distanceSqToEntity2 = refPoint.getDistanceSqToEntity(paramT2); - if (distanceSqToEntity1 < distanceSqToEntity2) - return -1; - if (distanceSqToEntity1 > distanceSqToEntity2) - return 1; - // Double.compare() does something with bits now, but for distances it's clear: - // if it's neither farther nor nearer is same. - return 0; + public void setDamage(ItemStack stack, int newDamage) { + int oldDamage = getDamage(stack); + if (newDamage <= oldDamage) { + super.setDamage(stack, newDamage); + } + int damage = newDamage - oldDamage; + + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if (eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(damage * Config.darkSteelShearsPowerUsePerDamagePoint, false); + } else { + super.setDamage(stack, newDamage); + } + if (eu != null) { + eu.writeToItem(stack); + } } - } + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); + } + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); + } + + @Override + public int getEnergyStored(ItemStack container) { + return EnergyUpgrade.getEnergyStored(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EnergyUpgrade.getMaxEnergyStored(container); + } + + @Override + public boolean getIsRepairable(ItemStack i1, ItemStack i2) { + // return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); + return false; + } + + @Override + public int getItemEnchantability() { + return ItemDarkSteelSword.MATERIAL.getEnchantability(); + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (!Config.addDurabilityTootip) { + list.add(ItemUtil.getDurabilityString(itemstack)); + } + String str = EnergyUpgrade.getStoredEnergyString(itemstack); + if (str != null) { + list.add(str); + } + if (EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnderIO.lang.localize("item." + name + "_shears.tooltip.multiHarvest")); + list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelShearsEffeciencyBoostWhenPowered + " " + + EnderIO.lang.localize("item." + name + "_pickaxe.tooltip.effPowered")); + } + DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); + } + + public ItemStack createItemStack() { + return new ItemStack(this); + } + + private static class MultiHarvestComparator implements Comparator { + + BlockCoord refPoint; + + @Override + public int compare(BlockCoord arg0, BlockCoord arg1) { + int d1 = refPoint.getDistSq(arg0); + int d2 = refPoint.getDistSq(arg1); + return compare(d1, d2); + } + + // NB: Copy of Integer.compare, which is only in Java 1.7+ + public static int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + } + + private static class EntityComparator implements Comparator { + + Entity refPoint; + + @Override + public int compare(Entity paramT1, Entity paramT2) { + double distanceSqToEntity1 = refPoint.getDistanceSqToEntity(paramT1); + double distanceSqToEntity2 = refPoint.getDistanceSqToEntity(paramT2); + if (distanceSqToEntity1 < distanceSqToEntity2) return -1; + if (distanceSqToEntity1 > distanceSqToEntity2) return 1; + // Double.compare() does something with bits now, but for distances it's clear: + // if it's neither farther nor nearer is same. + return 0; + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index c17770c7..3e7f8f87 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -1,7 +1,23 @@ package crazypants.enderio.item.darksteel; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; +import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; +import crazypants.enderio.teleport.TravelController; import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; @@ -23,394 +39,383 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import cofh.api.energy.IEnergyContainerItem; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Util; +public class ItemDarkSteelSword extends ItemSword + implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.api.teleport.IItemOfTravel; -import crazypants.enderio.api.teleport.TravelSource; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; -import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.teleport.TravelController; + private static final String ENDERZOO_ENDERMINY = "enderzoo.Enderminy"; -public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { + static final ToolMaterial MATERIAL = + EnumHelper.addToolMaterial("darkSteel", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 1561, 7, 2, 25); - private static final String ENDERZOO_ENDERMINY = "enderzoo.Enderminy"; - - static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("darkSteel", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 1561, 7, 2, 25); - - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() instanceof ItemDarkSteelSword; - } - - public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { - if(!isEquipped(player)) { - return false; - } - return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; - } - - public static ItemDarkSteelSword create() { - ItemDarkSteelSword res = new ItemDarkSteelSword(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } - - protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); - protected long lastBlickTick = -1; - protected String name; - - public ItemDarkSteelSword(String name, ToolMaterial mat) { - super(mat); - this.name = name; - setCreativeTab(EnderIOTab.tabEnderIO); - - String str = name+"_sword"; - setUnlocalizedName(str); - setTextureName(EnderIO.DOMAIN + ":" + str); - } - - public ItemDarkSteelSword() { - this("darkSteel",MATERIAL); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } - - @Override - public int getIngotsRequiredForFullRepair() { - return 3; - } - - @Override - public boolean isDamaged(ItemStack stack) { - return false; - } - - @SubscribeEvent - public void onEnderTeleport(EnderTeleportEvent evt) { - if(evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) { - evt.setCanceled(true); - } - } - - //Set priorty to lowest in the hope any other mod adding head drops will have already added them - //by the time this is called to prevent multiple head drops - @SubscribeEvent(priority = EventPriority.LOWEST) - public void onEntityDrop(LivingDropsEvent evt) { - - if(!(evt.source.getEntity() instanceof EntityPlayer)) { - return; - } - - EntityPlayer player = (EntityPlayer) evt.source.getEntity(); - //Handle TiC weapons with beheading differently - if(handleBeheadingWeapons(player, evt)) { - return; - } - - double skullDropChance = getSkullDropChance(player, evt); - if(player instanceof FakePlayer) { - skullDropChance *= Config.fakePlayerSkullChance; - } - if(Math.random() <= skullDropChance) { - dropSkull(evt, player); - } - - //Special handling for ender pear drops - if(isEquipped(player)) { - String name = EntityList.getEntityString(evt.entityLiving); - if(evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { - int numPearls = 0; - if(Math.random() <= Config.darkSteelSwordEnderPearlDropChance) { - numPearls++; + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; } - for (int i = 0; i < evt.lootingLevel; i++) { - if(Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) { - numPearls++; - } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() instanceof ItemDarkSteelSword; + } + + public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { + if (!isEquipped(player)) { + return false; + } + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; + } + + public static ItemDarkSteelSword create() { + ItemDarkSteelSword res = new ItemDarkSteelSword(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } + + protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); + protected long lastBlickTick = -1; + protected String name; + + public ItemDarkSteelSword(String name, ToolMaterial mat) { + super(mat); + this.name = name; + setCreativeTab(EnderIOTab.tabEnderIO); + + String str = name + "_sword"; + setUnlocalizedName(str); + setTextureName(EnderIO.DOMAIN + ":" + str); + } + + public ItemDarkSteelSword() { + this("darkSteel", MATERIAL); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } + + @Override + public int getIngotsRequiredForFullRepair() { + return 3; + } + + @Override + public boolean isDamaged(ItemStack stack) { + return false; + } + + @SubscribeEvent + public void onEnderTeleport(EnderTeleportEvent evt) { + if (evt.entityLiving.getEntityData().getBoolean("hitByDarkSteelSword")) { + evt.setCanceled(true); + } + } + + // Set priorty to lowest in the hope any other mod adding head drops will have already added them + // by the time this is called to prevent multiple head drops + @SubscribeEvent(priority = EventPriority.LOWEST) + public void onEntityDrop(LivingDropsEvent evt) { + + if (!(evt.source.getEntity() instanceof EntityPlayer)) { + return; } - int existing = 0; - for (EntityItem stack : evt.drops) { - if(stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) { - existing += stack.getEntityItem().stackSize; - } - } - int toDrop = numPearls - existing; - if(toDrop > 0) { - evt.drops.add(Util.createDrop(player.worldObj, new ItemStack(Items.ender_pearl, toDrop, 0), evt.entityLiving.posX, evt.entityLiving.posY, - evt.entityLiving.posZ, - false)); + EntityPlayer player = (EntityPlayer) evt.source.getEntity(); + // Handle TiC weapons with beheading differently + if (handleBeheadingWeapons(player, evt)) { + return; } - } + double skullDropChance = getSkullDropChance(player, evt); + if (player instanceof FakePlayer) { + skullDropChance *= Config.fakePlayerSkullChance; + } + if (Math.random() <= skullDropChance) { + dropSkull(evt, player); + } + + // Special handling for ender pear drops + if (isEquipped(player)) { + String name = EntityList.getEntityString(evt.entityLiving); + if (evt.entityLiving instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { + int numPearls = 0; + if (Math.random() <= Config.darkSteelSwordEnderPearlDropChance) { + numPearls++; + } + for (int i = 0; i < evt.lootingLevel; i++) { + if (Math.random() <= Config.darkSteelSwordEnderPearlDropChancePerLooting) { + numPearls++; + } + } + + int existing = 0; + for (EntityItem stack : evt.drops) { + if (stack.getEntityItem() != null && stack.getEntityItem().getItem() == Items.ender_pearl) { + existing += stack.getEntityItem().stackSize; + } + } + int toDrop = numPearls - existing; + if (toDrop > 0) { + evt.drops.add(Util.createDrop( + player.worldObj, + new ItemStack(Items.ender_pearl, toDrop, 0), + evt.entityLiving.posX, + evt.entityLiving.posY, + evt.entityLiving.posZ, + false)); + } + } + } } - } - - protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) { - ItemStack skull = getSkullForEntity(evt.entityLiving); - if(skull != null && !containsDrop(evt, skull)) { - evt.drops.add(Util.createEntityItem(player.worldObj, skull, evt.entityLiving.posX, evt.entityLiving.posY, evt.entityLiving.posZ)); - } - } - - private boolean handleBeheadingWeapons(EntityPlayer player, LivingDropsEvent evt) { - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null || equipped.stackTagCompound == null) { - return false; - } - NBTTagCompound infiToolRoot = equipped.getTagCompound().getCompoundTag("InfiTool"); - if(infiToolRoot == null) { - return false; + protected void dropSkull(LivingDropsEvent evt, EntityPlayer player) { + ItemStack skull = getSkullForEntity(evt.entityLiving); + if (skull != null && !containsDrop(evt, skull)) { + evt.drops.add(Util.createEntityItem( + player.worldObj, skull, evt.entityLiving.posX, evt.entityLiving.posY, evt.entityLiving.posZ)); + } } - boolean isCleaver = "tconstruct.items.tools.Cleaver".equals(equipped.getItem().getClass().getName()); - boolean hasBeheading = infiToolRoot.hasKey("Beheading"); - if(!isCleaver && !hasBeheading) { - //Use default behavior if it is not a cleaver and doesn't have beheading - return false; - } + private boolean handleBeheadingWeapons(EntityPlayer player, LivingDropsEvent evt) { + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null || equipped.stackTagCompound == null) { + return false; + } + NBTTagCompound infiToolRoot = equipped.getTagCompound().getCompoundTag("InfiTool"); + if (infiToolRoot == null) { + return false; + } - if(!(evt.entityLiving instanceof EntityEnderman)) { - //If its not an enderman just let TiC do its thing - //We wont modify head drops at all - return true; - } + boolean isCleaver = "tconstruct.items.tools.Cleaver" + .equals(equipped.getItem().getClass().getName()); + boolean hasBeheading = infiToolRoot.hasKey("Beheading"); + if (!isCleaver && !hasBeheading) { + // Use default behavior if it is not a cleaver and doesn't have beheading + return false; + } - float fromWeapon; - if(isCleaver) { - fromWeapon = Config.ticCleaverSkullDropChance; - } else { - fromWeapon = Config.vanillaSwordSkullChance; - } - float fromLooting = 0; - if(hasBeheading) { - fromLooting = Config.ticBeheadingSkullModifier * infiToolRoot.getInteger("Beheading"); - } - float skullDropChance = fromWeapon + fromLooting; - if(Math.random() <= skullDropChance) { - dropSkull(evt, player); - } - return true; - } + if (!(evt.entityLiving instanceof EntityEnderman)) { + // If its not an enderman just let TiC do its thing + // We wont modify head drops at all + return true; + } - private double getSkullDropChance(EntityPlayer player, LivingDropsEvent evt) { - if(isWitherSkeleton(evt)) { - if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { - return Config.darkSteelSwordWitherSkullChance + (Config.darkSteelSwordWitherSkullLootingModifier * evt.lootingLevel); - } else { - return 0.01; - } - } - float fromWeapon; - float fromLooting; - if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { - fromWeapon = Config.darkSteelSwordSkullChance; - fromLooting = Config.darkSteelSwordSkullLootingModifier * evt.lootingLevel; - } else { - fromWeapon = Config.vanillaSwordSkullChance; - fromLooting = Config.vanillaSwordSkullLootingModifier * evt.lootingLevel; - } - return fromWeapon + fromLooting; - } - - protected boolean isWitherSkeleton(LivingDropsEvent evt) { - return evt.entityLiving instanceof EntitySkeleton && ((EntitySkeleton) evt.entityLiving).getSkeletonType() == 1; - } - - private boolean containsDrop(LivingDropsEvent evt, ItemStack skull) { - for (EntityItem ei : evt.drops) { - if(ei != null && ei.getEntityItem() != null && ei.getEntityItem().getItem() == skull.getItem() - && ei.getEntityItem().getItemDamage() == skull.getItemDamage()) { + float fromWeapon; + if (isCleaver) { + fromWeapon = Config.ticCleaverSkullDropChance; + } else { + fromWeapon = Config.vanillaSwordSkullChance; + } + float fromLooting = 0; + if (hasBeheading) { + fromLooting = Config.ticBeheadingSkullModifier * infiToolRoot.getInteger("Beheading"); + } + float skullDropChance = fromWeapon + fromLooting; + if (Math.random() <= skullDropChance) { + dropSkull(evt, player); + } return true; - } - } - return false; - } - - private ItemStack getSkullForEntity(EntityLivingBase entityLiving) { - if(entityLiving instanceof EntitySkeleton) { - int type = ((EntitySkeleton) entityLiving).getSkeletonType(); - if(type == 1) { - return new ItemStack(Items.skull, 1, 1); - } else { - return new ItemStack(Items.skull, 1, 0); - } - } else if(entityLiving instanceof EntityZombie) { - return new ItemStack(Items.skull, 1, 2); - } else if(entityLiving instanceof EntityCreeper) { - return new ItemStack(Items.skull, 1, 4); - } else if(entityLiving instanceof EntityEnderman) { - return new ItemStack(EnderIO.blockEndermanSkull); } - return null; - } + private double getSkullDropChance(EntityPlayer player, LivingDropsEvent evt) { + if (isWitherSkeleton(evt)) { + if (isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { + return Config.darkSteelSwordWitherSkullChance + + (Config.darkSteelSwordWitherSkullLootingModifier * evt.lootingLevel); + } else { + return 0.01; + } + } + float fromWeapon; + float fromLooting; + if (isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { + fromWeapon = Config.darkSteelSwordSkullChance; + fromLooting = Config.darkSteelSwordSkullLootingModifier * evt.lootingLevel; + } else { + fromWeapon = Config.vanillaSwordSkullChance; + fromLooting = Config.vanillaSwordSkullLootingModifier * evt.lootingLevel; + } + return fromWeapon + fromLooting; + } - protected void init() { - GameRegistry.registerItem(this, getUnlocalizedName()); - } + protected boolean isWitherSkeleton(LivingDropsEvent evt) { + return evt.entityLiving instanceof EntitySkeleton && ((EntitySkeleton) evt.entityLiving).getSkeletonType() == 1; + } - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase playerEntity) { + private boolean containsDrop(LivingDropsEvent evt, ItemStack skull) { + for (EntityItem ei : evt.drops) { + if (ei != null + && ei.getEntityItem() != null + && ei.getEntityItem().getItem() == skull.getItem() + && ei.getEntityItem().getItemDamage() == skull.getItemDamage()) { + return true; + } + } + return false; + } - if(playerEntity instanceof EntityPlayer) { - - EntityPlayer player = (EntityPlayer) playerEntity; - ItemStack sword = player.getCurrentEquippedItem(); - - //Durability damage - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); - if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { - eu.extractEnergy(powerPerDamagePoint, false); - - } else { - super.hitEntity(stack, entity, playerEntity); - } - - //sword hit - if(eu != null) { - eu.writeToItem(sword); - - if(eu.getEnergy() > Config.darkSteelSwordPowerUsePerHit) { - extractEnergy(player.getCurrentEquippedItem(), Config.darkSteelSwordPowerUsePerHit, false); - String name = EntityList.getEntityString(entity); - if(entity instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { - entity.getEntityData().setBoolean("hitByDarkSteelSword", true); - } + private ItemStack getSkullForEntity(EntityLivingBase entityLiving) { + if (entityLiving instanceof EntitySkeleton) { + int type = ((EntitySkeleton) entityLiving).getSkeletonType(); + if (type == 1) { + return new ItemStack(Items.skull, 1, 1); + } else { + return new ItemStack(Items.skull, 1, 0); + } + } else if (entityLiving instanceof EntityZombie) { + return new ItemStack(Items.skull, 1, 2); + } else if (entityLiving instanceof EntityCreeper) { + return new ItemStack(Items.skull, 1, 4); + } else if (entityLiving instanceof EntityEnderman) { + return new ItemStack(EnderIO.blockEndermanSkull); } - } - + return null; } - return true; - } - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); - } - - @Override - public int getEnergyStored(ItemStack container) { - return EnergyUpgrade.getEnergyStored(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return EnergyUpgrade.getMaxEnergyStored(container); - } - - @Override - public boolean getIsRepairable(ItemStack i1, ItemStack i2) { - //return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); - return false; - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Config.addDurabilityTootip) { - list.add(ItemUtil.getDurabilityString(itemstack)); + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); } - String str = EnergyUpgrade.getStoredEnergyString(itemstack); - if(str != null) { - list.add(str); - } - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line1")); - if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line2")); - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_sword.tooltip.line3")); - } - DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); - } - public ItemStack createItemStack() { - return new ItemStack(this); - } + @Override + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase playerEntity) { - @Override - public boolean isActive(EntityPlayer ep, ItemStack equipped) { - return isTravelUpgradeActive(ep, equipped); - } + if (playerEntity instanceof EntityPlayer) { - @Override - public void extractInternal(ItemStack equipped, int power) { - extractEnergy(equipped, power, false); - } + EntityPlayer player = (EntityPlayer) playerEntity; + ItemStack sword = player.getCurrentEquippedItem(); - private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { - return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; - } + // Durability damage + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack); + if (eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) { + eu.extractEnergy(powerPerDamagePoint, false); - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(isTravelUpgradeActive(player, stack)) { - if(world.isRemote) { - if(TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) { - player.swingItem(); - return stack; + } else { + super.hitEntity(stack, entity, playerEntity); + } + + // sword hit + if (eu != null) { + eu.writeToItem(sword); + + if (eu.getEnergy() > Config.darkSteelSwordPowerUsePerHit) { + extractEnergy(player.getCurrentEquippedItem(), Config.darkSteelSwordPowerUsePerHit, false); + String name = EntityList.getEntityString(entity); + if (entity instanceof EntityEnderman || ENDERZOO_ENDERMINY.equals(name)) { + entity.getEntityData().setBoolean("hitByDarkSteelSword", true); + } + } + } } - } - - long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; - if(ticksSinceBlink < 0) { - lastBlickTick = -1; - } - if(Config.travelStaffBlinkEnabled && world.isRemote && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { - if(TravelController.instance.doBlink(stack, player)) { - player.swingItem(); - lastBlickTick = EnderIO.proxy.getTickCount(); - } - } - return stack; + return true; } - return super.onItemRightClick(stack, world, player); - } + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + return EnergyUpgrade.receiveEnergy(container, maxReceive, simulate); + } + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + return EnergyUpgrade.extractEnergy(container, maxExtract, simulate); + } + + @Override + public int getEnergyStored(ItemStack container) { + return EnergyUpgrade.getEnergyStored(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EnergyUpgrade.getMaxEnergyStored(container); + } + + @Override + public boolean getIsRepairable(ItemStack i1, ItemStack i2) { + // return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addCommonTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + DarkSteelRecipeManager.instance.addBasicTooltipEntries(itemstack, entityplayer, list, flag); + } + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (!Config.addDurabilityTootip) { + list.add(ItemUtil.getDurabilityString(itemstack)); + } + String str = EnergyUpgrade.getStoredEnergyString(itemstack); + if (str != null) { + list.add(str); + } + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_sword.tooltip.line1")); + if (EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_sword.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item." + name + "_sword.tooltip.line3")); + } + DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); + } + + public ItemStack createItemStack() { + return new ItemStack(this); + } + + @Override + public boolean isActive(EntityPlayer ep, ItemStack equipped) { + return isTravelUpgradeActive(ep, equipped); + } + + @Override + public void extractInternal(ItemStack equipped, int power) { + extractEnergy(equipped, power, false); + } + + private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { + return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (isTravelUpgradeActive(player, stack)) { + if (world.isRemote) { + if (TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) { + player.swingItem(); + return stack; + } + } + + long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; + if (ticksSinceBlink < 0) { + lastBlickTick = -1; + } + if (Config.travelStaffBlinkEnabled + && world.isRemote + && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { + if (TravelController.instance.doBlink(stack, player)) { + player.swingItem(); + lastBlickTick = EnderIO.proxy.getTickCount(); + } + } + return stack; + } + + return super.onItemRightClick(stack, world, player); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java index d133971c..55665e11 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelArmor.java @@ -1,13 +1,12 @@ package crazypants.enderio.item.darksteel; -import java.util.Iterator; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import java.util.Iterator; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,59 +14,65 @@ import net.minecraftforge.common.util.EnumHelper; public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelItem { - public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("endSteel", 50, new int[] { 4, 7, 10, 5 }, 25); + public static final ArmorMaterial MATERIAL = + EnumHelper.addArmorMaterial("endSteel", 50, new int[] {4, 7, 10, 5}, 25); - public ItemEndSteelArmor(int armorType) { - super(MATERIAL, "endSteel", armorType); + public ItemEndSteelArmor(int armorType) { + super(MATERIAL, "endSteel", armorType); + } - } + public static ItemEndSteelArmor create(int armorType) { + ItemEndSteelArmor res = new ItemEndSteelArmor(armorType); + res.init(); + return res; + } - public static ItemEndSteelArmor create(int armorType) { - ItemEndSteelArmor res = new ItemEndSteelArmor(armorType); - res.init(); - return res; - } + public static ItemEndSteelArmor forArmorType(int armorType) { + switch (armorType) { + case 0: + return DarkSteelItems.itemEndSteelHelmet; + case 1: + return DarkSteelItems.itemEndSteelChestplate; + case 2: + return DarkSteelItems.itemEndSteelLeggings; + case 3: + return DarkSteelItems.itemEndSteelBoots; + } + return null; + } - public static ItemEndSteelArmor forArmorType(int armorType) { - switch (armorType) { - case 0: return DarkSteelItems.itemEndSteelHelmet; - case 1: return DarkSteelItems.itemEndSteelChestplate; - case 2: return DarkSteelItems.itemEndSteelLeggings; - case 3: return DarkSteelItems.itemEndSteelBoots; - } - return null; - } + public static int getPoweredProtectionIncrease(int armorType) { + switch (armorType) { + case 0: + return 1; + case 1: + return 2; + case 2: + case 3: + return 1; + } + return 0; + } - public static int getPoweredProtectionIncrease(int armorType) { - switch (armorType) { - case 0: return 1; - case 1: return 2; - case 2: - case 3: return 1; - } - return 0; - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - - Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); - while (iter.hasNext()) { - IDarkSteelUpgrade upgrade = iter.next(); - if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { - upgrade.writeToItem(is); - } - } - - par3List.add(is); - } + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); + while (iter.hasNext()) { + IDarkSteelUpgrade upgrade = iter.next(); + if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { + upgrade.writeToItem(is); + } + } + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java index 114c84e9..79ce99be 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelAxe.java @@ -1,12 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,39 +14,38 @@ import net.minecraftforge.common.MinecraftForge; public class ItemEndSteelAxe extends ItemDarkSteelAxe implements IEndSteelItem { - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemEndSteelAxe; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelAxe; + } - public static ItemEndSteelAxe create() { - ItemEndSteelAxe res = new ItemEndSteelAxe(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public static ItemEndSteelAxe create() { + ItemEndSteelAxe res = new ItemEndSteelAxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public ItemEndSteelAxe() { - super("endSteel", ItemEndSteelSword.MATERIAL); - } + public ItemEndSteelAxe() { + super("endSteel", ItemEndSteelSword.MATERIAL); + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java index 9b733174..34a40c59 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelPickaxe.java @@ -1,12 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,39 +14,38 @@ import net.minecraftforge.common.MinecraftForge; public class ItemEndSteelPickaxe extends ItemDarkSteelPickaxe implements IEndSteelItem { - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemEndSteelPickaxe; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelPickaxe; + } - public static ItemEndSteelPickaxe create() { - ItemEndSteelPickaxe res = new ItemEndSteelPickaxe(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public static ItemEndSteelPickaxe create() { + ItemEndSteelPickaxe res = new ItemEndSteelPickaxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public ItemEndSteelPickaxe() { - super("endSteel", ItemEndSteelSword.MATERIAL); - } + public ItemEndSteelPickaxe() { + super("endSteel", ItemEndSteelSword.MATERIAL); + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java index bce4417f..d61ef908 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemEndSteelSword.java @@ -1,13 +1,12 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,41 +16,41 @@ import net.minecraftforge.common.util.EnumHelper; public class ItemEndSteelSword extends ItemDarkSteelSword implements IEndSteelItem { - static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("endSteel", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 2000, 12, 5, 30); + static final ToolMaterial MATERIAL = + EnumHelper.addToolMaterial("endSteel", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 2000, 12, 5, 30); - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemEndSteelSword; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemEndSteelSword; + } + public static ItemEndSteelSword create() { + ItemEndSteelSword res = new ItemEndSteelSword(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public static ItemEndSteelSword create() { - ItemEndSteelSword res = new ItemEndSteelSword(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public ItemEndSteelSword() { + super("endSteel", MATERIAL); + } - public ItemEndSteelSword() { - super("endSteel",MATERIAL); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java index a7986bf3..58230d79 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java @@ -1,16 +1,6 @@ package crazypants.enderio.item.darksteel; -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 net.minecraft.util.MathHelper; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,79 +8,86 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; +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 net.minecraft.util.MathHelper; public class ItemGliderWing extends Item implements IResourceTooltipProvider { - private static final BasicCapacitor CAP = new BasicCapacitor(); + private static final BasicCapacitor CAP = new BasicCapacitor(); - public static ItemGliderWing create() { - ItemGliderWing result = new ItemGliderWing(); - result.init(); - return result; - } - - private IIcon wingsIcon; - - protected ItemGliderWing() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemGliderWing.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemGliderWing.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, 1); - if(damage == 0) { - return itemIcon; + public static ItemGliderWing create() { + ItemGliderWing result = new ItemGliderWing(); + result.init(); + return result; } - return wingsIcon; - } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) { - itemIcon = register.registerIcon("enderio:itemGliderWing"); - wingsIcon = register.registerIcon("enderio:itemGliderWings"); - } + private IIcon wingsIcon; - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); - if(i == 0) { - return super.getUnlocalizedName(); + protected ItemGliderWing() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemGliderWing.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); } - return super.getUnlocalizedName() + "s"; - } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < 2; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + protected void init() { + GameRegistry.registerItem(this, ModObject.itemGliderWing.unlocalisedName); } - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(itemStack); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, 1); + if (damage == 0) { + return itemIcon; + } + return wingsIcon; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) { + itemIcon = register.registerIcon("enderio:itemGliderWing"); + wingsIcon = register.registerIcon("enderio:itemGliderWings"); + } -// @Override -// @SideOnly(Side.CLIENT) -// public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { -// if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { -// par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); -// } -// -// } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); + if (i == 0) { + return super.getUnlocalizedName(); + } + return super.getUnlocalizedName() + "s"; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < 2; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); + } + + // @Override + // @SideOnly(Side.CLIENT) + // public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + // { + // if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { + // par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); + // } + // + // } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java index e0eeb5ad..e332ab23 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarArmor.java @@ -1,14 +1,12 @@ package crazypants.enderio.item.darksteel; -import java.util.Iterator; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import java.util.Iterator; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,59 +14,66 @@ import net.minecraftforge.common.util.EnumHelper; public class ItemStellarArmor extends ItemDarkSteelArmor implements IStellarItem { - public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("stellarAlloy", 75, new int[] {8, 14, 18, 7}, 25); + public static final ArmorMaterial MATERIAL = + EnumHelper.addArmorMaterial("stellarAlloy", 75, new int[] {8, 14, 18, 7}, 25); - public ItemStellarArmor(int armorType) { - super(MATERIAL, "stellar", armorType); + public ItemStellarArmor(int armorType) { + super(MATERIAL, "stellar", armorType); + } - } + public static ItemStellarArmor create(int armorType) { + ItemStellarArmor res = new ItemStellarArmor(armorType); + res.init(); + return res; + } - public static ItemStellarArmor create(int armorType) { - ItemStellarArmor res = new ItemStellarArmor(armorType); - res.init(); - return res; - } + public static ItemStellarArmor forArmorType(int armorType) { + switch (armorType) { + case 0: + return DarkSteelItems.itemStellarHelmet; + case 1: + return DarkSteelItems.itemStellarChestplate; + case 2: + return DarkSteelItems.itemStellarLeggings; + case 3: + return DarkSteelItems.itemStellarBoots; + } + return null; + } - public static ItemStellarArmor forArmorType(int armorType) { - switch (armorType) { - case 0: return DarkSteelItems.itemStellarHelmet; - case 1: return DarkSteelItems.itemStellarChestplate; - case 2: return DarkSteelItems.itemStellarLeggings; - case 3: return DarkSteelItems.itemStellarBoots; - } - return null; - } + public static int getPoweredProtectionIncrease(int armorType) { + switch (armorType) { + case 0: + return 2; + case 1: + return 1; + case 2: + return 4; + case 3: + return 3; + } + return 0; + } - public static int getPoweredProtectionIncrease(int armorType) { - switch (armorType) { - case 0: return 2; - case 1: return 1; - case 2: return 4; - case 3: return 3; - } - return 0; - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - - Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); - while (iter.hasNext()) { - IDarkSteelUpgrade upgrade = iter.next(); - if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { - upgrade.writeToItem(is); - } - } - - par3List.add(is); - } + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); + while (iter.hasNext()) { + IDarkSteelUpgrade upgrade = iter.next(); + if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { + upgrade.writeToItem(is); + } + } + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java index 0a2b33fe..bb2d0ae9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarAxe.java @@ -1,12 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,39 +14,38 @@ import net.minecraftforge.common.MinecraftForge; public class ItemStellarAxe extends ItemDarkSteelAxe implements IStellarItem { - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemStellarAxe; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarAxe; + } - public static ItemStellarAxe create() { - ItemStellarAxe res = new ItemStellarAxe(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public static ItemStellarAxe create() { + ItemStellarAxe res = new ItemStellarAxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public ItemStellarAxe() { - super("stellar", ItemStellarSword.MATERIAL); - } + public ItemStellarAxe() { + super("stellar", ItemStellarSword.MATERIAL); + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java index 635fbc8a..39329638 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarPickaxe.java @@ -1,12 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,39 +14,38 @@ import net.minecraftforge.common.MinecraftForge; public class ItemStellarPickaxe extends ItemDarkSteelPickaxe implements IStellarItem { - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemStellarPickaxe; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarPickaxe; + } - public static ItemStellarPickaxe create() { - ItemStellarPickaxe res = new ItemStellarPickaxe(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public static ItemStellarPickaxe create() { + ItemStellarPickaxe res = new ItemStellarPickaxe(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public ItemStellarPickaxe() { - super("stellar", ItemStellarSword.MATERIAL); - } + public ItemStellarPickaxe() { + super("stellar", ItemStellarSword.MATERIAL); + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java index 1436fdce..e2be7877 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemStellarSword.java @@ -1,13 +1,12 @@ package crazypants.enderio.item.darksteel; -import java.util.List; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.item.darksteel.IDarkSteelItem.IStellarItem; +import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,41 +16,41 @@ import net.minecraftforge.common.util.EnumHelper; public class ItemStellarSword extends ItemDarkSteelSword implements IStellarItem { - static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("stellarAlloy", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 5000, 16, 11, 25); + static final ToolMaterial MATERIAL = + EnumHelper.addToolMaterial("stellarAlloy", Config.darkSteelPickMinesTiCArdite ? 5 : 3, 5000, 16, 11, 25); - public static boolean isEquipped(EntityPlayer player) { - if(player == null) { - return false; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return false; - } - return equipped.getItem() == DarkSteelItems.itemStellarSword; - } + public static boolean isEquipped(EntityPlayer player) { + if (player == null) { + return false; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return false; + } + return equipped.getItem() == DarkSteelItems.itemStellarSword; + } + public static ItemStellarSword create() { + ItemStellarSword res = new ItemStellarSword(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return res; + } - public static ItemStellarSword create() { - ItemStellarSword res = new ItemStellarSword(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return res; - } + public ItemStellarSword() { + super("stellar", MATERIAL); + } - public ItemStellarSword() { - super("stellar",MATERIAL); - } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + par3List.add(is); - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - par3List.add(is); - - is = new ItemStack(this); - EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); - EnergyUpgrade.setPowerFull(is); - TravelUpgrade.INSTANCE.writeToItem(is); - par3List.add(is); - } + is = new ItemStack(this); + EnergyUpgrade.EMPOWERED_FIVE.writeToItem(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); + par3List.add(is); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java index bcc050be..c78c36e4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java @@ -1,39 +1,40 @@ package crazypants.enderio.item.darksteel; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; public class PacketDarkSteelPowerPacket implements IMessage, IMessageHandler { - private int powerUse; - private short armorType; + private int powerUse; + private short armorType; - public PacketDarkSteelPowerPacket() { - } + public PacketDarkSteelPowerPacket() {} - public PacketDarkSteelPowerPacket(int powerUse, int armorType) { - this.powerUse = powerUse; - this.armorType = (short) armorType; - } + public PacketDarkSteelPowerPacket(int powerUse, int armorType) { + this.powerUse = powerUse; + this.armorType = (short) armorType; + } - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeInt(powerUse); - buffer.writeShort(armorType); - } + @Override + public void toBytes(ByteBuf buffer) { + buffer.writeInt(powerUse); + buffer.writeShort(armorType); + } - @Override - public void fromBytes(ByteBuf buffer) { - powerUse = buffer.readInt(); - armorType = buffer.readShort(); - } - - public IMessage onMessage(PacketDarkSteelPowerPacket message, MessageContext ctx) { - DarkSteelController.instance.usePlayerEnergy(ctx.getServerHandler().playerEntity, ItemDarkSteelArmor.forArmorType(message.armorType), message.powerUse); - ctx.getServerHandler().playerEntity.fallDistance = 0; - return null; - } + @Override + public void fromBytes(ByteBuf buffer) { + powerUse = buffer.readInt(); + armorType = buffer.readShort(); + } + public IMessage onMessage(PacketDarkSteelPowerPacket message, MessageContext ctx) { + DarkSteelController.instance.usePlayerEnergy( + ctx.getServerHandler().playerEntity, + ItemDarkSteelArmor.forArmorType(message.armorType), + message.powerUse); + ctx.getServerHandler().playerEntity.fallDistance = 0; + return null; + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java index 754450ef..6c596ae2 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java @@ -1,63 +1,65 @@ package crazypants.enderio.item.darksteel; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; public class PacketUpgradeState implements IMessage, IMessageHandler { - public enum Type { - GLIDE, - SPEED, - STEP_ASSIST, - JUMP - } - - public PacketUpgradeState() { - } - - private boolean isActive; - private Type type; - private int entityID; - - public PacketUpgradeState(Type type, boolean isActive) { - this(type, isActive, 0); - } - - public PacketUpgradeState(Type type, boolean isActive, int entityID) { - this.type = type; - this.isActive = isActive; - this.entityID = entityID; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeShort(type.ordinal()); - buf.writeBoolean(isActive); - buf.writeInt(entityID); - } - - @Override - public void fromBytes(ByteBuf buf) { - type = Type.values()[buf.readShort()]; - isActive = buf.readBoolean(); - entityID = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketUpgradeState message, MessageContext ctx) { - EntityPlayer player = (EntityPlayer) (ctx.side.isClient() ? EnderIO.proxy.getClientWorld().getEntityByID(message.entityID) : ctx.getServerHandler().playerEntity); - if (player != null) { - DarkSteelController.instance.setActive(player, message.type, message.isActive); - if (ctx.side.isServer()) { - message.entityID = player.getEntityId(); - PacketHandler.INSTANCE.sendToDimension(message, player.worldObj.provider.dimensionId); - } + public enum Type { + GLIDE, + SPEED, + STEP_ASSIST, + JUMP + } + + public PacketUpgradeState() {} + + private boolean isActive; + private Type type; + private int entityID; + + public PacketUpgradeState(Type type, boolean isActive) { + this(type, isActive, 0); + } + + public PacketUpgradeState(Type type, boolean isActive, int entityID) { + this.type = type; + this.isActive = isActive; + this.entityID = entityID; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(type.ordinal()); + buf.writeBoolean(isActive); + buf.writeInt(entityID); + } + + @Override + public void fromBytes(ByteBuf buf) { + type = Type.values()[buf.readShort()]; + isActive = buf.readBoolean(); + entityID = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketUpgradeState message, MessageContext ctx) { + EntityPlayer player = (EntityPlayer) + (ctx.side.isClient() + ? EnderIO.proxy.getClientWorld().getEntityByID(message.entityID) + : ctx.getServerHandler().playerEntity); + if (player != null) { + DarkSteelController.instance.setActive(player, message.type, message.isActive); + if (ctx.side.isServer()) { + message.entityID = player.getEntityId(); + PacketHandler.INSTANCE.sendToDimension(message, player.worldObj.provider.dimensionId); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index dcd6eac9..b44e5484 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -1,117 +1,111 @@ package crazypants.enderio.item.darksteel; +import cofh.api.energy.IEnergyContainerItem; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vector4f; +import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import cofh.api.energy.IEnergyContainerItem; - -import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Vector4f; - -import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; - public class PoweredItemRenderer implements IItemRenderer { - private RenderItem ri = new RenderItem(); + private RenderItem ri = new RenderItem(); - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.INVENTORY; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return false; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(data != null && data.length > 0) { - renderToInventory(item, (RenderBlocks) data[0]); - } - } - - public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - - Minecraft mc = Minecraft.getMinecraft(); - ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); - GL11.glDisable(GL11.GL_LIGHTING); - - if(isJustCrafted(item)) { - return; - } - - boolean hasEnergyUpgrade = EnergyUpgrade.loadFromItem(item) != null; - int y = hasEnergyUpgrade ? 12 : 13; - int bgH = hasEnergyUpgrade ? 4 : 2; - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - RenderUtil.renderQuad2D(2, y, 0, 13, bgH, ColorUtil.getRGB(Color.black)); - - double maxDam = item.getMaxDamage(); - double dispDamage = item.getItemDamageForDisplay(); - y = hasEnergyUpgrade ? 14 : 13; - renderBar(y, maxDam, dispDamage, Color.green, Color.red); - - if(hasEnergyUpgrade) { - IEnergyContainerItem armor = (IEnergyContainerItem) item.getItem(); - maxDam = armor.getMaxEnergyStored(item); - dispDamage = armor.getEnergyStored(item); - y = 12; - Color color = new Color(0x2D, 0xCE, 0xFA); // electric blue - renderBar2(y, maxDam, maxDam - dispDamage, color, color); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.INVENTORY; } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_LIGHTING); - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } - private boolean isJustCrafted(ItemStack item) { - return EnergyUpgrade.loadFromItem(item) == null && item.getItemDamageForDisplay() == 0; - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (data != null && data.length > 0) { + renderToInventory(item, (RenderBlocks) data[0]); + } + } - private void renderBar2(int y, double maxDam, double dispDamage, Color full, Color empty) { - double ratio = dispDamage / maxDam; - Vector4f fg = ColorUtil.toFloat(full); - Vector4f ec = ColorUtil.toFloat(empty); - fg.interpolate(ec, (float) ratio); - Vector4f bg = ColorUtil.toFloat(Color.black); - bg.interpolate(fg, 0.15f); - - int barLength = (int) Math.round(12.0 * (1 - ratio)); - - RenderUtil.renderQuad2D(2, y, 0, 12, 1, bg); - RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); - } + public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - - private void renderBar(int y, double maxDam, double dispDamage, Color full, Color empty) { - double ratio = dispDamage / maxDam; - Vector4f fg = ColorUtil.toFloat(full); - Vector4f ec = ColorUtil.toFloat(empty); + Minecraft mc = Minecraft.getMinecraft(); + ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); + GL11.glDisable(GL11.GL_LIGHTING); - fg.interpolate(ec, (float) ratio); + if (isJustCrafted(item)) { + return; + } - Vector4f bg = new Vector4f(0.17, 0.3, 0.1, 0); + boolean hasEnergyUpgrade = EnergyUpgrade.loadFromItem(item) != null; + int y = hasEnergyUpgrade ? 12 : 13; + int bgH = hasEnergyUpgrade ? 4 : 2; + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.renderQuad2D(2, y, 0, 13, bgH, ColorUtil.getRGB(Color.black)); - int barLength = (int) Math.round(12.0 * (1 - ratio)); - RenderUtil.renderQuad2D(2, y, 0, 12, 1, bg); - RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); - } + double maxDam = item.getMaxDamage(); + double dispDamage = item.getItemDamageForDisplay(); + y = hasEnergyUpgrade ? 14 : 13; + renderBar(y, maxDam, dispDamage, Color.green, Color.red); - private void renderBar(int y, double maxDam, double dispDamage) { - int ratio = (int) Math.round(255.0D - dispDamage * 255.0D / maxDam); - int fgCol = 255 - ratio << 16 | ratio << 8; - int bgCol = (255 - ratio) / 4 << 16 | 16128; - int barLength = (int) Math.round(12.0D - dispDamage * 12.0D / maxDam); - RenderUtil.renderQuad2D(2, y, 0, 12, 1, bgCol); - RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fgCol); - } + if (hasEnergyUpgrade) { + IEnergyContainerItem armor = (IEnergyContainerItem) item.getItem(); + maxDam = armor.getMaxEnergyStored(item); + dispDamage = armor.getEnergyStored(item); + y = 12; + Color color = new Color(0x2D, 0xCE, 0xFA); // electric blue + renderBar2(y, maxDam, maxDam - dispDamage, color, color); + } + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glEnable(GL11.GL_LIGHTING); + } + + private boolean isJustCrafted(ItemStack item) { + return EnergyUpgrade.loadFromItem(item) == null && item.getItemDamageForDisplay() == 0; + } + + private void renderBar2(int y, double maxDam, double dispDamage, Color full, Color empty) { + double ratio = dispDamage / maxDam; + Vector4f fg = ColorUtil.toFloat(full); + Vector4f ec = ColorUtil.toFloat(empty); + fg.interpolate(ec, (float) ratio); + Vector4f bg = ColorUtil.toFloat(Color.black); + bg.interpolate(fg, 0.15f); + + int barLength = (int) Math.round(12.0 * (1 - ratio)); + + RenderUtil.renderQuad2D(2, y, 0, 12, 1, bg); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); + } + + private void renderBar(int y, double maxDam, double dispDamage, Color full, Color empty) { + double ratio = dispDamage / maxDam; + Vector4f fg = ColorUtil.toFloat(full); + Vector4f ec = ColorUtil.toFloat(empty); + + fg.interpolate(ec, (float) ratio); + + Vector4f bg = new Vector4f(0.17, 0.3, 0.1, 0); + + int barLength = (int) Math.round(12.0 * (1 - ratio)); + RenderUtil.renderQuad2D(2, y, 0, 12, 1, bg); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fg); + } + + private void renderBar(int y, double maxDam, double dispDamage) { + int ratio = (int) Math.round(255.0D - dispDamage * 255.0D / maxDam); + int fgCol = 255 - ratio << 16 | ratio << 8; + int bgCol = (255 - ratio) / 4 << 16 | 16128; + int barLength = (int) Math.round(12.0D - dispDamage * 12.0D / maxDam); + RenderUtil.renderQuad2D(2, y, 0, 12, 1, bgCol); + RenderUtil.renderQuad2D(2, y, 0, barLength, 1, fgCol); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java index c19cc163..999839c1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java @@ -1,109 +1,111 @@ package crazypants.enderio.item.darksteel; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.config.Config; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ArrayBlockingQueue; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.client.event.sound.PlaySoundSourceEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.config.Config; - public class SoundDetector { - private static final int MAX_ENTITIES = 64; + private static final int MAX_ENTITIES = 64; - public static SoundDetector instance = new SoundDetector(); + public static SoundDetector instance = new SoundDetector(); - private List sounds; - private ArrayBlockingQueue soundQueue = new ArrayBlockingQueue(MAX_ENTITIES); + private List sounds; + private ArrayBlockingQueue soundQueue = new ArrayBlockingQueue(MAX_ENTITIES); - private Minecraft mc = Minecraft.getMinecraft(); + private Minecraft mc = Minecraft.getMinecraft(); - boolean enabled = false; + boolean enabled = false; - double maxRangeSq = Config.darkSteelSoundLocatorRange * Config.darkSteelSoundLocatorRange; + double maxRangeSq = Config.darkSteelSoundLocatorRange * Config.darkSteelSoundLocatorRange; - @SubscribeEvent - public void onSound(PlaySoundAtEntityEvent evt) { - if(enabled && evt.entity != null && evt.entity != Minecraft.getMinecraft().thePlayer && soundQueue.size() < MAX_ENTITIES) { - soundQueue.offer(new SoundSource(evt.entity, evt.volume)); - } - } - - @SubscribeEvent - public void onSound(PlaySoundSourceEvent evt) { - if(enabled && soundQueue.size() < MAX_ENTITIES) { - soundQueue.offer(new SoundSource(evt.sound.getXPosF(), evt.sound.getYPosF(), evt.sound.getZPosF(), evt.sound.getVolume())); - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onClientTick(TickEvent.ClientTickEvent event) { - - if(!enabled || mc.thePlayer == null || mc.thePlayer.worldObj == null) { - return; - } - - sounds = new ArrayList(MAX_ENTITIES); - soundQueue.drainTo(sounds); - - try { - Vector3d eye = Util.getEyePositionEio(mc.thePlayer); - for (SoundSource ss : sounds) { - double distSq = ss.pos.distanceSquared(eye); - int minDist = ss.isEntity ? 4 : 49; - if(distSq > minDist && distSq <= maxRangeSq) { - mc.thePlayer.worldObj.spawnEntityInWorld(new SoundEntity(mc.thePlayer.worldObj, ss.pos, ss.volume)); + @SubscribeEvent + public void onSound(PlaySoundAtEntityEvent evt) { + if (enabled + && evt.entity != null + && evt.entity != Minecraft.getMinecraft().thePlayer + && soundQueue.size() < MAX_ENTITIES) { + soundQueue.offer(new SoundSource(evt.entity, evt.volume)); } - } - } catch (Exception ex) { - //Probably not necessary anymore but saftey first! - } - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - private static class SoundSource { - - Vector3d pos; - float volume; - boolean isEntity; - - public SoundSource(Entity ent, float volume) { - AxisAlignedBB bb = ent.boundingBox; - if(bb != null) { - pos = new Vector3d(bb.minX + (bb.maxX - bb.minX) / 2, bb.minY + (bb.maxY - bb.minY) / 2, bb.minZ + (bb.maxZ - bb.minZ) / 2); - } else { - pos = new Vector3d(ent.posX, ent.posY, ent.posZ); - } - this.volume = volume; - isEntity = true; } - public SoundSource(double x, double y, double z, float volume) { - pos = new Vector3d(x, y, z); - this.volume = volume; - isEntity = false; + @SubscribeEvent + public void onSound(PlaySoundSourceEvent evt) { + if (enabled && soundQueue.size() < MAX_ENTITIES) { + soundQueue.offer(new SoundSource( + evt.sound.getXPosF(), evt.sound.getYPosF(), evt.sound.getZPosF(), evt.sound.getVolume())); + } } - } + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (!enabled || mc.thePlayer == null || mc.thePlayer.worldObj == null) { + return; + } + + sounds = new ArrayList(MAX_ENTITIES); + soundQueue.drainTo(sounds); + + try { + Vector3d eye = Util.getEyePositionEio(mc.thePlayer); + for (SoundSource ss : sounds) { + double distSq = ss.pos.distanceSquared(eye); + int minDist = ss.isEntity ? 4 : 49; + if (distSq > minDist && distSq <= maxRangeSq) { + mc.thePlayer.worldObj.spawnEntityInWorld(new SoundEntity(mc.thePlayer.worldObj, ss.pos, ss.volume)); + } + } + } catch (Exception ex) { + // Probably not necessary anymore but saftey first! + } + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + private static class SoundSource { + + Vector3d pos; + float volume; + boolean isEntity; + + public SoundSource(Entity ent, float volume) { + AxisAlignedBB bb = ent.boundingBox; + if (bb != null) { + pos = new Vector3d( + bb.minX + (bb.maxX - bb.minX) / 2, + bb.minY + (bb.maxY - bb.minY) / 2, + bb.minZ + (bb.maxZ - bb.minZ) / 2); + } else { + pos = new Vector3d(ent.posX, ent.posY, ent.posZ); + } + this.volume = volume; + isEntity = true; + } + + public SoundSource(double x, double y, double z, float volume) { + pos = new Vector3d(x, y, z); + this.volume = volume; + isEntity = false; + } + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java index 98c8ed1f..6f3b8f30 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java @@ -1,53 +1,47 @@ package crazypants.enderio.item.darksteel; +import com.enderio.core.common.vecmath.Vector3d; +import crazypants.enderio.config.Config; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import com.enderio.core.common.vecmath.Vector3d; - -import crazypants.enderio.config.Config; - public class SoundEntity extends Entity { - int lifeSpan = Config.darkSteelSoundLocatorLifespan; - float volume; + int lifeSpan = Config.darkSteelSoundLocatorLifespan; + float volume; - public SoundEntity(World world, Vector3d pos, float volume) { - super(world); - setPosition(pos.x, pos.y, pos.z); - this.volume = volume; - } - - @Override - protected void entityInit() { - } - - protected boolean canTriggerWalking() { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox() { - return null; - } - - @Override - public void onUpdate() { - super.onUpdate(); - lifeSpan--; - if(lifeSpan == 0) { - setDead(); + public SoundEntity(World world, Vector3d pos, float volume) { + super(world); + setPosition(pos.x, pos.y, pos.z); + this.volume = volume; } - } - @Override - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { - } + @Override + protected void entityInit() {} - @Override - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { - } + protected boolean canTriggerWalking() { + return false; + } + @Override + public AxisAlignedBB getBoundingBox() { + return null; + } + + @Override + public void onUpdate() { + super.onUpdate(); + lifeSpan--; + if (lifeSpan == 0) { + setDead(); + } + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {} + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {} } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java index b5ac6217..95c49b53 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundRenderer.java @@ -1,51 +1,48 @@ package crazypants.enderio.item.darksteel; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.gui.IconEIO; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderEntity; import net.minecraft.entity.Entity; - import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.gui.IconEIO; - @SideOnly(Side.CLIENT) public class SoundRenderer extends RenderEntity { - @Override - public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + @Override + public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { - SoundEntity se = ((SoundEntity) entity); + SoundEntity se = ((SoundEntity) entity); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - float alpha = 0.5f; + float alpha = 0.5f; - GL11.glColor4f(1, 1, 1, alpha); + GL11.glColor4f(1, 1, 1, alpha); - float scale = se.lifeSpan / 20f; + float scale = se.lifeSpan / 20f; - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - GL11.glRotatef(-player.rotationYaw, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(player.rotationPitch, 1.0F, 0.0F, 0.0F); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glRotatef(-player.rotationYaw, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(player.rotationPitch, 1.0F, 0.0F, 0.0F); - double size = 0.5 * se.lifeSpan / 20f; + double size = 0.5 * se.lifeSpan / 20f; - IconEIO.map.render(IconEIO.SOUND, -size/2, -size/2, size,size,0,true,true); - - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } + IconEIO.map.render(IconEIO.SOUND, -size / 2, -size / 2, size, size, 0, true, true); + GL11.glPopAttrib(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java index dc627890..6109306e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/AbstractUpgrade.java @@ -1,155 +1,151 @@ package crazypants.enderio.item.darksteel.upgrade; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import com.enderio.core.common.util.ItemUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.ItemUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; - public abstract class AbstractUpgrade implements IDarkSteelUpgrade { - public static final String KEY_LEVEL_COST = "level_cost"; + public static final String KEY_LEVEL_COST = "level_cost"; - private static final String KEY_UNLOC_NAME = "unlocalized_name"; + private static final String KEY_UNLOC_NAME = "unlocalized_name"; - public static final String KEY_UPGRADE_PREFIX = "enderio.darksteel.upgrade."; + public static final String KEY_UPGRADE_PREFIX = "enderio.darksteel.upgrade."; - private static final String KEY_UPGRADE_ITEM = "upgradeItem"; + private static final String KEY_UPGRADE_ITEM = "upgradeItem"; - protected final int levelCost; - protected final String id; - protected final String unlocName; + protected final int levelCost; + protected final String id; + protected final String unlocName; - protected ItemStack upgradeItem; + protected ItemStack upgradeItem; - protected AbstractUpgrade(String id, String unlocName, ItemStack upgradeItem, int levelCost) { - this.id = KEY_UPGRADE_PREFIX + id; - this.unlocName = unlocName; - this.upgradeItem = upgradeItem; - this.levelCost = levelCost; - } - - public AbstractUpgrade(String id, NBTTagCompound tag) { - this.id = KEY_UPGRADE_PREFIX + id; - levelCost = tag.getInteger(KEY_LEVEL_COST); - unlocName = tag.getString(KEY_UNLOC_NAME); - if(tag.hasKey(KEY_UPGRADE_ITEM)) { - upgradeItem = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag.getTag(KEY_UPGRADE_ITEM)); - } - } - - @Override - public boolean isUpgradeItem(ItemStack stack) { - if(stack == null || stack.getItem() == null || getUpgradeItem() == null) { - return false; - } - return stack.isItemEqual(getUpgradeItem()) && stack.stackSize == getUpgradeItem().stackSize; - } - - @Override - public ItemStack getUpgradeItem() { - return upgradeItem; - } - - @Override - public String getUpgradeItemName() { - return getUpgradeItem().getDisplayName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addCommonTooltipFromResources(list, getUnlocalizedName()); - } - - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); - SpecialTooltipHandler.addDetailedTooltipFromResources(list, getUnlocalizedName()); - } - - @Override - public int getLevelCost() { - return levelCost; - } - - @Override - public String getUnlocalizedName() { - return unlocName; - } - - @Override - @SideOnly(Side.CLIENT) - public IRenderUpgrade getRender() { - return null; - } - - @Override - public boolean hasUpgrade(ItemStack stack) { - if(stack == null) { - return false; - } - if(stack.stackTagCompound == null) { - return false; - } - return stack.stackTagCompound.hasKey(id); - } - - @Override - public void writeToItem(ItemStack stack) { - if(stack == null) { - return; - } - NBTTagCompound upgradeRoot = new NBTTagCompound(); - upgradeRoot.setInteger(KEY_LEVEL_COST, levelCost); - upgradeRoot.setString(KEY_UNLOC_NAME, getUnlocalizedName()); - - if(getUpgradeItem() != null) { - NBTTagCompound itemRoot = new NBTTagCompound(); - getUpgradeItem().writeToNBT(itemRoot); - upgradeRoot.setTag(KEY_UPGRADE_ITEM, itemRoot); + protected AbstractUpgrade(String id, String unlocName, ItemStack upgradeItem, int levelCost) { + this.id = KEY_UPGRADE_PREFIX + id; + this.unlocName = unlocName; + this.upgradeItem = upgradeItem; + this.levelCost = levelCost; } - writeUpgradeToNBT(upgradeRoot); - - NBTTagCompound stackRoot = ItemUtil.getOrCreateNBT(stack); - stackRoot.setTag(id, upgradeRoot); - stack.setTagCompound(stackRoot); - } - - public NBTTagCompound getUpgradeRoot(ItemStack stack) { - if(!hasUpgrade(stack)) { - return null; + public AbstractUpgrade(String id, NBTTagCompound tag) { + this.id = KEY_UPGRADE_PREFIX + id; + levelCost = tag.getInteger(KEY_LEVEL_COST); + unlocName = tag.getString(KEY_UNLOC_NAME); + if (tag.hasKey(KEY_UPGRADE_ITEM)) { + upgradeItem = ItemStack.loadItemStackFromNBT((NBTTagCompound) tag.getTag(KEY_UPGRADE_ITEM)); + } } - return (NBTTagCompound) stack.stackTagCompound.getTag(id); - } - public abstract void writeUpgradeToNBT(NBTTagCompound upgradeRoot); - - @Override - public void removeFromItem(ItemStack stack) { - if(stack == null) { - return; + @Override + public boolean isUpgradeItem(ItemStack stack) { + if (stack == null || stack.getItem() == null || getUpgradeItem() == null) { + return false; + } + return stack.isItemEqual(getUpgradeItem()) && stack.stackSize == getUpgradeItem().stackSize; } - if(stack.stackTagCompound == null) { - return; - } - stack.stackTagCompound.removeTag(id); - } + @Override + public ItemStack getUpgradeItem() { + return upgradeItem; + } + + @Override + public String getUpgradeItemName() { + return getUpgradeItem().getDisplayName(); + } + + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addCommonTooltipFromResources(list, getUnlocalizedName()); + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); + } + + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); + SpecialTooltipHandler.addDetailedTooltipFromResources(list, getUnlocalizedName()); + } + + @Override + public int getLevelCost() { + return levelCost; + } + + @Override + public String getUnlocalizedName() { + return unlocName; + } + + @Override + @SideOnly(Side.CLIENT) + public IRenderUpgrade getRender() { + return null; + } + + @Override + public boolean hasUpgrade(ItemStack stack) { + if (stack == null) { + return false; + } + if (stack.stackTagCompound == null) { + return false; + } + return stack.stackTagCompound.hasKey(id); + } + + @Override + public void writeToItem(ItemStack stack) { + if (stack == null) { + return; + } + NBTTagCompound upgradeRoot = new NBTTagCompound(); + upgradeRoot.setInteger(KEY_LEVEL_COST, levelCost); + upgradeRoot.setString(KEY_UNLOC_NAME, getUnlocalizedName()); + + if (getUpgradeItem() != null) { + NBTTagCompound itemRoot = new NBTTagCompound(); + getUpgradeItem().writeToNBT(itemRoot); + upgradeRoot.setTag(KEY_UPGRADE_ITEM, itemRoot); + } + + writeUpgradeToNBT(upgradeRoot); + + NBTTagCompound stackRoot = ItemUtil.getOrCreateNBT(stack); + stackRoot.setTag(id, upgradeRoot); + stack.setTagCompound(stackRoot); + } + + public NBTTagCompound getUpgradeRoot(ItemStack stack) { + if (!hasUpgrade(stack)) { + return null; + } + return (NBTTagCompound) stack.stackTagCompound.getTag(id); + } + + public abstract void writeUpgradeToNBT(NBTTagCompound upgradeRoot); + + @Override + public void removeFromItem(ItemStack stack) { + if (stack == null) { + return; + } + if (stack.stackTagCompound == null) { + return; + } + stack.stackTagCompound.removeTag(id); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java index d1cd1214..89c00a3c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java @@ -4,91 +4,94 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; -import crazypants.enderio.item.darksteel.ItemEndSteelArmor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class ApiaristArmorUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "apiaristArmor"; + private static String UPGRADE_NAME = "apiaristArmor"; - private static final String forestryItemNames[] = { - "apiaristHelmet", "apiaristChest", "apiaristLegs", "apiaristBoots"}; + private static final String forestryItemNames[] = { + "apiaristHelmet", "apiaristChest", "apiaristLegs", "apiaristBoots" + }; - public static final ApiaristArmorUpgrade HELMET = new ApiaristArmorUpgrade(0); - public static final ApiaristArmorUpgrade CHEST = new ApiaristArmorUpgrade(1); - public static final ApiaristArmorUpgrade LEGS = new ApiaristArmorUpgrade(2); - public static final ApiaristArmorUpgrade BOOTS = new ApiaristArmorUpgrade(3); + public static final ApiaristArmorUpgrade HELMET = new ApiaristArmorUpgrade(0); + public static final ApiaristArmorUpgrade CHEST = new ApiaristArmorUpgrade(1); + public static final ApiaristArmorUpgrade LEGS = new ApiaristArmorUpgrade(2); + public static final ApiaristArmorUpgrade BOOTS = new ApiaristArmorUpgrade(3); - public static ItemStack getApiaristArmor(int slot) { - Item i = GameRegistry.findItem("Forestry", forestryItemNames[slot]); - if(i != null) { - return new ItemStack(i); + public static ItemStack getApiaristArmor(int slot) { + Item i = GameRegistry.findItem("Forestry", forestryItemNames[slot]); + if (i != null) { + return new ItemStack(i); + } + return null; } - return null; - } - public static ApiaristArmorUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static ApiaristArmorUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new ApiaristArmorUpgrade( + (NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + private final int slot; + + public ApiaristArmorUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + this.slot = tag.getInteger("slot"); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public ApiaristArmorUpgrade(int slot) { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.apiaristArmor.".concat(ItemDarkSteelArmor.NAMES[slot]), + getApiaristArmor(slot), + Config.darkSteelApiaristArmorCost); + this.slot = slot; } - return new ApiaristArmorUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - private final int slot; - - public ApiaristArmorUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - this.slot = tag.getInteger("slot"); - } - - public ApiaristArmorUpgrade(int slot) { - super(UPGRADE_NAME, - "enderio.darksteel.upgrade.apiaristArmor.".concat(ItemDarkSteelArmor.NAMES[slot]), - getApiaristArmor(slot), Config.darkSteelApiaristArmorCost); - this.slot = slot; - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || ! DarkSteelItems.isArmorPart(stack.getItem(), slot) || getUpgradeItem() == null) { - return false; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), slot) || getUpgradeItem() == null) { + return false; + } + ApiaristArmorUpgrade up = loadFromItem(stack); + return up == null; } - ApiaristArmorUpgrade up = loadFromItem(stack); - return up == null; - } - @Override - public boolean hasUpgrade(ItemStack stack) { - return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot); - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - upgradeRoot.setByte("slot", (byte)slot); - } - - @Override - public ItemStack getUpgradeItem() { - if(upgradeItem != null) { - return upgradeItem; + @Override + public boolean hasUpgrade(ItemStack stack) { + return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot); } - upgradeItem = getApiaristArmor(slot); - return upgradeItem; - } - @Override - public String getUpgradeItemName() { - if(getUpgradeItem() == null) { - return "Apiarist Armor"; + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setByte("slot", (byte) slot); + } + + @Override + public ItemStack getUpgradeItem() { + if (upgradeItem != null) { + return upgradeItem; + } + upgradeItem = getApiaristArmor(slot); + return upgradeItem; + } + + @Override + public String getUpgradeItemName() { + if (getUpgradeItem() == null) { + return "Apiarist Armor"; + } + return super.getUpgradeItemName(); } - return super.getUpgradeItemName(); - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java index 050d279a..96462d9e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java @@ -1,16 +1,6 @@ package crazypants.enderio.item.darksteel.upgrade; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; - import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -19,274 +9,282 @@ import crazypants.enderio.item.darksteel.IDarkSteelItem; import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Material; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; public class EnergyUpgrade extends AbstractUpgrade { - public static final AbstractUpgrade EMPOWERED = new EnergyUpgrade( - "enderio.darksteel.upgrade.empowered_one", Config.darkSteelUpgradeVibrantCost, - new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()), - Config.darkSteelPowerStorageBase, - Config.darkSteelPowerStorageBase / 100); + public static final AbstractUpgrade EMPOWERED = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_one", + Config.darkSteelUpgradeVibrantCost, + new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()), + Config.darkSteelPowerStorageBase, + Config.darkSteelPowerStorageBase / 100); - public static final AbstractUpgrade EMPOWERED_TWO = new EnergyUpgrade( - "enderio.darksteel.upgrade.empowered_two", Config.darkSteelUpgradePowerOneCost, - new ItemStack(EnderIO.itemBasicCapacitor, 1, 0), - Config.darkSteelPowerStorageLevelOne, - Config.darkSteelPowerStorageLevelOne / 100); + public static final AbstractUpgrade EMPOWERED_TWO = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_two", + Config.darkSteelUpgradePowerOneCost, + new ItemStack(EnderIO.itemBasicCapacitor, 1, 0), + Config.darkSteelPowerStorageLevelOne, + Config.darkSteelPowerStorageLevelOne / 100); - public static final AbstractUpgrade EMPOWERED_THREE = new EnergyUpgrade( - "enderio.darksteel.upgrade.empowered_three", Config.darkSteelUpgradePowerTwoCost, - new ItemStack(EnderIO.itemBasicCapacitor, 1, 1), - Config.darkSteelPowerStorageLevelTwo, - Config.darkSteelPowerStorageLevelTwo / 100); + public static final AbstractUpgrade EMPOWERED_THREE = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_three", + Config.darkSteelUpgradePowerTwoCost, + new ItemStack(EnderIO.itemBasicCapacitor, 1, 1), + Config.darkSteelPowerStorageLevelTwo, + Config.darkSteelPowerStorageLevelTwo / 100); - public static final AbstractUpgrade EMPOWERED_FOUR = new EnergyUpgrade( - "enderio.darksteel.upgrade.empowered_four", Config.darkSteelUpgradePowerThreeCost, - new ItemStack(EnderIO.itemBasicCapacitor, 1, 2), - Config.darkSteelPowerStorageLevelThree, - Config.darkSteelPowerStorageLevelThree / 100); + public static final AbstractUpgrade EMPOWERED_FOUR = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_four", + Config.darkSteelUpgradePowerThreeCost, + new ItemStack(EnderIO.itemBasicCapacitor, 1, 2), + Config.darkSteelPowerStorageLevelThree, + Config.darkSteelPowerStorageLevelThree / 100); - public static final AbstractUpgrade EMPOWERED_FIVE = new EnergyUpgrade( - "enderio.darksteel.upgrade.empowered_five", Config.darkSteelUpgradePowerFourCost, - new ItemStack(EnderIO.itemBasicCapacitor, 1, 3), - Config.darkSteelPowerStorageLevelFour, - Config.darkSteelPowerStorageLevelFour / 100); + public static final AbstractUpgrade EMPOWERED_FIVE = new EnergyUpgrade( + "enderio.darksteel.upgrade.empowered_five", + Config.darkSteelUpgradePowerFourCost, + new ItemStack(EnderIO.itemBasicCapacitor, 1, 3), + Config.darkSteelPowerStorageLevelFour, + Config.darkSteelPowerStorageLevelFour / 100); - private static final String UPGRADE_NAME = "energyUpgrade"; - private static final String KEY_CAPACITY = "capacity"; - private static final String KEY_ENERGY = "energy"; - private static final String KEY_ABS_WITH_POWER = "absDamWithPower"; - private static final String KEY_MAX_IN = "maxInput"; - private static final String KEY_MAX_OUT = "maxOuput"; + private static final String UPGRADE_NAME = "energyUpgrade"; + private static final String KEY_CAPACITY = "capacity"; + private static final String KEY_ENERGY = "energy"; + private static final String KEY_ABS_WITH_POWER = "absDamWithPower"; + private static final String KEY_MAX_IN = "maxInput"; + private static final String KEY_MAX_OUT = "maxOuput"; + private static final Random RANDOM = new Random(); - private static final Random RANDOM = new Random(); - - public static EnergyUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; - } - if(stack.stackTagCompound == null) { - return null; - } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; - } - return new EnergyUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public static boolean itemHasAnyPowerUpgrade(ItemStack itemstack) { - return loadFromItem(itemstack) != null; - } - - public static AbstractUpgrade next(AbstractUpgrade upgrade) { - if(upgrade == null) { - return EMPOWERED; - } else if(upgrade.unlocName.equals(EMPOWERED.unlocName)) { - return EMPOWERED_TWO; - } else if(upgrade.unlocName.equals(EMPOWERED_TWO.unlocName)) { - return EMPOWERED_THREE; - } else if(upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) { - return EMPOWERED_FOUR; - } else if(upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { - return EMPOWERED_FIVE; - } - return null; - } - - public static int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - int res = eu.extractEnergy(maxExtract, simulate); - if(!simulate && res > 0) { - eu.writeToItem(container); - } - return res; - } - - public static int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - int res = eu.receiveEnergy(maxReceive, simulate); - if(!simulate && res > 0) { - eu.writeToItem(container); - } - return res; - } - - public static void setPowerLevel(ItemStack item, int amount) { - if(item == null || !itemHasAnyPowerUpgrade(item)) { - return; - } - amount = Math.min(amount, getMaxEnergyStored(item)); - EnergyUpgrade eu = loadFromItem(item); - eu.setEnergy(amount); - eu.writeToItem(item); - } - - public static void setPowerFull(ItemStack item) { - if(item == null || !itemHasAnyPowerUpgrade(item)) { - return; - } - EnergyUpgrade eu = loadFromItem(item); - eu.setEnergy(eu.getCapacity()); - eu.writeToItem(item); - } - - public static String getStoredEnergyString(ItemStack itemstack) { - EnergyUpgrade up = loadFromItem(itemstack); - if(up == null) { - return null; - } - return PowerDisplayUtil.formatStoredPower(up.energy, up.capacity); - } - - public static int getEnergyStored(ItemStack container) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - return eu.getEnergy(); - } - - public static int getMaxEnergyStored(ItemStack container) { - EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); - if(eu == null) { - return 0; - } - return eu.getCapacity(); - } - - protected int capacity; - protected int energy; - - protected int maxInRF; - protected int maxOutRF; - - public EnergyUpgrade(String name, int levels, ItemStack upgradeItem, int capcity, int maxReceiveIO) { - super(UPGRADE_NAME, name, upgradeItem, levels); - capacity = capcity; - energy = 0; - maxInRF = maxReceiveIO; - maxOutRF = maxReceiveIO; - } - - public EnergyUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - capacity = tag.getInteger(KEY_CAPACITY); - energy = tag.getInteger(KEY_ENERGY); - maxInRF = tag.getInteger(KEY_MAX_IN); - maxOutRF = tag.getInteger(KEY_MAX_OUT); - } - - @Override - public boolean hasUpgrade(ItemStack stack) { - if(!super.hasUpgrade(stack)) { - return false; - } - EnergyUpgrade up = loadFromItem(stack); - if(up == null) { - return false; - } - return up.unlocName.equals(unlocName); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() == null || !(stack.getItem() instanceof IDarkSteelItem)) { - return false; - } - AbstractUpgrade up = next(loadFromItem(stack)); - if(up == null) { - return false; + public static EnergyUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new EnergyUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(!(stack.getItem() instanceof IEndSteelItem) && up.unlocName.equals(EMPOWERED_FIVE.unlocName)) - return false; - - return up.unlocName.equals(unlocName); - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - - List upgradeStr = new ArrayList(); - upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); - SpecialTooltipHandler.addDetailedTooltipFromResources(upgradeStr, getUnlocalizedName()); - - String percDamage = (int)Math.round(getAbsorptionRatio(itemstack) * 100) + ""; - String capString = PowerDisplayUtil.formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); - for (int i = 0; i < upgradeStr.size(); i++) { - String str = upgradeStr.get(i); - str = str.replaceAll("\\$P", capString); - str = str.replaceAll("\\$D", percDamage); - upgradeStr.set(i, str); + public static boolean itemHasAnyPowerUpgrade(ItemStack itemstack) { + return loadFromItem(itemstack) != null; } - list.addAll(upgradeStr); - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - upgradeRoot.setInteger(KEY_CAPACITY, capacity); - upgradeRoot.setInteger(KEY_ENERGY, energy); - - upgradeRoot.setInteger(KEY_MAX_IN, maxInRF); - upgradeRoot.setInteger(KEY_MAX_OUT, maxOutRF); - } - - public boolean isAbsorbDamageWithPower(ItemStack stack) { - boolean res= RANDOM.nextDouble() < getAbsorptionRatio(stack); - return res; - } - - private double getAbsorptionRatio(ItemStack stack) { - AbstractUpgrade upgrade = loadFromItem(stack); - int index = 0; - if (upgrade.unlocName.equals(EMPOWERED_TWO.unlocName)) { - index = 1; - } else if (upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) { - index = 2; - } else if (upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { - index = 3; - } else if (upgrade.unlocName.equals(EMPOWERED_FIVE.unlocName)) { - index = 4; + public static AbstractUpgrade next(AbstractUpgrade upgrade) { + if (upgrade == null) { + return EMPOWERED; + } else if (upgrade.unlocName.equals(EMPOWERED.unlocName)) { + return EMPOWERED_TWO; + } else if (upgrade.unlocName.equals(EMPOWERED_TWO.unlocName)) { + return EMPOWERED_THREE; + } else if (upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) { + return EMPOWERED_FOUR; + } else if (upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { + return EMPOWERED_FIVE; + } + return null; } - return Config.darkSteelPowerDamgeAbsorptionRatios[index]; - } - public int getEnergy() { - return energy; - } - - public void setEnergy(int energy) { - this.energy = energy; - } - - public int receiveEnergy(int maxRF, boolean simulate) { - - int energyReceived = Math.min(capacity - energy, Math.min(maxInRF, maxRF)); - if(!simulate) { - energy += energyReceived; + public static int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if (eu == null) { + return 0; + } + int res = eu.extractEnergy(maxExtract, simulate); + if (!simulate && res > 0) { + eu.writeToItem(container); + } + return res; } - return energyReceived; - } - public int extractEnergy(int maxExtract, boolean simulate) { - int energyExtracted = Math.min(energy, Math.min(maxOutRF, maxExtract)); - if(!simulate) { - energy -= energyExtracted; + public static int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if (eu == null) { + return 0; + } + int res = eu.receiveEnergy(maxReceive, simulate); + if (!simulate && res > 0) { + eu.writeToItem(container); + } + return res; } - return energyExtracted; - } - public int getCapacity() { - return capacity; - } + public static void setPowerLevel(ItemStack item, int amount) { + if (item == null || !itemHasAnyPowerUpgrade(item)) { + return; + } + amount = Math.min(amount, getMaxEnergyStored(item)); + EnergyUpgrade eu = loadFromItem(item); + eu.setEnergy(amount); + eu.writeToItem(item); + } + public static void setPowerFull(ItemStack item) { + if (item == null || !itemHasAnyPowerUpgrade(item)) { + return; + } + EnergyUpgrade eu = loadFromItem(item); + eu.setEnergy(eu.getCapacity()); + eu.writeToItem(item); + } + + public static String getStoredEnergyString(ItemStack itemstack) { + EnergyUpgrade up = loadFromItem(itemstack); + if (up == null) { + return null; + } + return PowerDisplayUtil.formatStoredPower(up.energy, up.capacity); + } + + public static int getEnergyStored(ItemStack container) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if (eu == null) { + return 0; + } + return eu.getEnergy(); + } + + public static int getMaxEnergyStored(ItemStack container) { + EnergyUpgrade eu = EnergyUpgrade.loadFromItem(container); + if (eu == null) { + return 0; + } + return eu.getCapacity(); + } + + protected int capacity; + protected int energy; + + protected int maxInRF; + protected int maxOutRF; + + public EnergyUpgrade(String name, int levels, ItemStack upgradeItem, int capcity, int maxReceiveIO) { + super(UPGRADE_NAME, name, upgradeItem, levels); + capacity = capcity; + energy = 0; + maxInRF = maxReceiveIO; + maxOutRF = maxReceiveIO; + } + + public EnergyUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + capacity = tag.getInteger(KEY_CAPACITY); + energy = tag.getInteger(KEY_ENERGY); + maxInRF = tag.getInteger(KEY_MAX_IN); + maxOutRF = tag.getInteger(KEY_MAX_OUT); + } + + @Override + public boolean hasUpgrade(ItemStack stack) { + if (!super.hasUpgrade(stack)) { + return false; + } + EnergyUpgrade up = loadFromItem(stack); + if (up == null) { + return false; + } + return up.unlocName.equals(unlocName); + } + + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || stack.getItem() == null || !(stack.getItem() instanceof IDarkSteelItem)) { + return false; + } + AbstractUpgrade up = next(loadFromItem(stack)); + if (up == null) { + return false; + } + + if (!(stack.getItem() instanceof IEndSteelItem) && up.unlocName.equals(EMPOWERED_FIVE.unlocName)) return false; + + return up.unlocName.equals(unlocName); + } + + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + + List upgradeStr = new ArrayList(); + upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); + SpecialTooltipHandler.addDetailedTooltipFromResources(upgradeStr, getUnlocalizedName()); + + String percDamage = (int) Math.round(getAbsorptionRatio(itemstack) * 100) + ""; + String capString = PowerDisplayUtil.formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); + for (int i = 0; i < upgradeStr.size(); i++) { + String str = upgradeStr.get(i); + str = str.replaceAll("\\$P", capString); + str = str.replaceAll("\\$D", percDamage); + upgradeStr.set(i, str); + } + list.addAll(upgradeStr); + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setInteger(KEY_CAPACITY, capacity); + upgradeRoot.setInteger(KEY_ENERGY, energy); + + upgradeRoot.setInteger(KEY_MAX_IN, maxInRF); + upgradeRoot.setInteger(KEY_MAX_OUT, maxOutRF); + } + + public boolean isAbsorbDamageWithPower(ItemStack stack) { + boolean res = RANDOM.nextDouble() < getAbsorptionRatio(stack); + return res; + } + + private double getAbsorptionRatio(ItemStack stack) { + AbstractUpgrade upgrade = loadFromItem(stack); + int index = 0; + if (upgrade.unlocName.equals(EMPOWERED_TWO.unlocName)) { + index = 1; + } else if (upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) { + index = 2; + } else if (upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) { + index = 3; + } else if (upgrade.unlocName.equals(EMPOWERED_FIVE.unlocName)) { + index = 4; + } + return Config.darkSteelPowerDamgeAbsorptionRatios[index]; + } + + public int getEnergy() { + return energy; + } + + public void setEnergy(int energy) { + this.energy = energy; + } + + public int receiveEnergy(int maxRF, boolean simulate) { + + int energyReceived = Math.min(capacity - energy, Math.min(maxInRF, maxRF)); + if (!simulate) { + energy += energyReceived; + } + return energyReceived; + } + + public int extractEnergy(int maxExtract, boolean simulate) { + int energyExtracted = Math.min(energy, Math.min(maxOutRF, maxExtract)); + if (!simulate) { + energy -= energyExtracted; + } + return energyExtracted; + } + + public int getCapacity() { + return capacity; + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java index 8c070e52..903d8ded 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/GliderUpgrade.java @@ -1,99 +1,98 @@ package crazypants.enderio.item.darksteel.upgrade; +import static org.lwjgl.opengl.GL11.glDepthMask; + +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelController; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.client.event.RenderPlayerEvent; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelController; -import crazypants.enderio.item.darksteel.DarkSteelItems; - -import static org.lwjgl.opengl.GL11.glDepthMask; - public class GliderUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "glide"; + private static String UPGRADE_NAME = "glide"; - public static final GliderUpgrade INSTANCE = new GliderUpgrade(); + public static final GliderUpgrade INSTANCE = new GliderUpgrade(); - @SideOnly(Side.CLIENT) - private Render render; + @SideOnly(Side.CLIENT) + private Render render; - public static GliderUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static GliderUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new GliderUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public GliderUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; - } - return new GliderUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public GliderUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public GliderUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(DarkSteelItems.itemGliderWing,1,1), Config.darkSteelGliderCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 1)) { - return false; - } - GliderUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public IRenderUpgrade getRender() { - return render == null ? render = new Render() : render; - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } - - @SideOnly(Side.CLIENT) - private class Render implements IRenderUpgrade { - - private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); - private ItemStack glider = new ItemStack(DarkSteelItems.itemGliderWing, 1, 1); - - private Render() { - item.setEntityItemStack(glider); + public GliderUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.glider", + new ItemStack(DarkSteelItems.itemGliderWing, 1, 1), + Config.darkSteelGliderCost); } @Override - public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { - if (!head && DarkSteelController.instance.isGlideActive(event.entityPlayer)) { - RenderUtil.bindItemTexture(); - glDepthMask(true); - item.hoverStart = 0; - Helper.rotateIfSneaking(event.entityPlayer); - GL11.glTranslatef(-0, 1, 0.25f); - GL11.glRotatef(180, 1, 0, 0); - GL11.glScalef(3, 3, 3); - RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); - } + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 1)) { + return false; + } + GliderUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public IRenderUpgrade getRender() { + return render == null ? render = new Render() : render; + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} + + @SideOnly(Side.CLIENT) + private class Render implements IRenderUpgrade { + + private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); + private ItemStack glider = new ItemStack(DarkSteelItems.itemGliderWing, 1, 1); + + private Render() { + item.setEntityItemStack(glider); + } + + @Override + public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { + if (!head && DarkSteelController.instance.isGlideActive(event.entityPlayer)) { + RenderUtil.bindItemTexture(); + glDepthMask(true); + item.hoverStart = 0; + Helper.rotateIfSneaking(event.entityPlayer); + GL11.glTranslatef(-0, 1, 0.25f); + GL11.glRotatef(180, 1, 0, 0); + GL11.glScalef(3, 3, 3); + RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + } + } } - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IDarkSteelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IDarkSteelUpgrade.java index 31583c62..0ef2e291 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IDarkSteelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IDarkSteelUpgrade.java @@ -1,36 +1,32 @@ package crazypants.enderio.item.darksteel.upgrade; -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import javax.annotation.Nullable; +import net.minecraft.item.ItemStack; public interface IDarkSteelUpgrade extends IAdvancedTooltipProvider { - String getUnlocalizedName(); + String getUnlocalizedName(); - int getLevelCost(); + int getLevelCost(); - boolean isUpgradeItem(ItemStack stack); + boolean isUpgradeItem(ItemStack stack); - boolean canAddToItem(ItemStack stack); + boolean canAddToItem(ItemStack stack); - boolean hasUpgrade(ItemStack stack); + boolean hasUpgrade(ItemStack stack); - void writeToItem(ItemStack stack); + void writeToItem(ItemStack stack); - void removeFromItem(ItemStack stack); + void removeFromItem(ItemStack stack); - ItemStack getUpgradeItem(); + ItemStack getUpgradeItem(); - String getUpgradeItemName(); - - @Nullable - @SideOnly(Side.CLIENT) - IRenderUpgrade getRender(); + String getUpgradeItemName(); + @Nullable + @SideOnly(Side.CLIENT) + IRenderUpgrade getRender(); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java index c5a71670..2fbbddb3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/IRenderUpgrade.java @@ -4,31 +4,30 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; - import org.lwjgl.opengl.GL11; public interface IRenderUpgrade { - void render(RenderPlayerEvent event, ItemStack stack, boolean head); + void render(RenderPlayerEvent event, ItemStack stack, boolean head); - /** - * A few helper methods for rendering. Credit to Vazkii, used from Botania. - * {@link #translateToHeadLevel(EntityPlayer)} edited to remove sneaking - * translation. - */ - public static class Helper { + /** + * A few helper methods for rendering. Credit to Vazkii, used from Botania. + * {@link #translateToHeadLevel(EntityPlayer)} edited to remove sneaking + * translation. + */ + public static class Helper { - public static void rotateIfSneaking(EntityPlayer player) { - if (player.isSneaking()) - applySneakingRotation(); + public static void rotateIfSneaking(EntityPlayer player) { + if (player.isSneaking()) applySneakingRotation(); + } + + public static void applySneakingRotation() { + GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); + } + + public static void translateToHeadLevel(EntityPlayer player) { + GL11.glTranslated( + 0, (player != Minecraft.getMinecraft().thePlayer ? 1.7F : 0) - player.getDefaultEyeHeight(), 0); + } } - - public static void applySneakingRotation() { - GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); - } - - public static void translateToHeadLevel(EntityPlayer player) { - GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.7F : 0) - player.getDefaultEyeHeight(), 0); - } - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java index 92e1dc24..b3ec4ceb 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/JumpUpgrade.java @@ -1,83 +1,87 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class JumpUpgrade extends AbstractUpgrade { - private static final String KEY_LEVEL = "level"; + private static final String KEY_LEVEL = "level"; - private static String UPGRADE_NAME = "jumpBoost"; + private static String UPGRADE_NAME = "jumpBoost"; - public static JumpUpgrade JUMP_ONE = new JumpUpgrade("enderio.darksteel.upgrade.jump_one", 1, Config.darkSteelJumpOneCost); - public static JumpUpgrade JUMP_TWO = new JumpUpgrade("enderio.darksteel.upgrade.jump_two", 2, Config.darkSteelJumpTwoCost); - public static JumpUpgrade JUMP_THREE = new JumpUpgrade("enderio.darksteel.upgrade.jump_three", 3, Config.darkSteelJumpThreeCost); + public static JumpUpgrade JUMP_ONE = + new JumpUpgrade("enderio.darksteel.upgrade.jump_one", 1, Config.darkSteelJumpOneCost); + public static JumpUpgrade JUMP_TWO = + new JumpUpgrade("enderio.darksteel.upgrade.jump_two", 2, Config.darkSteelJumpTwoCost); + public static JumpUpgrade JUMP_THREE = + new JumpUpgrade("enderio.darksteel.upgrade.jump_three", 3, Config.darkSteelJumpThreeCost); - private short level; + private short level; - public static boolean isEquipped(EntityPlayer player) { - ItemStack boots = player.getEquipmentInSlot(1); - return loadFromItem(boots) != null; - } - - public static JumpUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static boolean isEquipped(EntityPlayer player) { + ItemStack boots = player.getEquipmentInSlot(1); + return loadFromItem(boots) != null; } - if(stack.stackTagCompound == null) { - return null; + + public static JumpUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new JumpUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public JumpUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + this.level = tag.getShort(KEY_LEVEL); } - return new JumpUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - public JumpUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - this.level = tag.getShort(KEY_LEVEL); - } - - public JumpUpgrade(String unlocName, int level, int levelCost) { - super(UPGRADE_NAME, unlocName, new ItemStack(Blocks.piston), levelCost); - this.level = (short) level; - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { - return false; + public JumpUpgrade(String unlocName, int level, int levelCost) { + super(UPGRADE_NAME, unlocName, new ItemStack(Blocks.piston), levelCost); + this.level = (short) level; } - JumpUpgrade up = loadFromItem(stack); - if(up == null) { - return getLevel() == 1; + + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null + || !DarkSteelItems.isArmorPart(stack.getItem(), 3) + || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + return false; + } + JumpUpgrade up = loadFromItem(stack); + if (up == null) { + return getLevel() == 1; + } + return up.getLevel() == getLevel() - 1; } - return up.getLevel() == getLevel() - 1; - } - - @Override - public boolean hasUpgrade(ItemStack stack) { - if(!super.hasUpgrade(stack)) { - return false; + @Override + public boolean hasUpgrade(ItemStack stack) { + if (!super.hasUpgrade(stack)) { + return false; + } + JumpUpgrade up = loadFromItem(stack); + if (up == null) { + return false; + } + return up.unlocName.equals(unlocName); } - JumpUpgrade up = loadFromItem(stack); - if(up == null) { - return false; + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setShort(KEY_LEVEL, getLevel()); } - return up.unlocName.equals(unlocName); - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - upgradeRoot.setShort(KEY_LEVEL, getLevel()); - } - - public short getLevel() { - return level; - } + public short getLevel() { + return level; + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java index 45a0abf1..61081ddd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NaturalistEyeUpgrade.java @@ -10,71 +10,75 @@ import net.minecraft.nbt.NBTTagCompound; public class NaturalistEyeUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "naturalistEye"; + private static String UPGRADE_NAME = "naturalistEye"; - public static final NaturalistEyeUpgrade INSTANCE = new NaturalistEyeUpgrade(); + public static final NaturalistEyeUpgrade INSTANCE = new NaturalistEyeUpgrade(); - public static ItemStack getNaturalistEye() { - Item i = GameRegistry.findItem("Forestry", "naturalistHelmet"); - if(i != null) { - return new ItemStack(i); + public static ItemStack getNaturalistEye() { + Item i = GameRegistry.findItem("Forestry", "naturalistHelmet"); + if (i != null) { + return new ItemStack(i); + } + return null; } - return null; - } - public static NaturalistEyeUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static NaturalistEyeUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new NaturalistEyeUpgrade( + (NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public static boolean isUpgradeEquipped(EntityPlayer player) { + ItemStack helmet = player.getEquipmentInSlot(4); + return NaturalistEyeUpgrade.loadFromItem(helmet) != null; } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public NaturalistEyeUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - return new NaturalistEyeUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - public static boolean isUpgradeEquipped(EntityPlayer player) { - ItemStack helmet = player.getEquipmentInSlot(4); - return NaturalistEyeUpgrade.loadFromItem(helmet) != null; - } - - public NaturalistEyeUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public NaturalistEyeUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.naturalistEye",getNaturalistEye(), Config.darkSteelApiaristArmorCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getUpgradeItem() == null) { - return false; + public NaturalistEyeUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.naturalistEye", + getNaturalistEye(), + Config.darkSteelApiaristArmorCost); } - NaturalistEyeUpgrade up = loadFromItem(stack); - return up == null; - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } - - @Override - public ItemStack getUpgradeItem() { - if(upgradeItem != null) { - return upgradeItem; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getUpgradeItem() == null) { + return false; + } + NaturalistEyeUpgrade up = loadFromItem(stack); + return up == null; } - upgradeItem = getNaturalistEye(); - return upgradeItem; - } - @Override - public String getUpgradeItemName() { - if(getUpgradeItem() == null) { - return "Naturalist Helmet"; + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} + + @Override + public ItemStack getUpgradeItem() { + if (upgradeItem != null) { + return upgradeItem; + } + upgradeItem = getNaturalistEye(); + return upgradeItem; + } + + @Override + public String getUpgradeItemName() { + if (getUpgradeItem() == null) { + return "Naturalist Helmet"; + } + return super.getUpgradeItemName(); } - return super.getUpgradeItemName(); - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java index f49036d6..d6536a34 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java @@ -9,52 +9,56 @@ import net.minecraft.potion.PotionHelper; public class NightVisionUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "nightVision"; + private static String UPGRADE_NAME = "nightVision"; - public static final NightVisionUpgrade INSTANCE = new NightVisionUpgrade(); + public static final NightVisionUpgrade INSTANCE = new NightVisionUpgrade(); - public static NightVisionUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static NightVisionUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new NightVisionUpgrade( + (NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + private static ItemStack createUpgradeItem() { + ItemStack pot = new ItemStack(Items.potionitem, 1, 0); + int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); + res = PotionHelper.applyIngredient(res, PotionHelper.goldenCarrotEffect); + pot.setItemDamage(res); + return pot; } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public NightVisionUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - return new NightVisionUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - private static ItemStack createUpgradeItem() { - ItemStack pot = new ItemStack(Items.potionitem, 1, 0); - int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.goldenCarrotEffect); - pot.setItemDamage(res); - return pot; - } - - public NightVisionUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public NightVisionUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.nightVision", createUpgradeItem(), Config.darkSteelNightVisionCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { - return false; + public NightVisionUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.nightVision", + createUpgradeItem(), + Config.darkSteelNightVisionCost); } - NightVisionUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { + return false; + } + NightVisionUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java index 1eea72ca..f1358f87 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java @@ -2,10 +2,7 @@ package crazypants.enderio.item.darksteel.upgrade; import static org.lwjgl.opengl.GL11.glDepthMask; -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -17,114 +14,119 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.client.event.RenderPlayerEvent; +import org.lwjgl.opengl.GL11; public class SolarUpgrade extends AbstractUpgrade { - private static final String KEY_LEVEL = "level"; + private static final String KEY_LEVEL = "level"; - private static final String UPGRADE_NAME = "speedBoost"; + private static final String UPGRADE_NAME = "speedBoost"; - public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); - public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); - public static final SolarUpgrade SOLAR_THREE = new SolarUpgrade("enderio.darksteel.upgrade.solar_three", (byte) 3, Config.darkSteelSolarThreeCost); + public static final SolarUpgrade SOLAR_ONE = + new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); + public static final SolarUpgrade SOLAR_TWO = + new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); + public static final SolarUpgrade SOLAR_THREE = + new SolarUpgrade("enderio.darksteel.upgrade.solar_three", (byte) 3, Config.darkSteelSolarThreeCost); - private Render render; + private Render render; - public static SolarUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static SolarUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + private static ItemStack createUpgradeItem(int level) { + return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + private byte level; + + public SolarUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + level = tag.getByte(KEY_LEVEL); } - return new SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - private static ItemStack createUpgradeItem(int level) { - return new ItemStack(EnderIO.blockSolarPanel,1,level-1); - } - - private byte level; - - public SolarUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - level = tag.getByte(KEY_LEVEL); - } - - public SolarUpgrade(String unlocName, byte level, int levelCost) { - super(UPGRADE_NAME, unlocName, createUpgradeItem(level), levelCost); - this.level = (byte) level; - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)|| !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { - return false; - } - SolarUpgrade up = loadFromItem(stack); - if(up == null) { - return level == 1; - } - return up.level == level - 1; - } - - @Override - public boolean hasUpgrade(ItemStack stack) { - if(!super.hasUpgrade(stack)) { - return false; + public SolarUpgrade(String unlocName, byte level, int levelCost) { + super(UPGRADE_NAME, unlocName, createUpgradeItem(level), levelCost); + this.level = (byte) level; } - SolarUpgrade up = loadFromItem(stack); - if(up == null) { - return false; - } - return up.unlocName.equals(unlocName); - } - - @Override - public ItemStack getUpgradeItem() { - return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - upgradeRoot.setByte(KEY_LEVEL, level); - } - - public int getRFPerSec() { - if(level==0) return Config.darkSteelSolarOneGen; - if(level==1) return Config.darkSteelSolarTwoGen; - else return Config.darkSteelSolarThreeGen; - - } - - @Override - @SideOnly(Side.CLIENT) - public IRenderUpgrade getRender() { - return render == null ? render = new Render() : render; - } - - @SideOnly(Side.CLIENT) - private class Render implements IRenderUpgrade { - - private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); @Override - public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { - if (head) { - RenderUtil.bindItemTexture(); - glDepthMask(true); - item.hoverStart = 0; - Helper.translateToHeadLevel(event.entityPlayer); - GL11.glTranslated(0, -0.155, 0); - GL11.glRotated(180, 1, 0, 0); - GL11.glScalef(2.1f, 2.1f, 2.1f); - byte level = loadFromItem(stack).level; - item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level-1)); - RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); - } + public boolean canAddToItem(ItemStack stack) { + if (stack == null + || !DarkSteelItems.isArmorPart(stack.getItem(), 0) + || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + return false; + } + SolarUpgrade up = loadFromItem(stack); + if (up == null) { + return level == 1; + } + return up.level == level - 1; + } + + @Override + public boolean hasUpgrade(ItemStack stack) { + if (!super.hasUpgrade(stack)) { + return false; + } + SolarUpgrade up = loadFromItem(stack); + if (up == null) { + return false; + } + return up.unlocName.equals(unlocName); + } + + @Override + public ItemStack getUpgradeItem() { + return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setByte(KEY_LEVEL, level); + } + + public int getRFPerSec() { + if (level == 0) return Config.darkSteelSolarOneGen; + if (level == 1) return Config.darkSteelSolarTwoGen; + else return Config.darkSteelSolarThreeGen; + } + + @Override + @SideOnly(Side.CLIENT) + public IRenderUpgrade getRender() { + return render == null ? render = new Render() : render; + } + + @SideOnly(Side.CLIENT) + private class Render implements IRenderUpgrade { + + private EntityItem item = new EntityItem(Minecraft.getMinecraft().theWorld); + + @Override + public void render(RenderPlayerEvent event, ItemStack stack, boolean head) { + if (head) { + RenderUtil.bindItemTexture(); + glDepthMask(true); + item.hoverStart = 0; + Helper.translateToHeadLevel(event.entityPlayer); + GL11.glTranslated(0, -0.155, 0); + GL11.glRotated(180, 1, 0, 0); + GL11.glScalef(2.1f, 2.1f, 2.1f); + byte level = loadFromItem(stack).level; + item.setEntityItemStack(new ItemStack(EnderIO.blockSolarPanel, 1, level - 1)); + RenderManager.instance.renderEntityWithPosYaw(item, 0, 0, 0, 0, 0); + } + } } - } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java index fba77422..062254b1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SoundDetectorUpgrade.java @@ -8,45 +8,48 @@ import net.minecraft.nbt.NBTTagCompound; public class SoundDetectorUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "soundDetector"; + private static String UPGRADE_NAME = "soundDetector"; - public static final SoundDetectorUpgrade INSTANCE = new SoundDetectorUpgrade(); + public static final SoundDetectorUpgrade INSTANCE = new SoundDetectorUpgrade(); - public static SoundDetectorUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static SoundDetectorUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SoundDetectorUpgrade( + (NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public SoundDetectorUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public SoundDetectorUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.sound", + new ItemStack(Blocks.noteblock), + Config.darkSteelSoundLocatorCost); } - return new SoundDetectorUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public SoundDetectorUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public SoundDetectorUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.sound", new ItemStack(Blocks.noteblock), Config.darkSteelSoundLocatorCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { - return false; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { + return false; + } + SoundDetectorUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; } - SoundDetectorUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } -} \ No newline at end of file + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java index a446af09..6b845994 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpeedUpgrade.java @@ -1,112 +1,117 @@ package crazypants.enderio.item.darksteel.upgrade; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionHelper; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; public class SpeedUpgrade extends AbstractUpgrade { - private static final String KEY_LEVEL = "level"; + private static final String KEY_LEVEL = "level"; - private static final String KEY_MULTIPLIER = "multiplier"; + private static final String KEY_MULTIPLIER = "multiplier"; - private static String UPGRADE_NAME = "speedBoost"; + private static String UPGRADE_NAME = "speedBoost"; - public static float[] WALK_MULTIPLIERS = new float[] { - Config.darkSteelSpeedOneWalkModifier, - Config.darkSteelSpeedTwoWalkMultiplier, - Config.darkSteelSpeedThreeWalkMultiplier - }; + public static float[] WALK_MULTIPLIERS = new float[] { + Config.darkSteelSpeedOneWalkModifier, + Config.darkSteelSpeedTwoWalkMultiplier, + Config.darkSteelSpeedThreeWalkMultiplier + }; - public static float[] SPRINT_MULTIPLIERS = new float[] { - Config.darkSteelSpeedOneSprintModifier, - Config.darkSteelSpeedTwoSprintMultiplier, - Config.darkSteelSpeedThreeSprintMultiplier - }; + public static float[] SPRINT_MULTIPLIERS = new float[] { + Config.darkSteelSpeedOneSprintModifier, + Config.darkSteelSpeedTwoSprintMultiplier, + Config.darkSteelSpeedThreeSprintMultiplier + }; - public static SpeedUpgrade SPEED_ONE = new SpeedUpgrade("enderio.darksteel.upgrade.speed_one", 1, Config.darkSteelSpeedOneCost); - public static SpeedUpgrade SPEED_TWO = new SpeedUpgrade("enderio.darksteel.upgrade.speed_two", 2, Config.darkSteelSpeedTwoCost); - public static SpeedUpgrade SPEED_THREE = new SpeedUpgrade("enderio.darksteel.upgrade.speed_three", 3, Config.darkSteelSpeedThreeCost); + public static SpeedUpgrade SPEED_ONE = + new SpeedUpgrade("enderio.darksteel.upgrade.speed_one", 1, Config.darkSteelSpeedOneCost); + public static SpeedUpgrade SPEED_TWO = + new SpeedUpgrade("enderio.darksteel.upgrade.speed_two", 2, Config.darkSteelSpeedTwoCost); + public static SpeedUpgrade SPEED_THREE = + new SpeedUpgrade("enderio.darksteel.upgrade.speed_three", 3, Config.darkSteelSpeedThreeCost); - private short level; - private float walkMultiplier; - protected float sprintMultiplier; + private short level; + private float walkMultiplier; + protected float sprintMultiplier; - public static boolean isEquipped(EntityPlayer player) { - ItemStack legs = player.getEquipmentInSlot(2); - return loadFromItem(legs) != null; - } - - public static SpeedUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static boolean isEquipped(EntityPlayer player) { + ItemStack legs = player.getEquipmentInSlot(2); + return loadFromItem(legs) != null; } - if(stack.stackTagCompound == null) { - return null; + + public static SpeedUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SpeedUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + private static ItemStack createUpgradeItem() { + ItemStack pot = new ItemStack(Items.potionitem, 1, 0); + int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); + res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); + pot.setItemDamage(res); + return pot; } - return new SpeedUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - private static ItemStack createUpgradeItem() { - ItemStack pot = new ItemStack(Items.potionitem, 1, 0); - int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); - res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); - pot.setItemDamage(res); - return pot; - } - - public SpeedUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - this.level = tag.getShort(KEY_LEVEL); - } - - public SpeedUpgrade(String unlocName, int level, int levelCost) { - super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost); - this.level = (short) level; - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 2) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { - return false; + public SpeedUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + this.level = tag.getShort(KEY_LEVEL); } - SpeedUpgrade up = loadFromItem(stack); - if(up == null) { - return getLevel() == 1; + + public SpeedUpgrade(String unlocName, int level, int levelCost) { + super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost); + this.level = (short) level; } - return up.getLevel() == getLevel() - 1; - } - @Override - public boolean hasUpgrade(ItemStack stack) { - if(!super.hasUpgrade(stack)) { - return false; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null + || !DarkSteelItems.isArmorPart(stack.getItem(), 2) + || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + return false; + } + SpeedUpgrade up = loadFromItem(stack); + if (up == null) { + return getLevel() == 1; + } + return up.getLevel() == getLevel() - 1; } - SpeedUpgrade up = loadFromItem(stack); - if(up == null) { - return false; + + @Override + public boolean hasUpgrade(ItemStack stack) { + if (!super.hasUpgrade(stack)) { + return false; + } + SpeedUpgrade up = loadFromItem(stack); + if (up == null) { + return false; + } + return up.unlocName.equals(unlocName); } - return up.unlocName.equals(unlocName); - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - upgradeRoot.setShort(KEY_LEVEL, getLevel()); - upgradeRoot.setFloat(KEY_MULTIPLIER, getWalkMultiplier()); - } + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setShort(KEY_LEVEL, getLevel()); + upgradeRoot.setFloat(KEY_MULTIPLIER, getWalkMultiplier()); + } - public short getLevel() { - return level; - } + public short getLevel() { + return level; + } - public float getWalkMultiplier() { - return walkMultiplier; - } + public float getWalkMultiplier() { + return walkMultiplier; + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java index 800340e4..393a43fe 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SpoonUpgrade.java @@ -8,47 +8,50 @@ import net.minecraft.nbt.NBTTagCompound; public class SpoonUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "spoon"; + private static String UPGRADE_NAME = "spoon"; - public static final SpoonUpgrade INSTANCE = new SpoonUpgrade(); + public static final SpoonUpgrade INSTANCE = new SpoonUpgrade(); - public static SpoonUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static SpoonUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SpoonUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public SpoonUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public SpoonUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.spoon", + new ItemStack(Items.diamond_shovel), + Config.darkSteelSpoonCost); } - return new SpoonUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public SpoonUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public SpoonUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.spoon", new ItemStack(Items.diamond_shovel), Config.darkSteelSpoonCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { - return false; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null + || (stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe + && stack.getItem() != DarkSteelItems.itemEndSteelPickaxe) + || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + return false; + } + SpoonUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; } - SpoonUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } - + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java index 982ff91b..407fc435 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/SwimUpgrade.java @@ -8,47 +8,47 @@ import net.minecraft.nbt.NBTTagCompound; public class SwimUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "swim"; + private static String UPGRADE_NAME = "swim"; - public static final SwimUpgrade INSTANCE = new SwimUpgrade(); + public static final SwimUpgrade INSTANCE = new SwimUpgrade(); - public static SwimUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static SwimUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SwimUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public SwimUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public SwimUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.swim", + new ItemStack(Blocks.waterlily), + Config.darkSteelSwimCost); } - return new SwimUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public SwimUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public SwimUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.swim", new ItemStack(Blocks.waterlily), Config.darkSteelSwimCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3)) { - return false; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 3)) { + return false; + } + SwimUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; } - SwimUpgrade up = loadFromItem(stack); - if(up == null) { - return true; - } - return false; - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } - + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java index 760fbed1..2870b557 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/TravelUpgrade.java @@ -4,54 +4,59 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.material.Material; +import java.util.stream.Stream; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import java.util.stream.Stream; - public class TravelUpgrade extends AbstractUpgrade { - private static final String UPGRADE_NAME = "travel"; + private static final String UPGRADE_NAME = "travel"; - public static final TravelUpgrade INSTANCE = new TravelUpgrade(); + public static final TravelUpgrade INSTANCE = new TravelUpgrade(); - public static TravelUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static TravelUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new TravelUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public TravelUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public TravelUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.travel", + new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), + Config.darkSteelTravelCost); } - return new TravelUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - - public TravelUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public TravelUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.travel", new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), Config.darkSteelTravelCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null) return false; - if(Stream.of( - DarkSteelItems.itemDarkSteelSword, DarkSteelItems.itemEndSteelSword, DarkSteelItems.itemStellarSword, - DarkSteelItems.itemDarkSteelPickaxe, DarkSteelItems.itemEndSteelPickaxe, DarkSteelItems.itemStellarPickaxe, - DarkSteelItems.itemEndSteelAxe, DarkSteelItems.itemStellarAxe - ).anyMatch(item -> stack.getItem() == item)) { - return EnergyUpgrade.itemHasAnyPowerUpgrade(stack) && loadFromItem(stack) == null; + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null) return false; + if (Stream.of( + DarkSteelItems.itemDarkSteelSword, + DarkSteelItems.itemEndSteelSword, + DarkSteelItems.itemStellarSword, + DarkSteelItems.itemDarkSteelPickaxe, + DarkSteelItems.itemEndSteelPickaxe, + DarkSteelItems.itemStellarPickaxe, + DarkSteelItems.itemEndSteelAxe, + DarkSteelItems.itemStellarAxe) + .anyMatch(item -> stack.getItem() == item)) { + return EnergyUpgrade.itemHasAnyPowerUpgrade(stack) && loadFromItem(stack) == null; + } + return false; } - return false; - } - - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} } diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index 2e3345ae..add7c49f 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -1,5 +1,11 @@ package crazypants.enderio.item.skull; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -9,127 +15,115 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.crafting.IInfusionStabiliser; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; @Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft") public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser { - public static int renderId = -1; + public static int renderId = -1; - public enum SkullType { + public enum SkullType { + BASE("base", false), + REANIMATED("reanimated", true), + TORMENTED("tormented", false), + REANIMATED_TORMENTED("reanimatedTormented", true); - BASE("base",false), - REANIMATED("reanimated",true), - TORMENTED("tormented",false), - REANIMATED_TORMENTED("reanimatedTormented",true); + final String name; + final boolean showEyes; - final String name; - final boolean showEyes; - - - SkullType(String name, boolean showEyes) { - this.name = name; - this.showEyes = showEyes; + SkullType(String name, boolean showEyes) { + this.name = name; + this.showEyes = showEyes; + } } - } - public static BlockEndermanSkull create() { - BlockEndermanSkull res = new BlockEndermanSkull(); - res.init(); - return res; - } - - IIcon frontIcon; - IIcon frontIconEyes; - IIcon sideIcon; - IIcon topIcon; - - private BlockEndermanSkull() { - super(ModObject.blockEndermanSkull.unlocalisedName, TileEndermanSkull.class, Material.circuits); - setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); - } - - - - @Override - protected void init() { - GameRegistry.registerBlock(this, ItemEndermanSkull.class, name); - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); - } - - - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - frontIcon = iIconRegister.registerIcon("enderio:endermanSkullFront"); - frontIconEyes = iIconRegister.registerIcon("enderio:endermanSkullFrontEyes"); - sideIcon = iIconRegister.registerIcon("enderio:endermanSkullSide"); - topIcon = iIconRegister.registerIcon("enderio:endermanSkullTop"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - ForgeDirection orint = ForgeDirection.getOrientation(side); - if(orint == ForgeDirection.NORTH) { - meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); - return SkullType.values()[meta].showEyes ? frontIconEyes : frontIcon; + public static BlockEndermanSkull create() { + BlockEndermanSkull res = new BlockEndermanSkull(); + res.init(); + return res; } - if(orint == ForgeDirection.UP || orint == ForgeDirection.DOWN || orint == ForgeDirection.SOUTH) { - return topIcon; + + IIcon frontIcon; + IIcon frontIconEyes; + IIcon sideIcon; + IIcon topIcon; + + private BlockEndermanSkull() { + super(ModObject.blockEndermanSkull.unlocalisedName, TileEndermanSkull.class, Material.circuits); + setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); } - return sideIcon; - } - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public String getItemIconName() { - return "enderio:endermanSkull"; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - - int inc = MathHelper.floor_double(player.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; - float facingYaw = -22.5f * inc; - TileEndermanSkull te = (TileEndermanSkull) world.getTileEntity(x, y, z); - te.setYaw(facingYaw); - if(world.isRemote) { - return; + @Override + protected void init() { + GameRegistry.registerBlock(this, ItemEndermanSkull.class, name); + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); } - world.setBlockMetadataWithNotify(x, y, z, stack.getItemDamage(), 2); - world.markBlockForUpdate(x, y, z); - } - @Override - public int damageDropped(int meta) { - return meta; - } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + frontIcon = iIconRegister.registerIcon("enderio:endermanSkullFront"); + frontIconEyes = iIconRegister.registerIcon("enderio:endermanSkullFrontEyes"); + sideIcon = iIconRegister.registerIcon("enderio:endermanSkullSide"); + topIcon = iIconRegister.registerIcon("enderio:endermanSkullTop"); + } - @Override - @Optional.Method(modid = "Thaumcraft") - public boolean canStabaliseInfusion(World world, int x, int y, int z) { - return true; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + ForgeDirection orint = ForgeDirection.getOrientation(side); + if (orint == ForgeDirection.NORTH) { + meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); + return SkullType.values()[meta].showEyes ? frontIconEyes : frontIcon; + } + if (orint == ForgeDirection.UP || orint == ForgeDirection.DOWN || orint == ForgeDirection.SOUTH) { + return topIcon; + } + return sideIcon; + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public String getItemIconName() { + return "enderio:endermanSkull"; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + + int inc = MathHelper.floor_double(player.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; + float facingYaw = -22.5f * inc; + TileEndermanSkull te = (TileEndermanSkull) world.getTileEntity(x, y, z); + te.setYaw(facingYaw); + if (world.isRemote) { + return; + } + world.setBlockMetadataWithNotify(x, y, z, stack.getItemDamage(), 2); + world.markBlockForUpdate(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + @Optional.Method(modid = "Thaumcraft") + public boolean canStabaliseInfusion(World world, int x, int y, int z) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java index e62dd004..55576833 100644 --- a/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java +++ b/src/main/java/crazypants/enderio/item/skull/EndermanSkullRenderer.java @@ -1,5 +1,12 @@ package crazypants.enderio.item.skull; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.client.render.VertexRotation; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -9,162 +16,148 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.client.render.VertexRotation; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; - public class EndermanSkullRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - public EndermanSkullRenderer() { - } + public EndermanSkullRenderer() {} - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - System.out.println("EndermanSkullRenderer.renderInventoryBlock: "); - - renderWorldBlock(null, 0, 0, 0, block, modelId, renderer); - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + System.out.println("EndermanSkullRenderer.renderInventoryBlock: "); - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - int meta = 0; - if(world != null) { - meta = world.getBlockMetadata(x, y, z); + renderWorldBlock(null, 0, 0, 0, block, modelId, renderer); } - return renderWorldBlock(world, x, y, z, block, modelId, renderer, meta); - } - - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer, int meta) { - Tessellator tes = Tessellator.instance; - tes.addTranslation(x, y, z); - tes.setColorOpaque_F(1, 1, 1); - - int brightness; - if(world == null) { - brightness = 15 << 20 | 15 << 4; - } else { - brightness = world.getLightBrightnessForSkyBlocks(x, y, z, 0); + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + int meta = 0; + if (world != null) { + meta = world.getBlockMetadata(x, y, z); + } + return renderWorldBlock(world, x, y, z, block, modelId, renderer, meta); } - tes.setBrightness(brightness); - - IIcon[] icons = new IIcon[6]; - for(int i=0;i 1) { + renderBolts(rot, size); + } + } + + tes.addTranslation(-x, -y, -z); + + return true; } - - float yaw = 180; - if(world != null) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEndermanSkull) { - yaw = ((TileEndermanSkull)te).yaw; - } + + private void renderBolts(VertexRotation rot, float size) { + BoundingBox bb; + float boltSize = size / 3; + BoundingBox baseBolt = BoundingBox.UNIT_CUBE.scale(boltSize, boltSize, boltSize); + IIcon icon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0); + + float offset = 0.15f; + bb = baseBolt.translate(size + boltSize / 2, -0.15f, offset); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate(size + boltSize / 2, -0.15f, -offset); + CubeRenderer.render(bb, icon, rot, true); + + bb = baseBolt.translate(-(size + boltSize / 2), -0.15f, offset); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate(-(size + boltSize / 2), -0.15f, -offset); + CubeRenderer.render(bb, icon, rot, true); + + bb = baseBolt.translate(-offset, -0.15f, -(size + boltSize / 2)); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate(offset, -0.15f, -(size + boltSize / 2)); + CubeRenderer.render(bb, icon, rot, true); + + bb = baseBolt.translate(offset, -0.15f, (size + boltSize / 2)); + CubeRenderer.render(bb, icon, rot, true); + bb = baseBolt.translate(-offset, -0.15f, (size + boltSize / 2)); + CubeRenderer.render(bb, icon, rot, true); } - - VertexRotation rot = new VertexRotation(Math.toRadians(yaw), new Vector3d(0,1,0), new Vector3d(0.5,0,0.5)); - - float size = 0.25f; - float height = 0.5f; - BoundingBox bb = new BoundingBox(size, 0, size, 1 - size, height, 1 - size); - if (renderer.hasOverrideBlockTexture()) { - CubeRenderer.render(bb, renderer.overrideBlockTexture, rot); - } else { - CubeRenderer.render(bb, icons, rot, true); - if(meta > 1) { - renderBolts(rot, size); - } + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; } - - tes.addTranslation(-x, -y, -z); - return true; - } - - private void renderBolts(VertexRotation rot, float size) { - BoundingBox bb; - float boltSize = size/3; - BoundingBox baseBolt = BoundingBox.UNIT_CUBE.scale(boltSize ,boltSize , boltSize); - IIcon icon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0); - - float offset = 0.15f; - bb = baseBolt.translate(size + boltSize/2, -0.15f, offset); - CubeRenderer.render(bb, icon, rot, true); - bb = baseBolt.translate(size + boltSize/2, -0.15f, -offset); - CubeRenderer.render(bb, icon, rot, true); - - bb = baseBolt.translate( -(size + boltSize/2), -0.15f, offset); - CubeRenderer.render(bb, icon, rot, true); - bb = baseBolt.translate( -(size + boltSize/2), -0.15f, -offset); - CubeRenderer.render(bb, icon, rot, true); - - - bb = baseBolt.translate( -offset, -0.15f, -(size + boltSize/2)); - CubeRenderer.render(bb, icon, rot, true); - bb = baseBolt.translate( offset, -0.15f, -(size + boltSize/2)); - CubeRenderer.render(bb, icon, rot, true); - - bb = baseBolt.translate( offset, -0.15f, (size + boltSize/2)); - CubeRenderer.render(bb, icon, rot, true); - bb = baseBolt.translate( -offset, -0.15f, (size + boltSize/2)); - CubeRenderer.render(bb, icon, rot, true); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockEndermanSkull.renderId; - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - Tessellator.instance.startDrawingQuads(); - GL11.glPushMatrix(); - float scale = 2.5f; - float xTrans = -0.5f; - float yTrans = 0; - float zTrans = -0.5f; - if(type == ItemRenderType.INVENTORY) { - yTrans = -0.25f; - scale = 1.8f; - } else if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - scale = 1.8f; - yTrans = 0f; - zTrans = -0.25f; - xTrans = -0.25f; + @Override + public int getRenderId() { + return BlockEndermanSkull.renderId; + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + Tessellator.instance.startDrawingQuads(); + GL11.glPushMatrix(); + float scale = 2.5f; + float xTrans = -0.5f; + float yTrans = 0; + float zTrans = -0.5f; + if (type == ItemRenderType.INVENTORY) { + yTrans = -0.25f; + scale = 1.8f; + } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + scale = 1.8f; + yTrans = 0f; + zTrans = -0.25f; + xTrans = -0.25f; + } + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(xTrans, yTrans, zTrans); + RenderUtil.bindBlockTexture(); + renderWorldBlock( + null, 0, 0, 0, EnderIO.blockEndermanSkull, getRenderId(), (RenderBlocks) data[0], item.getItemDamage()); + + Tessellator.instance.draw(); + GL11.glPopMatrix(); } - GL11.glScalef(scale, scale, scale); - GL11.glTranslatef(xTrans, yTrans, zTrans); - RenderUtil.bindBlockTexture(); - renderWorldBlock(null, 0, 0, 0, EnderIO.blockEndermanSkull, getRenderId(), (RenderBlocks)data[0], item.getItemDamage()); - - Tessellator.instance.draw(); - GL11.glPopMatrix(); - - } - } diff --git a/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java index 0f6ad521..fce2ae22 100644 --- a/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/ItemEndermanSkull.java @@ -1,41 +1,39 @@ package crazypants.enderio.item.skull; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; public class ItemEndermanSkull extends ItemBlockWithMetadata { - public ItemEndermanSkull(Block block) { - super(block, block); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); - return "tile.blockEndermanSkull." + SkullType.values()[meta].name; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < SkullType.values().length; ++j) { - if(!SkullType.values()[j].showEyes) { - par3List.add(new ItemStack(par1, 1, j)); - } + public ItemEndermanSkull(Block block) { + super(block, block); + setCreativeTab(EnderIOTab.tabEnderIO); } - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + meta = MathHelper.clamp_int(meta, 0, SkullType.values().length - 1); + return "tile.blockEndermanSkull." + SkullType.values()[meta].name; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < SkullType.values().length; ++j) { + if (!SkullType.values()[j].showEyes) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + } } diff --git a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java index e92c9115..766dba9a 100644 --- a/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/TileEndermanSkull.java @@ -5,25 +5,24 @@ import net.minecraft.nbt.NBTTagCompound; public class TileEndermanSkull extends TileEntityEio { - float yaw; - - @Override - protected void writeCustomNBT(NBTTagCompound root) { - root.setFloat("yaw", yaw); - } + float yaw; - @Override - protected void readCustomNBT(NBTTagCompound root) { - yaw = root.getFloat("yaw"); - } + @Override + protected void writeCustomNBT(NBTTagCompound root) { + root.setFloat("yaw", yaw); + } - public void setYaw(float yaw) { - this.yaw = yaw; - } + @Override + protected void readCustomNBT(NBTTagCompound root) { + yaw = root.getFloat("yaw"); + } - @Override - public boolean shouldUpdate() { - return false; - } + public void setYaw(float yaw) { + this.yaw = yaw; + } + @Override + public boolean shouldUpdate() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 117d6162..6f535217 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -1,8 +1,19 @@ package crazypants.enderio.machine; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.waila.IWailaInfoProvider; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -17,295 +28,282 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.TileEntityEnder; +public abstract class AbstractMachineBlock extends BlockEio + implements IGuiHandler, IResourceTooltipProvider, IWailaInfoProvider { -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ClientProxy; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.waila.IWailaInfoProvider; + public static int renderId; -public abstract class AbstractMachineBlock extends BlockEio implements IGuiHandler, IResourceTooltipProvider, - IWailaInfoProvider { + public IIcon overlayIconPull; + public IIcon overlayIconPush; + public IIcon overlayIconPushPull; + public IIcon overlayIconDisabled; + public IIcon overlayIconNone; + public IIcon overlayIconDirty; - public static int renderId; + public IIcon selectedFaceIcon; - public IIcon overlayIconPull; - public IIcon overlayIconPush; - public IIcon overlayIconPushPull; - public IIcon overlayIconDisabled; - public IIcon overlayIconNone; - public IIcon overlayIconDirty; + @SideOnly(Side.CLIENT) + protected IIcon[][] iconBuffer; - public IIcon selectedFaceIcon; + protected final Random random; - @SideOnly(Side.CLIENT) - protected IIcon[][] iconBuffer; + protected final ModObject modObject; - protected final Random random; - - protected final ModObject modObject; - - static { - PacketHandler.INSTANCE.registerMessage(PacketIoMode.class, PacketIoMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketItemBuffer.class, PacketItemBuffer.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketPowerStorage.class, PacketPowerStorage.class, PacketHandler.nextID(), Side.CLIENT); - } - - protected AbstractMachineBlock(ModObject mo, Class teClass, Material mat) { - super(mo.unlocalisedName, teClass, mat); - modObject = mo; - setHardness(2.0F); - setStepSound(soundTypeMetal); - setHarvestLevel("pickaxe", 0); - random = new Random(); - } - - protected AbstractMachineBlock(ModObject mo, Class teClass) { - this(mo, teClass, new Material(MapColor.ironColor)); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, modObject.unlocalisedName); - GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); - EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, getGuiId(), world, x, y, z); + static { + PacketHandler.INSTANCE.registerMessage( + PacketIoMode.class, PacketIoMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketItemBuffer.class, PacketItemBuffer.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketPowerStorage.class, PacketPowerStorage.class, PacketHandler.nextID(), Side.CLIENT); } - return true; - } - - @Override - public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata) { - return false; - } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - - iconBuffer = new IIcon[2][12]; - String side = getSideIconKey(false); - // first the 6 sides in OFF state - iconBuffer[0][0] = iIconRegister.registerIcon(getBottomIconKey(false)); - iconBuffer[0][1] = iIconRegister.registerIcon(getTopIconKey(false)); - iconBuffer[0][2] = iIconRegister.registerIcon(getBackIconKey(false)); - iconBuffer[0][3] = iIconRegister.registerIcon(getMachineFrontIconKey(false)); - iconBuffer[0][4] = iIconRegister.registerIcon(side); - iconBuffer[0][5] = iIconRegister.registerIcon(side); - - side = getSideIconKey(true); - iconBuffer[0][6] = iIconRegister.registerIcon(getBottomIconKey(true)); - iconBuffer[0][7] = iIconRegister.registerIcon(getTopIconKey(true)); - iconBuffer[0][8] = iIconRegister.registerIcon(getBackIconKey(true)); - iconBuffer[0][9] = iIconRegister.registerIcon(getMachineFrontIconKey(true)); - iconBuffer[0][10] = iIconRegister.registerIcon(side); - iconBuffer[0][11] = iIconRegister.registerIcon(side); - - iconBuffer[1][0] = iIconRegister.registerIcon(getModelIconKey(false)); - iconBuffer[1][1] = iIconRegister.registerIcon(getModelIconKey(true)); - - registerOverlayIcons(iIconRegister); - - } - - @SideOnly(Side.CLIENT) - protected void registerOverlayIcons(IIconRegister iIconRegister) { - overlayIconPull = iIconRegister.registerIcon("enderio:overlays/pull"); - overlayIconPush = iIconRegister.registerIcon("enderio:overlays/push"); - overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/pushPull"); - overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/disabled"); - overlayIconNone = iIconRegister.registerIcon("enderio:overlays/none"); - selectedFaceIcon = iIconRegister.registerIcon("enderio:overlays/selectedFace"); - overlayIconDirty = iIconRegister.registerIcon("enderio:overlays/dirt"); - } - - @SideOnly(Side.CLIENT) - public IIcon getOverlayIconForMode(T tile, ForgeDirection face, IoMode mode) { - if(mode == null) { - return null; + protected AbstractMachineBlock(ModObject mo, Class teClass, Material mat) { + super(mo.unlocalisedName, teClass, mat); + modObject = mo; + setHardness(2.0F); + setStepSound(soundTypeMetal); + setHarvestLevel("pickaxe", 0); + random = new Random(); } - switch (mode) { - case DISABLED: - return overlayIconDisabled; - case PULL: - return overlayIconPull; - case PUSH: - return overlayIconPush; - case PUSH_PULL: - return overlayIconPushPull; - default: - return tile.isDirty ? overlayIconDirty : null; + + protected AbstractMachineBlock(ModObject mo, Class teClass) { + this(mo, teClass, new Material(MapColor.ironColor)); } - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - - // used to render the block in the world - TileEntity te = world.getTileEntity(x, y, z); - int facing = 3; - if(te instanceof AbstractMachineEntity) { - AbstractMachineEntity me = (AbstractMachineEntity) te; - facing = me.facing; + @Override + protected void init() { + GameRegistry.registerBlock(this, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } - if(isActive(world, x, y, z)) { - return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] + 6]; - } else { - return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing]]; + + @Override + public int getRenderType() { + return renderId; } - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - // This is used to render the block as an item - return iconBuffer[0][blockSide]; - } - - public IIcon getModelIcon(IBlockAccess world, int x, int y, int z) { - return getModelIcon(((AbstractMachineEntity) world.getTileEntity(x, y, z)).isActive()); - } - - public IIcon getModelIcon() { - return getModelIcon(false); - } - - private IIcon getModelIcon(boolean active) { - return active ? iconBuffer[1][1] : iconBuffer[1][0]; - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack stack) { - if(te != null) { - ((AbstractMachineEntity) te).writeToItemStack(stack); + @Override + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, getGuiId(), world, x, y, z); + } + return true; } - } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, player, stack); - int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - AbstractMachineEntity te = (AbstractMachineEntity) world.getTileEntity(x, y, z); - te.setFacing(getFacingForHeading(heading)); - te.readFromItemStack(stack); - if(world.isRemote) { - return; + @Override + public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata) { + return false; } - world.markBlockForUpdate(x, y, z); - } - protected short getFacingForHeading(int heading) { - switch (heading) { - case 0: - return 2; - case 1: - return 5; - case 2: - return 3; - case 3: - default: - return 4; + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + + iconBuffer = new IIcon[2][12]; + String side = getSideIconKey(false); + // first the 6 sides in OFF state + iconBuffer[0][0] = iIconRegister.registerIcon(getBottomIconKey(false)); + iconBuffer[0][1] = iIconRegister.registerIcon(getTopIconKey(false)); + iconBuffer[0][2] = iIconRegister.registerIcon(getBackIconKey(false)); + iconBuffer[0][3] = iIconRegister.registerIcon(getMachineFrontIconKey(false)); + iconBuffer[0][4] = iIconRegister.registerIcon(side); + iconBuffer[0][5] = iIconRegister.registerIcon(side); + + side = getSideIconKey(true); + iconBuffer[0][6] = iIconRegister.registerIcon(getBottomIconKey(true)); + iconBuffer[0][7] = iIconRegister.registerIcon(getTopIconKey(true)); + iconBuffer[0][8] = iIconRegister.registerIcon(getBackIconKey(true)); + iconBuffer[0][9] = iIconRegister.registerIcon(getMachineFrontIconKey(true)); + iconBuffer[0][10] = iIconRegister.registerIcon(side); + iconBuffer[0][11] = iIconRegister.registerIcon(side); + + iconBuffer[1][0] = iIconRegister.registerIcon(getModelIconKey(false)); + iconBuffer[1][1] = iIconRegister.registerIcon(getModelIconKey(true)); + + registerOverlayIcons(iIconRegister); } - } - @Override - public void onBlockAdded(World world, int x, int y, int z) { - super.onBlockAdded(world, x, y, z); - world.markBlockForUpdate(x, y, z); - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - TileEntity ent = world.getTileEntity(x, y, z); - if(ent instanceof AbstractMachineEntity) { - AbstractMachineEntity te = (AbstractMachineEntity) ent; - te.onNeighborBlockChange(blockId); + @SideOnly(Side.CLIENT) + protected void registerOverlayIcons(IIconRegister iIconRegister) { + overlayIconPull = iIconRegister.registerIcon("enderio:overlays/pull"); + overlayIconPush = iIconRegister.registerIcon("enderio:overlays/push"); + overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/pushPull"); + overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/disabled"); + overlayIconNone = iIconRegister.registerIcon("enderio:overlays/none"); + selectedFaceIcon = iIconRegister.registerIcon("enderio:overlays/selectedFace"); + overlayIconDirty = iIconRegister.registerIcon("enderio:overlays/dirt"); } - } - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - // If active, randomly throw some smoke around - if(isActive(world, x, y, z)) { - float startX = x + 1.0F; - float startY = y + 1.0F; - float startZ = z + 1.0F; - for (int i = 0; i < 4; i++) { - float xOffset = -0.2F - rand.nextFloat() * 0.6F; - float yOffset = -0.1F + rand.nextFloat() * 0.2F; - float zOffset = -0.2F - rand.nextFloat() * 0.6F; - world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); - } + @SideOnly(Side.CLIENT) + public IIcon getOverlayIconForMode(T tile, ForgeDirection face, IoMode mode) { + if (mode == null) { + return null; + } + switch (mode) { + case DISABLED: + return overlayIconDisabled; + case PULL: + return overlayIconPull; + case PUSH: + return overlayIconPush; + case PUSH_PULL: + return overlayIconPushPull; + default: + return tile.isDirty ? overlayIconDirty : null; + } } - } - protected abstract int getGuiId(); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - protected abstract String getMachineFrontIconKey(boolean active); - - protected String getSideIconKey(boolean active) { - return "enderio:machineSide"; - } - - protected String getBackIconKey(boolean active) { - return "enderio:machineBack"; - } - - protected String getTopIconKey(boolean active) { - return "enderio:machineTop"; - } - - protected String getBottomIconKey(boolean active) { - return "enderio:machineBottom"; - } - - protected String getModelIconKey(boolean active) { - return getSideIconKey(active); - } - - protected boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity) { - return ((AbstractMachineEntity) te).isActive(); + // used to render the block in the world + TileEntity te = world.getTileEntity(x, y, z); + int facing = 3; + if (te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity) te; + facing = me.facing; + } + if (isActive(world, x, y, z)) { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] + 6]; + } else { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing]]; + } } - return false; - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int blockSide, int blockMeta) { + // This is used to render the block as an item + return iconBuffer[0][blockSide]; + } - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - } + public IIcon getModelIcon(IBlockAccess world, int x, int y, int z) { + return getModelIcon(((AbstractMachineEntity) world.getTileEntity(x, y, z)).isActive()); + } - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.ALL_BITS; - } + public IIcon getModelIcon() { + return getModelIcon(false); + } + + private IIcon getModelIcon(boolean active) { + return active ? iconBuffer[1][1] : iconBuffer[1][0]; + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack stack) { + if (te != null) { + ((AbstractMachineEntity) te).writeToItemStack(stack); + } + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + AbstractMachineEntity te = (AbstractMachineEntity) world.getTileEntity(x, y, z); + te.setFacing(getFacingForHeading(heading)); + te.readFromItemStack(stack); + if (world.isRemote) { + return; + } + world.markBlockForUpdate(x, y, z); + } + + protected short getFacingForHeading(int heading) { + switch (heading) { + case 0: + return 2; + case 1: + return 5; + case 2: + return 3; + case 3: + default: + return 4; + } + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + super.onBlockAdded(world, x, y, z); + world.markBlockForUpdate(x, y, z); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + TileEntity ent = world.getTileEntity(x, y, z); + if (ent instanceof AbstractMachineEntity) { + AbstractMachineEntity te = (AbstractMachineEntity) ent; + te.onNeighborBlockChange(blockId); + } + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // If active, randomly throw some smoke around + if (isActive(world, x, y, z)) { + float startX = x + 1.0F; + float startY = y + 1.0F; + float startZ = z + 1.0F; + for (int i = 0; i < 4; i++) { + float xOffset = -0.2F - rand.nextFloat() * 0.6F; + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = -0.2F - rand.nextFloat() * 0.6F; + world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + } + } + } + + protected abstract int getGuiId(); + + protected abstract String getMachineFrontIconKey(boolean active); + + protected String getSideIconKey(boolean active) { + return "enderio:machineSide"; + } + + protected String getBackIconKey(boolean active) { + return "enderio:machineBack"; + } + + protected String getTopIconKey(boolean active) { + return "enderio:machineTop"; + } + + protected String getBottomIconKey(boolean active) { + return "enderio:machineBottom"; + } + + protected String getModelIconKey(boolean active) { + return getSideIconKey(active); + } + + protected boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { + TileEntity te = blockAccess.getTileEntity(x, y, z); + if (te instanceof AbstractMachineEntity) { + return ((AbstractMachineEntity) te).isActive(); + } + return false; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.ALL_BITS; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 3cdcab3d..53dbf202 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -1,11 +1,19 @@ package crazypants.enderio.machine; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.InventoryWrapper; +import com.enderio.core.common.util.ItemUtil; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.api.redstone.IRedstoneConnectable; +import crazypants.enderio.config.Config; import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import java.util.Random; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -18,681 +26,673 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.InventoryWrapper; -import com.enderio.core.common.util.ItemUtil; +public abstract class AbstractMachineEntity extends TileEntityEio + implements ISidedInventory, IMachine, IRedstoneModeControlable, IRedstoneConnectable, IIoConfigurable { -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.api.redstone.IRedstoneConnectable; -import crazypants.enderio.config.Config; + public short facing; -public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IMachine, IRedstoneModeControlable, - IRedstoneConnectable, IIoConfigurable { + // Client sync monitoring + protected int ticksSinceSync = -1; + protected boolean forceClientUpdate = true; + protected boolean lastActive; + protected int ticksSinceActiveChanged = 0; - public short facing; + protected ItemStack[] inventory; + protected final SlotDefinition slotDefinition; - // Client sync monitoring - protected int ticksSinceSync = -1; - protected boolean forceClientUpdate = true; - protected boolean lastActive; - protected int ticksSinceActiveChanged = 0; + protected RedstoneControlMode redstoneControlMode; - protected ItemStack[] inventory; - protected final SlotDefinition slotDefinition; + protected boolean redstoneCheckPassed; - protected RedstoneControlMode redstoneControlMode; + private boolean redstoneStateDirty = true; - protected boolean redstoneCheckPassed; + protected Map faceModes; - private boolean redstoneStateDirty = true; + private final int[] allSlots; - protected Map faceModes; + protected boolean notifyNeighbours = false; - private final int[] allSlots; + @SideOnly(Side.CLIENT) + private MachineSound sound; - protected boolean notifyNeighbours = false; + private final ResourceLocation soundRes; - @SideOnly(Side.CLIENT) - private MachineSound sound; + public boolean isDirty = false; - private final ResourceLocation soundRes; - - public boolean isDirty = false; - - public static ResourceLocation getSoundFor(String sound) { - return sound == null ? null : new ResourceLocation(EnderIO.DOMAIN + ":" + sound); - } - - public AbstractMachineEntity(SlotDefinition slotDefinition) { - this.slotDefinition = slotDefinition; - facing = 3; - - inventory = new ItemStack[slotDefinition.getNumSlots()]; - redstoneControlMode = RedstoneControlMode.IGNORE; - soundRes = getSoundFor(getSoundName()); - - allSlots = new int[slotDefinition.getNumSlots()]; - for (int i = 0; i < allSlots.length; i++) { - allSlots[i] = i; + public static ResourceLocation getSoundFor(String sound) { + return sound == null ? null : new ResourceLocation(EnderIO.DOMAIN + ":" + sound); } - } - @Override - public IoMode toggleIoModeForFace(ForgeDirection faceHit) { - IoMode curMode = getIoMode(faceHit); - IoMode mode = curMode.next(); - while (!supportsMode(faceHit, mode)) { - mode = mode.next(); - } - setIoMode(faceHit, mode); - return mode; - } + public AbstractMachineEntity(SlotDefinition slotDefinition) { + this.slotDefinition = slotDefinition; + facing = 3; - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - return true; - } + inventory = new ItemStack[slotDefinition.getNumSlots()]; + redstoneControlMode = RedstoneControlMode.IGNORE; + soundRes = getSoundFor(getSoundName()); - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - if(mode == IoMode.NONE && faceModes == null) { - return; - } - if(faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); - } - faceModes.put(faceHit, mode); - forceClientUpdate = true; - notifyNeighbours = true; - - updateBlock(); - } - - @Override - public void clearAllIoModes() { - if(faceModes != null) { - faceModes = null; - forceClientUpdate = true; - notifyNeighbours = true; - updateBlock(); - } - } - - @Override - public IoMode getIoMode(ForgeDirection face) { - if(faceModes == null) { - return IoMode.NONE; - } - IoMode res = faceModes.get(face); - if(res == null) { - return IoMode.NONE; - } - return res; - } - - public SlotDefinition getSlotDefinition() { - return slotDefinition; - } - - public boolean isValidUpgrade(ItemStack itemstack) { - for (int i = slotDefinition.getMinUpgradeSlot(); i <= slotDefinition.getMaxUpgradeSlot(); i++) { - if(isItemValidForSlot(i, itemstack)) { - return true; - } - } - return false; - } - - public boolean isValidInput(ItemStack itemstack) { - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(isItemValidForSlot(i, itemstack)) { - return true; - } - } - return false; - } - - public boolean isValidOutput(ItemStack itemstack) { - for (int i = slotDefinition.getMinOutputSlot(); i <= slotDefinition.getMaxOutputSlot(); i++) { - if(isItemValidForSlot(i, itemstack)) { - return true; - } - } - return false; - } - - @Override - public final boolean isItemValidForSlot(int i, ItemStack itemstack) { - if(slotDefinition.isUpgradeSlot(i)) { - return itemstack != null && itemstack.getItem() == EnderIO.itemBasicCapacitor && itemstack.getItemDamage() > 0; - } - return isMachineItemValidForSlot(i, itemstack); - } - - protected abstract boolean isMachineItemValidForSlot(int i, ItemStack itemstack); - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return redstoneControlMode; - } - - @Override - public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { - this.redstoneControlMode = redstoneControlMode; - redstoneStateDirty = true; - updateBlock(); - } - - public short getFacing() { - return facing; - } - - public ForgeDirection getFacingDir() { - return ForgeDirection.getOrientation(facing); - } - - public void setFacing(short facing) { - this.facing = facing; - } - - public abstract boolean isActive(); - - public String getSoundName() { - return null; - } - - public boolean hasSound() { - return getSoundName() != null; - } - - public float getVolume() { - return Config.machineSoundVolume; - } - - public float getPitch() { - return 1.0f; - } - - protected boolean shouldPlaySound() { - return isActive() && !isInvalid(); - } - - @SideOnly(Side.CLIENT) - private void updateSound() { - if(Config.machineSoundsEnabled && hasSound()) { - if(shouldPlaySound()) { - if(sound == null) { - sound = new MachineSound(soundRes, xCoord + 0.5f, yCoord + 0.5f, zCoord + 0.5f, getVolume(), getPitch()); - FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound); + allSlots = new int[slotDefinition.getNumSlots()]; + for (int i = 0; i < allSlots.length; i++) { + allSlots[i] = i; } - } else if(sound != null) { - sound.endPlaying(); - sound = null; - } - } - } - - // --- Process Loop - // -------------------------------------------------------------------------- - - @Override - public void doUpdate() { - if(worldObj.isRemote) { - updateEntityClient(); - return; - } // else is server, do all logic only on the server - - boolean requiresClientSync = forceClientUpdate; - boolean prevRedCheck = redstoneCheckPassed; - if(redstoneStateDirty) { - redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); - redstoneStateDirty = false; } - if(shouldDoWorkThisTick(5)) { - requiresClientSync |= doSideIo(); + @Override + public IoMode toggleIoModeForFace(ForgeDirection faceHit) { + IoMode curMode = getIoMode(faceHit); + IoMode mode = curMode.next(); + while (!supportsMode(faceHit, mode)) { + mode = mode.next(); + } + setIoMode(faceHit, mode); + return mode; } - requiresClientSync |= prevRedCheck != redstoneCheckPassed; - - requiresClientSync |= processTasks(redstoneCheckPassed); - - if(requiresClientSync) { - - // this will cause 'getPacketDescription()' to be called and its result - // will be sent to the PacketHandler on the other end of - // client/server connection - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - // And this will make sure our current tile entity state is saved - markDirty(); + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + return true; } - if(notifyNeighbours) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - notifyNeighbours = false; - } - - } - - protected void updateEntityClient() { - // check if the block on the client needs to update its texture - if(isActive() != lastActive) { - ticksSinceActiveChanged++; - if(ticksSinceActiveChanged > 20 || isActive()) { - ticksSinceActiveChanged = 0; - lastActive = isActive(); + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) { + if (mode == IoMode.NONE && faceModes == null) { + return; + } + if (faceModes == null) { + faceModes = new EnumMap(ForgeDirection.class); + } + faceModes.put(faceHit, mode); forceClientUpdate = true; - } + notifyNeighbours = true; + + updateBlock(); } - if(hasSound()) { - updateSound(); - } - - if(forceClientUpdate) { - if (worldObj.rand.nextInt(1024) <= (isDirty ? 256 : 0)) { - isDirty = !isDirty; - } - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - forceClientUpdate = false; - } - } - - protected boolean doSideIo() { - if(faceModes == null) { - return false; - } - - boolean res = false; - Set> ents = faceModes.entrySet(); - for (Entry ent : ents) { - IoMode mode = ent.getValue(); - if(mode.pulls()) { - res = res | doPull(ent.getKey()); - } - if(mode.pushes()) { - res = res | doPush(ent.getKey()); - } - } - return res; - } - - protected boolean doPush(ForgeDirection dir) { - - if(slotDefinition.getNumOutputSlots() <= 0) { - return false; - } - if(!shouldDoWorkThisTick(20)) { - return false; - } - - BlockCoord loc = getLocation().getLocation(dir); - TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); - - return doPush(dir, te, slotDefinition.minOutputSlot, slotDefinition.maxOutputSlot); - } - - protected boolean doPush(ForgeDirection dir, TileEntity te, int minSlot, int maxSlot) { - if(te == null) { - return false; - } - for (int i = minSlot; i <= maxSlot; i++) { - ItemStack item = inventory[i]; - if(item != null) { - int num = ItemUtil.doInsertItem(te, item, dir.getOpposite()); - if(num > 0) { - item.stackSize -= num; - if(item.stackSize <= 0) { - item = null; - } - inventory[i] = item; - markDirty(); + @Override + public void clearAllIoModes() { + if (faceModes != null) { + faceModes = null; + forceClientUpdate = true; + notifyNeighbours = true; + updateBlock(); } - } - } - return false; - } - - protected boolean doPull(ForgeDirection dir) { - - if(slotDefinition.getNumInputSlots() <= 0) { - return false; - } - if(!shouldDoWorkThisTick(20)) { - return false; } - boolean hasSpace = false; - for (int slot = slotDefinition.minInputSlot; slot <= slotDefinition.maxInputSlot && !hasSpace; slot++) { - hasSpace = inventory[slot] == null ? true : inventory[slot].stackSize < Math.min(inventory[slot].getMaxStackSize(), getInventoryStackLimit(slot)); - } - if(!hasSpace) { - return false; + @Override + public IoMode getIoMode(ForgeDirection face) { + if (faceModes == null) { + return IoMode.NONE; + } + IoMode res = faceModes.get(face); + if (res == null) { + return IoMode.NONE; + } + return res; } - BlockCoord loc = getLocation().getLocation(dir); - TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); - if(te == null) { - return false; - } - if(!(te instanceof IInventory)) { - return false; - } - ISidedInventory target; - if(te instanceof ISidedInventory) { - target = (ISidedInventory) te; - } else { - target = new InventoryWrapper((IInventory) te); + public SlotDefinition getSlotDefinition() { + return slotDefinition; } - int[] targetSlots = target.getAccessibleSlotsFromSide(dir.getOpposite().ordinal()); - if(targetSlots == null) { - return false; - } - - for (int inputSlot = slotDefinition.minInputSlot; inputSlot <= slotDefinition.maxInputSlot; inputSlot++) { - if(doPull(inputSlot, target, targetSlots, dir)) { + public boolean isValidUpgrade(ItemStack itemstack) { + for (int i = slotDefinition.getMinUpgradeSlot(); i <= slotDefinition.getMaxUpgradeSlot(); i++) { + if (isItemValidForSlot(i, itemstack)) { + return true; + } + } return false; - } } - return false; - } - protected boolean doPull(int inputSlot, ISidedInventory target, int[] targetSlots, ForgeDirection side) { - for (int i = 0; i < targetSlots.length; i++) { - int tSlot = targetSlots[i]; - ItemStack targetStack = target.getStackInSlot(tSlot); - if(targetStack != null && target.canExtractItem(i, targetStack, side.getOpposite().ordinal())) { - int res = ItemUtil.doInsertItem(this, targetStack, side); - if(res > 0) { - targetStack = targetStack.copy(); - targetStack.stackSize -= res; - if(targetStack.stackSize <= 0) { - targetStack = null; - } - target.setInventorySlotContents(tSlot, targetStack); - return true; + public boolean isValidInput(ItemStack itemstack) { + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (isItemValidForSlot(i, itemstack)) { + return true; + } } - } + return false; } - return false; - } - protected abstract boolean processTasks(boolean redstoneCheckPassed); - - // ---- Tile Entity - // ------------------------------------------------------------------------------ - - @Override - public void invalidate() { - super.invalidate(); - if(worldObj.isRemote) { - updateSound(); - } - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - - setFacing(nbtRoot.getShort("facing")); - redstoneCheckPassed = nbtRoot.getBoolean("redstoneCheckPassed"); - forceClientUpdate = nbtRoot.getBoolean("forceClientUpdate"); - readCommon(nbtRoot); - } - - /** - * Read state common to both block and item - */ - public void readCommon(NBTTagCompound nbtRoot) { - - // read in the inventories contents - inventory = new ItemStack[slotDefinition.getNumSlots()]; - - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inventory.length) { - inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + public boolean isValidOutput(ItemStack itemstack) { + for (int i = slotDefinition.getMinOutputSlot(); i <= slotDefinition.getMaxOutputSlot(); i++) { + if (isItemValidForSlot(i, itemstack)) { + return true; + } } - } + return false; } - int rsContr = nbtRoot.getInteger("redstoneControlMode"); - if(rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { - rsContr = 0; - } - redstoneControlMode = RedstoneControlMode.values()[rsContr]; - - if(nbtRoot.hasKey("hasFaces")) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(nbtRoot.hasKey("face" + dir.ordinal())) { - setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())]); + @Override + public final boolean isItemValidForSlot(int i, ItemStack itemstack) { + if (slotDefinition.isUpgradeSlot(i)) { + return itemstack != null + && itemstack.getItem() == EnderIO.itemBasicCapacitor + && itemstack.getItemDamage() > 0; } - } + return isMachineItemValidForSlot(i, itemstack); } - } + protected abstract boolean isMachineItemValidForSlot(int i, ItemStack itemstack); - public void readFromItemStack(ItemStack stack) { - if(stack == null || stack.stackTagCompound == null) { - return; - } - NBTTagCompound root = stack.stackTagCompound; - if(!root.hasKey("eio.abstractMachine")) { - return; - } - readCommon(root); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - - nbtRoot.setShort("facing", facing); - nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); - nbtRoot.setBoolean("forceClientUpdate", forceClientUpdate); - forceClientUpdate = false; - - writeCommon(nbtRoot); - } - - /** - * Write state common to both block and item - */ - public void writeCommon(NBTTagCompound nbtRoot) { - - // write inventory list - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inventory.length; i++) { - if(inventory[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inventory[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - } - nbtRoot.setTag("Items", itemList); - - nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); - - //face modes - if(faceModes != null) { - nbtRoot.setByte("hasFaces", (byte) 1); - for (Entry e : faceModes.entrySet()) { - nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); - } - } - } - - public void writeToItemStack(ItemStack stack) { - if(stack == null) { - return; - } - if(stack.stackTagCompound == null) { - stack.stackTagCompound = new NBTTagCompound(); + @Override + public RedstoneControlMode getRedstoneControlMode() { + return redstoneControlMode; } - NBTTagCompound root = stack.stackTagCompound; - root.setBoolean("eio.abstractMachine", true); - writeCommon(root); - - String name; - if(stack.hasDisplayName()) { - name = stack.getDisplayName(); - } else { - name = EnderIO.lang.localizeExact(stack.getUnlocalizedName() + ".name"); - } - name += " " + EnderIO.lang.localize("machine.tooltip.configured"); - stack.setStackDisplayName(name); - } - - // ---- Inventory - // ------------------------------------------------------------------------------ - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return canPlayerAccess(player); - } - - @Override - public int getSizeInventory() { - return slotDefinition.getNumSlots(); - } - - public int getInventoryStackLimit(int slot) { - return getInventoryStackLimit(); - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(slot < 0 || slot >= inventory.length) { - return null; - } - return inventory[slot]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack fromStack = inventory[fromSlot]; - if(fromStack == null) { - return null; - } - if(fromStack.stackSize <= amount) { - inventory[fromSlot] = null; - return fromStack; - } - ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); - if(fromStack.stackTagCompound != null) { - result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); - } - fromStack.stackSize -= amount; - return result; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - if(contents == null) { - inventory[slot] = contents; - } else { - inventory[slot] = contents.copy(); + @Override + public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { + this.redstoneControlMode = redstoneControlMode; + redstoneStateDirty = true; + updateBlock(); } - if(contents != null && contents.stackSize > getInventoryStackLimit(slot)) { - contents.stackSize = getInventoryStackLimit(slot); + public short getFacing() { + return facing; } - } - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public String getInventoryName() { - return getMachineName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - if(isSideDisabled(var1)) { - return new int[0]; + public ForgeDirection getFacingDir() { + return ForgeDirection.getOrientation(facing); } - return allSlots; - } - @Override - public boolean canInsertItem(int slot, ItemStack itemstack, int side) { - if(isSideDisabled(side) || !slotDefinition.isInputSlot(slot)) { - return false; + public void setFacing(short facing) { + this.facing = facing; } - ItemStack existing = inventory[slot]; - if(existing != null) { - // no point in checking the recipes if an item is already in the slot - // worst case we get more of the wrong item - but that doesn't change anything - return existing.isStackable() && existing.isItemEqual(itemstack); - } - // no need to call isItemValidForSlot as upgrade slots are not input slots - return isMachineItemValidForSlot(slot, itemstack); - } - @Override - public boolean canExtractItem(int slot, ItemStack itemstack, int side) { - if(isSideDisabled(side)) { - return false; - } - if(!slotDefinition.isOutputSlot(slot)) { - return false; - } - return canExtractItem(slot, itemstack); - } + public abstract boolean isActive(); - protected boolean canExtractItem(int slot, ItemStack itemstack) { - if(inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) { - return false; + public String getSoundName() { + return null; } - return itemstack.getItem() == inventory[slot].getItem(); - } - public boolean isSideDisabled(int var1) { - ForgeDirection dir = ForgeDirection.getOrientation(var1); - IoMode mode = getIoMode(dir); - if(mode == IoMode.DISABLED) { - return true; + public boolean hasSound() { + return getSoundName() != null; } - return false; - } - public void onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - } - - /* IRedstoneConnectable */ - - @Override - public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { - return true; - } + public float getVolume() { + return Config.machineSoundVolume; + } + + public float getPitch() { + return 1.0f; + } + + protected boolean shouldPlaySound() { + return isActive() && !isInvalid(); + } + + @SideOnly(Side.CLIENT) + private void updateSound() { + if (Config.machineSoundsEnabled && hasSound()) { + if (shouldPlaySound()) { + if (sound == null) { + sound = new MachineSound( + soundRes, xCoord + 0.5f, yCoord + 0.5f, zCoord + 0.5f, getVolume(), getPitch()); + FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound); + } + } else if (sound != null) { + sound.endPlaying(); + sound = null; + } + } + } + + // --- Process Loop + // -------------------------------------------------------------------------- + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + updateEntityClient(); + return; + } // else is server, do all logic only on the server + + boolean requiresClientSync = forceClientUpdate; + boolean prevRedCheck = redstoneCheckPassed; + if (redstoneStateDirty) { + redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); + redstoneStateDirty = false; + } + + if (shouldDoWorkThisTick(5)) { + requiresClientSync |= doSideIo(); + } + + requiresClientSync |= prevRedCheck != redstoneCheckPassed; + + requiresClientSync |= processTasks(redstoneCheckPassed); + + if (requiresClientSync) { + + // this will cause 'getPacketDescription()' to be called and its result + // will be sent to the PacketHandler on the other end of + // client/server connection + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + // And this will make sure our current tile entity state is saved + markDirty(); + } + + if (notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + notifyNeighbours = false; + } + } + + protected void updateEntityClient() { + // check if the block on the client needs to update its texture + if (isActive() != lastActive) { + ticksSinceActiveChanged++; + if (ticksSinceActiveChanged > 20 || isActive()) { + ticksSinceActiveChanged = 0; + lastActive = isActive(); + forceClientUpdate = true; + } + } + + if (hasSound()) { + updateSound(); + } + + if (forceClientUpdate) { + if (worldObj.rand.nextInt(1024) <= (isDirty ? 256 : 0)) { + isDirty = !isDirty; + } + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + forceClientUpdate = false; + } + } + + protected boolean doSideIo() { + if (faceModes == null) { + return false; + } + + boolean res = false; + Set> ents = faceModes.entrySet(); + for (Entry ent : ents) { + IoMode mode = ent.getValue(); + if (mode.pulls()) { + res = res | doPull(ent.getKey()); + } + if (mode.pushes()) { + res = res | doPush(ent.getKey()); + } + } + return res; + } + + protected boolean doPush(ForgeDirection dir) { + + if (slotDefinition.getNumOutputSlots() <= 0) { + return false; + } + if (!shouldDoWorkThisTick(20)) { + return false; + } + + BlockCoord loc = getLocation().getLocation(dir); + TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); + + return doPush(dir, te, slotDefinition.minOutputSlot, slotDefinition.maxOutputSlot); + } + + protected boolean doPush(ForgeDirection dir, TileEntity te, int minSlot, int maxSlot) { + if (te == null) { + return false; + } + for (int i = minSlot; i <= maxSlot; i++) { + ItemStack item = inventory[i]; + if (item != null) { + int num = ItemUtil.doInsertItem(te, item, dir.getOpposite()); + if (num > 0) { + item.stackSize -= num; + if (item.stackSize <= 0) { + item = null; + } + inventory[i] = item; + markDirty(); + } + } + } + return false; + } + + protected boolean doPull(ForgeDirection dir) { + + if (slotDefinition.getNumInputSlots() <= 0) { + return false; + } + if (!shouldDoWorkThisTick(20)) { + return false; + } + + boolean hasSpace = false; + for (int slot = slotDefinition.minInputSlot; slot <= slotDefinition.maxInputSlot && !hasSpace; slot++) { + hasSpace = inventory[slot] == null + ? true + : inventory[slot].stackSize + < Math.min(inventory[slot].getMaxStackSize(), getInventoryStackLimit(slot)); + } + if (!hasSpace) { + return false; + } + + BlockCoord loc = getLocation().getLocation(dir); + TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); + if (te == null) { + return false; + } + if (!(te instanceof IInventory)) { + return false; + } + ISidedInventory target; + if (te instanceof ISidedInventory) { + target = (ISidedInventory) te; + } else { + target = new InventoryWrapper((IInventory) te); + } + + int[] targetSlots = target.getAccessibleSlotsFromSide(dir.getOpposite().ordinal()); + if (targetSlots == null) { + return false; + } + + for (int inputSlot = slotDefinition.minInputSlot; inputSlot <= slotDefinition.maxInputSlot; inputSlot++) { + if (doPull(inputSlot, target, targetSlots, dir)) { + return false; + } + } + return false; + } + + protected boolean doPull(int inputSlot, ISidedInventory target, int[] targetSlots, ForgeDirection side) { + for (int i = 0; i < targetSlots.length; i++) { + int tSlot = targetSlots[i]; + ItemStack targetStack = target.getStackInSlot(tSlot); + if (targetStack != null + && target.canExtractItem(i, targetStack, side.getOpposite().ordinal())) { + int res = ItemUtil.doInsertItem(this, targetStack, side); + if (res > 0) { + targetStack = targetStack.copy(); + targetStack.stackSize -= res; + if (targetStack.stackSize <= 0) { + targetStack = null; + } + target.setInventorySlotContents(tSlot, targetStack); + return true; + } + } + } + return false; + } + + protected abstract boolean processTasks(boolean redstoneCheckPassed); + + // ---- Tile Entity + // ------------------------------------------------------------------------------ + + @Override + public void invalidate() { + super.invalidate(); + if (worldObj.isRemote) { + updateSound(); + } + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + + setFacing(nbtRoot.getShort("facing")); + redstoneCheckPassed = nbtRoot.getBoolean("redstoneCheckPassed"); + forceClientUpdate = nbtRoot.getBoolean("forceClientUpdate"); + readCommon(nbtRoot); + } + + /** + * Read state common to both block and item + */ + public void readCommon(NBTTagCompound nbtRoot) { + + // read in the inventories contents + inventory = new ItemStack[slotDefinition.getNumSlots()]; + + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + if (itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + + int rsContr = nbtRoot.getInteger("redstoneControlMode"); + if (rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { + rsContr = 0; + } + redstoneControlMode = RedstoneControlMode.values()[rsContr]; + + if (nbtRoot.hasKey("hasFaces")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (nbtRoot.hasKey("face" + dir.ordinal())) { + setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())]); + } + } + } + } + + public void readFromItemStack(ItemStack stack) { + if (stack == null || stack.stackTagCompound == null) { + return; + } + NBTTagCompound root = stack.stackTagCompound; + if (!root.hasKey("eio.abstractMachine")) { + return; + } + readCommon(root); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + + nbtRoot.setShort("facing", facing); + nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); + nbtRoot.setBoolean("forceClientUpdate", forceClientUpdate); + forceClientUpdate = false; + + writeCommon(nbtRoot); + } + + /** + * Write state common to both block and item + */ + public void writeCommon(NBTTagCompound nbtRoot) { + + // write inventory list + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inventory.length; i++) { + if (inventory[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inventory[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); + + nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); + + // face modes + if (faceModes != null) { + nbtRoot.setByte("hasFaces", (byte) 1); + for (Entry e : faceModes.entrySet()) { + nbtRoot.setShort( + "face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + } + } + } + + public void writeToItemStack(ItemStack stack) { + if (stack == null) { + return; + } + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + } + + NBTTagCompound root = stack.stackTagCompound; + root.setBoolean("eio.abstractMachine", true); + writeCommon(root); + + String name; + if (stack.hasDisplayName()) { + name = stack.getDisplayName(); + } else { + name = EnderIO.lang.localizeExact(stack.getUnlocalizedName() + ".name"); + } + name += " " + EnderIO.lang.localize("machine.tooltip.configured"); + stack.setStackDisplayName(name); + } + + // ---- Inventory + // ------------------------------------------------------------------------------ + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + + @Override + public int getSizeInventory() { + return slotDefinition.getNumSlots(); + } + + public int getInventoryStackLimit(int slot) { + return getInventoryStackLimit(); + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public ItemStack getStackInSlot(int slot) { + if (slot < 0 || slot >= inventory.length) { + return null; + } + return inventory[slot]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack fromStack = inventory[fromSlot]; + if (fromStack == null) { + return null; + } + if (fromStack.stackSize <= amount) { + inventory[fromSlot] = null; + return fromStack; + } + ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); + if (fromStack.stackTagCompound != null) { + result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); + } + fromStack.stackSize -= amount; + return result; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + if (contents == null) { + inventory[slot] = contents; + } else { + inventory[slot] = contents.copy(); + } + + if (contents != null && contents.stackSize > getInventoryStackLimit(slot)) { + contents.stackSize = getInventoryStackLimit(slot); + } + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public String getInventoryName() { + return getMachineName(); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + if (isSideDisabled(var1)) { + return new int[0]; + } + return allSlots; + } + + @Override + public boolean canInsertItem(int slot, ItemStack itemstack, int side) { + if (isSideDisabled(side) || !slotDefinition.isInputSlot(slot)) { + return false; + } + ItemStack existing = inventory[slot]; + if (existing != null) { + // no point in checking the recipes if an item is already in the slot + // worst case we get more of the wrong item - but that doesn't change anything + return existing.isStackable() && existing.isItemEqual(itemstack); + } + // no need to call isItemValidForSlot as upgrade slots are not input slots + return isMachineItemValidForSlot(slot, itemstack); + } + + @Override + public boolean canExtractItem(int slot, ItemStack itemstack, int side) { + if (isSideDisabled(side)) { + return false; + } + if (!slotDefinition.isOutputSlot(slot)) { + return false; + } + return canExtractItem(slot, itemstack); + } + + protected boolean canExtractItem(int slot, ItemStack itemstack) { + if (inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) { + return false; + } + return itemstack.getItem() == inventory[slot].getItem(); + } + + public boolean isSideDisabled(int var1) { + ForgeDirection dir = ForgeDirection.getOrientation(var1); + IoMode mode = getIoMode(dir); + if (mode == IoMode.DISABLED) { + return true; + } + return false; + } + + public void onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + } + + /* IRedstoneConnectable */ + + @Override + public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 9bcf532c..93640be9 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -1,7 +1,17 @@ package crazypants.enderio.machine; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vertex; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.machine.painter.IPaintableTileEntity; +import crazypants.enderio.machine.painter.PaintedBlockRenderer; +import crazypants.enderio.machine.painter.PainterUtil; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -12,104 +22,103 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.CustomCubeRenderer; -import com.enderio.core.client.render.CustomRenderBlocks; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Vertex; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.machine.painter.IPaintableTileEntity; -import crazypants.enderio.machine.painter.PaintedBlockRenderer; -import crazypants.enderio.machine.painter.PainterUtil; - public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - private OverlayRenderer overlayRenderer = new OverlayRenderer() { + private OverlayRenderer overlayRenderer = new OverlayRenderer() { + @Override + public void renderFace( + CustomRenderBlocks rb, + ForgeDirection face, + Block par1Block, + double x, + double y, + double z, + IIcon texture, + List refVertices, + boolean translateToXyz) { + + ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, texture); + super.renderFace(rb, face, par1Block, x, y, z, texture, refVertices, translateToXyz); + } + }; + + private CustomCubeRenderer ccr = new CustomCubeRenderer(); + + private PaintedBlockRenderer paintedRenderer = + new PaintedBlockRenderer(this.getRenderId(), null); // passthrough renderer for paintable machines + @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - - ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, texture); - super.renderFace(rb, face, par1Block, x, y, z, texture, refVertices, translateToXyz); - } - }; - - private CustomCubeRenderer ccr = new CustomCubeRenderer(); - - private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough renderer for paintable machines - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - Block block; - if((block = PainterUtil.getSourceBlock(item)) != null) { - paintedRenderer.renderInventoryBlock(block, PainterUtil.getSourceBlockMetadata(item), 0, (RenderBlocks) data[0]); - } else { - renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); - } - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - - BoundingBox bb = BoundingBox.UNIT_CUBE; - bb = bb.translate(0, -0.1f, 0); - - Tessellator.instance.startDrawingQuads(); - - IIcon[] textures = RenderUtil.getBlockTextures(block, metadata); - - float[] brightnessPerSide = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightnessPerSide[dir.ordinal()] = Math.max(RenderUtil.getColorMultiplierForFace(dir) + 0.1f, 1f); - } - CubeRenderer.render(bb, textures, null, brightnessPerSide); - Tessellator.instance.draw(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - TileEntity te = world.getTileEntity(x, y, z); - AbstractMachineEntity machine = null; - - if(te instanceof AbstractMachineEntity) { - machine = (AbstractMachineEntity) te; + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - overlayRenderer.setTile(machine); - if(te instanceof IPaintableTileEntity && ((IPaintableTileEntity) te).getSourceBlock() != null) { - ccr.setOverrideTexture(IconUtil.blankTexture); - ccr.renderBlock(world, block, x, y, z, overlayRenderer); - ccr.setOverrideTexture(renderer.overrideBlockTexture); - paintedRenderer.renderWorldBlock(world, x, y, z, block, modelId, renderer); - } else { - ccr.setOverrideTexture(renderer.overrideBlockTexture); - ccr.renderBlock(world, block, x, y, z, overlayRenderer); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - ccr.setOverrideTexture(null); - return true; - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + Block block; + if ((block = PainterUtil.getSourceBlock(item)) != null) { + paintedRenderer.renderInventoryBlock( + block, PainterUtil.getSourceBlockMetadata(item), 0, (RenderBlocks) data[0]); + } else { + renderInventoryBlock( + Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); + } + } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - @Override - public int getRenderId() { - return AbstractMachineBlock.renderId; - } + BoundingBox bb = BoundingBox.UNIT_CUBE; + bb = bb.translate(0, -0.1f, 0); + + Tessellator.instance.startDrawingQuads(); + + IIcon[] textures = RenderUtil.getBlockTextures(block, metadata); + + float[] brightnessPerSide = new float[6]; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + brightnessPerSide[dir.ordinal()] = Math.max(RenderUtil.getColorMultiplierForFace(dir) + 0.1f, 1f); + } + CubeRenderer.render(bb, textures, null, brightnessPerSide); + Tessellator.instance.draw(); + } + + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileEntity te = world.getTileEntity(x, y, z); + AbstractMachineEntity machine = null; + + if (te instanceof AbstractMachineEntity) { + machine = (AbstractMachineEntity) te; + } + + overlayRenderer.setTile(machine); + if (te instanceof IPaintableTileEntity && ((IPaintableTileEntity) te).getSourceBlock() != null) { + ccr.setOverrideTexture(IconUtil.blankTexture); + ccr.renderBlock(world, block, x, y, z, overlayRenderer); + ccr.setOverrideTexture(renderer.overrideBlockTexture); + paintedRenderer.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } else { + ccr.setOverrideTexture(renderer.overrideBlockTexture); + ccr.renderBlock(world, block, x, y, z, overlayRenderer); + } + ccr.setOverrideTexture(null); + + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return AbstractMachineBlock.renderId; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java index 1ca2da02..061fff4d 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java @@ -1,31 +1,31 @@ package crazypants.enderio.machine; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; +import net.minecraftforge.common.util.ForgeDirection; -public abstract class AbstractPowerConsumerEntity extends AbstractPoweredMachineEntity implements IInternalPowerReceiver { +public abstract class AbstractPowerConsumerEntity extends AbstractPoweredMachineEntity + implements IInternalPowerReceiver { - public AbstractPowerConsumerEntity(SlotDefinition slotDefinition) { - super(slotDefinition); - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(isSideDisabled(from.ordinal())) { - return 0; + public AbstractPowerConsumerEntity(SlotDefinition slotDefinition) { + super(slotDefinition); } - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (isSideDisabled(from.ordinal())) { + return 0; + } + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index de29e98b..3acb61d5 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -1,202 +1,199 @@ package crazypants.enderio.machine; +import com.enderio.core.common.vecmath.VecmathUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.vecmath.VecmathUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.network.PacketHandler; - public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { - // Power - private Capacitors capacitorType; - private ICapacitor capacitor; + // Power + private Capacitors capacitorType; + private ICapacitor capacitor; - private int storedEnergyRF; - protected float lastSyncPowerStored = -1; + private int storedEnergyRF; + protected float lastSyncPowerStored = -1; - protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { - super(slotDefinition); - capacitorType = Capacitors.BASIC_CAPACITOR; - } - - @Override - public void init() { - super.init(); - onCapacitorTypeChange(); - } - - @Override - public void doUpdate() { - - super.doUpdate(); - - if (worldObj.isRemote) { - return; - } - boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5)); - if (powerChanged) { - lastSyncPowerStored = storedEnergyRF; - PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); - } - } - - //RF API Power - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return !isSideDisabled(from.ordinal()); - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - if (isSideDisabled(dir.ordinal())) { - return 0; - } - return getCapacitor().getMaxEnergyReceived(); - } - - @Override - public int getMaxEnergyStored() { - return getCapacitor().getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - @Override - public int getEnergyStored() { - return storedEnergyRF; - } - - //----- Common Machine Functions - - @Override - public boolean displayPower() { - return true; - } - - public boolean hasPower() { - return storedEnergyRF > 0; - } - - public Capacitors getCapacitorType() { - return capacitorType; - } - - public ICapacitor getCapacitor() { - - if (capacitor != null) { - return capacitor; - } else if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { - return EnderIO.itemBasicCapacitor.getCapacitor(contents); - } + protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { + super(slotDefinition); + capacitorType = Capacitors.BASIC_CAPACITOR; } - return capacitorType.capacitor; - - } - - public int getEnergyStoredScaled(int scale) { - // NB: called on the client so can't use the power provider - return VecmathUtil.clamp(Math.round(scale * ((float) storedEnergyRF / getMaxEnergyStored())), 0, scale); - } - - protected void setCapacitor(ICapacitor capacitor) { - this.capacitor = capacitor; - //Force a check that the new value is in bounds - setEnergyStored(getEnergyStored()); - } - - public void setCapacitor(Capacitors capacitorType) { - this.capacitorType = capacitorType; - - if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { - setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents)); - } - } else { - this.capacitor = capacitorType.capacitor; + @Override + public void init() { + super.init(); + onCapacitorTypeChange(); } - onCapacitorTypeChange(); - //Force a check that the new value is in bounds - setEnergyStored(getEnergyStored()); - forceClientUpdate = true; - } + @Override + public void doUpdate() { - public void onCapacitorTypeChange() {} + super.doUpdate(); - public int getPowerUsePerTick() { - return getCapacitor().getMaxEnergyExtracted(); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - super.setInventorySlotContents(slot, contents); - if (slotDefinition.isUpgradeSlot(slot)) { - updateCapacitorFromSlot(); + if (worldObj.isRemote) { + return; + } + boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(5)); + if (powerChanged) { + lastSyncPowerStored = storedEnergyRF; + PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); + } } - } - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack res = super.decrStackSize(fromSlot, amount); - if (slotDefinition.isUpgradeSlot(fromSlot)) { - updateCapacitorFromSlot(); + // RF API Power + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return !isSideDisabled(from.ordinal()); } - return res; - } - private void updateCapacitorFromSlot() { - if (slotDefinition.getNumUpgradeSlots() <= 0) { - setCapacitor(Capacitors.BASIC_CAPACITOR); - return; + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + if (isSideDisabled(dir.ordinal())) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); } - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { - setCapacitor(Capacitors.BASIC_CAPACITOR); - } else { - setCapacitor(Capacitors.values()[contents.getItemDamage()]); + + @Override + public int getMaxEnergyStored() { + return getCapacitor().getMaxEnergyStored(); } - } - //--------- NBT - - /** - * Read state common to both block and item - */ - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); - int energy; - if (nbtRoot.hasKey("storedEnergy")) { - float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); - energy = (int) (storedEnergyMJ * 10); - } else { - energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); } - setEnergyStored(energy); - } - /** - * Write state common to both block and item - */ - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); - nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); - } -} \ No newline at end of file + @Override + public int getEnergyStored() { + return storedEnergyRF; + } + + // ----- Common Machine Functions + + @Override + public boolean displayPower() { + return true; + } + + public boolean hasPower() { + return storedEnergyRF > 0; + } + + public Capacitors getCapacitorType() { + return capacitorType; + } + + public ICapacitor getCapacitor() { + + if (capacitor != null) { + return capacitor; + } else if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + return EnderIO.itemBasicCapacitor.getCapacitor(contents); + } + } + + return capacitorType.capacitor; + } + + public int getEnergyStoredScaled(int scale) { + // NB: called on the client so can't use the power provider + return VecmathUtil.clamp(Math.round(scale * ((float) storedEnergyRF / getMaxEnergyStored())), 0, scale); + } + + protected void setCapacitor(ICapacitor capacitor) { + this.capacitor = capacitor; + // Force a check that the new value is in bounds + setEnergyStored(getEnergyStored()); + } + + public void setCapacitor(Capacitors capacitorType) { + this.capacitorType = capacitorType; + + if (capacitorType == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if (contents != null && contents.getItem() == EnderIO.itemBasicCapacitor) { + setCapacitor(EnderIO.itemBasicCapacitor.getCapacitor(contents)); + } + } else { + this.capacitor = capacitorType.capacitor; + } + + onCapacitorTypeChange(); + // Force a check that the new value is in bounds + setEnergyStored(getEnergyStored()); + forceClientUpdate = true; + } + + public void onCapacitorTypeChange() {} + + public int getPowerUsePerTick() { + return getCapacitor().getMaxEnergyExtracted(); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + super.setInventorySlotContents(slot, contents); + if (slotDefinition.isUpgradeSlot(slot)) { + updateCapacitorFromSlot(); + } + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack res = super.decrStackSize(fromSlot, amount); + if (slotDefinition.isUpgradeSlot(fromSlot)) { + updateCapacitorFromSlot(); + } + return res; + } + + private void updateCapacitorFromSlot() { + if (slotDefinition.getNumUpgradeSlots() <= 0) { + setCapacitor(Capacitors.BASIC_CAPACITOR); + return; + } + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { + setCapacitor(Capacitors.BASIC_CAPACITOR); + } else { + setCapacitor(Capacitors.values()[contents.getItemDamage()]); + } + } + + // --------- NBT + + /** + * Read state common to both block and item + */ + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); + int energy; + if (nbtRoot.hasKey("storedEnergy")) { + float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); + energy = (int) (storedEnergyMJ * 10); + } else { + energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); + } + setEnergyStored(energy); + } + + /** + * Write state common to both block and item + */ + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); + nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); + } +} diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index c289815d..baa37b2b 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -1,407 +1,401 @@ package crazypants.enderio.machine; +import com.enderio.core.api.common.util.IProgressTile; +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.power.IInternalPowerReceiver; import java.util.ArrayList; import java.util.List; import java.util.Random; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.common.util.IProgressTile; +public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEntity + implements IInternalPowerReceiver, IProgressTile { -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.power.IInternalPowerReceiver; + protected IPoweredTask currentTask = null; + protected IMachineRecipe lastCompletedRecipe; + protected IMachineRecipe cachedNextRecipe; -public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEntity implements IInternalPowerReceiver, IProgressTile { + protected final Random random = new Random(); - protected IPoweredTask currentTask = null; - protected IMachineRecipe lastCompletedRecipe; - protected IMachineRecipe cachedNextRecipe; + protected int ticksSinceCheckedRecipe = 0; + protected boolean startFailed = false; + protected float nextChance = Float.NaN; - protected final Random random = new Random(); - - protected int ticksSinceCheckedRecipe = 0; - protected boolean startFailed = false; - protected float nextChance = Float.NaN; - - public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { - super(slotDefinition); - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - ForgeDirection dir = ForgeDirection.getOrientation(var1); - IoMode mode = getIoMode(dir); - if(mode == IoMode.DISABLED) { - return new int[0]; + public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { + super(slotDefinition); } - int[] res = new int[inventory.length - slotDefinition.getNumUpgradeSlots()]; - int index = 0; - for (int i = 0; i < inventory.length; i++) { - if(!slotDefinition.isUpgradeSlot(i)) { - res[index] = i; - index++; - } - } - return res; - } - - @Override - public boolean isActive() { - return currentTask == null ? false : currentTask.getProgress() >= 0 && hasPower() && redstoneCheckPassed; - } - - @Override - public float getProgress() { - return currentTask == null ? -1 : currentTask.getProgress(); - } - - @Override - public TileEntity getTileEntity() { - return this; - } - - @Override - public void setProgress(float progress) { - this.currentTask = progress < 0 ? null : new PoweredTaskProgress(progress); - } - - public IPoweredTask getCurrentTask() { - return currentTask; - } - - public float getExperienceForOutput(ItemStack output) { - if(lastCompletedRecipe == null) { - return 0; - } - return lastCompletedRecipe.getExperienceForOutput(output); - } - - public boolean getRedstoneChecksPassed() { - return redstoneCheckPassed; - } - - @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - - if(!redstoneChecksPassed) { - return false; - } - - boolean requiresClientSync = false; - // Process any current items - requiresClientSync |= checkProgress(redstoneChecksPassed); - - if(currentTask != null || !hasPower() || !hasInputStacks()) { - return requiresClientSync; - } - - if(startFailed) { - ticksSinceCheckedRecipe++; - if(ticksSinceCheckedRecipe < 20) { - return false; - } - } - ticksSinceCheckedRecipe = 0; - - // Get a new chance when we don't have one yet - // If a recipe could not be started we will try with the same chance next time - if(Float.isNaN(nextChance)) { - nextChance = random.nextFloat(); - } - - // Then see if we need to start a new one - IMachineRecipe nextRecipe = canStartNextTask(nextChance); - if(nextRecipe != null) { - boolean started = startNextTask(nextRecipe, nextChance); - if(started) { - // this chance value has been used up - nextChance = Float.NaN; - } - startFailed = !started; - } else { - startFailed = true; - } - sendTaskProgressPacket(); - - return requiresClientSync; - } - - protected boolean checkProgress(boolean redstoneChecksPassed) { - if(currentTask == null || !hasPower()) { - return false; - } - if (redstoneChecksPassed && !currentTask.isComplete()) { - usePower(); - } - // then check if we are done - if(currentTask.isComplete()) { - taskComplete(); - return false; - } - - return false; - } - - protected double usePower() { - return usePower(getPowerUsePerTick()); - } - - public int usePower(int wantToUse) { - int used = Math.min(getEnergyStored(), wantToUse); - setEnergyStored(Math.max(0, getEnergyStored() - used)); - if(currentTask != null) { - currentTask.update(used); - } - return used; - } - - protected void taskComplete() { - if(currentTask != null) { - lastCompletedRecipe = currentTask.getRecipe(); - ResultStack[] output = currentTask.getCompletedResult(); - if(output != null && output.length > 0) { - mergeResults(output); - } - } - markDirty(); - currentTask = null; - lastProgressScaled = 0; - } - - protected void mergeResults(ResultStack[] results) { - List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); - if(slotDefinition.getNumOutputSlots() > 0) { - for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { - ItemStack it = inventory[i]; - if(it != null) { - it = it.copy(); + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + ForgeDirection dir = ForgeDirection.getOrientation(var1); + IoMode mode = getIoMode(dir); + if (mode == IoMode.DISABLED) { + return new int[0]; } - outputStacks.add(it); - } - } - for (ResultStack result : results) { - if(result.item != null) { - int numMerged = mergeItemResult(result.item, outputStacks); - if(numMerged > 0) { - result.item.stackSize -= numMerged; + int[] res = new int[inventory.length - slotDefinition.getNumUpgradeSlots()]; + int index = 0; + for (int i = 0; i < inventory.length; i++) { + if (!slotDefinition.isUpgradeSlot(i)) { + res[index] = i; + index++; + } } - } else if(result.fluid != null) { - mergeFluidResult(result); - } + return res; } - if(slotDefinition.getNumOutputSlots() > 0) { - int listIndex = 0; - for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { - ItemStack st = outputStacks.get(listIndex); - if(st != null) { - st = st.copy(); + @Override + public boolean isActive() { + return currentTask == null ? false : currentTask.getProgress() >= 0 && hasPower() && redstoneCheckPassed; + } + + @Override + public float getProgress() { + return currentTask == null ? -1 : currentTask.getProgress(); + } + + @Override + public TileEntity getTileEntity() { + return this; + } + + @Override + public void setProgress(float progress) { + this.currentTask = progress < 0 ? null : new PoweredTaskProgress(progress); + } + + public IPoweredTask getCurrentTask() { + return currentTask; + } + + public float getExperienceForOutput(ItemStack output) { + if (lastCompletedRecipe == null) { + return 0; } - inventory[i] = st; - listIndex++; - } + return lastCompletedRecipe.getExperienceForOutput(output); } - cachedNextRecipe = null; - } + public boolean getRedstoneChecksPassed() { + return redstoneCheckPassed; + } - protected void mergeFluidResult(ResultStack result) { - } + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { - protected void drainInputFluid(MachineRecipeInput fluid) { - } - - protected boolean canInsertResultFluid(ResultStack fluid) { - return false; - } - - protected int mergeItemResult(ItemStack item, List outputStacks) { - - int res = 0; - - ItemStack copy = item.copy(); - //try to add it to existing stacks first - for (ItemStack outStack : outputStacks) { - if(outStack != null && copy != null) { - int num = getNumCanMerge(outStack, copy); - outStack.stackSize += num; - res += num; - copy.stackSize -= num; - if(copy.stackSize <= 0) { - return item.stackSize; + if (!redstoneChecksPassed) { + return false; } - } - } - //Try and add it to an empty slot - for (int i = 0; i < outputStacks.size(); i++) { - ItemStack outStack = outputStacks.get(i); - if(outStack == null) { - outputStacks.set(i, copy); - return item.stackSize; - } - } + boolean requiresClientSync = false; + // Process any current items + requiresClientSync |= checkProgress(redstoneChecksPassed); - return 0; - } + if (currentTask != null || !hasPower() || !hasInputStacks()) { + return requiresClientSync; + } - protected MachineRecipeInput[] getRecipeInputs() { - MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots()]; - int fromSlot = slotDefinition.minInputSlot; - for (int i = 0; i < res.length; i++) { - res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); - fromSlot++; - } - return res; - } + if (startFailed) { + ticksSinceCheckedRecipe++; + if (ticksSinceCheckedRecipe < 20) { + return false; + } + } + ticksSinceCheckedRecipe = 0; - protected IMachineRecipe getNextRecipe() { - if (cachedNextRecipe == null) { - cachedNextRecipe = MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), getRecipeInputs()); - } - return cachedNextRecipe; - } + // Get a new chance when we don't have one yet + // If a recipe could not be started we will try with the same chance next time + if (Float.isNaN(nextChance)) { + nextChance = random.nextFloat(); + } - protected IMachineRecipe canStartNextTask(float chance) { - IMachineRecipe nextRecipe = getNextRecipe(); - if(nextRecipe == null) { - return null; // no template - } - // make sure we have room for the next output - return canInsertResult(chance, nextRecipe) ? nextRecipe : null; - } - - protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { - - ResultStack[] nextResults = nextRecipe.getCompletedResult(chance, getRecipeInputs()); - List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); - if(slotDefinition.getNumOutputSlots() > 0) { - boolean allFull = true; - for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { - ItemStack st = inventory[i]; - if(st != null) { - st = st.copy(); - if(allFull && st.stackSize < st.getMaxStackSize()) { - allFull = false; - } + // Then see if we need to start a new one + IMachineRecipe nextRecipe = canStartNextTask(nextChance); + if (nextRecipe != null) { + boolean started = startNextTask(nextRecipe, nextChance); + if (started) { + // this chance value has been used up + nextChance = Float.NaN; + } + startFailed = !started; } else { - allFull = false; + startFailed = true; } - outputStacks.add(st); - } - if(allFull) { + sendTaskProgressPacket(); + + return requiresClientSync; + } + + protected boolean checkProgress(boolean redstoneChecksPassed) { + if (currentTask == null || !hasPower()) { + return false; + } + if (redstoneChecksPassed && !currentTask.isComplete()) { + usePower(); + } + // then check if we are done + if (currentTask.isComplete()) { + taskComplete(); + return false; + } + return false; - } } - for (ResultStack result : nextResults) { - if(result.item != null) { - if(mergeItemResult(result.item, outputStacks) == 0) { - return false; - } - } else if(result.fluid != null) { - if(!canInsertResultFluid(result)) { - return false; - } - } + protected double usePower() { + return usePower(getPowerUsePerTick()); } - return true; - } + public int usePower(int wantToUse) { + int used = Math.min(getEnergyStored(), wantToUse); + setEnergyStored(Math.max(0, getEnergyStored() - used)); + if (currentTask != null) { + currentTask.update(used); + } + return used; + } + + protected void taskComplete() { + if (currentTask != null) { + lastCompletedRecipe = currentTask.getRecipe(); + ResultStack[] output = currentTask.getCompletedResult(); + if (output != null && output.length > 0) { + mergeResults(output); + } + } + markDirty(); + currentTask = null; + lastProgressScaled = 0; + } + + protected void mergeResults(ResultStack[] results) { + List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); + if (slotDefinition.getNumOutputSlots() > 0) { + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { + ItemStack it = inventory[i]; + if (it != null) { + it = it.copy(); + } + outputStacks.add(it); + } + } + + for (ResultStack result : results) { + if (result.item != null) { + int numMerged = mergeItemResult(result.item, outputStacks); + if (numMerged > 0) { + result.item.stackSize -= numMerged; + } + } else if (result.fluid != null) { + mergeFluidResult(result); + } + } + + if (slotDefinition.getNumOutputSlots() > 0) { + int listIndex = 0; + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { + ItemStack st = outputStacks.get(listIndex); + if (st != null) { + st = st.copy(); + } + inventory[i] = st; + listIndex++; + } + } + + cachedNextRecipe = null; + } + + protected void mergeFluidResult(ResultStack result) {} + + protected void drainInputFluid(MachineRecipeInput fluid) {} + + protected boolean canInsertResultFluid(ResultStack fluid) { + return false; + } + + protected int mergeItemResult(ItemStack item, List outputStacks) { + + int res = 0; + + ItemStack copy = item.copy(); + // try to add it to existing stacks first + for (ItemStack outStack : outputStacks) { + if (outStack != null && copy != null) { + int num = getNumCanMerge(outStack, copy); + outStack.stackSize += num; + res += num; + copy.stackSize -= num; + if (copy.stackSize <= 0) { + return item.stackSize; + } + } + } + + // Try and add it to an empty slot + for (int i = 0; i < outputStacks.size(); i++) { + ItemStack outStack = outputStacks.get(i); + if (outStack == null) { + outputStacks.set(i, copy); + return item.stackSize; + } + } + + return 0; + } + + protected MachineRecipeInput[] getRecipeInputs() { + MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots()]; + int fromSlot = slotDefinition.minInputSlot; + for (int i = 0; i < res.length; i++) { + res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); + fromSlot++; + } + return res; + } + + protected IMachineRecipe getNextRecipe() { + if (cachedNextRecipe == null) { + cachedNextRecipe = MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), getRecipeInputs()); + } + return cachedNextRecipe; + } + + protected IMachineRecipe canStartNextTask(float chance) { + IMachineRecipe nextRecipe = getNextRecipe(); + if (nextRecipe == null) { + return null; // no template + } + // make sure we have room for the next output + return canInsertResult(chance, nextRecipe) ? nextRecipe : null; + } + + protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { + + ResultStack[] nextResults = nextRecipe.getCompletedResult(chance, getRecipeInputs()); + List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); + if (slotDefinition.getNumOutputSlots() > 0) { + boolean allFull = true; + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { + ItemStack st = inventory[i]; + if (st != null) { + st = st.copy(); + if (allFull && st.stackSize < st.getMaxStackSize()) { + allFull = false; + } + } else { + allFull = false; + } + outputStacks.add(st); + } + if (allFull) { + return false; + } + } + + for (ResultStack result : nextResults) { + if (result.item != null) { + if (mergeItemResult(result.item, outputStacks) == 0) { + return false; + } + } else if (result.fluid != null) { + if (!canInsertResultFluid(result)) { + return false; + } + } + } - protected boolean hasInputStacks() { - int fromSlot = slotDefinition.minInputSlot; - for (int i = 0; i < slotDefinition.getNumInputSlots(); i++) { - if(inventory[fromSlot] != null) { return true; - } - fromSlot++; } - return false; - } - - protected int getNumCanMerge(ItemStack itemStack, ItemStack result) { - if(!itemStack.isItemEqual(result)) { - return 0; - } - return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize); - } - - protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { - if(hasPower() && nextRecipe.isRecipe(getRecipeInputs())) { - // then get our recipe and take away the source items - currentTask = createTask(nextRecipe, chance); - List consumed = nextRecipe.getQuantitiesConsumed(getRecipeInputs()); - for (MachineRecipeInput item : consumed) { - if(item != null) { - if(item.item != null && item.item.stackSize > 0) { - decrStackSize(item.slotNumber, item.item.stackSize); - } else if(item.fluid != null) { - drainInputFluid(item); - } + protected boolean hasInputStacks() { + int fromSlot = slotDefinition.minInputSlot; + for (int i = 0; i < slotDefinition.getNumInputSlots(); i++) { + if (inventory[fromSlot] != null) { + return true; + } + fromSlot++; } - } - return true; + return false; } - return false; - } - protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { - return new PoweredTask(nextRecipe, chance, getRecipeInputs()); - } - - protected IPoweredTask createTask(NBTTagCompound taskTagCompound) { - return PoweredTask.readFromNBT(taskTagCompound); - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - currentTask = nbtRoot.hasKey("currentTask") ? createTask(nbtRoot.getCompoundTag("currentTask")) : null; - String uid = nbtRoot.getString("lastCompletedRecipe"); - lastCompletedRecipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - if(currentTask != null) { - NBTTagCompound currentTaskNBT = new NBTTagCompound(); - currentTask.writeToNBT(currentTaskNBT); - nbtRoot.setTag("currentTask", currentTaskNBT); + protected int getNumCanMerge(ItemStack itemStack, ItemStack result) { + if (!itemStack.isItemEqual(result)) { + return 0; + } + return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize); } - if(lastCompletedRecipe != null) { - nbtRoot.setString("lastCompletedRecipe", lastCompletedRecipe.getUid()); + + protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { + if (hasPower() && nextRecipe.isRecipe(getRecipeInputs())) { + // then get our recipe and take away the source items + currentTask = createTask(nextRecipe, chance); + List consumed = nextRecipe.getQuantitiesConsumed(getRecipeInputs()); + for (MachineRecipeInput item : consumed) { + if (item != null) { + if (item.item != null && item.item.stackSize > 0) { + decrStackSize(item.slotNumber, item.item.stackSize); + } else if (item.fluid != null) { + drainInputFluid(item); + } + } + } + return true; + } + return false; } - } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - cachedNextRecipe = null; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack res = super.decrStackSize(fromSlot, amount); - if(slotDefinition.isInputSlot(fromSlot)) { - cachedNextRecipe = null; + protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { + return new PoweredTask(nextRecipe, chance, getRecipeInputs()); } - return res; - } - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - super.setInventorySlotContents(slot, contents); - if(slotDefinition.isInputSlot(slot)) { - cachedNextRecipe = null; + protected IPoweredTask createTask(NBTTagCompound taskTagCompound) { + return PoweredTask.readFromNBT(taskTagCompound); } - } + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + currentTask = nbtRoot.hasKey("currentTask") ? createTask(nbtRoot.getCompoundTag("currentTask")) : null; + String uid = nbtRoot.getString("lastCompletedRecipe"); + lastCompletedRecipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + if (currentTask != null) { + NBTTagCompound currentTaskNBT = new NBTTagCompound(); + currentTask.writeToNBT(currentTaskNBT); + nbtRoot.setTag("currentTask", currentTaskNBT); + } + if (lastCompletedRecipe != null) { + nbtRoot.setString("lastCompletedRecipe", lastCompletedRecipe.getUid()); + } + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + cachedNextRecipe = null; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack res = super.decrStackSize(fromSlot, amount); + if (slotDefinition.isInputSlot(fromSlot)) { + cachedNextRecipe = null; + } + return res; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + super.setInventorySlotContents(slot, contents); + if (slotDefinition.isInputSlot(slot)) { + cachedNextRecipe = null; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java index 9820520f..f17821b7 100644 --- a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java +++ b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -10,62 +12,63 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.EnderIO; public class ClearConfigRecipe implements IRecipe { - - static { - RecipeSorter.register("EnderIO:clearConfig", ClearConfigRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); - } - private ItemStack output; - - @Override - public boolean matches(InventoryCrafting inv, World world) { - int count = 0; - ItemStack input = null; - - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack checkStack = inv.getStackInSlot(i); - if (checkStack != null && Block.getBlockFromItem(checkStack.getItem()) instanceof AbstractMachineBlock) { - count++; - } - input = count == 1 && checkStack != null ? checkStack : input; + static { + RecipeSorter.register( + "EnderIO:clearConfig", ClearConfigRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); } - - if (count == 1 && input.stackTagCompound != null && input.stackTagCompound.getBoolean("eio.abstractMachine")) { - ItemStack out = input.copy(); - out.stackTagCompound = new NBTTagCompound(); - out.stackTagCompound.setBoolean("clearedConfig", true); - out.stackSize = 1; - output = out; - } else { - output = null; + + private ItemStack output; + + @Override + public boolean matches(InventoryCrafting inv, World world) { + int count = 0; + ItemStack input = null; + + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack checkStack = inv.getStackInSlot(i); + if (checkStack != null && Block.getBlockFromItem(checkStack.getItem()) instanceof AbstractMachineBlock) { + count++; + } + input = count == 1 && checkStack != null ? checkStack : input; + } + + if (count == 1 && input.stackTagCompound != null && input.stackTagCompound.getBoolean("eio.abstractMachine")) { + ItemStack out = input.copy(); + out.stackTagCompound = new NBTTagCompound(); + out.stackTagCompound.setBoolean("clearedConfig", true); + out.stackSize = 1; + output = out; + } else { + output = null; + } + + return count == 1 && output != null; } - - return count == 1 && output != null; - } - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - return output.copy(); - } - - @Override - public int getRecipeSize() { - return 1; - } - - @Override - public ItemStack getRecipeOutput() { - return output; - } - - @SubscribeEvent - public void onTooltip(ItemTooltipEvent event) { - if (output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { - event.toolTip.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.ITALIC + EnderIO.lang.localize("machine.tooltip.clearConfig")); + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + return output.copy(); + } + + @Override + public int getRecipeSize() { + return 1; + } + + @Override + public ItemStack getRecipeOutput() { + return output; + } + + @SubscribeEvent + public void onTooltip(ItemTooltipEvent event) { + if (output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { + event.toolTip.add(EnumChatFormatting.RED.toString() + + EnumChatFormatting.ITALIC + + EnderIO.lang.localize("machine.tooltip.clearConfig")); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/ContainerNoInv.java b/src/main/java/crazypants/enderio/machine/ContainerNoInv.java index 2061c683..24f3409f 100644 --- a/src/main/java/crazypants/enderio/machine/ContainerNoInv.java +++ b/src/main/java/crazypants/enderio/machine/ContainerNoInv.java @@ -6,16 +6,15 @@ import net.minecraft.inventory.IInventory; public class ContainerNoInv extends Container { - private IInventory inv; - - public ContainerNoInv(IInventory inv) { - super(); - this.inv = inv; - } + private IInventory inv; - @Override - public boolean canInteractWith(EntityPlayer player) { - return inv.isUseableByPlayer(player); - } + public ContainerNoInv(IInventory inv) { + super(); + this.inv = inv; + } + @Override + public boolean canInteractWith(EntityPlayer player) { + return inv.isUseableByPlayer(player); + } } diff --git a/src/main/java/crazypants/enderio/machine/ContinuousTask.java b/src/main/java/crazypants/enderio/machine/ContinuousTask.java index ad45ebc9..01486660 100644 --- a/src/main/java/crazypants/enderio/machine/ContinuousTask.java +++ b/src/main/java/crazypants/enderio/machine/ContinuousTask.java @@ -1,62 +1,60 @@ package crazypants.enderio.machine; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.recipe.RecipeBonusType; +import net.minecraft.nbt.NBTTagCompound; public class ContinuousTask implements IPoweredTask { - - float powerUserPerTick; - - public ContinuousTask(float powerUsePerTick) { - this.powerUserPerTick = powerUsePerTick; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - } - @Override - public void update(float availableEnergy) { - } + float powerUserPerTick; - @Override - public boolean isComplete() { - return false; - } + public ContinuousTask(float powerUsePerTick) { + this.powerUserPerTick = powerUsePerTick; + } - @Override - public float getRequiredEnergy() { - return powerUserPerTick; - } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) {} - @Override - public IMachineRecipe getRecipe() { - return null; - } + @Override + public void update(float availableEnergy) {} - @Override - public float getProgress() { - return 0.5f; - } + @Override + public boolean isComplete() { + return false; + } - @Override - public ResultStack[] getCompletedResult() { - return new ResultStack[0]; - } + @Override + public float getRequiredEnergy() { + return powerUserPerTick; + } - @Override - public float getChance() { - return 1; - } + @Override + public IMachineRecipe getRecipe() { + return null; + } - @Override - public RecipeBonusType getBonusType() { - return RecipeBonusType.NONE; - } + @Override + public float getProgress() { + return 0.5f; + } - @Override - public MachineRecipeInput[] getInputs() { - return new MachineRecipeInput[0]; - } + @Override + public ResultStack[] getCompletedResult() { + return new ResultStack[0]; + } + + @Override + public float getChance() { + return 1; + } + + @Override + public RecipeBonusType getBonusType() { + return RecipeBonusType.NONE; + } + + @Override + public MachineRecipeInput[] getInputs() { + return new MachineRecipeInput[0]; + } } diff --git a/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java b/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java index 60df9fc1..17755bf4 100644 --- a/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java +++ b/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java @@ -1,41 +1,34 @@ package crazypants.enderio.machine; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; - import com.enderio.core.common.util.BlockCoord; import com.mojang.authlib.GameProfile; - import crazypants.enderio.machine.farm.FakeNetHandlerPlayServer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.FakePlayer; public class FakePlayerEIO extends FakePlayer { - ItemStack prevWeapon; + ItemStack prevWeapon; - public FakePlayerEIO(World world, BlockCoord pos, GameProfile profile) { - super(MinecraftServer.getServer().worldServerForDimension(world.provider.dimensionId), profile); - posX = pos.x + 0.5; - posY = pos.y + 0.5; - posZ = pos.z + 0.5; - // ItemInWorldManager will access this field directly and can crash - playerNetServerHandler = new FakeNetHandlerPlayServer(this); - } + public FakePlayerEIO(World world, BlockCoord pos, GameProfile profile) { + super(MinecraftServer.getServer().worldServerForDimension(world.provider.dimensionId), profile); + posX = pos.x + 0.5; + posY = pos.y + 0.5; + posZ = pos.z + 0.5; + // ItemInWorldManager will access this field directly and can crash + playerNetServerHandler = new FakeNetHandlerPlayServer(this); + } - // These do things with packets...which crash since the net handler is null. Potion effects are not needed anyways. - @Override - protected void onNewPotionEffect(PotionEffect p_70670_1_) { - } + // These do things with packets...which crash since the net handler is null. Potion effects are not needed anyways. + @Override + protected void onNewPotionEffect(PotionEffect p_70670_1_) {} - @Override - protected void onChangedPotionEffect(PotionEffect p_70695_1_, boolean p_70695_2_) { - } - - @Override - protected void onFinishedPotionEffect(PotionEffect p_70688_1_) { - } + @Override + protected void onChangedPotionEffect(PotionEffect p_70695_1_, boolean p_70695_2_) {} + @Override + protected void onFinishedPotionEffect(PotionEffect p_70688_1_) {} } diff --git a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java index 0e612414..fa582307 100644 --- a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java +++ b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java @@ -1,21 +1,19 @@ package crazypants.enderio.machine; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; +import net.minecraftforge.common.util.ForgeDirection; public interface IIoConfigurable { - public IoMode toggleIoModeForFace(ForgeDirection faceHit); + public IoMode toggleIoModeForFace(ForgeDirection faceHit); - public boolean supportsMode(ForgeDirection faceHit, IoMode mode); + public boolean supportsMode(ForgeDirection faceHit, IoMode mode); - public void setIoMode(ForgeDirection faceHit, IoMode mode); + public void setIoMode(ForgeDirection faceHit, IoMode mode); - public IoMode getIoMode(ForgeDirection face) ; + public IoMode getIoMode(ForgeDirection face); - public void clearAllIoModes(); - - BlockCoord getLocation(); + public void clearAllIoModes(); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/machine/IItemBuffer.java b/src/main/java/crazypants/enderio/machine/IItemBuffer.java index df2fc79d..704aaac0 100644 --- a/src/main/java/crazypants/enderio/machine/IItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/IItemBuffer.java @@ -4,10 +4,9 @@ import com.enderio.core.common.util.BlockCoord; public interface IItemBuffer { - void setBufferStacks(boolean bufferStacks); + void setBufferStacks(boolean bufferStacks); - boolean isBufferStacks(); - - BlockCoord getLocation(); + boolean isBufferStacks(); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/machine/IMachine.java b/src/main/java/crazypants/enderio/machine/IMachine.java index c37d9003..e7138db3 100644 --- a/src/main/java/crazypants/enderio/machine/IMachine.java +++ b/src/main/java/crazypants/enderio/machine/IMachine.java @@ -2,6 +2,5 @@ package crazypants.enderio.machine; public interface IMachine { - String getMachineName(); - + String getMachineName(); } diff --git a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java index e687c8c4..ccf6b2ec 100644 --- a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java @@ -1,124 +1,121 @@ package crazypants.enderio.machine; +import crazypants.enderio.machine.recipe.RecipeBonusType; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.machine.recipe.RecipeBonusType; /** * A MachineRecipe implementation must be stateless, always returning the same * values given the same parameters. The 'in progress' recipe for a machine is * stored to and retrieved from a machines TileEntity soley based on its UID. - * + * * @author cp - * + * */ public interface IMachineRecipe { - /** - * Returns the globally unique ID for the recipe. - * - * @return - */ - String getUid(); + /** + * Returns the globally unique ID for the recipe. + * + * @return + */ + String getUid(); - /** - * The amount total number of MJ required to craft the recipe based on the - * inputs. The amount returned should be for a single 'cycle' of the recipe. - * For examples, if the inputs would allow the recipe to completed 10 times, - * this method should only return the amount of energy used for a single - * cycle. - * - * @param inputs - * @return - */ - int getEnergyRequired(MachineRecipeInput... inputs); + /** + * The amount total number of MJ required to craft the recipe based on the + * inputs. The amount returned should be for a single 'cycle' of the recipe. + * For examples, if the inputs would allow the recipe to completed 10 times, + * this method should only return the amount of energy used for a single + * cycle. + * + * @param inputs + * @return + */ + int getEnergyRequired(MachineRecipeInput... inputs); - /** - * Returns the how bonus should be handled for this input - **/ - RecipeBonusType getBonusType(MachineRecipeInput... inputs); + /** + * Returns the how bonus should be handled for this input + **/ + RecipeBonusType getBonusType(MachineRecipeInput... inputs); - /** - * Only returns true if output can be generated using these inputs. If - * partially complete inputs are provided (for example only one of two - * required inputs are present) the method should return false. - * - * @param inputs - * @return - */ - public boolean isRecipe(MachineRecipeInput... inputs); + /** + * Only returns true if output can be generated using these inputs. If + * partially complete inputs are provided (for example only one of two + * required inputs are present) the method should return false. + * + * @param inputs + * @return + */ + public boolean isRecipe(MachineRecipeInput... inputs); - /** - * Returns the output from a single 'cycle' of the recipe (even if the inputs - * would allow the recipe to be crafted several times). - * - * This method must not return null. If no output is generated an empty array - * should be returned. - * - * @param randomChance - * a random number to be used as a seed for determining whether '% - * chance' outputs are returned. This value is in the range 0-1. - * @param inputs - * @return - */ - ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs); + /** + * Returns the output from a single 'cycle' of the recipe (even if the inputs + * would allow the recipe to be crafted several times). + * + * This method must not return null. If no output is generated an empty array + * should be returned. + * + * @param randomChance + * a random number to be used as a seed for determining whether '% + * chance' outputs are returned. This value is in the range 0-1. + * @param inputs + * @return + */ + ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs); - /** - * Returns the experience a user gains when this recipe has generated the - * specified output. If the output is the result of several recipe cycles, the - * accumulated total of experience gained for all cycles should be returned. - * - * @param output - * @return - */ - float getExperienceForOutput(ItemStack output); + /** + * Returns the experience a user gains when this recipe has generated the + * specified output. If the output is the result of several recipe cycles, the + * accumulated total of experience gained for all cycles should be returned. + * + * @param output + * @return + */ + float getExperienceForOutput(ItemStack output); - /** - * Should return true if the specified parameter is can be used in this - * recipe. - * - * @param input - * @return - */ - boolean isValidInput(MachineRecipeInput input); + /** + * Should return true if the specified parameter is can be used in this + * recipe. + * + * @param input + * @return + */ + boolean isValidInput(MachineRecipeInput input); - /** - * The name of the machine this recipe can be crafted by. - * - * @return - */ - String getMachineName(); + /** + * The name of the machine this recipe can be crafted by. + * + * @return + */ + String getMachineName(); - /** - * Returns the quantity of inputs consumed by a single cycle of the recipe. - * - * @param inputs - * @return - */ - List getQuantitiesConsumed(MachineRecipeInput[] inputs); + /** + * Returns the quantity of inputs consumed by a single cycle of the recipe. + * + * @param inputs + * @return + */ + List getQuantitiesConsumed(MachineRecipeInput[] inputs); - public static class ResultStack { + public static class ResultStack { - public final ItemStack item; - public final FluidStack fluid; + public final ItemStack item; + public final FluidStack fluid; - public ResultStack(ItemStack item, FluidStack fluid) { - this.item = item; - this.fluid = fluid; + public ResultStack(ItemStack item, FluidStack fluid) { + this.item = item; + this.fluid = fluid; + } + + public ResultStack(ItemStack item) { + this.item = item; + this.fluid = null; + } + + public ResultStack(FluidStack fluid) { + this.item = null; + this.fluid = fluid; + } } - - public ResultStack(ItemStack item) { - this.item = item; - this.fluid = null; - } - - public ResultStack(FluidStack fluid) { - this.item = null; - this.fluid = fluid; - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/IPoweredTask.java b/src/main/java/crazypants/enderio/machine/IPoweredTask.java index 6113a3bc..8b6b9a07 100644 --- a/src/main/java/crazypants/enderio/machine/IPoweredTask.java +++ b/src/main/java/crazypants/enderio/machine/IPoweredTask.java @@ -1,32 +1,30 @@ package crazypants.enderio.machine; -import javax.annotation.Nullable; - -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.recipe.RecipeBonusType; +import javax.annotation.Nullable; +import net.minecraft.nbt.NBTTagCompound; public interface IPoweredTask { - void update(float availableEnergy); + void update(float availableEnergy); - boolean isComplete(); + boolean isComplete(); - float getProgress(); + float getProgress(); - ResultStack[] getCompletedResult(); + ResultStack[] getCompletedResult(); - float getRequiredEnergy(); + float getRequiredEnergy(); - float getChance(); + float getChance(); - RecipeBonusType getBonusType(); + RecipeBonusType getBonusType(); - void writeToNBT(NBTTagCompound nbtRoot); + void writeToNBT(NBTTagCompound nbtRoot); - @Nullable - IMachineRecipe getRecipe(); - - public abstract MachineRecipeInput[] getInputs(); + @Nullable + IMachineRecipe getRecipe(); + public abstract MachineRecipeInput[] getInputs(); } diff --git a/src/main/java/crazypants/enderio/machine/IRedstoneModeControlable.java b/src/main/java/crazypants/enderio/machine/IRedstoneModeControlable.java index 30d83c7f..ecd17fd9 100644 --- a/src/main/java/crazypants/enderio/machine/IRedstoneModeControlable.java +++ b/src/main/java/crazypants/enderio/machine/IRedstoneModeControlable.java @@ -2,8 +2,7 @@ package crazypants.enderio.machine; public interface IRedstoneModeControlable { - RedstoneControlMode getRedstoneControlMode(); - - void setRedstoneControlMode(RedstoneControlMode mode); + RedstoneControlMode getRedstoneControlMode(); + void setRedstoneControlMode(RedstoneControlMode mode); } diff --git a/src/main/java/crazypants/enderio/machine/IoMode.java b/src/main/java/crazypants/enderio/machine/IoMode.java index 1e0f2ae9..ad8be025 100644 --- a/src/main/java/crazypants/enderio/machine/IoMode.java +++ b/src/main/java/crazypants/enderio/machine/IoMode.java @@ -1,86 +1,90 @@ package crazypants.enderio.machine; -import net.minecraft.util.EnumChatFormatting; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; +import net.minecraft.util.EnumChatFormatting; public enum IoMode { + NONE("gui.machine.ioMode.none"), + PULL("gui.machine.ioMode.pull"), + PUSH("gui.machine.ioMode.push"), + PUSH_PULL("gui.machine.ioMode.pullPush"), + DISABLED("gui.machine.ioMode.disabled"); - NONE("gui.machine.ioMode.none"), - PULL("gui.machine.ioMode.pull"), - PUSH("gui.machine.ioMode.push"), - PUSH_PULL("gui.machine.ioMode.pullPush"), - DISABLED("gui.machine.ioMode.disabled"); + private final String unlocalisedName; - private final String unlocalisedName; - - IoMode(String unlocalisedName) { - this.unlocalisedName = unlocalisedName; - } - - public String getUnlocalisedName() { - return unlocalisedName; - } - - public static ConnectionMode getNext(ConnectionMode mode) { - int ord = mode.ordinal() + 1; - if(ord >= ConnectionMode.values().length) { - ord = 0; + IoMode(String unlocalisedName) { + this.unlocalisedName = unlocalisedName; } - return ConnectionMode.values()[ord]; - } - public static ConnectionMode getPrevious(ConnectionMode mode) { - - int ord = mode.ordinal() - 1; - if(ord < 0) { - ord = ConnectionMode.values().length - 1; + public String getUnlocalisedName() { + return unlocalisedName; } - return ConnectionMode.values()[ord]; - } - public boolean pulls() { - return this == PULL || this == PUSH_PULL; - } - - public boolean pushes() { - return this == PUSH || this == PUSH_PULL; - } - - public boolean canOutput() { - return pushes() || this == NONE; - } - - public boolean canRecieveInput() { - return pulls() || this == NONE; - } - - public String getLocalisedName() { - return EnderIO.lang.localize(unlocalisedName); - } - - public String colorLocalisedName() { - String loc = getLocalisedName(); - switch (this) { - case DISABLED: - return EnumChatFormatting.RED + loc; - case NONE: - return EnumChatFormatting.GRAY + loc; - case PULL: - return EnumChatFormatting.AQUA + loc; - case PUSH: - return EnumChatFormatting.GOLD + loc; - case PUSH_PULL: - return String.format(EnderIO.lang.localize(this.getUnlocalisedName() + ".colored"), EnumChatFormatting.GOLD, EnumChatFormatting.WHITE, EnumChatFormatting.AQUA); - default: return loc; + public static ConnectionMode getNext(ConnectionMode mode) { + int ord = mode.ordinal() + 1; + if (ord >= ConnectionMode.values().length) { + ord = 0; + } + return ConnectionMode.values()[ord]; } - } - public IoMode next() { - int index = ordinal() + 1; - if(index >= values().length) { - index = 0; + public static ConnectionMode getPrevious(ConnectionMode mode) { + + int ord = mode.ordinal() - 1; + if (ord < 0) { + ord = ConnectionMode.values().length - 1; + } + return ConnectionMode.values()[ord]; + } + + public boolean pulls() { + return this == PULL || this == PUSH_PULL; + } + + public boolean pushes() { + return this == PUSH || this == PUSH_PULL; + } + + public boolean canOutput() { + return pushes() || this == NONE; + } + + public boolean canRecieveInput() { + return pulls() || this == NONE; + } + + public String getLocalisedName() { + return EnderIO.lang.localize(unlocalisedName); + } + + public String colorLocalisedName() { + String loc = getLocalisedName(); + switch (this) { + case DISABLED: + return EnumChatFormatting.RED + loc; + case NONE: + return EnumChatFormatting.GRAY + loc; + case PULL: + return EnumChatFormatting.AQUA + loc; + case PUSH: + return EnumChatFormatting.GOLD + loc; + case PUSH_PULL: + return String.format( + EnderIO.lang.localize(this.getUnlocalisedName() + ".colored"), + EnumChatFormatting.GOLD, + EnumChatFormatting.WHITE, + EnumChatFormatting.AQUA); + default: + return loc; + } + } + + public IoMode next() { + int index = ordinal() + 1; + if (index >= values().length) { + index = 0; + } + return values()[index]; } - return values()[index]; - } } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java b/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java index 8b581ed8..10330f8e 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeInput.java @@ -6,79 +6,78 @@ import net.minecraftforge.fluids.FluidStack; public class MachineRecipeInput { - public static ItemStack getInputForSlot(int slot, MachineRecipeInput... inputs) { - for (MachineRecipeInput ri : inputs) { - if(ri.slotNumber == slot) { - return ri.item; - } + public static ItemStack getInputForSlot(int slot, MachineRecipeInput... inputs) { + for (MachineRecipeInput ri : inputs) { + if (ri.slotNumber == slot) { + return ri.item; + } + } + return null; } - return null; - } - public static MachineRecipeInput create(int slotNumber, ItemStack item) { - return new MachineRecipeInput(slotNumber, item); - } - - public final int slotNumber; - public final ItemStack item; - - public final FluidStack fluid; - - public MachineRecipeInput(int slotNumber, ItemStack item) { - this.slotNumber = slotNumber; - this.item = item; - fluid = null; - } - - public MachineRecipeInput(int slotNumber, FluidStack fluid) { - this.slotNumber = slotNumber; - item = null; - this.fluid = fluid; - } - - public MachineRecipeInput(int slotNumber, ItemStack item, FluidStack fluid) { - this.slotNumber = slotNumber; - this.item = item; - this.fluid = fluid; - } - - public MachineRecipeInput copy() { - if(isFluid()) { - return new MachineRecipeInput(slotNumber, fluid.copy()); - } else { - return new MachineRecipeInput(slotNumber, item == null ? (ItemStack) null : item.copy()); + public static MachineRecipeInput create(int slotNumber, ItemStack item) { + return new MachineRecipeInput(slotNumber, item); } - } - public static MachineRecipeInput readFromNBT(NBTTagCompound root) { - int slotNum = root.getInteger("slotNum"); - ItemStack item = null; - FluidStack fluid = null; - if(root.hasKey("itemStack")) { - NBTTagCompound stackRoot = root.getCompoundTag("itemStack"); - item = ItemStack.loadItemStackFromNBT(stackRoot); - } else if(root.hasKey("fluidStack")) { - NBTTagCompound stackRoot = root.getCompoundTag("fluidStack"); - fluid = FluidStack.loadFluidStackFromNBT(stackRoot); + public final int slotNumber; + public final ItemStack item; + + public final FluidStack fluid; + + public MachineRecipeInput(int slotNumber, ItemStack item) { + this.slotNumber = slotNumber; + this.item = item; + fluid = null; } - return new MachineRecipeInput(slotNum, item, fluid); - } - public void writeToNbt(NBTTagCompound root) { - if(item != null) { - NBTTagCompound stackRoot = new NBTTagCompound(); - item.writeToNBT(stackRoot); - root.setTag("itemStack", stackRoot); - } else if(fluid != null) { - NBTTagCompound stackRoot = new NBTTagCompound(); - fluid.writeToNBT(stackRoot); - root.setTag("fluidStack", stackRoot); + public MachineRecipeInput(int slotNumber, FluidStack fluid) { + this.slotNumber = slotNumber; + item = null; + this.fluid = fluid; } - root.setInteger("slotNum", slotNumber); - } - public boolean isFluid() { - return fluid != null; - } + public MachineRecipeInput(int slotNumber, ItemStack item, FluidStack fluid) { + this.slotNumber = slotNumber; + this.item = item; + this.fluid = fluid; + } -} \ No newline at end of file + public MachineRecipeInput copy() { + if (isFluid()) { + return new MachineRecipeInput(slotNumber, fluid.copy()); + } else { + return new MachineRecipeInput(slotNumber, item == null ? (ItemStack) null : item.copy()); + } + } + + public static MachineRecipeInput readFromNBT(NBTTagCompound root) { + int slotNum = root.getInteger("slotNum"); + ItemStack item = null; + FluidStack fluid = null; + if (root.hasKey("itemStack")) { + NBTTagCompound stackRoot = root.getCompoundTag("itemStack"); + item = ItemStack.loadItemStackFromNBT(stackRoot); + } else if (root.hasKey("fluidStack")) { + NBTTagCompound stackRoot = root.getCompoundTag("fluidStack"); + fluid = FluidStack.loadFluidStackFromNBT(stackRoot); + } + return new MachineRecipeInput(slotNum, item, fluid); + } + + public void writeToNbt(NBTTagCompound root) { + if (item != null) { + NBTTagCompound stackRoot = new NBTTagCompound(); + item.writeToNBT(stackRoot); + root.setTag("itemStack", stackRoot); + } else if (fluid != null) { + NBTTagCompound stackRoot = new NBTTagCompound(); + fluid.writeToNBT(stackRoot); + root.setTag("fluidStack", stackRoot); + } + root.setInteger("slotNum", slotNumber); + } + + public boolean isFluid() { + return fluid != null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java index 4fea088e..bdada2bd 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java @@ -9,62 +9,62 @@ import java.util.Map; public class MachineRecipeRegistry { - public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); + public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); - private final Map> machineRecipes = new HashMap>(); + private final Map> machineRecipes = + new HashMap>(); - public void registerRecipe(String machine, IMachineRecipe recipe) { - getRecipesForMachine(machine).put(recipe.getUid(), recipe); - } - - public Map getRecipesForMachine(String machineName) { - Map res = machineRecipes.get(machineName); - if(res == null) { - res = new LinkedHashMap(); - machineRecipes.put(machineName, res); + public void registerRecipe(String machine, IMachineRecipe recipe) { + getRecipesForMachine(machine).put(recipe.getUid(), recipe); } - return res; - } - public IMachineRecipe getRecipeForUid(String uid) { - if(uid == null) { - return null; - } - for (Map recipes : machineRecipes.values()) { - for (IMachineRecipe recipe : recipes.values()) { - if(uid.equals(recipe.getUid())) { - return recipe; + public Map getRecipesForMachine(String machineName) { + Map res = machineRecipes.get(machineName); + if (res == null) { + res = new LinkedHashMap(); + machineRecipes.put(machineName, res); } - } + return res; } - return null; - } - public IMachineRecipe getRecipeForInputs(String machineName, MachineRecipeInput... inputs) { - Map recipes = getRecipesForMachine(machineName); - if(recipes == null) { - return null; + public IMachineRecipe getRecipeForUid(String uid) { + if (uid == null) { + return null; + } + for (Map recipes : machineRecipes.values()) { + for (IMachineRecipe recipe : recipes.values()) { + if (uid.equals(recipe.getUid())) { + return recipe; + } + } + } + return null; } - for (IMachineRecipe recipe : recipes.values()) { - if(recipe.isRecipe(inputs)) { - return recipe; - } - } - return null; - } - public List getRecipesForInput(String machineName, MachineRecipeInput input) { - if(input == null) { - return Collections.emptyList(); + public IMachineRecipe getRecipeForInputs(String machineName, MachineRecipeInput... inputs) { + Map recipes = getRecipesForMachine(machineName); + if (recipes == null) { + return null; + } + for (IMachineRecipe recipe : recipes.values()) { + if (recipe.isRecipe(inputs)) { + return recipe; + } + } + return null; } - List result = new ArrayList(); - Map recipes = getRecipesForMachine(machineName); - for (IMachineRecipe recipe : recipes.values()) { - if(recipe.isValidInput(input)) { - result.add(recipe); - } - } - return result; - } + public List getRecipesForInput(String machineName, MachineRecipeInput input) { + if (input == null) { + return Collections.emptyList(); + } + List result = new ArrayList(); + Map recipes = getRecipesForMachine(machineName); + for (IMachineRecipe recipe : recipes.values()) { + if (recipe.isValidInput(input)) { + result.add(recipe); + } + } + return result; + } } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 24c48b5e..b1df3a7b 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -1,9 +1,10 @@ package crazypants.enderio.machine; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; +import static crazypants.enderio.EnderIO.itemBasicCapacitor; +import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.Material.*; +import static crazypants.util.RecipeUtil.*; + import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.item.FunctionUpgrade; @@ -18,300 +19,751 @@ import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; import crazypants.enderio.power.Capacitors; - -import static crazypants.enderio.EnderIO.itemBasicCapacitor; -import static crazypants.enderio.material.Alloy.*; -import static crazypants.enderio.material.Material.*; -import static crazypants.util.RecipeUtil.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; public class MachineRecipes { - public static void addRecipes() { - //Common ingredients - ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); - ItemStack capacitor2 = new ItemStack(itemBasicCapacitor, 1, 1); - ItemStack capacitor3 = new ItemStack(itemBasicCapacitor, 1, 2); - ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); - String basicGear = MachinePart.BASIC_GEAR.oreDict; - String machineChassi = MachinePart.MACHINE_CHASSI.oreDict; - ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); - ItemStack enlightedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 2); - ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); - ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); - ItemStack enderRes = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); - ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); - ItemStack obsidian = new ItemStack(Blocks.obsidian); + public static void addRecipes() { + // Common ingredients + ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); + ItemStack capacitor2 = new ItemStack(itemBasicCapacitor, 1, 1); + ItemStack capacitor3 = new ItemStack(itemBasicCapacitor, 1, 2); + ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); + String basicGear = MachinePart.BASIC_GEAR.oreDict; + String machineChassi = MachinePart.MACHINE_CHASSI.oreDict; + ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); + ItemStack enlightedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 2); + ItemStack zombieController = + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); + ItemStack enderRes = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); + ItemStack sentientEnder = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); + ItemStack obsidian = new ItemStack(Blocks.obsidian); - String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); - String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); - String darkSteel = DARK_STEEL.getOreIngot(); - String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); - String phasedGold = PHASED_GOLD.getOreIngot(); - String phasedIron = PHASED_IRON.getOreIngot(); - String soularium = SOULARIUM.getOreIngot(); - String endSteel = END_STEEL.getOreIngot(); + String redstoneAlloy = REDSTONE_ALLOY.getOreIngot(); + String electricalSteel = ELECTRICAL_STEEL.getOreIngot(); + String darkSteel = DARK_STEEL.getOreIngot(); + String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); + String phasedGold = PHASED_GOLD.getOreIngot(); + String phasedIron = PHASED_IRON.getOreIngot(); + String soularium = SOULARIUM.getOreIngot(); + String endSteel = END_STEEL.getOreIngot(); - String vibCry = VIBRANT_CYSTAL.oreDict; - String pulCry = PULSATING_CYSTAL.oreDict; - String endCry = ENDER_CRYSTAL.oreDict; - String binder = CONDUIT_BINDER.oreDict; - String silicon = SILICON.oreDict; + String vibCry = VIBRANT_CYSTAL.oreDict; + String pulCry = PULSATING_CYSTAL.oreDict; + String endCry = ENDER_CRYSTAL.oreDict; + String binder = CONDUIT_BINDER.oreDict; + String silicon = SILICON.oreDict; - if (Config.addPeacefulRecipes) { - addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', "ingotGold", 'd', "gemDiamond", 'z', zombieController); - addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes); + if (Config.addPeacefulRecipes) { + addShaped(frankenZombie, "gdg", "dzd", "gdg", 'g', "ingotGold", 'd', "gemDiamond", 'z', zombieController); + addShaped(sentientEnder, "ddd", "ded", "dgd", 'g', "blockGold", 'd', "gemDiamond", 'e', enderRes); + } + + // stirling gen + ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); + addShaped( + stirlingGen, + "bbb", + "bfb", + "gpg", + 'b', + Blocks.stonebrick, + 'f', + Blocks.furnace, + 'p', + Blocks.piston, + 'g', + basicGear); + + // Combustion Gen + ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0); + ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0); + addShaped( + comGen, + "eee", + "rmr", + "gpg", + 'e', + electricalSteel, + 'r', + res, + 'm', + machineChassi, + 'g', + basicGear, + 'p', + Blocks.piston); + + // ZombieGen + ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); + addShaped( + zg, + "eee", + "qzq", + "qqq", + 'e', + electricalSteel, + 'q', + fusedQuartz, + 'z', + new ItemStack(EnderIO.itemFrankenSkull, 1, 0)); + + // FrankenzombieGen + ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0); + addShaped( + fg, + "eee", + "qzq", + "qqq", + 'e', + soularium, + 'q', + fusedQuartz, + 'z', + new ItemStack(EnderIO.itemFrankenSkull, 1, 2)); + + // EnderGen + ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0); + addShaped( + eg, + "eee", + "qzq", + "qqq", + 'e', + endSteel, + 'q', + fusedQuartz, + 'z', + new ItemStack(EnderIO.itemFrankenSkull, 1, 3)); + + // KillerJoe + ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); + addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); + + // Wireless charger + ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger); + // addShaped(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', + // capacitor3, 'v', vibCry); + addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes); + + // Crafter + ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); + addShaped( + crafter, + "iti", + "imi", + "izi", + 'i', + "ingotIron", + 't', + "craftingTableWood", + 'm', + machineChassi, + 'z', + zombieController); + + // Powered Spawner + ItemStack poweredSpawner = new ItemStack(EnderIO.blockPoweredSpawner); + ItemStack zombieBit; + if (Config.useHardRecipes) { + zombieBit = frankenZombie; + } else { + zombieBit = zombieController; + } + addShaped( + poweredSpawner, + "ese", + "eme", + "vzv", + 'e', + electricalSteel, + 's', + "itemSkull", + 'v', + vibCry, + 'm', + machineChassi, + 'z', + zombieBit); + + if (Config.reservoirEnabled) { + // reservoir + ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); + Object glassSides; + if (Config.useHardRecipes) { + glassSides = "blockGlassHardened"; + } else { + glassSides = "glass"; + } + addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); + } + + // Tanks + ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0); + addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars); + + ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1); + addShaped( + advTank, + "ibi", + "bgb", + "ibi", + 'g', + "blockGlassHardened", + 'i', + darkSteel, + 'b', + EnderIO.blockDarkIronBars); + + // mill + ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0); + if (Config.useHardRecipes) { + addShaped( + crusher, + "ooo", + "fmf", + "pip", + 'f', + Items.flint, + 'm', + machineChassi, + 'i', + "ingotIron", + 'p', + Blocks.piston, + 'o', + Blocks.obsidian); + } else { + addShaped( + crusher, + "fff", + "imi", + "ipi", + 'f', + Items.flint, + 'm', + machineChassi, + 'i', + "ingotIron", + 'p', + Blocks.piston); + } + + // alloy smelter + ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0); + if (Config.useHardRecipes) { + addShaped( + alloySmelter, + "bfb", + "fmf", + "bcb", + 'c', + Items.cauldron, + 'm', + machineChassi, + 'b', + "blockIron", + 'f', + Blocks.furnace); + } else { + addShaped( + alloySmelter, + "bfb", + "fmf", + "bcb", + 'c', + Items.cauldron, + 'm', + machineChassi, + 'b', + "ingotIron", + 'f', + Blocks.furnace); + } + + // Vat + ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0); + addShaped( + still, + "eve", + "tmt", + "efe", + 'v', + Items.cauldron, + 'm', + machineChassi, + 'e', + electricalSteel, + 'f', + Blocks.furnace, + 't', + basicTank); + + // capacitor bank + + ItemStack capBank1 = + BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); + addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone"); + ItemStack capBank2 = + BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); + addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone"); + ItemStack capBank3 = + BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); + addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry); + + ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); + GameRegistry.addRecipe(convertRecipe); + + GameRegistry.addRecipe(new UpgradeCapBankRecipe( + capBank2, "eee", "bcb", "eee", 'e', energeticAlloy, 'b', capBank1, 'c', capacitor2)); + GameRegistry.addRecipe(new UpgradeCapBankRecipe( + capBank3, "vov", "NcN", "vov", 'v', phasedGold, 'o', capacitor3, 'N', capBank2, 'c', vibCry)); + + // painter + ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); + if (Config.useHardRecipes) { + addShaped( + painter, + "qqq", + "mdm", + "mMm", + 'm', + electricalSteel, + 'M', + machineChassi, + 'q', + "gemQuartz", + 'd', + "gemDiamond", + 'd', + "gemDiamond"); + } else { + addShaped( + painter, + "qdq", + "mMm", + "mmm", + 'm', + electricalSteel, + 'M', + machineChassi, + 'q', + "gemQuartz", + 'd', + "gemDiamond", + 'd', + "gemDiamond"); + } + + // Farm + ItemStack farm = new ItemStack(EnderIO.blockFarmStation, 1, 0); + if (Config.useHardRecipes) { + zombieBit = frankenZombie; + } else { + zombieBit = zombieController; + } + addShaped( + farm, + "ehe", + "eme", + "pzp", + 'h', + Items.diamond_hoe, + 'm', + machineChassi, + 'e', + electricalSteel, + 'z', + zombieController, + 'p', + pulCry); + + if (Config.transceiverEnabled) { + // transceiver + ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); + if (Config.transceiverUseEasyRecipe) { + addShaped( + transceiver, + "oeo", + "pdp", + "oco", + 'o', + obsidian, + 'e', + Items.ender_eye, + 'c', + enderCapacitor, + 'p', + phasedGold, + 'd', + Items.diamond); + } else { + addShaped( + transceiver, + "oeo", + "pdp", + "oco", + 'o', + electricalSteel, + 'e', + enderRes, + 'c', + enderCapacitor, + 'p', + fusedQuartz, + 'd', + endCry); + addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); + } + } + + // solar panel + if (Config.photovoltaicCellEnabled) { + + ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0); + ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1); + ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2); + + if (Config.useHardRecipes) { + addShaped( + solarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + "blockGlassHardened", + 'c', + capacitor, + 'e', + energeticAlloy, + 'p', + phasedGold); + addShaped( + advSolarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + enlightedQuartz, + 'c', + capacitor2, + 'e', + phasedIron, + 'p', + phasedGold); + addShaped( + vibSolarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + enlightedQuartz, + 'c', + capacitor3, + 'e', + endSteel, + 'p', + phasedGold); + } else { + addShaped( + solarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + "blockGlassHardened", + 'p', + silicon, + 'e', + energeticAlloy, + 'c', + redstoneAlloy); + addShaped( + advSolarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + enlightedQuartz, + 'p', + pulCry, + 'e', + phasedIron, + 'c', + electricalSteel); + addShaped( + vibSolarPanel, + "efe", + "pfp", + "cdc", + 'd', + Blocks.daylight_detector, + 'f', + enlightedQuartz, + 'p', + vibCry, + 'e', + phasedGold, + 'c', + endSteel); + } + } + + // MJ Monitor + ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0); + ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); + ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); + addShaped( + mJMonitor, + "sms", + "sMs", + "sps", + 's', + electricalSteel, + 'M', + machineChassi, + 'm', + mJReader, + 'p', + powerConduit, + 'r', + redstoneConduit); + + // Enchanter + ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter); + addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel); + + // Vacuum Chest + ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest); + addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry); + + // Soul Binder + Object enderBit; + if (Config.soulBinderRequiresEndermanSkull) { + enderBit = new ItemStack(EnderIO.blockEndermanSkull); + } else { + enderBit = pulCry; + } + ItemStack creeperSkull = new ItemStack(Items.skull, 1, 2); + ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4); + ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0); + ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser); + addShaped( + soulBinder, + "ses", + "zmc", + "sks", + 's', + soularium, + 'm', + machineChassi, + 'e', + enderBit, + 'z', + zombieSkull, + 'c', + creeperSkull, + 'k', + skeletonSkull); + + // Attractor + ItemStack attractor = new ItemStack(EnderIO.blockAttractor); + ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); + addShaped( + attractor, + " c ", + "ese", + "sms", + 's', + soularium, + 'm', + machineChassi, + 'c', + attractorCrystal, + 'e', + energeticAlloy); + + // Aversion + ItemStack aversion = new ItemStack(EnderIO.blockSpawnGuard); + ItemStack tormentedEnderman = + new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); + addShaped( + aversion, + " c ", + "ese", + "sms", + 's', + soularium, + 'm', + machineChassi, + 'c', + tormentedEnderman, + 'e', + energeticAlloy); + + // Experience + ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk); + ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer); + addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem); + + // Weather + ItemStack weather = new ItemStack(EnderIO.blockWeatherObelisk); + ItemStack weatherItem = new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()); + addShaped( + weather, + " x ", + "ese", + "sbs", + 'x', + weatherItem, + 'e', + energeticAlloy, + 's', + soularium, + 'b', + new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.SIMPLE))); + + ClearConfigRecipe inst = new ClearConfigRecipe(); + MinecraftForge.EVENT_BUS.register(inst); + GameRegistry.addRecipe(inst); + + // wireless light + ItemStack poweredLamp = + new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.ELECTRIC.ordinal()); + ItemStack poweredLampInv = + new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.ELECTRIC_INV.ordinal()); + ItemStack wirelessLamp = + new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.WIRELESS.ordinal()); + ItemStack wirelessLampInv = + new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.WIRELESS_INV.ordinal()); + addShapeless(wirelessLamp, poweredLamp, enderRes); + addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch); + addShapeless(wirelessLampInv, poweredLampInv, enderRes); + addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch); + + // inventory panel + ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal()); + addShaped( + awareness, "bsb", "ses", "bib", 'b', binder, 's', silicon, 'e', Items.ender_eye, 'i', electricalSteel); + ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel); + addShaped( + invPanel, + "dad", + "psp", + "dtd", + 'd', + darkSteel, + 'a', + awareness, + 'p', + pulCry, + 's', + sentientEnder, + 't', + basicTank); + + ItemStack machineChassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); + + // powered light + if (Config.useHardRecipes) { + addShaped( + poweredLamp, + "ggg", + "sds", + "scs", + 'g', + fusedQuartz, + 'd', + "dustGlowstone", + 's', + "itemSilicon", + 'c', + capacitor); + } else { + addShaped( + poweredLamp, + "ggg", + "sds", + "scs", + 'g', + "glass", + 'd', + "dustGlowstone", + 's', + "itemSilicon", + 'c', + capacitor); + } + ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1); + addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch); + addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch); + + // light + ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2); + addShaped(lamp, " ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron"); + ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3); + addShapeless(invLamp, lamp, Blocks.redstone_torch); + addShapeless(lamp, invLamp, Blocks.redstone_torch); + + // MJ Reader + + addShaped( + mJReader, + "epe", + "gcg", + "srs", + 'p', + powerConduit, + 'r', + redstoneConduit, + 'c', + Items.comparator, + 'g', + "paneGlass", + 's', + "itemSilicon", + 'e', + electricalSteel); + + // Slice'N'Splice + ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice); + addShaped( + sns, + "iki", + "ams", + "iii", + 'i', + soularium, + 'm', + machineChassis, + 'k', + "itemSkull", + 'a', + Items.iron_axe, + 's', + Items.shears); + + // Buffer + ItemStack itemBuffer = Type.getStack(Type.ITEM); + ItemStack powerBuffer = Type.getStack(Type.POWER); + ItemStack omniBuffer = Type.getStack(Type.OMNI); + addShaped(itemBuffer, "isi", "scs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'c', "chestWood"); + addShaped(powerBuffer, "isi", "sfs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'f', machineChassis); + addShapeless(omniBuffer, itemBuffer, powerBuffer); } - - //stirling gen - ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); - addShaped(stirlingGen, "bbb", "bfb", "gpg", 'b', Blocks.stonebrick, 'f', Blocks.furnace, 'p', Blocks.piston, 'g', basicGear); - - //Combustion Gen - ItemStack res = new ItemStack(EnderIO.blockTank, 1, 0); - ItemStack comGen = new ItemStack(EnderIO.blockCombustionGenerator, 1, 0); - addShaped(comGen, "eee", "rmr", "gpg", 'e', electricalSteel, 'r', res, 'm', machineChassi, 'g', basicGear, 'p', Blocks.piston); - - //ZombieGen - ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); - addShaped(zg, "eee", "qzq", "qqq", 'e', electricalSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0)); - - //FrankenzombieGen - ItemStack fg = new ItemStack(EnderIO.blockFrankenZombieGenerator, 1, 0); - addShaped(fg, "eee", "qzq", "qqq", 'e', soularium, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 2)); - - //EnderGen - ItemStack eg = new ItemStack(EnderIO.blockEnderGenerator, 1, 0); - addShaped(eg, "eee", "qzq", "qqq", 'e', endSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 3)); - - //KillerJoe - ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); - addShaped(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', frankenZombie); - - //Wireless charger - ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger); - //addShaped(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', capacitor3, 'v', vibCry); - addShaped(wirelessCharger, "sss", "ses", "scs", 's', electricalSteel, 'c', capacitor3, 'e', enderRes); - - //Crafter - ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); - addShaped(crafter, "iti", "imi", "izi", 'i', "ingotIron", 't', "craftingTableWood", 'm', machineChassi, 'z', zombieController); - - //Powered Spawner - ItemStack poweredSpawner = new ItemStack(EnderIO.blockPoweredSpawner); - ItemStack zombieBit; - if (Config.useHardRecipes) { - zombieBit = frankenZombie; - } else { - zombieBit = zombieController; - } - addShaped(poweredSpawner, "ese", "eme", "vzv", 'e', electricalSteel, 's', "itemSkull", 'v', vibCry, 'm', machineChassi, 'z', zombieBit); - - if (Config.reservoirEnabled) { - //reservoir - ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); - Object glassSides; - if (Config.useHardRecipes) { - glassSides = "blockGlassHardened"; - } else { - glassSides = "glass"; - } - addShaped(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); - } - - //Tanks - ItemStack basicTank = new ItemStack(EnderIO.blockTank, 1, 0); - addShaped(basicTank, "ibi", "bgb", "ibi", 'g', "glass", 'i', "ingotIron", 'b', Blocks.iron_bars); - - ItemStack advTank = new ItemStack(EnderIO.blockTank, 1, 1); - addShaped(advTank, "ibi", "bgb", "ibi", 'g', "blockGlassHardened", 'i', darkSteel, 'b', EnderIO.blockDarkIronBars); - - //mill - ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0); - if (Config.useHardRecipes) { - addShaped(crusher, "ooo", "fmf", "pip", 'f', Items.flint, 'm', machineChassi, 'i', "ingotIron", 'p', Blocks.piston, 'o', Blocks.obsidian); - } else { - addShaped(crusher, "fff", "imi", "ipi", 'f', Items.flint, 'm', machineChassi, 'i', "ingotIron", 'p', Blocks.piston); - } - - //alloy smelter - ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0); - if (Config.useHardRecipes) { - addShaped(alloySmelter, "bfb", "fmf", "bcb", 'c', Items.cauldron, 'm', machineChassi, 'b', "blockIron", 'f', Blocks.furnace); - } else { - addShaped(alloySmelter, "bfb", "fmf", "bcb", 'c', Items.cauldron, 'm', machineChassi, 'b', "ingotIron", 'f', Blocks.furnace); - - } - - //Vat - ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0); - addShaped(still, "eve", "tmt", "efe", 'v', Items.cauldron, 'm', machineChassi, 'e', electricalSteel, 'f', Blocks.furnace, 't', basicTank); - - //capacitor bank - - ItemStack capBank1 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); - addShaped(capBank1, "bcb", "cmc", "bcb", 'b', "ingotIron", 'c', capacitor, 'm', "blockRedstone"); - ItemStack capBank2 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); - addShaped(capBank2, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor2, 'm', "blockRedstone"); - ItemStack capBank3 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); - addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry); - - ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); - GameRegistry.addRecipe(convertRecipe); - - GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank2, "eee", "bcb", "eee", 'e', energeticAlloy, 'b', capBank1, 'c', capacitor2)); - GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank3, "vov", "NcN", "vov", 'v', phasedGold, 'o', capacitor3, 'N', capBank2, 'c', vibCry)); - - //painter - ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); - if (Config.useHardRecipes) { - addShaped(painter, "qqq", "mdm", "mMm", 'm', electricalSteel, 'M', machineChassi, 'q', "gemQuartz", 'd', "gemDiamond", 'd', "gemDiamond"); - } else { - addShaped(painter, "qdq", "mMm", "mmm", 'm', electricalSteel, 'M', machineChassi, 'q', "gemQuartz", 'd', "gemDiamond", 'd', "gemDiamond"); - } - - //Farm - ItemStack farm = new ItemStack(EnderIO.blockFarmStation, 1, 0); - if (Config.useHardRecipes) { - zombieBit = frankenZombie; - } else { - zombieBit = zombieController; - } - addShaped(farm, "ehe", "eme", "pzp", 'h', Items.diamond_hoe, 'm', machineChassi, 'e', electricalSteel, 'z', zombieController, 'p', pulCry); - - if (Config.transceiverEnabled) { - //transceiver - ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); - if (Config.transceiverUseEasyRecipe) { - addShaped(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', - Items.diamond); - } else { - addShaped(transceiver, "oeo", "pdp", "oco", 'o', electricalSteel, 'e', enderRes, 'c', enderCapacitor, 'p', fusedQuartz, 'd', endCry); - addShapeless(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); - } - } - - //solar panel - if (Config.photovoltaicCellEnabled) { - - ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0); - ItemStack advSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 1); - ItemStack vibSolarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 2); - - if (Config.useHardRecipes) { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'c', capacitor, 'e', energeticAlloy, 'p', phasedGold); - addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor2, 'e', phasedIron, 'p', phasedGold); - addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'c', capacitor3, 'e', endSteel, 'p', phasedGold); - } else { - addShaped(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', "blockGlassHardened", 'p', silicon, 'e', energeticAlloy, 'c', redstoneAlloy); - addShaped(advSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', pulCry, 'e', phasedIron, 'c', electricalSteel); - addShaped(vibSolarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', enlightedQuartz, 'p', vibCry, 'e', phasedGold, 'c', endSteel); - - } - } - - //MJ Monitor - ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0); - ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); - ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); - ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); - addShaped(mJMonitor, "sms", "sMs", "sps", 's', electricalSteel, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, 'r', redstoneConduit); - - //Enchanter - ItemStack enchanter = new ItemStack(EnderIO.blockEnchanter); - addShaped(enchanter, "dbd", "sss", " s ", 'd', "gemDiamond", 'b', Items.book, 's', darkSteel); - - //Vacuum Chest - ItemStack vacuumChest = new ItemStack(EnderIO.blockVacuumChest); - addShaped(vacuumChest, "iii", "ici", "ipi", 'i', "ingotIron", 'c', "chestWood", 'p', pulCry); - - //Soul Binder - Object enderBit; - if (Config.soulBinderRequiresEndermanSkull) { - enderBit = new ItemStack(EnderIO.blockEndermanSkull); - } else { - enderBit = pulCry; - } - ItemStack creeperSkull = new ItemStack(Items.skull, 1, 2); - ItemStack zombieSkull = new ItemStack(Items.skull, 1, 4); - ItemStack skeletonSkull = new ItemStack(Items.skull, 1, 0); - ItemStack soulBinder = new ItemStack(EnderIO.blockSoulFuser); - addShaped(soulBinder, "ses", "zmc", "sks", 's', soularium, 'm', machineChassi, 'e', enderBit, 'z', zombieSkull, 'c', creeperSkull, 'k', skeletonSkull); - - //Attractor - ItemStack attractor = new ItemStack(EnderIO.blockAttractor); - ItemStack attractorCrystal = new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); - addShaped(attractor, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', attractorCrystal, 'e', energeticAlloy); - - //Aversion - ItemStack aversion = new ItemStack(EnderIO.blockSpawnGuard); - ItemStack tormentedEnderman = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); - addShaped(aversion, " c ", "ese", "sms", 's', soularium, 'm', machineChassi, 'c', tormentedEnderman, 'e', energeticAlloy); - - //Experience - ItemStack xp = new ItemStack(EnderIO.blockExperianceOblisk); - ItemStack xpItem = new ItemStack(EnderIO.itemXpTransfer); - addShaped(xp, " x ", " s ", "sms", 's', soularium, 'm', machineChassi, 'x', xpItem); - - //Weather - ItemStack weather = new ItemStack(EnderIO.blockWeatherObelisk); - ItemStack weatherItem = new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()); - addShaped(weather, " x ", "ese", "sbs", 'x', weatherItem, 'e', energeticAlloy, 's', soularium, 'b', - new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.SIMPLE))); - - ClearConfigRecipe inst = new ClearConfigRecipe(); - MinecraftForge.EVENT_BUS.register(inst); - GameRegistry.addRecipe(inst); - - //wireless light - ItemStack poweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.ELECTRIC.ordinal()); - ItemStack poweredLampInv = new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.ELECTRIC_INV.ordinal()); - ItemStack wirelessLamp = new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.WIRELESS.ordinal()); - ItemStack wirelessLampInv = new ItemStack(EnderIO.blockElectricLight, 1, BlockItemElectricLight.Type.WIRELESS_INV.ordinal()); - addShapeless(wirelessLamp, poweredLamp, enderRes); - addShapeless(wirelessLamp, wirelessLampInv, Blocks.redstone_torch); - addShapeless(wirelessLampInv, poweredLampInv, enderRes); - addShapeless(wirelessLampInv, wirelessLamp, Blocks.redstone_torch); - - //inventory panel - ItemStack awareness = new ItemStack(EnderIO.itemFunctionUpgrade, 1, FunctionUpgrade.INVENTORY_PANEL.ordinal()); - addShaped(awareness, "bsb", "ses", "bib", 'b', binder, 's', silicon, 'e', Items.ender_eye, 'i', electricalSteel); - ItemStack invPanel = new ItemStack(EnderIO.blockInventoryPanel); - addShaped(invPanel, "dad", "psp", "dtd", 'd', darkSteel, 'a', awareness, 'p', pulCry, 's', sentientEnder, 't', basicTank); - - ItemStack machineChassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); - - //powered light - if (Config.useHardRecipes) { - addShaped(poweredLamp, "ggg", "sds", "scs", 'g', fusedQuartz, 'd', "dustGlowstone", 's', "itemSilicon", 'c', capacitor); - } else { - addShaped(poweredLamp, "ggg", "sds", "scs", 'g', "glass", 'd', "dustGlowstone", 's', "itemSilicon", 'c', capacitor); - } - ItemStack invPoweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 1); - addShapeless(invPoweredLamp, poweredLamp, Blocks.redstone_torch); - addShapeless(poweredLamp, invPoweredLamp, Blocks.redstone_torch); - - //light - ItemStack lamp = new ItemStack(EnderIO.blockElectricLight, 1, 2); - addShaped(lamp, " ", "ggg", "isi", 'g', "glass", 's', "glowstone", 'i', "ingotIron"); - ItemStack invLamp = new ItemStack(EnderIO.blockElectricLight, 1, 3); - addShapeless(invLamp, lamp, Blocks.redstone_torch); - addShapeless(lamp, invLamp, Blocks.redstone_torch); - - //MJ Reader - - addShaped(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Items.comparator, 'g', "paneGlass", 's', "itemSilicon", 'e', - electricalSteel); - - //Slice'N'Splice - ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice); - addShaped(sns, "iki", "ams", "iii", 'i', soularium, 'm', machineChassis, 'k', "itemSkull", 'a', Items.iron_axe, 's', Items.shears); - - //Buffer - ItemStack itemBuffer = Type.getStack(Type.ITEM); - ItemStack powerBuffer = Type.getStack(Type.POWER); - ItemStack omniBuffer = Type.getStack(Type.OMNI); - addShaped(itemBuffer, "isi", "scs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'c', "chestWood"); - addShaped(powerBuffer, "isi", "sfs", "isi", 'i', "ingotIron", 's', "ingotElectricalSteel", 'f', machineChassis); - addShapeless(omniBuffer, itemBuffer, powerBuffer); - } } diff --git a/src/main/java/crazypants/enderio/machine/MachineSound.java b/src/main/java/crazypants/enderio/machine/MachineSound.java index dd9dc5da..7c46cd7a 100644 --- a/src/main/java/crazypants/enderio/machine/MachineSound.java +++ b/src/main/java/crazypants/enderio/machine/MachineSound.java @@ -6,43 +6,43 @@ import net.minecraft.util.ResourceLocation; public class MachineSound extends PositionedSound implements ITickableSound { - private boolean donePlaying; + private boolean donePlaying; - public MachineSound(ResourceLocation sound, float x, float y, float z, float volume, float pitch) { - super(sound); - this.xPosF = x; - this.yPosF = y; - this.zPosF = z; - this.volume = volume; - this.field_147663_c = pitch; - this.repeat = true; - } + public MachineSound(ResourceLocation sound, float x, float y, float z, float volume, float pitch) { + super(sound); + this.xPosF = x; + this.yPosF = y; + this.zPosF = z; + this.volume = volume; + this.field_147663_c = pitch; + this.repeat = true; + } - @Override - public void update() { - ; - } + @Override + public void update() { + ; + } - @Override - public boolean isDonePlaying() { - return donePlaying; - } + @Override + public boolean isDonePlaying() { + return donePlaying; + } - public void endPlaying() { - donePlaying = true; - } + public void endPlaying() { + donePlaying = true; + } - public void startPlaying() { - donePlaying = false; - } + public void startPlaying() { + donePlaying = false; + } - public MachineSound setVolume(float vol) { - this.volume = vol; - return this; - } + public MachineSound setVolume(float vol) { + this.volume = vol; + return this; + } - public MachineSound setPitch(float pitch) { - this.field_147663_c = pitch; - return this; - } + public MachineSound setPitch(float pitch) { + this.field_147663_c = pitch; + return this; + } } diff --git a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java index f0829772..9e250c7e 100644 --- a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java +++ b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java @@ -1,13 +1,5 @@ package crazypants.enderio.machine; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.render.IRenderFace; import com.enderio.core.client.render.CustomCubeRenderer; import com.enderio.core.client.render.CustomRenderBlocks; @@ -16,38 +8,52 @@ import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vertex; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class OverlayRenderer implements IRenderFace { - private static final CustomCubeRenderer ccr = CustomCubeRenderer.instance; - private AbstractMachineEntity te; - - public void setTile(AbstractMachineEntity te) { - this.te = te; - } - - @SuppressWarnings("unchecked") - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { + private static final CustomCubeRenderer ccr = CustomCubeRenderer.instance; + private AbstractMachineEntity te; - if(te != null && par1Block instanceof AbstractMachineBlock) { - BlockCoord bc = new BlockCoord(x, y, z); - if(par1Block.isOpaqueCube()) { - bc = bc.getLocation(face); - } - RenderUtil.setTesselatorBrightness(Minecraft.getMinecraft().theWorld, bc.x, bc.y, bc.z); - Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, 0.001); - Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); - - IoMode mode = te.getIoMode(face); - IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(te, face, mode); - if(tex != null) { - ccr.getCustomRenderBlocks().setRenderBoundsFromBlock(par1Block); - ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex); - } - - Tessellator.instance.addTranslation(-(float) offset.x, -(float) offset.y, -(float) offset.z); + public void setTile(AbstractMachineEntity te) { + this.te = te; + } + + @SuppressWarnings("unchecked") + @Override + public void renderFace( + CustomRenderBlocks rb, + ForgeDirection face, + Block par1Block, + double x, + double y, + double z, + IIcon texture, + List refVertices, + boolean translateToXyz) { + + if (te != null && par1Block instanceof AbstractMachineBlock) { + BlockCoord bc = new BlockCoord(x, y, z); + if (par1Block.isOpaqueCube()) { + bc = bc.getLocation(face); + } + RenderUtil.setTesselatorBrightness(Minecraft.getMinecraft().theWorld, bc.x, bc.y, bc.z); + Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, 0.001); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + + IoMode mode = te.getIoMode(face); + IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(te, face, mode); + if (tex != null) { + ccr.getCustomRenderBlocks().setRenderBoundsFromBlock(par1Block); + ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex); + } + + Tessellator.instance.addTranslation(-(float) offset.x, -(float) offset.y, -(float) offset.z); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 46670aa7..7018abf7 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -1,76 +1,72 @@ package crazypants.enderio.machine; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; - public class PacketIoMode implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private IoMode mode; - private ForgeDirection face; + private int x; + private int y; + private int z; + private IoMode mode; + private ForgeDirection face; - public PacketIoMode() { - } + public PacketIoMode() {} - public PacketIoMode(IIoConfigurable cont) { - BlockCoord location = cont.getLocation(); - this.x = location.x; - this.y = location.y; - this.z = location.z; - this.mode = IoMode.NONE; - this.face = ForgeDirection.UNKNOWN; - } - - public PacketIoMode(IIoConfigurable cont, ForgeDirection face) { - BlockCoord location = cont.getLocation(); - this.x = location.x; - this.y = location.y; - this.z = location.z; - this.face = face; - mode = cont.getIoMode(face); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeShort((short) mode.ordinal()); - buf.writeShort((short) face.ordinal()); - - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - mode = IoMode.values()[buf.readShort()]; - face = ForgeDirection.values()[buf.readShort()]; - } - - @Override - public IMessage onMessage(PacketIoMode message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof IIoConfigurable) { - IIoConfigurable me = (IIoConfigurable) te; - if(message.face == ForgeDirection.UNKNOWN) { - me.clearAllIoModes(); - } else { - me.setIoMode(message.face, message.mode); - } + public PacketIoMode(IIoConfigurable cont) { + BlockCoord location = cont.getLocation(); + this.x = location.x; + this.y = location.y; + this.z = location.z; + this.mode = IoMode.NONE; + this.face = ForgeDirection.UNKNOWN; + } + + public PacketIoMode(IIoConfigurable cont, ForgeDirection face) { + BlockCoord location = cont.getLocation(); + this.x = location.x; + this.y = location.y; + this.z = location.z; + this.face = face; + mode = cont.getIoMode(face); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort((short) mode.ordinal()); + buf.writeShort((short) face.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + mode = IoMode.values()[buf.readShort()]; + face = ForgeDirection.values()[buf.readShort()]; + } + + @Override + public IMessage onMessage(PacketIoMode message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof IIoConfigurable) { + IIoConfigurable me = (IIoConfigurable) te; + if (message.face == ForgeDirection.UNKNOWN) { + me.clearAllIoModes(); + } else { + me.setIoMode(message.face, message.mode); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java b/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java index 6d59d512..659800f5 100644 --- a/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/PacketItemBuffer.java @@ -1,57 +1,53 @@ package crazypants.enderio.machine; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; - public class PacketItemBuffer implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - boolean bufferStacks; + private int x; + private int y; + private int z; + boolean bufferStacks; - public PacketItemBuffer() { - } + public PacketItemBuffer() {} - public PacketItemBuffer(IItemBuffer buffer) { - BlockCoord bc = buffer.getLocation(); - x = bc.x; - y = bc.y; - z = bc.z; - bufferStacks = buffer.isBufferStacks(); - } + public PacketItemBuffer(IItemBuffer buffer) { + BlockCoord bc = buffer.getLocation(); + x = bc.x; + y = bc.y; + z = bc.z; + bufferStacks = buffer.isBufferStacks(); + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeBoolean(bufferStacks); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeBoolean(bufferStacks); + } - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - bufferStacks = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketItemBuffer message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof IItemBuffer) { - ((IItemBuffer)te).setBufferStacks(message.bufferStacks); - } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + bufferStacks = buf.readBoolean(); + } + @Override + public IMessage onMessage(PacketItemBuffer message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof IItemBuffer) { + ((IItemBuffer) te).setBufferStacks(message.bufferStacks); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java index b5fba683..7a90838d 100644 --- a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java @@ -1,61 +1,56 @@ package crazypants.enderio.machine; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.power.IPowerContainer; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketPowerStorage implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private int storedEnergy; + private int x; + private int y; + private int z; + private int storedEnergy; - public PacketPowerStorage() { - } + public PacketPowerStorage() {} - public PacketPowerStorage(IPowerContainer ent) { - BlockCoord bc = ent.getLocation(); - x = bc.x; - y = bc.y; - z = bc.z; - storedEnergy = ent.getEnergyStored(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(storedEnergy); - - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - storedEnergy = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketPowerStorage message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof IPowerContainer) { - IPowerContainer me = (IPowerContainer) te; - me.setEnergyStored(message.storedEnergy); + public PacketPowerStorage(IPowerContainer ent) { + BlockCoord bc = ent.getLocation(); + x = bc.x; + y = bc.y; + z = bc.z; + storedEnergy = ent.getEnergyStored(); } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(storedEnergy); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + storedEnergy = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketPowerStorage message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof IPowerContainer) { + IPowerContainer me = (IPowerContainer) te; + me.setEnergyStored(message.storedEnergy); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/PacketProgress.java b/src/main/java/crazypants/enderio/machine/PacketProgress.java index 5569ccbc..bc9f6266 100644 --- a/src/main/java/crazypants/enderio/machine/PacketProgress.java +++ b/src/main/java/crazypants/enderio/machine/PacketProgress.java @@ -1,46 +1,43 @@ package crazypants.enderio.machine; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; -public class PacketProgress extends MessageTileEntity implements IMessageHandler { +public class PacketProgress extends MessageTileEntity implements IMessageHandler { - private float progress; + private float progress; - public PacketProgress() { - } + public PacketProgress() {} - public PacketProgress(IProgressTile tile) { - super(tile.getTileEntity()); - progress = tile.getProgress(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeFloat(progress); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - progress = buf.readFloat(); - } - - @Override - public IMessage onMessage(PacketProgress message, MessageContext ctx) { - TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); - if(tile instanceof IProgressTile) { - ((IProgressTile) tile).setProgress(message.progress); + public PacketProgress(IProgressTile tile) { + super(tile.getTileEntity()); + progress = tile.getProgress(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeFloat(progress); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + progress = buf.readFloat(); + } + + @Override + public IMessage onMessage(PacketProgress message, MessageContext ctx) { + TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); + if (tile instanceof IProgressTile) { + ((IProgressTile) tile).setProgress(message.progress); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java index 374ce9f9..105d1010 100644 --- a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java @@ -1,62 +1,60 @@ package crazypants.enderio.machine; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketRedstoneMode implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private RedstoneControlMode mode; + private int x; + private int y; + private int z; + private RedstoneControlMode mode; - public PacketRedstoneMode() { - } + public PacketRedstoneMode() {} - public PacketRedstoneMode(IRedstoneModeControlable cont, int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - mode = cont.getRedstoneControlMode(); - } - - public PacketRedstoneMode(AbstractMachineEntity ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - mode = ent.getRedstoneControlMode(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeShort((short) mode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - short ordinal = buf.readShort(); - mode = RedstoneControlMode.values()[ordinal]; - } - - @Override - public IMessage onMessage(PacketRedstoneMode message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof IRedstoneModeControlable) { - IRedstoneModeControlable me = (IRedstoneModeControlable) te; - me.setRedstoneControlMode(message.mode); + public PacketRedstoneMode(IRedstoneModeControlable cont, int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + mode = cont.getRedstoneControlMode(); } - return null; - } + public PacketRedstoneMode(AbstractMachineEntity ent) { + x = ent.xCoord; + y = ent.yCoord; + z = ent.zCoord; + mode = ent.getRedstoneControlMode(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort((short) mode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + short ordinal = buf.readShort(); + mode = RedstoneControlMode.values()[ordinal]; + } + + @Override + public IMessage onMessage(PacketRedstoneMode message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof IRedstoneModeControlable) { + IRedstoneModeControlable me = (IRedstoneModeControlable) te; + me.setRedstoneControlMode(message.mode); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/PoweredTask.java b/src/main/java/crazypants/enderio/machine/PoweredTask.java index 30b7223f..fc51630c 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTask.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTask.java @@ -1,179 +1,174 @@ package crazypants.enderio.machine; +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.machine.recipe.RecipeBonusType; import java.util.ArrayList; import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.machine.recipe.RecipeBonusType; public class PoweredTask implements IPoweredTask { - public static final String KEY_INPUT_STACKS = "inputsStacks"; + public static final String KEY_INPUT_STACKS = "inputsStacks"; - public static final String KEY_RECIPE = "recipeUid"; - public static final String KEY_USED_ENERGY = "usedEnergy"; - private static final String KEY_CHANCE = "chance"; + public static final String KEY_RECIPE = "recipeUid"; + public static final String KEY_USED_ENERGY = "usedEnergy"; + private static final String KEY_CHANCE = "chance"; - private float usedEnergy = 0; + private float usedEnergy = 0; - private MachineRecipeInput[] inputs; + private MachineRecipeInput[] inputs; - private float requiredEnergy; + private float requiredEnergy; - private RecipeBonusType bonusType; + private RecipeBonusType bonusType; - private IMachineRecipe recipe; + private IMachineRecipe recipe; - private float chance; + private float chance; - public PoweredTask(IMachineRecipe recipe, float chance, MachineRecipeInput... inputs) { - this(recipe, 0, chance, inputs); - } - - protected PoweredTask(IMachineRecipe recipe, float usedEnergy, float chance, MachineRecipeInput... inputsIn) { - this.inputs = inputsIn; - int numInputs = 0; - for (int i = 0; i < inputsIn.length; i++) { - if(inputsIn[i] != null && (inputsIn[i].item != null || inputsIn[i].fluid != null)) { - numInputs++; - } + public PoweredTask(IMachineRecipe recipe, float chance, MachineRecipeInput... inputs) { + this(recipe, 0, chance, inputs); } - inputs = new MachineRecipeInput[numInputs]; - int index = 0; - for (int i = 0; i < inputsIn.length; i++) { - if(inputsIn[i] != null) { - if(inputsIn[i].item != null) { - inputs[index] = new MachineRecipeInput(inputsIn[i].slotNumber, inputsIn[i].item.copy()); - index++; - } else if(inputsIn[i].fluid != null) { - inputs[index] = new MachineRecipeInput(inputsIn[i].slotNumber, inputsIn[i].fluid.copy()); - index++; + protected PoweredTask(IMachineRecipe recipe, float usedEnergy, float chance, MachineRecipeInput... inputsIn) { + this.inputs = inputsIn; + int numInputs = 0; + for (int i = 0; i < inputsIn.length; i++) { + if (inputsIn[i] != null && (inputsIn[i].item != null || inputsIn[i].fluid != null)) { + numInputs++; + } } - } + + inputs = new MachineRecipeInput[numInputs]; + int index = 0; + for (int i = 0; i < inputsIn.length; i++) { + if (inputsIn[i] != null) { + if (inputsIn[i].item != null) { + inputs[index] = new MachineRecipeInput(inputsIn[i].slotNumber, inputsIn[i].item.copy()); + index++; + } else if (inputsIn[i].fluid != null) { + inputs[index] = new MachineRecipeInput(inputsIn[i].slotNumber, inputsIn[i].fluid.copy()); + index++; + } + } + } + + this.recipe = recipe; + this.usedEnergy = usedEnergy; + this.chance = MathHelper.clamp_float(chance, 0, 1); + requiredEnergy = recipe.getEnergyRequired(inputsIn); + bonusType = recipe.getBonusType(inputsIn); } - this.recipe = recipe; - this.usedEnergy = usedEnergy; - this.chance = MathHelper.clamp_float(chance, 0, 1); - requiredEnergy = recipe.getEnergyRequired(inputsIn); - bonusType = recipe.getBonusType(inputsIn); - } - - - @Override - public void update(float availableEnergy) { - usedEnergy += availableEnergy; - } - - @Override - public boolean isComplete() { - return usedEnergy >= requiredEnergy; - } - - - @Override - public float getProgress() { - return MathHelper.clamp_float(usedEnergy / requiredEnergy, 0, 1); - } - - - @Override - public ResultStack[] getCompletedResult() { - return recipe.getCompletedResult(chance, inputs); - } - - @Override - public MachineRecipeInput[] getInputs() { - return inputs; - } - - public void setInputs(MachineRecipeInput[] inputs) { - this.inputs = inputs; - } - - /* (non-Javadoc) - * @see crazypants.enderio.machine.IPoweredTask#getRequiredEnergy() - */ - @Override - public float getRequiredEnergy() { - return requiredEnergy; - } - - public void setRequiredEnergy(float requiredEnergy) { - this.requiredEnergy = requiredEnergy; - } - - /* (non-Javadoc) - * @see crazypants.enderio.machine.IPoweredTask#getChance() - */ - @Override - public float getChance() { - return chance; - } - - public void setChance(float chance) { - this.chance = chance; - } - - @Override - public RecipeBonusType getBonusType() { - return bonusType; - } - - /* (non-Javadoc) - * @see crazypants.enderio.machine.IPoweredTask#writeToNBT(net.minecraft.nbt.NBTTagCompound) - */ - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - NBTTagCompound stackRoot; - - NBTTagList inputItems = new NBTTagList(); - for (MachineRecipeInput ri : inputs) { - stackRoot = new NBTTagCompound(); - ri.writeToNbt(stackRoot); - inputItems.appendTag(stackRoot); + @Override + public void update(float availableEnergy) { + usedEnergy += availableEnergy; } - nbtRoot.setTag(KEY_INPUT_STACKS, inputItems); - - nbtRoot.setString(KEY_RECIPE, recipe.getUid()); - nbtRoot.setFloat(KEY_USED_ENERGY, usedEnergy); - - nbtRoot.setFloat(KEY_CHANCE, chance); - } - - public static IPoweredTask readFromNBT(NBTTagCompound nbtRoot) { - IMachineRecipe recipe; - - float usedEnergy = nbtRoot.getFloat(KEY_USED_ENERGY); - float chance = nbtRoot.getFloat(KEY_CHANCE); - - NBTTagList inputItems = (NBTTagList) nbtRoot.getTag(KEY_INPUT_STACKS); - if(inputItems == null) { - return null; + @Override + public boolean isComplete() { + return usedEnergy >= requiredEnergy; } - List ins = new ArrayList(3); - for (int i = 0; i < inputItems.tagCount(); i++) { - NBTTagCompound stackTag = inputItems.getCompoundTagAt(i); - MachineRecipeInput mi = MachineRecipeInput.readFromNBT(stackTag); - ins.add(mi); + @Override + public float getProgress() { + return MathHelper.clamp_float(usedEnergy / requiredEnergy, 0, 1); } - String uid = nbtRoot.getString(KEY_RECIPE); - recipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); - if(recipe != null) { - return new PoweredTask(recipe, usedEnergy, chance, ins.toArray(new MachineRecipeInput[ins.size()])); + @Override + public ResultStack[] getCompletedResult() { + return recipe.getCompletedResult(chance, inputs); } - return null; - } + @Override + public MachineRecipeInput[] getInputs() { + return inputs; + } - public IMachineRecipe getRecipe() { - return recipe; - } + public void setInputs(MachineRecipeInput[] inputs) { + this.inputs = inputs; + } + + /* (non-Javadoc) + * @see crazypants.enderio.machine.IPoweredTask#getRequiredEnergy() + */ + @Override + public float getRequiredEnergy() { + return requiredEnergy; + } + + public void setRequiredEnergy(float requiredEnergy) { + this.requiredEnergy = requiredEnergy; + } + + /* (non-Javadoc) + * @see crazypants.enderio.machine.IPoweredTask#getChance() + */ + @Override + public float getChance() { + return chance; + } + + public void setChance(float chance) { + this.chance = chance; + } + + @Override + public RecipeBonusType getBonusType() { + return bonusType; + } + + /* (non-Javadoc) + * @see crazypants.enderio.machine.IPoweredTask#writeToNBT(net.minecraft.nbt.NBTTagCompound) + */ + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + NBTTagCompound stackRoot; + + NBTTagList inputItems = new NBTTagList(); + for (MachineRecipeInput ri : inputs) { + stackRoot = new NBTTagCompound(); + ri.writeToNbt(stackRoot); + inputItems.appendTag(stackRoot); + } + + nbtRoot.setTag(KEY_INPUT_STACKS, inputItems); + + nbtRoot.setString(KEY_RECIPE, recipe.getUid()); + nbtRoot.setFloat(KEY_USED_ENERGY, usedEnergy); + + nbtRoot.setFloat(KEY_CHANCE, chance); + } + + public static IPoweredTask readFromNBT(NBTTagCompound nbtRoot) { + IMachineRecipe recipe; + + float usedEnergy = nbtRoot.getFloat(KEY_USED_ENERGY); + float chance = nbtRoot.getFloat(KEY_CHANCE); + + NBTTagList inputItems = (NBTTagList) nbtRoot.getTag(KEY_INPUT_STACKS); + if (inputItems == null) { + return null; + } + + List ins = new ArrayList(3); + for (int i = 0; i < inputItems.tagCount(); i++) { + NBTTagCompound stackTag = inputItems.getCompoundTagAt(i); + MachineRecipeInput mi = MachineRecipeInput.readFromNBT(stackTag); + ins.add(mi); + } + + String uid = nbtRoot.getString(KEY_RECIPE); + recipe = MachineRecipeRegistry.instance.getRecipeForUid(uid); + if (recipe != null) { + return new PoweredTask(recipe, usedEnergy, chance, ins.toArray(new MachineRecipeInput[ins.size()])); + } + return null; + } + + public IMachineRecipe getRecipe() { + return recipe; + } } diff --git a/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java b/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java index 1ccbdb7a..8d92a00e 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTaskProgress.java @@ -1,70 +1,67 @@ package crazypants.enderio.machine; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.recipe.RecipeBonusType; +import net.minecraft.nbt.NBTTagCompound; /** * Client side stub for reporting progress. */ public class PoweredTaskProgress implements IPoweredTask { - private float progress; + private float progress; - public PoweredTaskProgress(IPoweredTask task) { - progress = task.getProgress(); - } + public PoweredTaskProgress(IPoweredTask task) { + progress = task.getProgress(); + } - public PoweredTaskProgress(float progress) { - this.progress = progress; - } + public PoweredTaskProgress(float progress) { + this.progress = progress; + } - @Override - public void update(float availableEnergy) { - } + @Override + public void update(float availableEnergy) {} - @Override - public boolean isComplete() { - return getProgress() >= 1; - } + @Override + public boolean isComplete() { + return getProgress() >= 1; + } - @Override - public float getProgress() { - return progress; - } + @Override + public float getProgress() { + return progress; + } - @Override - public ResultStack[] getCompletedResult() { - return new ResultStack[0]; - } + @Override + public ResultStack[] getCompletedResult() { + return new ResultStack[0]; + } - @Override - public float getRequiredEnergy() { - return 0; - } + @Override + public float getRequiredEnergy() { + return 0; + } - @Override - public float getChance() { - return 0; - } + @Override + public float getChance() { + return 0; + } - @Override - public RecipeBonusType getBonusType() { - return RecipeBonusType.NONE; - } + @Override + public RecipeBonusType getBonusType() { + return RecipeBonusType.NONE; + } - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - } + @Override + public void writeToNBT(NBTTagCompound nbtRoot) {} - @Override - public IMachineRecipe getRecipe() { - return null; - } - - @Override - public MachineRecipeInput[] getInputs() { - return new MachineRecipeInput[0]; - } + @Override + public IMachineRecipe getRecipe() { + return null; + } + @Override + public MachineRecipeInput[] getInputs() { + return new MachineRecipeInput[0]; + } } diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index 7a015b41..0313c823 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -1,82 +1,77 @@ package crazypants.enderio.machine; -import java.util.List; -import java.util.Locale; - -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.CycleButton.ICycleEnum; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; +import java.util.List; +import java.util.Locale; +import net.minecraft.tileentity.TileEntity; public enum RedstoneControlMode implements ICycleEnum { + IGNORE(IconEIO.REDSTONE_MODE_ALWAYS), + ON(IconEIO.REDSTONE_MODE_WITH_SIGNAL), + OFF(IconEIO.REDSTONE_MODE_WITHOUT_SIGNAL), + NEVER(IconEIO.REDSTONE_MODE_NEVER); - IGNORE(IconEIO.REDSTONE_MODE_ALWAYS), - ON(IconEIO.REDSTONE_MODE_WITH_SIGNAL), - OFF(IconEIO.REDSTONE_MODE_WITHOUT_SIGNAL), - NEVER(IconEIO.REDSTONE_MODE_NEVER); + private IWidgetIcon icon; - - private IWidgetIcon icon; - - RedstoneControlMode(IWidgetIcon icon) { - this.icon = icon; - } - - public String getTooltip() { - return EnderIO.lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase(Locale.US)); - } - - @Override - public IWidgetIcon getIcon() { - return icon; - } - - @Override - public List getTooltipLines() { - return Lists.newArrayList(getTooltip()); - } - - public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, int powerLevel) { - boolean redstoneCheckPassed = true; - if(redstoneControlMode == RedstoneControlMode.NEVER) { - redstoneCheckPassed = false; - } else if(redstoneControlMode == RedstoneControlMode.ON) { - if(powerLevel < 1) { - redstoneCheckPassed = false; - } - } else if(redstoneControlMode == RedstoneControlMode.OFF) { - if(powerLevel > 0) { - redstoneCheckPassed = false; - } + RedstoneControlMode(IWidgetIcon icon) { + this.icon = icon; } - return redstoneCheckPassed; - } - public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, TileEntity te) { - return isConditionMet(redstoneControlMode, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); - } - - public RedstoneControlMode next() { - int ord = ordinal(); - if(ord == values().length - 1) { - ord = 0; - } else { - ord++; + public String getTooltip() { + return EnderIO.lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase(Locale.US)); } - return values()[ord]; - } - public RedstoneControlMode previous() { - int ord = ordinal(); - ord--; - if(ord < 0) { - ord = values().length - 1; - } - return values()[ord]; - } + @Override + public IWidgetIcon getIcon() { + return icon; + } + @Override + public List getTooltipLines() { + return Lists.newArrayList(getTooltip()); + } + + public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, int powerLevel) { + boolean redstoneCheckPassed = true; + if (redstoneControlMode == RedstoneControlMode.NEVER) { + redstoneCheckPassed = false; + } else if (redstoneControlMode == RedstoneControlMode.ON) { + if (powerLevel < 1) { + redstoneCheckPassed = false; + } + } else if (redstoneControlMode == RedstoneControlMode.OFF) { + if (powerLevel > 0) { + redstoneCheckPassed = false; + } + } + return redstoneCheckPassed; + } + + public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, TileEntity te) { + return isConditionMet( + redstoneControlMode, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); + } + + public RedstoneControlMode next() { + int ord = ordinal(); + if (ord == values().length - 1) { + ord = 0; + } else { + ord++; + } + return values()[ord]; + } + + public RedstoneControlMode previous() { + int ord = ordinal(); + ord--; + if (ord < 0) { + ord = values().length - 1; + } + return values()[ord]; + } } diff --git a/src/main/java/crazypants/enderio/machine/SlotDefinition.java b/src/main/java/crazypants/enderio/machine/SlotDefinition.java index 1c428b85..dc577a1b 100644 --- a/src/main/java/crazypants/enderio/machine/SlotDefinition.java +++ b/src/main/java/crazypants/enderio/machine/SlotDefinition.java @@ -2,107 +2,113 @@ package crazypants.enderio.machine; public class SlotDefinition { - public final int minUpgradeSlot; - public final int maxUpgradeSlot; + public final int minUpgradeSlot; + public final int maxUpgradeSlot; - public final int minInputSlot; - public final int maxInputSlot; + public final int minInputSlot; + public final int maxInputSlot; - public final int minOutputSlot; - public final int maxOutputSlot; + public final int minOutputSlot; + public final int maxOutputSlot; - public SlotDefinition(int numInputs, int numOutputs, int numUpgradeSlots) { - this.minInputSlot = 0; - this.maxInputSlot = numInputs - 1; - this.minOutputSlot = numOutputs > 0 ? numInputs : -10; - this.maxOutputSlot = minOutputSlot + (numOutputs - 1); - this.minUpgradeSlot = numUpgradeSlots > 0 ? numInputs + numOutputs : -1; - this.maxUpgradeSlot = minUpgradeSlot + (numUpgradeSlots - 1); - } - - public SlotDefinition(int numInputs, int numOutputs) { - this.minInputSlot = 0; - this.maxInputSlot = numInputs - 1; - this.minOutputSlot = numOutputs > 0 ? numInputs : -10; - this.maxOutputSlot = minOutputSlot + (numOutputs - 1); - this.minUpgradeSlot = Math.max(maxInputSlot, maxOutputSlot) + 1; - this.maxUpgradeSlot = minUpgradeSlot; - } - - public SlotDefinition(int minInputSlot, int maxInputSlot, int minOutputSlot, int maxOutputSlot, int minUpgradeSlot, int maxUpgradeSlot) { - this.minInputSlot = minInputSlot; - this.maxInputSlot = maxInputSlot; - this.minOutputSlot = minOutputSlot; - this.maxOutputSlot = maxOutputSlot; - this.minUpgradeSlot = minUpgradeSlot; - this.maxUpgradeSlot = maxUpgradeSlot; - } - - public boolean isUpgradeSlot(int slot) { - return slot >= minUpgradeSlot && slot <= maxUpgradeSlot; - } - - public boolean isInputSlot(int slot) { - return slot >= minInputSlot && slot <= maxInputSlot; - } - - public boolean isOutputSlot(int slot) { - return slot >= minOutputSlot && slot <= maxOutputSlot; - } - - public int getNumUpgradeSlots() { - if(minUpgradeSlot < 0) { - return 0; + public SlotDefinition(int numInputs, int numOutputs, int numUpgradeSlots) { + this.minInputSlot = 0; + this.maxInputSlot = numInputs - 1; + this.minOutputSlot = numOutputs > 0 ? numInputs : -10; + this.maxOutputSlot = minOutputSlot + (numOutputs - 1); + this.minUpgradeSlot = numUpgradeSlots > 0 ? numInputs + numOutputs : -1; + this.maxUpgradeSlot = minUpgradeSlot + (numUpgradeSlots - 1); } - return Math.max(0, maxUpgradeSlot - minUpgradeSlot + 1); - } - public int getNumInputSlots() { - if(minInputSlot < 0) { - return 0; + public SlotDefinition(int numInputs, int numOutputs) { + this.minInputSlot = 0; + this.maxInputSlot = numInputs - 1; + this.minOutputSlot = numOutputs > 0 ? numInputs : -10; + this.maxOutputSlot = minOutputSlot + (numOutputs - 1); + this.minUpgradeSlot = Math.max(maxInputSlot, maxOutputSlot) + 1; + this.maxUpgradeSlot = minUpgradeSlot; } - return Math.max(0, maxInputSlot - minInputSlot + 1); - } - public int getNumOutputSlots() { - if(minOutputSlot < 0) { - return 0; + public SlotDefinition( + int minInputSlot, + int maxInputSlot, + int minOutputSlot, + int maxOutputSlot, + int minUpgradeSlot, + int maxUpgradeSlot) { + this.minInputSlot = minInputSlot; + this.maxInputSlot = maxInputSlot; + this.minOutputSlot = minOutputSlot; + this.maxOutputSlot = maxOutputSlot; + this.minUpgradeSlot = minUpgradeSlot; + this.maxUpgradeSlot = maxUpgradeSlot; } - return Math.max(0, maxOutputSlot - minOutputSlot + 1); - } - public int getNumSlots() { - return Math.max(Math.max(getMaxInputSlot(), getMaxOutputSlot()), getMaxUpgradeSlot()) + 1; - } + public boolean isUpgradeSlot(int slot) { + return slot >= minUpgradeSlot && slot <= maxUpgradeSlot; + } - public int getMinUpgradeSlot() { - return minUpgradeSlot; - } + public boolean isInputSlot(int slot) { + return slot >= minInputSlot && slot <= maxInputSlot; + } - public int getMaxUpgradeSlot() { - return maxUpgradeSlot; - } + public boolean isOutputSlot(int slot) { + return slot >= minOutputSlot && slot <= maxOutputSlot; + } - public int getMinInputSlot() { - return minInputSlot; - } + public int getNumUpgradeSlots() { + if (minUpgradeSlot < 0) { + return 0; + } + return Math.max(0, maxUpgradeSlot - minUpgradeSlot + 1); + } - public int getMaxInputSlot() { - return maxInputSlot; - } + public int getNumInputSlots() { + if (minInputSlot < 0) { + return 0; + } + return Math.max(0, maxInputSlot - minInputSlot + 1); + } - public int getMinOutputSlot() { - return minOutputSlot; - } + public int getNumOutputSlots() { + if (minOutputSlot < 0) { + return 0; + } + return Math.max(0, maxOutputSlot - minOutputSlot + 1); + } - public int getMaxOutputSlot() { - return maxOutputSlot; - } + public int getNumSlots() { + return Math.max(Math.max(getMaxInputSlot(), getMaxOutputSlot()), getMaxUpgradeSlot()) + 1; + } - @Override - public String toString() { - return "SlotDefinition [minUpgradeSlot=" + minUpgradeSlot + ", maxUpgradeSlot=" + maxUpgradeSlot + ", minInputSlot=" + minInputSlot + ", maxInputSlot=" - + maxInputSlot + ", minOutputSlot=" + minOutputSlot + ", maxOutputSlot=" + maxOutputSlot + ", nunSlots=" + getNumSlots() + " ]"; - } + public int getMinUpgradeSlot() { + return minUpgradeSlot; + } + public int getMaxUpgradeSlot() { + return maxUpgradeSlot; + } + + public int getMinInputSlot() { + return minInputSlot; + } + + public int getMaxInputSlot() { + return maxInputSlot; + } + + public int getMinOutputSlot() { + return minOutputSlot; + } + + public int getMaxOutputSlot() { + return maxOutputSlot; + } + + @Override + public String toString() { + return "SlotDefinition [minUpgradeSlot=" + minUpgradeSlot + ", maxUpgradeSlot=" + maxUpgradeSlot + + ", minInputSlot=" + minInputSlot + ", maxInputSlot=" + maxInputSlot + ", minOutputSlot=" + + minOutputSlot + ", maxOutputSlot=" + maxOutputSlot + ", nunSlots=" + getNumSlots() + " ]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index a8a0ae53..313b5638 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -1,11 +1,5 @@ package crazypants.enderio.machine; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.CustomCubeRenderer; import com.enderio.core.client.render.TechneModelRenderer; @@ -13,63 +7,75 @@ import com.enderio.core.client.render.TechneUtil; import com.enderio.core.client.render.VertexRotationFacing; import com.enderio.core.client.render.VertexTransformComposite; import com.google.common.collect.ObjectArrays; - import crazypants.enderio.EnderIO; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; public class TechneMachineRenderer extends TechneModelRenderer { - private CustomCubeRenderer ccr = new CustomCubeRenderer(); - private OverlayRenderer overlay = new OverlayRenderer(); + private CustomCubeRenderer ccr = new CustomCubeRenderer(); + private OverlayRenderer overlay = new OverlayRenderer(); - public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { - super(EnderIO.DOMAIN, modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); - } - - public TechneMachineRenderer(int renderId, String modelPath) { - super(TechneUtil.getModel(EnderIO.DOMAIN, modelPath), renderId, new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); - } - - public TechneMachineRenderer addTransform(VertexTransform vt) { - this.vt = new VertexTransformComposite(ObjectArrays.concat(vt, ((VertexTransformComposite) this.vt).xforms)); - return this; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - setFacingDir(ForgeDirection.SOUTH); - super.renderInventoryBlock(block, metadata, modelId, renderer); - } - - @SuppressWarnings("unchecked") - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - T te = (T) world.getTileEntity(x, y, z); - if (te != null) { - setFacingDir(te.getFacingDir()); - overlay.setTile(te); + public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { + super( + EnderIO.DOMAIN, + modelPath, + block.getRenderType(), + new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } - super.renderWorldBlock(world, x, y, z, block, modelId, renderer); - - if (renderer.overrideBlockTexture == null) { - ccr.renderBlock(world, block, x, y, z, overlay); + public TechneMachineRenderer(int renderId, String modelPath) { + super( + TechneUtil.getModel(EnderIO.DOMAIN, modelPath), + renderId, + new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } - return true; - } + public TechneMachineRenderer addTransform(VertexTransform vt) { + this.vt = new VertexTransformComposite(ObjectArrays.concat(vt, ((VertexTransformComposite) this.vt).xforms)); + return this; + } - @Override - protected IIcon getModelIcon(Block block, int metadata) { - return ((AbstractMachineBlock) block).getModelIcon(); - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + setFacingDir(ForgeDirection.SOUTH); + super.renderInventoryBlock(block, metadata, modelId, renderer); + } - @Override - protected IIcon getModelIcon(IBlockAccess world, int x, int y, int z, Block block) { - return getModelIcon(block, 0); - } + @SuppressWarnings("unchecked") + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + T te = (T) world.getTileEntity(x, y, z); + if (te != null) { + setFacingDir(te.getFacingDir()); + overlay.setTile(te); + } - private void setFacingDir(ForgeDirection dir) { - VertexRotationFacing rot = (VertexRotationFacing) ((VertexTransformComposite) vt).xforms[0]; - rot.setRotation(dir); - } + super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + + if (renderer.overrideBlockTexture == null) { + ccr.renderBlock(world, block, x, y, z, overlay); + } + + return true; + } + + @Override + protected IIcon getModelIcon(Block block, int metadata) { + return ((AbstractMachineBlock) block).getModelIcon(); + } + + @Override + protected IIcon getModelIcon(IBlockAccess world, int x, int y, int z, Block block) { + return getModelIcon(block, 0); + } + + private void setFacingDir(ForgeDirection dir) { + VertexRotationFacing rot = (VertexRotationFacing) ((VertexTransformComposite) vt).xforms[0]; + rot.setRotation(dir); + } } diff --git a/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java index 205ee984..bdb43119 100644 --- a/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java +++ b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java @@ -1,49 +1,53 @@ package crazypants.enderio.machine; +import crazypants.enderio.power.PowerHandlerUtil; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; -import crazypants.enderio.power.PowerHandlerUtil; public class UpgradeCapBankRecipe extends ShapedOreRecipe { - static { - RecipeSorter.register("EnderIO:upgradeCapBankRecipe", UpgradeCapBankRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shaped"); - } - - public UpgradeCapBankRecipe(ItemStack result, Object... recipe) { - super(result, recipe); - } - - @Override - public boolean matches(InventoryCrafting inv, World world) { - for(int y=0 ; y<3 ; y++) { - for(int x=0 ; x<3 ; x++) { - ItemStack st = inv.getStackInRowAndColumn(x, y); - if(st != null && st.stackTagCompound != null && st.stackTagCompound.hasKey("Items")) { - return false; - } - } - } - return super.matches(inv, world); - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) { - long energy = 0; - for(int y=0 ; y<3 ; y++) { - for(int x=0 ; x<3 ; x++) { - ItemStack st = var1.getStackInRowAndColumn(x, y); - if(st != null) { - energy += PowerHandlerUtil.getStoredEnergyForItem(st); - } - } + static { + RecipeSorter.register( + "EnderIO:upgradeCapBankRecipe", + UpgradeCapBankRecipe.class, + RecipeSorter.Category.SHAPED, + "after:minecraft:shaped"); } - ItemStack res = super.getCraftingResult(var1); - PowerHandlerUtil.setStoredEnergyForItem(res, (int)Math.min(Integer.MAX_VALUE, energy)); - return res; - } + public UpgradeCapBankRecipe(ItemStack result, Object... recipe) { + super(result, recipe); + } + + @Override + public boolean matches(InventoryCrafting inv, World world) { + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 3; x++) { + ItemStack st = inv.getStackInRowAndColumn(x, y); + if (st != null && st.stackTagCompound != null && st.stackTagCompound.hasKey("Items")) { + return false; + } + } + } + return super.matches(inv, world); + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + long energy = 0; + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 3; x++) { + ItemStack st = var1.getStackInRowAndColumn(x, y); + if (st != null) { + energy += PowerHandlerUtil.getStoredEnergyForItem(st); + } + } + } + + ItemStack res = super.getCraftingResult(var1); + PowerHandlerUtil.setStoredEnergyForItem(res, (int) Math.min(Integer.MAX_VALUE, energy)); + return res; + } } diff --git a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java index d45db3b8..aabf883c 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/alloy/AlloyRecipeManager.java @@ -1,11 +1,5 @@ package crazypants.enderio.machine.alloy; -import java.util.ArrayList; -import java.util.List; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; - import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeRegistry; @@ -14,102 +8,105 @@ import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.machine.recipe.ManyToOneRecipeManager; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; +import java.util.ArrayList; +import java.util.List; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; public class AlloyRecipeManager extends ManyToOneRecipeManager { - - private static final String CORE_FILE_NAME = "AlloySmelterRecipes_Core.xml"; - private static final String CUSTOM_FILE_NAME = "AlloySmelterRecipes_User.xml"; - static final AlloyRecipeManager instance = new AlloyRecipeManager(); + private static final String CORE_FILE_NAME = "AlloySmelterRecipes_Core.xml"; + private static final String CUSTOM_FILE_NAME = "AlloySmelterRecipes_User.xml"; - public static AlloyRecipeManager getInstance() { - return instance; - } + static final AlloyRecipeManager instance = new AlloyRecipeManager(); - VanillaSmeltingRecipe vanillaRecipe = new VanillaSmeltingRecipe(); + public static AlloyRecipeManager getInstance() { + return instance; + } - public AlloyRecipeManager() { - super(CORE_FILE_NAME, CUSTOM_FILE_NAME, "Alloy Smelter"); - } + VanillaSmeltingRecipe vanillaRecipe = new VanillaSmeltingRecipe(); - public VanillaSmeltingRecipe getVanillaRecipe() { - return vanillaRecipe; - } + public AlloyRecipeManager() { + super(CORE_FILE_NAME, CUSTOM_FILE_NAME, "Alloy Smelter"); + } - public void setVanillaRecipe(VanillaSmeltingRecipe vanillaRecipe) { - this.vanillaRecipe = vanillaRecipe; - } - - @Override - protected CustomTagHandler createCustomTagHandler() { - return new VanillaFurnaceTagHandler(); - } + public VanillaSmeltingRecipe getVanillaRecipe() { + return vanillaRecipe; + } - @Override - public void loadRecipesFromConfig() { - super.loadRecipesFromConfig(); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new ManyToOneMachineRecipe("AlloySmelterRecipe", ModObject.blockAlloySmelter.unlocalisedName, this)); - //vanilla alloy furnace recipes - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, vanillaRecipe); - } - - - private static final String ELEMENT_ROOT = "vanillaFurnaceRecipes"; - private static final String ELEMENT_EXCLUDE = "exclude"; - - - private class VanillaFurnaceTagHandler implements CustomTagHandler { - - private boolean inTag = false; - - private boolean inExcludes = false; - - private Boolean enabled = null; - - private List excludes = new ArrayList(); + public void setVanillaRecipe(VanillaSmeltingRecipe vanillaRecipe) { + this.vanillaRecipe = vanillaRecipe; + } @Override - public boolean startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - if(ELEMENT_ROOT.equals(localName)) { - inTag = true; - if(RecipeConfigParser.hasAttribute(RecipeConfigParser.AT_ENABLED, attributes)) { - boolean defVal = true; - if(enabled != null) { - defVal = enabled; - } - enabled = RecipeConfigParser.getBooleanValue(RecipeConfigParser.AT_ENABLED, attributes, defVal); + protected CustomTagHandler createCustomTagHandler() { + return new VanillaFurnaceTagHandler(); + } + + @Override + public void loadRecipesFromConfig() { + super.loadRecipesFromConfig(); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockAlloySmelter.unlocalisedName, + new ManyToOneMachineRecipe("AlloySmelterRecipe", ModObject.blockAlloySmelter.unlocalisedName, this)); + // vanilla alloy furnace recipes + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, vanillaRecipe); + } + + private static final String ELEMENT_ROOT = "vanillaFurnaceRecipes"; + private static final String ELEMENT_EXCLUDE = "exclude"; + + private class VanillaFurnaceTagHandler implements CustomTagHandler { + + private boolean inTag = false; + + private boolean inExcludes = false; + + private Boolean enabled = null; + + private List excludes = new ArrayList(); + + @Override + public boolean startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { + if (ELEMENT_ROOT.equals(localName)) { + inTag = true; + if (RecipeConfigParser.hasAttribute(RecipeConfigParser.AT_ENABLED, attributes)) { + boolean defVal = true; + if (enabled != null) { + defVal = enabled; + } + enabled = RecipeConfigParser.getBooleanValue(RecipeConfigParser.AT_ENABLED, attributes, defVal); + } + } else if (ELEMENT_EXCLUDE.equals(localName)) { + inExcludes = true; + } else if (inExcludes && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { + RecipeInput ri = RecipeConfigParser.getItemStack(attributes); + excludes.add(ri); + } + return inTag; + } + + @Override + public boolean endElement(String uri, String localName, String qName) throws SAXException { + if (ELEMENT_ROOT.equals(localName)) { + inTag = false; + } else if (ELEMENT_EXCLUDE.equals(localName)) { + inExcludes = false; + } + return inTag; + } + + @Override + public void configProcessed() { + if (enabled != null) { + Log.info("AlloyRecipeManager: Vannila smelting in AlloySmelting enabled=" + enabled); + vanillaRecipe.setEnabled(enabled.booleanValue()); + } + for (RecipeInput ri : excludes) { + Log.info("Excluding furnace recipe from Alloy Smelter: " + ri); + vanillaRecipe.addExclude(ri); + } } - } else if(ELEMENT_EXCLUDE.equals(localName)) { - inExcludes = true; - } else if(inExcludes && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { - RecipeInput ri = RecipeConfigParser.getItemStack(attributes); - excludes.add(ri); - } - return inTag; } - - @Override - public boolean endElement(String uri, String localName, String qName) throws SAXException { - if(ELEMENT_ROOT.equals(localName)) { - inTag = false; - } else if(ELEMENT_EXCLUDE.equals(localName)) { - inExcludes = false; - } - return inTag; - } - - @Override - public void configProcessed() { - if(enabled != null) { - Log.info("AlloyRecipeManager: Vannila smelting in AlloySmelting enabled=" + enabled); - vanillaRecipe.setEnabled(enabled.booleanValue()); - } - for (RecipeInput ri : excludes) { - Log.info("Excluding furnace recipe from Alloy Smelter: " + ri); - vanillaRecipe.addExclude(ri); - } - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java index 39a98c00..eb3433f8 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/BlockAlloySmelter.java @@ -1,73 +1,73 @@ package crazypants.enderio.machine.alloy; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class BlockAlloySmelter extends AbstractMachineBlock { - public static BlockAlloySmelter create() { + public static BlockAlloySmelter create() { - PacketHandler.INSTANCE.registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); - BlockAlloySmelter ppainter = new BlockAlloySmelter(); - ppainter.init(); - return ppainter; - } - - IIcon vanillaSmeltingOn; - IIcon vanillaSmeltingOff; - IIcon vanillaSmeltingOnly; - - private BlockAlloySmelter() { - super(ModObject.blockAlloySmelter, TileAlloySmelter.class); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - vanillaSmeltingOn = iIconRegister.registerIcon("enderio:furnaceSmeltingOn"); - vanillaSmeltingOff = iIconRegister.registerIcon("enderio:furnaceSmeltingOff"); - vanillaSmeltingOnly = iIconRegister.registerIcon("enderio:furnaceSmeltingOnly"); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileAlloySmelter) { - return new ContainerAlloySmelter(player.inventory, (TileAlloySmelter) te); + BlockAlloySmelter ppainter = new BlockAlloySmelter(); + ppainter.init(); + return ppainter; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - return new GuiAlloySmelter(player.inventory, (TileAlloySmelter) te); - } + IIcon vanillaSmeltingOn; + IIcon vanillaSmeltingOff; + IIcon vanillaSmeltingOnly; - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_ALLOY_SMELTER; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:alloySmelterFrontOn"; + private BlockAlloySmelter() { + super(ModObject.blockAlloySmelter, TileAlloySmelter.class); } - return "enderio:alloySmelterFront"; - } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + vanillaSmeltingOn = iIconRegister.registerIcon("enderio:furnaceSmeltingOn"); + vanillaSmeltingOff = iIconRegister.registerIcon("enderio:furnaceSmeltingOff"); + vanillaSmeltingOnly = iIconRegister.registerIcon("enderio:furnaceSmeltingOnly"); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileAlloySmelter) { + return new ContainerAlloySmelter(player.inventory, (TileAlloySmelter) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + return new GuiAlloySmelter(player.inventory, (TileAlloySmelter) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_ALLOY_SMELTER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:alloySmelterFrontOn"; + } + return "enderio:alloySmelterFront"; + } } diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index f916d13a..057acad2 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.alloy; +import com.enderio.core.common.util.Util; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -8,94 +10,88 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.stats.AchievementList; -import com.enderio.core.common.util.Util; - -import crazypants.enderio.machine.gui.AbstractMachineContainer; - public class ContainerAlloySmelter extends AbstractMachineContainer { - private final EntityPlayer thePlayer; + private final EntityPlayer thePlayer; - public ContainerAlloySmelter(InventoryPlayer playerInv, TileAlloySmelter te) { - super(playerInv, te); - thePlayer = playerInv.player; - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 54, 17) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 79, 7) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 2, 103, 17) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(2, itemStack); - } - }); - addSlotToContainer(new SlotSmelter(getInv(), 3, 79, 57)); - - } - - private class SlotSmelter extends Slot { - - int numResults = 0; - - public SlotSmelter(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); + public ContainerAlloySmelter(InventoryPlayer playerInv, TileAlloySmelter te) { + super(playerInv, te); + thePlayer = playerInv.player; } @Override - public ItemStack decrStackSize(int par1) { - if(getHasStack()) { - numResults += Math.min(par1, getStack().stackSize); - } - return super.decrStackSize(par1); + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 54, 17) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 79, 7) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 2, 103, 17) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(2, itemStack); + } + }); + addSlotToContainer(new SlotSmelter(getInv(), 3, 79, 57)); } - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; + private class SlotSmelter extends Slot { + + int numResults = 0; + + public SlotSmelter(IInventory par1iInventory, int par2, int par3, int par4) { + super(par1iInventory, par2, par3, par4); + } + + @Override + public ItemStack decrStackSize(int par1) { + if (getHasStack()) { + numResults += Math.min(par1, getStack().stackSize); + } + return super.decrStackSize(par1); + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + + @Override + public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack output) { + onCrafting(output); + super.onPickupFromSlot(par1EntityPlayer, output); + } + + @Override + protected void onCrafting(ItemStack par1ItemStack, int par2) { + numResults += par2; + onCrafting(par1ItemStack); + } + + @Override + protected void onCrafting(ItemStack output) { + output.onCrafting(thePlayer.worldObj, thePlayer, numResults); + if (!thePlayer.worldObj.isRemote) { + ItemStack outputSized = output.copy(); + outputSized.stackSize = numResults; + float experience = getInv().getExperienceForOutput(outputSized); + Util.giveExperience(thePlayer, experience); + } + numResults = 0; + + if (output.getItem() == Items.iron_ingot) { + thePlayer.addStat(AchievementList.acquireIron, 1); + } + if (output.getItem() == Items.cooked_fished) { + thePlayer.addStat(AchievementList.cookFish, 1); + } + } } - - @Override - public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack output) { - onCrafting(output); - super.onPickupFromSlot(par1EntityPlayer, output); - } - - @Override - protected void onCrafting(ItemStack par1ItemStack, int par2) { - numResults += par2; - onCrafting(par1ItemStack); - } - - @Override - protected void onCrafting(ItemStack output) { - output.onCrafting(thePlayer.worldObj, thePlayer, numResults); - if(!thePlayer.worldObj.isRemote) { - ItemStack outputSized = output.copy(); - outputSized.stackSize = numResults; - float experience = getInv().getExperienceForOutput(outputSized); - Util.giveExperience(thePlayer, experience); - } - numResults = 0; - - if(output.getItem() == Items.iron_ingot) { - thePlayer.addStat(AchievementList.acquireIron, 1); - } - if(output.getItem() == Items.cooked_fished) { - thePlayer.addStat(AchievementList.cookFish, 1); - } - } - } - } diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 45267fc1..fdfe1908 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -1,111 +1,108 @@ package crazypants.enderio.machine.alloy; -import java.awt.Rectangle; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IIconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.alloy.TileAlloySmelter.Mode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.IIcon; +import org.lwjgl.opengl.GL11; public class GuiAlloySmelter extends GuiPoweredMachineBase { - private final IIconButton vanillaFurnaceButton; - private final GuiToolTip vanillaFurnaceTooltip; + private final IIconButton vanillaFurnaceButton; + private final GuiToolTip vanillaFurnaceTooltip; - protected static final int SMELT_MODE_BUTTON_ID = 76; + protected static final int SMELT_MODE_BUTTON_ID = 76; - public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { - super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory), "alloySmelter"); + public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { + super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory), "alloySmelter"); - vanillaFurnaceButton = new IIconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); - vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); + vanillaFurnaceButton = + new IIconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); + vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); - vanillaFurnaceTooltip = new GuiToolTip(new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE), (String[])null); + vanillaFurnaceTooltip = + new GuiToolTip(new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE), (String[]) null); - addProgressTooltip(55, 35, 14, 14); - addProgressTooltip(103, 35, 14, 14); - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() { - super.initGui(); - - vanillaFurnaceButton.xPosition = guiLeft + vanillaFurnaceTooltip.getBounds().x; - vanillaFurnaceButton.yPosition = guiTop + vanillaFurnaceTooltip.getBounds().y; - - buttonList.add(vanillaFurnaceButton); - addToolTip(vanillaFurnaceTooltip); - - updateVanillaFurnaceButton(); - } - - @Override - protected void renderSlotHighlight(int slot, Vector4f col) { - if(getTileEntity().getSlotDefinition().isOutputSlot(slot)) { - renderSlotHighlight(col, 75, 54, 24, 24); - } else { - super.renderSlotHighlight(slot, col); - } - } - - @Override - protected void actionPerformed(GuiButton par1GuiButton) { - if(par1GuiButton.id == SMELT_MODE_BUTTON_ID) { - getTileEntity().setMode(getTileEntity().getMode().next()); - updateVanillaFurnaceButton(); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(getTileEntity())); - } else { - super.actionPerformed(par1GuiButton); - } - } - - private void updateVanillaFurnaceButton() { - IIcon icon = EnderIO.blockAlloySmelter.vanillaSmeltingOn; - String unlocText = "gui.alloy.mode.all"; - if(getTileEntity().getMode() == Mode.ALLOY) { - icon = EnderIO.blockAlloySmelter.vanillaSmeltingOff; - unlocText = "gui.alloy.mode.alloy"; - } else if(getTileEntity().getMode() == Mode.FURNACE) { - icon = EnderIO.blockAlloySmelter.vanillaSmeltingOnly; - unlocText = "gui.alloy.mode.furnace"; - } - vanillaFurnaceButton.setIcon(icon); - vanillaFurnaceTooltip.setToolTipText( - EnderIO.lang.localize("gui.alloy.mode.heading"), - EnderIO.lang.localize(unlocText)); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = guiLeft; - int sy = guiTop; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - if(shouldRenderProgress()) { - int scaled = getProgressScaled(14) + 1; - drawTexturedModalRect(sx + 55, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); - drawTexturedModalRect(sx + 103, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); + addProgressTooltip(55, 35, 14, 14); + addProgressTooltip(103, 35, 14, 14); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + @SuppressWarnings("unchecked") + @Override + public void initGui() { + super.initGui(); + + vanillaFurnaceButton.xPosition = guiLeft + vanillaFurnaceTooltip.getBounds().x; + vanillaFurnaceButton.yPosition = guiTop + vanillaFurnaceTooltip.getBounds().y; + + buttonList.add(vanillaFurnaceButton); + addToolTip(vanillaFurnaceTooltip); + + updateVanillaFurnaceButton(); + } + + @Override + protected void renderSlotHighlight(int slot, Vector4f col) { + if (getTileEntity().getSlotDefinition().isOutputSlot(slot)) { + renderSlotHighlight(col, 75, 54, 24, 24); + } else { + super.renderSlotHighlight(slot, col); + } + } + + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + if (par1GuiButton.id == SMELT_MODE_BUTTON_ID) { + getTileEntity().setMode(getTileEntity().getMode().next()); + updateVanillaFurnaceButton(); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(getTileEntity())); + } else { + super.actionPerformed(par1GuiButton); + } + } + + private void updateVanillaFurnaceButton() { + IIcon icon = EnderIO.blockAlloySmelter.vanillaSmeltingOn; + String unlocText = "gui.alloy.mode.all"; + if (getTileEntity().getMode() == Mode.ALLOY) { + icon = EnderIO.blockAlloySmelter.vanillaSmeltingOff; + unlocText = "gui.alloy.mode.alloy"; + } else if (getTileEntity().getMode() == Mode.FURNACE) { + icon = EnderIO.blockAlloySmelter.vanillaSmeltingOnly; + unlocText = "gui.alloy.mode.furnace"; + } + vanillaFurnaceButton.setIcon(icon); + vanillaFurnaceTooltip.setToolTipText( + EnderIO.lang.localize("gui.alloy.mode.heading"), EnderIO.lang.localize(unlocText)); + } + + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = guiLeft; + int sy = guiTop; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + if (shouldRenderProgress()) { + int scaled = getProgressScaled(14) + 1; + drawTexturedModalRect(sx + 55, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); + drawTexturedModalRect(sx + 103, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java index 9faef242..91596637 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java @@ -1,55 +1,52 @@ package crazypants.enderio.machine.alloy; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; public class PacketClientState implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; + private int x; + private int y; + private int z; - private TileAlloySmelter.Mode mode; + private TileAlloySmelter.Mode mode; - public PacketClientState() { + public PacketClientState() {} - } - - public PacketClientState(TileAlloySmelter tile) { - x = tile.xCoord; - y = tile.yCoord; - z = tile.zCoord; - mode = tile.getMode(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeShort(mode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - short ordinal = buf.readShort(); - mode = TileAlloySmelter.Mode.values()[ordinal]; - - } - - public IMessage onMessage(PacketClientState message, MessageContext ctx) { - TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileAlloySmelter) { - TileAlloySmelter me = (TileAlloySmelter) te; - me.setMode(message.mode); - ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(message.x, message.y, message.z); + public PacketClientState(TileAlloySmelter tile) { + x = tile.xCoord; + y = tile.yCoord; + z = tile.zCoord; + mode = tile.getMode(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort(mode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + short ordinal = buf.readShort(); + mode = TileAlloySmelter.Mode.values()[ordinal]; + } + + public IMessage onMessage(PacketClientState message, MessageContext ctx) { + TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileAlloySmelter) { + TileAlloySmelter me = (TileAlloySmelter) te; + me.setMode(message.mode); + ctx.getServerHandler().playerEntity.worldObj.markBlockForUpdate(message.x, message.y, message.z); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java index e24f3a23..55e0a578 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/TileAlloySmelter.java @@ -1,9 +1,5 @@ package crazypants.enderio.machine.alloy; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -13,197 +9,206 @@ import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileAlloySmelter extends AbstractPoweredTaskEntity { - public static enum Mode { - ALL, - ALLOY, - FURNACE; + public static enum Mode { + ALL, + ALLOY, + FURNACE; - Mode next() { - int nextOrd = ordinal() + 1; - if(nextOrd >= values().length) { - nextOrd = 0; - } - return values()[nextOrd]; - } - } - - private Mode mode; - - public TileAlloySmelter() { - super(new SlotDefinition(3, 1)); - mode = Mode.ALL; - } - - @Override - public String getInventoryName() { - return "Alloy Smelter"; - } - - public Mode getMode() { - return mode; - } - - public void setMode(Mode mode) { - if(mode == null) { - mode = Mode.ALL; - } - if(this.mode != mode) { - this.mode = mode; - forceClientUpdate = true; - } - - } - - @Override - protected IMachineRecipe canStartNextTask(float chance) { - if(mode == Mode.FURNACE) { - VanillaSmeltingRecipe vr = AlloyRecipeManager.getInstance().vanillaRecipe; - if(vr.isRecipe(getRecipeInputs())) { - ResultStack[] res = vr.getCompletedResult(chance, getRecipeInputs()); - if(res == null || res.length == 0) { - return null; - } - return canInsertResult(chance, vr) ? vr : null; - } - return null; - } - - IMachineRecipe nextRecipe = getNextRecipe(); - if(mode == Mode.ALLOY && nextRecipe instanceof VanillaSmeltingRecipe) { - nextRecipe = null; - } - if(nextRecipe == null) { - return null; // no template - } - // make sure we have room for the next output - return canInsertResult(chance, nextRecipe) ? nextRecipe : null; - } - - @Override - public String getMachineName() { - return ModObject.blockAlloySmelter.unlocalisedName; - } - - @Override - public boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { - if(!slotDefinition.isInputSlot(slot)) { - return false; - } - - //We will assume anything that is in a slot is valid, so just return whether the new input can be stacked with the current one - ItemStack currentStackInSlot = inventory[slot]; - if(currentStackInSlot != null) { - return currentStackInSlot.isItemEqual(itemstack); - } - - int numSlotsFilled = 0; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(i >= 0 && i < inventory.length) { - if(inventory[i] != null && inventory[i].stackSize > 0) { - numSlotsFilled++; - } - } - } - List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), MachineRecipeInput.create(slot, itemstack)); - - if(mode == Mode.FURNACE) { - return isValidInputForFurnaceRecipe(itemstack, numSlotsFilled, recipes); - } else if(mode == Mode.ALLOY) { - return isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); - } - return isValidInputForFurnaceRecipe(itemstack, numSlotsFilled, recipes) || isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); - } - - private boolean isValidInputForAlloyRecipe(int slot, ItemStack itemstack, int numSlotsFilled, List recipes) { - if(numSlotsFilled == 0) { - return containsAlloyRecipe(recipes); - } - for (IMachineRecipe recipe : recipes) { - if(!(recipe instanceof VanillaSmeltingRecipe)) { - - if(recipe instanceof ManyToOneMachineRecipe) { - ItemStack[] resultInv = new ItemStack[slotDefinition.getNumInputSlots()]; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(i >= 0 && i < inventory.length) { - if(i == slot) { - resultInv[i] = itemstack; - } else { - resultInv[i] = inventory[i]; - } + Mode next() { + int nextOrd = ordinal() + 1; + if (nextOrd >= values().length) { + nextOrd = 0; } - } - if(((ManyToOneMachineRecipe) recipe).isValidRecipeComponents(resultInv)) { - return true; - } - - } else { - Log.warn("TileAlloySmelter.isMachineItemValidForSlot: A non alloy recipe was returned for the alloy smelter"); - return true; + return values()[nextOrd]; } - } } - return false; - } - private boolean isValidInputForFurnaceRecipe(ItemStack itemstack, int numSlotsFilled, List recipes) { - if(numSlotsFilled == 0) { - return containsFurnaceRecipe(recipes); + private Mode mode; + + public TileAlloySmelter() { + super(new SlotDefinition(3, 1)); + mode = Mode.ALL; } - return containsFurnaceRecipe(recipes) && isItemAlreadyInASlot(itemstack); - } - private boolean isItemAlreadyInASlot(ItemStack itemstack) { - ItemStack currentStackType = null; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot() && currentStackType == null; i++) { - currentStackType = inventory[i]; - if(currentStackType != null && currentStackType.isItemEqual(itemstack)) { - return true; - } + @Override + public String getInventoryName() { + return "Alloy Smelter"; } - return false; - } - private boolean containsFurnaceRecipe(List recipes) { - for (IMachineRecipe rec : recipes) { - if(rec instanceof VanillaSmeltingRecipe) { - return true; - } + public Mode getMode() { + return mode; } - return false; - } - private boolean containsAlloyRecipe(List recipes) { - for (IMachineRecipe rec : recipes) { - if(!(rec instanceof VanillaSmeltingRecipe)) { - return true; - } + public void setMode(Mode mode) { + if (mode == null) { + mode = Mode.ALL; + } + if (this.mode != mode) { + this.mode = mode; + forceClientUpdate = true; + } } - return false; - } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - short mb = nbtRoot.getShort("mode"); - Mode[] modes = Mode.values(); - if(mb < 0 || mb >= modes.length) { - mb = 0; + @Override + protected IMachineRecipe canStartNextTask(float chance) { + if (mode == Mode.FURNACE) { + VanillaSmeltingRecipe vr = AlloyRecipeManager.getInstance().vanillaRecipe; + if (vr.isRecipe(getRecipeInputs())) { + ResultStack[] res = vr.getCompletedResult(chance, getRecipeInputs()); + if (res == null || res.length == 0) { + return null; + } + return canInsertResult(chance, vr) ? vr : null; + } + return null; + } + + IMachineRecipe nextRecipe = getNextRecipe(); + if (mode == Mode.ALLOY && nextRecipe instanceof VanillaSmeltingRecipe) { + nextRecipe = null; + } + if (nextRecipe == null) { + return null; // no template + } + // make sure we have room for the next output + return canInsertResult(chance, nextRecipe) ? nextRecipe : null; } - mode = modes[mb]; - } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - nbtRoot.setShort("mode", (short) mode.ordinal()); - } + @Override + public String getMachineName() { + return ModObject.blockAlloySmelter.unlocalisedName; + } - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { + if (!slotDefinition.isInputSlot(slot)) { + return false; + } + // We will assume anything that is in a slot is valid, so just return whether the new input can be stacked with + // the current one + ItemStack currentStackInSlot = inventory[slot]; + if (currentStackInSlot != null) { + return currentStackInSlot.isItemEqual(itemstack); + } + + int numSlotsFilled = 0; + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (i >= 0 && i < inventory.length) { + if (inventory[i] != null && inventory[i].stackSize > 0) { + numSlotsFilled++; + } + } + } + List recipes = MachineRecipeRegistry.instance.getRecipesForInput( + getMachineName(), MachineRecipeInput.create(slot, itemstack)); + + if (mode == Mode.FURNACE) { + return isValidInputForFurnaceRecipe(itemstack, numSlotsFilled, recipes); + } else if (mode == Mode.ALLOY) { + return isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); + } + return isValidInputForFurnaceRecipe(itemstack, numSlotsFilled, recipes) + || isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); + } + + private boolean isValidInputForAlloyRecipe( + int slot, ItemStack itemstack, int numSlotsFilled, List recipes) { + if (numSlotsFilled == 0) { + return containsAlloyRecipe(recipes); + } + for (IMachineRecipe recipe : recipes) { + if (!(recipe instanceof VanillaSmeltingRecipe)) { + + if (recipe instanceof ManyToOneMachineRecipe) { + ItemStack[] resultInv = new ItemStack[slotDefinition.getNumInputSlots()]; + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (i >= 0 && i < inventory.length) { + if (i == slot) { + resultInv[i] = itemstack; + } else { + resultInv[i] = inventory[i]; + } + } + } + if (((ManyToOneMachineRecipe) recipe).isValidRecipeComponents(resultInv)) { + return true; + } + + } else { + Log.warn( + "TileAlloySmelter.isMachineItemValidForSlot: A non alloy recipe was returned for the alloy smelter"); + return true; + } + } + } + return false; + } + + private boolean isValidInputForFurnaceRecipe( + ItemStack itemstack, int numSlotsFilled, List recipes) { + if (numSlotsFilled == 0) { + return containsFurnaceRecipe(recipes); + } + return containsFurnaceRecipe(recipes) && isItemAlreadyInASlot(itemstack); + } + + private boolean isItemAlreadyInASlot(ItemStack itemstack) { + ItemStack currentStackType = null; + for (int i = slotDefinition.getMinInputSlot(); + i <= slotDefinition.getMaxInputSlot() && currentStackType == null; + i++) { + currentStackType = inventory[i]; + if (currentStackType != null && currentStackType.isItemEqual(itemstack)) { + return true; + } + } + return false; + } + + private boolean containsFurnaceRecipe(List recipes) { + for (IMachineRecipe rec : recipes) { + if (rec instanceof VanillaSmeltingRecipe) { + return true; + } + } + return false; + } + + private boolean containsAlloyRecipe(List recipes) { + for (IMachineRecipe rec : recipes) { + if (!(rec instanceof VanillaSmeltingRecipe)) { + return true; + } + } + return false; + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + short mb = nbtRoot.getShort("mode"); + Mode[] modes = Mode.values(); + if (mb < 0 || mb >= modes.length) { + mb = 0; + } + mode = modes[mb]; + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setShort("mode", (short) mode.ordinal()); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java index 73edb457..2c937721 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java @@ -1,15 +1,5 @@ package crazypants.enderio.machine.alloy; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntityFurnace; import crazypants.enderio.ModObject; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; @@ -19,171 +9,182 @@ import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; import crazypants.enderio.material.OreDictionaryPreferences; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.tileentity.TileEntityFurnace; public class VanillaSmeltingRecipe implements IMachineRecipe { - // We will use the same energy as per a standard furnace. - // To do the conversion between fuel burning and RF, use the Stirling Gen - // which produces ten RF per tick of burn time - private static int RF_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) * 10 / 8 ; + // We will use the same energy as per a standard furnace. + // To do the conversion between fuel burning and RF, use the Stirling Gen + // which produces ten RF per tick of burn time + private static int RF_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) * 10 / 8; - private boolean enabled = true; + private boolean enabled = true; - private List excludes = new ArrayList(); + private List excludes = new ArrayList(); - @Override - public String getUid() { - return "VanillaSmeltingRecipe"; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public void addExclude(RecipeInput ri) { - excludes.add(ri); - } - - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - int numInputs = getNumInputs(inputs); - return numInputs * RF_PER_ITEM; - } - - @Override - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - return RecipeBonusType.NONE; - } - - private int getNumInputs(MachineRecipeInput[] inputs) { - int numInputs = 0; - for (MachineRecipeInput input : inputs) { - if(input != null && isValidInput(input)) { - numInputs += input.item.stackSize; - } + @Override + public String getUid() { + return "VanillaSmeltingRecipe"; } - return Math.min(numInputs, 3); - } - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - if(!enabled) { - return false; + public void setEnabled(boolean enabled) { + this.enabled = enabled; } - ItemStack output = null; - for (MachineRecipeInput ri : inputs) { - if(ri != null && ri.item != null && !isExcluded(ri.item)) { - if(output == null) { - output = FurnaceRecipes.smelting().getSmeltingResult(ri.item); - if(output == null) { - return false; - } - } else { - ItemStack newOutput = FurnaceRecipes.smelting().getSmeltingResult(ri.item); - if(newOutput == null || !newOutput.isItemEqual(output)) { - return false; - } + + public void addExclude(RecipeInput ri) { + excludes.add(ri); + } + + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + int numInputs = getNumInputs(inputs); + return numInputs * RF_PER_ITEM; + } + + @Override + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + return RecipeBonusType.NONE; + } + + private int getNumInputs(MachineRecipeInput[] inputs) { + int numInputs = 0; + for (MachineRecipeInput input : inputs) { + if (input != null && isValidInput(input)) { + numInputs += input.item.stackSize; + } } - } + return Math.min(numInputs, 3); } - return output != null; - } - private boolean isExcluded(ItemStack item) { - for (RecipeInput ri : excludes) { - if(ri != null && ri.isInput(item)) { - return true; - } - } - return false; - } - - @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack output = null; - int inputCount = 0; - for (MachineRecipeInput ri : inputs) { - if(ri != null && ri.item != null && output == null) { - output = FurnaceRecipes.smelting().getSmeltingResult(ri.item); - } - } - if(output == null) { - return new ResultStack[0]; - } - int stackSize = output.stackSize; - output = OreDictionaryPreferences.instance.getPreferred(output); - ItemStack result = output.copy(); - result.stackSize = stackSize; - result.stackSize = result.stackSize * getNumInputs(inputs); - return new ResultStack[] { new ResultStack(result) }; - } - - @Override - public float getExperienceForOutput(ItemStack output) { - if(output == null) { - return 0; - } - float result = FurnaceRecipes.smelting().func_151398_b(output); - if (result > 1.0f) { - // see net.minecraft.inventory.SlotFurnace.onCrafting(ItemStack) - result = 1.0f; - } - return result * output.stackSize; - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(!enabled) { - return false; - } - if(input == null || input.item == null) { - return false; - } - if(isExcluded(input.item)) { - return false; - } - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(input.item); - return itemstack != null; - } - - @Override - public String getMachineName() { - return ModObject.blockAlloySmelter.unlocalisedName; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - int consumed = 0; - List result = new ArrayList(); - for (MachineRecipeInput ri : inputs) { - if(isValidInput(new MachineRecipeInput(ri.slotNumber, ri.item)) && consumed < 3 && ri != null && ri.item != null) { - int available = ri.item.stackSize; - int canUse = 3 - consumed; - int use = Math.min(canUse, available); - if(use > 0) { - ItemStack st = ri.item.copy(); - st.stackSize = use; - result.add(new MachineRecipeInput(ri.slotNumber, st)); - consumed += use; + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + if (!enabled) { + return false; } - } + ItemStack output = null; + for (MachineRecipeInput ri : inputs) { + if (ri != null && ri.item != null && !isExcluded(ri.item)) { + if (output == null) { + output = FurnaceRecipes.smelting().getSmeltingResult(ri.item); + if (output == null) { + return false; + } + } else { + ItemStack newOutput = FurnaceRecipes.smelting().getSmeltingResult(ri.item); + if (newOutput == null || !newOutput.isItemEqual(output)) { + return false; + } + } + } + } + return output != null; } - return result; - } - - - public List getAllRecipes() { - if(!enabled) { - return Collections.emptyList(); - } - List result = new ArrayList(); - Map metaList = FurnaceRecipes.smelting().getSmeltingList(); - for (Entry entry : metaList.entrySet()) { - ItemStack output = entry.getValue(); - output = OreDictionaryPreferences.instance.getPreferred(output).copy(); - result.add(new Recipe(new RecipeInput(entry.getKey()), RF_PER_ITEM, RecipeBonusType.NONE, new RecipeOutput(output))); - } - return result; - } + private boolean isExcluded(ItemStack item) { + for (RecipeInput ri : excludes) { + if (ri != null && ri.isInput(item)) { + return true; + } + } + return false; + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack output = null; + int inputCount = 0; + for (MachineRecipeInput ri : inputs) { + if (ri != null && ri.item != null && output == null) { + output = FurnaceRecipes.smelting().getSmeltingResult(ri.item); + } + } + if (output == null) { + return new ResultStack[0]; + } + int stackSize = output.stackSize; + output = OreDictionaryPreferences.instance.getPreferred(output); + ItemStack result = output.copy(); + result.stackSize = stackSize; + result.stackSize = result.stackSize * getNumInputs(inputs); + return new ResultStack[] {new ResultStack(result)}; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + if (output == null) { + return 0; + } + float result = FurnaceRecipes.smelting().func_151398_b(output); + if (result > 1.0f) { + // see net.minecraft.inventory.SlotFurnace.onCrafting(ItemStack) + result = 1.0f; + } + return result * output.stackSize; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (!enabled) { + return false; + } + if (input == null || input.item == null) { + return false; + } + if (isExcluded(input.item)) { + return false; + } + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(input.item); + return itemstack != null; + } + + @Override + public String getMachineName() { + return ModObject.blockAlloySmelter.unlocalisedName; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + int consumed = 0; + List result = new ArrayList(); + for (MachineRecipeInput ri : inputs) { + if (isValidInput(new MachineRecipeInput(ri.slotNumber, ri.item)) + && consumed < 3 + && ri != null + && ri.item != null) { + int available = ri.item.stackSize; + int canUse = 3 - consumed; + int use = Math.min(canUse, available); + if (use > 0) { + ItemStack st = ri.item.copy(); + st.stackSize = use; + result.add(new MachineRecipeInput(ri.slotNumber, st)); + consumed += use; + } + } + } + return result; + } + + public List getAllRecipes() { + if (!enabled) { + return Collections.emptyList(); + } + List result = new ArrayList(); + Map metaList = FurnaceRecipes.smelting().getSmeltingList(); + for (Entry entry : metaList.entrySet()) { + ItemStack output = entry.getValue(); + output = OreDictionaryPreferences.instance.getPreferred(output).copy(); + result.add(new Recipe( + new RecipeInput(entry.getKey()), RF_PER_ITEM, RecipeBonusType.NONE, new RecipeOutput(output))); + } + return result; + } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java index 0ed0e3fe..24a71cbf 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java @@ -1,17 +1,5 @@ package crazypants.enderio.machine.buffer; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,168 +14,183 @@ import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; import crazypants.util.IFacade; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockBuffer extends AbstractMachineBlock implements IFacade { - public static BlockBuffer create() { - PacketHandler.INSTANCE.registerMessage(PacketBufferIO.class, PacketBufferIO.class, PacketHandler.nextID(), Side.SERVER); - BlockBuffer res = new BlockBuffer(); - res.init(); - return res; - } - - private static final String[] textureNames = new String[] { "blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative" }; - @SideOnly(Side.CLIENT) - private IIcon[] textures; - - private BlockBuffer() { - super(ModObject.blockBuffer, TileBuffer.class); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemBuffer.class, modObject.unlocalisedName); - GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); - EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - return new ContainerBuffer(player.inventory, (TileBuffer) te); + public static BlockBuffer create() { + PacketHandler.INSTANCE.registerMessage( + PacketBufferIO.class, PacketBufferIO.class, PacketHandler.nextID(), Side.SERVER); + BlockBuffer res = new BlockBuffer(); + res.init(); + return res; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - return new GuiBuffer(player.inventory, (TileBuffer) te); - } - return null; - } + private static final String[] textureNames = + new String[] {"blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative"}; - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_BUFFER; - } + @SideOnly(Side.CLIENT) + private IIcon[] textures; - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - textures = new IIcon[textureNames.length]; - for (int i = 0; i < textureNames.length; i++) { - textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); - } - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - return getSideIconKey(active); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - TileBuffer tef = (TileBuffer) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } else if(blockSide > 1) { - return textures[world.getBlockMetadata(x, y, z)]; - } - } - return super.getIcon(world, x, y, z, blockSide); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - if(entity instanceof EntityPlayer) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - TileBuffer ta = (TileBuffer) te; - if(stack.stackTagCompound != null) { - ta.readCommon(stack.stackTagCompound); - } - world.markBlockForUpdate(x, y, z); - } - } - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - public ItemStack createItemStackForSourceBlock(ItemStack machine, Block block, int sourceMeta) { - PainterUtil.setSourceBlock(machine, block, sourceMeta); - return machine; - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(BlockBuffer.this); + private BlockBuffer() { + super(ModObject.blockBuffer, TileBuffer.class); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs); - target = target.copy(); - target.stackSize = 1; - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(target, Block.getBlockFromItem(paintSource.getItem()), - paintSource.getItemDamage())) }; + protected void init() { + GameRegistry.registerBlock(this, BlockItemBuffer.class, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); } - } - @Override - public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - return ((TileBuffer) te).getSourceBlockMetadata(); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + return new ContainerBuffer(player.inventory, (TileBuffer) te); + } + return null; } - return 0; - } - @Override - public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IPaintableTileEntity) { - Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); - if (sourceBlock != null) { - return sourceBlock; - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + return new GuiBuffer(player.inventory, (TileBuffer) te); + } + return null; } - return this; - } - @Override - public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacade(world, x, y, z, side.ordinal()); - } + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_BUFFER; + } - @Override - public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacadeMetadata(world, x, y, z, side.ordinal()); - } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + textures = new IIcon[textureNames.length]; + for (int i = 0; i < textureNames.length; i++) { + textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); + } + } - @Override - public boolean supportsVisualConnections() { - return true; - } + @Override + protected String getMachineFrontIconKey(boolean active) { + return getSideIconKey(active); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int blockSide, int blockMeta) { + return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + TileBuffer tef = (TileBuffer) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } else if (blockSide > 1) { + return textures[world.getBlockMetadata(x, y, z)]; + } + } + return super.getIcon(world, x, y, z, blockSide); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { + if (entity instanceof EntityPlayer) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + TileBuffer ta = (TileBuffer) te; + if (stack.stackTagCompound != null) { + ta.readCommon(stack.stackTagCompound); + } + world.markBlockForUpdate(x, y, z); + } + } + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + public ItemStack createItemStackForSourceBlock(ItemStack machine, Block block, int sourceMeta) { + PainterUtil.setSourceBlock(machine, block, sourceMeta); + return machine; + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(BlockBuffer.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + ItemStack target = MachineRecipeInput.getInputForSlot(0, inputs); + target = target.copy(); + target.stackSize = 1; + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + target, Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } + + @Override + public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + return ((TileBuffer) te).getSourceBlockMetadata(); + } + return 0; + } + + @Override + public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); + if (sourceBlock != null) { + return sourceBlock; + } + } + return this; + } + + @Override + public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacade(world, x, y, z, side.ordinal()); + } + + @Override + public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacadeMetadata(world, x, y, z, side.ordinal()); + } + + @Override + public boolean supportsVisualConnections() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java index 19ea6b44..6f58c1a5 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockItemBuffer.java @@ -1,8 +1,11 @@ package crazypants.enderio.machine.buffer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; import java.util.List; import java.util.Locale; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -11,73 +14,80 @@ import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; public class BlockItemBuffer extends ItemBlockWithMetadata { - public enum Type { - ITEM(true, false, false), - POWER(false, true, false), - OMNI(true, true, false), - CREATIVE(true, true, true); + public enum Type { + ITEM(true, false, false), + POWER(false, true, false), + OMNI(true, true, false), + CREATIVE(true, true, true); - final boolean hasInventory; - final boolean hasPower; - final boolean isCreative; + final boolean hasInventory; + final boolean hasPower; + final boolean isCreative; - private Type(boolean hasInventory, boolean hasPower, boolean isCreative) { - this.hasInventory = hasInventory; - this.hasPower = hasPower; - this.isCreative = isCreative; + private Type(boolean hasInventory, boolean hasPower, boolean isCreative) { + this.hasInventory = hasInventory; + this.hasPower = hasPower; + this.isCreative = isCreative; + } + + public static Type get(TileBuffer buffer) { + return !buffer.hasPower() ? ITEM : !buffer.hasInventory() ? POWER : !buffer.isCreative() ? OMNI : CREATIVE; + } + + public String getUnlocalizedName() { + return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US); + } + + public static ItemStack getStack(Type type) { + return new ItemStack(EnderIO.blockBuffer, 1, type.ordinal()); + } } - public static Type get(TileBuffer buffer) { - return !buffer.hasPower() ? ITEM : !buffer.hasInventory() ? POWER : !buffer.isCreative() ? OMNI : CREATIVE; + public BlockItemBuffer(Block block) { + super(block, block); } - public String getUnlocalizedName() { - return "tile." + ModObject.blockBuffer.unlocalisedName + "." + name().toLowerCase(Locale.US); + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (Type type : Type.values()) { + list.add(new ItemStack(item, 1, type.ordinal())); + } } - public static ItemStack getStack(Type type) { - return new ItemStack(EnderIO.blockBuffer, 1, type.ordinal()); + @Override + public String getUnlocalizedName(ItemStack stack) { + return Type.values()[stack.getItemDamage()].getUnlocalizedName(); } - } - public BlockItemBuffer(Block block) { - super(block, block); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (Type type : Type.values()) { - list.add(new ItemStack(item, 1, type.ordinal())); + @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) { + super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + if (world.getBlock(x, y, z) == field_150939_a) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileBuffer) { + TileBuffer buffer = ((TileBuffer) te); + Type t = Type.values()[metadata]; + buffer.setHasInventory(t.hasInventory); + buffer.setHasPower(t.hasPower); + buffer.setCreative(t.isCreative); + } + } + return true; } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return Type.values()[stack.getItemDamage()].getUnlocalizedName(); - } - - @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) { - super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); - if(world.getBlock(x, y, z) == field_150939_a) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - TileBuffer buffer = ((TileBuffer) te); - Type t = Type.values()[metadata]; - buffer.setHasInventory(t.hasInventory); - buffer.setHasPower(t.hasPower); - buffer.setCreative(t.isCreative); - } - } - return true; - } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockRendererBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockRendererBuffer.java index 7dd1cd81..e087f514 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockRendererBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockRendererBuffer.java @@ -1,9 +1,8 @@ package crazypants.enderio.machine.buffer; -import net.minecraftforge.client.IItemRenderer; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.machine.AbstractMachineRenderer; +import net.minecraftforge.client.IItemRenderer; -public class BlockRendererBuffer extends AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - -} +public class BlockRendererBuffer extends AbstractMachineRenderer + implements ISimpleBlockRenderingHandler, IItemRenderer {} diff --git a/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java index 10bd4107..0562ee34 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/ContainerBuffer.java @@ -1,30 +1,29 @@ package crazypants.enderio.machine.buffer; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import java.awt.Point; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerBuffer extends AbstractMachineContainer { - - public ContainerBuffer(InventoryPlayer playerInv, TileBuffer te) { - super(playerInv, te); - } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - TileBuffer buf = (TileBuffer) getInv(); - if(buf.hasInventory()) { - Point point = new Point(buf.hasInventory() && buf.hasPower() ? 96 : 62, 15); - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(this.getInv(), i, point.x + ((i % 3) * 18), point.y + ((i / 3) * 18))); - } + public ContainerBuffer(InventoryPlayer playerInv, TileBuffer te) { + super(playerInv, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + TileBuffer buf = (TileBuffer) getInv(); + if (buf.hasInventory()) { + Point point = new Point(buf.hasInventory() && buf.hasPower() ? 96 : 62, 15); + for (int i = 0; i < 9; i++) { + addSlotToContainer(new Slot(this.getInv(), i, point.x + ((i % 3) * 18), point.y + ((i / 3) * 18))); + } + } + } + + @Override + public Point getPlayerInventoryOffset() { + return super.getPlayerInventoryOffset(); } - } - - @Override - public Point getPlayerInventoryOffset() { - return super.getPlayerInventoryOffset(); - } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index 31d9e156..00285f77 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -1,208 +1,205 @@ package crazypants.enderio.machine.buffer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import org.lwjgl.opengl.GL11; public class GuiBuffer extends GuiPoweredMachineBase { - private static final String TEXTURE_SIMPLE = "buffer"; - private static final String TEXTURE_FULL = "buffer_full"; + private static final String TEXTURE_SIMPLE = "buffer"; + private static final String TEXTURE_FULL = "buffer_full"; - private TextFieldEnder maxInput; - private TextFieldEnder maxOutput; + private TextFieldEnder maxInput; + private TextFieldEnder maxOutput; - private int lastInput, lastOutput; + private int lastInput, lastOutput; - public GuiBuffer(InventoryPlayer par1InventoryPlayer, TileBuffer te) { - super(te, new ContainerBuffer(par1InventoryPlayer, te), TEXTURE_SIMPLE, TEXTURE_FULL); - redstoneButton.setPosition(isFull() ? 153 : 120, 24); - configB.setPosition(isFull() ? 153 : 120, 42); + public GuiBuffer(InventoryPlayer par1InventoryPlayer, TileBuffer te) { + super(te, new ContainerBuffer(par1InventoryPlayer, te), TEXTURE_SIMPLE, TEXTURE_FULL); + redstoneButton.setPosition(isFull() ? 153 : 120, 24); + configB.setPosition(isFull() ? 153 : 120, 42); - if(te.hasPower()) { - int x = (isFull() ? 20 : 58); - int y = guiTop + 27; + if (te.hasPower()) { + int x = (isFull() ? 20 : 58); + int y = guiTop + 27; - maxInput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); - y += 28; - maxOutput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); - - textFields.add(maxInput); - textFields.add(maxOutput); - } - } + maxInput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); + y += 28; + maxOutput = new TextFieldEnder(getFontRenderer(), x, y, 60, 12); - @Override - public void initGui() { - super.initGui(); - - if(getTileEntity().hasPower()) { - maxInput.setMaxStringLength(10); - maxInput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxInput())); - maxOutput.setMaxStringLength(10); - maxOutput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxOutput())); - } - } - - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - if(par1 == 'e') { - super.keyTyped(par1, 1); + textFields.add(maxInput); + textFields.add(maxOutput); + } } - if(getTileEntity().hasPower()) { - updateInputOutput(); - } - } + @Override + public void initGui() { + super.initGui(); - private void updateInputOutput() { - int input = PowerDisplayUtil.parsePower(maxInput); - setMaxInput(input); - int output = PowerDisplayUtil.parsePower(maxOutput); - setMaxOutput(output); - sendUpdateToServer(); - } - - private void setMaxOutput(int output) { - if(output != lastOutput) { - lastOutput = output; - maxOutput.setText(PowerDisplayUtil.formatPower(output)); - } - } - - private void setMaxInput(int input) { - if(input != lastInput) { - lastInput = input; - maxInput.setText(PowerDisplayUtil.formatPower(input)); - sendUpdateToServer(); - } - } - - protected void sendUpdateToServer() { - PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput)); - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - protected boolean renderPowerBar() { - return getTileEntity().hasPower(); - } - - @Override - public int getYSize() { - return ySize; - } - - @Override - protected int getPowerHeight() { - return 52; - } - - @Override - protected int getPowerX() { - return isFull() ? 6 : 44; - } - - @Override - protected int getPowerY() { - return 15; - } - - @Override - protected int getPowerV() { - return 0; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - bindGuiTexture(isFull() ? 1 : 0); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - bindGuiTexture(); - - if(getTileEntity().hasPower()) { - drawPowerBg(sx, sy); + if (getTileEntity().hasPower()) { + maxInput.setMaxStringLength(10); + maxInput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxInput())); + maxOutput.setMaxStringLength(10); + maxOutput.setText(PowerDisplayUtil.formatPower(getTileEntity().getMaxOutput())); + } } - if(getTileEntity().hasInventory()) { - drawSlotBg(sx, sy); + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + if (par1 == 'e') { + super.keyTyped(par1, 1); + } + + if (getTileEntity().hasPower()) { + updateInputOutput(); + } } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - String invName = EnderIO.lang.localizeExact(getTileEntity().getInventoryName() + ".name"); - getFontRenderer().drawStringWithShadow(invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), sy + 4, 0xFFFFFF); - - if(getTileEntity().hasPower()) { - sx += isFull() ? 19 : 57; - sy += 17; - - getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.in"), sx, sy, 0xFFFFFF); - getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.out"), sx, sy + 27, 0xFFFFFF); + private void updateInputOutput() { + int input = PowerDisplayUtil.parsePower(maxInput); + setMaxInput(input); + int output = PowerDisplayUtil.parsePower(maxOutput); + setMaxOutput(output); + sendUpdateToServer(); } - } - boolean isFull() { - return getTileEntity().hasInventory() && getTileEntity().hasPower(); - } - - @Override - public void renderSlotHighlights(IoMode mode) { - if (!getTileEntity().hasInventory()) { - return; + private void setMaxOutput(int output) { + if (output != lastOutput) { + lastOutput = output; + maxOutput.setText(PowerDisplayUtil.formatPower(output)); + } } - - for (int slot = 0; slot < getTileEntity().getSizeInventory(); slot++) { - renderSlotHighlight(slot, mode); + + private void setMaxInput(int input) { + if (input != lastInput) { + lastInput = input; + maxInput.setText(PowerDisplayUtil.formatPower(input)); + sendUpdateToServer(); + } } - } - protected void renderSlotHighlight(int slot, IoMode mode) { - Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); - if(mode == IoMode.PULL) { - renderSlotHighlight(slot, PULL_COLOR); - } else if(mode == IoMode.PUSH) { - renderSlotHighlight(slot, PUSH_COLOR); - } else if(mode == IoMode.PUSH_PULL) { - renderSplitHighlight(invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); + protected void sendUpdateToServer() { + PacketHandler.INSTANCE.sendToServer(new PacketBufferIO(getTileEntity(), lastInput, lastOutput)); } - } - protected void renderSplitHighlight(int x, int y, int width, int height) { - GL11.glEnable(GL11.GL_BLEND); - RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y, 0, width, height / 2, PULL_COLOR); - RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y + (height / 2), 0, width, height / 2, PUSH_COLOR); - GL11.glDisable(GL11.GL_BLEND); - } + @Override + protected boolean showRecipeButton() { + return false; + } - private void drawPowerBg(int sx, int sy) { - drawTexturedModalRect(sx + (isFull() ? 5 : 43), sy + 14, xSize + 10, 0, 12, 54); - } + @Override + protected boolean renderPowerBar() { + return getTileEntity().hasPower(); + } - private void drawSlotBg(int sx, int sy) { - drawTexturedModalRect(sx + (isFull() ? 95 : 61), sy + 14, xSize + 22, 0, 54, 54); - } + @Override + public int getYSize() { + return ySize; + } + + @Override + protected int getPowerHeight() { + return 52; + } + + @Override + protected int getPowerX() { + return isFull() ? 6 : 44; + } + + @Override + protected int getPowerY() { + return 15; + } + + @Override + protected int getPowerV() { + return 0; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + bindGuiTexture(isFull() ? 1 : 0); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + bindGuiTexture(); + + if (getTileEntity().hasPower()) { + drawPowerBg(sx, sy); + } + + if (getTileEntity().hasInventory()) { + drawSlotBg(sx, sy); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + String invName = EnderIO.lang.localizeExact(getTileEntity().getInventoryName() + ".name"); + getFontRenderer() + .drawStringWithShadow( + invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), sy + 4, 0xFFFFFF); + + if (getTileEntity().hasPower()) { + sx += isFull() ? 19 : 57; + sy += 17; + + getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.in"), sx, sy, 0xFFFFFF); + getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.out"), sx, sy + 27, 0xFFFFFF); + } + } + + boolean isFull() { + return getTileEntity().hasInventory() && getTileEntity().hasPower(); + } + + @Override + public void renderSlotHighlights(IoMode mode) { + if (!getTileEntity().hasInventory()) { + return; + } + + for (int slot = 0; slot < getTileEntity().getSizeInventory(); slot++) { + renderSlotHighlight(slot, mode); + } + } + + protected void renderSlotHighlight(int slot, IoMode mode) { + Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); + if (mode == IoMode.PULL) { + renderSlotHighlight(slot, PULL_COLOR); + } else if (mode == IoMode.PUSH) { + renderSlotHighlight(slot, PUSH_COLOR); + } else if (mode == IoMode.PUSH_PULL) { + renderSplitHighlight(invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); + } + } + + protected void renderSplitHighlight(int x, int y, int width, int height) { + GL11.glEnable(GL11.GL_BLEND); + RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y, 0, width, height / 2, PULL_COLOR); + RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y + (height / 2), 0, width, height / 2, PUSH_COLOR); + GL11.glDisable(GL11.GL_BLEND); + } + + private void drawPowerBg(int sx, int sy) { + drawTexturedModalRect(sx + (isFull() ? 5 : 43), sy + 14, xSize + 10, 0, 12, 54); + } + + private void drawSlotBg(int sx, int sy) { + drawTexturedModalRect(sx + (isFull() ? 95 : 61), sy + 14, xSize + 22, 0, 54, 54); + } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java index 46ffed86..56e31fa8 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java +++ b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java @@ -1,47 +1,45 @@ package crazypants.enderio.machine.buffer; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; -public class PacketBufferIO extends MessageTileEntity implements IMessage, IMessageHandler { +public class PacketBufferIO extends MessageTileEntity + implements IMessage, IMessageHandler { - public PacketBufferIO() {} - - private int in, out; - - public PacketBufferIO(TileBuffer tile, int in, int out) { - super(tile); - tile.setIO(in, out); - this.in = in; - this.out = out; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - this.in = buf.readInt(); - this.out = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(this.in); - buf.writeInt(this.out); - } + public PacketBufferIO() {} - @Override - public IMessage onMessage(PacketBufferIO message, MessageContext ctx) { - TileBuffer buf = message.getTileEntity(message.getWorld(ctx)); - if (buf != null) { - buf.setIO(message.in, message.out); + private int in, out; + + public PacketBufferIO(TileBuffer tile, int in, int out) { + super(tile); + tile.setIO(in, out); + this.in = in; + this.out = out; } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + this.in = buf.readInt(); + this.out = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(this.in); + buf.writeInt(this.out); + } + + @Override + public IMessage onMessage(PacketBufferIO message, MessageContext ctx) { + TileBuffer buf = message.getTileEntity(message.getWorld(ctx)); + if (buf != null) { + buf.setIO(message.in, message.out); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index b1d3340f..4193b775 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -1,13 +1,6 @@ package crazypants.enderio.machine.buffer; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.IoMode; @@ -16,236 +9,247 @@ import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintableTileEntity, IInternalPowerHandler { - private Block sourceBlock; - private int sourceBlockMetadata; + private Block sourceBlock; + private int sourceBlockMetadata; - private boolean hasPower, hasInventory, isCreative; + private boolean hasPower, hasInventory, isCreative; - private PowerDistributor dist; + private PowerDistributor dist; - private int maxOut = Config.powerConduitTierThreeRF; - private int maxIn = maxOut; + private int maxOut = Config.powerConduitTierThreeRF; + private int maxIn = maxOut; - public TileBuffer() { - super(new SlotDefinition(9, 0, 0)); - } - - @Override - public String getMachineName() { - return BlockItemBuffer.Type.get(this).getUnlocalizedName(); - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - - @Override - public boolean isActive() { - return false; - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - if(getEnergyStored() <= 0 || !redstoneCheckPassed) { - return false; - } - if(dist == null) { - dist = new PowerDistributor(new BlockCoord(this)); - } - int transmitted = dist.transmitEnergy(worldObj, Math.min(getMaxOutput(), getEnergyStored())); - if (!isCreative()) { - setEnergyStored(getEnergyStored() - transmitted); - } - return false; - } - - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - super.setIoMode(faceHit, mode); - if(dist != null) { - dist.neighboursChanged(); - } - } - - @Override - public void clearAllIoModes() { - super.clearAllIoModes(); - if(dist != null) { - dist.neighboursChanged(); - } - } - - @Override - public void writeToItemStack(ItemStack stack) { - super.writeToItemStack(stack); - stack.setItemDamage(BlockItemBuffer.Type.get(this).ordinal()); - } - - @Override - public boolean canInsertItem(int slot, ItemStack var2, int side) { - return hasInventory() && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput() && isMachineItemValidForSlot(slot, var2); - } - - @Override - public boolean canExtractItem(int slot, ItemStack itemstack, int side) { - return hasInventory() && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canOutput() && canExtractItem(slot, itemstack); - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return hasPower; - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return maxIn; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return hasPower() && getIoMode(from).canRecieveInput() ? super.receiveEnergy(from, maxReceive, isCreative() || simulate) : 0; - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - protected boolean doPull(ForgeDirection dir) { - ItemStack[] invCopy = new ItemStack[inventory.length]; - for (int i = 0; i < inventory.length; i++) { - invCopy[i] = inventory[i] == null ? null : inventory[i].copy(); + public TileBuffer() { + super(new SlotDefinition(9, 0, 0)); } - boolean ret = super.doPull(dir); - - if(isCreative()) { - inventory = invCopy; + @Override + public String getMachineName() { + return BlockItemBuffer.Type.get(this).getUnlocalizedName(); } - return ret; - } - - @Override - protected boolean doPush(ForgeDirection dir) { - - if(!shouldDoWorkThisTick(20)) { - return false; + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return true; } - ItemStack[] invCopy = new ItemStack[inventory.length]; - for (int i = 0; i < inventory.length; i++) { - invCopy[i] = inventory[i] == null ? null : inventory[i].copy(); + @Override + public boolean isActive() { + return false; } - BlockCoord loc = getLocation().getLocation(dir); - TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); - - boolean ret = super.doPush(dir, te, slotDefinition.minInputSlot, slotDefinition.maxInputSlot); - - if(isCreative()) { - inventory = invCopy; + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + if (getEnergyStored() <= 0 || !redstoneCheckPassed) { + return false; + } + if (dist == null) { + dist = new PowerDistributor(new BlockCoord(this)); + } + int transmitted = dist.transmitEnergy(worldObj, Math.min(getMaxOutput(), getEnergyStored())); + if (!isCreative()) { + setEnergyStored(getEnergyStored() - transmitted); + } + return false; } - return ret; - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("hasInv", hasInventory); - nbtRoot.setBoolean("hasPower", hasPower); - nbtRoot.setBoolean("creative", isCreative); - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - PainterUtil.setSourceBlock(nbtRoot, sourceBlock, sourceBlockMetadata); - nbtRoot.setInteger("maxIn", maxIn); - nbtRoot.setInteger("maxOut", maxOut); - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - this.hasInventory = nbtRoot.getBoolean("hasInv"); - this.hasPower = nbtRoot.getBoolean("hasPower"); - this.isCreative = nbtRoot.getBoolean("creative"); - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - this.sourceBlock = PainterUtil.getSourceBlock(nbtRoot); - this.sourceBlockMetadata = PainterUtil.getSourceBlockMetadata(nbtRoot); - this.maxIn = nbtRoot.getInteger("maxIn"); - this.maxOut = nbtRoot.getInteger("maxOut"); - } - - @Override - public void setSourceBlockMetadata(int sourceBlockMetadata) { - this.sourceBlockMetadata = sourceBlockMetadata; - } - - @Override - public int getSourceBlockMetadata() { - return sourceBlockMetadata; - } - - @Override - public void setSourceBlock(Block sourceBlock) { - this.sourceBlock = sourceBlock; - } - - @Override - public Block getSourceBlock() { - return sourceBlock; - } - - public boolean hasInventory() { - return hasInventory; - } - - public void setHasInventory(boolean hasInventory) { - this.hasInventory = hasInventory; - } - - @Override - public boolean hasPower() { - return hasPower; - } - - public void setHasPower(boolean hasPower) { - this.hasPower = hasPower; - } - - public boolean isCreative() { - return isCreative; - } - - public void setCreative(boolean isCreative) { - this.isCreative = isCreative; - if (isCreative) { - this.setEnergyStored(getMaxEnergyStored() / 2); + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) { + super.setIoMode(faceHit, mode); + if (dist != null) { + dist.neighboursChanged(); + } } - } - public void setIO(int in, int out) { - this.maxIn = in; - this.maxOut = out; - } + @Override + public void clearAllIoModes() { + super.clearAllIoModes(); + if (dist != null) { + dist.neighboursChanged(); + } + } - public int getMaxInput() { - return maxIn; - } + @Override + public void writeToItemStack(ItemStack stack) { + super.writeToItemStack(stack); + stack.setItemDamage(BlockItemBuffer.Type.get(this).ordinal()); + } - public int getMaxOutput() { - return maxOut; - } + @Override + public boolean canInsertItem(int slot, ItemStack var2, int side) { + return hasInventory() + && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput() + && isMachineItemValidForSlot(slot, var2); + } + + @Override + public boolean canExtractItem(int slot, ItemStack itemstack, int side) { + return hasInventory() + && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canOutput() + && canExtractItem(slot, itemstack); + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return hasPower; + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return maxIn; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return hasPower() && getIoMode(from).canRecieveInput() + ? super.receiveEnergy(from, maxReceive, isCreative() || simulate) + : 0; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + protected boolean doPull(ForgeDirection dir) { + ItemStack[] invCopy = new ItemStack[inventory.length]; + for (int i = 0; i < inventory.length; i++) { + invCopy[i] = inventory[i] == null ? null : inventory[i].copy(); + } + + boolean ret = super.doPull(dir); + + if (isCreative()) { + inventory = invCopy; + } + + return ret; + } + + @Override + protected boolean doPush(ForgeDirection dir) { + + if (!shouldDoWorkThisTick(20)) { + return false; + } + + ItemStack[] invCopy = new ItemStack[inventory.length]; + for (int i = 0; i < inventory.length; i++) { + invCopy[i] = inventory[i] == null ? null : inventory[i].copy(); + } + + BlockCoord loc = getLocation().getLocation(dir); + TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); + + boolean ret = super.doPush(dir, te, slotDefinition.minInputSlot, slotDefinition.maxInputSlot); + + if (isCreative()) { + inventory = invCopy; + } + + return ret; + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("hasInv", hasInventory); + nbtRoot.setBoolean("hasPower", hasPower); + nbtRoot.setBoolean("creative", isCreative); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + PainterUtil.setSourceBlock(nbtRoot, sourceBlock, sourceBlockMetadata); + nbtRoot.setInteger("maxIn", maxIn); + nbtRoot.setInteger("maxOut", maxOut); + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + this.hasInventory = nbtRoot.getBoolean("hasInv"); + this.hasPower = nbtRoot.getBoolean("hasPower"); + this.isCreative = nbtRoot.getBoolean("creative"); + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + this.sourceBlock = PainterUtil.getSourceBlock(nbtRoot); + this.sourceBlockMetadata = PainterUtil.getSourceBlockMetadata(nbtRoot); + this.maxIn = nbtRoot.getInteger("maxIn"); + this.maxOut = nbtRoot.getInteger("maxOut"); + } + + @Override + public void setSourceBlockMetadata(int sourceBlockMetadata) { + this.sourceBlockMetadata = sourceBlockMetadata; + } + + @Override + public int getSourceBlockMetadata() { + return sourceBlockMetadata; + } + + @Override + public void setSourceBlock(Block sourceBlock) { + this.sourceBlock = sourceBlock; + } + + @Override + public Block getSourceBlock() { + return sourceBlock; + } + + public boolean hasInventory() { + return hasInventory; + } + + public void setHasInventory(boolean hasInventory) { + this.hasInventory = hasInventory; + } + + @Override + public boolean hasPower() { + return hasPower; + } + + public void setHasPower(boolean hasPower) { + this.hasPower = hasPower; + } + + public boolean isCreative() { + return isCreative; + } + + public void setCreative(boolean isCreative) { + this.isCreative = isCreative; + if (isCreative) { + this.setEnergyStored(getMaxEnergyStored() / 2); + } + } + + public void setIO(int in, int out) { + this.maxIn = in; + this.maxOut = out; + } + + public int getMaxInput() { + return maxIn; + } + + public int getMaxOutput() { + return maxOut; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 9c2b94c2..4f43c79a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -1,34 +1,10 @@ package crazypants.enderio.machine.capbank; -import java.text.MessageFormat; -import java.util.Collection; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -54,504 +30,575 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; +import java.text.MessageFormat; +import java.util.Collection; +import java.util.List; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable { +public class BlockCapBank extends BlockEio + implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable { - public static int renderId = -1; + public static int renderId = -1; - public static BlockCapBank create() { + public static BlockCapBank create() { - PacketHandler.INSTANCE.registerMessage(PacketNetworkStateResponse.class, PacketNetworkStateResponse.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketNetworkStateRequest.class, PacketNetworkStateRequest.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketNetworkIdRequest.class, PacketNetworkIdRequest.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketNetworkIdResponse.class, PacketNetworkIdResponse.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketNetworkEnergyRequest.class, PacketNetworkEnergyRequest.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketNetworkEnergyResponse.class, PacketNetworkEnergyResponse.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketGuiChange.class, PacketGuiChange.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkStateResponse.class, + PacketNetworkStateResponse.class, + PacketHandler.nextID(), + Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkStateRequest.class, PacketNetworkStateRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkIdRequest.class, PacketNetworkIdRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkIdResponse.class, PacketNetworkIdResponse.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkEnergyRequest.class, + PacketNetworkEnergyRequest.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketNetworkEnergyResponse.class, + PacketNetworkEnergyResponse.class, + PacketHandler.nextID(), + Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketGuiChange.class, PacketGuiChange.class, PacketHandler.nextID(), Side.SERVER); - BlockCapBank res = new BlockCapBank(); - res.init(); - return res; - } - - @SideOnly(Side.CLIENT) - private IIcon gaugeIcon; - @SideOnly(Side.CLIENT) - private IIcon fillBarIcon; - - @SideOnly(Side.CLIENT) - private IIcon[] blockIcons; - @SideOnly(Side.CLIENT) - private IIcon[] borderIcons; - @SideOnly(Side.CLIENT) - private IIcon[] inputIcons; - @SideOnly(Side.CLIENT) - private IIcon[] outputIcons; - @SideOnly(Side.CLIENT) - private IIcon[] lockedIcons; - @SideOnly(Side.CLIENT) - private IIcon infoPanelIcon; - - protected BlockCapBank() { - super(ModObject.blockCapBank.unlocalisedName, TileCapBank.class); - setHardness(2.0F); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemCapBank.class, name); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + BlockCapBank res = new BlockCapBank(); + res.init(); + return res; } - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAP_BANK, this); - setLightOpacity(255); - } + @SideOnly(Side.CLIENT) + private IIcon gaugeIcon; - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) { - int meta = 0; - for (CapBankType type : CapBankType.types()) { - if(type.isCreative()) { - list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored() / 2)); - } else { - list.add(BlockItemCapBank.createItemStackWithPower(meta, 0)); - list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored())); - } - meta++; - } - } + @SideOnly(Side.CLIENT) + private IIcon fillBarIcon; - @Override - public int damageDropped(int par1) { - return par1; - } + @SideOnly(Side.CLIENT) + private IIcon[] blockIcons; - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } + @SideOnly(Side.CLIENT) + private IIcon[] borderIcons; - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(PowerDisplayUtil.formatStoredPower(PowerHandlerUtil.getStoredEnergyForItem(itemstack), CapBankType.getTypeFromMeta(itemstack.getItemDamage()) - .getMaxEnergyStored())); - if(itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("Items")) { - NBTTagList itemList = (NBTTagList) itemstack.stackTagCompound.getTag("Items"); - String msg = EnderIO.lang.localizeExact("tile.blockCapBank.tooltip.hasItems"); - list.add(EnumChatFormatting.GOLD + MessageFormat.format(msg, itemList.tagCount())); - } - } + @SideOnly(Side.CLIENT) + private IIcon[] inputIcons; - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - } + @SideOnly(Side.CLIENT) + private IIcon[] outputIcons; - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + @SideOnly(Side.CLIENT) + private IIcon[] lockedIcons; - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapBank)) { - return false; + @SideOnly(Side.CLIENT) + private IIcon infoPanelIcon; + + protected BlockCapBank() { + super(ModObject.blockCapBank.unlocalisedName, TileCapBank.class); + setHardness(2.0F); } - TileCapBank tcb = (TileCapBank) te; - ForgeDirection faceHit = ForgeDirection.getOrientation(side); - - if(entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem() == null && faceHit.offsetY == 0) { - InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); - if(newDisplayType == InfoDisplayType.NONE) { - tcb.setDefaultIoMode(faceHit); - } else { - tcb.setIoMode(faceHit, IoMode.DISABLED); - } - tcb.setDisplayType(faceHit, newDisplayType); - return true; - } - - if(!entityPlayer.isSneaking() && ToolUtil.isToolEquipped(entityPlayer)) { - - IoMode ioMode = tcb.getIoMode(faceHit); - if(faceHit.offsetY == 0) { - if(ioMode == IoMode.DISABLED) { - InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); - tcb.setDisplayType(faceHit, newDisplayType); - if(newDisplayType == InfoDisplayType.NONE) { - tcb.setDefaultIoMode(faceHit); - } - } else { - tcb.toggleIoModeForFace(faceHit); + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemCapBank.class, name); + if (teClass != null) { + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); } - } else { - tcb.toggleIoModeForFace(faceHit); - } - if(world.isRemote) { - world.markBlockForUpdate(x, y, z); - } else { - world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapBank); - world.markBlockForUpdate(x, y, z); - } - - return true; + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAP_BANK, this); + setLightOpacity(255); } - return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAP_BANK, world, x, y, z); - } - return true; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - return new ContainerCapBank(player.inventory, (TileCapBank) te); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - return new GuiCapBank(player, player.inventory, (TileCapBank) te); - } - return null; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); - gaugeIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); - fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); - infoPanelIcon = IIconRegister.registerIcon("enderio:capBankInfoPanel"); - - blockIcons = new IIcon[CapBankType.types().size()]; - borderIcons = new IIcon[CapBankType.types().size()]; - inputIcons = new IIcon[CapBankType.types().size()]; - outputIcons = new IIcon[CapBankType.types().size()]; - lockedIcons = new IIcon[CapBankType.types().size()]; - int index = 0; - for (CapBankType type : CapBankType.types()) { - blockIcons[index] = IIconRegister.registerIcon(type.getIcon()); - borderIcons[index] = IIconRegister.registerIcon(type.getBorderIcon()); - inputIcons[index] = IIconRegister.registerIcon(type.getInputIcon()); - outputIcons[index] = IIconRegister.registerIcon(type.getOutputIcon()); - lockedIcons[index] = IIconRegister.registerIcon(type.getLockedIcon()); - ++index; - } - - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); - return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); - return blockIcons[meta]; - } - - @SideOnly(Side.CLIENT) - public IIcon getBorderIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); - return borderIcons[meta]; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { - TileEntity te = ba.getTileEntity(x, y, z); - if(!(te instanceof TileCapBank)) { - return blockIcons[0]; - } - - // if(true) { - // return IconUtil.blankTexture; - // } - - TileCapBank cb = (TileCapBank) te; - ForgeDirection face = ForgeDirection.values()[side]; - - int meta = ba.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); - - IoMode mode = cb.getIoMode(face); - if(mode == null || mode == IoMode.NONE || cb.getDisplayType(face) != InfoDisplayType.NONE) { - return blockIcons[meta]; - } - if(mode == IoMode.PULL) { - return inputIcons[meta]; - } - if(mode == IoMode.PUSH) { - return outputIcons[meta]; - } - return lockedIcons[meta]; - } - - @SideOnly(Side.CLIENT) - public IIcon getGaugeIcon() { - return gaugeIcon; - } - - @SideOnly(Side.CLIENT) - public IIcon getFillBarIcon() { - return fillBarIcon; - } - - @SideOnly(Side.CLIENT) - public IIcon getInfoPanelIcon() { - return infoPanelIcon; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - if(world.isRemote) { - return; - } - TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof TileCapBank) { - TileCapBank te = (TileCapBank) tile; - te.onNeighborBlockChange(blockId); - } - } - - @Override - public int quantityDropped(Random r) { - return 0; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, player, stack); - - TileCapBank cb = getTileEntity(world, x, y, z); - if(cb == null) { - return; - } - if(stack.stackTagCompound != null) { - cb.readCommonNBT(stack.stackTagCompound); - } - - Collection neigbours = NetworkUtil.getNeigbours(cb); - if(neigbours.isEmpty()) { - int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - ForgeDirection dir = getDirForHeading(heading); - cb.setDisplayType(dir, InfoDisplayType.LEVEL_BAR); - } else { - boolean modifiedDisplayType; - modifiedDisplayType = setDisplayToVerticalFillBar(cb, getTileEntity(world, x, y - 1, z)); - modifiedDisplayType |= setDisplayToVerticalFillBar(cb, getTileEntity(world, x, y + 1, z)); - if(modifiedDisplayType) { - cb.validateDisplayTypes(); - } - } - - if(world.isRemote) { - return; - } - world.markBlockForUpdate(x, y, z); - } - - protected boolean setDisplayToVerticalFillBar(TileCapBank cb, TileCapBank capBank) { - boolean modifiedDisplayType = false; - if(capBank != null) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir.offsetY == 0 && capBank.getDisplayType(dir) == InfoDisplayType.LEVEL_BAR && capBank.getType() == cb.getType()) { - cb.setDisplayType(dir, InfoDisplayType.LEVEL_BAR); - modifiedDisplayType = true; + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) { + int meta = 0; + for (CapBankType type : CapBankType.types()) { + if (type.isCreative()) { + list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored() / 2)); + } else { + list.add(BlockItemCapBank.createItemStackWithPower(meta, 0)); + list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored())); + } + meta++; } - } } - return modifiedDisplayType; - } - private TileCapBank getTileEntity(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - return (TileCapBank) te; + @Override + public int damageDropped(int par1) { + return par1; } - return null; - } - protected ForgeDirection getDirForHeading(int heading) { - switch (heading) { - case 0: - return ForgeDirection.values()[2]; - case 1: - return ForgeDirection.values()[5]; - case 2: - return ForgeDirection.values()[3]; - case 3: - default: - return ForgeDirection.values()[4]; + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(PowerDisplayUtil.formatStoredPower( + PowerHandlerUtil.getStoredEnergyForItem(itemstack), + CapBankType.getTypeFromMeta(itemstack.getItemDamage()).getMaxEnergyStored())); + if (itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("Items")) { + NBTTagList itemList = (NBTTagList) itemstack.stackTagCompound.getTag("Items"); + String msg = EnderIO.lang.localizeExact("tile.blockCapBank.tooltip.hasItems"); + list.add(EnumChatFormatting.GOLD + MessageFormat.format(msg, itemList.tagCount())); + } } - } - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && (!player.capabilities.isCreativeMode)) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); + } + + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapBank)) { + return false; + } + + TileCapBank tcb = (TileCapBank) te; + ForgeDirection faceHit = ForgeDirection.getOrientation(side); + + if (entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem() == null && faceHit.offsetY == 0) { + InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); + if (newDisplayType == InfoDisplayType.NONE) { + tcb.setDefaultIoMode(faceHit); + } else { + tcb.setIoMode(faceHit, IoMode.DISABLED); + } + tcb.setDisplayType(faceHit, newDisplayType); + return true; + } + + if (!entityPlayer.isSneaking() && ToolUtil.isToolEquipped(entityPlayer)) { + + IoMode ioMode = tcb.getIoMode(faceHit); + if (faceHit.offsetY == 0) { + if (ioMode == IoMode.DISABLED) { + InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); + tcb.setDisplayType(faceHit, newDisplayType); + if (newDisplayType == InfoDisplayType.NONE) { + tcb.setDefaultIoMode(faceHit); + } + } else { + tcb.toggleIoModeForFace(faceHit); + } + } else { + tcb.toggleIoModeForFace(faceHit); + } + + if (world.isRemote) { + world.markBlockForUpdate(x, y, z); + } else { + world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapBank); + world.markBlockForUpdate(x, y, z); + } + + return true; + } + + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAP_BANK, world, x, y, z); + } + return true; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + return new ContainerCapBank(player.inventory, (TileCapBank) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + return new GuiCapBank(player, player.inventory, (TileCapBank) te); + } + return null; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); + gaugeIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); + fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); + infoPanelIcon = IIconRegister.registerIcon("enderio:capBankInfoPanel"); + + blockIcons = new IIcon[CapBankType.types().size()]; + borderIcons = new IIcon[CapBankType.types().size()]; + inputIcons = new IIcon[CapBankType.types().size()]; + outputIcons = new IIcon[CapBankType.types().size()]; + lockedIcons = new IIcon[CapBankType.types().size()]; + int index = 0; + for (CapBankType type : CapBankType.types()) { + blockIcons[index] = IIconRegister.registerIcon(type.getIcon()); + borderIcons[index] = IIconRegister.registerIcon(type.getBorderIcon()); + inputIcons[index] = IIconRegister.registerIcon(type.getInputIcon()); + outputIcons[index] = IIconRegister.registerIcon(type.getOutputIcon()); + lockedIcons[index] = IIconRegister.registerIcon(type.getLockedIcon()); + ++index; + } + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); + return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); + return blockIcons[meta]; + } + + @SideOnly(Side.CLIENT) + public IIcon getBorderIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); + return borderIcons[meta]; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { + TileEntity te = ba.getTileEntity(x, y, z); + if (!(te instanceof TileCapBank)) { + return blockIcons[0]; + } + + // if(true) { + // return IconUtil.blankTexture; + // } + TileCapBank cb = (TileCapBank) te; - cb.moveInventoryToNetwork(); - } - } - return super.removedByPlayer(world, player, x, y, z, doHarvest); - } + ForgeDirection face = ForgeDirection.values()[side]; - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - drop.stackTagCompound = new NBTTagCompound(); - if(te != null) { - ((TileCapBank) te).writeCommonNBT(drop.stackTagCompound); - } - } + int meta = ba.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapBank)) { - return; - } - TileCapBank cb = (TileCapBank) te; - cb.onBreakBlock(); - } - super.breakBlock(world, x, y, z, par5, par6); - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapBank)) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - TileCapBank tr = (TileCapBank) te; - ICapBankNetwork network = tr.getNetwork(); - - if(!tr.getType().isMultiblock() || network == null) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - - Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - for (TileCapBank bc : network.getMembers()) { - min.x = Math.min(min.x, bc.xCoord); - max.x = Math.max(max.x, bc.xCoord + 1); - min.y = Math.min(min.y, bc.yCoord); - max.y = Math.max(max.y, bc.yCoord + 1); - min.z = Math.min(min.z, bc.zCoord); - max.z = Math.max(max.z, bc.zCoord + 1); - } - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - } - - @Override - public boolean hasComparatorInputOverride() { - return true; - } - - @Override - public int getComparatorInputOverride(World w, int x, int y, int z, int side) { - TileEntity te = w.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - return ((TileCapBank) te).getComparatorOutput(); - } - return 0; - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - TileCapBank cap = (TileCapBank) te; - if(cap.getNetwork() != null) { - if(world.isRemote && shouldDoWorkThisTick(world, x, y, z, 20)) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(cap)); + IoMode mode = cb.getIoMode(face); + if (mode == null || mode == IoMode.NONE || cb.getDisplayType(face) != InfoDisplayType.NONE) { + return blockIcons[meta]; } - ICapBankNetwork nw = cap.getNetwork(); - if(world.isRemote) { - ((CapBankClientNetwork) nw).requestPowerUpdate(cap, 2); + if (mode == IoMode.PULL) { + return inputIcons[meta]; + } + if (mode == IoMode.PUSH) { + return outputIcons[meta]; + } + return lockedIcons[meta]; + } + + @SideOnly(Side.CLIENT) + public IIcon getGaugeIcon() { + return gaugeIcon; + } + + @SideOnly(Side.CLIENT) + public IIcon getFillBarIcon() { + return fillBarIcon; + } + + @SideOnly(Side.CLIENT) + public IIcon getInfoPanelIcon() { + return infoPanelIcon; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + if (world.isRemote) { + return; + } + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof TileCapBank) { + TileCapBank te = (TileCapBank) tile; + te.onNeighborBlockChange(blockId); + } + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + + TileCapBank cb = getTileEntity(world, x, y, z); + if (cb == null) { + return; + } + if (stack.stackTagCompound != null) { + cb.readCommonNBT(stack.stackTagCompound); } - if(SpecialTooltipHandler.showAdvancedTooltips()) { - String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; - String suffix = Util.TAB + Util.ALIGNRIGHT + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(nw.getMaxIO()), suffix)); - tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(nw.getMaxInput()), suffix)); - tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(nw.getMaxOutput()), suffix)); - tooltip.add(""); + Collection neigbours = NetworkUtil.getNeigbours(cb); + if (neigbours.isEmpty()) { + int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + ForgeDirection dir = getDirForHeading(heading); + cb.setDisplayType(dir, InfoDisplayType.LEVEL_BAR); + } else { + boolean modifiedDisplayType; + modifiedDisplayType = setDisplayToVerticalFillBar(cb, getTileEntity(world, x, y - 1, z)); + modifiedDisplayType |= setDisplayToVerticalFillBar(cb, getTileEntity(world, x, y + 1, z)); + if (modifiedDisplayType) { + cb.validateDisplayTypes(); + } } - long stored = nw.getEnergyStoredL(); - long max = nw.getMaxEnergyStoredL(); - tooltip.add(String.format("%s%s%s / %s%s%s %s", EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(stored), EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(max), EnumChatFormatting.RESET, PowerDisplayUtil.abrevation())); - - int change = Math.round(nw.getAverageChangePerTick()); - String color = EnumChatFormatting.WHITE.toString(); - if(change > 0) { - color = EnumChatFormatting.GREEN.toString() + "+"; - } else if(change < 0) { - color = EnumChatFormatting.RED.toString(); + if (world.isRemote) { + return; } - tooltip.add(String.format("%s%s%s", color, PowerDisplayUtil.formatPowerPerTick(change), " " + EnumChatFormatting.RESET.toString())); - } + world.markBlockForUpdate(x, y, z); } - } - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.BIT_DETAILED; - } + protected boolean setDisplayToVerticalFillBar(TileCapBank cb, TileCapBank capBank) { + boolean modifiedDisplayType = false; + if (capBank != null) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir.offsetY == 0 + && capBank.getDisplayType(dir) == InfoDisplayType.LEVEL_BAR + && capBank.getType() == cb.getType()) { + cb.setDisplayType(dir, InfoDisplayType.LEVEL_BAR); + modifiedDisplayType = true; + } + } + } + return modifiedDisplayType; + } - /* IRedstoneConnectable */ + private TileCapBank getTileEntity(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + return (TileCapBank) te; + } + return null; + } - @Override - public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { - return true; - } + protected ForgeDirection getDirForHeading(int heading) { + switch (heading) { + case 0: + return ForgeDirection.values()[2]; + case 1: + return ForgeDirection.values()[5]; + case 2: + return ForgeDirection.values()[3]; + case 3: + default: + return ForgeDirection.values()[4]; + } + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + if (!world.isRemote && (!player.capabilities.isCreativeMode)) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + TileCapBank cb = (TileCapBank) te; + cb.moveInventoryToNetwork(); + } + } + return super.removedByPlayer(world, player, x, y, z, doHarvest); + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if (te != null) { + ((TileCapBank) te).writeCommonNBT(drop.stackTagCompound); + } + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapBank)) { + return; + } + TileCapBank cb = (TileCapBank) te; + cb.onBreakBlock(); + } + super.breakBlock(world, x, y, z, par5, par6); + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapBank)) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + TileCapBank tr = (TileCapBank) te; + ICapBankNetwork network = tr.getNetwork(); + + if (!tr.getType().isMultiblock() || network == null) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (TileCapBank bc : network.getMembers()) { + min.x = Math.min(min.x, bc.xCoord); + max.x = Math.max(max.x, bc.xCoord + 1); + min.y = Math.min(min.y, bc.yCoord); + max.y = Math.max(max.y, bc.yCoord + 1); + min.z = Math.min(min.z, bc.zCoord); + max.z = Math.max(max.z, bc.zCoord + 1); + } + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World w, int x, int y, int z, int side) { + TileEntity te = w.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + return ((TileCapBank) te).getComparatorOutput(); + } + return 0; + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapBank) { + TileCapBank cap = (TileCapBank) te; + if (cap.getNetwork() != null) { + if (world.isRemote && shouldDoWorkThisTick(world, x, y, z, 20)) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(cap)); + } + ICapBankNetwork nw = cap.getNetwork(); + if (world.isRemote) { + ((CapBankClientNetwork) nw).requestPowerUpdate(cap, 2); + } + + if (SpecialTooltipHandler.showAdvancedTooltips()) { + String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + String suffix = + Util.TAB + Util.ALIGNRIGHT + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + tooltip.add(String.format( + "%s : %s%s%s", + EnderIO.lang.localize("capbank.maxIO"), + format, + PowerDisplayUtil.formatPower(nw.getMaxIO()), + suffix)); + tooltip.add(String.format( + "%s : %s%s%s", + EnderIO.lang.localize("capbank.maxIn"), + format, + PowerDisplayUtil.formatPower(nw.getMaxInput()), + suffix)); + tooltip.add(String.format( + "%s : %s%s%s", + EnderIO.lang.localize("capbank.maxOut"), + format, + PowerDisplayUtil.formatPower(nw.getMaxOutput()), + suffix)); + tooltip.add(""); + } + + long stored = nw.getEnergyStoredL(); + long max = nw.getMaxEnergyStoredL(); + tooltip.add(String.format( + "%s%s%s / %s%s%s %s", + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(stored), + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(max), + EnumChatFormatting.RESET, + PowerDisplayUtil.abrevation())); + + int change = Math.round(nw.getAverageChangePerTick()); + String color = EnumChatFormatting.WHITE.toString(); + if (change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if (change < 0) { + color = EnumChatFormatting.RED.toString(); + } + tooltip.add(String.format( + "%s%s%s", + color, PowerDisplayUtil.formatPowerPerTick(change), " " + EnumChatFormatting.RESET.toString())); + } + } + } + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.BIT_DETAILED; + } + + /* IRedstoneConnectable */ + + @Override + public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java index 89cc36ad..d7f01a9d 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java @@ -1,101 +1,98 @@ package crazypants.enderio.machine.capbank; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.power.PowerHandlerUtil; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem { - public static ItemStack createItemStackWithPower(int meta, int storedEnergy) { - ItemStack res = new ItemStack(EnderIO.blockCapBank, 1, meta); - PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); - CapBankType type = CapBankType.getTypeFromMeta(meta); - type.writeTypeToNBT(res.stackTagCompound); - return res; - } - - public BlockItemCapBank() { - super(EnderIO.blockCapBank); - setHasSubtypes(true); - } - - public BlockItemCapBank(Block block) { - super(block); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return CapBankType.getTypeFromMeta(par1ItemStack.getItemDamage()).getUnlocalizedName(); - } - - @Override - public boolean showDurabilityBar(ItemStack itemStack) { - return !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative(); - } - - @Override - public double getDurabilityForDisplay(ItemStack itemStack) { - int maxStored = CapBankType.getTypeFromMeta(itemStack.getItemDamage()).getMaxEnergyStored(); - double stored = maxStored - getEnergyStored(itemStack) + 1; - double max = maxStored + 1; - return stored / max; - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if(container.stackSize > 1) { - return 0; + public static ItemStack createItemStackWithPower(int meta, int storedEnergy) { + ItemStack res = new ItemStack(EnderIO.blockCapBank, 1, meta); + PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); + CapBankType type = CapBankType.getTypeFromMeta(meta); + type.writeTypeToNBT(res.stackTagCompound); + return res; } - CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); - int energy = getEnergyStored(container); - int maxInput = type.getMaxIO(); - int energyReceived = Math.min(type.getMaxEnergyStored() - energy, Math.min(maxReceive, maxInput)); - if(!simulate && !type.isCreative()) { - energy += energyReceived; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); + public BlockItemCapBank() { + super(EnderIO.blockCapBank); + setHasSubtypes(true); } - return energyReceived; - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if(container.stackSize > 1) { - return 0; + public BlockItemCapBank(Block block) { + super(block); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); } - CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); - int energy = getEnergyStored(container); - int maxOutput = type.getMaxIO(); - int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); - if(!simulate && !type.isCreative()) { - energy -= energyExtracted; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); + @Override + public int getMetadata(int par1) { + return par1; } - return energyExtracted; - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return CapBankType.getTypeFromMeta(par1ItemStack.getItemDamage()).getUnlocalizedName(); + } - @Override - public int getEnergyStored(ItemStack container) { - return PowerHandlerUtil.getStoredEnergyForItem(container); - } + @Override + public boolean showDurabilityBar(ItemStack itemStack) { + return !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative(); + } - @Override - public int getMaxEnergyStored(ItemStack container) { - return CapBankType.getTypeFromMeta(container.getItemDamage()).getMaxEnergyStored(); - } + @Override + public double getDurabilityForDisplay(ItemStack itemStack) { + int maxStored = CapBankType.getTypeFromMeta(itemStack.getItemDamage()).getMaxEnergyStored(); + double stored = maxStored - getEnergyStored(itemStack) + 1; + double max = maxStored + 1; + return stored / max; + } + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + if (container.stackSize > 1) { + return 0; + } + CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); + int energy = getEnergyStored(container); + int maxInput = type.getMaxIO(); + int energyReceived = Math.min(type.getMaxEnergyStored() - energy, Math.min(maxReceive, maxInput)); + + if (!simulate && !type.isCreative()) { + energy += energyReceived; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + if (container.stackSize > 1) { + return 0; + } + CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); + int energy = getEnergyStored(container); + int maxOutput = type.getMaxIO(); + int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); + + if (!simulate && !type.isCreative()) { + energy -= energyExtracted; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + return PowerHandlerUtil.getStoredEnergyForItem(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return CapBankType.getTypeFromMeta(container.getItemDamage()).getMaxEnergyStored(); + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index 77c454b5..eacebaad 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -1,152 +1,190 @@ package crazypants.enderio.machine.capbank; +import crazypants.enderio.config.Config; import java.util.ArrayList; import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import crazypants.enderio.config.Config; public class CapBankType { - public static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankTierTwoMaxStorageRF, false, - true, - "enderio:capacitorBank", "enderio:capacitorBankCreativeBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", - "enderio:capacitorBankLocked"); + public static final CapBankType CREATIVE = new CapBankType( + "CREATIVE", + "tile.blockCapBank.creative", + 500000, + Config.capacitorBankTierTwoMaxStorageRF, + false, + true, + "enderio:capacitorBank", + "enderio:capacitorBankCreativeBorder", + "enderio:capacitorBankInput", + "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); - public static final CapBankType SIMPLE = new CapBankType("SIMPLE", "tile.blockCapBank.simple", Config.capacitorBankTierOneMaxIoRF, - Config.capacitorBankTierOneMaxStorageRF, - true, - false, "enderio:capacitorBank", "enderio:capacitorBankSimpleBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", - "enderio:capacitorBankLocked"); + public static final CapBankType SIMPLE = new CapBankType( + "SIMPLE", + "tile.blockCapBank.simple", + Config.capacitorBankTierOneMaxIoRF, + Config.capacitorBankTierOneMaxStorageRF, + true, + false, + "enderio:capacitorBank", + "enderio:capacitorBankSimpleBorder", + "enderio:capacitorBankInput", + "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); - public static final CapBankType ACTIVATED = new CapBankType("ACTIVATED", "tile.blockCapBank.activated", Config.capacitorBankTierTwoMaxIoRF, - Config.capacitorBankTierTwoMaxStorageRF, - true, - false, "enderio:capacitorBank", "enderio:capacitorBankActivatedBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", - "enderio:capacitorBankLocked"); + public static final CapBankType ACTIVATED = new CapBankType( + "ACTIVATED", + "tile.blockCapBank.activated", + Config.capacitorBankTierTwoMaxIoRF, + Config.capacitorBankTierTwoMaxStorageRF, + true, + false, + "enderio:capacitorBank", + "enderio:capacitorBankActivatedBorder", + "enderio:capacitorBankInput", + "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); - public static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankTierThreeMaxIoRF, - Config.capacitorBankTierThreeMaxStorageRF, - true, false, "enderio:capacitorBank", "enderio:capacitorBankVibrantBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", - "enderio:capacitorBankLocked"); + public static final CapBankType VIBRANT = new CapBankType( + "VIBRANT", + "tile.blockCapBank.vibrant", + Config.capacitorBankTierThreeMaxIoRF, + Config.capacitorBankTierThreeMaxStorageRF, + true, + false, + "enderio:capacitorBank", + "enderio:capacitorBankVibrantBorder", + "enderio:capacitorBankInput", + "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); - private static final List TYPES = new ArrayList(); + private static final List TYPES = new ArrayList(); - static { - TYPES.add(CREATIVE); - TYPES.add(SIMPLE); - TYPES.add(ACTIVATED); - TYPES.add(VIBRANT); - } - - public static List types() { - return TYPES; - } - - public static int getMetaFromType(CapBankType type) { - for (int i = 0; i < TYPES.size(); i++) { - if(TYPES.get(i) == type) { - return i; - } + static { + TYPES.add(CREATIVE); + TYPES.add(SIMPLE); + TYPES.add(ACTIVATED); + TYPES.add(VIBRANT); } - return 1; - } - public static CapBankType getTypeFromMeta(int meta) { - meta = MathHelper.clamp_int(meta, 0, TYPES.size() - 1); - return types().get(meta); - } - - public static CapBankType getTypeFromUID(String uid) { - for (CapBankType type : TYPES) { - if(type.uid.equals(uid)) { - return type; - } + public static List types() { + return TYPES; } - return ACTIVATED; - } - private final String uid; - private final String unlocalizedName; - private final int maxIO; - private final int maxStored; - private final boolean isMultiblock; - private final boolean isCreative; - private final String icon; - private final String borderIcon; - private final String inputIcon; - private final String outputIcon; - private final String lockedIcon; - - public CapBankType(String uid, String unlocalizedName, int maxIO, int maxStored, boolean isMultiblock, boolean isCreative, String icon, String borderIcon, - String inputIcon, String outputIcon, String lockedIcon) { - this.uid = uid; - this.unlocalizedName = unlocalizedName; - this.maxIO = maxIO; - this.maxStored = maxStored; - this.isMultiblock = isMultiblock; - this.isCreative = isCreative; - this.icon = icon; - this.borderIcon = borderIcon; - this.inputIcon = inputIcon; - this.outputIcon = outputIcon; - this.lockedIcon = lockedIcon; - } - - public int getMaxIO() { - return maxIO; - } - - public int getMaxEnergyStored() { - return maxStored; - } - - public boolean isMultiblock() { - return isMultiblock; - } - - public boolean isCreative() { - return isCreative; - } - - public String getUnlocalizedName() { - return unlocalizedName; - } - - public String getIcon() { - return icon; - } - - public String getBorderIcon() { - return borderIcon; - } - - public String getInputIcon() { - return inputIcon; - } - - public String getOutputIcon() { - return outputIcon; - } - - public String getLockedIcon() { - return lockedIcon; - } - - public String getUid() { - return uid; - } - - public void writeTypeToNBT(NBTTagCompound nbtRoot) { - nbtRoot.setString("type", getUid()); - } - - public static CapBankType readTypeFromNBT(NBTTagCompound nbtRoot) { - if(nbtRoot == null || !nbtRoot.hasKey("type")) { - return ACTIVATED; + public static int getMetaFromType(CapBankType type) { + for (int i = 0; i < TYPES.size(); i++) { + if (TYPES.get(i) == type) { + return i; + } + } + return 1; } - return getTypeFromUID(nbtRoot.getString("type")); - } + public static CapBankType getTypeFromMeta(int meta) { + meta = MathHelper.clamp_int(meta, 0, TYPES.size() - 1); + return types().get(meta); + } + + public static CapBankType getTypeFromUID(String uid) { + for (CapBankType type : TYPES) { + if (type.uid.equals(uid)) { + return type; + } + } + return ACTIVATED; + } + + private final String uid; + private final String unlocalizedName; + private final int maxIO; + private final int maxStored; + private final boolean isMultiblock; + private final boolean isCreative; + private final String icon; + private final String borderIcon; + private final String inputIcon; + private final String outputIcon; + private final String lockedIcon; + + public CapBankType( + String uid, + String unlocalizedName, + int maxIO, + int maxStored, + boolean isMultiblock, + boolean isCreative, + String icon, + String borderIcon, + String inputIcon, + String outputIcon, + String lockedIcon) { + this.uid = uid; + this.unlocalizedName = unlocalizedName; + this.maxIO = maxIO; + this.maxStored = maxStored; + this.isMultiblock = isMultiblock; + this.isCreative = isCreative; + this.icon = icon; + this.borderIcon = borderIcon; + this.inputIcon = inputIcon; + this.outputIcon = outputIcon; + this.lockedIcon = lockedIcon; + } + + public int getMaxIO() { + return maxIO; + } + + public int getMaxEnergyStored() { + return maxStored; + } + + public boolean isMultiblock() { + return isMultiblock; + } + + public boolean isCreative() { + return isCreative; + } + + public String getUnlocalizedName() { + return unlocalizedName; + } + + public String getIcon() { + return icon; + } + + public String getBorderIcon() { + return borderIcon; + } + + public String getInputIcon() { + return inputIcon; + } + + public String getOutputIcon() { + return outputIcon; + } + + public String getLockedIcon() { + return lockedIcon; + } + + public String getUid() { + return uid; + } + + public void writeTypeToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setString("type", getUid()); + } + + public static CapBankType readTypeFromNBT(NBTTagCompound nbtRoot) { + if (nbtRoot == null || !nbtRoot.hasKey("type")) { + return ACTIVATED; + } + return getTypeFromUID(nbtRoot.getString("type")); + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java index 8cbba552..824b82f9 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java @@ -1,7 +1,12 @@ package crazypants.enderio.machine.capbank; +import com.enderio.core.common.ContainerEnder; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.capbank.network.InventoryImpl; +import crazypants.util.BaublesUtil; +import crazypants.util.ShadowInventory; import java.awt.Point; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -10,230 +15,226 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.enderio.core.common.ContainerEnder; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.capbank.network.InventoryImpl; -import crazypants.util.BaublesUtil; -import crazypants.util.ShadowInventory; - public class ContainerCapBank extends ContainerEnder { - private InventoryImpl inv; + private InventoryImpl inv; - // Note: Modifying the Baubles inventory on the client side of an integrated - // server is a bad idea because Baubles actually shares the object between - // server and client. However, by not doing so, we prevent the callback hooks - // to be called in the client thread. It doesn't seem to matter now, but if we - // ever get reports of problems, we need to find a solution to synthesize - // these calls. - // In a multiplayer client this works well, but we need to prevent Baubles - // from calling those callbacks when the server syncs the slot contents to the - // client (packet 30) initially. They are still called every time the server - // updates the slots (which is wrong), but the original Baubles inventory - // works this way, so... - private IInventory baubles; + // Note: Modifying the Baubles inventory on the client side of an integrated + // server is a bad idea because Baubles actually shares the object between + // server and client. However, by not doing so, we prevent the callback hooks + // to be called in the client thread. It doesn't seem to matter now, but if we + // ever get reports of problems, we need to find a solution to synthesize + // these calls. + // In a multiplayer client this works well, but we need to prevent Baubles + // from calling those callbacks when the server syncs the slot contents to the + // client (packet 30) initially. They are still called every time the server + // updates the slots (which is wrong), but the original Baubles inventory + // works this way, so... + private IInventory baubles; - public ContainerCapBank(InventoryPlayer playerInv, TileCapBank cb) { - super(playerInv, cb); - } - - public boolean hasBaublesSlots() { - return baubles != null; - } - - @Override - protected void addSlots(final InventoryPlayer playerInv) { - if(getInv().getNetwork() != null && getInv().getNetwork().getInventory() != null) { - inv = getInv().getNetwork().getInventory(); - } else { - inv = new InventoryImpl(); + public ContainerCapBank(InventoryPlayer playerInv, TileCapBank cb) { + super(playerInv, cb); } - baubles = BaublesUtil.instance().getBaubles(playerInv.player); - - if (baubles != null && BaublesUtil.WhoAmI.whoAmI(playerInv.player.worldObj) == BaublesUtil.WhoAmI.SPCLIENT) { - baubles = new ShadowInventory(baubles); - } - - int armorOffset = 21; - for(int i = 0; i < 4; i++) { - addSlotToContainer(new SlotImpl(inv, i, 59 + armorOffset + i*20, 59)); - } - - //armor slots - for (int i = 0; i < 4; ++i) { - final int k = i; - addSlotToContainer(new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 12 + i * 18) { - - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - if(par1ItemStack == null) { - return false; - } - return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, playerInv.player); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getBackgroundIconIndex() { - return ItemArmor.func_94602_b(k); - } - }); - } - - if (hasBaublesSlots()) { - for (int i = 0; i < baubles.getSizeInventory(); i++) { - addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack); - } - }); - } - } - } - - public void updateInventory() { - if(getInv().getNetwork() != null && getInv().getNetwork().getInventory() != null) { - inv.setCapBank(getInv().getNetwork().getInventory().getCapBank()); - } - } - - @Override - public Point getPlayerInventoryOffset() { - Point p = super.getPlayerInventoryOffset(); - p.translate(21, 0); - return p; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - - int startPlayerSlot = 4; - int endPlayerSlot = startPlayerSlot + 26; - int startHotBarSlot = endPlayerSlot + 1; - int endHotBarSlot = startHotBarSlot + 9; - int startBaublesSlot = endHotBarSlot + 1; - int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory(); - - ItemStack copystack = null; - Slot slot = (Slot) inventorySlots.get(slotIndex); - if(slot != null && slot.getHasStack()) { - - ItemStack origStack = slot.getStack(); - copystack = origStack.copy(); - - // Note: Merging into Baubles slots is disabled because the used vanilla - // merge method does not check if the item can go into the slot or not. - - if(slotIndex < 4) { - // merge from machine input slots to inventory - if (!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex) - && /* - * !(baubles != null && mergeItemStack(origStack, - * startBaublesSlot, endBaublesSlot, false)) && - */!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { - return null; - } - - } else { - //Check from inv-> charge then inv->hotbar or hotbar->inv - if(slotIndex >= startPlayerSlot) { - if(!inv.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { - - if(slotIndex <= endPlayerSlot) { - if (/* - * !(baubles != null && mergeItemStack(origStack, - * startBaublesSlot, endBaublesSlot, false)) && - */!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { - return null; - } - } else if(slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { - if (/* - * !(baubles != null && mergeItemStack(origStack, - * startBaublesSlot, endBaublesSlot, false)) && - */!mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { - return null; - } - } else if (slotIndex >= startBaublesSlot && slotIndex <= endBaublesSlot) { - if(!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false) && - !mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { - return null; - } - } - - } - } - } - - if(origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - slot.onSlotChanged(); - - if(origStack.stackSize == copystack.stackSize) { - return null; - } - - slot.onPickupFromSlot(entityPlayer, origStack); - } - - return copystack; - } - - private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { - if(origStack == null || !(origStack.getItem() instanceof ItemArmor)) { - return false; - } - ItemArmor armor = (ItemArmor) origStack.getItem(); - int index = 3 - armor.armorType; - ItemStack[] ai = entityPlayer.inventory.armorInventory; - if(ai[index] == null) { - ai[index] = origStack.copy(); - origStack.stackSize = 0; - return true; - } - return false; - } - - private static class SlotImpl extends Slot { - public SlotImpl(IInventory inv, int idx, int x, int y) { - super(inv, idx, x, y); + public boolean hasBaublesSlots() { + return baubles != null; } @Override - public boolean isItemValid(ItemStack itemStack) { - return inventory.isItemValidForSlot(getSlotIndex(), itemStack); - } - } + protected void addSlots(final InventoryPlayer playerInv) { + if (getInv().getNetwork() != null && getInv().getNetwork().getInventory() != null) { + inv = getInv().getNetwork().getInventory(); + } else { + inv = new InventoryImpl(); + } - /** - * called when the content of slots is synced from the server to the client - * (packet 30) - */ - @Override - @SideOnly(Side.CLIENT) - public void putStacksInSlots(ItemStack[] p_75131_1_) { - if (hasBaublesSlots() && BaublesUtil.WhoAmI.whoAmI(getInv().getWorldObj()) == BaublesUtil.WhoAmI.MPCLIENT) { - try { - BaublesUtil.instance().disableCallbacks(baubles, true); - super.putStacksInSlots(p_75131_1_); - } finally { - BaublesUtil.instance().disableCallbacks(baubles, false); - } - } else { - super.putStacksInSlots(p_75131_1_); - } - } + baubles = BaublesUtil.instance().getBaubles(playerInv.player); + if (baubles != null && BaublesUtil.WhoAmI.whoAmI(playerInv.player.worldObj) == BaublesUtil.WhoAmI.SPCLIENT) { + baubles = new ShadowInventory(baubles); + } + + int armorOffset = 21; + for (int i = 0; i < 4; i++) { + addSlotToContainer(new SlotImpl(inv, i, 59 + armorOffset + i * 20, 59)); + } + + // armor slots + for (int i = 0; i < 4; ++i) { + final int k = i; + addSlotToContainer( + new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 12 + i * 18) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + if (par1ItemStack == null) { + return false; + } + return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, playerInv.player); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + return ItemArmor.func_94602_b(k); + } + }); + } + + if (hasBaublesSlots()) { + for (int i = 0; i < baubles.getSizeInventory(); i++) { + addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack); + } + }); + } + } + } + + public void updateInventory() { + if (getInv().getNetwork() != null && getInv().getNetwork().getInventory() != null) { + inv.setCapBank(getInv().getNetwork().getInventory().getCapBank()); + } + } + + @Override + public Point getPlayerInventoryOffset() { + Point p = super.getPlayerInventoryOffset(); + p.translate(21, 0); + return p; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + + int startPlayerSlot = 4; + int endPlayerSlot = startPlayerSlot + 26; + int startHotBarSlot = endPlayerSlot + 1; + int endHotBarSlot = startHotBarSlot + 9; + int startBaublesSlot = endHotBarSlot + 1; + int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory(); + + ItemStack copystack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { + + ItemStack origStack = slot.getStack(); + copystack = origStack.copy(); + + // Note: Merging into Baubles slots is disabled because the used vanilla + // merge method does not check if the item can go into the slot or not. + + if (slotIndex < 4) { + // merge from machine input slots to inventory + if (!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex) + && /* + * !(baubles != null && mergeItemStack(origStack, + * startBaublesSlot, endBaublesSlot, false)) && + */ !mergeItemStack( + origStack, startPlayerSlot, endHotBarSlot, false)) { + return null; + } + + } else { + // Check from inv-> charge then inv->hotbar or hotbar->inv + if (slotIndex >= startPlayerSlot) { + if (!inv.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { + + if (slotIndex <= endPlayerSlot) { + if ( + /* + * !(baubles != null && mergeItemStack(origStack, + * startBaublesSlot, endBaublesSlot, false)) && + */ !mergeItemStack( + origStack, startHotBarSlot, endHotBarSlot, false)) { + return null; + } + } else if (slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { + if ( + /* + * !(baubles != null && mergeItemStack(origStack, + * startBaublesSlot, endBaublesSlot, false)) && + */ !mergeItemStack( + origStack, startPlayerSlot, endPlayerSlot, false)) { + return null; + } + } else if (slotIndex >= startBaublesSlot && slotIndex <= endBaublesSlot) { + if (!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false) + && !mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { + return null; + } + } + } + } + } + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + slot.onSlotChanged(); + + if (origStack.stackSize == copystack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return copystack; + } + + private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { + if (origStack == null || !(origStack.getItem() instanceof ItemArmor)) { + return false; + } + ItemArmor armor = (ItemArmor) origStack.getItem(); + int index = 3 - armor.armorType; + ItemStack[] ai = entityPlayer.inventory.armorInventory; + if (ai[index] == null) { + ai[index] = origStack.copy(); + origStack.stackSize = 0; + return true; + } + return false; + } + + private static class SlotImpl extends Slot { + public SlotImpl(IInventory inv, int idx, int x, int y) { + super(inv, idx, x, y); + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + return inventory.isItemValidForSlot(getSlotIndex(), itemStack); + } + } + + /** + * called when the content of slots is synced from the server to the client + * (packet 30) + */ + @Override + @SideOnly(Side.CLIENT) + public void putStacksInSlots(ItemStack[] p_75131_1_) { + if (hasBaublesSlots() && BaublesUtil.WhoAmI.whoAmI(getInv().getWorldObj()) == BaublesUtil.WhoAmI.MPCLIENT) { + try { + BaublesUtil.instance().disableCallbacks(baubles, true); + super.putStacksInSlots(p_75131_1_); + } finally { + BaublesUtil.instance().disableCallbacks(baubles, false); + } + } else { + super.putStacksInSlots(p_75131_1_); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java b/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java index 02604b34..d48086a6 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java +++ b/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.capbank; +import crazypants.enderio.EnderIO; +import crazypants.enderio.power.PowerHandlerUtil; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -7,57 +9,57 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import crazypants.enderio.EnderIO; -import crazypants.enderio.power.PowerHandlerUtil; public class ConvertOldRecipe implements IRecipe { - static { - RecipeSorter.register("EnderIO:convertOldCapBankRecipe", ConvertOldRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); - } - - private ItemStack output; - - @Override - public boolean matches(InventoryCrafting inv, World world) { - ItemStack input = null; - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack checkStack = inv.getStackInSlot(i); - if(checkStack != null) { - if(input != null) { - return false; - } - if(Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) { - input = checkStack; - } else { - return false; - } - } + static { + RecipeSorter.register( + "EnderIO:convertOldCapBankRecipe", + ConvertOldRecipe.class, + Category.SHAPELESS, + "after:minecraft:shapeless"); } - if(input == null) { - return false; + private ItemStack output; + + @Override + public boolean matches(InventoryCrafting inv, World world) { + ItemStack input = null; + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack checkStack = inv.getStackInSlot(i); + if (checkStack != null) { + if (input != null) { + return false; + } + if (Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) { + input = checkStack; + } else { + return false; + } + } + } + + if (input == null) { + return false; + } + + output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); + PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input)); + return true; } - output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); - PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input)); - return true; + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + return output.copy(); + } - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - return output.copy(); - } - - @Override - public int getRecipeSize() { - return 1; - } - - @Override - public ItemStack getRecipeOutput() { - return output; - } + @Override + public int getRecipeSize() { + return 1; + } + @Override + public ItemStack getRecipeOutput() { + return output; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 0e17c8bc..5e7be9cf 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -1,24 +1,9 @@ package crazypants.enderio.machine.capbank; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.EnumChatFormatting; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.VecmathUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.RedstoneModeButton; @@ -33,338 +18,346 @@ import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; +import org.lwjgl.opengl.GL11; public class GuiCapBank extends GuiContainerBaseEIO { - private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1); + private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1); - protected static final int INPUT_BUTTON_ID = 18; - protected static final int OUTPUT_BUTTON_ID = 37; + protected static final int INPUT_BUTTON_ID = 18; + protected static final int OUTPUT_BUTTON_ID = 37; - protected static final int CONFIG_ID = 377996104; + protected static final int CONFIG_ID = 377996104; - private static final int POWER_X = 11 + 18; - private static final int POWER_Y = 9; - private static final int POWER_WIDTH = 10; - private static final int POWER_HEIGHT = 68; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + private static final int POWER_X = 11 + 18; + private static final int POWER_Y = 9; + private static final int POWER_WIDTH = 10; + private static final int POWER_HEIGHT = 68; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - private int inputX = 78 + 24; - private int inputY = 18; + private int inputX = 78 + 24; + private int inputY = 18; - private int outputX = 78 + 24; - private int outputY = 36; + private int outputX = 78 + 24; + private int outputY = 36; - private int rightMargin = 8 + 24; + private int rightMargin = 8 + 24; - private final TileCapBank capBank; + private final TileCapBank capBank; - private RedstoneModeButton inputRsButton; - private RedstoneModeButton outputRsButton; + private RedstoneModeButton inputRsButton; + private RedstoneModeButton outputRsButton; - private TextFieldEnder maxInputTF; - private TextFieldEnder maxOutputTF; + private TextFieldEnder maxInputTF; + private TextFieldEnder maxOutputTF; - private final GuiOverlayIoConfig configOverlay; - private final GuiButtonIoConfig configB; + private final GuiOverlayIoConfig configOverlay; + private final GuiButtonIoConfig configB; - private CapBankClientNetwork network; + private CapBankClientNetwork network; - private int initialStateCount = -1; - private boolean initState = true; + private int initialStateCount = -1; + private boolean initState = true; - private final ContainerCapBank container; + private final ContainerCapBank container; - public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) { - super(new ContainerCapBank(playerInv, te), "capacitorBank"); - capBank = te; - container = (ContainerCapBank) inventorySlots; + public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) { + super(new ContainerCapBank(playerInv, te), "capacitorBank"); + capBank = te; + container = (ContainerCapBank) inventorySlots; - updateState(); + updateState(); - xSize = 176 + 42; + xSize = 176 + 42; - addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { - @Override - protected void updateText() { - text.clear(); - text.add(PowerDisplayUtil.formatPower(network.getEnergyStoredL()) + " " + PowerDisplayUtil.ofStr()); - text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStoredL()) + " " + EnumChatFormatting.GRAY - + PowerDisplayUtil.abrevation()); + @Override + protected void updateText() { + text.clear(); + text.add(PowerDisplayUtil.formatPower(network.getEnergyStoredL()) + " " + PowerDisplayUtil.ofStr()); + text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStoredL()) + " " + + EnumChatFormatting.GRAY + PowerDisplayUtil.abrevation()); - float change = network.getAverageChangePerTick(); - String color = EnumChatFormatting.WHITE.toString(); - if(change > 0) { - color = EnumChatFormatting.GREEN.toString() + "+"; - } else if(change < 0) { - color = EnumChatFormatting.RED.toString(); + float change = network.getAverageChangePerTick(); + String color = EnumChatFormatting.WHITE.toString(); + if (change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if (change < 0) { + color = EnumChatFormatting.RED.toString(); + } + text.add(String.format( + "%s%s%s" + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(), + color, + PowerDisplayUtil.formatPower(Math.round(change)), + " " + EnumChatFormatting.GRAY.toString())); + } + }); + + int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; + int y = inputY; + inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + network.setInputControlMode(mode); + sendUpdateToServer(); + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + return network.getInputControlMode(); + } + }); + inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); + + y += 18; + outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + network.setOutputControlMode(mode); + sendUpdateToServer(); + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + return network.getOutputControlMode(); + } + }); + outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); + + List coords = new ArrayList(); + if (network != null && network.getMembers().size() < 200) { + for (TileCapBank cb : network.getMembers()) { + coords.add(cb.getLocation()); + } } - text.add(String.format("%s%s%s" + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(), color, - PowerDisplayUtil.formatPower(Math.round(change)), " " - + EnumChatFormatting.GRAY.toString())); - } - - }); - - int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; - int y = inputY; - inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - network.setInputControlMode(mode); - sendUpdateToServer(); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return network.getInputControlMode(); - } - }); - inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); - - y += 18; - outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - network.setOutputControlMode(mode); - sendUpdateToServer(); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return network.getOutputControlMode(); - } - }); - outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); - - List coords = new ArrayList(); - if(network != null && network.getMembers().size() < 200) { - for (TileCapBank cb : network.getMembers()) { - coords.add(cb.getLocation()); - } - } - if(coords.isEmpty()) { - coords.add(te.getLocation()); - } - - - configOverlay = new GuiOverlayIoConfig(coords) { - @Override - protected String getLabelForMode(IoMode mode) { - if(mode == IoMode.PUSH) { - return EnderIO.lang.localize("gui.capBank.outputMode"); - } else if(mode == IoMode.PULL) { - return EnderIO.lang.localize("gui.capBank.inputMode"); + if (coords.isEmpty()) { + coords.add(te.getLocation()); } - return super.getLabelForMode(mode); - } - }; - addOverlay(configOverlay); - y += 20; - configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, te, configOverlay); - - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - - x = inputX - 24; - y = inputY; - maxInputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); - maxInputTF.setMaxStringLength(10); - maxInputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); - - x = outputX - 24; - y = outputY; - maxOutputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); - maxOutputTF.setMaxStringLength(10); - maxOutputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); + configOverlay = new GuiOverlayIoConfig(coords) { + @Override + protected String getLabelForMode(IoMode mode) { + if (mode == IoMode.PUSH) { + return EnderIO.lang.localize("gui.capBank.outputMode"); + } else if (mode == IoMode.PULL) { + return EnderIO.lang.localize("gui.capBank.inputMode"); + } + return super.getLabelForMode(mode); + } + }; + addOverlay(configOverlay); - textFields.add(maxInputTF); - textFields.add(maxOutputTF); - } + y += 20; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, te, configOverlay); - @Override - public void initGui() { - super.initGui(); + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - configB.onGuiInit(); + x = inputX - 24; + y = inputY; + maxInputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); + maxInputTF.setMaxStringLength(10); + maxInputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); - inputRsButton.onGuiInit(); - outputRsButton.onGuiInit(); - } + x = outputX - 24; + y = outputY; + maxOutputTF = new TextFieldEnder(fontRenderer, x, y, 68, 16); + maxOutputTF.setMaxStringLength(10); + maxOutputTF.setCharFilter(TextFieldEnder.FILTER_NUMERIC); - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - updateInputOutput(); - } - - private void updateInputOutput() { - int input = PowerDisplayUtil.parsePower(maxInputTF); - if(input >= 0 && network.getMaxInput() != input) { - setMaxInput(input); - } - int output = PowerDisplayUtil.parsePower(maxOutputTF); - if(output >= 0 && network.getMaxOutput() != output) { - setMaxOutput(output); - } - } - - private void setMaxOutput(int output) { - if(output != network.getMaxOutput()) { - network.setMaxOutput(output); - maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); - sendUpdateToServer(); - } - } - - private void setMaxInput(int input) { - if(input != network.getMaxInput()) { - network.setMaxInput(input); - maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); - sendUpdateToServer(); - } - } - - protected void sendUpdateToServer() { - if(network != NULL_NETWORK) { - PacketHandler.INSTANCE.sendToServer(new PacketGuiChange(capBank)); - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - - requestStateUpdate(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize - 21, ySize); - - if (container.hasBaublesSlots()) { - drawTexturedModalRect(sx, sy + 83, 197, 83, 24, 77); - } - - int i1 = getEnergyStoredScaled(POWER_HEIGHT); - drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) buttonList.get(i); - guibutton.drawButton(mc, 0, 0); + textFields.add(maxInputTF); + textFields.add(maxOutputTF); } - int midX = sx + xSize / 2; + @Override + public void initGui() { + super.initGui(); - String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(network.getMaxIO()) + - " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - FontRenderer fontRenderer = getFontRenderer(); - int swid = fontRenderer.getStringWidth(str); - int x = midX - swid / 2; - int y = guiTop + 5; + configB.onGuiInit(); - drawString(fontRenderer, str, x, y, -1); - - str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + inputX - swid - 3; - y = guiTop + inputY + 2; - drawString(fontRenderer, str, x, y, -1); - - str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + outputX - swid - 3; - y = guiTop + outputY + 2; - drawString(fontRenderer, str, x, y, -1); - - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - - @SuppressWarnings("rawtypes") - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - super.drawHoveringText(par1List, par2 + 24, par3, font); - GL11.glPopAttrib(); - GL11.glPopAttrib(); - } - - @Override - public int getGuiLeft() { - return guiLeft + 24; - } - - @Override - public int getGuiTop() { - return guiTop; - } - - @Override - public int getXSize() { - return xSize - 42; - } - - @Override - public int getOverlayOffsetX() { - return 21; - } - - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } - - private int getEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * network.getEnergyStoredRatio()), 0, scale); - } - - private void requestStateUpdate() { - if(EnderIO.proxy.getTickCount() % 2 == 0) { - if(!updateState()) { - network.requestPowerUpdate(capBank, 2); - } - } - } - - private boolean updateState() { - if(!initState) { - return false; + inputRsButton.onGuiInit(); + outputRsButton.onGuiInit(); } - if(capBank.getNetwork() == null) { - network = NULL_NETWORK; - return true; + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + updateInputOutput(); } - if(network == null || network == NULL_NETWORK) { - network = (CapBankClientNetwork) capBank.getNetwork(); - initialStateCount = network.getStateUpdateCount(); - PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); - return true; - } - if(network.getStateUpdateCount() == initialStateCount) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); - return true; - } - if(network.getStateUpdateCount() > initialStateCount) { - container.updateInventory(); - updateFieldsFromState(); - initState = false; - return true; - } - return false; - } - private void updateFieldsFromState() { - maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); - maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); - inputRsButton.setMode(network.getInputControlMode()); - outputRsButton.setMode(network.getOutputControlMode()); - } + private void updateInputOutput() { + int input = PowerDisplayUtil.parsePower(maxInputTF); + if (input >= 0 && network.getMaxInput() != input) { + setMaxInput(input); + } + int output = PowerDisplayUtil.parsePower(maxOutputTF); + if (output >= 0 && network.getMaxOutput() != output) { + setMaxOutput(output); + } + } + private void setMaxOutput(int output) { + if (output != network.getMaxOutput()) { + network.setMaxOutput(output); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); + sendUpdateToServer(); + } + } + private void setMaxInput(int input) { + if (input != network.getMaxInput()) { + network.setMaxInput(input); + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); + sendUpdateToServer(); + } + } + + protected void sendUpdateToServer() { + if (network != NULL_NETWORK) { + PacketHandler.INSTANCE.sendToServer(new PacketGuiChange(capBank)); + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + + requestStateUpdate(); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize - 21, ySize); + + if (container.hasBaublesSlots()) { + drawTexturedModalRect(sx, sy + 83, 197, 83, 24, 77); + } + + int i1 = getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) buttonList.get(i); + guibutton.drawButton(mc, 0, 0); + } + + int midX = sx + xSize / 2; + + String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(network.getMaxIO()) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + FontRenderer fontRenderer = getFontRenderer(); + int swid = fontRenderer.getStringWidth(str); + int x = midX - swid / 2; + int y = guiTop + 5; + + drawString(fontRenderer, str, x, y, -1); + + str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + inputX - swid - 3; + y = guiTop + inputY + 2; + drawString(fontRenderer, str, x, y, -1); + + str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + outputX - swid - 3; + y = guiTop + outputY + 2; + drawString(fontRenderer, str, x, y, -1); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + @SuppressWarnings("rawtypes") + @Override + public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + super.drawHoveringText(par1List, par2 + 24, par3, font); + GL11.glPopAttrib(); + GL11.glPopAttrib(); + } + + @Override + public int getGuiLeft() { + return guiLeft + 24; + } + + @Override + public int getGuiTop() { + return guiTop; + } + + @Override + public int getXSize() { + return xSize - 42; + } + + @Override + public int getOverlayOffsetX() { + return 21; + } + + @Override + public FontRenderer getFontRenderer() { + return Minecraft.getMinecraft().fontRenderer; + } + + private int getEnergyStoredScaled(int scale) { + return (int) VecmathUtil.clamp(Math.round(scale * network.getEnergyStoredRatio()), 0, scale); + } + + private void requestStateUpdate() { + if (EnderIO.proxy.getTickCount() % 2 == 0) { + if (!updateState()) { + network.requestPowerUpdate(capBank, 2); + } + } + } + + private boolean updateState() { + if (!initState) { + return false; + } + + if (capBank.getNetwork() == null) { + network = NULL_NETWORK; + return true; + } + if (network == null || network == NULL_NETWORK) { + network = (CapBankClientNetwork) capBank.getNetwork(); + initialStateCount = network.getStateUpdateCount(); + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); + return true; + } + if (network.getStateUpdateCount() == initialStateCount) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); + return true; + } + if (network.getStateUpdateCount() > initialStateCount) { + container.updateInventory(); + updateFieldsFromState(); + initState = false; + return true; + } + return false; + } + + private void updateFieldsFromState() { + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); + inputRsButton.setMode(network.getInputControlMode()); + outputRsButton.setMode(network.getOutputControlMode()); + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java index fcd0ac97..a5ce0479 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java @@ -1,19 +1,16 @@ package crazypants.enderio.machine.capbank; - public enum InfoDisplayType { + NONE, + LEVEL_BAR, + IO; - NONE, - LEVEL_BAR, - IO; - - public InfoDisplayType next() { - int ord = ordinal(); - ++ord; - if(ord >= values().length) { - ord = 0; + public InfoDisplayType next() { + int ord = ordinal(); + ++ord; + if (ord >= values().length) { + ord = 0; + } + return values()[ord]; } - return values()[ord]; - } - } diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 9149401b..37de270f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -1,29 +1,10 @@ package crazypants.enderio.machine.capbank; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.EntityUtil; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -44,890 +25,905 @@ import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class TileCapBank extends TileEntityEio implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage { +public class TileCapBank extends TileEntityEio + implements IInternalPowerReceiver, IInventory, IIoConfigurable, IPowerStorage { - private Map faceModes; - private Map faceDisplayTypes; + private Map faceModes; + private Map faceDisplayTypes; - private CapBankType type; + private CapBankType type; - private int energyStored; - private int maxInput = -1; - private int maxOutput = -1; + private int energyStored; + private int maxInput = -1; + private int maxOutput = -1; - private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; - private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; - private boolean redstoneStateDirty = true; - private boolean isRecievingRedstoneSignal; + private boolean redstoneStateDirty = true; + private boolean isRecievingRedstoneSignal; - private final List receptors = new ArrayList(); - private boolean receptorsDirty = true; + private final List receptors = new ArrayList(); + private boolean receptorsDirty = true; - private ICapBankNetwork network; + private ICapBankNetwork network; - private final ItemStack[] inventory; + private final ItemStack[] inventory; - public TileCapBank() { - inventory = new ItemStack[4]; - } - - //Client side refernce to look up network state - private int networkId = -1; - private int idRequestTimer = 0; - - private boolean dropItems; - private boolean displayTypesDirty; - private boolean revalidateDisplayTypes; - private int lastComparatorState; - - public CapBankType getType() { - if(type == null) { - type = CapBankType.getTypeFromMeta(getBlockMetadata()); + public TileCapBank() { + inventory = new ItemStack[4]; } - return type; - } - public void onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - revalidateDisplayTypes = true; - // directly call updateReceptors() to work around issue #1433 - updateReceptors(); - } + // Client side refernce to look up network state + private int networkId = -1; + private int idRequestTimer = 0; - //---------- Multiblock + private boolean dropItems; + private boolean displayTypesDirty; + private boolean revalidateDisplayTypes; + private int lastComparatorState; - @SideOnly(Side.CLIENT) - public void setNetworkId(int networkId) { - this.networkId = networkId; - if(networkId != -1) { - ClientNetworkManager.getInstance().addToNetwork(networkId, this); - } - } - - @SideOnly(Side.CLIENT) - public int getNetworkId() { - return networkId; - } - - public ICapBankNetwork getNetwork() { - return network; - } - - public boolean setNetwork(ICapBankNetwork network) { - this.network = network; - return true; - } - - public boolean canConnectTo(TileCapBank cap) { - CapBankType t = getType(); - return t.isMultiblock() && t.getUid().equals(cap.getType().getUid()); - } - - @Override - public void onChunkUnload() { - if(network != null) { - network.destroyNetwork(); - } - } - - @Override - public void invalidate() { - super.invalidate(); - if(network != null) { - network.destroyNetwork(); - } - } - - public void moveInventoryToNetwork() { - if(network == null) { - return; - } - if(network.getInventory().getCapBank() == this && !InventoryImpl.isInventoryEmtpy(inventory)) { - for (TileCapBank cb : network.getMembers()) { - if(cb != this) { - for (int i = 0; i < inventory.length; i++) { - cb.inventory[i] = inventory[i]; - inventory[i] = null; - } - network.getInventory().setCapBank(cb); - break; + public CapBankType getType() { + if (type == null) { + type = CapBankType.getTypeFromMeta(getBlockMetadata()); } - } + return type; } - } - public void onBreakBlock() { - //If we are holding the networks inventory when we care broken, tranfer it to another member of the network - moveInventoryToNetwork(); - } + public void onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + revalidateDisplayTypes = true; + // directly call updateReceptors() to work around issue #1433 + updateReceptors(); + } - @Override - public void doUpdate() { - if(worldObj.isRemote) { - if(networkId == -1) { - if(idRequestTimer <= 0) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkIdRequest(this)); - idRequestTimer = 5; + // ---------- Multiblock + + @SideOnly(Side.CLIENT) + public void setNetworkId(int networkId) { + this.networkId = networkId; + if (networkId != -1) { + ClientNetworkManager.getInstance().addToNetwork(networkId, this); + } + } + + @SideOnly(Side.CLIENT) + public int getNetworkId() { + return networkId; + } + + public ICapBankNetwork getNetwork() { + return network; + } + + public boolean setNetwork(ICapBankNetwork network) { + this.network = network; + return true; + } + + public boolean canConnectTo(TileCapBank cap) { + CapBankType t = getType(); + return t.isMultiblock() && t.getUid().equals(cap.getType().getUid()); + } + + @Override + public void onChunkUnload() { + if (network != null) { + network.destroyNetwork(); + } + } + + @Override + public void invalidate() { + super.invalidate(); + if (network != null) { + network.destroyNetwork(); + } + } + + public void moveInventoryToNetwork() { + if (network == null) { + return; + } + if (network.getInventory().getCapBank() == this && !InventoryImpl.isInventoryEmtpy(inventory)) { + for (TileCapBank cb : network.getMembers()) { + if (cb != this) { + for (int i = 0; i < inventory.length; i++) { + cb.inventory[i] = inventory[i]; + inventory[i] = null; + } + network.getInventory().setCapBank(cb); + break; + } + } + } + } + + public void onBreakBlock() { + // If we are holding the networks inventory when we care broken, tranfer it to another member of the network + moveInventoryToNetwork(); + } + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + if (networkId == -1) { + if (idRequestTimer <= 0) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkIdRequest(this)); + idRequestTimer = 5; + } else { + --idRequestTimer; + } + } + return; + } + updateNetwork(worldObj); + if (network == null) { + return; + } + + if (redstoneStateDirty) { + int sig = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + boolean recievingSignal = sig > 0; + network.updateRedstoneSignal(this, recievingSignal); + redstoneStateDirty = false; + } + + if (receptorsDirty) { + updateReceptors(); + } + if (revalidateDisplayTypes) { + validateDisplayTypes(); + revalidateDisplayTypes = false; + } + if (displayTypesDirty) { + displayTypesDirty = false; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + // update any comparators, since they don't check themselves + int comparatorState = getComparatorOutput(); + if (lastComparatorState != comparatorState) { + worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); + lastComparatorState = comparatorState; + } + + doDropItems(); + } + + private void updateNetwork(World world) { + if (getNetwork() == null) { + NetworkUtil.ensureValidNetwork(this); + } + if (getNetwork() != null) { + getNetwork().onUpdateEntity(this); + } + } + + // ---------- IO + + @Override + public IoMode toggleIoModeForFace(ForgeDirection faceHit) { + IPowerInterface rec = getReceptorForFace(faceHit); + IoMode curMode = getIoMode(faceHit); + if (curMode == IoMode.PULL) { + setIoMode(faceHit, IoMode.PUSH, true); + return IoMode.PUSH; + } + if (curMode == IoMode.PUSH) { + setIoMode(faceHit, IoMode.DISABLED, true); + return IoMode.DISABLED; + } + if (curMode == IoMode.DISABLED) { + if (rec == null || rec.getDelegate() instanceof IConduitBundle) { + setIoMode(faceHit, IoMode.NONE, true); + return IoMode.NONE; + } + } + setIoMode(faceHit, IoMode.PULL, true); + return IoMode.PULL; + } + + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + IPowerInterface rec = getReceptorForFace(faceHit); + if (mode == IoMode.NONE) { + return rec == null || rec.getDelegate() instanceof IConduitBundle; + } + return true; + } + + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) { + setIoMode(faceHit, mode, true); + } + + public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { + if (mode == IoMode.NONE) { + if (faceModes == null) { + return; + } + faceModes.remove(faceHit); + if (faceModes.isEmpty()) { + faceModes = null; + } } else { - --idRequestTimer; + if (faceModes == null) { + faceModes = new EnumMap(ForgeDirection.class); + } + faceModes.put(faceHit, mode); } - } - return; - } - updateNetwork(worldObj); - if(network == null) { - return; - } - - if(redstoneStateDirty) { - int sig = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); - boolean recievingSignal = sig > 0; - network.updateRedstoneSignal(this, recievingSignal); - redstoneStateDirty = false; - } - - if(receptorsDirty) { - updateReceptors(); - } - if(revalidateDisplayTypes) { - validateDisplayTypes(); - revalidateDisplayTypes = false; - } - if(displayTypesDirty) { - displayTypesDirty = false; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - - // update any comparators, since they don't check themselves - int comparatorState = getComparatorOutput(); - if(lastComparatorState != comparatorState) { - worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); - lastComparatorState = comparatorState; - } - - doDropItems(); - } - - private void updateNetwork(World world) { - if(getNetwork() == null) { - NetworkUtil.ensureValidNetwork(this); - } - if(getNetwork() != null) { - getNetwork().onUpdateEntity(this); - } - - } - - //---------- IO - - @Override - public IoMode toggleIoModeForFace(ForgeDirection faceHit) { - IPowerInterface rec = getReceptorForFace(faceHit); - IoMode curMode = getIoMode(faceHit); - if(curMode == IoMode.PULL) { - setIoMode(faceHit, IoMode.PUSH, true); - return IoMode.PUSH; - } - if(curMode == IoMode.PUSH) { - setIoMode(faceHit, IoMode.DISABLED, true); - return IoMode.DISABLED; - } - if(curMode == IoMode.DISABLED) { - if(rec == null || rec.getDelegate() instanceof IConduitBundle) { - setIoMode(faceHit, IoMode.NONE, true); - return IoMode.NONE; - } - } - setIoMode(faceHit, IoMode.PULL, true); - return IoMode.PULL; - } - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - IPowerInterface rec = getReceptorForFace(faceHit); - if(mode == IoMode.NONE) { - return rec == null || rec.getDelegate() instanceof IConduitBundle; - } - return true; - } - - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - setIoMode(faceHit, mode, true); - } - - public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { - if(mode == IoMode.NONE) { - if(faceModes == null) { - return; - } - faceModes.remove(faceHit); - if(faceModes.isEmpty()) { - faceModes = null; - } - } else { - if(faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); - } - faceModes.put(faceHit, mode); - } - if(updateReceptors) { - validateModeForReceptor(faceHit); - receptorsDirty = true; - } - if(worldObj != null) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - } - } - - public void setDefaultIoMode(ForgeDirection faceHit) { - EnergyReceptor er = getEnergyReceptorForFace(faceHit); - if(er == null || er.getConduit() != null) { - setIoMode(faceHit, IoMode.NONE); - } else if(er.getReceptor().isInputOnly()) { - setIoMode(faceHit, IoMode.PUSH); - } else if(er.getReceptor().isOutputOnly()) { - setIoMode(faceHit, IoMode.PULL); - } else { - setIoMode(faceHit, IoMode.PUSH); - } - } - - @Override - public void clearAllIoModes() { - if(network != null) { - for(TileCapBank cb : network.getMembers()) { - cb.doClearAllIoModes(); - } - } else { - doClearAllIoModes(); - } - } - - private void doClearAllIoModes() { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - setDefaultIoMode(dir); - } - } - - @Override - public IoMode getIoMode(ForgeDirection face) { - if(faceModes == null) { - return IoMode.NONE; - } - IoMode res = faceModes.get(face); - if(res == null) { - return IoMode.NONE; - } - return res; - } - - //----- Info Display - - public boolean hasDisplayTypes() { - return faceDisplayTypes != null; - } - - public InfoDisplayType getDisplayType(ForgeDirection face) { - if(faceDisplayTypes == null) { - return InfoDisplayType.NONE; - } - InfoDisplayType res = faceDisplayTypes.get(face); - return res == null ? InfoDisplayType.NONE : res; - } - - public void setDisplayType(ForgeDirection face, InfoDisplayType type) { - setDisplayType(face, type, true); - } - - public void setDisplayType(ForgeDirection face, InfoDisplayType type, boolean markDirty) { - if(type == null) { - type = InfoDisplayType.NONE; - } - if(faceDisplayTypes == null && type == InfoDisplayType.NONE) { - return; - } - InfoDisplayType cur = getDisplayType(face); - if(cur == type) { - return; - } - - if(faceDisplayTypes == null) { - faceDisplayTypes = new EnumMap(ForgeDirection.class); - } - - if(type == InfoDisplayType.NONE) { - faceDisplayTypes.remove(face); - } else { - faceDisplayTypes.put(face, type); - } - - if(faceDisplayTypes.isEmpty()) { - faceDisplayTypes = null; - } - displayTypesDirty = markDirty; - invalidateDisplayInfoCache(); - } - - public void validateDisplayTypes() { - if(faceDisplayTypes == null) { - return; - } - List reset = new ArrayList(); - for (Entry entry : faceDisplayTypes.entrySet()) { - BlockCoord bc = getLocation().getLocation(entry.getKey()); - Block block = worldObj.getBlock(bc.x, bc.y, bc.z); - if(block != null && (block.isOpaqueCube() || block == EnderIO.blockCapBank)) { - reset.add(entry.getKey()); - } - } - for (ForgeDirection dir : reset) { - setDisplayType(dir, InfoDisplayType.NONE); - setDefaultIoMode(dir); - } - } - - private void invalidateDisplayInfoCache() { - if(network != null) { - network.invalidateDisplayInfoCache(); - } - } - - //----------- rendering - - @Override - public boolean shouldRenderInPass(int pass) { - if(faceDisplayTypes == null) { - return false; - } - return pass == 0; - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - if(!getType().isMultiblock() || !(network instanceof CapBankClientNetwork)) { - return super.getRenderBoundingBox(); - } - - int minX = xCoord; - int minY = yCoord; - int minZ = zCoord; - int maxX = xCoord+1; - int maxY = yCoord+1; - int maxZ = zCoord+1; - - if(faceDisplayTypes != null) { - CapBankClientNetwork cn = (CapBankClientNetwork)network; - if(faceDisplayTypes.get(ForgeDirection.NORTH) == InfoDisplayType.IO) { - CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.NORTH); - maxX = Math.max(maxX, xCoord + info.width); - minY = Math.min(minY, yCoord + 1 - info.height); - } - if(faceDisplayTypes.get(ForgeDirection.SOUTH) == InfoDisplayType.IO) { - CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.SOUTH); - minX = Math.min(minX, xCoord + 1 - info.width); - minY = Math.min(minY, yCoord + 1 - info.height); - } - if(faceDisplayTypes.get(ForgeDirection.EAST) == InfoDisplayType.IO) { - CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.EAST); - maxZ = Math.max(maxZ, zCoord + info.width); - minY = Math.min(minY, yCoord + 1 - info.height); - } - if(faceDisplayTypes.get(ForgeDirection.WEST) == InfoDisplayType.IO) { - CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.WEST); - minZ = Math.min(minZ, zCoord + 1 - info.width); - minY = Math.min(minY, yCoord + 1 - info.height); - } - } - - return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); - } - - //----------- Redstone - - public RedstoneControlMode getInputControlMode() { - return inputControlMode; - } - - public void setInputControlMode(RedstoneControlMode inputControlMode) { - this.inputControlMode = inputControlMode; - } - - public RedstoneControlMode getOutputControlMode() { - return outputControlMode; - } - - public void setOutputControlMode(RedstoneControlMode outputControlMode) { - this.outputControlMode = outputControlMode; - } - - //----------- Power - - @Override - public IPowerStorage getController() { - return network; - } - - @Override - public long getEnergyStoredL() { - if(network == null) { - return getEnergyStored(); - } - return network.getEnergyStoredL(); - } - - @Override - public long getMaxEnergyStoredL() { - if (network == null) { - return getMaxEnergyStored(); - } - return network.getMaxEnergyStoredL(); - } - - @Override - public boolean isOutputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); - } - - private boolean isOutputEnabled() { - if(network == null) { - return true; - } - return network.isOutputEnabled(); - } - - @Override - public boolean isInputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); - } - - private boolean isInputEnabled() { - if(network == null) { - return true; - } - return network.isInputEnabled(); - } - - @Override - public boolean isNetworkControlledIo(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.NONE || mode == IoMode.PULL; - } - - @Override - public boolean isCreative() { - return getType().isCreative(); - } - - public List getReceptors() { - if(receptorsDirty) { - updateReceptors(); - } - return receptors; - } - - private void updateReceptors() { - - if(network == null) { - return; - } - network.removeReceptors(receptors); - - receptors.clear(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IPowerInterface pi = getReceptorForFace(dir); - if(pi != null) { - EnergyReceptor er = new EnergyReceptor(this, pi, dir); - validateModeForReceptor(er); - IoMode ioMode = getIoMode(dir); - if(ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) { - receptors.add(er); + if (updateReceptors) { + validateModeForReceptor(faceHit); + receptorsDirty = true; } - } - } - network.addReceptors(receptors); - - receptorsDirty = false; - } - - private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { - BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(!(te instanceof TileCapBank)) { - return PowerHandlerUtil.create(te); - } else { - TileCapBank other = (TileCapBank) te; - if(other.getType() != getType()) { - return PowerHandlerUtil.create(te); - } - } - return null; - } - - private EnergyReceptor getEnergyReceptorForFace(ForgeDirection dir) { - IPowerInterface pi = getReceptorForFace(dir); - if(pi == null || pi.getDelegate() instanceof TileCapBank) { - return null; - } - return new EnergyReceptor(this, pi, dir); - } - - private void validateModeForReceptor(ForgeDirection dir) { - validateModeForReceptor(getEnergyReceptorForFace(dir)); - } - - private void validateModeForReceptor(EnergyReceptor er) { - if (er == null) return; - IoMode ioMode = getIoMode(er.getDir()); - if((ioMode == IoMode.PUSH_PULL || ioMode == IoMode.NONE) && er.getConduit() == null) { - if(er.getReceptor().isOutputOnly()) { - setIoMode(er.getDir(), IoMode.PULL, false); - } else if (er.getReceptor().isInputOnly()) { - setIoMode(er.getDir(), IoMode.PUSH, false); - } - } - if(ioMode == IoMode.PULL && er.getReceptor().isInputOnly()) { - setIoMode(er.getDir(), IoMode.PUSH, false); - } else if(ioMode == IoMode.PUSH && er.getReceptor().isOutputOnly()) { - setIoMode(er.getDir(), IoMode.DISABLED, false); - } - } - - @Override - public void addEnergy(int energy) { - if(network == null) { - setEnergyStored(getEnergyStored() + energy); - } else { - network.addEnergy(energy); - } - } - - @Override - public void setEnergyStored(int stored) { - energyStored = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - @Override - public int getEnergyStored() { - return energyStored; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored() { - return getType().getMaxEnergyStored(); - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return getMaxInput(); - } - - @Override - public int getMaxInput() { - if(network == null) { - return getType().getMaxIO(); - } - return network.getMaxInput(); - } - - public void setMaxInput(int maxInput) { - this.maxInput = maxInput; - } - - public int getMaxInputOverride() { - return maxInput; - } - - @Override - public int getMaxOutput() { - if(network == null) { - return getType().getMaxIO(); - } - return network.getMaxOutput(); - } - - public void setMaxOutput(int maxOutput) { - this.maxOutput = maxOutput; - } - - public int getMaxOutputOverride() { - return maxOutput; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(network == null) { - return 0; - } - IoMode mode = getIoMode(from); - if(mode == IoMode.DISABLED || mode == IoMode.PUSH) { - return 0; - } - return network.receiveEnergy(maxReceive, simulate); - } - -// @Override -// public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { -// return 0; -// } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getType().getMaxEnergyStored(); - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return getIoMode(from) != IoMode.DISABLED; - } - - public int getComparatorOutput() { - double stored = getEnergyStored(); - return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14); - } - - @Override - public boolean displayPower() { - return true; - } - - //------------------- Inventory - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return canPlayerAccess(player); - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(network == null) { - return null; - } - return network.getInventory().getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - if(network == null) { - return null; - } - return network.getInventory().decrStackSize(fromSlot, amount); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemstack) { - if(network == null) { - return; - } - network.getInventory().setInventorySlotContents(slot, itemstack); - } - - @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return null; - } - - @Override - public int getSizeInventory() { - return 4; - } - - @Override - public String getInventoryName() { - return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) { - if(itemstack == null) { - return false; - } - return itemstack.getItem() instanceof IEnergyContainerItem; - } - - public ItemStack[] getInventory() { - return inventory; - } - - public void dropItems() { - dropItems = true; - } - - public void doDropItems() { - if(!dropItems) { - return; - } - Vector3d dropLocation; - EntityPlayer player = worldObj.getClosestPlayer(xCoord, yCoord, zCoord, 32); - if(player != null) { - dropLocation = EntityUtil.getEntityPosition(player); - } else { - dropLocation = new Vector3d(xCoord, yCoord, zCoord); - } - Util.dropItems(worldObj, inventory, (int) dropLocation.x, (int) dropLocation.y, (int) dropLocation.z, false); - for (int i = 0; i < inventory.length; i++) { - inventory[i] = null; - } - dropItems = false; - } - - //---------------- NBT - - @Override - protected void writeCustomNBT(NBTTagCompound nbtRoot) { - writeCommonNBT(nbtRoot); - } - - //Values common to both item and block form - public void writeCommonNBT(NBTTagCompound nbtRoot) { - getType().writeTypeToNBT(nbtRoot); - nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, energyStored); - - if(maxInput != -1) { - nbtRoot.setInteger("maxInput", maxInput); - } - if(maxOutput != -1) { - nbtRoot.setInteger("maxOutput", maxOutput); - } - if(inputControlMode != RedstoneControlMode.IGNORE) { - nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); - } - if(outputControlMode != RedstoneControlMode.IGNORE) { - nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); - } - - //face modes - if(faceModes != null) { - nbtRoot.setByte("hasFaces", (byte) 1); - for (Entry e : faceModes.entrySet()) { - nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); - } - } - - //display type - if(faceDisplayTypes != null) { - nbtRoot.setByte("hasDisplayTypes", (byte) 1); - for (Entry e : faceDisplayTypes.entrySet()) { - if(e.getValue() != InfoDisplayType.NONE) { - nbtRoot.setShort("faceDisplay" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + if (worldObj != null) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); } - } } - boolean hasItems = false; - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inventory.length; i++) { - if(inventory[i] != null) { - hasItems = true; - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inventory[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - } - if(hasItems) { - nbtRoot.setTag("Items", itemList); - } - } - - @Override - protected void readCustomNBT(NBTTagCompound nbtRoot) { - readCommonNBT(nbtRoot); - } - - //Values common to both item and block form - public void readCommonNBT(NBTTagCompound nbtRoot) { - type = CapBankType.readTypeFromNBT(nbtRoot); - energyStored = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); - setEnergyStored(energyStored); //Call this to clamp values in case config changed - - if(nbtRoot.hasKey("maxInput")) { - maxInput = nbtRoot.getInteger("maxInput"); - } else { - maxInput = -1; - } - if(nbtRoot.hasKey("maxOutput")) { - maxOutput = nbtRoot.getInteger("maxOutput"); - } else { - maxOutput = -1; - } - - if(nbtRoot.hasKey("inputControlMode")) { - inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; - } else { - inputControlMode = RedstoneControlMode.IGNORE; - } - if(nbtRoot.hasKey("outputControlMode")) { - outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; - } else { - outputControlMode = RedstoneControlMode.IGNORE; - } - - if(nbtRoot.hasKey("hasFaces")) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "face" + dir.ordinal(); - if(nbtRoot.hasKey(key)) { - setIoMode(dir, IoMode.values()[nbtRoot.getShort(key)], false); + public void setDefaultIoMode(ForgeDirection faceHit) { + EnergyReceptor er = getEnergyReceptorForFace(faceHit); + if (er == null || er.getConduit() != null) { + setIoMode(faceHit, IoMode.NONE); + } else if (er.getReceptor().isInputOnly()) { + setIoMode(faceHit, IoMode.PUSH); + } else if (er.getReceptor().isOutputOnly()) { + setIoMode(faceHit, IoMode.PULL); + } else { + setIoMode(faceHit, IoMode.PUSH); } - } - } else { - faceModes = null; } - if(nbtRoot.hasKey("hasDisplayTypes")) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - String key = "faceDisplay" + dir.ordinal(); - if(nbtRoot.hasKey(key)) { - setDisplayType(dir, InfoDisplayType.values()[nbtRoot.getShort(key)], false); + @Override + public void clearAllIoModes() { + if (network != null) { + for (TileCapBank cb : network.getMembers()) { + cb.doClearAllIoModes(); + } + } else { + doClearAllIoModes(); } - } - } else { - faceDisplayTypes = null; } - for (int i = 0; i < inventory.length; i++) { - inventory[i] = null; - } - - if(nbtRoot.hasKey("Items")) { - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inventory.length) { - inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + private void doClearAllIoModes() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + setDefaultIoMode(dir); } - } } - } + @Override + public IoMode getIoMode(ForgeDirection face) { + if (faceModes == null) { + return IoMode.NONE; + } + IoMode res = faceModes.get(face); + if (res == null) { + return IoMode.NONE; + } + return res; + } + + // ----- Info Display + + public boolean hasDisplayTypes() { + return faceDisplayTypes != null; + } + + public InfoDisplayType getDisplayType(ForgeDirection face) { + if (faceDisplayTypes == null) { + return InfoDisplayType.NONE; + } + InfoDisplayType res = faceDisplayTypes.get(face); + return res == null ? InfoDisplayType.NONE : res; + } + + public void setDisplayType(ForgeDirection face, InfoDisplayType type) { + setDisplayType(face, type, true); + } + + public void setDisplayType(ForgeDirection face, InfoDisplayType type, boolean markDirty) { + if (type == null) { + type = InfoDisplayType.NONE; + } + if (faceDisplayTypes == null && type == InfoDisplayType.NONE) { + return; + } + InfoDisplayType cur = getDisplayType(face); + if (cur == type) { + return; + } + + if (faceDisplayTypes == null) { + faceDisplayTypes = new EnumMap(ForgeDirection.class); + } + + if (type == InfoDisplayType.NONE) { + faceDisplayTypes.remove(face); + } else { + faceDisplayTypes.put(face, type); + } + + if (faceDisplayTypes.isEmpty()) { + faceDisplayTypes = null; + } + displayTypesDirty = markDirty; + invalidateDisplayInfoCache(); + } + + public void validateDisplayTypes() { + if (faceDisplayTypes == null) { + return; + } + List reset = new ArrayList(); + for (Entry entry : faceDisplayTypes.entrySet()) { + BlockCoord bc = getLocation().getLocation(entry.getKey()); + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + if (block != null && (block.isOpaqueCube() || block == EnderIO.blockCapBank)) { + reset.add(entry.getKey()); + } + } + for (ForgeDirection dir : reset) { + setDisplayType(dir, InfoDisplayType.NONE); + setDefaultIoMode(dir); + } + } + + private void invalidateDisplayInfoCache() { + if (network != null) { + network.invalidateDisplayInfoCache(); + } + } + + // ----------- rendering + + @Override + public boolean shouldRenderInPass(int pass) { + if (faceDisplayTypes == null) { + return false; + } + return pass == 0; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() { + if (!getType().isMultiblock() || !(network instanceof CapBankClientNetwork)) { + return super.getRenderBoundingBox(); + } + + int minX = xCoord; + int minY = yCoord; + int minZ = zCoord; + int maxX = xCoord + 1; + int maxY = yCoord + 1; + int maxZ = zCoord + 1; + + if (faceDisplayTypes != null) { + CapBankClientNetwork cn = (CapBankClientNetwork) network; + if (faceDisplayTypes.get(ForgeDirection.NORTH) == InfoDisplayType.IO) { + CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.NORTH); + maxX = Math.max(maxX, xCoord + info.width); + minY = Math.min(minY, yCoord + 1 - info.height); + } + if (faceDisplayTypes.get(ForgeDirection.SOUTH) == InfoDisplayType.IO) { + CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.SOUTH); + minX = Math.min(minX, xCoord + 1 - info.width); + minY = Math.min(minY, yCoord + 1 - info.height); + } + if (faceDisplayTypes.get(ForgeDirection.EAST) == InfoDisplayType.IO) { + CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.EAST); + maxZ = Math.max(maxZ, zCoord + info.width); + minY = Math.min(minY, yCoord + 1 - info.height); + } + if (faceDisplayTypes.get(ForgeDirection.WEST) == InfoDisplayType.IO) { + CapBankClientNetwork.IOInfo info = cn.getIODisplayInfo(xCoord, yCoord, zCoord, ForgeDirection.WEST); + minZ = Math.min(minZ, zCoord + 1 - info.width); + minY = Math.min(minY, yCoord + 1 - info.height); + } + } + + return AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ); + } + + // ----------- Redstone + + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + public void setInputControlMode(RedstoneControlMode inputControlMode) { + this.inputControlMode = inputControlMode; + } + + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + this.outputControlMode = outputControlMode; + } + + // ----------- Power + + @Override + public IPowerStorage getController() { + return network; + } + + @Override + public long getEnergyStoredL() { + if (network == null) { + return getEnergyStored(); + } + return network.getEnergyStoredL(); + } + + @Override + public long getMaxEnergyStoredL() { + if (network == null) { + return getMaxEnergyStored(); + } + return network.getMaxEnergyStoredL(); + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); + } + + private boolean isOutputEnabled() { + if (network == null) { + return true; + } + return network.isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); + } + + private boolean isInputEnabled() { + if (network == null) { + return true; + } + return network.isInputEnabled(); + } + + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.NONE || mode == IoMode.PULL; + } + + @Override + public boolean isCreative() { + return getType().isCreative(); + } + + public List getReceptors() { + if (receptorsDirty) { + updateReceptors(); + } + return receptors; + } + + private void updateReceptors() { + + if (network == null) { + return; + } + network.removeReceptors(receptors); + + receptors.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IPowerInterface pi = getReceptorForFace(dir); + if (pi != null) { + EnergyReceptor er = new EnergyReceptor(this, pi, dir); + validateModeForReceptor(er); + IoMode ioMode = getIoMode(dir); + if (ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) { + receptors.add(er); + } + } + } + network.addReceptors(receptors); + + receptorsDirty = false; + } + + private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { + BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (!(te instanceof TileCapBank)) { + return PowerHandlerUtil.create(te); + } else { + TileCapBank other = (TileCapBank) te; + if (other.getType() != getType()) { + return PowerHandlerUtil.create(te); + } + } + return null; + } + + private EnergyReceptor getEnergyReceptorForFace(ForgeDirection dir) { + IPowerInterface pi = getReceptorForFace(dir); + if (pi == null || pi.getDelegate() instanceof TileCapBank) { + return null; + } + return new EnergyReceptor(this, pi, dir); + } + + private void validateModeForReceptor(ForgeDirection dir) { + validateModeForReceptor(getEnergyReceptorForFace(dir)); + } + + private void validateModeForReceptor(EnergyReceptor er) { + if (er == null) return; + IoMode ioMode = getIoMode(er.getDir()); + if ((ioMode == IoMode.PUSH_PULL || ioMode == IoMode.NONE) && er.getConduit() == null) { + if (er.getReceptor().isOutputOnly()) { + setIoMode(er.getDir(), IoMode.PULL, false); + } else if (er.getReceptor().isInputOnly()) { + setIoMode(er.getDir(), IoMode.PUSH, false); + } + } + if (ioMode == IoMode.PULL && er.getReceptor().isInputOnly()) { + setIoMode(er.getDir(), IoMode.PUSH, false); + } else if (ioMode == IoMode.PUSH && er.getReceptor().isOutputOnly()) { + setIoMode(er.getDir(), IoMode.DISABLED, false); + } + } + + @Override + public void addEnergy(int energy) { + if (network == null) { + setEnergyStored(getEnergyStored() + energy); + } else { + network.addEnergy(energy); + } + } + + @Override + public void setEnergyStored(int stored) { + energyStored = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); + } + + @Override + public int getEnergyStored() { + return energyStored; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored() { + return getType().getMaxEnergyStored(); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return getMaxInput(); + } + + @Override + public int getMaxInput() { + if (network == null) { + return getType().getMaxIO(); + } + return network.getMaxInput(); + } + + public void setMaxInput(int maxInput) { + this.maxInput = maxInput; + } + + public int getMaxInputOverride() { + return maxInput; + } + + @Override + public int getMaxOutput() { + if (network == null) { + return getType().getMaxIO(); + } + return network.getMaxOutput(); + } + + public void setMaxOutput(int maxOutput) { + this.maxOutput = maxOutput; + } + + public int getMaxOutputOverride() { + return maxOutput; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (network == null) { + return 0; + } + IoMode mode = getIoMode(from); + if (mode == IoMode.DISABLED || mode == IoMode.PUSH) { + return 0; + } + return network.receiveEnergy(maxReceive, simulate); + } + + // @Override + // public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + // return 0; + // } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getType().getMaxEnergyStored(); + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return getIoMode(from) != IoMode.DISABLED; + } + + public int getComparatorOutput() { + double stored = getEnergyStored(); + return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14); + } + + @Override + public boolean displayPower() { + return true; + } + + // ------------------- Inventory + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + + @Override + public ItemStack getStackInSlot(int slot) { + if (network == null) { + return null; + } + return network.getInventory().getStackInSlot(slot); + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + if (network == null) { + return null; + } + return network.getInventory().decrStackSize(fromSlot, amount); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemstack) { + if (network == null) { + return; + } + network.getInventory().setInventorySlotContents(slot, itemstack); + } + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + return null; + } + + @Override + public int getSizeInventory() { + return 4; + } + + @Override + public String getInventoryName() { + return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { + if (itemstack == null) { + return false; + } + return itemstack.getItem() instanceof IEnergyContainerItem; + } + + public ItemStack[] getInventory() { + return inventory; + } + + public void dropItems() { + dropItems = true; + } + + public void doDropItems() { + if (!dropItems) { + return; + } + Vector3d dropLocation; + EntityPlayer player = worldObj.getClosestPlayer(xCoord, yCoord, zCoord, 32); + if (player != null) { + dropLocation = EntityUtil.getEntityPosition(player); + } else { + dropLocation = new Vector3d(xCoord, yCoord, zCoord); + } + Util.dropItems(worldObj, inventory, (int) dropLocation.x, (int) dropLocation.y, (int) dropLocation.z, false); + for (int i = 0; i < inventory.length; i++) { + inventory[i] = null; + } + dropItems = false; + } + + // ---------------- NBT + + @Override + protected void writeCustomNBT(NBTTagCompound nbtRoot) { + writeCommonNBT(nbtRoot); + } + + // Values common to both item and block form + public void writeCommonNBT(NBTTagCompound nbtRoot) { + getType().writeTypeToNBT(nbtRoot); + nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, energyStored); + + if (maxInput != -1) { + nbtRoot.setInteger("maxInput", maxInput); + } + if (maxOutput != -1) { + nbtRoot.setInteger("maxOutput", maxOutput); + } + if (inputControlMode != RedstoneControlMode.IGNORE) { + nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); + } + if (outputControlMode != RedstoneControlMode.IGNORE) { + nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); + } + + // face modes + if (faceModes != null) { + nbtRoot.setByte("hasFaces", (byte) 1); + for (Entry e : faceModes.entrySet()) { + nbtRoot.setShort( + "face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + } + } + + // display type + if (faceDisplayTypes != null) { + nbtRoot.setByte("hasDisplayTypes", (byte) 1); + for (Entry e : faceDisplayTypes.entrySet()) { + if (e.getValue() != InfoDisplayType.NONE) { + nbtRoot.setShort("faceDisplay" + e.getKey().ordinal(), (short) + e.getValue().ordinal()); + } + } + } + + boolean hasItems = false; + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inventory.length; i++) { + if (inventory[i] != null) { + hasItems = true; + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inventory[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + if (hasItems) { + nbtRoot.setTag("Items", itemList); + } + } + + @Override + protected void readCustomNBT(NBTTagCompound nbtRoot) { + readCommonNBT(nbtRoot); + } + + // Values common to both item and block form + public void readCommonNBT(NBTTagCompound nbtRoot) { + type = CapBankType.readTypeFromNBT(nbtRoot); + energyStored = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); + setEnergyStored(energyStored); // Call this to clamp values in case config changed + + if (nbtRoot.hasKey("maxInput")) { + maxInput = nbtRoot.getInteger("maxInput"); + } else { + maxInput = -1; + } + if (nbtRoot.hasKey("maxOutput")) { + maxOutput = nbtRoot.getInteger("maxOutput"); + } else { + maxOutput = -1; + } + + if (nbtRoot.hasKey("inputControlMode")) { + inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; + } else { + inputControlMode = RedstoneControlMode.IGNORE; + } + if (nbtRoot.hasKey("outputControlMode")) { + outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; + } else { + outputControlMode = RedstoneControlMode.IGNORE; + } + + if (nbtRoot.hasKey("hasFaces")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "face" + dir.ordinal(); + if (nbtRoot.hasKey(key)) { + setIoMode(dir, IoMode.values()[nbtRoot.getShort(key)], false); + } + } + } else { + faceModes = null; + } + + if (nbtRoot.hasKey("hasDisplayTypes")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "faceDisplay" + dir.ordinal(); + if (nbtRoot.hasKey(key)) { + setDisplayType(dir, InfoDisplayType.values()[nbtRoot.getShort(key)], false); + } + } + } else { + faceDisplayTypes = null; + } + + for (int i = 0; i < inventory.length; i++) { + inventory[i] = null; + } + + if (nbtRoot.hasKey("Items")) { + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index a3e5a183..0bb9f04c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -1,16 +1,6 @@ package crazypants.enderio.machine.capbank.network; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.CapBankType; @@ -20,447 +10,445 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IPowerStorage; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class CapBankClientNetwork implements ICapBankNetwork { - private final int id; - private final Map members = new HashMap(); - private int maxEnergySent; - private int maxEnergyRecieved; + private final int id; + private final Map members = new HashMap(); + private int maxEnergySent; + private int maxEnergyRecieved; - private int stateUpdateCount; - private int maxIO; - private long maxEnergyStored; - private long energyStored; + private int stateUpdateCount; + private int maxIO; + private long maxEnergyStored; + private long energyStored; - private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; - private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; - private final InventoryImpl inventory = new InventoryImpl(); + private final InventoryImpl inventory = new InventoryImpl(); - private float avgInput; - private float avgOutput; + private float avgInput; + private float avgOutput; - private long lastPowerRequestTick = -1; + private long lastPowerRequestTick = -1; - private Map ioDisplayInfoCache; + private Map ioDisplayInfoCache; - public CapBankClientNetwork(int id) { - this.id = id; - } - - @Override - public int getId() { - return id; - } - - public void requestPowerUpdate(TileCapBank capBank, int interval) { - long curTick = EnderIO.proxy.getTickCount(); - if(lastPowerRequestTick == -1 || curTick - lastPowerRequestTick >= interval) { - if(stateUpdateCount == 0) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); - // the network state also contains the energy data - } else { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank)); - } - lastPowerRequestTick = curTick; - } - } - - public void setState(World world, NetworkState state) { - maxEnergyRecieved = state.getMaxInput(); - maxEnergySent = state.getMaxOutput(); - maxIO = state.getMaxIO(); - maxEnergyStored = state.getMaxEnergyStored(); - energyStored = state.getEnergyStored(); - inputControlMode = state.getInputMode(); - outputControlMode = state.getOutputMode(); - - BlockCoord bc = state.getInventoryImplLocation(); - if(bc == null) { - inventory.setCapBank(null); - } else if(world != null) { - TileEntity te = world.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapBank) { - inventory.setCapBank((TileCapBank) te); - } - } - avgInput = state.getAverageInput(); - avgOutput = state.getAverageOutput(); - - stateUpdateCount++; - } - - public int getStateUpdateCount() { - return stateUpdateCount; - } - - public void setStateUpdateCount(int stateUpdateCount) { - this.stateUpdateCount = stateUpdateCount; - } - - @Override - public void addMember(TileCapBank capBank) { - members.put(capBank.getLocation(), capBank); - invalidateDisplayInfoCache(); - } - - @Override - public Collection getMembers() { - return members.values(); - } - - @Override - public void destroyNetwork() { - for (TileCapBank cb : members.values()) { - cb.setNetworkId(-1); - cb.setNetwork(null); - } - invalidateDisplayInfoCache(); - } - - @Override - public int getMaxIO() { - return maxIO; - } - - @Override - public long getMaxEnergyStoredL() { - return maxEnergyStored; - } - - public void setMaxEnergyStoredL(long maxEnergyStored) { - this.maxEnergyStored = maxEnergyStored; - } - - public void setEnergyStored(long energyStored) { - this.energyStored = energyStored; - } - - @Override - public long getEnergyStoredL() { - return energyStored; - } - - @Override - public int getMaxOutput() { - return maxEnergySent; - } - - @Override - public void setMaxOutput(int max) { - maxEnergySent = MathHelper.clamp_int(max, 0, maxIO); - } - - @Override - public int getMaxInput() { - return maxEnergyRecieved; - } - - @Override - public void setMaxInput(int max) { - maxEnergyRecieved = MathHelper.clamp_int(max, 0, maxIO); - } - - public double getEnergyStoredRatio() { - if(getMaxEnergyStoredL() <= 0) { - return 0; - } - return (double) getEnergyStoredL() / getMaxEnergyStoredL(); - } - - @Override - public RedstoneControlMode getInputControlMode() { - return inputControlMode; - } - - @Override - public void setInputControlMode(RedstoneControlMode inputControlMode) { - this.inputControlMode = inputControlMode; - } - - @Override - public RedstoneControlMode getOutputControlMode() { - return outputControlMode; - } - - @Override - public void setOutputControlMode(RedstoneControlMode outputControlMode) { - this.outputControlMode = outputControlMode; - } - - @Override - public InventoryImpl getInventory() { - return inventory; - } - - @Override - public float getAverageChangePerTick() { - return avgInput - avgOutput; - } - - @Override - public float getAverageInputPerTick() { - return avgInput; - } - - @Override - public float getAverageOutputPerTick() { - return avgOutput; - } - - public void setAverageIOPerTick(float input, float output) { - this.avgInput = input; - this.avgOutput = output; - } - - @Override - public NetworkState getState() { - return new NetworkState(this); - } - - @Override - public void onUpdateEntity(TileCapBank tileCapBank) { - } - - @Override - public void addEnergy(int energy) { - } - - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { - return 0; - } - - @Override - public void removeReceptors(Collection receptors) { - } - - @Override - public void addReceptors(Collection receptors) { - } - - @Override - public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { - } - - @Override - public boolean isOutputEnabled() { - return true; - } - - @Override - public boolean isInputEnabled() { - return true; - } - - @Override - public IPowerStorage getController() { - return this; - } - - @Override - public boolean isOutputEnabled(ForgeDirection direction) { - return isOutputEnabled(); - } - - @Override - public boolean isInputEnabled(ForgeDirection direction) { - return isInputEnabled(); - } - - @Override - public boolean isCreative() { - return false; - } - - @Override - public boolean isNetworkControlledIo(ForgeDirection direction) { - return true; - } - - @Override - public void invalidateDisplayInfoCache() { - ioDisplayInfoCache = null; - } - - public IOInfo getIODisplayInfo(int x, int y, int z, ForgeDirection face) { - DisplayInfoKey key = new DisplayInfoKey(x, y, z, face); - if(ioDisplayInfoCache == null) { - ioDisplayInfoCache = new HashMap(); - } - IOInfo value = ioDisplayInfoCache.get(key); - if(value == null) { - value = computeIODisplayInfo(x, y, z, face); - ioDisplayInfoCache.put(key, value); - } - return value; - } - - private IOInfo computeIODisplayInfo(int xOrg, int yOrg, int zOrg, ForgeDirection dir) { - if(dir.offsetY != 0) { - return IOInfo.SINGLE; + public CapBankClientNetwork(int id) { + this.id = id; } - TileCapBank cb = getCapBankAt(xOrg, yOrg, zOrg); - if(cb == null) { - return IOInfo.SINGLE; + @Override + public int getId() { + return id; } - CapBankType type = cb.getType(); - ForgeDirection left = dir.getRotation(ForgeDirection.DOWN); - ForgeDirection right = left.getOpposite(); - - int hOff = 0; - int vOff = 0; - - // step 1: find top left - while(isIOType(xOrg+left.offsetX, yOrg, zOrg+left.offsetZ, dir, type)) { - xOrg += left.offsetX; - zOrg += left.offsetZ; - hOff++; - } - - while(isIOType(xOrg, yOrg+1, zOrg, dir, type)) { - yOrg++; - vOff++; - } - - if(isIOType(xOrg+left.offsetX, yOrg, zOrg+left.offsetZ, dir, type)) { - // not a rectangle - return IOInfo.SINGLE; - } - - // step 2: find width - int width = 1; - int height = 1; - int xTmp = xOrg; - int yTmp = yOrg; - int zTmp = zOrg; - while(isIOType(xTmp+right.offsetX, yTmp, zTmp+right.offsetZ, dir, type)) { - if(isIOType(xTmp+right.offsetX, yTmp+1, zTmp+right.offsetZ, dir, type)) { - // not a rectangle - return IOInfo.SINGLE; - } - xTmp += right.offsetX; - zTmp += right.offsetZ; - width++; - } - - // step 3: find height - while(isIOType(xOrg, yTmp-1, zOrg, dir, type)) { - xTmp = xOrg; - yTmp--; - zTmp = zOrg; - - if(isIOType(xTmp+left.offsetX, yTmp, zTmp+left.offsetZ, dir, type)) { - // not a rectangle - return IOInfo.SINGLE; - } - - for(int i=1 ; i= interval) { + if (stateUpdateCount == 0) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); + // the network state also contains the energy data + } else { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank)); + } + lastPowerRequestTick = curTick; } - } - - if(isIOType(xTmp+right.offsetX, yTmp, zTmp+right.offsetZ, dir, type)) { - // not a rectangle - return IOInfo.SINGLE; - } - - height++; } - xTmp = xOrg; - yTmp--; - zTmp = zOrg; + public void setState(World world, NetworkState state) { + maxEnergyRecieved = state.getMaxInput(); + maxEnergySent = state.getMaxOutput(); + maxIO = state.getMaxIO(); + maxEnergyStored = state.getMaxEnergyStored(); + energyStored = state.getEnergyStored(); + inputControlMode = state.getInputMode(); + outputControlMode = state.getOutputMode(); - for(int i=0 ; i 0 || vOff > 0) { - return IOInfo.INSIDE; - } - - return new IOInfo(width, height); - } - - private boolean isIOType(int x, int y, int z, ForgeDirection face, CapBankType type) { - TileCapBank cb = getCapBankAt(x, y, z); - return cb != null && type == cb.getType() && cb.getDisplayType(face) == InfoDisplayType.IO; - } - - private TileCapBank getCapBankAt(int x, int y, int z) { - return members.get(new BlockCoord(x, y, z)); - } - - public static final class DisplayInfoKey { - final int x; - final int y; - final int z; - final ForgeDirection face; - - public DisplayInfoKey(int x, int y, int z, ForgeDirection face) { - this.x = x; - this.y = y; - this.z = z; - this.face = face; + public void setStateUpdateCount(int stateUpdateCount) { + this.stateUpdateCount = stateUpdateCount; } @Override - public int hashCode() { - int hash = 7; - hash = 97 * hash + this.x; - hash = 97 * hash + this.y; - hash = 97 * hash + this.z; - hash = 97 * hash + this.face.hashCode(); - return hash; + public void addMember(TileCapBank capBank) { + members.put(capBank.getLocation(), capBank); + invalidateDisplayInfoCache(); } @Override - public boolean equals(Object obj) { - if(!(obj instanceof DisplayInfoKey)) { + public Collection getMembers() { + return members.values(); + } + + @Override + public void destroyNetwork() { + for (TileCapBank cb : members.values()) { + cb.setNetworkId(-1); + cb.setNetwork(null); + } + invalidateDisplayInfoCache(); + } + + @Override + public int getMaxIO() { + return maxIO; + } + + @Override + public long getMaxEnergyStoredL() { + return maxEnergyStored; + } + + public void setMaxEnergyStoredL(long maxEnergyStored) { + this.maxEnergyStored = maxEnergyStored; + } + + public void setEnergyStored(long energyStored) { + this.energyStored = energyStored; + } + + @Override + public long getEnergyStoredL() { + return energyStored; + } + + @Override + public int getMaxOutput() { + return maxEnergySent; + } + + @Override + public void setMaxOutput(int max) { + maxEnergySent = MathHelper.clamp_int(max, 0, maxIO); + } + + @Override + public int getMaxInput() { + return maxEnergyRecieved; + } + + @Override + public void setMaxInput(int max) { + maxEnergyRecieved = MathHelper.clamp_int(max, 0, maxIO); + } + + public double getEnergyStoredRatio() { + if (getMaxEnergyStoredL() <= 0) { + return 0; + } + return (double) getEnergyStoredL() / getMaxEnergyStoredL(); + } + + @Override + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + @Override + public void setInputControlMode(RedstoneControlMode inputControlMode) { + this.inputControlMode = inputControlMode; + } + + @Override + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + @Override + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + this.outputControlMode = outputControlMode; + } + + @Override + public InventoryImpl getInventory() { + return inventory; + } + + @Override + public float getAverageChangePerTick() { + return avgInput - avgOutput; + } + + @Override + public float getAverageInputPerTick() { + return avgInput; + } + + @Override + public float getAverageOutputPerTick() { + return avgOutput; + } + + public void setAverageIOPerTick(float input, float output) { + this.avgInput = input; + this.avgOutput = output; + } + + @Override + public NetworkState getState() { + return new NetworkState(this); + } + + @Override + public void onUpdateEntity(TileCapBank tileCapBank) {} + + @Override + public void addEnergy(int energy) {} + + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + return 0; + } + + @Override + public void removeReceptors(Collection receptors) {} + + @Override + public void addReceptors(Collection receptors) {} + + @Override + public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) {} + + @Override + public boolean isOutputEnabled() { + return true; + } + + @Override + public boolean isInputEnabled() { + return true; + } + + @Override + public IPowerStorage getController() { + return this; + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + return isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + return isInputEnabled(); + } + + @Override + public boolean isCreative() { return false; - } - final DisplayInfoKey other = (DisplayInfoKey) obj; - return (this.x == other.x) && - (this.y == other.y) && - (this.z == other.z) && - (this.face == other.face); - } - } - - public static class IOInfo { - public final int width; - public final int height; - - static final IOInfo SINGLE = new IOInfo(1, 1); - static final IOInfo INSIDE = new IOInfo(0, 0); - - IOInfo(int width, int height) { - this.width = width; - this.height = height; } - public boolean isInside() { - return width == 0; + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + return true; } - } + @Override + public void invalidateDisplayInfoCache() { + ioDisplayInfoCache = null; + } + + public IOInfo getIODisplayInfo(int x, int y, int z, ForgeDirection face) { + DisplayInfoKey key = new DisplayInfoKey(x, y, z, face); + if (ioDisplayInfoCache == null) { + ioDisplayInfoCache = new HashMap(); + } + IOInfo value = ioDisplayInfoCache.get(key); + if (value == null) { + value = computeIODisplayInfo(x, y, z, face); + ioDisplayInfoCache.put(key, value); + } + return value; + } + + private IOInfo computeIODisplayInfo(int xOrg, int yOrg, int zOrg, ForgeDirection dir) { + if (dir.offsetY != 0) { + return IOInfo.SINGLE; + } + + TileCapBank cb = getCapBankAt(xOrg, yOrg, zOrg); + if (cb == null) { + return IOInfo.SINGLE; + } + + CapBankType type = cb.getType(); + ForgeDirection left = dir.getRotation(ForgeDirection.DOWN); + ForgeDirection right = left.getOpposite(); + + int hOff = 0; + int vOff = 0; + + // step 1: find top left + while (isIOType(xOrg + left.offsetX, yOrg, zOrg + left.offsetZ, dir, type)) { + xOrg += left.offsetX; + zOrg += left.offsetZ; + hOff++; + } + + while (isIOType(xOrg, yOrg + 1, zOrg, dir, type)) { + yOrg++; + vOff++; + } + + if (isIOType(xOrg + left.offsetX, yOrg, zOrg + left.offsetZ, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + + // step 2: find width + int width = 1; + int height = 1; + int xTmp = xOrg; + int yTmp = yOrg; + int zTmp = zOrg; + while (isIOType(xTmp + right.offsetX, yTmp, zTmp + right.offsetZ, dir, type)) { + if (isIOType(xTmp + right.offsetX, yTmp + 1, zTmp + right.offsetZ, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + xTmp += right.offsetX; + zTmp += right.offsetZ; + width++; + } + + // step 3: find height + while (isIOType(xOrg, yTmp - 1, zOrg, dir, type)) { + xTmp = xOrg; + yTmp--; + zTmp = zOrg; + + if (isIOType(xTmp + left.offsetX, yTmp, zTmp + left.offsetZ, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + + for (int i = 1; i < width; i++) { + xTmp += right.offsetX; + zTmp += right.offsetZ; + + if (!isIOType(xTmp, yTmp, zTmp, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + } + + if (isIOType(xTmp + right.offsetX, yTmp, zTmp + right.offsetZ, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + + height++; + } + + xTmp = xOrg; + yTmp--; + zTmp = zOrg; + + for (int i = 0; i < width; i++) { + if (isIOType(xTmp, yTmp, zTmp, dir, type)) { + // not a rectangle + return IOInfo.SINGLE; + } + + xTmp += right.offsetX; + zTmp += right.offsetZ; + } + + if (width == 1 && height == 1) { + return IOInfo.SINGLE; + } + + if (hOff > 0 || vOff > 0) { + return IOInfo.INSIDE; + } + + return new IOInfo(width, height); + } + + private boolean isIOType(int x, int y, int z, ForgeDirection face, CapBankType type) { + TileCapBank cb = getCapBankAt(x, y, z); + return cb != null && type == cb.getType() && cb.getDisplayType(face) == InfoDisplayType.IO; + } + + private TileCapBank getCapBankAt(int x, int y, int z) { + return members.get(new BlockCoord(x, y, z)); + } + + public static final class DisplayInfoKey { + final int x; + final int y; + final int z; + final ForgeDirection face; + + public DisplayInfoKey(int x, int y, int z, ForgeDirection face) { + this.x = x; + this.y = y; + this.z = z; + this.face = face; + } + + @Override + public int hashCode() { + int hash = 7; + hash = 97 * hash + this.x; + hash = 97 * hash + this.y; + hash = 97 * hash + this.z; + hash = 97 * hash + this.face.hashCode(); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof DisplayInfoKey)) { + return false; + } + final DisplayInfoKey other = (DisplayInfoKey) obj; + return (this.x == other.x) && (this.y == other.y) && (this.z == other.z) && (this.face == other.face); + } + } + + public static class IOInfo { + public final int width; + public final int height; + + static final IOInfo SINGLE = new IOInfo(1, 1); + static final IOInfo INSIDE = new IOInfo(0, 0); + + IOInfo(int width, int height) { + this.width = width; + this.height = height; + } + + public boolean isInside() { + return width == 0; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index 737e77e2..6e070d46 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -1,20 +1,8 @@ package crazypants.enderio.machine.capbank.network; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.RoundRobinIterator; - import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.conduit.ConduitNetworkTickHandler; import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; @@ -30,558 +18,562 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PerTickIntAverageCalculator; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class CapBankNetwork implements ICapBankNetwork { - private static final int IO_CAP = 2000000000; + private static final int IO_CAP = 2000000000; - private final List capBanks = new ArrayList(); + private final List capBanks = new ArrayList(); - private final Set receptors = new HashSet(); - private RoundRobinIterator receptorIterator; + private final Set receptors = new HashSet(); + private RoundRobinIterator receptorIterator; - private final int id; + private final int id; - private int maxIO; + private int maxIO; - private int maxInput = -1; + private int maxInput = -1; - private int maxOutput = -1; + private int maxOutput = -1; - private long timeAtLastApply; + private long timeAtLastApply; - private long energyStored; - private long prevEnergyStored = -1; - private long energyReceived; - private long energySend; + private long energyStored; + private long prevEnergyStored = -1; + private long energyReceived; + private long energySend; - private long maxEnergyStored; + private long maxEnergyStored; - private CapBankType type; + private CapBankType type; - private final Set redstoneRecievers = new HashSet(); + private final Set redstoneRecievers = new HashSet(); - private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; - private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; - private boolean inputRedstoneConditionMet = true; - private boolean outputRedstoneConditionMet = true; + private boolean inputRedstoneConditionMet = true; + private boolean outputRedstoneConditionMet = true; - private final TickListener tickListener = new TickReciever(); + private final TickListener tickListener = new TickReciever(); - private final PerTickIntAverageCalculator powerTrackerIn = new PerTickIntAverageCalculator(2); - private final PerTickIntAverageCalculator powerTrackerOut = new PerTickIntAverageCalculator(2); + private final PerTickIntAverageCalculator powerTrackerIn = new PerTickIntAverageCalculator(2); + private final PerTickIntAverageCalculator powerTrackerOut = new PerTickIntAverageCalculator(2); - private final InventoryImpl inventory = new InventoryImpl(); + private final InventoryImpl inventory = new InventoryImpl(); - private boolean firstUpate = true; + private boolean firstUpate = true; - public CapBankNetwork(int id) { - this.id = id; - } - - //--------- Network Management - - public void init(TileCapBank cap, Collection neighbours, World world) { - if(world.isRemote) { - throw new UnsupportedOperationException(); + public CapBankNetwork(int id) { + this.id = id; } - type = cap.getType(); - inputControlMode = cap.getInputControlMode(); - outputControlMode = cap.getOutputControlMode(); - for (TileCapBank con : neighbours) { - ICapBankNetwork network = con.getNetwork(); - if(network != null) { - network.destroyNetwork(); - } - } - setNetwork(world, cap); - } + // --------- Network Management - - protected void setNetwork(World world, TileCapBank cap) { - if(cap == null) { - return; - } - Set work = new HashSet(); - for(;;) { - ICapBankNetwork network = cap.getNetwork(); - if(network != this) { - if(network != null) { - network.destroyNetwork(); + public void init(TileCapBank cap, Collection neighbours, World world) { + if (world.isRemote) { + throw new UnsupportedOperationException(); } - if(cap.setNetwork(this)) { - addMember(cap); - NetworkUtil.getNeigbours(cap, work); + + type = cap.getType(); + inputControlMode = cap.getInputControlMode(); + outputControlMode = cap.getOutputControlMode(); + for (TileCapBank con : neighbours) { + ICapBankNetwork network = con.getNetwork(); + if (network != null) { + network.destroyNetwork(); + } } - } - if(work.isEmpty()) { - return; - } - Iterator iter = work.iterator(); - cap = iter.next(); - iter.remove(); + setNetwork(world, cap); } - } - @Override - public void destroyNetwork() { - distributeEnergyToBanks(); - TileCapBank cap = null; - for (TileCapBank cb : capBanks) { - cb.setNetwork(null); - if(cap == null) { - cap = cb; - } + protected void setNetwork(World world, TileCapBank cap) { + if (cap == null) { + return; + } + Set work = new HashSet(); + for (; ; ) { + ICapBankNetwork network = cap.getNetwork(); + if (network != this) { + if (network != null) { + network.destroyNetwork(); + } + if (cap.setNetwork(this)) { + addMember(cap); + NetworkUtil.getNeigbours(cap, work); + } + } + if (work.isEmpty()) { + return; + } + Iterator iter = work.iterator(); + cap = iter.next(); + iter.remove(); + } } - capBanks.clear(); - if(cap != null) { - PacketHandler.INSTANCE.sendToAll(new PacketNetworkStateResponse(this, true)); + + @Override + public void destroyNetwork() { + distributeEnergyToBanks(); + TileCapBank cap = null; + for (TileCapBank cb : capBanks) { + cb.setNetwork(null); + if (cap == null) { + cap = cb; + } + } + capBanks.clear(); + if (cap != null) { + PacketHandler.INSTANCE.sendToAll(new PacketNetworkStateResponse(this, true)); + } } - } - @Override - public Collection getMembers() { - return capBanks; - } + @Override + public Collection getMembers() { + return capBanks; + } - @Override - public void addMember(TileCapBank cap) { - if(!capBanks.contains(cap)) { - capBanks.add(cap); - long newIO = maxIO + cap.getType().getMaxIO(); - if(newIO > IO_CAP) { - newIO = IO_CAP; - } - maxIO = (int) newIO; + @Override + public void addMember(TileCapBank cap) { + if (!capBanks.contains(cap)) { + capBanks.add(cap); + long newIO = maxIO + cap.getType().getMaxIO(); + if (newIO > IO_CAP) { + newIO = IO_CAP; + } + maxIO = (int) newIO; - energyStored += cap.getEnergyStored(); - maxEnergyStored += cap.getMaxEnergyStored(); - if(maxInput == -1) { - maxInput = cap.getMaxInputOverride(); - } - if(maxOutput == -1) { - maxOutput = cap.getMaxOutputOverride(); - } - cap.setInputControlMode(inputControlMode); - cap.setOutputControlMode(outputControlMode); + energyStored += cap.getEnergyStored(); + maxEnergyStored += cap.getMaxEnergyStored(); + if (maxInput == -1) { + maxInput = cap.getMaxInputOverride(); + } + if (maxOutput == -1) { + maxOutput = cap.getMaxOutputOverride(); + } + cap.setInputControlMode(inputControlMode); + cap.setOutputControlMode(outputControlMode); - List recs = cap.getReceptors(); - if(!recs.isEmpty()) { - addReceptors(recs); - } + List recs = cap.getReceptors(); + if (!recs.isEmpty()) { + addReceptors(recs); + } - if(inventory.isEmtpy()) { - inventory.setCapBank(cap); - } else if(!InventoryImpl.isInventoryEmtpy(cap)) { - if(inventory.isEmtpy()) { - inventory.setCapBank(cap); + if (inventory.isEmtpy()) { + inventory.setCapBank(cap); + } else if (!InventoryImpl.isInventoryEmtpy(cap)) { + if (inventory.isEmtpy()) { + inventory.setCapBank(cap); + } else { + cap.dropItems(); + } + } + } + } + + @Override + public InventoryImpl getInventory() { + return inventory; + } + + @Override + public int getId() { + return id; + } + + @Override + public NetworkState getState() { + return new NetworkState(this); + } + + // --------- Tick Handling + + @Override + public void onUpdateEntity(TileCapBank tileCapBank) { + World world = tileCapBank.getWorldObj(); + if (world == null) { + return; + } + if (world.isRemote) { + return; + } + long curTime = world.getTotalWorldTime(); + if (curTime != timeAtLastApply) { + timeAtLastApply = curTime; + ConduitNetworkTickHandler.instance.addListener(tickListener); + } + } + + private void doNetworkTick() { + + chargeItems(inventory.getStacks()); + transmitEnergy(); + + if (energyStored != prevEnergyStored) { + distributeEnergyToBanks(); + } + powerTrackerIn.tick(energyReceived); + powerTrackerOut.tick(energySend); + prevEnergyStored = energyStored; + energyReceived = 0; + energySend = 0; + + if (firstUpate) { + if (!capBanks.isEmpty()) { + PacketHandler.sendToAllAround(new PacketNetworkStateResponse(this), capBanks.get(0)); + PacketHandler.sendToAllAround(new PacketNetworkEnergyResponse(this), capBanks.get(0)); + } + firstUpate = false; + } + } + + private void transmitEnergy() { + + if (!outputRedstoneConditionMet) { + return; + } + + if (receptors.isEmpty()) { + return; + } + + int available = getEnergyAvailableForTick(getMaxOutput()); + if (available <= 0) { + return; + } + + if (receptorIterator == null) { + List rl = new ArrayList(receptors); + receptorIterator = new RoundRobinIterator(rl); + } + + int totalSent = 0; + Iterator iter = receptorIterator.iterator(); + while (available > 0 && iter.hasNext()) { + int sent = sendPowerTo(iter.next(), available); + totalSent += sent; + available -= sent; + } + addEnergy(-totalSent); + } + + protected int getEnergyAvailableForTick(int limit) { + int available; + if (energyStored > limit) { + available = limit; } else { - cap.dropItems(); + available = (int) energyStored; } - } - - } - } - - @Override - public InventoryImpl getInventory() { - return inventory; - } - - @Override - public int getId() { - return id; - } - - @Override - public NetworkState getState() { - return new NetworkState(this); - } - - //--------- Tick Handling - - @Override - public void onUpdateEntity(TileCapBank tileCapBank) { - World world = tileCapBank.getWorldObj(); - if(world == null) { - return; - } - if(world.isRemote) { - return; - } - long curTime = world.getTotalWorldTime(); - if(curTime != timeAtLastApply) { - timeAtLastApply = curTime; - ConduitNetworkTickHandler.instance.addListener(tickListener); - } - } - - private void doNetworkTick() { - - chargeItems(inventory.getStacks()); - transmitEnergy(); - - if(energyStored != prevEnergyStored) { - distributeEnergyToBanks(); - } - powerTrackerIn.tick(energyReceived); - powerTrackerOut.tick(energySend); - prevEnergyStored = energyStored; - energyReceived = 0; - energySend = 0; - - if(firstUpate) { - if(!capBanks.isEmpty()) { - PacketHandler.sendToAllAround(new PacketNetworkStateResponse(this), capBanks.get(0)); - PacketHandler.sendToAllAround(new PacketNetworkEnergyResponse(this), capBanks.get(0)); - } - firstUpate = false; + return available; } - } - - private void transmitEnergy() { - - if(!outputRedstoneConditionMet) { - return; - } - - if(receptors.isEmpty()) { - return; - } - - int available = getEnergyAvailableForTick(getMaxOutput()); - if(available <= 0) { - return; - } - - if(receptorIterator == null) { - List rl = new ArrayList(receptors); - receptorIterator = new RoundRobinIterator(rl); - } - - int totalSent = 0; - Iterator iter = receptorIterator.iterator(); - while (available > 0 && iter.hasNext()) { - int sent = sendPowerTo(iter.next(), available); - totalSent += sent; - available -= sent; - } - addEnergy(-totalSent); - } - - protected int getEnergyAvailableForTick(int limit) { - int available; - if(energyStored > limit) { - available = limit; - } else { - available = (int) energyStored; - } - return available; - } - - private int sendPowerTo(EnergyReceptor next, int available) { - //Can only send to power conduits if we are in push mode or the conduit is in pull mode - //With default setting interaction between conduits and Cap Banks is handled by NetworkPowerManager - IPowerConduit con = next.getConduit(); - if(con != null && next.getMode() == IoMode.NONE && con.getConnectionMode(next.getDir().getOpposite()) == ConnectionMode.IN_OUT) { - return 0; - } - IPowerInterface inf = next.getReceptor(); - int result = inf.recieveEnergy(next.getDir().getOpposite(), available); - if(result < 0) { - result = 0; - } - return result; - } - - public boolean chargeItems(ItemStack[] items) { - if(items == null) { - return false; - } - boolean chargedItem = false; - int available = getEnergyAvailableForTick(getMaxIO()); - for (ItemStack item : items) { - if(item != null && available > 0 && item.stackSize == 1 && item.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - int max = chargable.getMaxEnergyStored(item); - int cur = chargable.getEnergyStored(item); - if(cur < max) { - int canUse = Math.min(available, max - cur); - int used = chargable.receiveEnergy(item, canUse, false); - if(used > 0) { - addEnergy(-used); - chargedItem = true; - available -= used; - } + private int sendPowerTo(EnergyReceptor next, int available) { + // Can only send to power conduits if we are in push mode or the conduit is in pull mode + // With default setting interaction between conduits and Cap Banks is handled by NetworkPowerManager + IPowerConduit con = next.getConduit(); + if (con != null + && next.getMode() == IoMode.NONE + && con.getConnectionMode(next.getDir().getOpposite()) == ConnectionMode.IN_OUT) { + return 0; } - } - } - return chargedItem; - } - - private void distributeEnergyToBanks() { - if(capBanks.isEmpty()) { - return; - } - int energyPerCapBank = (int) (energyStored / capBanks.size()); - int remaining = (int) (energyStored % capBanks.size()); - for (TileCapBank cb : capBanks) { - cb.setEnergyStored(energyPerCapBank); - } - TileCapBank cb = capBanks.get(0); - cb.setEnergyStored(cb.getEnergyStored() + remaining); - } - - //------ Power - - @Override - public float getAverageChangePerTick() { - return powerTrackerIn.getAverage() - powerTrackerOut.getAverage(); - } - - @Override - public float getAverageInputPerTick() { - return powerTrackerIn.getAverage(); - } - - @Override - public float getAverageOutputPerTick() { - return powerTrackerOut.getAverage(); - } - - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { - if(maxReceive <= 0 || !inputRedstoneConditionMet) { - return 0; + IPowerInterface inf = next.getReceptor(); + int result = inf.recieveEnergy(next.getDir().getOpposite(), available); + if (result < 0) { + result = 0; + } + return result; } - long spaceAvailable = maxEnergyStored - energyStored; - if(spaceAvailable > Integer.MAX_VALUE) { - spaceAvailable = Integer.MAX_VALUE; + public boolean chargeItems(ItemStack[] items) { + if (items == null) { + return false; + } + boolean chargedItem = false; + int available = getEnergyAvailableForTick(getMaxIO()); + for (ItemStack item : items) { + if (item != null + && available > 0 + && item.stackSize == 1 + && item.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + if (cur < max) { + int canUse = Math.min(available, max - cur); + int used = chargable.receiveEnergy(item, canUse, false); + if (used > 0) { + addEnergy(-used); + chargedItem = true; + available -= used; + } + } + } + } + return chargedItem; } - int res = Math.min(maxReceive, (int) spaceAvailable); - res = Math.min(res, getMaxInput()); - if(!simulate) { - addEnergy(res); + + private void distributeEnergyToBanks() { + if (capBanks.isEmpty()) { + return; + } + int energyPerCapBank = (int) (energyStored / capBanks.size()); + int remaining = (int) (energyStored % capBanks.size()); + for (TileCapBank cb : capBanks) { + cb.setEnergyStored(energyPerCapBank); + } + TileCapBank cb = capBanks.get(0); + cb.setEnergyStored(cb.getEnergyStored() + remaining); } - return res; - } - @Override - public void addEnergy(int energy) { - if(energy > 0) { - energyReceived += energy; - } else { - energySend -= energy; - } - if(!type.isCreative()) { - energyStored += energy; - if(energyStored > maxEnergyStored) { - energyStored = maxEnergyStored; - } else if(energyStored < 0) { - energyStored = 0; - } - } - } - - public void addEnergyReceptor(EnergyReceptor rec) { - receptors.add(rec); - receptorIterator = null; - } - - @Override - public void addReceptors(Collection rec) { - if(rec.isEmpty()) { - return; - } - receptors.addAll(rec); - receptorIterator = null; - } - - @Override - public void removeReceptors(Collection rec) { - if(rec.isEmpty()) { - return; - } - receptors.removeAll(rec); - receptorIterator = null; - } - - public void removeReceptor(EnergyReceptor rec) { - receptors.remove(rec); - receptorIterator = null; - } - - @Override - public long getEnergyStoredL() { - return energyStored; - } - - @Override - public long getMaxEnergyStoredL() { - return maxEnergyStored; - } - - @Override - public int getMaxIO() { - return maxIO; - } - - //----- IO overrides - - @Override - public int getMaxInput() { - if(maxInput == -1) { - return maxIO; - } - return Math.min(maxInput, maxIO); - } - - @Override - public int getMaxOutput() { - if(maxOutput == -1) { - return maxIO; - } - return Math.min(maxOutput, maxIO); - } - - @Override - public void setMaxInput(int max) { - if(max >= maxIO) { - maxInput = -1; - } else if(max < 0) { - maxInput = 0; - } else { - maxInput = max; - } - for (TileCapBank cb : capBanks) { - cb.setMaxInput(maxInput); - } - } - - @Override - public void setMaxOutput(int max) { - if(max >= maxIO) { - maxOutput = -1; - } else if(max < 0) { - maxOutput = 0; - } else { - maxOutput = max; - } - for (TileCapBank cb : capBanks) { - cb.setMaxOutput(maxOutput); - } - } - - - - //----------- Redstone - - @Override - public RedstoneControlMode getInputControlMode() { - return inputControlMode; - } - - @Override - public void setInputControlMode(RedstoneControlMode inputControlMode) { - if(this.inputControlMode == inputControlMode) { - return; - } - this.inputControlMode = inputControlMode; - for (TileCapBank capBank : capBanks) { - capBank.setInputControlMode(inputControlMode); - } - updateRedstoneConditions(); - } - - @Override - public RedstoneControlMode getOutputControlMode() { - return outputControlMode; - } - - @Override - public void setOutputControlMode(RedstoneControlMode outputControlMode) { - if(this.outputControlMode == outputControlMode) { - return; - } - this.outputControlMode = outputControlMode; - for (TileCapBank capBank : capBanks) { - capBank.setOutputControlMode(outputControlMode); - } - updateRedstoneConditions(); - } - - @Override - public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { - if(recievingSignal) { - redstoneRecievers.add(tileCapBank.getLocation()); - } else { - redstoneRecievers.remove(tileCapBank.getLocation()); - } - updateRedstoneConditions(); - } - - @Override - public boolean isInputEnabled() { - return inputRedstoneConditionMet; - } - - @Override - public boolean isOutputEnabled() { - return outputRedstoneConditionMet; - } - - private void updateRedstoneConditions() { - int powerLevel = redstoneRecievers.isEmpty() ? 0 : 15; - inputRedstoneConditionMet = RedstoneControlMode.isConditionMet(inputControlMode, powerLevel); - outputRedstoneConditionMet = RedstoneControlMode.isConditionMet(outputControlMode, powerLevel); - - } - - private class TickReciever implements TickListener { + // ------ Power @Override - public void tickStart(ServerTickEvent evt) { + public float getAverageChangePerTick() { + return powerTrackerIn.getAverage() - powerTrackerOut.getAverage(); } @Override - public void tickEnd(ServerTickEvent evt) { - doNetworkTick(); + public float getAverageInputPerTick() { + return powerTrackerIn.getAverage(); } - } + @Override + public float getAverageOutputPerTick() { + return powerTrackerOut.getAverage(); + } - @Override - public IPowerStorage getController() { - return this; - } + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + if (maxReceive <= 0 || !inputRedstoneConditionMet) { + return 0; + } - @Override - public boolean isOutputEnabled(ForgeDirection direction) { - return isOutputEnabled(); - } + long spaceAvailable = maxEnergyStored - energyStored; + if (spaceAvailable > Integer.MAX_VALUE) { + spaceAvailable = Integer.MAX_VALUE; + } + int res = Math.min(maxReceive, (int) spaceAvailable); + res = Math.min(res, getMaxInput()); + if (!simulate) { + addEnergy(res); + } + return res; + } - @Override - public boolean isInputEnabled(ForgeDirection direction) { - return isInputEnabled(); - } + @Override + public void addEnergy(int energy) { + if (energy > 0) { + energyReceived += energy; + } else { + energySend -= energy; + } + if (!type.isCreative()) { + energyStored += energy; + if (energyStored > maxEnergyStored) { + energyStored = maxEnergyStored; + } else if (energyStored < 0) { + energyStored = 0; + } + } + } - @Override - public boolean isCreative() { - return type.isCreative(); - } + public void addEnergyReceptor(EnergyReceptor rec) { + receptors.add(rec); + receptorIterator = null; + } - @Override - public boolean isNetworkControlledIo(ForgeDirection direction) { - //This is handled at the block level based on the IO mode - return true; - } + @Override + public void addReceptors(Collection rec) { + if (rec.isEmpty()) { + return; + } + receptors.addAll(rec); + receptorIterator = null; + } - @Override - public void invalidateDisplayInfoCache() { - } + @Override + public void removeReceptors(Collection rec) { + if (rec.isEmpty()) { + return; + } + receptors.removeAll(rec); + receptorIterator = null; + } + public void removeReceptor(EnergyReceptor rec) { + receptors.remove(rec); + receptorIterator = null; + } + + @Override + public long getEnergyStoredL() { + return energyStored; + } + + @Override + public long getMaxEnergyStoredL() { + return maxEnergyStored; + } + + @Override + public int getMaxIO() { + return maxIO; + } + + // ----- IO overrides + + @Override + public int getMaxInput() { + if (maxInput == -1) { + return maxIO; + } + return Math.min(maxInput, maxIO); + } + + @Override + public int getMaxOutput() { + if (maxOutput == -1) { + return maxIO; + } + return Math.min(maxOutput, maxIO); + } + + @Override + public void setMaxInput(int max) { + if (max >= maxIO) { + maxInput = -1; + } else if (max < 0) { + maxInput = 0; + } else { + maxInput = max; + } + for (TileCapBank cb : capBanks) { + cb.setMaxInput(maxInput); + } + } + + @Override + public void setMaxOutput(int max) { + if (max >= maxIO) { + maxOutput = -1; + } else if (max < 0) { + maxOutput = 0; + } else { + maxOutput = max; + } + for (TileCapBank cb : capBanks) { + cb.setMaxOutput(maxOutput); + } + } + + // ----------- Redstone + + @Override + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + @Override + public void setInputControlMode(RedstoneControlMode inputControlMode) { + if (this.inputControlMode == inputControlMode) { + return; + } + this.inputControlMode = inputControlMode; + for (TileCapBank capBank : capBanks) { + capBank.setInputControlMode(inputControlMode); + } + updateRedstoneConditions(); + } + + @Override + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + @Override + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + if (this.outputControlMode == outputControlMode) { + return; + } + this.outputControlMode = outputControlMode; + for (TileCapBank capBank : capBanks) { + capBank.setOutputControlMode(outputControlMode); + } + updateRedstoneConditions(); + } + + @Override + public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { + if (recievingSignal) { + redstoneRecievers.add(tileCapBank.getLocation()); + } else { + redstoneRecievers.remove(tileCapBank.getLocation()); + } + updateRedstoneConditions(); + } + + @Override + public boolean isInputEnabled() { + return inputRedstoneConditionMet; + } + + @Override + public boolean isOutputEnabled() { + return outputRedstoneConditionMet; + } + + private void updateRedstoneConditions() { + int powerLevel = redstoneRecievers.isEmpty() ? 0 : 15; + inputRedstoneConditionMet = RedstoneControlMode.isConditionMet(inputControlMode, powerLevel); + outputRedstoneConditionMet = RedstoneControlMode.isConditionMet(outputControlMode, powerLevel); + } + + private class TickReciever implements TickListener { + + @Override + public void tickStart(ServerTickEvent evt) {} + + @Override + public void tickEnd(ServerTickEvent evt) { + doNetworkTick(); + } + } + + @Override + public IPowerStorage getController() { + return this; + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + return isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + return isInputEnabled(); + } + + @Override + public boolean isCreative() { + return type.isCreative(); + } + + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + // This is handled at the block level based on the IO mode + return true; + } + + @Override + public void invalidateDisplayInfoCache() {} } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java index 4dc913bd..b5b5ed40 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -1,57 +1,54 @@ package crazypants.enderio.machine.capbank.network; +import crazypants.enderio.machine.capbank.TileCapBank; import java.util.HashMap; import java.util.Map; - import net.minecraft.world.World; -import crazypants.enderio.machine.capbank.TileCapBank; public class ClientNetworkManager { - private static final ClientNetworkManager instance = new ClientNetworkManager(); + private static final ClientNetworkManager instance = new ClientNetworkManager(); - public static ClientNetworkManager getInstance() { - return instance; - } - - private final Map networks = new HashMap(); - - ClientNetworkManager() { - } - - public void destroyNetwork(int id) { - CapBankClientNetwork res = networks.remove(id); - if(res != null) { - res.destroyNetwork(); + public static ClientNetworkManager getInstance() { + return instance; } - } - public void updateState(World world, int id, NetworkState state) { - CapBankClientNetwork network = getOrCreateNetwork(id); - network.setState(world, state); - } + private final Map networks = new HashMap(); - public void updateEnergy(int id, long energyStored, float avgInput, float avgOutput) { - CapBankClientNetwork res = networks.get(id); - if(res == null) { - return; + ClientNetworkManager() {} + + public void destroyNetwork(int id) { + CapBankClientNetwork res = networks.remove(id); + if (res != null) { + res.destroyNetwork(); + } } - res.setEnergyStored(energyStored); - res.setAverageIOPerTick(avgInput, avgOutput); - } - public CapBankClientNetwork getOrCreateNetwork(int id) { - CapBankClientNetwork res = networks.get(id); - if(res == null) { - res = new CapBankClientNetwork(id); - networks.put(id, res); + public void updateState(World world, int id, NetworkState state) { + CapBankClientNetwork network = getOrCreateNetwork(id); + network.setState(world, state); } - return res; - } - public void addToNetwork(int id, TileCapBank tileCapBank) { - CapBankClientNetwork network = getOrCreateNetwork(id); - network.addMember(tileCapBank); - } + public void updateEnergy(int id, long energyStored, float avgInput, float avgOutput) { + CapBankClientNetwork res = networks.get(id); + if (res == null) { + return; + } + res.setEnergyStored(energyStored); + res.setAverageIOPerTick(avgInput, avgOutput); + } + public CapBankClientNetwork getOrCreateNetwork(int id) { + CapBankClientNetwork res = networks.get(id); + if (res == null) { + res = new CapBankClientNetwork(id); + networks.put(id, res); + } + return res; + } + + public void addToNetwork(int id, TileCapBank tileCapBank) { + CapBankClientNetwork network = getOrCreateNetwork(id); + network.addMember(tileCapBank); + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java index c8df1203..08aa7c83 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java @@ -1,92 +1,90 @@ package crazypants.enderio.machine.capbank.network; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.power.IPowerInterface; +import net.minecraftforge.common.util.ForgeDirection; public class EnergyReceptor { - private final IPowerInterface receptor; - private final ForgeDirection fromDir; - private final IoMode mode; - private final BlockCoord location; + private final IPowerInterface receptor; + private final ForgeDirection fromDir; + private final IoMode mode; + private final BlockCoord location; - private final IPowerConduit conduit; + private final IPowerConduit conduit; - public EnergyReceptor(TileCapBank cb, IPowerInterface receptor, ForgeDirection dir) { - this.receptor = receptor; - fromDir = dir; - mode = cb.getIoMode(dir); - if(receptor.getDelegate() instanceof IConduitBundle) { - conduit = ((IConduitBundle) receptor.getDelegate()).getConduit(IPowerConduit.class); - } else { - conduit = null; + public EnergyReceptor(TileCapBank cb, IPowerInterface receptor, ForgeDirection dir) { + this.receptor = receptor; + fromDir = dir; + mode = cb.getIoMode(dir); + if (receptor.getDelegate() instanceof IConduitBundle) { + conduit = ((IConduitBundle) receptor.getDelegate()).getConduit(IPowerConduit.class); + } else { + conduit = null; + } + location = cb.getLocation(); } - location = cb.getLocation(); - } - public IPowerConduit getConduit() { - return conduit; - } - - public IPowerInterface getReceptor() { - return receptor; - } - - public ForgeDirection getDir() { - return fromDir; - } - - public IoMode getMode() { - return mode; - } - - //NB: Special impl of equals and hash code based solely on the location and dir - //This is done to ensure the receptors in the Networks Set are added / removed correctly - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((fromDir == null) ? 0 : fromDir.hashCode()); - result = prime * result + ((location == null) ? 0 : location.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; + public IPowerConduit getConduit() { + return conduit; } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - EnergyReceptor other = (EnergyReceptor) obj; - if(fromDir != other.fromDir) { - return false; - } - if(location == null) { - if(other.location != null) { - return false; - } - } else if(!location.equals(other.location)) { - return false; - } - return true; - } - @Override - public String toString() { - return "EnergyReceptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + ", conduit=" + conduit + "]"; - } + public IPowerInterface getReceptor() { + return receptor; + } + public ForgeDirection getDir() { + return fromDir; + } + + public IoMode getMode() { + return mode; + } + + // NB: Special impl of equals and hash code based solely on the location and dir + // This is done to ensure the receptors in the Networks Set are added / removed correctly + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((fromDir == null) ? 0 : fromDir.hashCode()); + result = prime * result + ((location == null) ? 0 : location.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + EnergyReceptor other = (EnergyReceptor) obj; + if (fromDir != other.fromDir) { + return false; + } + if (location == null) { + if (other.location != null) { + return false; + } + } else if (!location.equals(other.location)) { + return false; + } + return true; + } + + @Override + public String toString() { + return "EnergyReceptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + ", conduit=" + + conduit + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java index 3f1e02ab..5d45d681 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java @@ -1,87 +1,82 @@ package crazypants.enderio.machine.capbank.network; -import java.util.Collection; - import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.power.IPowerStorage; +import java.util.Collection; public interface ICapBankNetwork extends IPowerStorage { - //------ Network + // ------ Network - int getId(); + int getId(); - void addMember(TileCapBank cap); + void addMember(TileCapBank cap); - Collection getMembers(); + Collection getMembers(); - void destroyNetwork(); + void destroyNetwork(); - NetworkState getState(); + NetworkState getState(); - void onUpdateEntity(TileCapBank tileCapBank); + void onUpdateEntity(TileCapBank tileCapBank); + // ------ Energy - //------ Energy + @Override + long getEnergyStoredL(); - @Override - long getEnergyStoredL(); + @Override + void addEnergy(int energy); - @Override - void addEnergy(int energy); + int receiveEnergy(int maxReceive, boolean simulate); - int receiveEnergy(int maxReceive, boolean simulate); + @Override + long getMaxEnergyStoredL(); - @Override - long getMaxEnergyStoredL(); + int getMaxIO(); - int getMaxIO(); + @Override + int getMaxOutput(); - @Override - int getMaxOutput(); + void setMaxOutput(int max); - void setMaxOutput(int max); + @Override + int getMaxInput(); - @Override - int getMaxInput(); + void setMaxInput(int max); - void setMaxInput(int max); + float getAverageChangePerTick(); - float getAverageChangePerTick(); + float getAverageInputPerTick(); - float getAverageInputPerTick(); + float getAverageOutputPerTick(); - float getAverageOutputPerTick(); + void removeReceptors(Collection receptors); - void removeReceptors(Collection receptors); + void addReceptors(Collection receptors); - void addReceptors(Collection receptors); + // ------ Inventory + InventoryImpl getInventory(); - //------ Inventory + // ------ Redstone - InventoryImpl getInventory(); + void setOutputControlMode(RedstoneControlMode outputControlMode); + RedstoneControlMode getOutputControlMode(); - //------ Redstone + void setInputControlMode(RedstoneControlMode inputControlMode); - void setOutputControlMode(RedstoneControlMode outputControlMode); + RedstoneControlMode getInputControlMode(); - RedstoneControlMode getOutputControlMode(); + void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal); - void setInputControlMode(RedstoneControlMode inputControlMode); + boolean isOutputEnabled(); - RedstoneControlMode getInputControlMode(); + boolean isInputEnabled(); - void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal); - - boolean isOutputEnabled(); - - boolean isInputEnabled(); - - //------- rendering info caching - - void invalidateDisplayInfoCache(); + // ------- rendering info caching + void invalidateDisplayInfoCache(); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java b/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java index b0bd241c..0230b033 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java @@ -1,157 +1,152 @@ package crazypants.enderio.machine.capbank.network; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; public class InventoryImpl implements IInventory { - public static boolean isInventoryEmtpy(TileCapBank cap) { - for (ItemStack st : cap.getInventory()) { - if(st != null) { + public static boolean isInventoryEmtpy(TileCapBank cap) { + for (ItemStack st : cap.getInventory()) { + if (st != null) { + return false; + } + } + return true; + } + + public static boolean isInventoryEmtpy(ItemStack[] inv) { + if (inv == null) { + return true; + } + for (ItemStack st : inv) { + if (st != null) { + return false; + } + } + return true; + } + + private ItemStack[] inventory; + + private TileCapBank capBank; + + public InventoryImpl() {} + + public TileCapBank getCapBank() { + return capBank; + } + + public void setCapBank(TileCapBank cap) { + capBank = cap; + if (cap == null) { + inventory = null; + return; + } + inventory = cap.getInventory(); + } + + public boolean isEmtpy() { + return isInventoryEmtpy(inventory); + } + + public ItemStack[] getStacks() { + return inventory; + } + + @Override + public ItemStack getStackInSlot(int slot) { + if (inventory == null) { + return null; + } + if (slot < 0 || slot >= inventory.length) { + return null; + } + return inventory[slot]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + if (inventory == null) { + return null; + } + + if (fromSlot < 0 || fromSlot >= inventory.length) { + return null; + } + ItemStack item = inventory[fromSlot]; + if (item == null) { + return null; + } + if (item.stackSize <= amount) { + ItemStack result = item.copy(); + inventory[fromSlot] = null; + return result; + } + item.stackSize -= amount; + return item.copy(); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemstack) { + if (inventory == null) { + return; + } + if (slot < 0 || slot >= inventory.length) { + return; + } + inventory[slot] = itemstack; + } + + @Override + public int getSizeInventory() { + return 4; + } + + // --- constant values + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + return null; + } + + @Override + public String getInventoryName() { + return EnderIO.blockCapBank.getUnlocalizedName() + ".name"; + } + + @Override + public boolean hasCustomInventoryName() { return false; - } - } - return true; - } - - public static boolean isInventoryEmtpy(ItemStack[] inv) { - if(inv == null) { - return true; - } - for (ItemStack st : inv) { - if(st != null) { - return false; - } - } - return true; - } - - private ItemStack[] inventory; - - private TileCapBank capBank; - - public InventoryImpl() { - } - - public TileCapBank getCapBank() { - return capBank; - } - - public void setCapBank(TileCapBank cap) { - capBank = cap; - if(cap == null) { - inventory = null; - return; - } - inventory = cap.getInventory(); - } - - public boolean isEmtpy() { - return isInventoryEmtpy(inventory); - } - - public ItemStack[] getStacks() { - return inventory; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(inventory == null) { - return null; - } - if(slot < 0 || slot >= inventory.length) { - return null; - } - return inventory[slot]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - if(inventory == null) { - return null; } - if(fromSlot < 0 || fromSlot >= inventory.length) { - return null; + @Override + public int getInventoryStackLimit() { + return 1; } - ItemStack item = inventory[fromSlot]; - if(item == null) { - return null; + + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + return true; } - if(item.stackSize <= amount) { - ItemStack result = item.copy(); - inventory[fromSlot] = null; - return result; + + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { + if (itemstack == null) { + return false; + } + return itemstack.getItem() instanceof IEnergyContainerItem; } - item.stackSize -= amount; - return item.copy(); - } - @Override - public void setInventorySlotContents(int slot, ItemStack itemstack) { - if(inventory == null) { - return; - } - if(slot < 0 || slot >= inventory.length) { - return; - } - inventory[slot] = itemstack; - } + @Override + public void openInventory() {} - @Override - public int getSizeInventory() { - return 4; - } - - //--- constant values - - @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return null; - } - - @Override - public String getInventoryName() { - return EnderIO.blockCapBank.getUnlocalizedName() + ".name"; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { - return true; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) { - if(itemstack == null) { - return false; - } - return itemstack.getItem() instanceof IEnergyContainerItem; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public void markDirty() { - } + @Override + public void closeInventory() {} + @Override + public void markDirty() {} } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java index 9f136a66..a0d0b15a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java @@ -1,123 +1,137 @@ package crazypants.enderio.machine.capbank.network; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; +import io.netty.buffer.ByteBuf; public class NetworkState { - private final long energyStored; - private final long maxEnergyStored; - private final int maxIO; - private final int maxInput; - private final int maxOutput; - private final RedstoneControlMode inputMode; - private final RedstoneControlMode outputMode; - private final BlockCoord invImplLoc; - private final float averageInput; - private final float averageOutput; + private final long energyStored; + private final long maxEnergyStored; + private final int maxIO; + private final int maxInput; + private final int maxOutput; + private final RedstoneControlMode inputMode; + private final RedstoneControlMode outputMode; + private final BlockCoord invImplLoc; + private final float averageInput; + private final float averageOutput; - public NetworkState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode, - RedstoneControlMode outputMode, BlockCoord invImplLoc, float averageInput, float averageOutput) { - this.energyStored = energyStored; - this.maxEnergyStored = maxEnergyStored; - this.maxIO = maxIO; - this.maxInput = maxInput; - this.maxOutput = maxOutput; - this.inputMode = inputMode; - this.outputMode = outputMode; - this.invImplLoc = invImplLoc; - this.averageInput = averageInput; - this.averageOutput = averageOutput; - } - - public NetworkState(ICapBankNetwork network) { - energyStored = network.getEnergyStoredL(); - maxEnergyStored = network.getMaxEnergyStoredL(); - maxIO = network.getMaxIO(); - maxInput = network.getMaxInput(); - maxOutput = network.getMaxOutput(); - inputMode = network.getInputControlMode(); - outputMode = network.getOutputControlMode(); - TileCapBank cb = network.getInventory().getCapBank(); - if(cb != null) { - invImplLoc = cb.getLocation(); - } else { - invImplLoc = null; + public NetworkState( + long energyStored, + long maxEnergyStored, + int maxIO, + int maxInput, + int maxOutput, + RedstoneControlMode inputMode, + RedstoneControlMode outputMode, + BlockCoord invImplLoc, + float averageInput, + float averageOutput) { + this.energyStored = energyStored; + this.maxEnergyStored = maxEnergyStored; + this.maxIO = maxIO; + this.maxInput = maxInput; + this.maxOutput = maxOutput; + this.inputMode = inputMode; + this.outputMode = outputMode; + this.invImplLoc = invImplLoc; + this.averageInput = averageInput; + this.averageOutput = averageOutput; } - averageInput = network.getAverageInputPerTick(); - averageOutput = network.getAverageOutputPerTick(); - } - public long getEnergyStored() { - return energyStored; - } - - public long getMaxEnergyStored() { - return maxEnergyStored; - } - - public int getMaxOutput() { - return maxOutput; - } - - public int getMaxInput() { - return maxInput; - } - - public int getMaxIO() { - return maxIO; - } - - public RedstoneControlMode getInputMode() { - return inputMode; - } - - public RedstoneControlMode getOutputMode() { - return outputMode; - } - - public BlockCoord getInventoryImplLocation() { - return invImplLoc; - } - - public float getAverageInput() { - return averageInput; - } - - public float getAverageOutput() { - return averageOutput; - } - - public void writeToBuf(ByteBuf buf) { - buf.writeLong(energyStored); - buf.writeLong(maxEnergyStored); - buf.writeInt(maxIO); - buf.writeInt(maxInput); - buf.writeInt(maxOutput); - buf.writeShort(inputMode.ordinal()); - buf.writeShort(outputMode.ordinal()); - buf.writeBoolean(invImplLoc != null); - if(invImplLoc != null) { - invImplLoc.writeToBuf(buf); + public NetworkState(ICapBankNetwork network) { + energyStored = network.getEnergyStoredL(); + maxEnergyStored = network.getMaxEnergyStoredL(); + maxIO = network.getMaxIO(); + maxInput = network.getMaxInput(); + maxOutput = network.getMaxOutput(); + inputMode = network.getInputControlMode(); + outputMode = network.getOutputControlMode(); + TileCapBank cb = network.getInventory().getCapBank(); + if (cb != null) { + invImplLoc = cb.getLocation(); + } else { + invImplLoc = null; + } + averageInput = network.getAverageInputPerTick(); + averageOutput = network.getAverageOutputPerTick(); } - buf.writeFloat(averageInput); - buf.writeFloat(averageOutput); - } - public static NetworkState readFromBuf(ByteBuf buf) { - return new NetworkState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(), - RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()], - buf.readBoolean() ? BlockCoord.readFromBuf(buf) : null, buf.readFloat(), buf.readFloat()); - } + public long getEnergyStored() { + return energyStored; + } - @Override - public String toString() { - return "NetworkClientState [energyStored=" + energyStored + ", maxEnergyStored=" + maxEnergyStored + ", maxIO=" + maxIO + ", maxInput=" + maxInput - + ", maxOutput=" + maxOutput + "]"; - } + public long getMaxEnergyStored() { + return maxEnergyStored; + } + public int getMaxOutput() { + return maxOutput; + } + + public int getMaxInput() { + return maxInput; + } + + public int getMaxIO() { + return maxIO; + } + + public RedstoneControlMode getInputMode() { + return inputMode; + } + + public RedstoneControlMode getOutputMode() { + return outputMode; + } + + public BlockCoord getInventoryImplLocation() { + return invImplLoc; + } + + public float getAverageInput() { + return averageInput; + } + + public float getAverageOutput() { + return averageOutput; + } + + public void writeToBuf(ByteBuf buf) { + buf.writeLong(energyStored); + buf.writeLong(maxEnergyStored); + buf.writeInt(maxIO); + buf.writeInt(maxInput); + buf.writeInt(maxOutput); + buf.writeShort(inputMode.ordinal()); + buf.writeShort(outputMode.ordinal()); + buf.writeBoolean(invImplLoc != null); + if (invImplLoc != null) { + invImplLoc.writeToBuf(buf); + } + buf.writeFloat(averageInput); + buf.writeFloat(averageOutput); + } + + public static NetworkState readFromBuf(ByteBuf buf) { + return new NetworkState( + buf.readLong(), + buf.readLong(), + buf.readInt(), + buf.readInt(), + buf.readInt(), + RedstoneControlMode.values()[buf.readShort()], + RedstoneControlMode.values()[buf.readShort()], + buf.readBoolean() ? BlockCoord.readFromBuf(buf) : null, + buf.readFloat(), + buf.readFloat()); + } + + @Override + public String toString() { + return "NetworkClientState [energyStored=" + energyStored + ", maxEnergyStored=" + maxEnergyStored + ", maxIO=" + + maxIO + ", maxInput=" + maxInput + ", maxOutput=" + maxOutput + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index 3cf70997..fc313886 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -1,74 +1,70 @@ package crazypants.enderio.machine.capbank.network; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.capbank.TileCapBank; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.capbank.TileCapBank; - public class NetworkUtil { - private static AtomicInteger nextID = new AtomicInteger(0); + private static AtomicInteger nextID = new AtomicInteger(0); - @SuppressWarnings({ "rawtypes", "unchecked" }) - public static void ensureValidNetwork(TileCapBank cap) { - World world = cap.getWorldObj(); - Collection neighbours = getNeigbours(cap); - if(reuseNetwork(cap, neighbours, world)) { - return; - } - CapBankNetwork network = new CapBankNetwork(nextID.getAndIncrement()); - network.init(cap, neighbours, world); - return; - } - - public static Collection getNeigbours(TileCapBank cap) { - if(!cap.getType().isMultiblock()) { - return Collections.emptyList(); - } - Collection res = new ArrayList(); - getNeigbours(cap, res); - return res; - } - - public static void getNeigbours(TileCapBank cap, Collection res) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord bc = cap.getLocation().getLocation(dir); - TileEntity te = cap.getWorldObj().getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapBank) { - TileCapBank neighbour = (TileCapBank) te; - if(neighbour.canConnectTo(cap)) { - res.add(neighbour); + @SuppressWarnings({"rawtypes", "unchecked"}) + public static void ensureValidNetwork(TileCapBank cap) { + World world = cap.getWorldObj(); + Collection neighbours = getNeigbours(cap); + if (reuseNetwork(cap, neighbours, world)) { + return; } - } + CapBankNetwork network = new CapBankNetwork(nextID.getAndIncrement()); + network.init(cap, neighbours, world); + return; } - } - private static boolean reuseNetwork(TileCapBank cap, Collection neighbours, World world) { - ICapBankNetwork network = null; - for (TileCapBank conduit : neighbours) { - if(network == null) { - network = conduit.getNetwork(); - } else if(network != conduit.getNetwork()) { + public static Collection getNeigbours(TileCapBank cap) { + if (!cap.getType().isMultiblock()) { + return Collections.emptyList(); + } + Collection res = new ArrayList(); + getNeigbours(cap, res); + return res; + } + + public static void getNeigbours(TileCapBank cap, Collection res) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord bc = cap.getLocation().getLocation(dir); + TileEntity te = cap.getWorldObj().getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof TileCapBank) { + TileCapBank neighbour = (TileCapBank) te; + if (neighbour.canConnectTo(cap)) { + res.add(neighbour); + } + } + } + } + + private static boolean reuseNetwork(TileCapBank cap, Collection neighbours, World world) { + ICapBankNetwork network = null; + for (TileCapBank conduit : neighbours) { + if (network == null) { + network = conduit.getNetwork(); + } else if (network != conduit.getNetwork()) { + return false; + } + } + if (network == null) { + return false; + } + if (cap.setNetwork(network)) { + network.addMember(cap); + // network.notifyNetworkOfUpdate(); + return true; + } return false; - } } - if(network == null) { - return false; - } - if(cap.setNetwork(network)) { - network.addMember(cap); - //network.notifyNetworkOfUpdate(); - return true; - } - return false; - } - } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java index 82d3400c..bba31f1d 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java @@ -1,102 +1,101 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public abstract class PacketCapBank implements IMessage, IMessageHandler { +public abstract class PacketCapBank + implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; + private int x; + private int y; + private int z; - public PacketCapBank() { - } + public PacketCapBank() {} - public PacketCapBank(TileCapBank capBank) { - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } - - public int getX() { - return x; - } - - public void setX(int x) { - this.x = x; - } - - public int getY() { - return y; - } - - public void setY(int y) { - this.y = y; - } - - public int getZ() { - return z; - } - - public void setZ(int z) { - this.z = z; - } - - @Override - public Q onMessage(T message, MessageContext ctx) { - - TileCapBank te = getTileEntity(message, ctx); - if(te == null) { - - return null; + public PacketCapBank(TileCapBank capBank) { + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; } - return handleMessage(te, message, ctx); - } - protected abstract Q handleMessage(TileCapBank te, T message, MessageContext ctx); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - protected TileCapBank getTileEntity(T message, MessageContext ctx) { - World worldObj = getWorld(ctx); - if(worldObj == null) { - return null; + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); } - TileEntity te = worldObj.getTileEntity(message.getX(), message.getY(), message.getZ()); - if(te == null) { - return null; - } - if(te instanceof TileCapBank) { - return (TileCapBank) te; - } - return null; - } - protected World getWorld(MessageContext ctx) { - if(ctx.side == Side.SERVER) { - return ctx.getServerHandler().playerEntity.worldObj; - } else { - return EnderIO.proxy.getClientWorld(); + public int getX() { + return x; } - } + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + + public int getZ() { + return z; + } + + public void setZ(int z) { + this.z = z; + } + + @Override + public Q onMessage(T message, MessageContext ctx) { + + TileCapBank te = getTileEntity(message, ctx); + if (te == null) { + + return null; + } + return handleMessage(te, message, ctx); + } + + protected abstract Q handleMessage(TileCapBank te, T message, MessageContext ctx); + + protected TileCapBank getTileEntity(T message, MessageContext ctx) { + World worldObj = getWorld(ctx); + if (worldObj == null) { + return null; + } + TileEntity te = worldObj.getTileEntity(message.getX(), message.getY(), message.getZ()); + if (te == null) { + return null; + } + if (te instanceof TileCapBank) { + return (TileCapBank) te; + } + return null; + } + + protected World getWorld(MessageContext ctx) { + if (ctx.side == Side.SERVER) { + return ctx.getServerHandler().playerEntity.worldObj; + } else { + return EnderIO.proxy.getClientWorld(); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java index 3e743a6e..794863a5 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java @@ -1,60 +1,58 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; +import io.netty.buffer.ByteBuf; public class PacketGuiChange extends PacketCapBank { - private int maxSend; - private int maxRec; - private RedstoneControlMode inputMode; - private RedstoneControlMode outputMode; + private int maxSend; + private int maxRec; + private RedstoneControlMode inputMode; + private RedstoneControlMode outputMode; - public PacketGuiChange() { - } + public PacketGuiChange() {} - public PacketGuiChange(TileCapBank capBank) { - super(capBank); - ICapBankNetwork network = capBank.getNetwork(); - maxSend = network.getMaxOutput(); - maxRec = network.getMaxInput(); - inputMode = network.getInputControlMode(); - outputMode = network.getOutputControlMode(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(maxSend); - buf.writeInt(maxRec); - buf.writeShort(inputMode.ordinal()); - buf.writeShort(outputMode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - maxSend = buf.readInt(); - maxRec = buf.readInt(); - inputMode = RedstoneControlMode.values()[buf.readShort()]; - outputMode = RedstoneControlMode.values()[buf.readShort()]; - } - - @Override - protected IMessage handleMessage(TileCapBank te, PacketGuiChange message, MessageContext ctx) { - ICapBankNetwork net = te.getNetwork(); - if(net == null) { - return null; + public PacketGuiChange(TileCapBank capBank) { + super(capBank); + ICapBankNetwork network = capBank.getNetwork(); + maxSend = network.getMaxOutput(); + maxRec = network.getMaxInput(); + inputMode = network.getInputControlMode(); + outputMode = network.getOutputControlMode(); } - net.setMaxOutput(message.maxSend); - net.setMaxInput(message.maxRec); - net.setInputControlMode(message.inputMode); - net.setOutputControlMode(message.outputMode); - return null; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(maxSend); + buf.writeInt(maxRec); + buf.writeShort(inputMode.ordinal()); + buf.writeShort(outputMode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + maxSend = buf.readInt(); + maxRec = buf.readInt(); + inputMode = RedstoneControlMode.values()[buf.readShort()]; + outputMode = RedstoneControlMode.values()[buf.readShort()]; + } + + @Override + protected IMessage handleMessage(TileCapBank te, PacketGuiChange message, MessageContext ctx) { + ICapBankNetwork net = te.getNetwork(); + if (net == null) { + return null; + } + net.setMaxOutput(message.maxSend); + net.setMaxInput(message.maxRec); + net.setInputControlMode(message.inputMode); + net.setOutputControlMode(message.outputMode); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java index db79e28d..6a9db43f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java @@ -5,19 +5,18 @@ import crazypants.enderio.machine.capbank.TileCapBank; public class PacketNetworkEnergyRequest extends PacketCapBank { - public PacketNetworkEnergyRequest() { - } + public PacketNetworkEnergyRequest() {} - public PacketNetworkEnergyRequest(TileCapBank capBank) { - super(capBank); - } - - @Override - protected PacketNetworkEnergyResponse handleMessage(TileCapBank te, PacketNetworkEnergyRequest message, MessageContext ctx) { - if(te.getNetwork() != null) { - return new PacketNetworkEnergyResponse(te.getNetwork()); + public PacketNetworkEnergyRequest(TileCapBank capBank) { + super(capBank); } - return null; - } + @Override + protected PacketNetworkEnergyResponse handleMessage( + TileCapBank te, PacketNetworkEnergyRequest message, MessageContext ctx) { + if (te.getNetwork() != null) { + return new PacketNetworkEnergyResponse(te.getNetwork()); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java index d62c7592..f9bad0c1 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java @@ -1,49 +1,48 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; +import io.netty.buffer.ByteBuf; public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler { - private int id; - private long energyStored; - private float avgInput; - private float avgOutput; + private int id; + private long energyStored; + private float avgInput; + private float avgOutput; - public PacketNetworkEnergyResponse() { - } + public PacketNetworkEnergyResponse() {} - public PacketNetworkEnergyResponse(ICapBankNetwork network) { - id = network.getId(); - energyStored = network.getEnergyStoredL(); - avgInput = network.getAverageInputPerTick(); - avgOutput = network.getAverageOutputPerTick(); - } + public PacketNetworkEnergyResponse(ICapBankNetwork network) { + id = network.getId(); + energyStored = network.getEnergyStoredL(); + avgInput = network.getAverageInputPerTick(); + avgOutput = network.getAverageOutputPerTick(); + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(id); - buf.writeLong(energyStored); - buf.writeFloat(avgInput); - buf.writeFloat(avgOutput); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(id); + buf.writeLong(energyStored); + buf.writeFloat(avgInput); + buf.writeFloat(avgOutput); + } - @Override - public void fromBytes(ByteBuf buf) { - id = buf.readInt(); - energyStored = buf.readLong(); - avgInput = buf.readFloat(); - avgOutput = buf.readFloat(); - } - - @Override - public IMessage onMessage(PacketNetworkEnergyResponse message, MessageContext ctx) { - ClientNetworkManager.getInstance().updateEnergy(message.id, message.energyStored, message.avgInput, message.avgOutput); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + id = buf.readInt(); + energyStored = buf.readLong(); + avgInput = buf.readFloat(); + avgOutput = buf.readFloat(); + } + @Override + public IMessage onMessage(PacketNetworkEnergyResponse message, MessageContext ctx) { + ClientNetworkManager.getInstance() + .updateEnergy(message.id, message.energyStored, message.avgInput, message.avgOutput); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java index 420dc483..7a7ddb74 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java @@ -5,19 +5,18 @@ import crazypants.enderio.machine.capbank.TileCapBank; public class PacketNetworkIdRequest extends PacketCapBank { - public PacketNetworkIdRequest() { - } + public PacketNetworkIdRequest() {} - public PacketNetworkIdRequest(TileCapBank capBank) { - super(capBank); - } - - @Override - protected PacketNetworkIdResponse handleMessage(TileCapBank te, PacketNetworkIdRequest message, MessageContext ctx) { - if(te.getNetwork() != null) { - return new PacketNetworkIdResponse(te); + public PacketNetworkIdRequest(TileCapBank capBank) { + super(capBank); } - return null; - } + @Override + protected PacketNetworkIdResponse handleMessage( + TileCapBank te, PacketNetworkIdRequest message, MessageContext ctx) { + if (te.getNetwork() != null) { + return new PacketNetworkIdResponse(te); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java index 8eda0642..cfc1cbe7 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java @@ -1,44 +1,42 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import io.netty.buffer.ByteBuf; public class PacketNetworkIdResponse extends PacketCapBank { - private int id; - - public PacketNetworkIdResponse() { - } + private int id; - PacketNetworkIdResponse(TileCapBank capBank) { - super(capBank); - if(capBank != null && capBank.getNetwork() != null) { - id = capBank.getNetwork().getId(); - } else { - id = -1; + public PacketNetworkIdResponse() {} + + PacketNetworkIdResponse(TileCapBank capBank) { + super(capBank); + if (capBank != null && capBank.getNetwork() != null) { + id = capBank.getNetwork().getId(); + } else { + id = -1; + } } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(id); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(id); + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - id = buf.readInt(); - } - - @Override - protected IMessage handleMessage(TileCapBank te, PacketNetworkIdResponse message, MessageContext ctx) { - te.setNetworkId(message.id); - te.setNetwork(ClientNetworkManager.getInstance().getOrCreateNetwork(message.id)); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + id = buf.readInt(); + } + @Override + protected IMessage handleMessage(TileCapBank te, PacketNetworkIdResponse message, MessageContext ctx) { + te.setNetworkId(message.id); + te.setNetwork(ClientNetworkManager.getInstance().getOrCreateNetwork(message.id)); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java index dcb43be0..b5bca65f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java @@ -6,17 +6,16 @@ import crazypants.enderio.machine.capbank.network.ICapBankNetwork; public class PacketNetworkStateRequest extends PacketCapBank { - public PacketNetworkStateRequest() { - } + public PacketNetworkStateRequest() {} - public PacketNetworkStateRequest(TileCapBank capBank) { - super(capBank); - } - - @Override - protected PacketNetworkStateResponse handleMessage(TileCapBank te, PacketNetworkStateRequest message, MessageContext ctx) { - ICapBankNetwork network = te.getNetwork(); - return network == null ? null : new PacketNetworkStateResponse(network); - } + public PacketNetworkStateRequest(TileCapBank capBank) { + super(capBank); + } + @Override + protected PacketNetworkStateResponse handleMessage( + TileCapBank te, PacketNetworkStateRequest message, MessageContext ctx) { + ICapBankNetwork network = te.getNetwork(); + return network == null ? null : new PacketNetworkStateResponse(network); + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java index 3e4b7aff..920d1ace 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -8,56 +7,55 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; import crazypants.enderio.machine.capbank.network.NetworkState; +import io.netty.buffer.ByteBuf; public class PacketNetworkStateResponse implements IMessage, IMessageHandler { - private int id; - private NetworkState state; + private int id; + private NetworkState state; - public PacketNetworkStateResponse() { - } + public PacketNetworkStateResponse() {} - public PacketNetworkStateResponse(ICapBankNetwork network) { - this(network, false); - } - - public PacketNetworkStateResponse(ICapBankNetwork network, boolean remove) { - id = network.getId(); - if(!remove) { - state = network.getState(); - } else { - state = null; + public PacketNetworkStateResponse(ICapBankNetwork network) { + this(network, false); } - } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(id); - buf.writeBoolean(state != null); - if(state != null) { - state.writeToBuf(buf); + public PacketNetworkStateResponse(ICapBankNetwork network, boolean remove) { + id = network.getId(); + if (!remove) { + state = network.getState(); + } else { + state = null; + } } - } - @Override - public void fromBytes(ByteBuf buf) { - id = buf.readInt(); - boolean hasState = buf.readBoolean(); - if(hasState) { - state = NetworkState.readFromBuf(buf); - } else { - state = null; + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(id); + buf.writeBoolean(state != null); + if (state != null) { + state.writeToBuf(buf); + } } - } - @Override - public IMessage onMessage(PacketNetworkStateResponse message, MessageContext ctx) { - if(message.state != null) { - ClientNetworkManager.getInstance().updateState(EnderIO.proxy.getClientWorld(), message.id, message.state); - } else { - ClientNetworkManager.getInstance().destroyNetwork(message.id); + @Override + public void fromBytes(ByteBuf buf) { + id = buf.readInt(); + boolean hasState = buf.readBoolean(); + if (hasState) { + state = NetworkState.readFromBuf(buf); + } else { + state = null; + } } - return null; - } + @Override + public IMessage onMessage(PacketNetworkStateResponse message, MessageContext ctx) { + if (message.state != null) { + ClientNetworkManager.getInstance().updateState(EnderIO.proxy.getClientWorld(), message.id, message.state); + } else { + ClientNetworkManager.getInstance().destroyNetwork(message.id); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index 77e53bd3..87b635ba 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -1,27 +1,9 @@ package crazypants.enderio.machine.capbank.render; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.ConnectedTextureRenderer; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.CustomCubeRenderer; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,151 +16,163 @@ import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.render.FillGauge.GaugeInfo; import crazypants.enderio.machine.capbank.render.FillGauge.GaugeKey; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - private ConnectedTextureRenderer connectedTexRenderer; + private ConnectedTextureRenderer connectedTexRenderer; - private Map infoRenderers; - private FillGauge fillGaugeRenderer; + private Map infoRenderers; + private FillGauge fillGaugeRenderer; - public CapBankRenderer() { - connectedTexRenderer = new ConnectedTextureRenderer(); - connectedTexRenderer.setMatchMeta(true); - fillGaugeRenderer = new FillGauge(); - infoRenderers = new HashMap(); - infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer); - infoRenderers.put(InfoDisplayType.IO, new IoDisplay()); - } - - //------- Block - - @Override - 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) { - - int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); - CapBankType type = CapBankType.getTypeFromMeta(meta); - if(!type.isMultiblock()) { - connectedTexRenderer.setForceAllEdges(true); - } else { - connectedTexRenderer.setForceAllEdges(false); - } - connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta)); - CustomCubeRenderer.instance.setOverrideTexture(renderer.overrideBlockTexture); - if (renderer.overrideBlockTexture == null) { - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer); - } else { - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z); - } - CustomCubeRenderer.instance.setOverrideTexture(null); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCapBank.renderId; - } - - //------- Item - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - - tes.startDrawingQuads(); - CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage()); - tes.draw(); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - tes.startDrawingQuads(); - tes.setColorRGBA_F(1, 1, 1, 1); - tes.addTranslation(0, -0.1f, 0); - renderBorder(null, 0, 0, 0, item.getItemDamage()); - tes.draw(); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - - - CapBankClientNetwork nw = new CapBankClientNetwork(-1); - nw.setMaxEnergyStoredL(CapBankType.getTypeFromMeta(item.getItemDamage()).getMaxEnergyStored()); - nw.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(item)); - - GaugeInfo gi = new GaugeInfo(1, 0); - GaugeKey key = new GaugeKey(ForgeDirection.SOUTH, FillGauge.Type.SINGLE); - fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); - // key = new GaugeKey(ForgeDirection.EAST, FillGauge.Type.SINGLE); - // fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); - tes.addTranslation(0, 0.1f, 0); - } - - private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { - IIcon texture = EnderIO.blockCapBank.getBorderIcon(0, meta); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - RenderUtil.renderConnectedTextureFace(blockAccess, EnderIO.blockCapBank, x, y, z, face, texture, - blockAccess == null, false, false); - } - } - - //---- Info Display - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - - TileCapBank cb = (TileCapBank) te; - if(!cb.hasDisplayTypes()) { - return; + public CapBankRenderer() { + connectedTexRenderer = new ConnectedTextureRenderer(); + connectedTexRenderer.setMatchMeta(true); + fillGaugeRenderer = new FillGauge(); + infoRenderers = new HashMap(); + infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer); + infoRenderers.put(InfoDisplayType.IO, new IoDisplay()); } - boolean glSetup = false; + // ------- Block - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - InfoDisplayType type = cb.getDisplayType(dir); - if(type != InfoDisplayType.NONE) { - IInfoRenderer rend = infoRenderers.get(type); - if(rend != null) { - if(!glSetup) { - glSetup = true; - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {} - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - } + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - rend.render(cb, dir, x, y, z, partialTick); + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); + CapBankType type = CapBankType.getTypeFromMeta(meta); + if (!type.isMultiblock()) { + connectedTexRenderer.setForceAllEdges(true); + } else { + connectedTexRenderer.setForceAllEdges(false); } - } + connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta)); + CustomCubeRenderer.instance.setOverrideTexture(renderer.overrideBlockTexture); + if (renderer.overrideBlockTexture == null) { + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer); + } else { + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z); + } + CustomCubeRenderer.instance.setOverrideTexture(null); + return true; } - if(glSetup) { - GL11.glPopMatrix(); - GL11.glPopAttrib(); + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; } - } + @Override + public int getRenderId() { + return BlockCapBank.renderId; + } + + // ------- Item + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + + tes.startDrawingQuads(); + CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage()); + tes.draw(); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + tes.startDrawingQuads(); + tes.setColorRGBA_F(1, 1, 1, 1); + tes.addTranslation(0, -0.1f, 0); + renderBorder(null, 0, 0, 0, item.getItemDamage()); + tes.draw(); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + CapBankClientNetwork nw = new CapBankClientNetwork(-1); + nw.setMaxEnergyStoredL(CapBankType.getTypeFromMeta(item.getItemDamage()).getMaxEnergyStored()); + nw.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(item)); + + GaugeInfo gi = new GaugeInfo(1, 0); + GaugeKey key = new GaugeKey(ForgeDirection.SOUTH, FillGauge.Type.SINGLE); + fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); + // key = new GaugeKey(ForgeDirection.EAST, FillGauge.Type.SINGLE); + // fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); + tes.addTranslation(0, 0.1f, 0); + } + + private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { + IIcon texture = EnderIO.blockCapBank.getBorderIcon(0, meta); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + RenderUtil.renderConnectedTextureFace( + blockAccess, EnderIO.blockCapBank, x, y, z, face, texture, blockAccess == null, false, false); + } + } + + // ---- Info Display + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + + TileCapBank cb = (TileCapBank) te; + if (!cb.hasDisplayTypes()) { + return; + } + + boolean glSetup = false; + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + InfoDisplayType type = cb.getDisplayType(dir); + if (type != InfoDisplayType.NONE) { + IInfoRenderer rend = infoRenderers.get(type); + if (rend != null) { + if (!glSetup) { + glSetup = true; + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + } + + rend.render(cb, dir, x, y, z, partialTick); + } + } + } + + if (glSetup) { + GL11.glPopMatrix(); + GL11.glPopAttrib(); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index 33bc3dd5..9e2bd5d4 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -1,18 +1,5 @@ package crazypants.enderio.machine.capbank.render; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; @@ -20,290 +7,296 @@ import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4f; import com.enderio.core.common.vecmath.Vertex; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class FillGauge implements IInfoRenderer, IResourceManagerReloadListener { - private static final double HEIGHT = 0.75; - private static final double VERT_BORDER = (1 - HEIGHT) / 2; - private static final double WIDTH = 0.25; + private static final double HEIGHT = 0.75; + private static final double VERT_BORDER = (1 - HEIGHT) / 2; + private static final double WIDTH = 0.25; - enum Type { - SINGLE, - TOP, - BOTTOM, - MIDDLE - } - - private IIcon barIcon; - private IIcon gaugeIcon; - - private float barHeightV; - - private Map> gaugeVertexCache; - private Map> levelVertexCache; - private float barMinV; - - FillGauge() { - RenderUtil.registerReloadListener(this); - } - - @Override - public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { - - CapBankClientNetwork nw = null; - if(cb.getNetwork() != null) { - nw = (CapBankClientNetwork) cb.getNetwork(); - nw.requestPowerUpdate(cb, 20); + enum Type { + SINGLE, + TOP, + BOTTOM, + MIDDLE } - int brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); - GaugeInfo info = getGaugeInfo(cb, dir); - GaugeKey key = new GaugeKey(dir, info.type); - doRender(nw, brightness, info, key); + private IIcon barIcon; + private IIcon gaugeIcon; - } + private float barHeightV; - public void doRender(CapBankClientNetwork nw, int brightness, GaugeInfo info, GaugeKey key) { - if(gaugeVertexCache == null) { - createVertexCache(); - } - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - tes.setBrightness(brightness); - tes.setColorOpaque_F(1, 1, 1); - List verts = gaugeVertexCache.get(key); - RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); - renderFillBar(key, nw, info); - tes.draw(); - } + private Map> gaugeVertexCache; + private Map> levelVertexCache; + private float barMinV; - private void renderFillBar(GaugeKey key, CapBankClientNetwork nw, GaugeInfo info) { - double ratio = 0; - if(nw != null) { - ratio = nw.getEnergyStoredRatio(); - } - if(ratio <= 0) { - return; - } - double maxY = ratio * info.height; - if(maxY <= info.yPosition) { - //empty - return; - } - - Vector3d offset = ForgeDirectionOffsets.offsetScaled(key.dir, 0.005); - Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); - - List verts = levelVertexCache.get(key); - if(maxY >= info.yPosition + 1) { - //full bar - RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); - - } else { - //need to render partial bar - double myMaxY = maxY - info.yPosition; - - if(info.type == Type.BOTTOM || info.type == Type.SINGLE) { - //If we have some power and we are the bottom bit of the display, - //always show at least a little bit in the bar - myMaxY = Math.max(0.2, myMaxY); - } - List newVerts = new ArrayList(); - for (Vertex v : verts) { - v = new Vertex(v); - newVerts.add(v); - if(v.y() > myMaxY) { - v.setXYZ(v.x(), myMaxY, v.z()); - v.setUV(v.u(), barMinV + (float) (myMaxY * barHeightV)); - } - } - RenderUtil.addVerticesToTessellator(newVerts, Tessellator.instance); - } - offset.scale(-1); - Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); - - } - - private GaugeInfo getGaugeInfo(TileCapBank cb, ForgeDirection dir) { - - if (!cb.getType().isMultiblock()) { - return new GaugeInfo(1, 0); - } - - int height = 1; - int yPos = 0; - BlockCoord loc = cb.getLocation(); - boolean found = true; - while (found) { - loc = loc.getLocation(ForgeDirection.UP); - if(isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { - height++; - } else { - found = false; - } - } - - loc = cb.getLocation(); - found = true; - while (found) { - loc = loc.getLocation(ForgeDirection.DOWN); - if(isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { - height++; - yPos++; - } else { - found = false; - } - } - - return new GaugeInfo(height, yPos); - - } - - private boolean isGaugeType(World worldObj, BlockCoord bc, ForgeDirection face, CapBankType type) { - TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapBank) { - TileCapBank cb = (TileCapBank) te; - return type == cb.getType() && cb.getDisplayType(face) == InfoDisplayType.LEVEL_BAR; - } - return false; - } - - @Override - public void onResourceManagerReload(IResourceManager p_110549_1_) { - createVertexCache(); - } - - private void createVertexCache() { - barIcon = EnderIO.blockCapBank.getFillBarIcon(); - barMinV = barIcon.getMinV(); - barHeightV = barIcon.getMaxV() - barIcon.getMinV(); - gaugeIcon = EnderIO.blockCapBank.getGaugeIcon(); - - gaugeVertexCache = new HashMap>(); - levelVertexCache = new HashMap>(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir.offsetY == 0) { - for (Type type : Type.values()) { - GaugeKey key = new GaugeKey(dir, type); - gaugeVertexCache.put(key, createGaugeBoundForFace(key, gaugeIcon)); - levelVertexCache.put(key, createGaugeBoundForFace(key, barIcon)); - } - } - } - } - - protected List createGaugeBoundForFace(GaugeKey key, IIcon icon) { - - ForgeDirection dir = key.dir; - Type type = key.type; - - double widthScale = 0.25; - double heightScale = 0.8; - - double xScale = dir.offsetX == 0 ? widthScale : 1; - double yScale = 1; - double zScale = dir.offsetZ == 0 ? widthScale : 1; - - BoundingBox bb = BoundingBox.UNIT_CUBE; - Vector3d off = ForgeDirectionOffsets.forDirCopy(dir); - off.scale(-1); - bb = bb.translate(off); - bb = bb.scale(xScale, yScale, zScale); - off.scale(-1); - bb = bb.translate(off); - - Vector4f uv = getUvForType(key.type, icon); - - List result = bb.getCornersWithUvForFace(dir, uv.x, uv.y, uv.z, uv.w); - return result; - } - - private Vector4f getUvForType(Type type, IIcon icon) { - double uWidth = (icon.getMaxU() - icon.getMinU()) / 4; - - Vector4f res = new Vector4f(); - res.x = (float) (icon.getMinU() + type.ordinal() * uWidth); - res.y = (float) (res.x + uWidth); - - res.z = icon.getMinV(); - res.w = icon.getMaxV(); - return res; - } - - static class GaugeInfo { - - int height; - int yPosition; - Type type; - - GaugeInfo(int height, int position) { - this.height = height; - yPosition = position; - type = calcType(); - } - - Type calcType() { - if(height == 1) { - return Type.SINGLE; - } - if(yPosition == 0) { - return Type.BOTTOM; - } - if(yPosition == height - 1) { - return Type.TOP; - } - return Type.MIDDLE; - } - - } - - static class GaugeKey { - - ForgeDirection dir; - Type type; - - GaugeKey(ForgeDirection dir, Type type) { - this.dir = dir; - this.type = type; + FillGauge() { + RenderUtil.registerReloadListener(this); } @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((dir == null) ? 0 : dir.hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); - return result; + public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { + + CapBankClientNetwork nw = null; + if (cb.getNetwork() != null) { + nw = (CapBankClientNetwork) cb.getNetwork(); + nw.requestPowerUpdate(cb, 20); + } + + int brightness = cb.getWorldObj() + .getLightBrightnessForSkyBlocks( + cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + GaugeInfo info = getGaugeInfo(cb, dir); + GaugeKey key = new GaugeKey(dir, info.type); + doRender(nw, brightness, info, key); + } + + public void doRender(CapBankClientNetwork nw, int brightness, GaugeInfo info, GaugeKey key) { + if (gaugeVertexCache == null) { + createVertexCache(); + } + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + tes.setBrightness(brightness); + tes.setColorOpaque_F(1, 1, 1); + List verts = gaugeVertexCache.get(key); + RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); + renderFillBar(key, nw, info); + tes.draw(); + } + + private void renderFillBar(GaugeKey key, CapBankClientNetwork nw, GaugeInfo info) { + double ratio = 0; + if (nw != null) { + ratio = nw.getEnergyStoredRatio(); + } + if (ratio <= 0) { + return; + } + double maxY = ratio * info.height; + if (maxY <= info.yPosition) { + // empty + return; + } + + Vector3d offset = ForgeDirectionOffsets.offsetScaled(key.dir, 0.005); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + + List verts = levelVertexCache.get(key); + if (maxY >= info.yPosition + 1) { + // full bar + RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); + + } else { + // need to render partial bar + double myMaxY = maxY - info.yPosition; + + if (info.type == Type.BOTTOM || info.type == Type.SINGLE) { + // If we have some power and we are the bottom bit of the display, + // always show at least a little bit in the bar + myMaxY = Math.max(0.2, myMaxY); + } + List newVerts = new ArrayList(); + for (Vertex v : verts) { + v = new Vertex(v); + newVerts.add(v); + if (v.y() > myMaxY) { + v.setXYZ(v.x(), myMaxY, v.z()); + v.setUV(v.u(), barMinV + (float) (myMaxY * barHeightV)); + } + } + RenderUtil.addVerticesToTessellator(newVerts, Tessellator.instance); + } + offset.scale(-1); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + } + + private GaugeInfo getGaugeInfo(TileCapBank cb, ForgeDirection dir) { + + if (!cb.getType().isMultiblock()) { + return new GaugeInfo(1, 0); + } + + int height = 1; + int yPos = 0; + BlockCoord loc = cb.getLocation(); + boolean found = true; + while (found) { + loc = loc.getLocation(ForgeDirection.UP); + if (isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { + height++; + } else { + found = false; + } + } + + loc = cb.getLocation(); + found = true; + while (found) { + loc = loc.getLocation(ForgeDirection.DOWN); + if (isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { + height++; + yPos++; + } else { + found = false; + } + } + + return new GaugeInfo(height, yPos); + } + + private boolean isGaugeType(World worldObj, BlockCoord bc, ForgeDirection face, CapBankType type) { + TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof TileCapBank) { + TileCapBank cb = (TileCapBank) te; + return type == cb.getType() && cb.getDisplayType(face) == InfoDisplayType.LEVEL_BAR; + } + return false; } @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - GaugeKey other = (GaugeKey) obj; - if(dir != other.dir) { - return false; - } - if(type != other.type) { - return false; - } - return true; + public void onResourceManagerReload(IResourceManager p_110549_1_) { + createVertexCache(); } - } + private void createVertexCache() { + barIcon = EnderIO.blockCapBank.getFillBarIcon(); + barMinV = barIcon.getMinV(); + barHeightV = barIcon.getMaxV() - barIcon.getMinV(); + gaugeIcon = EnderIO.blockCapBank.getGaugeIcon(); + gaugeVertexCache = new HashMap>(); + levelVertexCache = new HashMap>(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir.offsetY == 0) { + for (Type type : Type.values()) { + GaugeKey key = new GaugeKey(dir, type); + gaugeVertexCache.put(key, createGaugeBoundForFace(key, gaugeIcon)); + levelVertexCache.put(key, createGaugeBoundForFace(key, barIcon)); + } + } + } + } + + protected List createGaugeBoundForFace(GaugeKey key, IIcon icon) { + + ForgeDirection dir = key.dir; + Type type = key.type; + + double widthScale = 0.25; + double heightScale = 0.8; + + double xScale = dir.offsetX == 0 ? widthScale : 1; + double yScale = 1; + double zScale = dir.offsetZ == 0 ? widthScale : 1; + + BoundingBox bb = BoundingBox.UNIT_CUBE; + Vector3d off = ForgeDirectionOffsets.forDirCopy(dir); + off.scale(-1); + bb = bb.translate(off); + bb = bb.scale(xScale, yScale, zScale); + off.scale(-1); + bb = bb.translate(off); + + Vector4f uv = getUvForType(key.type, icon); + + List result = bb.getCornersWithUvForFace(dir, uv.x, uv.y, uv.z, uv.w); + return result; + } + + private Vector4f getUvForType(Type type, IIcon icon) { + double uWidth = (icon.getMaxU() - icon.getMinU()) / 4; + + Vector4f res = new Vector4f(); + res.x = (float) (icon.getMinU() + type.ordinal() * uWidth); + res.y = (float) (res.x + uWidth); + + res.z = icon.getMinV(); + res.w = icon.getMaxV(); + return res; + } + + static class GaugeInfo { + + int height; + int yPosition; + Type type; + + GaugeInfo(int height, int position) { + this.height = height; + yPosition = position; + type = calcType(); + } + + Type calcType() { + if (height == 1) { + return Type.SINGLE; + } + if (yPosition == 0) { + return Type.BOTTOM; + } + if (yPosition == height - 1) { + return Type.TOP; + } + return Type.MIDDLE; + } + } + + static class GaugeKey { + + ForgeDirection dir; + Type type; + + GaugeKey(ForgeDirection dir, Type type) { + this.dir = dir; + this.type = type; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + GaugeKey other = (GaugeKey) obj; + if (dir != other.dir) { + return false; + } + if (type != other.type) { + return false; + } + return true; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java index 1c2b977c..5f07c064 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java @@ -1,10 +1,9 @@ package crazypants.enderio.machine.capbank.render; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.capbank.TileCapBank; +import net.minecraftforge.common.util.ForgeDirection; public interface IInfoRenderer { - void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick); - + void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index 5e7ab479..95c8deac 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -1,237 +1,235 @@ package crazypants.enderio.machine.capbank.render; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.power.PowerDisplayUtil; import java.util.Locale; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; -import crazypants.enderio.machine.power.PowerDisplayUtil; - public class IoDisplay implements IInfoRenderer { - @Override - public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { - if(dir.offsetY != 0) { - return; - } - - CapBankClientNetwork nw = (CapBankClientNetwork) cb.getNetwork(); - if(nw == null) { - return; - } - - CapBankClientNetwork.IOInfo info = nw.getIODisplayInfo(cb.xCoord, cb.yCoord, cb.zCoord, dir); - if(info.isInside()) { - return; - } - - boolean selfIlum = true; - int brightness = 0; - if(!selfIlum) { - brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); - int l1 = brightness % 65536; - int l2 = brightness / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - } else { - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - } - - boolean drawBackground = true; - if(drawBackground) { - RenderUtil.bindBlockTexture(); - - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - if(!selfIlum) { - tes.setBrightness(brightness); - } - tes.setColorOpaque_F(1, 1, 1); - - float scale = 0.85f; - float offset = (1-scale)/2; - IIcon icon = EnderIO.blockCapBank.getInfoPanelIcon(); - float minU = icon.getMinU(); - float maxU = icon.getMaxU(); - float minV = icon.getMinV(); - float maxV = icon.getMaxV(); - - switch (dir) { - case NORTH: { - float y0 = offset - (info.height-1); - float y1 = 1 - offset; - float x0 = offset; - float x1 = info.width - offset; - float z0 = 0; - tes.setNormal(0, 0, -1); - tes.addVertexWithUV(x1, y0, z0, minU, minV); - tes.addVertexWithUV(x0, y0, z0, maxU, minV); - tes.addVertexWithUV(x0, y1, z0, maxU, maxV); - tes.addVertexWithUV(x1, y1, z0, minU, maxV); - break; + @Override + public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { + if (dir.offsetY != 0) { + return; } - case SOUTH: { - float y0 = offset - (info.height-1); - float y1 = 1 - offset; - float x0 = offset - (info.width-1); - float x1 = 1 - offset; - float z1 = 1; - tes.setNormal(0, 0, 1); - tes.addVertexWithUV(x0, y0, z1, maxU, minV); - tes.addVertexWithUV(x1, y0, z1, minU, minV); - tes.addVertexWithUV(x1, y1, z1, minU, maxV); - tes.addVertexWithUV(x0, y1, z1, maxU, maxV); - break; + CapBankClientNetwork nw = (CapBankClientNetwork) cb.getNetwork(); + if (nw == null) { + return; } - case EAST: { - float y0 = offset - (info.height-1); - float y1 = 1 - offset; - float z0 = offset; - float z1 = info.width - offset; - float x1 = 1; - tes.setNormal(1, 0, 0); - tes.addVertexWithUV(x1, y1, z0, maxU, maxV); - tes.addVertexWithUV(x1, y1, z1, minU, maxV); - tes.addVertexWithUV(x1, y0, z1, minU, minV); - tes.addVertexWithUV(x1, y0, z0, maxU, minV); - break; + CapBankClientNetwork.IOInfo info = nw.getIODisplayInfo(cb.xCoord, cb.yCoord, cb.zCoord, dir); + if (info.isInside()) { + return; } - case WEST: { - float y0 = offset - (info.height-1); - float y1 = 1 - offset; - float z0 = offset - (info.width-1); - float z1 = 1 - offset; - float x0 = 0; - tes.setNormal(-1, 0, 0); - tes.addVertexWithUV(x0, y0, z0, maxU, minV); - tes.addVertexWithUV(x0, y0, z1, minU, minV); - tes.addVertexWithUV(x0, y1, z1, minU, maxV); - tes.addVertexWithUV(x0, y1, z0, maxU, maxV); - break; + boolean selfIlum = true; + int brightness = 0; + if (!selfIlum) { + brightness = cb.getWorldObj() + .getLightBrightnessForSkyBlocks( + cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + int l1 = brightness % 65536; + int l2 = brightness / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + } else { + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); } - default: - throw new AssertionError(); - } + boolean drawBackground = true; + if (drawBackground) { + RenderUtil.bindBlockTexture(); - tes.draw(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + if (!selfIlum) { + tes.setBrightness(brightness); + } + tes.setColorOpaque_F(1, 1, 1); + + float scale = 0.85f; + float offset = (1 - scale) / 2; + IIcon icon = EnderIO.blockCapBank.getInfoPanelIcon(); + float minU = icon.getMinU(); + float maxU = icon.getMaxU(); + float minV = icon.getMinV(); + float maxV = icon.getMaxV(); + + switch (dir) { + case NORTH: { + float y0 = offset - (info.height - 1); + float y1 = 1 - offset; + float x0 = offset; + float x1 = info.width - offset; + float z0 = 0; + tes.setNormal(0, 0, -1); + tes.addVertexWithUV(x1, y0, z0, minU, minV); + tes.addVertexWithUV(x0, y0, z0, maxU, minV); + tes.addVertexWithUV(x0, y1, z0, maxU, maxV); + tes.addVertexWithUV(x1, y1, z0, minU, maxV); + break; + } + + case SOUTH: { + float y0 = offset - (info.height - 1); + float y1 = 1 - offset; + float x0 = offset - (info.width - 1); + float x1 = 1 - offset; + float z1 = 1; + tes.setNormal(0, 0, 1); + tes.addVertexWithUV(x0, y0, z1, maxU, minV); + tes.addVertexWithUV(x1, y0, z1, minU, minV); + tes.addVertexWithUV(x1, y1, z1, minU, maxV); + tes.addVertexWithUV(x0, y1, z1, maxU, maxV); + break; + } + + case EAST: { + float y0 = offset - (info.height - 1); + float y1 = 1 - offset; + float z0 = offset; + float z1 = info.width - offset; + float x1 = 1; + tes.setNormal(1, 0, 0); + tes.addVertexWithUV(x1, y1, z0, maxU, maxV); + tes.addVertexWithUV(x1, y1, z1, minU, maxV); + tes.addVertexWithUV(x1, y0, z1, minU, minV); + tes.addVertexWithUV(x1, y0, z0, maxU, minV); + break; + } + + case WEST: { + float y0 = offset - (info.height - 1); + float y1 = 1 - offset; + float z0 = offset - (info.width - 1); + float z1 = 1 - offset; + float x0 = 0; + tes.setNormal(-1, 0, 0); + tes.addVertexWithUV(x0, y0, z0, maxU, minV); + tes.addVertexWithUV(x0, y0, z1, minU, minV); + tes.addVertexWithUV(x0, y1, z1, minU, maxV); + tes.addVertexWithUV(x0, y1, z0, maxU, maxV); + break; + } + + default: + throw new AssertionError(); + } + + tes.draw(); + } + + nw.requestPowerUpdate(cb, 20); + + HeadingText heading1 = HeadingText.STABLE; + HeadingText heading2 = null; + String text1; + String text2 = ""; + + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + float size = 0.15f * Math.min(info.width, info.height); + float scale = size / fr.FONT_HEIGHT; + float offset; + + if (info.height * 3 >= info.width * 4) { + heading1 = HeadingText.INPUT; + heading2 = HeadingText.OUTPUT; + text1 = getChangeText(nw.getAverageInputPerTick(), fr); + text2 = getChangeText(nw.getAverageOutputPerTick(), fr); + offset = -size * 2.5f; + } else { + int change = Math.round(nw.getAverageChangePerTick()); + if (change > 0) { + heading1 = HeadingText.GAIN; + } else if (change < 0) { + heading1 = HeadingText.LOSS; + } + text1 = getChangeText(change, fr); + offset = -size; + } + + ForgeDirection right = dir.getRotation(ForgeDirection.UP); + + GL11.glPushMatrix(); + GL11.glTranslatef( + (dir.offsetX * 1.02f) / 2 + 0.5f + right.offsetX * (info.width - 1) * 0.5f, + 1 + size * 0.5f - info.height * 0.5f, + (dir.offsetZ * 1.02f) / 2 + 0.5f + right.offsetZ * (info.width - 1) * 0.5f); + GL11.glRotatef(-180, 1, 0, 0); + if (dir == ForgeDirection.NORTH) { + GL11.glRotatef(-180, 0, 1, 0); + } else if (dir == ForgeDirection.EAST) { + GL11.glRotatef(-90, 0, 1, 0); + } else if (dir == ForgeDirection.WEST) { + GL11.glRotatef(90, 0, 1, 0); + } + + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + + offset = drawText(heading1, text1, offset, scale, size, fr); + if (heading2 != null) { + drawText(heading2, text2, offset, scale, size, fr); + } + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); } - nw.requestPowerUpdate(cb, 20); + private float drawText(HeadingText heading, String text, float offset, float scale, float size, FontRenderer fr) { + GL11.glPushMatrix(); + GL11.glTranslatef(0, offset, 0); + GL11.glScalef(scale, scale, scale); + fr.drawString(heading.text, -fr.getStringWidth(heading.text) / 2, 0, 0); + GL11.glPopMatrix(); + offset += size * 1.5f; - HeadingText heading1 = HeadingText.STABLE; - HeadingText heading2 = null; - String text1; - String text2 = ""; + GL11.glPushMatrix(); + GL11.glTranslatef(0, offset, 0); + GL11.glScalef(scale, scale, scale); + fr.drawString(text, -fr.getStringWidth(text) / 2, 0, heading.color); + GL11.glPopMatrix(); + offset += size * 1.5f; - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - float size = 0.15f * Math.min(info.width, info.height); - float scale = size / fr.FONT_HEIGHT; - float offset; - - if(info.height*3 >= info.width*4) { - heading1 = HeadingText.INPUT; - heading2 = HeadingText.OUTPUT; - text1 = getChangeText(nw.getAverageInputPerTick(), fr); - text2 = getChangeText(nw.getAverageOutputPerTick(), fr); - offset = -size*2.5f; - } else { - int change = Math.round(nw.getAverageChangePerTick()); - if(change > 0) { - heading1 = HeadingText.GAIN; - } else if(change < 0) { - heading1 = HeadingText.LOSS; - } - text1 = getChangeText(change, fr); - offset = -size; + return offset; } - ForgeDirection right = dir.getRotation(ForgeDirection.UP); - - GL11.glPushMatrix(); - GL11.glTranslatef( - (dir.offsetX * 1.02f)/2 + 0.5f + right.offsetX*(info.width-1)*0.5f, - 1 + size*0.5f - info.height*0.5f, - (dir.offsetZ * 1.02f)/2 + 0.5f + right.offsetZ*(info.width-1)*0.5f); - GL11.glRotatef(-180, 1, 0, 0); - if(dir == ForgeDirection.NORTH) { - GL11.glRotatef(-180, 0, 1, 0); - } else if(dir == ForgeDirection.EAST) { - GL11.glRotatef(-90, 0, 1, 0); - } else if(dir == ForgeDirection.WEST) { - GL11.glRotatef(90, 0, 1, 0); + protected String getChangeText(float average, FontRenderer fr) { + int change = Math.round(Math.abs(average)); + String txt = PowerDisplayUtil.INT_NF.format(change); + int width = fr.getStringWidth(txt); + if (width > 38 && change > 1000) { + change = change / 1000; + txt = PowerDisplayUtil.INT_NF.format(change) + "K"; + } + return txt; } - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + static enum HeadingText { + STABLE(ColorUtil.getRGB(0, 0, 0)), + GAIN(ColorUtil.getRGB(0, 0.25f, 0)), + LOSS(ColorUtil.getRGB(0.25f, 0, 0)), + INPUT(ColorUtil.getRGB(0, 0.25f, 0)), + OUTPUT(ColorUtil.getRGB(0.25f, 0, 0)); - offset = drawText(heading1, text1, offset, scale, size, fr); - if(heading2 != null) { - drawText(heading2, text2, offset, scale, size, fr); + final String text; + final int color; + + private HeadingText(int color) { + this.text = EnderIO.lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.US))); + this.color = color; + } } - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } - - private float drawText(HeadingText heading, String text, float offset, float scale, float size, FontRenderer fr) { - GL11.glPushMatrix(); - GL11.glTranslatef(0, offset, 0); - GL11.glScalef(scale, scale, scale); - fr.drawString(heading.text, -fr.getStringWidth(heading.text) / 2, 0, 0); - GL11.glPopMatrix(); - offset += size * 1.5f; - - GL11.glPushMatrix(); - GL11.glTranslatef(0, offset, 0); - GL11.glScalef(scale, scale, scale); - fr.drawString(text, -fr.getStringWidth(text) / 2, 0, heading.color); - GL11.glPopMatrix(); - offset += size * 1.5f; - - return offset; - } - - protected String getChangeText(float average, FontRenderer fr) { - int change = Math.round(Math.abs(average)); - String txt = PowerDisplayUtil.INT_NF.format(change); - int width = fr.getStringWidth(txt); - if(width > 38 && change > 1000) { - change = change / 1000; - txt = PowerDisplayUtil.INT_NF.format(change) + "K"; - } - return txt; - } - - static enum HeadingText { - STABLE(ColorUtil.getRGB(0, 0, 0)), - GAIN(ColorUtil.getRGB(0, 0.25f, 0)), - LOSS(ColorUtil.getRGB(0.25f, 0, 0)), - INPUT(ColorUtil.getRGB(0, 0.25f, 0)), - OUTPUT(ColorUtil.getRGB(0.25f, 0, 0)); - - final String text; - final int color; - - private HeadingText(int color) { - this.text = EnderIO.lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.US))); - this.color = color; - } - } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java index f52b65b9..0f58b87e 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/BlockCrafter.java @@ -1,68 +1,68 @@ package crazypants.enderio.machine.crafter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class BlockCrafter extends AbstractMachineBlock { - public static BlockCrafter create() { - PacketHandler.INSTANCE.registerMessage(PacketCrafter.class,PacketCrafter.class,PacketHandler.nextID(), Side.SERVER); - BlockCrafter res = new BlockCrafter(); - res.init(); - return res; - } - - protected BlockCrafter() { - super(ModObject.blockCrafter, TileCrafter.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCrafter) { - return new ContainerCrafter(player.inventory, (TileCrafter) te); + public static BlockCrafter create() { + PacketHandler.INSTANCE.registerMessage( + PacketCrafter.class, PacketCrafter.class, PacketHandler.nextID(), Side.SERVER); + BlockCrafter res = new BlockCrafter(); + res.init(); + return res; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCrafter) { - return new GuiCrafter(player.inventory, (TileCrafter) te); + protected BlockCrafter() { + super(ModObject.blockCrafter, TileCrafter.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_CRAFTER; - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCrafter) { + return new ContainerCrafter(player.inventory, (TileCrafter) te); + } + return null; + } - @Override - protected String getMachineFrontIconKey(boolean active) { - return "enderio:crafter"; - } - - @Override - protected String getSideIconKey(boolean active) { - return "enderio:crafterSide"; - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCrafter) { + return new GuiCrafter(player.inventory, (TileCrafter) te); + } + return null; + } - @Override - protected String getBackIconKey(boolean active) { - return getSideIconKey(active); - } + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_CRAFTER; + } - @Override - protected String getTopIconKey(boolean active) { - return "enderio:crafterTop"; - } + @Override + protected String getMachineFrontIconKey(boolean active) { + return "enderio:crafter"; + } + @Override + protected String getSideIconKey(boolean active) { + return "enderio:crafterSide"; + } + + @Override + protected String getBackIconKey(boolean active) { + return getSideIconKey(active); + } + + @Override + protected String getTopIconKey(boolean active) { + return "enderio:crafterTop"; + } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java index c3aae9e5..c2b01a67 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java @@ -1,114 +1,111 @@ package crazypants.enderio.machine.crafter; +import com.enderio.core.client.gui.widget.GhostSlot; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import crazypants.enderio.network.PacketHandler; import java.awt.Point; import java.util.List; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostSlot; - -import crazypants.enderio.machine.gui.AbstractMachineContainer; -import crazypants.enderio.network.PacketHandler; - public class ContainerCrafter extends AbstractMachineContainer { - public ContainerCrafter(InventoryPlayer playerInv, TileCrafter te) { - super(playerInv, te); - } - - public void addCrafterSlots(List ghostSlots) { - int topY = 16; - int leftX = 31; - int index = 0; - - for (int row = 0; row < 3; ++row) { - for (int col = 0; col < 3; ++col) { - int x = leftX + col * 18; - int y = topY + row * 18; - ghostSlots.add(new DummySlot(index, x, y)); - index++; - } + public ContainerCrafter(InventoryPlayer playerInv, TileCrafter te) { + super(playerInv, te); } - ghostSlots.add(new DummySlot(9, 90, 34)); - } + public void addCrafterSlots(List ghostSlots) { + int topY = 16; + int leftX = 31; + int index = 0; - @Override - public Point getPlayerInventoryOffset() { - return new Point(30, 84); - } + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + int x = leftX + col * 18; + int y = topY + row * 18; + ghostSlots.add(new DummySlot(index, x, y)); + index++; + } + } - @Override - public Point getUpgradeOffset() { - return new Point(6, 60); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - int topY = 16; - int leftX = 113; - int index = 0; - - for (int row = 0; row < 3; ++row) { - for (int col = 0; col < 3; ++col) { - int x = leftX + col * 18; - int y = topY + row * 18; - addSlotToContainer(new InputSlot(getInv(), index, x, y)); - index++; - } - } - addSlotToContainer(new Slot(getInv(), 9, 172, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return false; - } - }); - } - - private class InputSlot extends Slot { - - public InputSlot(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); + ghostSlots.add(new DummySlot(9, 90, 34)); } @Override - public boolean isItemValid(ItemStack itemStack) { - - ItemStack refStack = getInv().craftingGrid.getStackInSlot(slotNumber); - if(refStack == null || itemStack == null) { - return false; - } - return TileCrafter.compareDamageable(itemStack, refStack); - } - } - - private class DummySlot extends GhostSlot { - private final int slotIndex; - - public DummySlot(int slotIndex, int x, int y) { - this.slotIndex = slotIndex; - this.x = x; - this.y = y; + public Point getPlayerInventoryOffset() { + return new Point(30, 84); } @Override - public ItemStack getStack() { - return getInv().craftingGrid.getStackInSlot(slotIndex); + public Point getUpgradeOffset() { + return new Point(6, 60); } @Override - public void putStack(ItemStack stack) { - if(slotIndex >= 9) { - return; - } - if(stack != null) { - stack = stack.copy(); - stack.stackSize = 1; - } - PacketHandler.INSTANCE.sendToServer(PacketCrafter.setSlot(getInv(), slotIndex, stack)); + protected void addMachineSlots(InventoryPlayer playerInv) { + int topY = 16; + int leftX = 113; + int index = 0; + + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + int x = leftX + col * 18; + int y = topY + row * 18; + addSlotToContainer(new InputSlot(getInv(), index, x, y)); + index++; + } + } + addSlotToContainer(new Slot(getInv(), 9, 172, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return false; + } + }); + } + + private class InputSlot extends Slot { + + public InputSlot(IInventory par1iInventory, int par2, int par3, int par4) { + super(par1iInventory, par2, par3, par4); + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + + ItemStack refStack = getInv().craftingGrid.getStackInSlot(slotNumber); + if (refStack == null || itemStack == null) { + return false; + } + return TileCrafter.compareDamageable(itemStack, refStack); + } + } + + private class DummySlot extends GhostSlot { + private final int slotIndex; + + public DummySlot(int slotIndex, int x, int y) { + this.slotIndex = slotIndex; + this.x = x; + this.y = y; + } + + @Override + public ItemStack getStack() { + return getInv().craftingGrid.getStackInSlot(slotIndex); + } + + @Override + public void putStack(ItemStack stack) { + if (slotIndex >= 9) { + return; + } + if (stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + } + PacketHandler.INSTANCE.sendToServer(PacketCrafter.setSlot(getInv(), slotIndex, stack)); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java b/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java index 019b4574..f3e1701d 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java +++ b/src/main/java/crazypants/enderio/machine/crafter/DummyCraftingGrid.java @@ -8,123 +8,118 @@ import net.minecraft.nbt.NBTTagList; public class DummyCraftingGrid implements IInventory { - ItemStack[] inv = new ItemStack[10]; + ItemStack[] inv = new ItemStack[10]; - public boolean hasValidRecipe() { - return getOutput() != null; - } - - public ItemStack getOutput() { - return inv[9]; - } - - @Override - public int getSizeInventory() { - return inv.length; - } - - @Override - public ItemStack getStackInSlot(int var1) { - if(var1 < 0 || var1 >= inv.length) { - return null; - } - return inv[var1]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack item = inv[fromSlot]; - inv[fromSlot] = null; - if(item == null) { - return null; - } - item.stackSize = 0; - return item; - } - - @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return null; - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - if(itemstack != null) { - inv[i] = itemstack.copy(); - if(i < 9) { - inv[i].stackSize = 0; - } - } else { - inv[i] = null; + public boolean hasValidRecipe() { + return getOutput() != null; } - } - - @Override - public String getInventoryName() { - return "CraftingGrid"; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 0; - } - - @Override - public void markDirty() { - } - - @Override - public boolean isUseableByPlayer(EntityPlayer var1) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int var1, ItemStack var2) { - return var1 < 9; - } - - public void readFromNBT(NBTTagCompound nbtRoot) { - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if(itemList == null) { - for (int i = 0; i < inv.length; i++) { - inv[i] = null; - } - return; + public ItemStack getOutput() { + return inv[9]; } - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inv.length) { - inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); - } - } - } - public void writeToNBT(NBTTagCompound nbtRoot) { - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inv.length; i++) { - if(inv[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inv[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } + @Override + public int getSizeInventory() { + return inv.length; } - nbtRoot.setTag("Items", itemList); - } + @Override + public ItemStack getStackInSlot(int var1) { + if (var1 < 0 || var1 >= inv.length) { + return null; + } + return inv[var1]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack item = inv[fromSlot]; + inv[fromSlot] = null; + if (item == null) { + return null; + } + item.stackSize = 0; + return item; + } + + @Override + public ItemStack getStackInSlotOnClosing(int var1) { + return null; + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + if (itemstack != null) { + inv[i] = itemstack.copy(); + if (i < 9) { + inv[i].stackSize = 0; + } + } else { + inv[i] = null; + } + } + + @Override + public String getInventoryName() { + return "CraftingGrid"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 0; + } + + @Override + public void markDirty() {} + + @Override + public boolean isUseableByPlayer(EntityPlayer var1) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int var1, ItemStack var2) { + return var1 < 9; + } + + public void readFromNBT(NBTTagCompound nbtRoot) { + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + if (itemList == null) { + for (int i = 0; i < inv.length; i++) { + inv[i] = null; + } + return; + } + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inv.length) { + inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + + public void writeToNBT(NBTTagCompound nbtRoot) { + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inv.length; i++) { + if (inv[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inv[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); + } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index bbc427cc..c2f13311 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -1,18 +1,7 @@ package crazypants.enderio.machine.crafter; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; @@ -20,91 +9,96 @@ import crazypants.enderio.machine.PacketItemBuffer; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; -public class GuiCrafter extends GuiPoweredMachineBase { +public class GuiCrafter extends GuiPoweredMachineBase { - private final ToggleButton bufferSizeB; + private final ToggleButton bufferSizeB; - public GuiCrafter(InventoryPlayer par1InventoryPlayer, TileCrafter te) { - super(te, new ContainerCrafter(par1InventoryPlayer, te), "crafter"); - xSize = getXSize(); + public GuiCrafter(InventoryPlayer par1InventoryPlayer, TileCrafter te) { + super(te, new ContainerCrafter(par1InventoryPlayer, te), "crafter"); + xSize = getXSize(); - int x = getXSize() - 5 - 16; - int y = 43; - bufferSizeB = new ToggleButton(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); - bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); - bufferSizeB.setSelected(te.isBufferStacks()); - } + int x = getXSize() - 5 - 16; + int y = 43; + bufferSizeB = new ToggleButton(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); + bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); + bufferSizeB.setSelected(te.isBufferStacks()); + } - @Override - public void initGui() { - super.initGui(); - bufferSizeB.onGuiInit(); - ((ContainerCrafter) inventorySlots).addCrafterSlots(ghostSlots); - } + @Override + public void initGui() { + super.initGui(); + bufferSizeB.onGuiInit(); + ((ContainerCrafter) inventorySlots).addCrafterSlots(ghostSlots); + } - @Override - protected void mouseClickMove(int mouseX, int mouseY, int button, long par4) { - if(!ghostSlots.isEmpty()) { - GhostSlot slot = getGhostSlot(mouseX, mouseY); - if(slot != null) { - ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); - // don't replace already set slots while dragging an item - if(st == null || slot.getStack() == null) { - slot.putStack(st); + @Override + protected void mouseClickMove(int mouseX, int mouseY, int button, long par4) { + if (!ghostSlots.isEmpty()) { + GhostSlot slot = getGhostSlot(mouseX, mouseY); + if (slot != null) { + ItemStack st = Minecraft.getMinecraft().thePlayer.inventory.getItemStack(); + // don't replace already set slots while dragging an item + if (st == null || slot.getStack() == null) { + slot.putStack(st); + } + } } - } + super.mouseClickMove(mouseX, mouseY, button, par4); } - super.mouseClickMove(mouseX, mouseY, button, par4); - } - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b == bufferSizeB) { - getTileEntity().setBufferStacks(bufferSizeB.isSelected()); - PacketHandler.INSTANCE.sendToServer(new PacketItemBuffer(getTileEntity())); + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b == bufferSizeB) { + getTileEntity().setBufferStacks(bufferSizeB.isSelected()); + PacketHandler.INSTANCE.sendToServer(new PacketItemBuffer(getTileEntity())); + } } - } - @Override - protected boolean showRecipeButton() { - return false; - } + @Override + protected boolean showRecipeButton() { + return false; + } - @Override - public final int getXSize() { - return 219; - } - - @Override - protected int getPowerU() { - return 220; - } + @Override + public final int getXSize() { + return 219; + } - @Override - protected int getPowerX() { - return 9; - } - - @Override - protected void updatePowerBarTooltip(List text) { - text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() - + " " + EnderIO.lang.localize("gui.machine.percraft")); - super.updatePowerBarTooltip(text); - } + @Override + protected int getPowerU() { + return 220; + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + @Override + protected int getPowerX() { + return 9; + } - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + @Override + protected void updatePowerBarTooltip(List text) { + text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() + " " + + EnderIO.lang.localize("gui.machine.percraft")); + super.updatePowerBarTooltip(text); + } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java index 7d89d7b4..4c98a567 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java @@ -1,61 +1,57 @@ package crazypants.enderio.machine.crafter; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; public class PacketCrafter extends MessageTileEntity implements IMessageHandler { - private int slot; - private ItemStack stack; + private int slot; + private ItemStack stack; - public PacketCrafter() { - } + public PacketCrafter() {} - private PacketCrafter(TileCrafter tile) { - super(tile); - } - - public static PacketCrafter setSlot(TileCrafter te, int slot, ItemStack stack) { - PacketCrafter msg = new PacketCrafter(te); - msg.slot = slot; - msg.stack = stack; - msg.execute(te); - return msg; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - slot = buf.readShort(); - stack = ByteBufUtils.readItemStack(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(slot); - ByteBufUtils.writeItemStack(buf, stack); - } - - @Override - public IMessage onMessage(PacketCrafter msg, MessageContext ctx) { - TileCrafter te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if(te != null) { - msg.execute(te); + private PacketCrafter(TileCrafter tile) { + super(tile); } - return null; - } - - private void execute(TileCrafter te) { - te.craftingGrid.setInventorySlotContents(slot, stack); - te.updateCraftingOutput(); - } + public static PacketCrafter setSlot(TileCrafter te, int slot, ItemStack stack) { + PacketCrafter msg = new PacketCrafter(te); + msg.slot = slot; + msg.stack = stack; + msg.execute(te); + return msg; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + slot = buf.readShort(); + stack = ByteBufUtils.readItemStack(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(slot); + ByteBufUtils.writeItemStack(buf, stack); + } + + @Override + public IMessage onMessage(PacketCrafter msg, MessageContext ctx) { + TileCrafter te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + msg.execute(te); + } + return null; + } + + private void execute(TileCrafter te) { + te.craftingGrid.setInventorySlotContents(slot, stack); + te.updateCraftingOutput(); + } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index 7a6e81d9..10358094 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -1,23 +1,7 @@ package crazypants.enderio.machine.crafter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayer; - import com.enderio.core.common.util.ItemUtil; import com.mojang.authlib.GameProfile; - import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -28,339 +12,359 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuffer { - DummyCraftingGrid craftingGrid = new DummyCraftingGrid(); + DummyCraftingGrid craftingGrid = new DummyCraftingGrid(); - private final List containerItems; + private final List containerItems; - private boolean bufferStacks = true; + private boolean bufferStacks = true; - private long ticksSinceLastCraft = 0; + private long ticksSinceLastCraft = 0; - private FakePlayer playerInst; + private FakePlayer playerInst; - public TileCrafter() { - super(new SlotDefinition(9, 1)); - containerItems = new ArrayList(); - } - - @Override - public void onCapacitorTypeChange() { - ICapacitor refCap = getCapacitor(); - int maxUse = getPowerUsePerTick(getCapacitorType()); - int io = Math.max(maxUse, refCap.getMaxEnergyExtracted()); - setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io)); - } - - @Override - public String getMachineName() { - return ModObject.blockCrafter.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { - if(!slotDefinition.isInputSlot(slot)) { - return false; + public TileCrafter() { + super(new SlotDefinition(9, 1)); + containerItems = new ArrayList(); } - return craftingGrid.inv[slot] != null && compareDamageable(itemstack, craftingGrid.inv[slot]); - } - @Override - public boolean isActive() { - return false; - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - ticksSinceLastCraft++; - if(!redstoneCheckPassed || !craftingGrid.hasValidRecipe() || !canMergeOutput() || !hasRequiredPower()) { - return false; + @Override + public void onCapacitorTypeChange() { + ICapacitor refCap = getCapacitor(); + int maxUse = getPowerUsePerTick(getCapacitorType()); + int io = Math.max(maxUse, refCap.getMaxEnergyExtracted()); + setCapacitor(new BasicCapacitor(0, io * 4, refCap.getMaxEnergyStored(), io)); } - int ticksPerCraft = getTicksPerCraft(getCapacitorType()); - if(ticksSinceLastCraft <= ticksPerCraft) { - return false; - } - ticksSinceLastCraft = 0; - // process buffered container items - if(!containerItems.isEmpty()) { - Iterator iter = containerItems.iterator(); - while (iter.hasNext()) { - ItemStack stack = iter.next(); - if(inventory[9] == null) { - inventory[9] = stack; - iter.remove(); - } else if(ItemUtil.areStackMergable(inventory[9], stack) && inventory[9].stackSize + stack.stackSize <= inventory[9].getMaxStackSize()) { - inventory[9].stackSize += stack.stackSize; - iter.remove(); + @Override + public String getMachineName() { + return ModObject.blockCrafter.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { + if (!slotDefinition.isInputSlot(slot)) { + return false; } - } - return false; + return craftingGrid.inv[slot] != null && compareDamageable(itemstack, craftingGrid.inv[slot]); } - if(craftRecipe()) { - int used = Math.min(getEnergyStored(), Config.crafterRfPerCraft); - setEnergyStored(getEnergyStored() - used); - } - return false; - } - - private boolean hasRequiredPower() { - return getEnergyStored() >= Config.crafterRfPerCraft; - } - - @Override - public int getPowerUsePerTick() { - return getPowerUsePerTick(getCapacitorType()); - } - - public int getPowerUsePerTick(Capacitors type) { - int ticks = getTicksPerCraft(type); - return (int)Math.ceil(Config.crafterRfPerCraft / (double)ticks); - } - - public int getTicksPerCraft(Capacitors type) { - if(type == Capacitors.BASIC_CAPACITOR) { - return 20; - } else if(type == Capacitors.ACTIVATED_CAPACITOR) { - return 10; - } else { - return 2; - } - } - - static boolean compareDamageable(ItemStack stack, ItemStack req) { - if(stack.isItemEqual(req)) { - return true; - } - if(stack.isItemStackDamageable() && stack.getItem() == req.getItem()) { - return stack.getItemDamage() < stack.getMaxDamage(); - } - return false; - } - - private static final UUID uuid = UUID.fromString("9b381cae-3c95-4a64-b958-1e25b0a4c790"); - private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioCrafter]"); - - private boolean craftRecipe() { - - // (1) Find the items to craft with and put a copy into a temp crafting grid; - // also record what was used to destroy it later - InventoryCrafting inv = new InventoryCrafting(new Container() { - @Override - public boolean canInteractWith(EntityPlayer var1) { + @Override + public boolean isActive() { return false; - } - }, 3, 3); - - int[] usedItems = new int[9]; - - for (int j = 0; j < 9; j++) { - ItemStack req = craftingGrid.getStackInSlot(j); - if (req != null) { - for (int i = 0; i < 9; i++) { - if (inventory[i] != null && inventory[i].stackSize > usedItems[i] && compareDamageable(inventory[i], req)) { - req = null; - usedItems[i]++; - ItemStack craftingItem = inventory[i].copy(); - craftingItem.stackSize = 1; - inv.setInventorySlotContents(j, craftingItem); - break; - } - } - if (req != null) { - return false; - } - } } - // (2) Try to craft with the temp grid - ItemStack output = CraftingManager.getInstance().findMatchingRecipe(inv, worldObj); - - // (3) If we got a result, ... - if (output != null) { - if (playerInst == null) { - playerInst = new FakePlayerEIO(worldObj, getLocation(), DUMMY_PROFILE); - } - MinecraftForge.EVENT_BUS.post(new ItemCraftedEvent(playerInst, output, inv)); - - // (3a) ... remove the used up items and ... - for (int i = 0; i < 9; i++) { - for (int j = 0; j < usedItems[i] && inventory[i] != null; j++) { - setInventorySlotContents(i, eatOneItemForCrafting(inventory[i].copy())); + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + ticksSinceLastCraft++; + if (!redstoneCheckPassed || !craftingGrid.hasValidRecipe() || !canMergeOutput() || !hasRequiredPower()) { + return false; } - } + int ticksPerCraft = getTicksPerCraft(getCapacitorType()); + if (ticksSinceLastCraft <= ticksPerCraft) { + return false; + } + ticksSinceLastCraft = 0; - // (3b) ... put the result into its slot - if (inventory[9] == null) { - setInventorySlotContents(9, output); - } else if (ItemUtil.areStackMergable(inventory[9], output)) { - ItemStack cur = inventory[9].copy(); - cur.stackSize += output.stackSize; - if (cur.stackSize > cur.getMaxStackSize()) { - // we check beforehand that there is enough free space, but some mod may return different - // amounts based on the nbt of the input items (e.g. magical wood) - ItemStack overflow = cur.copy(); - overflow.stackSize = cur.stackSize - cur.getMaxStackSize(); - cur.stackSize = cur.getMaxStackSize(); - containerItems.add(overflow); + // process buffered container items + if (!containerItems.isEmpty()) { + Iterator iter = containerItems.iterator(); + while (iter.hasNext()) { + ItemStack stack = iter.next(); + if (inventory[9] == null) { + inventory[9] = stack; + iter.remove(); + } else if (ItemUtil.areStackMergable(inventory[9], stack) + && inventory[9].stackSize + stack.stackSize <= inventory[9].getMaxStackSize()) { + inventory[9].stackSize += stack.stackSize; + iter.remove(); + } + } + return false; } - setInventorySlotContents(9, cur); - } else { - // some mod may return different nbt based on the nbt of the input items (e.g. TE machines?) - containerItems.add(output); - } - } else { - // Crafting failed. This is not supposed to happen, but if a recipe is nbt-sensitive, it can. - // To avoid being stuck in a dead loop, we flush the non-working input items. - for (int j = 0; j < 9; j++) { - if (usedItems[j] > 0 && inventory[j] != null) { - ItemStack rejected = inventory[j].copy(); - rejected.stackSize = Math.min(inventory[j].stackSize, usedItems[j]); - containerItems.add(rejected); - if (inventory[j].stackSize <= usedItems[j]) { - inventory[j] = null; - } else { - inventory[j].stackSize -= usedItems[j]; - } + + if (craftRecipe()) { + int used = Math.min(getEnergyStored(), Config.crafterRfPerCraft); + setEnergyStored(getEnergyStored() - used); } - } + return false; } - return true; - } + private boolean hasRequiredPower() { + return getEnergyStored() >= Config.crafterRfPerCraft; + } - private ItemStack eatOneItemForCrafting(ItemStack avail) { - // 101 special cases for container items - if (avail.getItem().hasContainerItem(avail)) { - ItemStack used = avail.getItem().getContainerItem(avail); - if (used == null) { - // The promised container item does not exist - avail.stackSize--; - } else if (used.isItemStackDamageable() && used.getItemDamage() > used.getMaxDamage()) { - // Container item was used up - used = null; - avail.stackSize--; - } else if (used.isItemEqual(avail)) { - if (used.isItemStackDamageable()) { - // Container item is the same, but may have a different damage value - if (avail.stackSize == 1) { - // itemstack was used up, container item can replace it - avail = used; - } else { - // itemstack was not used up, container item goes into overflow - // (impossible case with vanilla and mods that play by the rules) - containerItems.add(used.copy()); - avail.stackSize--; - } + @Override + public int getPowerUsePerTick() { + return getPowerUsePerTick(getCapacitorType()); + } + + public int getPowerUsePerTick(Capacitors type) { + int ticks = getTicksPerCraft(type); + return (int) Math.ceil(Config.crafterRfPerCraft / (double) ticks); + } + + public int getTicksPerCraft(Capacitors type) { + if (type == Capacitors.BASIC_CAPACITOR) { + return 20; + } else if (type == Capacitors.ACTIVATED_CAPACITOR) { + return 10; } else { - // Container item is exactly the same: item should not be used up - // Nothing to do here + return 2; } - } else { - // Container item is different (e.g. bucket for lava bucket) and goes into the overflow - containerItems.add(used.copy()); - avail.stackSize--; - } - } else { - // no container item, use up one item of the stack - avail.stackSize--; } - if (avail.stackSize == 0) { - avail = null; - } - return avail; - } - - private boolean canMergeOutput() { - if(inventory[9] == null) { - return true; - } - ItemStack output = craftingGrid.getOutput(); - if(!ItemUtil.areStackMergable(inventory[9], output)) { - return false; - } - return output.getMaxStackSize() >= (inventory[9].stackSize + output.stackSize); - } - - @Override - public int getInventoryStackLimit() { - return bufferStacks ? 64 : 1; - } - - @Override - public boolean isBufferStacks() { - return bufferStacks; - } - - @Override - public void setBufferStacks(boolean bufferStacks) { - this.bufferStacks = bufferStacks; - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - NBTTagCompound craftRoot = nbtRoot.getCompoundTag("craftingGrid"); - craftingGrid.readFromNBT(craftRoot); - - if(nbtRoot.hasKey("bufferStacks")) { - bufferStacks = nbtRoot.getBoolean("bufferStacks"); - } else { - bufferStacks = true; - } - - containerItems.clear(); - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("containerItems"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - containerItems.add(ItemStack.loadItemStackFromNBT(itemStack)); - } - } - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - NBTTagCompound craftingRoot = new NBTTagCompound(); - craftingGrid.writeToNBT(craftingRoot); - nbtRoot.setTag("craftingGrid", craftingRoot); - - nbtRoot.setBoolean("bufferStacks", bufferStacks); - - if (containerItems.isEmpty()) { - nbtRoot.removeTag("containerItems"); - } else { - NBTTagList itemList = new NBTTagList(); - for (ItemStack stack : containerItems) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - stack.writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - nbtRoot.setTag("containerItems", itemList); - } - } - - public void updateCraftingOutput() { - InventoryCrafting inv = new InventoryCrafting(new Container() { - - @Override - public boolean canInteractWith(EntityPlayer var1) { + static boolean compareDamageable(ItemStack stack, ItemStack req) { + if (stack.isItemEqual(req)) { + return true; + } + if (stack.isItemStackDamageable() && stack.getItem() == req.getItem()) { + return stack.getItemDamage() < stack.getMaxDamage(); + } return false; - } - }, 3, 3); - - for (int i = 0; i < 9; i++) { - inv.setInventorySlotContents(i, craftingGrid.getStackInSlot(i)); } - ItemStack matches = CraftingManager.getInstance().findMatchingRecipe(inv, worldObj); - craftingGrid.setInventorySlotContents(9, matches); - markDirty(); - } + private static final UUID uuid = UUID.fromString("9b381cae-3c95-4a64-b958-1e25b0a4c790"); + private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioCrafter]"); + private boolean craftRecipe() { + + // (1) Find the items to craft with and put a copy into a temp crafting grid; + // also record what was used to destroy it later + InventoryCrafting inv = new InventoryCrafting( + new Container() { + @Override + public boolean canInteractWith(EntityPlayer var1) { + return false; + } + }, + 3, + 3); + + int[] usedItems = new int[9]; + + for (int j = 0; j < 9; j++) { + ItemStack req = craftingGrid.getStackInSlot(j); + if (req != null) { + for (int i = 0; i < 9; i++) { + if (inventory[i] != null + && inventory[i].stackSize > usedItems[i] + && compareDamageable(inventory[i], req)) { + req = null; + usedItems[i]++; + ItemStack craftingItem = inventory[i].copy(); + craftingItem.stackSize = 1; + inv.setInventorySlotContents(j, craftingItem); + break; + } + } + if (req != null) { + return false; + } + } + } + + // (2) Try to craft with the temp grid + ItemStack output = CraftingManager.getInstance().findMatchingRecipe(inv, worldObj); + + // (3) If we got a result, ... + if (output != null) { + if (playerInst == null) { + playerInst = new FakePlayerEIO(worldObj, getLocation(), DUMMY_PROFILE); + } + MinecraftForge.EVENT_BUS.post(new ItemCraftedEvent(playerInst, output, inv)); + + // (3a) ... remove the used up items and ... + for (int i = 0; i < 9; i++) { + for (int j = 0; j < usedItems[i] && inventory[i] != null; j++) { + setInventorySlotContents(i, eatOneItemForCrafting(inventory[i].copy())); + } + } + + // (3b) ... put the result into its slot + if (inventory[9] == null) { + setInventorySlotContents(9, output); + } else if (ItemUtil.areStackMergable(inventory[9], output)) { + ItemStack cur = inventory[9].copy(); + cur.stackSize += output.stackSize; + if (cur.stackSize > cur.getMaxStackSize()) { + // we check beforehand that there is enough free space, but some mod may return different + // amounts based on the nbt of the input items (e.g. magical wood) + ItemStack overflow = cur.copy(); + overflow.stackSize = cur.stackSize - cur.getMaxStackSize(); + cur.stackSize = cur.getMaxStackSize(); + containerItems.add(overflow); + } + setInventorySlotContents(9, cur); + } else { + // some mod may return different nbt based on the nbt of the input items (e.g. TE machines?) + containerItems.add(output); + } + } else { + // Crafting failed. This is not supposed to happen, but if a recipe is nbt-sensitive, it can. + // To avoid being stuck in a dead loop, we flush the non-working input items. + for (int j = 0; j < 9; j++) { + if (usedItems[j] > 0 && inventory[j] != null) { + ItemStack rejected = inventory[j].copy(); + rejected.stackSize = Math.min(inventory[j].stackSize, usedItems[j]); + containerItems.add(rejected); + if (inventory[j].stackSize <= usedItems[j]) { + inventory[j] = null; + } else { + inventory[j].stackSize -= usedItems[j]; + } + } + } + } + + return true; + } + + private ItemStack eatOneItemForCrafting(ItemStack avail) { + // 101 special cases for container items + if (avail.getItem().hasContainerItem(avail)) { + ItemStack used = avail.getItem().getContainerItem(avail); + if (used == null) { + // The promised container item does not exist + avail.stackSize--; + } else if (used.isItemStackDamageable() && used.getItemDamage() > used.getMaxDamage()) { + // Container item was used up + used = null; + avail.stackSize--; + } else if (used.isItemEqual(avail)) { + if (used.isItemStackDamageable()) { + // Container item is the same, but may have a different damage value + if (avail.stackSize == 1) { + // itemstack was used up, container item can replace it + avail = used; + } else { + // itemstack was not used up, container item goes into overflow + // (impossible case with vanilla and mods that play by the rules) + containerItems.add(used.copy()); + avail.stackSize--; + } + } else { + // Container item is exactly the same: item should not be used up + // Nothing to do here + } + } else { + // Container item is different (e.g. bucket for lava bucket) and goes into the overflow + containerItems.add(used.copy()); + avail.stackSize--; + } + } else { + // no container item, use up one item of the stack + avail.stackSize--; + } + + if (avail.stackSize == 0) { + avail = null; + } + return avail; + } + + private boolean canMergeOutput() { + if (inventory[9] == null) { + return true; + } + ItemStack output = craftingGrid.getOutput(); + if (!ItemUtil.areStackMergable(inventory[9], output)) { + return false; + } + return output.getMaxStackSize() >= (inventory[9].stackSize + output.stackSize); + } + + @Override + public int getInventoryStackLimit() { + return bufferStacks ? 64 : 1; + } + + @Override + public boolean isBufferStacks() { + return bufferStacks; + } + + @Override + public void setBufferStacks(boolean bufferStacks) { + this.bufferStacks = bufferStacks; + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + NBTTagCompound craftRoot = nbtRoot.getCompoundTag("craftingGrid"); + craftingGrid.readFromNBT(craftRoot); + + if (nbtRoot.hasKey("bufferStacks")) { + bufferStacks = nbtRoot.getBoolean("bufferStacks"); + } else { + bufferStacks = true; + } + + containerItems.clear(); + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("containerItems"); + if (itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + containerItems.add(ItemStack.loadItemStackFromNBT(itemStack)); + } + } + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + NBTTagCompound craftingRoot = new NBTTagCompound(); + craftingGrid.writeToNBT(craftingRoot); + nbtRoot.setTag("craftingGrid", craftingRoot); + + nbtRoot.setBoolean("bufferStacks", bufferStacks); + + if (containerItems.isEmpty()) { + nbtRoot.removeTag("containerItems"); + } else { + NBTTagList itemList = new NBTTagList(); + for (ItemStack stack : containerItems) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + stack.writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + nbtRoot.setTag("containerItems", itemList); + } + } + + public void updateCraftingOutput() { + InventoryCrafting inv = new InventoryCrafting( + new Container() { + + @Override + public boolean canInteractWith(EntityPlayer var1) { + return false; + } + }, + 3, + 3); + + for (int i = 0; i < 9; i++) { + inv.setInventorySlotContents(i, craftingGrid.getStackInSlot(i)); + } + ItemStack matches = CraftingManager.getInstance().findMatchingRecipe(inv, worldObj); + craftingGrid.setInventorySlotContents(9, matches); + markDirty(); + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java index af6fd0a5..bb49e86a 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/BlockCrusher.java @@ -1,90 +1,90 @@ package crazypants.enderio.machine.crusher; -import java.util.Random; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import java.util.Random; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockCrusher extends AbstractMachineBlock { - public static BlockCrusher create() { - PacketHandler.INSTANCE.registerMessage(PacketGrindingBall.class, PacketGrindingBall.class, PacketHandler.nextID(), Side.CLIENT); + public static BlockCrusher create() { + PacketHandler.INSTANCE.registerMessage( + PacketGrindingBall.class, PacketGrindingBall.class, PacketHandler.nextID(), Side.CLIENT); - BlockCrusher res = new BlockCrusher(); - res.init(); - return res; - } - - private BlockCrusher() { - super(ModObject.blockSagMill, TileCrusher.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCrusher) { - return new ContainerCrusher(player.inventory, (TileCrusher) te); + BlockCrusher res = new BlockCrusher(); + res.init(); + return res; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCrusher) { - return new GuiCrusher(player.inventory, (TileCrusher) te); + private BlockCrusher() { + super(ModObject.blockSagMill, TileCrusher.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_CRUSHER; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:crusherFrontOn"; - } - return "enderio:crusherFront"; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - TileCrusher te = (TileCrusher) world.getTileEntity(x, y, z); - if(te != null && te.isActive()) { - ForgeDirection front = ForgeDirection.values()[te.facing]; - - for (int i = 0; i < 3; i++) { - double px = x + 0.5 + front.offsetX * 0.51; - double pz = z + 0.5 + front.offsetZ * 0.51; - double py = y + world.rand.nextFloat() * 0.8f + 0.1f; - double v = 0.05; - double vx = 0; - double vz = 0; - - if(front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { - px += world.rand.nextFloat() * 0.8 - 0.4; - vz += front == ForgeDirection.NORTH ? -v : v; - } else { - pz += world.rand.nextFloat() * 0.8 - 0.4; - vx += front == ForgeDirection.WEST ? -v : v; + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCrusher) { + return new ContainerCrusher(player.inventory, (TileCrusher) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCrusher) { + return new GuiCrusher(player.inventory, (TileCrusher) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_CRUSHER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:crusherFrontOn"; + } + return "enderio:crusherFront"; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + TileCrusher te = (TileCrusher) world.getTileEntity(x, y, z); + if (te != null && te.isActive()) { + ForgeDirection front = ForgeDirection.values()[te.facing]; + + for (int i = 0; i < 3; i++) { + double px = x + 0.5 + front.offsetX * 0.51; + double pz = z + 0.5 + front.offsetZ * 0.51; + double py = y + world.rand.nextFloat() * 0.8f + 0.1f; + double v = 0.05; + double vx = 0; + double vz = 0; + + if (front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { + px += world.rand.nextFloat() * 0.8 - 0.4; + vz += front == ForgeDirection.NORTH ? -v : v; + } else { + pz += world.rand.nextFloat() * 0.8 - 0.4; + vx += front == ForgeDirection.WEST ? -v : v; + } + + world.spawnParticle("smoke", px, py, pz, vx, 0, vz); + } } - - world.spawnParticle("smoke", px, py, pz, vx, 0, vz); - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java index c487e86f..309d468f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java @@ -1,55 +1,54 @@ package crazypants.enderio.machine.crusher; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerCrusher extends AbstractMachineContainer { - public ContainerCrusher(InventoryPlayer playerInv, TileCrusher te) { - super(playerInv, te); - } + public ContainerCrusher(InventoryPlayer playerInv, TileCrusher te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 80, 12) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 122, 23) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - - addSlotToContainer(new Slot(getInv(), 2, 49, 59) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - addSlotToContainer(new Slot(getInv(), 3, 70, 59) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - addSlotToContainer(new Slot(getInv(), 4, 91, 59) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - addSlotToContainer(new Slot(getInv(), 5, 112, 59) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 80, 12) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 122, 23) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 2, 49, 59) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + addSlotToContainer(new Slot(getInv(), 3, 70, 59) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + addSlotToContainer(new Slot(getInv(), 4, 91, 59) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + addSlotToContainer(new Slot(getInv(), 5, 112, 59) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherMachineRecipe.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherMachineRecipe.java index 753ed964..89e6fcb3 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherMachineRecipe.java @@ -7,28 +7,26 @@ import crazypants.enderio.machine.recipe.IRecipe; public class CrusherMachineRecipe extends AbstractMachineRecipe { - @Override - public String getUid() { - return "CrusherRecipe"; - } - - @Override - public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { - return CrusherRecipeManager.instance.getRecipeForInput(inputs[0].item); - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null) { - return false; + @Override + public String getUid() { + return "CrusherRecipe"; } - return CrusherRecipeManager.instance.isValidInput(input); - } - @Override - public String getMachineName() { - return ModObject.blockSagMill.unlocalisedName; - } + @Override + public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { + return CrusherRecipeManager.instance.getRecipeForInput(inputs[0].item); + } - + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null) { + return false; + } + return CrusherRecipeManager.instance.isValidInput(input); + } + + @Override + public String getMachineName() { + return ModObject.blockSagMill.unlocalisedName; + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 9ad9e3a4..5b9b8d2f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -1,16 +1,6 @@ package crazypants.enderio.machine.crusher; -import java.io.File; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import com.enderio.core.common.util.Util; - import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -23,196 +13,202 @@ import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; +import java.io.File; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; public class CrusherRecipeManager { - public static final int ORE_ENERGY_COST = 400; + public static final int ORE_ENERGY_COST = 400; - public static final int INGOT_ENERGY_COST = 240; + public static final int INGOT_ENERGY_COST = 240; - private static final String CORE_FILE_NAME = "SAGMillRecipes_Core.xml"; - private static final String CUSTOM_FILE_NAME = "SAGMillRecipes_User.xml"; + private static final String CORE_FILE_NAME = "SAGMillRecipes_Core.xml"; + private static final String CUSTOM_FILE_NAME = "SAGMillRecipes_User.xml"; - static final CrusherRecipeManager instance = new CrusherRecipeManager(); + static final CrusherRecipeManager instance = new CrusherRecipeManager(); - public static CrusherRecipeManager getInstance() { - return instance; - } - - private final List recipes = new ArrayList(); - - private final List ballExcludes = new ArrayList(); - - private final List balls = new ArrayList(); - - private Set excludedStacks = new HashSet(); - - public CrusherRecipeManager() { - } - - public boolean isValidSagBall(ItemStack stack) { - return getGrindballFromStack(stack) != null; - } - - public boolean isExcludedFromBallBonus(MachineRecipeInput[] inputs) { - if(inputs == null || inputs.length < 1) { - return true; + public static CrusherRecipeManager getInstance() { + return instance; } - for(MachineRecipeInput input : inputs) { - if(input.item != null) { - if(isExcludedStack(input.item)){ - return true; - } - int id = OreDictionary.getOreID(input.item); - if(id >= 0) { - String name = OreDictionary.getOreName(id); - if(name.startsWith("ingot") || name.startsWith("block") || name.startsWith("nugget")) { - addExcludedStack(input.item); + + private final List recipes = new ArrayList(); + + private final List ballExcludes = new ArrayList(); + + private final List balls = new ArrayList(); + + private Set excludedStacks = new HashSet(); + + public CrusherRecipeManager() {} + + public boolean isValidSagBall(ItemStack stack) { + return getGrindballFromStack(stack) != null; + } + + public boolean isExcludedFromBallBonus(MachineRecipeInput[] inputs) { + if (inputs == null || inputs.length < 1) { return true; - } } - } - } - for(RecipeInput input : ballExcludes) { - if(input != null && input.isInput(inputs[0].item)) { - addExcludedStack(inputs[0].item); - return true; - } - } - - return false; - } + for (MachineRecipeInput input : inputs) { + if (input.item != null) { + if (isExcludedStack(input.item)) { + return true; + } + int id = OreDictionary.getOreID(input.item); + if (id >= 0) { + String name = OreDictionary.getOreName(id); + if (name.startsWith("ingot") || name.startsWith("block") || name.startsWith("nugget")) { + addExcludedStack(input.item); + return true; + } + } + } + } + for (RecipeInput input : ballExcludes) { + if (input != null && input.isInput(inputs[0].item)) { + addExcludedStack(inputs[0].item); + return true; + } + } - private void addExcludedStack(ItemStack item) { - item = item.copy(); - item.stackSize = 1; - excludedStacks.add(item); - } - - private boolean isExcludedStack(ItemStack item) { - item = item.copy(); - item.stackSize = 1; - return excludedStacks.contains(item); - } - - public IGrindingMultiplier getGrindballFromStack(ItemStack stack) { - if(stack == null) { - return null; - } - for(GrindingBall ball : balls) { - if(ball.isInput(stack)) { - return ball; - } - } - return null; - } - - public boolean isValidInput(MachineRecipeInput input) { - if(input.slotNumber == 1) { - return isValidSagBall(input.item); - } - return getRecipeForInput(input.item) != null; - } - - public void loadRecipesFromConfig() { - GrindingBallTagHandler th = new GrindingBallTagHandler(); - RecipeConfig config = RecipeConfig.loadRecipeConfig(CORE_FILE_NAME, CUSTOM_FILE_NAME, th); - balls.addAll(th.balls.values()); - ballExcludes.addAll(th.excludes); - Log.info("Loaded " + balls.size() + " grinding balls from SAG Mill config."); - Log.info("Excluding " + ballExcludes.size() + " recipes from grinding balls bonus."); - if(config != null) { - processConfig(config); - } else { - Log.error("Could not load recipes for SAG Mill."); - } - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSagMill.unlocalisedName, new CrusherMachineRecipe()); - } - - public void addCustomRecipes(String xmlDef) { - GrindingBallTagHandler th = new GrindingBallTagHandler(); - RecipeConfig config; - try { - config = RecipeConfigParser.parse(xmlDef, th); - } catch (Exception e) { - Log.error("Error parsing custom xml"); - return; + return false; } - balls.addAll(th.balls.values()); - ballExcludes.addAll(th.excludes); - if(config == null) { - Log.error("Could not process custom XML"); - return; - } - processConfig(config); - } - - public IRecipe getRecipeForInput(ItemStack input) { - if(input == null) { - return null; - } - for (Recipe recipe : recipes) { - if(recipe.isInputForRecipe(new MachineRecipeInput(0, input))) { - return recipe; - } - } - return null; - } - - private void processConfig(RecipeConfig config) { - if(config.isDumpItemRegistery()) { - Util.dumpModObjects(new File(Config.configDirectory, "modObjectsRegistery.txt")); - } - if(config.isDumpOreDictionary()) { - Util.dumpOreNames(new File(Config.configDirectory, "oreDictionaryRegistery.txt")); + private void addExcludedStack(ItemStack item) { + item = item.copy(); + item.stackSize = 1; + excludedStacks.add(item); } - List newRecipes = config.getRecipes(true); - Log.info("Found " + newRecipes.size() + " valid SAG Mill recipes in config."); - for (Recipe rec : newRecipes) { - addRecipe(rec); + private boolean isExcludedStack(ItemStack item) { + item = item.copy(); + item.stackSize = 1; + return excludedStacks.contains(item); } - Log.info("Finished processing SAG Mill recipes. " + recipes.size() + " recipes avaliable."); - } - public void addRecipe(ItemStack input, int energyCost, ItemStack output) { - addRecipe(input, energyCost, new RecipeOutput(output, 1)); - } - - public void addRecipe(ItemStack input, int energyCost, RecipeOutput... output) { - if(input == null || output == null) { - return; + public IGrindingMultiplier getGrindballFromStack(ItemStack stack) { + if (stack == null) { + return null; + } + for (GrindingBall ball : balls) { + if (ball.isInput(stack)) { + return ball; + } + } + return null; } - addRecipe(new Recipe(new RecipeInput(input, false), energyCost, RecipeBonusType.MULTIPLY_OUTPUT, output)); - } - public void addRecipe(Recipe recipe) { - if(recipe == null || !recipe.isValid()) { - Log.debug("Could not add invalid recipe: " + recipe); - return; + public boolean isValidInput(MachineRecipeInput input) { + if (input.slotNumber == 1) { + return isValidSagBall(input.item); + } + return getRecipeForInput(input.item) != null; } - IRecipe rec = getRecipeForInput(getInput(recipe)); - if(rec != null) { - Log.warn("Not adding supplied recipe as a recipe already exists for the input: " + getInput(recipe)); - return; + + public void loadRecipesFromConfig() { + GrindingBallTagHandler th = new GrindingBallTagHandler(); + RecipeConfig config = RecipeConfig.loadRecipeConfig(CORE_FILE_NAME, CUSTOM_FILE_NAME, th); + balls.addAll(th.balls.values()); + ballExcludes.addAll(th.excludes); + Log.info("Loaded " + balls.size() + " grinding balls from SAG Mill config."); + Log.info("Excluding " + ballExcludes.size() + " recipes from grinding balls bonus."); + if (config != null) { + processConfig(config); + } else { + Log.error("Could not load recipes for SAG Mill."); + } + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSagMill.unlocalisedName, new CrusherMachineRecipe()); } - recipes.add(recipe); - } - public List getRecipes() { - return recipes; - } + public void addCustomRecipes(String xmlDef) { + GrindingBallTagHandler th = new GrindingBallTagHandler(); + RecipeConfig config; + try { + config = RecipeConfigParser.parse(xmlDef, th); + } catch (Exception e) { + Log.error("Error parsing custom xml"); + return; + } - public static ItemStack getInput(IRecipe recipe) { - if(recipe == null || recipe.getInputs() == null || recipe.getInputs().length == 0) { - return null; + balls.addAll(th.balls.values()); + ballExcludes.addAll(th.excludes); + if (config == null) { + Log.error("Could not process custom XML"); + return; + } + processConfig(config); } - return recipe.getInputs()[0].getInput(); - } - public List getBalls() { - return balls; - } + public IRecipe getRecipeForInput(ItemStack input) { + if (input == null) { + return null; + } + for (Recipe recipe : recipes) { + if (recipe.isInputForRecipe(new MachineRecipeInput(0, input))) { + return recipe; + } + } + return null; + } + private void processConfig(RecipeConfig config) { + if (config.isDumpItemRegistery()) { + Util.dumpModObjects(new File(Config.configDirectory, "modObjectsRegistery.txt")); + } + if (config.isDumpOreDictionary()) { + Util.dumpOreNames(new File(Config.configDirectory, "oreDictionaryRegistery.txt")); + } + + List newRecipes = config.getRecipes(true); + Log.info("Found " + newRecipes.size() + " valid SAG Mill recipes in config."); + for (Recipe rec : newRecipes) { + addRecipe(rec); + } + Log.info("Finished processing SAG Mill recipes. " + recipes.size() + " recipes avaliable."); + } + + public void addRecipe(ItemStack input, int energyCost, ItemStack output) { + addRecipe(input, energyCost, new RecipeOutput(output, 1)); + } + + public void addRecipe(ItemStack input, int energyCost, RecipeOutput... output) { + if (input == null || output == null) { + return; + } + addRecipe(new Recipe(new RecipeInput(input, false), energyCost, RecipeBonusType.MULTIPLY_OUTPUT, output)); + } + + public void addRecipe(Recipe recipe) { + if (recipe == null || !recipe.isValid()) { + Log.debug("Could not add invalid recipe: " + recipe); + return; + } + IRecipe rec = getRecipeForInput(getInput(recipe)); + if (rec != null) { + Log.warn("Not adding supplied recipe as a recipe already exists for the input: " + getInput(recipe)); + return; + } + recipes.add(recipe); + } + + public List getRecipes() { + return recipes; + } + + public static ItemStack getInput(IRecipe recipe) { + if (recipe == null || recipe.getInputs() == null || recipe.getInputs().length == 0) { + return null; + } + return recipe.getInputs()[0].getInput(); + } + + public List getBalls() { + return balls; + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java index 50701bd7..513f3091 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java @@ -1,77 +1,76 @@ package crazypants.enderio.machine.crusher; -import net.minecraft.item.ItemStack; import crazypants.enderio.machine.recipe.RecipeInput; +import net.minecraft.item.ItemStack; public class GrindingBall extends RecipeInput implements IGrindingMultiplier { - - float chanceMultiplier = 1; - float powerMultiplier = 1; + float chanceMultiplier = 1; - float grindingMultiplier = 1; + float powerMultiplier = 1; - int durationMJ; + float grindingMultiplier = 1; - RecipeInput ri; + int durationMJ; - public GrindingBall(RecipeInput ri, float gm, float cm, float pm, int dmj) { - super(ri.getInput()); - this.ri = ri; - grindingMultiplier = gm; - chanceMultiplier = cm; - powerMultiplier = pm; - durationMJ = dmj; - } - - @Override - public RecipeInput copy() { - return new GrindingBall(ri, grindingMultiplier, chanceMultiplier, powerMultiplier, durationMJ); - } + RecipeInput ri; - @Override - public boolean isInput(ItemStack test) { - return ri.isInput(test); - } + public GrindingBall(RecipeInput ri, float gm, float cm, float pm, int dmj) { + super(ri.getInput()); + this.ri = ri; + grindingMultiplier = gm; + chanceMultiplier = cm; + powerMultiplier = pm; + durationMJ = dmj; + } - @Override - public float getGrindingMultiplier() { - return grindingMultiplier; - } + @Override + public RecipeInput copy() { + return new GrindingBall(ri, grindingMultiplier, chanceMultiplier, powerMultiplier, durationMJ); + } - @Override - public float getChanceMultiplier() { - return chanceMultiplier; - } + @Override + public boolean isInput(ItemStack test) { + return ri.isInput(test); + } - @Override - public float getPowerMultiplier() { - return powerMultiplier; - } + @Override + public float getGrindingMultiplier() { + return grindingMultiplier; + } - @Override - public void setChanceMultiplier(float chanceMultiplier) { - this.chanceMultiplier = chanceMultiplier; - } + @Override + public float getChanceMultiplier() { + return chanceMultiplier; + } - @Override - public void setPowerMultiplier(float powerMultiplier) { - this.powerMultiplier = powerMultiplier; - } + @Override + public float getPowerMultiplier() { + return powerMultiplier; + } - @Override - public void setGrindingMultiplier(float grindingMultiplier) { - this.grindingMultiplier = grindingMultiplier; - } + @Override + public void setChanceMultiplier(float chanceMultiplier) { + this.chanceMultiplier = chanceMultiplier; + } - @Override - public int getDurationMJ() { - return durationMJ; - } + @Override + public void setPowerMultiplier(float powerMultiplier) { + this.powerMultiplier = powerMultiplier; + } - @Override - public void setDurationMJ(int durationMJ) { - this.durationMJ = durationMJ; - } + @Override + public void setGrindingMultiplier(float grindingMultiplier) { + this.grindingMultiplier = grindingMultiplier; + } + @Override + public int getDurationMJ() { + return durationMJ; + } + + @Override + public void setDurationMJ(int durationMJ) { + this.durationMJ = durationMJ; + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java index 20c12295..f0d29a79 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingBallTagHandler.java @@ -1,116 +1,113 @@ package crazypants.enderio.machine.crusher; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; - import crazypants.enderio.Log; import crazypants.enderio.machine.recipe.CustomTagHandler; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; public class GrindingBallTagHandler implements CustomTagHandler { - private static final String ELEMENT_ROOT = "grindingBalls"; + private static final String ELEMENT_ROOT = "grindingBalls"; - private static final String BALL_ROOT = "grindingBall"; + private static final String BALL_ROOT = "grindingBall"; - private static final String EXCLUDES_ROOT = "excludes"; + private static final String EXCLUDES_ROOT = "excludes"; - private static final String AT_ID = "id"; - private static final String AT_REMOVE = "remove"; - private static final String AT_GM = "grindingMultiplier"; - private static final String AT_PM = "powerMultiplier"; - private static final String AT_CM = "chanceMultiplier"; - private static final String AT_DMJ = "durationRF"; + private static final String AT_ID = "id"; + private static final String AT_REMOVE = "remove"; + private static final String AT_GM = "grindingMultiplier"; + private static final String AT_PM = "powerMultiplier"; + private static final String AT_CM = "chanceMultiplier"; + private static final String AT_DMJ = "durationRF"; - Map balls = new HashMap(); - List excludes = new ArrayList(); + Map balls = new HashMap(); + List excludes = new ArrayList(); - boolean processStack = false; - boolean processExclude = false; + boolean processStack = false; + boolean processExclude = false; - private String id; - private float gm; - private float pm; - private float cm; - private int drf; + private String id; + private float gm; + private float pm; + private float cm; + private int drf; - @Override - public boolean startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - if(ELEMENT_ROOT.equals(localName)) { - return true; - } - if(BALL_ROOT.equals(localName)) { - id = RecipeConfigParser.getStringValue(AT_ID, attributes, null); - if(id == null) { - Log.warn("GrindingBallTagHandler: grinding ball specified without the '" + AT_ID + "' attribute. It will be ignored."); - processStack = false; - return true; - } - boolean remove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); - if(remove) { - GrindingBall res = balls.remove(id); - if(res == null) { - Log.warn("User config requested removal of grinding ball with id: " + id + " but it was not found."); - } else { - Log.info("Removed grinding ball with id=" + id + " due to user config."); + @Override + public boolean startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (ELEMENT_ROOT.equals(localName)) { + return true; } - processStack = false; - return true; - } - gm = RecipeConfigParser.getFloatValue(AT_GM, attributes, 1); - cm = RecipeConfigParser.getFloatValue(AT_CM, attributes, 1); - pm = RecipeConfigParser.getFloatValue(AT_PM, attributes, 1); - drf = RecipeConfigParser.getIntValue(AT_DMJ, attributes, 24000); - processStack = true; - return true; - } - if(EXCLUDES_ROOT.equals(localName)) { - processExclude = true; - return true; - } - if(processStack && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { - RecipeInput ri = RecipeConfigParser.getItemStack(attributes); - if(ri != null) { - GrindingBall gb = new GrindingBall(ri, gm, cm, pm, drf); - balls.put(id, gb); - } - } - if(processExclude && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { - RecipeInput ri = RecipeConfigParser.getItemStack(attributes); - if(ri != null) { - boolean remove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); - if(remove) { - excludes.remove(ri); - Log.info("Removed grinding ball exclude for " + ri.getInput().getDisplayName() + " due to user config."); - } else { - excludes.add(ri); + if (BALL_ROOT.equals(localName)) { + id = RecipeConfigParser.getStringValue(AT_ID, attributes, null); + if (id == null) { + Log.warn("GrindingBallTagHandler: grinding ball specified without the '" + AT_ID + + "' attribute. It will be ignored."); + processStack = false; + return true; + } + boolean remove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); + if (remove) { + GrindingBall res = balls.remove(id); + if (res == null) { + Log.warn( + "User config requested removal of grinding ball with id: " + id + " but it was not found."); + } else { + Log.info("Removed grinding ball with id=" + id + " due to user config."); + } + processStack = false; + return true; + } + gm = RecipeConfigParser.getFloatValue(AT_GM, attributes, 1); + cm = RecipeConfigParser.getFloatValue(AT_CM, attributes, 1); + pm = RecipeConfigParser.getFloatValue(AT_PM, attributes, 1); + drf = RecipeConfigParser.getIntValue(AT_DMJ, attributes, 24000); + processStack = true; + return true; } - } + if (EXCLUDES_ROOT.equals(localName)) { + processExclude = true; + return true; + } + if (processStack && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { + RecipeInput ri = RecipeConfigParser.getItemStack(attributes); + if (ri != null) { + GrindingBall gb = new GrindingBall(ri, gm, cm, pm, drf); + balls.put(id, gb); + } + } + if (processExclude && RecipeConfigParser.ELEMENT_ITEM_STACK.equals(localName)) { + RecipeInput ri = RecipeConfigParser.getItemStack(attributes); + if (ri != null) { + boolean remove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); + if (remove) { + excludes.remove(ri); + Log.info("Removed grinding ball exclude for " + + ri.getInput().getDisplayName() + " due to user config."); + } else { + excludes.add(ri); + } + } + } + + return false; } - return false; - } - - @Override - public boolean endElement(String uri, String localName, String qName) throws SAXException { - if(ELEMENT_ROOT.equals(localName) || BALL_ROOT.equals(localName) || EXCLUDES_ROOT.equals(localName)) { - processStack = false; - processExclude = false; - return true; + @Override + public boolean endElement(String uri, String localName, String qName) throws SAXException { + if (ELEMENT_ROOT.equals(localName) || BALL_ROOT.equals(localName) || EXCLUDES_ROOT.equals(localName)) { + processStack = false; + processExclude = false; + return true; + } + return false; } - return false; - } - - @Override - public void configProcessed() { - } - - + @Override + public void configProcessed() {} } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java index b9e494f1..8fd41c87 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingMultiplierNBT.java @@ -4,83 +4,81 @@ import net.minecraft.nbt.NBTTagCompound; public class GrindingMultiplierNBT implements IGrindingMultiplier { - float chanceMultiplier = 1; + float chanceMultiplier = 1; - float powerMultiplier = 1; + float powerMultiplier = 1; - float grindingMultiplier = 1; + float grindingMultiplier = 1; - int durationMJ; + int durationMJ; - private static String CM = "grindBall.chanceMultiplier"; - private static String PM = "grindBall.powerMultiplier"; - private static String GM = "grindBall.grindingMultiplier"; - private static String DMJ = "grindBall.durationMJ"; + private static String CM = "grindBall.chanceMultiplier"; + private static String PM = "grindBall.powerMultiplier"; + private static String GM = "grindBall.grindingMultiplier"; + private static String DMJ = "grindBall.durationMJ"; - public static GrindingMultiplierNBT readFromNBT(NBTTagCompound nbtRoot) { - if(nbtRoot.hasKey(CM) && nbtRoot.hasKey(PM)&& nbtRoot.hasKey(GM)&& nbtRoot.hasKey(DMJ)) { - return new GrindingMultiplierNBT(nbtRoot.getFloat(CM), nbtRoot.getFloat(PM), nbtRoot.getFloat(GM), nbtRoot.getInteger(DMJ)); + public static GrindingMultiplierNBT readFromNBT(NBTTagCompound nbtRoot) { + if (nbtRoot.hasKey(CM) && nbtRoot.hasKey(PM) && nbtRoot.hasKey(GM) && nbtRoot.hasKey(DMJ)) { + return new GrindingMultiplierNBT( + nbtRoot.getFloat(CM), nbtRoot.getFloat(PM), nbtRoot.getFloat(GM), nbtRoot.getInteger(DMJ)); + } + return null; } - return null; - } - public static void writeToNBT(IGrindingMultiplier gm, NBTTagCompound nbtRoot) { - if(gm != null) { - nbtRoot.setFloat(CM, gm.getChanceMultiplier()); - nbtRoot.setFloat(PM, gm.getPowerMultiplier()); - nbtRoot.setFloat(GM, gm.getGrindingMultiplier()); - nbtRoot.setInteger(DMJ, gm.getDurationMJ()); + public static void writeToNBT(IGrindingMultiplier gm, NBTTagCompound nbtRoot) { + if (gm != null) { + nbtRoot.setFloat(CM, gm.getChanceMultiplier()); + nbtRoot.setFloat(PM, gm.getPowerMultiplier()); + nbtRoot.setFloat(GM, gm.getGrindingMultiplier()); + nbtRoot.setInteger(DMJ, gm.getDurationMJ()); + } } - } + protected GrindingMultiplierNBT( + float chanceMultiplier, float powerMultiplier, float grindingMultiplier, int durationMJ) { + this.chanceMultiplier = chanceMultiplier; + this.powerMultiplier = powerMultiplier; + this.grindingMultiplier = grindingMultiplier; + this.durationMJ = durationMJ; + } - protected GrindingMultiplierNBT(float chanceMultiplier, float powerMultiplier, float grindingMultiplier, int durationMJ) { - this.chanceMultiplier = chanceMultiplier; - this.powerMultiplier = powerMultiplier; - this.grindingMultiplier = grindingMultiplier; - this.durationMJ = durationMJ; - } + @Override + public float getGrindingMultiplier() { + return grindingMultiplier; + } - @Override - public float getGrindingMultiplier() { - return grindingMultiplier; - } + @Override + public float getChanceMultiplier() { + return chanceMultiplier; + } - @Override - public float getChanceMultiplier() { - return chanceMultiplier; - } + @Override + public float getPowerMultiplier() { + return powerMultiplier; + } - @Override - public float getPowerMultiplier() { - return powerMultiplier; - } + @Override + public void setChanceMultiplier(float chanceMultiplier) { + this.chanceMultiplier = chanceMultiplier; + } - @Override - public void setChanceMultiplier(float chanceMultiplier) { - this.chanceMultiplier = chanceMultiplier; - } - - @Override - public void setPowerMultiplier(float powerMultiplier) { - this.powerMultiplier = powerMultiplier; - } - - @Override - public void setGrindingMultiplier(float grindingMultiplier) { - this.grindingMultiplier = grindingMultiplier; - } - - @Override - public int getDurationMJ() { - return durationMJ; - } - - @Override - public void setDurationMJ(int durationMJ) { - this.durationMJ = durationMJ; - } + @Override + public void setPowerMultiplier(float powerMultiplier) { + this.powerMultiplier = powerMultiplier; + } + @Override + public void setGrindingMultiplier(float grindingMultiplier) { + this.grindingMultiplier = grindingMultiplier; + } + @Override + public int getDurationMJ() { + return durationMJ; + } + @Override + public void setDurationMJ(int durationMJ) { + this.durationMJ = durationMJ; + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index a8d58551..87e824d4 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -1,54 +1,47 @@ package crazypants.enderio.machine.crusher; -import java.awt.Rectangle; - -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import java.awt.Rectangle; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiCrusher extends GuiPoweredMachineBase { - public GuiCrusher(InventoryPlayer par1InventoryPlayer, TileCrusher inventory) { - super(inventory, new ContainerCrusher(par1InventoryPlayer, inventory), "crusher"); - addToolTip(new GuiToolTip(new Rectangle(142, 23, 5, 17), "") { + public GuiCrusher(InventoryPlayer par1InventoryPlayer, TileCrusher inventory) { + super(inventory, new ContainerCrusher(par1InventoryPlayer, inventory), "crusher"); + addToolTip(new GuiToolTip(new Rectangle(142, 23, 5, 17), "") { - @Override - protected void updateText() { - text.clear(); - text.add(getTileEntity().getBallDurationScaled(100) + "%"); - } - }); + @Override + protected void updateText() { + text.clear(); + text.add(getTileEntity().getBallDurationScaled(100) + "%"); + } + }); - addProgressTooltip(79, 31, 18, 24); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - - drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); - - if(shouldRenderProgress()) { - int barHeight = getProgressScaled(24); - drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + addProgressTooltip(79, 31, 18, 24); } - int barHeight = getTileEntity().getBallDurationScaled(16); - if(barHeight > 0) { - drawTexturedModalRect(guiLeft + 142, guiTop + 23 + (16 - barHeight), 186, 31, 4, barHeight); + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + + drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); + + if (shouldRenderProgress()) { + int barHeight = getProgressScaled(24); + drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + } + + int barHeight = getTileEntity().getBallDurationScaled(16); + if (barHeight > 0) { + drawTexturedModalRect(guiLeft + 142, guiTop + 23 + (16 - barHeight), 186, 31, 4, barHeight); + } + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - - } diff --git a/src/main/java/crazypants/enderio/machine/crusher/IGrindingMultiplier.java b/src/main/java/crazypants/enderio/machine/crusher/IGrindingMultiplier.java index 84510a72..ffb62fff 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/IGrindingMultiplier.java +++ b/src/main/java/crazypants/enderio/machine/crusher/IGrindingMultiplier.java @@ -2,20 +2,19 @@ package crazypants.enderio.machine.crusher; public interface IGrindingMultiplier { - void setDurationMJ(int durationMJ); + void setDurationMJ(int durationMJ); - int getDurationMJ(); + int getDurationMJ(); - void setGrindingMultiplier(float grindingMultiplier); + void setGrindingMultiplier(float grindingMultiplier); - void setPowerMultiplier(float powerMultiplier); + void setPowerMultiplier(float powerMultiplier); - void setChanceMultiplier(float chanceMultiplier); + void setChanceMultiplier(float chanceMultiplier); - float getPowerMultiplier(); + float getPowerMultiplier(); - float getChanceMultiplier(); - - float getGrindingMultiplier(); + float getChanceMultiplier(); + float getGrindingMultiplier(); } diff --git a/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java b/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java index 110f6f79..e185e39d 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java +++ b/src/main/java/crazypants/enderio/machine/crusher/PacketGrindingBall.java @@ -1,61 +1,59 @@ package crazypants.enderio.machine.crusher; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketGrindingBall implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; + private int x; + private int y; + private int z; - int currGbUse; - int maxGbUse; + int currGbUse; + int maxGbUse; - public PacketGrindingBall() { - } + public PacketGrindingBall() {} - public PacketGrindingBall(TileCrusher ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - currGbUse = ent.currGbUse; - maxGbUse = ent.gb == null ? 0 : ent.gb.getDurationMJ(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(currGbUse); - buf.writeInt(maxGbUse); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - currGbUse = buf.readInt(); - maxGbUse = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketGrindingBall message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCrusher) { - TileCrusher me = (TileCrusher) te; - me.currGbUse = message.currGbUse; - me.maxGbUse = message.maxGbUse; + public PacketGrindingBall(TileCrusher ent) { + x = ent.xCoord; + y = ent.yCoord; + z = ent.zCoord; + currGbUse = ent.currGbUse; + maxGbUse = ent.gb == null ? 0 : ent.gb.getDurationMJ(); } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(currGbUse); + buf.writeInt(maxGbUse); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + currGbUse = buf.readInt(); + maxGbUse = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketGrindingBall message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileCrusher) { + TileCrusher me = (TileCrusher) te; + me.currGbUse = message.currGbUse; + me.maxGbUse = message.maxGbUse; + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java index 3254e22c..dda681da 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/TileCrusher.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine.crusher; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe; @@ -11,147 +9,149 @@ import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.network.PacketHandler; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class TileCrusher extends AbstractPoweredTaskEntity { - protected IGrindingMultiplier gb; - protected int currGbUse = 0; - protected int maxGbUse = 0; + protected IGrindingMultiplier gb; + protected int currGbUse = 0; + protected int maxGbUse = 0; - protected int lastSendGbScaled = 0; - private boolean useGrindingBall; - - public TileCrusher() { - super(new SlotDefinition(2, 4)); - } + protected int lastSendGbScaled = 0; + private boolean useGrindingBall; - @Override - public String getInventoryName() { - return ModObject.blockSagMill.unlocalisedName; - } - - @Override - public String getMachineName() { - return ModObject.blockSagMill.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null) { - return false; + public TileCrusher() { + super(new SlotDefinition(2, 4)); } - return CrusherRecipeManager.instance.isValidInput(new MachineRecipeInput(i, itemstack)); - } - public int getBallDurationScaled(int scale) { - return (maxGbUse > 0) ? (int) (scale * (1 - ((float) currGbUse / (float) maxGbUse))) : 0; - } + @Override + public String getInventoryName() { + return ModObject.blockSagMill.unlocalisedName; + } - @Override - protected double usePower() { - double res = super.usePower(); - boolean sendGB = false; + @Override + public String getMachineName() { + return ModObject.blockSagMill.unlocalisedName; + } - if(gb != null && useGrindingBall) { - currGbUse += res; - - if(currGbUse >= gb.getDurationMJ()) { - currGbUse = 0; - maxGbUse = 0; - gb = null; - sendGB = true; - } else { - int newScaled = getBallDurationScaled(16); - if(newScaled != lastSendGbScaled) { - sendGB = true; + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + if (itemstack == null) { + return false; } - } + return CrusherRecipeManager.instance.isValidInput(new MachineRecipeInput(i, itemstack)); } - if(gb == null) { - gb = CrusherRecipeManager.getInstance().getGrindballFromStack(inventory[1]); - if(gb != null) { - maxGbUse = gb.getDurationMJ(); - decrStackSize(1, 1); - markDirty(); - sendGB = false; // the tile update will also sync the grinding ball - } - } - if(sendGB) { - PacketHandler.sendToAllAround(new PacketGrindingBall(this), this); - lastSendGbScaled = getBallDurationScaled(16); - } - return res; - } - @Override - protected void taskComplete() { - IPoweredTask ct = currentTask; - super.taskComplete(); - //run it again if the ball says so - if(gb != null && useGrindingBall && ct != null) { - if(ct.getBonusType() == RecipeBonusType.MULTIPLY_OUTPUT) { - float chance = random.nextFloat(); - float mul = gb.getGrindingMultiplier() - 1; - while (mul > 0) { - if(chance <= mul) { - currentTask = ct; - super.taskComplete(); - } - mul--; + public int getBallDurationScaled(int scale) { + return (maxGbUse > 0) ? (int) (scale * (1 - ((float) currGbUse / (float) maxGbUse))) : 0; + } + + @Override + protected double usePower() { + double res = super.usePower(); + boolean sendGB = false; + + if (gb != null && useGrindingBall) { + currGbUse += res; + + if (currGbUse >= gb.getDurationMJ()) { + currGbUse = 0; + maxGbUse = 0; + gb = null; + sendGB = true; + } else { + int newScaled = getBallDurationScaled(16); + if (newScaled != lastSendGbScaled) { + sendGB = true; + } + } } - } + if (gb == null) { + gb = CrusherRecipeManager.getInstance().getGrindballFromStack(inventory[1]); + if (gb != null) { + maxGbUse = gb.getDurationMJ(); + decrStackSize(1, 1); + markDirty(); + sendGB = false; // the tile update will also sync the grinding ball + } + } + if (sendGB) { + PacketHandler.sendToAllAround(new PacketGrindingBall(this), this); + lastSendGbScaled = getBallDurationScaled(16); + } + return res; } - } - @Override - protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { - PoweredTask res; - useGrindingBall = false; - if(gb != null) { - useGrindingBall = !CrusherRecipeManager.getInstance().isExcludedFromBallBonus(getRecipeInputs()); - if(useGrindingBall) { - res = new PoweredTask(nextRecipe, chance / gb.getChanceMultiplier(), getRecipeInputs()); - res.setRequiredEnergy(res.getRequiredEnergy() * gb.getPowerMultiplier()); - } else { - res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); - } - } else { - res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); + @Override + protected void taskComplete() { + IPoweredTask ct = currentTask; + super.taskComplete(); + // run it again if the ball says so + if (gb != null && useGrindingBall && ct != null) { + if (ct.getBonusType() == RecipeBonusType.MULTIPLY_OUTPUT) { + float chance = random.nextFloat(); + float mul = gb.getGrindingMultiplier() - 1; + while (mul > 0) { + if (chance <= mul) { + currentTask = ct; + super.taskComplete(); + } + mul--; + } + } + } } - return res; - } - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - gb = GrindingMultiplierNBT.readFromNBT(nbtRoot); - currGbUse = nbtRoot.getInteger("currGbUse"); - maxGbUse = (gb != null) ? gb.getDurationMJ() : 0; - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - if(gb != null) { - GrindingMultiplierNBT.writeToNBT(gb, nbtRoot); + @Override + protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { + PoweredTask res; + useGrindingBall = false; + if (gb != null) { + useGrindingBall = !CrusherRecipeManager.getInstance().isExcludedFromBallBonus(getRecipeInputs()); + if (useGrindingBall) { + res = new PoweredTask(nextRecipe, chance / gb.getChanceMultiplier(), getRecipeInputs()); + res.setRequiredEnergy(res.getRequiredEnergy() * gb.getPowerMultiplier()); + } else { + res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); + } + } else { + res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); + } + return res; } - nbtRoot.setInteger("currGbUse", currGbUse); - lastSendGbScaled = getBallDurationScaled(16); - } + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + gb = GrindingMultiplierNBT.readFromNBT(nbtRoot); + currGbUse = nbtRoot.getInteger("currGbUse"); + maxGbUse = (gb != null) ? gb.getDurationMJ() : 0; + } - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + if (gb != null) { + GrindingMultiplierNBT.writeToNBT(gb, nbtRoot); + } + nbtRoot.setInteger("currGbUse", currGbUse); - @Override - public String getSoundName() { - return "machine.sagmill"; - } - - @Override - public float getVolume() { - return super.getVolume() * 0.125f; - } + lastSendGbScaled = getBallDurationScaled(16); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public String getSoundName() { + return "machine.sagmill"; + } + + @Override + public float getVolume() { + return super.getVolume() * 0.125f; + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index e0bf65c7..5eb1cdb3 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -1,7 +1,13 @@ package crazypants.enderio.machine.enchanter; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.network.IGuiHandler; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -10,135 +16,125 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.Util; - -import cpw.mods.fml.common.network.IGuiHandler; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; - public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTooltipProvider { - public static BlockEnchanter create() { - BlockEnchanter res = new BlockEnchanter(); - res.init(); - return res; - } - - public static int renderId = -1; - - protected BlockEnchanter() { - super(ModObject.blockEnchanter.unlocalisedName, TileEnchanter.class); - setBlockTextureName("enderio:blockEnchanter"); - setLightOpacity(4); - } - - @Override - protected void init() { - super.init(); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENCHANTER, this); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, player, stack); - int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - TileEnchanter te = (TileEnchanter) world.getTileEntity(x, y, z); - switch (heading) { - case 0: - te.setFacing((short) 2); - break; - case 1: - te.setFacing((short) 5); - break; - case 2: - te.setFacing((short) 3); - break; - case 3: - te.setFacing((short) 4); - break; - default: - break; + public static BlockEnchanter create() { + BlockEnchanter res = new BlockEnchanter(); + res.init(); + return res; } - if(world.isRemote) { - return; + + public static int renderId = -1; + + protected BlockEnchanter() { + super(ModObject.blockEnchanter.unlocalisedName, TileEnchanter.class); + setBlockTextureName("enderio:blockEnchanter"); + setLightOpacity(4); } - world.markBlockForUpdate(x, y, z); - } - - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENCHANTER, world, x, y, z); + + @Override + protected void init() { + super.init(); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENCHANTER, this); } - return true; - } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter) { - dropItems(world, x, y, z, (TileEnchanter) te); + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + TileEnchanter te = (TileEnchanter) world.getTileEntity(x, y, z); + switch (heading) { + case 0: + te.setFacing((short) 2); + break; + case 1: + te.setFacing((short) 5); + break; + case 2: + te.setFacing((short) 3); + break; + case 3: + te.setFacing((short) 4); + break; + default: + break; + } + if (world.isRemote) { + return; + } + world.markBlockForUpdate(x, y, z); } - super.breakBlock(world, x, y, z, block, meta); - } - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - private void dropItems(World world, int x, int y, int z, TileEnchanter te) { - if(te.getStackInSlot(0) != null) { - Util.dropItems(world, te.getStackInSlot(0), x, y, z, true); + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENCHANTER, world, x, y, z); + } + return true; } - if(te.getStackInSlot(1) != null) { - Util.dropItems(world, te.getStackInSlot(1), x, y, z, true); + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEnchanter) { + dropItems(world, x, y, z, (TileEnchanter) te); + } + super.breakBlock(world, x, y, z, block, meta); } - } - @Override - public int quantityDropped(Random p_149745_1_) { - return 0; - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter) { - return new ContainerEnchanter(player, player.inventory, (TileEnchanter) te); + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter) { - return new GuiEnchanter(player, player.inventory, (TileEnchanter) te); + private void dropItems(World world, int x, int y, int z, TileEnchanter te) { + if (te.getStackInSlot(0) != null) { + Util.dropItems(world, te.getStackInSlot(0), x, y, z, true); + } + if (te.getStackInSlot(1) != null) { + Util.dropItems(world, te.getStackInSlot(1), x, y, z, true); + } } - return null; - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } + @Override + public int quantityDropped(Random p_149745_1_) { + return 0; + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEnchanter) { + return new ContainerEnchanter(player, player.inventory, (TileEnchanter) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEnchanter) { + return new GuiEnchanter(player, player.inventory, (TileEnchanter) te); + } + return null; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java index 67a0e167..ed5ca77c 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.enchanter; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.ContainerEnder; import java.util.List; - import net.minecraft.enchantment.EnchantmentData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -9,152 +11,146 @@ import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; - -import crazypants.enderio.EnderIO; - public class ContainerEnchanter extends ContainerEnder { - public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) { - super(playerInv, te); - } - - @Override - protected void addSlots(InventoryPlayer playerInv) { - - final TileEnchanter te = getInv(); - - addSlotToContainer(new Slot(te, 0, 27, 35) { - - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return te.isItemValidForSlot(0, itemStack); - } - - @Override - public void onSlotChanged() { - updateOutput(); - } - - }); - - addSlotToContainer(new Slot(te, 1, 76, 35) { - - @Override - public boolean isItemValid(ItemStack itemStack) { - return te.isItemValidForSlot(1, itemStack); - } - - @Override - public void onSlotChanged() { - updateOutput(); - } - - }); - - addSlotToContainer(new Slot(te, 2, 134, 35) { - - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public boolean isItemValid(ItemStack itemStack) { - return false; - } - - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - if(!player.capabilities.isCreativeMode) { - player.addExperienceLevel(-te.getCurrentEnchantmentCost()); - } - EnchantmentData enchData = te.getCurrentEnchantmentData(); - EnchanterRecipe recipe = te.getCurrentEnchantmentRecipe(); - ItemStack curStack = te.getStackInSlot(1); - if(recipe == null || enchData == null || curStack == null || enchData.enchantmentLevel >= curStack.stackSize) { - te.setInventorySlotContents(1, (ItemStack) null); - } else { - - curStack = curStack.copy(); - curStack.stackSize -= recipe.getItemsPerLevel() * enchData.enchantmentLevel; - if(curStack.stackSize > 0) { - te.setInventorySlotContents(1, curStack); - } else { - te.setInventorySlotContents(1, null); - } - te.markDirty(); - } - - te.setInventorySlotContents(0, (ItemStack) null); - if (!te.getWorldObj().isRemote) { - te.getWorldObj().playAuxSFX(1021, te.xCoord, te.yCoord, te.zCoord, 0); - } - } - - @Override - public boolean canTakeStack(EntityPlayer player) { - return playerHasEnoughLevels(player); - } - - }); - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(Items.writable_book, 27, 35)); - } - - public boolean playerHasEnoughLevels(EntityPlayer player) { - if(player.capabilities.isCreativeMode) { - return true; + public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) { + super(playerInv, te); } - return player.experienceLevel >= getInv().getCurrentEnchantmentCost(); - } - private void updateOutput() { - ItemStack output = null; - EnchantmentData enchantment = getInv().getCurrentEnchantmentData(); - if(enchantment != null) { - output = new ItemStack(Items.enchanted_book); - Items.enchanted_book.addEnchantment(output, enchantment); + @Override + protected void addSlots(InventoryPlayer playerInv) { + + final TileEnchanter te = getInv(); + + addSlotToContainer(new Slot(te, 0, 27, 35) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + return te.isItemValidForSlot(0, itemStack); + } + + @Override + public void onSlotChanged() { + updateOutput(); + } + }); + + addSlotToContainer(new Slot(te, 1, 76, 35) { + + @Override + public boolean isItemValid(ItemStack itemStack) { + return te.isItemValidForSlot(1, itemStack); + } + + @Override + public void onSlotChanged() { + updateOutput(); + } + }); + + addSlotToContainer(new Slot(te, 2, 134, 35) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + return false; + } + + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!player.capabilities.isCreativeMode) { + player.addExperienceLevel(-te.getCurrentEnchantmentCost()); + } + EnchantmentData enchData = te.getCurrentEnchantmentData(); + EnchanterRecipe recipe = te.getCurrentEnchantmentRecipe(); + ItemStack curStack = te.getStackInSlot(1); + if (recipe == null + || enchData == null + || curStack == null + || enchData.enchantmentLevel >= curStack.stackSize) { + te.setInventorySlotContents(1, (ItemStack) null); + } else { + + curStack = curStack.copy(); + curStack.stackSize -= recipe.getItemsPerLevel() * enchData.enchantmentLevel; + if (curStack.stackSize > 0) { + te.setInventorySlotContents(1, curStack); + } else { + te.setInventorySlotContents(1, null); + } + te.markDirty(); + } + + te.setInventorySlotContents(0, (ItemStack) null); + if (!te.getWorldObj().isRemote) { + te.getWorldObj().playAuxSFX(1021, te.xCoord, te.yCoord, te.zCoord, 0); + } + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + return playerHasEnoughLevels(player); + } + }); } - getInv().setOutput(output); - } - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - ItemStack copyStack = null; - Slot slot = (Slot) inventorySlots.get(par2); - - if (slot != null && slot.getHasStack()) { - ItemStack origStack = slot.getStack(); - copyStack = origStack.copy(); - - if (par2 <= 2) { - if (!mergeItemStack(origStack, 2, inventorySlots.size(), true)) { - return null; - } - } else { - if (!getInv().isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 1, false)) { - if (!getInv().isItemValidForSlot(1, origStack) || !mergeItemStack(origStack, 1, 2, false)) { - return null; - } - } - } - if (origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - slot.onPickupFromSlot(par1EntityPlayer, origStack); + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(Items.writable_book, 27, 35)); + } + + public boolean playerHasEnoughLevels(EntityPlayer player) { + if (player.capabilities.isCreativeMode) { + return true; + } + return player.experienceLevel >= getInv().getCurrentEnchantmentCost(); + } + + private void updateOutput() { + ItemStack output = null; + EnchantmentData enchantment = getInv().getCurrentEnchantmentData(); + if (enchantment != null) { + output = new ItemStack(Items.enchanted_book); + Items.enchanted_book.addEnchantment(output, enchantment); + } + getInv().setOutput(output); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { + ItemStack copyStack = null; + Slot slot = (Slot) inventorySlots.get(par2); + + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + copyStack = origStack.copy(); + + if (par2 <= 2) { + if (!mergeItemStack(origStack, 2, inventorySlots.size(), true)) { + return null; + } + } else { + if (!getInv().isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 1, false)) { + if (!getInv().isItemValidForSlot(1, origStack) || !mergeItemStack(origStack, 1, 2, false)) { + return null; + } + } + } + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + slot.onPickupFromSlot(par1EntityPlayer, origStack); + } + return copyStack; } - return copyStack; - } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModel.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModel.java index 96193042..ea779c21 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModel.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModel.java @@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class EnchanterModel extends ModelBase { - //fields + // fields ModelRenderer stand; ModelRenderer ring; ModelRenderer base; @@ -16,95 +16,93 @@ public class EnchanterModel extends ModelBase { ModelRenderer pageLeft; ModelRenderer sheetRight; ModelRenderer pageRight; - - public EnchanterModel() { - - textureWidth = 64; - textureHeight = 64; - - stand = new ModelRenderer(this, 0, 14); - stand.addBox(0F, 0F, 0F, 3, 11, 3); - stand.setRotationPoint(-1.5F, 12F, -1.5F); - stand.setTextureSize(64, 64); - stand.mirror = true; - setRotation(stand, 0F, 0F, 0F); - ring = new ModelRenderer(this, 12, 14); - ring.addBox(0F, 0F, 0F, 4, 2, 4); - ring.setRotationPoint(-2F, 17F, -2F); - ring.setTextureSize(64, 64); - ring.mirror = true; - setRotation(ring, 0F, 0F, 0F); - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 13, 1, 13); - base.setRotationPoint(-6.5F, 23F, -6.5F); - base.setTextureSize(64, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - tableTop = new ModelRenderer(this, 0, 0); - tableTop.addBox(-6.5F, 0F, -6.5F, 13, 1, 13); - tableTop.setRotationPoint(0F, 11.5F, 0F); - tableTop.setTextureSize(64, 64); - tableTop.mirror = true; - setRotation(tableTop, 0.2268928F, 0F, 0F); - coverRight = new ModelRenderer(this, 0, 32); - coverRight.addBox(-0.1F, 0F, -4F, 5, 1, 8); - coverRight.setRotationPoint(1F, 11F, 0F); - coverRight.setTextureSize(64, 64); - coverRight.mirror = true; - setRotation(coverRight, 0.2268928F, 0F, -0.0523599F); - coverMiddle = new ModelRenderer(this, 26, 32); - coverMiddle.addBox(-1F, 0F, -4F, 2, 1, 8); - coverMiddle.setRotationPoint(0F, 11F, 0F); - coverMiddle.setTextureSize(64, 64); - coverMiddle.mirror = true; - setRotation(coverMiddle, 0.2268928F, 0F, 0F); - coverLeft = new ModelRenderer(this, 0, 32); - coverLeft.addBox(-5F, 0F, -4F, 5, 1, 8); - coverLeft.setRotationPoint(-0.9F, 11F, 0F); - coverLeft.setTextureSize(64, 64); - coverLeft.mirror = true; - setRotation(coverLeft, 0.2268928F, 0F, 0.0523599F); - pageLeft = new ModelRenderer(this, 0, 41); - pageLeft.addBox(-5F, -1F, -3.5F, 5, 1, 7); - pageLeft.setRotationPoint(0F, 11F, 0F); - pageLeft.setTextureSize(64, 64); - pageLeft.mirror = true; - setRotation(pageLeft, 0.2268928F, 0F, 0.0523599F); - //sheetRight = new ModelRenderer(this, 24, 49); - sheetRight = new ModelRenderer(this, 0, 41); - sheetRight.addBox(-0.1F, -0.8F, -3.5F, 5, 0, 7); - sheetRight.setRotationPoint(0F, 11F, 0F); - sheetRight.setTextureSize(64, 64); - sheetRight.mirror = true; - setRotation(sheetRight, 0.2268928F, 0.0349066F, -0.0349066F); - pageRight = new ModelRenderer(this, 24, 41); - pageRight.addBox(-0.1F, -1F, -3.5F, 5, 1, 7); - pageRight.setRotationPoint(0F, 11F, 0F); - pageRight.setTextureSize(64, 64); - pageRight.mirror = true; - setRotation(pageRight, 0.2268928F, 0F, -0.0523599F); - } - - 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); - stand.render(f5); - ring.render(f5); - base.render(f5); - tableTop.render(f5); - coverRight.render(f5); - coverMiddle.render(f5); - coverLeft.render(f5); - pageLeft.render(f5); - sheetRight.render(f5); - pageRight.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - + public EnchanterModel() { + + textureWidth = 64; + textureHeight = 64; + + stand = new ModelRenderer(this, 0, 14); + stand.addBox(0F, 0F, 0F, 3, 11, 3); + stand.setRotationPoint(-1.5F, 12F, -1.5F); + stand.setTextureSize(64, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + ring = new ModelRenderer(this, 12, 14); + ring.addBox(0F, 0F, 0F, 4, 2, 4); + ring.setRotationPoint(-2F, 17F, -2F); + ring.setTextureSize(64, 64); + ring.mirror = true; + setRotation(ring, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 13, 1, 13); + base.setRotationPoint(-6.5F, 23F, -6.5F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + tableTop = new ModelRenderer(this, 0, 0); + tableTop.addBox(-6.5F, 0F, -6.5F, 13, 1, 13); + tableTop.setRotationPoint(0F, 11.5F, 0F); + tableTop.setTextureSize(64, 64); + tableTop.mirror = true; + setRotation(tableTop, 0.2268928F, 0F, 0F); + coverRight = new ModelRenderer(this, 0, 32); + coverRight.addBox(-0.1F, 0F, -4F, 5, 1, 8); + coverRight.setRotationPoint(1F, 11F, 0F); + coverRight.setTextureSize(64, 64); + coverRight.mirror = true; + setRotation(coverRight, 0.2268928F, 0F, -0.0523599F); + coverMiddle = new ModelRenderer(this, 26, 32); + coverMiddle.addBox(-1F, 0F, -4F, 2, 1, 8); + coverMiddle.setRotationPoint(0F, 11F, 0F); + coverMiddle.setTextureSize(64, 64); + coverMiddle.mirror = true; + setRotation(coverMiddle, 0.2268928F, 0F, 0F); + coverLeft = new ModelRenderer(this, 0, 32); + coverLeft.addBox(-5F, 0F, -4F, 5, 1, 8); + coverLeft.setRotationPoint(-0.9F, 11F, 0F); + coverLeft.setTextureSize(64, 64); + coverLeft.mirror = true; + setRotation(coverLeft, 0.2268928F, 0F, 0.0523599F); + pageLeft = new ModelRenderer(this, 0, 41); + pageLeft.addBox(-5F, -1F, -3.5F, 5, 1, 7); + pageLeft.setRotationPoint(0F, 11F, 0F); + pageLeft.setTextureSize(64, 64); + pageLeft.mirror = true; + setRotation(pageLeft, 0.2268928F, 0F, 0.0523599F); + // sheetRight = new ModelRenderer(this, 24, 49); + sheetRight = new ModelRenderer(this, 0, 41); + sheetRight.addBox(-0.1F, -0.8F, -3.5F, 5, 0, 7); + sheetRight.setRotationPoint(0F, 11F, 0F); + sheetRight.setTextureSize(64, 64); + sheetRight.mirror = true; + setRotation(sheetRight, 0.2268928F, 0.0349066F, -0.0349066F); + pageRight = new ModelRenderer(this, 24, 41); + pageRight.addBox(-0.1F, -1F, -3.5F, 5, 1, 7); + pageRight.setRotationPoint(0F, 11F, 0F); + pageRight.setTextureSize(64, 64); + pageRight.mirror = true; + setRotation(pageRight, 0.2268928F, 0F, -0.0523599F); + } + + 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); + stand.render(f5); + ring.render(f5); + base.render(f5); + tableTop.render(f5); + coverRight.render(f5); + coverMiddle.render(f5); + coverLeft.render(f5); + pageLeft.render(f5); + sheetRight.render(f5); + pageRight.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java index 04854c6e..1b657ac2 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterModelRenderer.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.enchanter; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,87 +12,80 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class EnchanterModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final String TEXTURE = "enderio:models/BookStand.png"; + private static final String TEXTURE = "enderio:models/BookStand.png"; - private EnchanterModel model = new EnchanterModel(); + private EnchanterModel model = new EnchanterModel(); - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - World world = te.getWorldObj(); - TileEnchanter gen = (TileEnchanter) te; + World world = te.getWorldObj(); + TileEnchanter gen = (TileEnchanter) te; - float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - renderModel(gen.getFacing()); - GL11.glPopMatrix(); - } - - private void renderModel(int facing) { - - GL11.glPushMatrix(); - - GL11.glTranslatef(0.5F, 1.5f, 0.5F); - GL11.glRotatef(180F, 1F, 0F, 0F); -// GL11.glScalef(1.2f, 0.9f, 1.2f); - - ForgeDirection dir = ForgeDirection.getOrientation(facing); - if(dir == ForgeDirection.SOUTH) { - facing = 0; - - } else if(dir == ForgeDirection.WEST) { - facing = -1; + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + renderModel(gen.getFacing()); + GL11.glPopMatrix(); } - GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(TEXTURE); - model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + private void renderModel(int facing) { - GL11.glTranslatef(-0.5F, -1.5f, -0.5F); - GL11.glPopMatrix(); + GL11.glPushMatrix(); - } + GL11.glTranslatef(0.5F, 1.5f, 0.5F); + GL11.glRotatef(180F, 1F, 0F, 0F); + // GL11.glScalef(1.2f, 0.9f, 1.2f); - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } + ForgeDirection dir = ForgeDirection.getOrientation(facing); + if (dir == ForgeDirection.SOUTH) { + facing = 0; - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } + } else if (dir == ForgeDirection.WEST) { + facing = -1; + } + GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderItem(0, 0, 0); - } + RenderUtil.bindTexture(TEXTURE); + model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - private void renderItem(float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - renderModel(ForgeDirection.SOUTH.ordinal()); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } + GL11.glTranslatef(-0.5F, -1.5f, -0.5F); + GL11.glPopMatrix(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderItem(0, 0, 0); + } + + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + renderModel(ForgeDirection.SOUTH.ordinal()); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipe.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipe.java index a3bc4ad0..886fff93 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipe.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipe.java @@ -1,70 +1,67 @@ package crazypants.enderio.machine.enchanter; +import crazypants.enderio.machine.recipe.RecipeInput; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.recipe.RecipeInput; public class EnchanterRecipe { - private final RecipeInput input; - private final Enchantment enchantment; - private final int costPerLevel; - private final int stackSizePerLevel; - - public static Enchantment getEnchantmentFromName(String enchantmentName) { - for(Enchantment ench : Enchantment.enchantmentsList) { - if(ench != null && ench.getName() != null && ench.getName().equals(enchantmentName)) { - return ench; - } + private final RecipeInput input; + private final Enchantment enchantment; + private final int costPerLevel; + private final int stackSizePerLevel; + + public static Enchantment getEnchantmentFromName(String enchantmentName) { + for (Enchantment ench : Enchantment.enchantmentsList) { + if (ench != null && ench.getName() != null && ench.getName().equals(enchantmentName)) { + return ench; + } + } + return null; } - return null; - } - - public EnchanterRecipe(RecipeInput curInput, String enchantmentName, int costPerLevel) { - input = curInput; - enchantment = getEnchantmentFromName(enchantmentName); - this.costPerLevel = costPerLevel; - stackSizePerLevel = curInput.getInput().stackSize; - } - public EnchanterRecipe(RecipeInput input, Enchantment enchantment, int costPerLevel) { - this.input = input; - this.enchantment = enchantment; - this.costPerLevel = costPerLevel; - stackSizePerLevel = input.getInput().stackSize; - } - - public boolean isInput(ItemStack stack) { - if(stack == null || !isValid()) { - return false; + public EnchanterRecipe(RecipeInput curInput, String enchantmentName, int costPerLevel) { + input = curInput; + enchantment = getEnchantmentFromName(enchantmentName); + this.costPerLevel = costPerLevel; + stackSizePerLevel = curInput.getInput().stackSize; } - return input.isInput(stack); - } - - public boolean isValid() { - return enchantment != null && input != null && input.getInput() != null && costPerLevel > -1; - } - public Enchantment getEnchantment() { - return enchantment; - } + public EnchanterRecipe(RecipeInput input, Enchantment enchantment, int costPerLevel) { + this.input = input; + this.enchantment = enchantment; + this.costPerLevel = costPerLevel; + stackSizePerLevel = input.getInput().stackSize; + } - public RecipeInput getInput() { - return input; - } + public boolean isInput(ItemStack stack) { + if (stack == null || !isValid()) { + return false; + } + return input.isInput(stack); + } - public int getCostPerLevel() { - return costPerLevel; - } - - public int getLevelForStackSize(int size) { - return Math.min(size / stackSizePerLevel, enchantment.getMaxLevel()); - } + public boolean isValid() { + return enchantment != null && input != null && input.getInput() != null && costPerLevel > -1; + } - public int getItemsPerLevel() { - return stackSizePerLevel; - } - - - + public Enchantment getEnchantment() { + return enchantment; + } + + public RecipeInput getInput() { + return input; + } + + public int getCostPerLevel() { + return costPerLevel; + } + + public int getLevelForStackSize(int size) { + return Math.min(size / stackSizePerLevel, enchantment.getMaxLevel()); + } + + public int getItemsPerLevel() { + return stackSizePerLevel; + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java index d76c9bc7..9489d618 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeManager.java @@ -1,52 +1,50 @@ package crazypants.enderio.machine.enchanter; +import crazypants.enderio.Log; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; -import crazypants.enderio.Log; public class EnchanterRecipeManager { - private static EnchanterRecipeManager instance = new EnchanterRecipeManager(); - - public static EnchanterRecipeManager getInstance() { - return instance; - } + private static EnchanterRecipeManager instance = new EnchanterRecipeManager(); - private final List recipes = new ArrayList(); - - public void loadRecipesFromConfig() { - List res = EnchanterRecipeParser.loadRecipeConfig(); - if(res != null) { - recipes.addAll(res); + public static EnchanterRecipeManager getInstance() { + return instance; } - Log.info("Loaded " + recipes.size() + " recipes for Enchanter"); - } - public EnchanterRecipe getEnchantmentRecipeForInput(ItemStack itemStack) { - if(itemStack == null) { - return null; + private final List recipes = new ArrayList(); + + public void loadRecipesFromConfig() { + List res = EnchanterRecipeParser.loadRecipeConfig(); + if (res != null) { + recipes.addAll(res); + } + Log.info("Loaded " + recipes.size() + " recipes for Enchanter"); } - for(EnchanterRecipe recipe : recipes) { - if(recipe.isInput(itemStack)) { - return recipe; - } + + public EnchanterRecipe getEnchantmentRecipeForInput(ItemStack itemStack) { + if (itemStack == null) { + return null; + } + for (EnchanterRecipe recipe : recipes) { + if (recipe.isInput(itemStack)) { + return recipe; + } + } + return null; } - return null; - } - public void addCustomRecipes(String xml) { - try { - List newRec = EnchanterRecipeParser.parse(xml); - EnchanterRecipeParser.merge(recipes, newRec); - } catch (Exception e) { - Log.error("EnchanterRecipeManager: Error processing custom Enchanter recipes: " + e); + public void addCustomRecipes(String xml) { + try { + List newRec = EnchanterRecipeParser.parse(xml); + EnchanterRecipeParser.merge(recipes, newRec); + } catch (Exception e) { + Log.error("EnchanterRecipeManager: Error processing custom Enchanter recipes: " + e); + } } - } - - public List getRecipes() { - return recipes; - } + public List getRecipes() { + return recipes; + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java index b0db18c7..5f04360e 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/EnchanterRecipeParser.java @@ -1,5 +1,10 @@ package crazypants.enderio.machine.enchanter; +import crazypants.enderio.Log; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.recipe.RecipeConfig; +import crazypants.enderio.machine.recipe.RecipeConfigParser; +import crazypants.enderio.machine.recipe.RecipeInput; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -12,12 +17,9 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; - import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; - import net.minecraft.enchantment.Enchantment; - import org.apache.commons.io.IOUtils; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -26,218 +28,216 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import crazypants.enderio.Log; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.recipe.RecipeConfig; -import crazypants.enderio.machine.recipe.RecipeConfigParser; -import crazypants.enderio.machine.recipe.RecipeInput; - public class EnchanterRecipeParser extends DefaultHandler { - private static final String CORE_FILE_NAME = "EnchanterRecipes_Core.xml"; - private static final String CUSTOM_FILE_NAME = "EnchanterRecipes_User.xml"; + private static final String CORE_FILE_NAME = "EnchanterRecipes_Core.xml"; + private static final String CUSTOM_FILE_NAME = "EnchanterRecipes_User.xml"; - public static List loadRecipeConfig() { - File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); + public static List loadRecipeConfig() { + File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); - String defaultVals = null; - try { - defaultVals = readRecipes(coreFile, CORE_FILE_NAME, true); - } catch (IOException e) { - Log.error("Could not load default recipes file " + coreFile + " from EnderIO jar: " + e.getMessage()); - e.printStackTrace(); - return null; - } - - if(!coreFile.exists()) { - Log.error("Could not load default recipes from " + coreFile + " as the file does not exist."); - return null; - } - - List result = null; - try { - result = parse(defaultVals); - } catch (Exception e) { - Log.error("Error parsing " + CORE_FILE_NAME); - return null; - } - - File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); - String userConfigStr = null; - try { - userConfigStr = readRecipes(userFile, CUSTOM_FILE_NAME, false); - if(userConfigStr == null || userConfigStr.trim().length() == 0) { - Log.error("Empty user config file: " + userFile.getAbsolutePath()); - } else { - List userConfig = parse(userConfigStr); - merge(result, userConfig); - } - } catch (Exception e) { - Log.error("Could not load user defined recipes from file: " + CUSTOM_FILE_NAME); - e.printStackTrace(); - } - return result; - } - - public static void merge(List core, List userConfig) { - for (EnchanterRecipe rec : userConfig) { - removeFromList(rec.getEnchantment(), core); - } - core.addAll(userConfig); - } - - private static void removeFromList(Enchantment enchantment, List recipes) { - if(enchantment == null) { - return; - } - ListIterator iter = recipes.listIterator(); - while (iter.hasNext()) { - EnchanterRecipe rec = iter.next(); - if(rec != null && rec.getEnchantment() != null && rec.getEnchantment().getName().equals(enchantment.getName())) { - Log.info("Replacing enchater recipe based on user config for enchantment " + enchantment.getName()); - iter.remove(); - } - } - } - - private static String readRecipes(File copyTo, String fileName, boolean replaceIfExists) throws IOException { - if(!replaceIfExists && copyTo.exists()) { - return readStream(new FileInputStream(copyTo)); - } - - InputStream in = RecipeConfig.class.getResourceAsStream("/assets/enderio/config/" + fileName); - if(in == null) { - Log.error("Could load default Enchanter recipes."); - throw new IOException("Could not resource /assets/enderio/config/" + fileName + " form classpath. "); - } - String output = readStream(in); - BufferedWriter writer = null; - try { - writer = new BufferedWriter(new FileWriter(copyTo, false)); - writer.write(output.toString()); - } finally { - IOUtils.closeQuietly(writer); - } - return output.toString(); - } - - private static String readStream(InputStream in) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - StringBuilder output = new StringBuilder(); - try { - String line = reader.readLine(); - while (line != null) { - output.append(line); - output.append("\n"); - line = reader.readLine(); - } - } finally { - IOUtils.closeQuietly(reader); - } - return output.toString(); - } - - public static List parse(String str) throws Exception { - StringReader reader = new StringReader(str); - InputSource is = new InputSource(reader); - try { - return parse(is); - } finally { - reader.close(); - } - } - - public static List parse(InputSource is) throws Exception { - - EnchanterRecipeParser parser = new EnchanterRecipeParser(); - - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setNamespaceAware(true); - SAXParser saxParser = spf.newSAXParser(); - XMLReader xmlReader = saxParser.getXMLReader(); - xmlReader.setContentHandler(parser); - xmlReader.parse(is); - - return parser.getResult(); - } - - public static final String ELEMENT_ENCHANTMENT = "enchantment"; - public static final String ELEMENT_ITEM_STACK = "itemStack"; - public static final String AT_NAME = "name"; - private static final String AT_LEVEL = "costPerLevel"; - - private List result = new ArrayList(); - - private Enchantment curEnchantment = null; - private int curLevelCost = -1; - private boolean enchantmentFound = true; - private RecipeInput curInput = null; - - private List getResult() { - return result; - } - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - if(ELEMENT_ENCHANTMENT.equals(localName)) { - curEnchantment = EnchanterRecipe.getEnchantmentFromName(attributes.getValue(AT_NAME)); - curLevelCost = RecipeConfigParser.getIntValue(AT_LEVEL, attributes, -1); - if(curLevelCost == -1) { - Log.warn("Cost per level not found for enchantment with name " + attributes.getValue(AT_NAME) + " when parsing enchanter recipes."); - curEnchantment = null; - } else if(curEnchantment == null) { - Log.warn("Could not find enchantment with name " + attributes.getValue(AT_NAME) + " when parsing enchanter recipes."); - enchantmentFound = false; - } else { - enchantmentFound = true; - } - } else if(ELEMENT_ITEM_STACK.equals(localName)) { - if(curEnchantment == null) { - if(enchantmentFound) { - Log.error("EnchanterRecipeParser: Encontered an item stack outside an enchantment element."); + String defaultVals = null; + try { + defaultVals = readRecipes(coreFile, CORE_FILE_NAME, true); + } catch (IOException e) { + Log.error("Could not load default recipes file " + coreFile + " from EnderIO jar: " + e.getMessage()); + e.printStackTrace(); + return null; } - } else if(curInput != null) { - Log.error("EnchanterRecipeParser: Multiple input stacks found within the enchantment tag for " + curEnchantment.getName()); - } else { - curInput = RecipeConfigParser.getItemStack(attributes); - } - } - } - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if(ELEMENT_ENCHANTMENT.equals(localName)) { - if(curEnchantment != null) { - if(curInput == null) { - Log.error("Valid input found for enchantment " + curEnchantment.getName() + " not found."); - } else { - EnchanterRecipe rec = new EnchanterRecipe(curInput, curEnchantment, curLevelCost); - if(rec.isValid()) { - result.add(rec); - } + if (!coreFile.exists()) { + Log.error("Could not load default recipes from " + coreFile + " as the file does not exist."); + return null; } - } - curInput = null; - curEnchantment = null; - enchantmentFound = true; + + List result = null; + try { + result = parse(defaultVals); + } catch (Exception e) { + Log.error("Error parsing " + CORE_FILE_NAME); + return null; + } + + File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); + String userConfigStr = null; + try { + userConfigStr = readRecipes(userFile, CUSTOM_FILE_NAME, false); + if (userConfigStr == null || userConfigStr.trim().length() == 0) { + Log.error("Empty user config file: " + userFile.getAbsolutePath()); + } else { + List userConfig = parse(userConfigStr); + merge(result, userConfig); + } + } catch (Exception e) { + Log.error("Could not load user defined recipes from file: " + CUSTOM_FILE_NAME); + e.printStackTrace(); + } + return result; } - } - @Override - public void warning(SAXParseException e) throws SAXException { - Log.warn("Warning parsing Enchanter config file: " + e.getMessage()); - } + public static void merge(List core, List userConfig) { + for (EnchanterRecipe rec : userConfig) { + removeFromList(rec.getEnchantment(), core); + } + core.addAll(userConfig); + } - @Override - public void error(SAXParseException e) throws SAXException { - Log.error("Error parsing Enchanter config file: " + e.getMessage()); - e.printStackTrace(); - } + private static void removeFromList(Enchantment enchantment, List recipes) { + if (enchantment == null) { + return; + } + ListIterator iter = recipes.listIterator(); + while (iter.hasNext()) { + EnchanterRecipe rec = iter.next(); + if (rec != null + && rec.getEnchantment() != null + && rec.getEnchantment().getName().equals(enchantment.getName())) { + Log.info("Replacing enchater recipe based on user config for enchantment " + enchantment.getName()); + iter.remove(); + } + } + } - @Override - public void fatalError(SAXParseException e) throws SAXException { - Log.error("Error parsing Enchanter config file: " + e.getMessage()); - e.printStackTrace(); - } + private static String readRecipes(File copyTo, String fileName, boolean replaceIfExists) throws IOException { + if (!replaceIfExists && copyTo.exists()) { + return readStream(new FileInputStream(copyTo)); + } + InputStream in = RecipeConfig.class.getResourceAsStream("/assets/enderio/config/" + fileName); + if (in == null) { + Log.error("Could load default Enchanter recipes."); + throw new IOException("Could not resource /assets/enderio/config/" + fileName + " form classpath. "); + } + String output = readStream(in); + BufferedWriter writer = null; + try { + writer = new BufferedWriter(new FileWriter(copyTo, false)); + writer.write(output.toString()); + } finally { + IOUtils.closeQuietly(writer); + } + return output.toString(); + } + + private static String readStream(InputStream in) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + StringBuilder output = new StringBuilder(); + try { + String line = reader.readLine(); + while (line != null) { + output.append(line); + output.append("\n"); + line = reader.readLine(); + } + } finally { + IOUtils.closeQuietly(reader); + } + return output.toString(); + } + + public static List parse(String str) throws Exception { + StringReader reader = new StringReader(str); + InputSource is = new InputSource(reader); + try { + return parse(is); + } finally { + reader.close(); + } + } + + public static List parse(InputSource is) throws Exception { + + EnchanterRecipeParser parser = new EnchanterRecipeParser(); + + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setNamespaceAware(true); + SAXParser saxParser = spf.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setContentHandler(parser); + xmlReader.parse(is); + + return parser.getResult(); + } + + public static final String ELEMENT_ENCHANTMENT = "enchantment"; + public static final String ELEMENT_ITEM_STACK = "itemStack"; + public static final String AT_NAME = "name"; + private static final String AT_LEVEL = "costPerLevel"; + + private List result = new ArrayList(); + + private Enchantment curEnchantment = null; + private int curLevelCost = -1; + private boolean enchantmentFound = true; + private RecipeInput curInput = null; + + private List getResult() { + return result; + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (ELEMENT_ENCHANTMENT.equals(localName)) { + curEnchantment = EnchanterRecipe.getEnchantmentFromName(attributes.getValue(AT_NAME)); + curLevelCost = RecipeConfigParser.getIntValue(AT_LEVEL, attributes, -1); + if (curLevelCost == -1) { + Log.warn("Cost per level not found for enchantment with name " + attributes.getValue(AT_NAME) + + " when parsing enchanter recipes."); + curEnchantment = null; + } else if (curEnchantment == null) { + Log.warn("Could not find enchantment with name " + attributes.getValue(AT_NAME) + + " when parsing enchanter recipes."); + enchantmentFound = false; + } else { + enchantmentFound = true; + } + } else if (ELEMENT_ITEM_STACK.equals(localName)) { + if (curEnchantment == null) { + if (enchantmentFound) { + Log.error("EnchanterRecipeParser: Encontered an item stack outside an enchantment element."); + } + } else if (curInput != null) { + Log.error("EnchanterRecipeParser: Multiple input stacks found within the enchantment tag for " + + curEnchantment.getName()); + } else { + curInput = RecipeConfigParser.getItemStack(attributes); + } + } + } + + @Override + public void endElement(String uri, String localName, String qName) throws SAXException { + if (ELEMENT_ENCHANTMENT.equals(localName)) { + if (curEnchantment != null) { + if (curInput == null) { + Log.error("Valid input found for enchantment " + curEnchantment.getName() + " not found."); + } else { + EnchanterRecipe rec = new EnchanterRecipe(curInput, curEnchantment, curLevelCost); + if (rec.isValid()) { + result.add(rec); + } + } + } + curInput = null; + curEnchantment = null; + enchantmentFound = true; + } + } + + @Override + public void warning(SAXParseException e) throws SAXException { + Log.warn("Warning parsing Enchanter config file: " + e.getMessage()); + } + + @Override + public void error(SAXParseException e) throws SAXException { + Log.error("Error parsing Enchanter config file: " + e.getMessage()); + e.printStackTrace(); + } + + @Override + public void fatalError(SAXParseException e) throws SAXException { + Log.error("Error parsing Enchanter config file: " + e.getMessage()); + e.printStackTrace(); + } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java index 8ce49ee4..998018fd 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java @@ -1,69 +1,65 @@ package crazypants.enderio.machine.enchanter; +import com.enderio.core.client.gui.button.IconButton; +import crazypants.enderio.EnderIO; +import crazypants.enderio.gui.GuiContainerBaseEIO; +import crazypants.enderio.gui.IconEIO; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.GuiContainerBaseEIO; -import crazypants.enderio.gui.IconEIO; - public class GuiEnchanter extends GuiContainerBaseEIO { - private TileEnchanter te; - private ContainerEnchanter container; - private IconButton recipeButton; - - public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) { - super(new ContainerEnchanter(player, inventory, te), "enchanter"); - container = (ContainerEnchanter)inventorySlots; - this.te = te; - - recipeButton = new IconButton(this, 100, 154, 8, IconEIO.RECIPE); - recipeButton.visible = false; - recipeButton.setIconMargin(1, 1); - } - - @Override - public void initGui() { - super.initGui(); - recipeButton.onGuiInit(); - recipeButton.visible = EnderIO.proxy.isNeiInstalled(); - ((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - if(EnderIO.proxy.isNeiInstalled()) { - IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true); + private TileEnchanter te; + private ContainerEnchanter container; + private IconButton recipeButton; + + public GuiEnchanter(EntityPlayer player, InventoryPlayer inventory, TileEnchanter te) { + super(new ContainerEnchanter(player, inventory, te), "enchanter"); + container = (ContainerEnchanter) inventorySlots; + this.te = te; + + recipeButton = new IconButton(this, 100, 154, 8, IconEIO.RECIPE); + recipeButton.visible = false; + recipeButton.setIconMargin(1, 1); } - - int curCost = te.getCurrentEnchantmentCost(); - if(curCost > 0) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int col; - if(container.playerHasEnoughLevels(Minecraft.getMinecraft().thePlayer)) { - col = 8453920; //all good - } else { - col = 16736352; //not enough levels + + @Override + public void initGui() { + super.initGui(); + recipeButton.onGuiInit(); + recipeButton.visible = EnderIO.proxy.isNeiInstalled(); + ((ContainerEnchanter) inventorySlots).createGhostSlots(getGhostSlots()); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); bindGuiTexture(); - drawTexturedModalRect(sx + 99, sy + 33, 176, 0, 28, 21); - } - String s = I18n.format("container.repair.cost", new Object[] {Integer.valueOf(curCost)}); - drawCenteredString(Minecraft.getMinecraft().fontRenderer, s, sx + xSize/2, sy + 57, col); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + if (EnderIO.proxy.isNeiInstalled()) { + IconEIO.map.render(IconEIO.RECIPE, sx + 155, sy + 8, 16, 16, 0, true); + } + + int curCost = te.getCurrentEnchantmentCost(); + if (curCost > 0) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int col; + if (container.playerHasEnoughLevels(Minecraft.getMinecraft().thePlayer)) { + col = 8453920; // all good + } else { + col = 16736352; // not enough levels + bindGuiTexture(); + drawTexturedModalRect(sx + 99, sy + 33, 176, 0, 28, 21); + } + String s = I18n.format("container.repair.cost", new Object[] {Integer.valueOf(curCost)}); + drawCenteredString(Minecraft.getMinecraft().fontRenderer, s, sx + xSize / 2, sy + 57, col); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java index 4518bc01..3259677c 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/TileEnchanter.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.enchanter; +import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.config.Config; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.entity.player.EntityPlayer; @@ -9,269 +12,262 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.config.Config; public class TileEnchanter extends TileEntityEio implements ISidedInventory { - private ItemStack[] inv = new ItemStack[3]; + private ItemStack[] inv = new ItemStack[3]; - private short facing = (short) ForgeDirection.NORTH.ordinal(); + private short facing = (short) ForgeDirection.NORTH.ordinal(); - public void setFacing(short s) { - facing = s; - } - - public short getFacing() { - return facing; - } - - @Override - protected void writeCustomNBT(NBTTagCompound root) { - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inv.length; i++) { - if(inv[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inv[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } + public void setFacing(short s) { + facing = s; } - root.setTag("Items", itemList); - root.setShort("facing", facing); - } - @Override - protected void readCustomNBT(NBTTagCompound root) { - NBTTagList itemList = (NBTTagList) root.getTag("Items"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inv.length) { - inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); + public short getFacing() { + return facing; + } + + @Override + protected void writeCustomNBT(NBTTagCompound root) { + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inv.length; i++) { + if (inv[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inv[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } } - } + root.setTag("Items", itemList); + root.setShort("facing", facing); } - facing = root.getShort("facing"); - } - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return canPlayerAccess(player); - } - - @Override - public int getSizeInventory() { - return inv.length; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(slot < 0 || slot >= inv.length) { - return null; + @Override + protected void readCustomNBT(NBTTagCompound root) { + NBTTagList itemList = (NBTTagList) root.getTag("Items"); + if (itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inv.length) { + inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + facing = root.getShort("facing"); } - return inv[slot]; - } - @Override - public ItemStack decrStackSize(int slot, int amount) { - if(amount <= 0 || slot < 0 || slot >= inv.length || inv[slot] == null) { - return null; + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); } - ItemStack fromStack = inv[slot]; - if(fromStack == null) { - return null; - } - if(fromStack.stackSize <= amount) { - inv[slot] = null; - return fromStack; - } - ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); - if(fromStack.stackTagCompound != null) { - result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); - } - fromStack.stackSize -= amount; - return result; - } - @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - if(contents == null) { - inv[slot] = contents; - } else { - inv[slot] = contents.copy(); + @Override + public int getSizeInventory() { + return inv.length; } - if(contents != null && contents.stackSize > getInventoryStackLimit()) { - contents.stackSize = getInventoryStackLimit(); + + @Override + public ItemStack getStackInSlot(int slot) { + if (slot < 0 || slot >= inv.length) { + return null; + } + return inv[slot]; } - } - @Override - public String getInventoryName() { - return ModObject.blockEnchanter.unlocalisedName; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public void openInventory() { - - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - if(stack == null) { - return false; + @Override + public ItemStack decrStackSize(int slot, int amount) { + if (amount <= 0 || slot < 0 || slot >= inv.length || inv[slot] == null) { + return null; + } + ItemStack fromStack = inv[slot]; + if (fromStack == null) { + return null; + } + if (fromStack.stackSize <= amount) { + inv[slot] = null; + return fromStack; + } + ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); + if (fromStack.stackTagCompound != null) { + result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); + } + fromStack.stackSize -= amount; + return result; } - if(slot == 0) { - return Items.writable_book == stack.getItem(); - } - if(slot == 1) { - return EnchanterRecipeManager.getInstance().getEnchantmentRecipeForInput(stack) != null; - } - return false; - } - public EnchanterRecipe getCurrentEnchantmentRecipe() { - if(inv[0] == null) { - return null; + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + return null; } - if(inv[1] == null) { - return null; - } - EnchanterRecipe ench = EnchanterRecipeManager.getInstance().getEnchantmentRecipeForInput(inv[1]); - if(ench == null) { - return null; - } - int level = ench.getLevelForStackSize(inv[1].stackSize); - if(level <= 0) { - return null; - } - return ench; - } - - public EnchantmentData getCurrentEnchantmentData() { - EnchanterRecipe rec = getCurrentEnchantmentRecipe(); - if(rec == null || inv[1] == null) { - return null; - } - int level = rec.getLevelForStackSize(inv[1].stackSize); - if(level <= 0) { - return null; - } - return new EnchantmentData(rec.getEnchantment(), level); - } - // public static int getEnchantmentCost(EnchantmentData enchData) { - // if(enchData == null) { - // return 0; - // } - // int level = enchData.enchantmentLevel; - // Enchantment enchantment = enchData.enchantmentobj; - // - // if(level > enchantment.getMaxLevel()) { - // level = enchantment.getMaxLevel(); - // } - // - // int costPerLevel = 0; - // switch (enchantment.getWeight()) { - // case 1: - // costPerLevel = 8; - // //Stops silk touch and infinity being too cheap - // if(enchantment.getMaxLevel() == 1) { - // level = 2; - // } - // break; - // case 2: - // costPerLevel = 4; - // case 3: - // case 4: - // case 6: - // case 7: - // case 8: - // case 9: - // default: - // break; - // case 5: - // costPerLevel = 2; - // break; - // case 10: - // costPerLevel = 1; - // } - // - // int res = 4; - // for (int i = 0; i < level; i++) { - // res += costPerLevel * level; - // } - // return res; - // } - - public int getCurrentEnchantmentCost() { - return getEnchantmentCost(getCurrentEnchantmentRecipe()); - } - - private int getEnchantmentCost(EnchanterRecipe currentEnchantment) { - ItemStack item = inv[1]; - if(item == null) { - return 0; + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + if (contents == null) { + inv[slot] = contents; + } else { + inv[slot] = contents.copy(); + } + if (contents != null && contents.stackSize > getInventoryStackLimit()) { + contents.stackSize = getInventoryStackLimit(); + } } - if(currentEnchantment == null) { - return 0; + + @Override + public String getInventoryName() { + return ModObject.blockEnchanter.unlocalisedName; } - Enchantment enchantment = currentEnchantment.getEnchantment(); - int level = currentEnchantment.getLevelForStackSize(item.stackSize); - return getEnchantmentCost(currentEnchantment, level); - } - - public static int getEnchantmentCost(EnchanterRecipe recipe, int level) { - if(level > recipe.getEnchantment().getMaxLevel()) { - level = recipe.getEnchantment().getMaxLevel(); + + @Override + public boolean hasCustomInventoryName() { + return false; } - int costPerLevel = recipe.getCostPerLevel(); - int res = Config.enchanterBaseLevelCost; - for (int i = 0; i < level; i++) { - res += costPerLevel * level; + + @Override + public int getInventoryStackLimit() { + return 64; } - return res; - } - public void setOutput(ItemStack output) { - inv[inv.length - 1] = output; - markDirty(); - } + @Override + public void openInventory() {} - @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { - return new int[0]; - } + @Override + public void closeInventory() {} - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { - return false; - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + if (stack == null) { + return false; + } + if (slot == 0) { + return Items.writable_book == stack.getItem(); + } + if (slot == 1) { + return EnchanterRecipeManager.getInstance().getEnchantmentRecipeForInput(stack) != null; + } + return false; + } - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { - return false; - } + public EnchanterRecipe getCurrentEnchantmentRecipe() { + if (inv[0] == null) { + return null; + } + if (inv[1] == null) { + return null; + } + EnchanterRecipe ench = EnchanterRecipeManager.getInstance().getEnchantmentRecipeForInput(inv[1]); + if (ench == null) { + return null; + } + int level = ench.getLevelForStackSize(inv[1].stackSize); + if (level <= 0) { + return null; + } + return ench; + } + public EnchantmentData getCurrentEnchantmentData() { + EnchanterRecipe rec = getCurrentEnchantmentRecipe(); + if (rec == null || inv[1] == null) { + return null; + } + int level = rec.getLevelForStackSize(inv[1].stackSize); + if (level <= 0) { + return null; + } + return new EnchantmentData(rec.getEnchantment(), level); + } + + // public static int getEnchantmentCost(EnchantmentData enchData) { + // if(enchData == null) { + // return 0; + // } + // int level = enchData.enchantmentLevel; + // Enchantment enchantment = enchData.enchantmentobj; + // + // if(level > enchantment.getMaxLevel()) { + // level = enchantment.getMaxLevel(); + // } + // + // int costPerLevel = 0; + // switch (enchantment.getWeight()) { + // case 1: + // costPerLevel = 8; + // //Stops silk touch and infinity being too cheap + // if(enchantment.getMaxLevel() == 1) { + // level = 2; + // } + // break; + // case 2: + // costPerLevel = 4; + // case 3: + // case 4: + // case 6: + // case 7: + // case 8: + // case 9: + // default: + // break; + // case 5: + // costPerLevel = 2; + // break; + // case 10: + // costPerLevel = 1; + // } + // + // int res = 4; + // for (int i = 0; i < level; i++) { + // res += costPerLevel * level; + // } + // return res; + // } + + public int getCurrentEnchantmentCost() { + return getEnchantmentCost(getCurrentEnchantmentRecipe()); + } + + private int getEnchantmentCost(EnchanterRecipe currentEnchantment) { + ItemStack item = inv[1]; + if (item == null) { + return 0; + } + if (currentEnchantment == null) { + return 0; + } + Enchantment enchantment = currentEnchantment.getEnchantment(); + int level = currentEnchantment.getLevelForStackSize(item.stackSize); + return getEnchantmentCost(currentEnchantment, level); + } + + public static int getEnchantmentCost(EnchanterRecipe recipe, int level) { + if (level > recipe.getEnchantment().getMaxLevel()) { + level = recipe.getEnchantment().getMaxLevel(); + } + int costPerLevel = recipe.getCostPerLevel(); + int res = Config.enchanterBaseLevelCost; + for (int i = 0; i < level; i++) { + res += costPerLevel * level; + } + return res; + } + + public void setOutput(ItemStack output) { + inv[inv.length - 1] = output; + markDirty(); + } + + @Override + public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + return new int[0]; + } + + @Override + public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + return false; + } + + @Override + public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java index 70acabec..32966e2d 100644 --- a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -1,7 +1,13 @@ package crazypants.enderio.machine.farm; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.network.PacketHandler; import java.util.Random; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -10,122 +16,117 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.network.PacketHandler; public class BlockFarmStation extends AbstractMachineBlock { - public static BlockFarmStation create() { - PacketHandler.INSTANCE.registerMessage(PacketFarmAction.class, PacketFarmAction.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketUpdateNotification.class, PacketUpdateNotification.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketFarmLockedSlot.class, PacketFarmLockedSlot.class, PacketHandler.nextID(), Side.SERVER); - BlockFarmStation result = new BlockFarmStation(); - result.init(); - return result; - } - - public static int renderId; - - private IIcon[] overlays; - - protected BlockFarmStation() { - super(ModObject.blockFarmStation, TileFarmStation.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileFarmStation) { - return new FarmStationContainer(player.inventory, (TileFarmStation)te); + public static BlockFarmStation create() { + PacketHandler.INSTANCE.registerMessage( + PacketFarmAction.class, PacketFarmAction.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketUpdateNotification.class, PacketUpdateNotification.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketFarmLockedSlot.class, PacketFarmLockedSlot.class, PacketHandler.nextID(), Side.SERVER); + BlockFarmStation result = new BlockFarmStation(); + result.init(); + return result; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileFarmStation) { - return new GuiFarmStation(player.inventory, (TileFarmStation) te); + public static int renderId; + + private IIcon[] overlays; + + protected BlockFarmStation() { + super(ModObject.blockFarmStation, TileFarmStation.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_FARM_STATATION; - } - - @Override - protected void registerOverlayIcons(IIconRegister iIconRegister) { - super.registerOverlayIcons(iIconRegister); - overlays = new IIcon[IoMode.values().length]; - overlays[IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); - overlays[IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); - overlays[IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); - overlays[IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledSides"); - } - - @Override - public IIcon getOverlayIconForMode(TileFarmStation tile, ForgeDirection face, IoMode mode) { - if(face.offsetY != 0 || mode == IoMode.NONE) { - return super.getOverlayIconForMode(tile, face, mode); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileFarmStation) { + return new FarmStationContainer(player.inventory, (TileFarmStation) te); + } + return null; } - return overlays[mode.ordinal()]; - } - @Override - protected String getMachineFrontIconKey(boolean active) { - return getBackIconKey(active); - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileFarmStation) { + return new GuiFarmStation(player.inventory, (TileFarmStation) te); + } + return null; + } - @Override - protected String getSideIconKey(boolean active) { - return super.getBackIconKey(active); - } - - @Override - protected String getModelIconKey(boolean active) { - return "enderio:farmModel"; - } + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_FARM_STATATION; + } - @Override - public int getRenderType() { - return renderId; - } + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + overlays = new IIcon[IoMode.values().length]; + overlays[IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); + overlays[IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); + overlays[IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); + overlays[IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledSides"); + } - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return true; - } + @Override + public IIcon getOverlayIconForMode(TileFarmStation tile, ForgeDirection face, IoMode mode) { + if (face.offsetY != 0 || mode == IoMode.NONE) { + return super.getOverlayIconForMode(tile, face, mode); + } + return overlays[mode.ordinal()]; + } - @Override - public boolean renderAsNormalBlock() { - return false; - } + @Override + protected String getMachineFrontIconKey(boolean active) { + return getBackIconKey(active); + } - @Override - public boolean isOpaqueCube() { - return false; - } + @Override + protected String getSideIconKey(boolean active) { + return super.getBackIconKey(active); + } - public IIcon getFrontIcon() { - return iconBuffer[0][3]; - } + @Override + protected String getModelIconKey(boolean active) { + return "enderio:farmModel"; + } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - } + @Override + public int getRenderType() { + return renderId; + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered( + IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { + return true; + } + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + public IIcon getFrontIcon() { + return iconBuffer[0][3]; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) {} + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java index 92ab5756..de9d3896 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FakeFarmPlayer.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.farm; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.Log; import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -10,89 +12,84 @@ import net.minecraft.server.management.ItemInWorldManager; import net.minecraft.stats.StatBase; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import com.mojang.authlib.GameProfile; - -import cpw.mods.fml.common.FMLCommonHandler; -import crazypants.enderio.Log; - /** * This is not in the FakePlayer hierarchy for reasons. * */ public class FakeFarmPlayer extends EntityPlayerMP { - private static final UUID uuid = UUID.fromString("c1ddfd7f-120a-4437-8b64-38660d3ec62d"); + private static final UUID uuid = UUID.fromString("c1ddfd7f-120a-4437-8b64-38660d3ec62d"); - private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioFarmer]"); + private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioFarmer]"); - public FakeFarmPlayer(WorldServer world) { - super(FMLCommonHandler.instance().getMinecraftServerInstance(), world, DUMMY_PROFILE, new ItemInWorldManager(world)); - // ItemInWorldManager will access this field directly and can crash - playerNetServerHandler = new FakeNetHandlerPlayServer(this); - } + public FakeFarmPlayer(WorldServer world) { + super( + FMLCommonHandler.instance().getMinecraftServerInstance(), + world, + DUMMY_PROFILE, + new ItemInWorldManager(world)); + // ItemInWorldManager will access this field directly and can crash + playerNetServerHandler = new FakeNetHandlerPlayServer(this); + } - @Override - public boolean canCommandSenderUseCommand(int i, String s) { - return false; - } + @Override + public boolean canCommandSenderUseCommand(int i, String s) { + return false; + } - @Override - public ChunkCoordinates getPlayerCoordinates() { - return new ChunkCoordinates(0, 0, 0); - } + @Override + public ChunkCoordinates getPlayerCoordinates() { + return new ChunkCoordinates(0, 0, 0); + } - @Override - public void addStat(StatBase par1StatBase, int par2) { - } + @Override + public void addStat(StatBase par1StatBase, int par2) {} - @Override - public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) { - } + @Override + public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) {} - @Override - public boolean isEntityInvulnerable() { - return true; - } + @Override + public boolean isEntityInvulnerable() { + return true; + } - @Override - public boolean canAttackPlayer(EntityPlayer player) { - return false; - } + @Override + public boolean canAttackPlayer(EntityPlayer player) { + return false; + } - @Override - public void onDeath(DamageSource source) { - return; - } + @Override + public void onDeath(DamageSource source) { + return; + } - @Override - public void onUpdate() { - return; - } + @Override + public void onUpdate() { + return; + } - @Override - public void travelToDimension(int dim) { - return; - } + @Override + public void travelToDimension(int dim) { + return; + } - @Override - public void func_147100_a(C15PacketClientSettings pkt) { - return; - } + @Override + public void func_147100_a(C15PacketClientSettings pkt) { + return; + } - @Override - public boolean canPlayerEdit(int par1, int par2, int par3, int par4, ItemStack par5ItemStack) { - return true; - } - - @Override - public void setWorld(World p_70029_1_) { - Log.warn("Ender IO Farming station fake player is being transfered to world '" + p_70029_1_ - + "'. Trying to reject transfer. Call stack follows:"); - Thread.dumpStack(); - } + @Override + public boolean canPlayerEdit(int par1, int par2, int par3, int par4, ItemStack par5ItemStack) { + return true; + } + @Override + public void setWorld(World p_70029_1_) { + Log.warn("Ender IO Farming station fake player is being transfered to world '" + p_70029_1_ + + "'. Trying to reject transfer. Call stack follows:"); + Thread.dumpStack(); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/FakeNetHandlerPlayServer.java b/src/main/java/crazypants/enderio/machine/farm/FakeNetHandlerPlayServer.java index 98a0f86e..9dcfe38a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FakeNetHandlerPlayServer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FakeNetHandlerPlayServer.java @@ -31,121 +31,94 @@ import net.minecraft.util.IChatComponent; public class FakeNetHandlerPlayServer extends NetHandlerPlayServer { - public FakeNetHandlerPlayServer(EntityPlayerMP p_i1530_3_) { - super(MinecraftServer.getServer(), new net.minecraft.network.NetworkManager(false), p_i1530_3_); - } + public FakeNetHandlerPlayServer(EntityPlayerMP p_i1530_3_) { + super(MinecraftServer.getServer(), new net.minecraft.network.NetworkManager(false), p_i1530_3_); + } - @Override - public void onNetworkTick() { - } + @Override + public void onNetworkTick() {} - @Override - public NetworkManager func_147362_b() { - return null; - } + @Override + public NetworkManager func_147362_b() { + return null; + } - @Override - public void kickPlayerFromServer(String p_147360_1_) { - } + @Override + public void kickPlayerFromServer(String p_147360_1_) {} - @Override - public void processInput(C0CPacketInput p_147358_1_) { - } + @Override + public void processInput(C0CPacketInput p_147358_1_) {} - @Override - public void processPlayer(C03PacketPlayer p_147347_1_) { - } + @Override + public void processPlayer(C03PacketPlayer p_147347_1_) {} - @Override - public void setPlayerLocation(double p_147364_1_, double p_147364_3_, double p_147364_5_, float p_147364_7_, float p_147364_8_) { - } + @Override + public void setPlayerLocation( + double p_147364_1_, double p_147364_3_, double p_147364_5_, float p_147364_7_, float p_147364_8_) {} - @Override - public void processPlayerDigging(C07PacketPlayerDigging p_147345_1_) { - } + @Override + public void processPlayerDigging(C07PacketPlayerDigging p_147345_1_) {} - @Override - public void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement p_147346_1_) { - } + @Override + public void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement p_147346_1_) {} - @Override - public void onDisconnect(IChatComponent p_147231_1_) { - } + @Override + public void onDisconnect(IChatComponent p_147231_1_) {} - @Override - public void sendPacket(Packet p_147359_1_) { - } + @Override + public void sendPacket(Packet p_147359_1_) {} - @Override - public void processHeldItemChange(C09PacketHeldItemChange p_147355_1_) { - } + @Override + public void processHeldItemChange(C09PacketHeldItemChange p_147355_1_) {} - @Override - public void processChatMessage(C01PacketChatMessage p_147354_1_) { - } + @Override + public void processChatMessage(C01PacketChatMessage p_147354_1_) {} - @Override - public void processAnimation(C0APacketAnimation p_147350_1_) { - } + @Override + public void processAnimation(C0APacketAnimation p_147350_1_) {} - @Override - public void processEntityAction(C0BPacketEntityAction p_147357_1_) { - } + @Override + public void processEntityAction(C0BPacketEntityAction p_147357_1_) {} - @Override - public void processUseEntity(C02PacketUseEntity p_147340_1_) { - } + @Override + public void processUseEntity(C02PacketUseEntity p_147340_1_) {} - @Override - public void processClientStatus(C16PacketClientStatus p_147342_1_) { - } + @Override + public void processClientStatus(C16PacketClientStatus p_147342_1_) {} - @Override - public void processCloseWindow(C0DPacketCloseWindow p_147356_1_) { - } + @Override + public void processCloseWindow(C0DPacketCloseWindow p_147356_1_) {} - @Override - public void processClickWindow(C0EPacketClickWindow p_147351_1_) { - } + @Override + public void processClickWindow(C0EPacketClickWindow p_147351_1_) {} - @Override - public void processEnchantItem(C11PacketEnchantItem p_147338_1_) { - } + @Override + public void processEnchantItem(C11PacketEnchantItem p_147338_1_) {} - @Override - public void processCreativeInventoryAction(C10PacketCreativeInventoryAction p_147344_1_) { - } + @Override + public void processCreativeInventoryAction(C10PacketCreativeInventoryAction p_147344_1_) {} - @Override - public void processConfirmTransaction(C0FPacketConfirmTransaction p_147339_1_) { - } + @Override + public void processConfirmTransaction(C0FPacketConfirmTransaction p_147339_1_) {} - @Override - public void processUpdateSign(C12PacketUpdateSign p_147343_1_) { - } + @Override + public void processUpdateSign(C12PacketUpdateSign p_147343_1_) {} - @Override - public void processKeepAlive(C00PacketKeepAlive p_147353_1_) { - } + @Override + public void processKeepAlive(C00PacketKeepAlive p_147353_1_) {} - @Override - public void processPlayerAbilities(C13PacketPlayerAbilities p_147348_1_) { - } + @Override + public void processPlayerAbilities(C13PacketPlayerAbilities p_147348_1_) {} - @Override - public void processTabComplete(C14PacketTabComplete p_147341_1_) { - } + @Override + public void processTabComplete(C14PacketTabComplete p_147341_1_) {} - @Override - public void processClientSettings(C15PacketClientSettings p_147352_1_) { - } + @Override + public void processClientSettings(C15PacketClientSettings p_147352_1_) {} - @Override - public void processVanilla250Packet(C17PacketCustomPayload p_147349_1_) { - } - - @Override - public void onConnectionStateTransition(EnumConnectionState p_147232_1_, EnumConnectionState p_147232_2_) { - } + @Override + public void processVanilla250Packet(C17PacketCustomPayload p_147349_1_) {} + @Override + public void onConnectionStateTransition(EnumConnectionState p_147232_1_, EnumConnectionState p_147232_2_) {} } diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index 0fd8f448..4b59a3bf 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -1,11 +1,17 @@ package crazypants.enderio.machine.farm; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import java.awt.Point; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Random; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -13,161 +19,163 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; - -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.config.Config; -import crazypants.enderio.item.darksteel.DarkSteelItems; -import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; -import crazypants.enderio.machine.gui.AbstractMachineContainer; - public class FarmStationContainer extends AbstractMachineContainer { - // TODO: This is a mess. Someone should make some nice, hand-selected lists of - // what to put in here. + // TODO: This is a mess. Someone should make some nice, hand-selected lists of + // what to put in here. - static private final Item[] slotItems1 = { Items.wooden_hoe, Items.stone_hoe, Items.iron_hoe, Items.golden_hoe, Items.diamond_hoe }; - static private final List slotItemsStacks1 = new ArrayList(); - static { - for (Item item : slotItems1) { - slotItemsStacks1.add(new ItemStack(item)); + private static final Item[] slotItems1 = { + Items.wooden_hoe, Items.stone_hoe, Items.iron_hoe, Items.golden_hoe, Items.diamond_hoe + }; + private static final List slotItemsStacks1 = new ArrayList(); + + static { + for (Item item : slotItems1) { + slotItemsStacks1.add(new ItemStack(item)); + } + slotItemsStacks1.addAll(Config.farmHoes); } - slotItemsStacks1.addAll(Config.farmHoes); - } - static private final Item[] slotItems2 = { Items.wooden_axe, Items.stone_axe, Items.iron_axe, Items.golden_axe, - Items.diamond_axe, DarkSteelItems.itemDarkSteelAxe }; - static private final Item[] slotItems3 = RubberTreeFarmerIC2.treeTap != null ? new Item[] { Items.shears, - DarkSteelItems.itemDarkSteelShears, GameRegistry.findItem("IC2", "itemTreetap") } : new Item[] { Items.shears, - DarkSteelItems.itemDarkSteelShears }; - static public final List slotItemsSeeds = new ArrayList(); - static { - slotItemsSeeds.add(new ItemStack(Items.wheat_seeds)); - slotItemsSeeds.add(new ItemStack(Blocks.carrots)); - slotItemsSeeds.add(new ItemStack(Blocks.potatoes)); - slotItemsSeeds.add(new ItemStack(Blocks.red_mushroom)); - slotItemsSeeds.add(new ItemStack(Blocks.brown_mushroom)); - slotItemsSeeds.add(new ItemStack(Blocks.nether_wart)); - slotItemsSeeds.add(new ItemStack(Blocks.sapling)); - slotItemsSeeds.add(new ItemStack(Items.reeds)); - } - static public final List slotItemsProduce = new ArrayList(); - static { - slotItemsProduce.add(new ItemStack(Blocks.log, 1, 0)); - slotItemsProduce.add(new ItemStack(Blocks.wheat)); - slotItemsProduce.add(new ItemStack(Blocks.leaves, 1, 0)); - slotItemsProduce.add(new ItemStack(Items.apple)); - } - static public final List slotItemsFertilizer = new ArrayList(); - static { - slotItemsFertilizer.add(new ItemStack(Items.dye, 1, 15)); - } - static private final Random rand = new Random(); + private static final Item[] slotItems2 = { + Items.wooden_axe, + Items.stone_axe, + Items.iron_axe, + Items.golden_axe, + Items.diamond_axe, + DarkSteelItems.itemDarkSteelAxe + }; + private static final Item[] slotItems3 = RubberTreeFarmerIC2.treeTap != null + ? new Item[] {Items.shears, DarkSteelItems.itemDarkSteelShears, GameRegistry.findItem("IC2", "itemTreetap")} + : new Item[] {Items.shears, DarkSteelItems.itemDarkSteelShears}; + public static final List slotItemsSeeds = new ArrayList(); - private static final int ROW_TOOLS = 19; - private static final int ROW_IO = 44; + static { + slotItemsSeeds.add(new ItemStack(Items.wheat_seeds)); + slotItemsSeeds.add(new ItemStack(Blocks.carrots)); + slotItemsSeeds.add(new ItemStack(Blocks.potatoes)); + slotItemsSeeds.add(new ItemStack(Blocks.red_mushroom)); + slotItemsSeeds.add(new ItemStack(Blocks.brown_mushroom)); + slotItemsSeeds.add(new ItemStack(Blocks.nether_wart)); + slotItemsSeeds.add(new ItemStack(Blocks.sapling)); + slotItemsSeeds.add(new ItemStack(Items.reeds)); + } - private static final int COL_TOOLS = 44; - private static final int COL_INPUT = 53; - private static final int COL_FERTILIZER = 116; - private static final int COL_OUTPUT = 107; + public static final List slotItemsProduce = new ArrayList(); - private static final int SLOT_SIZE = 18; - private static final int ONE = 0 * SLOT_SIZE; - private static final int TWO = 1 * SLOT_SIZE; - private static final int THREE = 2 * SLOT_SIZE; + static { + slotItemsProduce.add(new ItemStack(Blocks.log, 1, 0)); + slotItemsProduce.add(new ItemStack(Blocks.wheat)); + slotItemsProduce.add(new ItemStack(Blocks.leaves, 1, 0)); + slotItemsProduce.add(new ItemStack(Items.apple)); + } - private static final Point[] points = new Point[] { - new Point(COL_TOOLS + ONE, ROW_TOOLS), - new Point(COL_TOOLS + TWO, ROW_TOOLS), - new Point(COL_TOOLS + THREE, ROW_TOOLS), + public static final List slotItemsFertilizer = new ArrayList(); - new Point(COL_FERTILIZER + ONE, ROW_TOOLS), - new Point(COL_FERTILIZER + TWO, ROW_TOOLS), + static { + slotItemsFertilizer.add(new ItemStack(Items.dye, 1, 15)); + } - new Point(COL_INPUT + ONE, ROW_IO + ONE), - new Point(COL_INPUT + TWO, ROW_IO + ONE), - new Point(COL_INPUT + ONE, ROW_IO + TWO), - new Point(COL_INPUT + TWO, ROW_IO + TWO), + private static final Random rand = new Random(); - new Point(COL_OUTPUT + ONE, ROW_IO + ONE), - new Point(COL_OUTPUT + TWO, ROW_IO + ONE), - new Point(COL_OUTPUT + THREE, ROW_IO + ONE), - new Point(COL_OUTPUT + ONE, ROW_IO + TWO), - new Point(COL_OUTPUT + TWO, ROW_IO + TWO), - new Point(COL_OUTPUT + THREE, ROW_IO + TWO), + private static final int ROW_TOOLS = 19; + private static final int ROW_IO = 44; + + private static final int COL_TOOLS = 44; + private static final int COL_INPUT = 53; + private static final int COL_FERTILIZER = 116; + private static final int COL_OUTPUT = 107; + + private static final int SLOT_SIZE = 18; + private static final int ONE = 0 * SLOT_SIZE; + private static final int TWO = 1 * SLOT_SIZE; + private static final int THREE = 2 * SLOT_SIZE; + + private static final Point[] points = new Point[] { + new Point(COL_TOOLS + ONE, ROW_TOOLS), + new Point(COL_TOOLS + TWO, ROW_TOOLS), + new Point(COL_TOOLS + THREE, ROW_TOOLS), + new Point(COL_FERTILIZER + ONE, ROW_TOOLS), + new Point(COL_FERTILIZER + TWO, ROW_TOOLS), + new Point(COL_INPUT + ONE, ROW_IO + ONE), + new Point(COL_INPUT + TWO, ROW_IO + ONE), + new Point(COL_INPUT + ONE, ROW_IO + TWO), + new Point(COL_INPUT + TWO, ROW_IO + TWO), + new Point(COL_OUTPUT + ONE, ROW_IO + ONE), + new Point(COL_OUTPUT + TWO, ROW_IO + ONE), + new Point(COL_OUTPUT + THREE, ROW_IO + ONE), + new Point(COL_OUTPUT + ONE, ROW_IO + TWO), + new Point(COL_OUTPUT + TWO, ROW_IO + TWO), + new Point(COL_OUTPUT + THREE, ROW_IO + TWO), }; - public FarmStationContainer(InventoryPlayer inventory, TileFarmStation te) { - super(inventory, te); - } + public FarmStationContainer(InventoryPlayer inventory, TileFarmStation te) { + super(inventory, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - int i=0; - for(Point p : points) { - final int slot = i; - i++; - addSlotToContainer(new Slot(getInv(), slot, p.x, p.y) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(slot, itemStack); + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + int i = 0; + for (Point p : points) { + final int slot = i; + i++; + addSlotToContainer(new Slot(getInv(), slot, p.x, p.y) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(slot, itemStack); + } + + @Override + public int getSlotStackLimit() { + return ((TileFarmStation) getInv()).getInventoryStackLimit(slot); + } + }); + } + } + + private static void clean(List list) { + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + final Object o = iterator.next(); + if (o == null || (o instanceof ItemStack && ((ItemStack) o).getItem() == null)) { + iterator.remove(); + } + } + } + + public void createGhostSlots(List slots) { + clean(slotItemsStacks1); + clean(slotItemsFertilizer); + clean(slotItemsSeeds); + clean(slotItemsProduce); + + slots.add(new GhostBackgroundItemSlot( + slotItemsStacks1.get(rand.nextInt(slotItemsStacks1.size())), points[0].x, points[0].y)); + slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], points[1].x, points[1].y)); + slots.add(new GhostBackgroundItemSlot(slotItems3[rand.nextInt(slotItems3.length)], points[2].x, points[2].y)); + + slots.add(new GhostBackgroundItemSlot( + slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[3].x, points[3].y)); + slots.add(new GhostBackgroundItemSlot( + slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[4].x, points[4].y)); + + for (int i = 0; i < 4; i++) { + slots.add(new GhostBackgroundItemSlot( + slotItemsSeeds.get(rand.nextInt(slotItemsSeeds.size())), points[5 + i].x, points[5 + i].y)); } - @Override - public int getSlotStackLimit() { - return ((TileFarmStation)getInv()).getInventoryStackLimit(slot); + for (int i = 0; i < 6; i++) { + slots.add(new GhostBackgroundItemSlot( + slotItemsProduce.get(rand.nextInt(slotItemsProduce.size())), points[9 + i].x, points[9 + i].y)); } - }); } - } - - private static void clean(List list) { - Iterator iterator = list.iterator(); - while (iterator.hasNext()) { - final Object o = iterator.next(); - if (o == null || (o instanceof ItemStack && ((ItemStack) o).getItem() == null)) { - iterator.remove(); - } - } - } - - public void createGhostSlots(List slots) { - clean(slotItemsStacks1); - clean(slotItemsFertilizer); - clean(slotItemsSeeds); - clean(slotItemsProduce); - - slots.add(new GhostBackgroundItemSlot(slotItemsStacks1.get(rand.nextInt(slotItemsStacks1.size())), points[0].x, points[0].y)); - slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], points[1].x, points[1].y)); - slots.add(new GhostBackgroundItemSlot(slotItems3[rand.nextInt(slotItems3.length)], points[2].x, points[2].y)); - - slots.add(new GhostBackgroundItemSlot(slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[3].x, - points[3].y)); - slots.add(new GhostBackgroundItemSlot(slotItemsFertilizer.get(rand.nextInt(slotItemsFertilizer.size())), points[4].x, - points[4].y)); - - for (int i = 0; i < 4; i++) { - slots.add(new GhostBackgroundItemSlot(slotItemsSeeds.get(rand.nextInt(slotItemsSeeds.size())), points[5 + i].x, - points[5 + i].y)); + @Override + public Point getPlayerInventoryOffset() { + return new Point(8, 87); } - for (int i = 0; i < 6; i++) { - slots.add(new GhostBackgroundItemSlot(slotItemsProduce.get(rand.nextInt(slotItemsProduce.size())), points[9 + i].x, - points[9 + i].y)); + @Override + public Point getUpgradeOffset() { + return new Point(12, 63); } - } - - @Override - public Point getPlayerInventoryOffset() { - return new Point(8,87); - } - - @Override - public Point getUpgradeOffset() { - return new Point(12,63); - } - } diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java index a2f42d31..167b95e1 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmersRegistry.java @@ -1,10 +1,5 @@ package crazypants.enderio.machine.farm; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.config.Config; @@ -12,6 +7,7 @@ import crazypants.enderio.machine.farm.farmers.CocoaFarmer; import crazypants.enderio.machine.farm.farmers.CustomSeedFarmer; import crazypants.enderio.machine.farm.farmers.FarmersCommune; import crazypants.enderio.machine.farm.farmers.FlowerPicker; +import crazypants.enderio.machine.farm.farmers.ForestryFarmer; import crazypants.enderio.machine.farm.farmers.ManaBeanFarmer; import crazypants.enderio.machine.farm.farmers.MelonFarmer; import crazypants.enderio.machine.farm.farmers.NaturaBerryFarmer; @@ -21,188 +17,194 @@ import crazypants.enderio.machine.farm.farmers.PlantableFarmer; import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; import crazypants.enderio.machine.farm.farmers.StemFarmer; import crazypants.enderio.machine.farm.farmers.TreeFarmer; -import crazypants.enderio.machine.farm.farmers.ForestryFarmer; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public final class FarmersRegistry { - public static final PlantableFarmer DEFAULT_FARMER = new PlantableFarmer(); - - public static void addFarmers() { + public static final PlantableFarmer DEFAULT_FARMER = new PlantableFarmer(); - addExtraUtilities(); - addNatura(); - addTiC(); - addIC2(); - addThaumcraft(); - addFlowers(); - if (Loader.isModLoaded("Forestry")) { - ForestryFarmer.init(); + public static void addFarmers() { + + addExtraUtilities(); + addNatura(); + addTiC(); + addIC2(); + addThaumcraft(); + addFlowers(); + if (Loader.isModLoaded("Forestry")) { + ForestryFarmer.init(); + } + + FarmersCommune.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds))); + FarmersCommune.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus))); + FarmersCommune.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log)); + FarmersCommune.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log2)); + FarmersCommune.joinCommune(new TreeFarmer(true, Blocks.red_mushroom, Blocks.red_mushroom_block)); + FarmersCommune.joinCommune(new TreeFarmer(true, Blocks.brown_mushroom, Blocks.brown_mushroom_block)); + // special case of plantables to get spacing correct + FarmersCommune.joinCommune( + new MelonFarmer(Blocks.melon_stem, Blocks.melon_block, new ItemStack(Items.melon_seeds))); + FarmersCommune.joinCommune( + new MelonFarmer(Blocks.pumpkin_stem, Blocks.pumpkin, new ItemStack(Items.pumpkin_seeds))); + // 'BlockNetherWart' is not an IGrowable + FarmersCommune.joinCommune(new NetherWartFarmer()); + // Cocoa is odd + FarmersCommune.joinCommune(new CocoaFarmer()); + // Handles all 'vanilla' style crops + FarmersCommune.joinCommune(DEFAULT_FARMER); } - FarmersCommune.joinCommune(new StemFarmer(Blocks.reeds, new ItemStack(Items.reeds))); - FarmersCommune.joinCommune(new StemFarmer(Blocks.cactus, new ItemStack(Blocks.cactus))); - FarmersCommune.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log)); - FarmersCommune.joinCommune(new TreeFarmer(Blocks.sapling, Blocks.log2)); - FarmersCommune.joinCommune(new TreeFarmer(true,Blocks.red_mushroom, Blocks.red_mushroom_block)); - FarmersCommune.joinCommune(new TreeFarmer(true,Blocks.brown_mushroom, Blocks.brown_mushroom_block)); - //special case of plantables to get spacing correct - FarmersCommune.joinCommune(new MelonFarmer(Blocks.melon_stem, Blocks.melon_block, new ItemStack(Items.melon_seeds))); - FarmersCommune.joinCommune(new MelonFarmer(Blocks.pumpkin_stem, Blocks.pumpkin, new ItemStack(Items.pumpkin_seeds))); - //'BlockNetherWart' is not an IGrowable - FarmersCommune.joinCommune(new NetherWartFarmer()); - //Cocoa is odd - FarmersCommune.joinCommune(new CocoaFarmer()); - //Handles all 'vanilla' style crops - FarmersCommune.joinCommune(DEFAULT_FARMER); - } - - public static void addPickable(String mod, String blockName, String itemName) { - Block cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - Item seedItem = GameRegistry.findItem(mod, itemName); - if(seedItem != null) { - FarmersCommune.joinCommune(new PickableFarmer(cropBlock, new ItemStack(seedItem))); - } - } - } - - public static CustomSeedFarmer addSeed(String mod, String blockName, String itemName, Block... extraFarmland) { - Block cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - Item seedItem = GameRegistry.findItem(mod, itemName); - if(seedItem != null) { - CustomSeedFarmer farmer = new CustomSeedFarmer(cropBlock, new ItemStack(seedItem)); - if(extraFarmland != null) { - for (Block farmland : extraFarmland) { - if(farmland != null) { - farmer.addTilledBlock(farmland); + public static void addPickable(String mod, String blockName, String itemName) { + Block cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + Item seedItem = GameRegistry.findItem(mod, itemName); + if (seedItem != null) { + FarmersCommune.joinCommune(new PickableFarmer(cropBlock, new ItemStack(seedItem))); } - } } - FarmersCommune.joinCommune(farmer); - return farmer; - } } - return null; - } - private static void addTiC() { - String mod = "TConstruct"; - String blockName = "ore.berries.two"; - - Block cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - Item seedItem = GameRegistry.findItem(mod, blockName); - if(seedItem != null) { - for (int i = 0; i < 2; i++) { - PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); - farmer.setRequiresFarmland(false); - FarmersCommune.joinCommune(farmer); + public static CustomSeedFarmer addSeed(String mod, String blockName, String itemName, Block... extraFarmland) { + Block cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + Item seedItem = GameRegistry.findItem(mod, itemName); + if (seedItem != null) { + CustomSeedFarmer farmer = new CustomSeedFarmer(cropBlock, new ItemStack(seedItem)); + if (extraFarmland != null) { + for (Block farmland : extraFarmland) { + if (farmland != null) { + farmer.addTilledBlock(farmland); + } + } + } + FarmersCommune.joinCommune(farmer); + return farmer; + } } - } + return null; } - blockName = "ore.berries.one"; - cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - Item seedItem = GameRegistry.findItem(mod, blockName); - if(seedItem != null) { - for (int i = 0; i < 4; i++) { - PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); - farmer.setRequiresFarmland(false); - FarmersCommune.joinCommune(farmer); + private static void addTiC() { + String mod = "TConstruct"; + String blockName = "ore.berries.two"; + + Block cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + Item seedItem = GameRegistry.findItem(mod, blockName); + if (seedItem != null) { + for (int i = 0; i < 2; i++) { + PickableFarmer farmer = + new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); + farmer.setRequiresFarmland(false); + FarmersCommune.joinCommune(farmer); + } + } } - } - } - } - - private static void addNatura() { - String mod = "Natura"; - String blockName = "N Crops"; - - Block cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - DEFAULT_FARMER.addHarvestExlude(cropBlock); - Item seedItem = GameRegistry.findItem(mod, "barley.seed"); - if(seedItem != null) { - //barley - FarmersCommune.joinCommune(new CustomSeedFarmer(cropBlock, 3, new ItemStack(seedItem))); - // cotton - FarmersCommune.joinCommune(new PickableFarmer(cropBlock, 4, 8, new ItemStack(seedItem, 1, 1))); - } - } - - blockName = "BerryBush"; - cropBlock = GameRegistry.findBlock(mod, blockName); - if(cropBlock != null) { - Item seedItem = GameRegistry.findItem(mod, blockName); - if(seedItem != null) { - for (int i = 0; i < 4; i++) { - PickableFarmer farmer = new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 12 + i)); - farmer.setRequiresFarmland(false); - FarmersCommune.joinCommune(farmer); + blockName = "ore.berries.one"; + cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + Item seedItem = GameRegistry.findItem(mod, blockName); + if (seedItem != null) { + for (int i = 0; i < 4; i++) { + PickableFarmer farmer = + new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 8 + i)); + farmer.setRequiresFarmland(false); + FarmersCommune.joinCommune(farmer); + } + } } - } } - blockName = "florasapling"; - Block saplingBlock = GameRegistry.findBlock(mod, blockName); - if(saplingBlock != null) { - FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, - GameRegistry.findBlock(mod, "tree"), - GameRegistry.findBlock(mod, "willow"), - GameRegistry.findBlock(mod, "Dark Tree"))); - } - blockName = "Rare Sapling"; - saplingBlock = GameRegistry.findBlock(mod, blockName); - if(saplingBlock != null) { - FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, GameRegistry.findBlock(mod, "Rare Tree"))); + private static void addNatura() { + String mod = "Natura"; + String blockName = "N Crops"; + + Block cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + DEFAULT_FARMER.addHarvestExlude(cropBlock); + Item seedItem = GameRegistry.findItem(mod, "barley.seed"); + if (seedItem != null) { + // barley + FarmersCommune.joinCommune(new CustomSeedFarmer(cropBlock, 3, new ItemStack(seedItem))); + // cotton + FarmersCommune.joinCommune(new PickableFarmer(cropBlock, 4, 8, new ItemStack(seedItem, 1, 1))); + } + } + + blockName = "BerryBush"; + cropBlock = GameRegistry.findBlock(mod, blockName); + if (cropBlock != null) { + Item seedItem = GameRegistry.findItem(mod, blockName); + if (seedItem != null) { + for (int i = 0; i < 4; i++) { + PickableFarmer farmer = + new NaturaBerryFarmer(cropBlock, i, 12 + i, new ItemStack(seedItem, 1, 12 + i)); + farmer.setRequiresFarmland(false); + FarmersCommune.joinCommune(farmer); + } + } + } + + blockName = "florasapling"; + Block saplingBlock = GameRegistry.findBlock(mod, blockName); + if (saplingBlock != null) { + FarmersCommune.joinCommune(new TreeFarmer( + saplingBlock, + GameRegistry.findBlock(mod, "tree"), + GameRegistry.findBlock(mod, "willow"), + GameRegistry.findBlock(mod, "Dark Tree"))); + } + blockName = "Rare Sapling"; + saplingBlock = GameRegistry.findBlock(mod, blockName); + if (saplingBlock != null) { + FarmersCommune.joinCommune(new TreeFarmer(saplingBlock, GameRegistry.findBlock(mod, "Rare Tree"))); + } } - } - - private static void addThaumcraft() - { - String mod = "Thaumcraft"; - String manaBean = "ItemManaBean"; - String manaPod = "blockManaPod"; - Block block = GameRegistry.findBlock(mod,manaPod); - Item item = GameRegistry.findItem(mod,manaBean); - if (Config.farmManaBeansEnabled && block!=null && item!=null) - { - FarmersCommune.joinCommune(new ManaBeanFarmer(block, new ItemStack(item))); + private static void addThaumcraft() { + String mod = "Thaumcraft"; + String manaBean = "ItemManaBean"; + String manaPod = "blockManaPod"; + Block block = GameRegistry.findBlock(mod, manaPod); + Item item = GameRegistry.findItem(mod, manaBean); + if (Config.farmManaBeansEnabled && block != null && item != null) { + FarmersCommune.joinCommune(new ManaBeanFarmer(block, new ItemStack(item))); + } } - } - - private static void addIC2() { - RubberTreeFarmerIC2 rtf = new RubberTreeFarmerIC2(); - if(rtf.isValid()) { - FarmersCommune.joinCommune(rtf); + + private static void addIC2() { + RubberTreeFarmerIC2 rtf = new RubberTreeFarmerIC2(); + if (rtf.isValid()) { + FarmersCommune.joinCommune(rtf); + } } - } - private static void addExtraUtilities() { - String mod = "ExtraUtilities"; - String name = "plant/ender_lilly"; + private static void addExtraUtilities() { + String mod = "ExtraUtilities"; + String name = "plant/ender_lilly"; - CustomSeedFarmer farmer = addSeed(mod, name, name, Blocks.end_stone, GameRegistry.findBlock(mod, "decorativeBlock1")); - if(farmer != null) { - farmer.setIgnoreGroundCanSustainCheck(true); + CustomSeedFarmer farmer = + addSeed(mod, name, name, Blocks.end_stone, GameRegistry.findBlock(mod, "decorativeBlock1")); + if (farmer != null) { + farmer.setIgnoreGroundCanSustainCheck(true); + } } - } - private static void addFlowers() { - FarmersCommune.joinCommune(new FlowerPicker().add( - GameRegistry.findBlock("minecraft", "yellow_flower"), - GameRegistry.findBlock("minecraft", "red_flower"), - GameRegistry.findBlock("BiomesOPlenty", "flowers"), - GameRegistry.findBlock("BiomesOPlenty", "flowers2"), - GameRegistry.findBlock("Botany", "flower"), - GameRegistry.findBlock("Botania", "flower") ) ); - } - - private FarmersRegistry() { - } + private static void addFlowers() { + FarmersCommune.joinCommune(new FlowerPicker() + .add( + GameRegistry.findBlock("minecraft", "yellow_flower"), + GameRegistry.findBlock("minecraft", "red_flower"), + GameRegistry.findBlock("BiomesOPlenty", "flowers"), + GameRegistry.findBlock("BiomesOPlenty", "flowers2"), + GameRegistry.findBlock("Botany", "flower"), + GameRegistry.findBlock("Botania", "flower"))); + } + private FarmersRegistry() {} } diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index f3d19c56..410d8043 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -1,5 +1,9 @@ package crazypants.enderio.machine.farm; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.TechneMachineRenderer; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -8,35 +12,30 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.TechneMachineRenderer; - public class FarmingStationRenderer extends TechneMachineRenderer { - public FarmingStationRenderer() { - super(EnderIO.blockFarmStation, "models/farm"); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - IIcon override = renderer.overrideBlockTexture; - - if(world != null) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileFarmStation && ((TileFarmStation) te).isActive()) { - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(10D / 16D, 0.25, 10D / 16D); - bb = bb.scale(1.01, 1, 1.01); - bb = bb.translate(0, 5f / 16f, 0); - bb = bb.translate(x, y, z); - Tessellator.instance.setColorOpaque_F(1, 1, 1); - Tessellator.instance.setBrightness(0xF000F0); - CubeRenderer.render(bb, override != null ? override : Blocks.portal.getBlockTextureFromSide(1)); - } + public FarmingStationRenderer() { + super(EnderIO.blockFarmStation, "models/farm"); } - return super.renderWorldBlock(world, x, y, z, block, modelId, renderer); - } + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + IIcon override = renderer.overrideBlockTexture; + + if (world != null) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileFarmStation && ((TileFarmStation) te).isActive()) { + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(10D / 16D, 0.25, 10D / 16D); + bb = bb.scale(1.01, 1, 1.01); + bb = bb.translate(0, 5f / 16f, 0); + bb = bb.translate(x, y, z); + Tessellator.instance.setColorOpaque_F(1, 1, 1); + Tessellator.instance.setBrightness(0xF000F0); + CubeRenderer.render(bb, override != null ? override : Blocks.portal.getBlockTextureFromSide(1)); + } + } + + return super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java index 3fcd35f0..afab2a02 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java @@ -1,37 +1,34 @@ package crazypants.enderio.machine.farm; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Vector3f; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.config.Config; - import static org.lwjgl.opengl.GL11.*; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vector3f; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.config.Config; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + @SideOnly(Side.CLIENT) -public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer{ +public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer { - private void renderFarmStationAt(TileFarmStation tile, double x, double y, double z, float partialTickTime) { + private void renderFarmStationAt(TileFarmStation tile, double x, double y, double z, float partialTickTime) { - String toRender = tile.notification; - if ("".equals(toRender) || Config.disableFarmNotification) { - return; + String toRender = tile.notification; + if ("".equals(toRender) || Config.disableFarmNotification) { + return; + } + + glDisable(GL_LIGHTING); + RenderUtil.drawBillboardedText(new Vector3f(x + 0.5, y + 1.5, z + 0.5), toRender, 0.25f); + glEnable(GL_LIGHTING); } - glDisable(GL_LIGHTING); - RenderUtil.drawBillboardedText(new Vector3f(x + 0.5, y + 1.5, z + 0.5), toRender, 0.25f); - glEnable(GL_LIGHTING); - - } - - @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTickTime) { - if (tile instanceof TileFarmStation) { - renderFarmStationAt((TileFarmStation) tile, x, y, z, partialTickTime); + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTickTime) { + if (tile instanceof TileFarmStation) { + renderFarmStationAt((TileFarmStation) tile, x, y, z, partialTickTime); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index 2e2025db..5abd6db3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.farm; +import com.enderio.core.common.util.BlockCoord; +import com.google.common.collect.Lists; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -12,158 +14,153 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import com.enderio.core.common.util.BlockCoord; -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.registry.GameRegistry; - public enum Fertilizer { - /** - * Not a fertilizer. Using this handler class any item can be "used" as a - * fertilizer. Meaning, fertilizing will always fail. - */ - NONE((ItemStack) null) { + /** + * Not a fertilizer. Using this handler class any item can be "used" as a + * fertilizer. Meaning, fertilizing will always fail. + */ + NONE((ItemStack) null) { - @Override - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return false; + @Override + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return false; + } + }, + + BONEMEAL(new ItemStack(Items.dye, 1, 15)) { + + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return stack.getItem().onItemUse(stack, player, world, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f); + } + }, + + FORESTRY_FERTILIZER_COMPOUND(GameRegistry.findItem("Forestry", "fertilizerCompound")) { + + @Override + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return BONEMEAL.apply(stack, player, world, bc); + } + }, + + BOTANIA_FLORAL_FERTILIZER(GameRegistry.findItem("Botania", "fertilizer")) { + + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + BlockCoord below = bc.getLocation(ForgeDirection.DOWN); + Block belowBlock = below.getBlock(world); + if (belowBlock == Blocks.dirt || belowBlock == Blocks.grass) { + return stack.getItem().onItemUse(stack, player, world, below.x, below.y, below.z, 1, 0.5f, 0.5f, 0.5f); + } + return false; + } + + public boolean applyOnAir() { + return true; + } + + public boolean applyOnPlant() { + return false; + } + }, + + METALLURGY_FERTILIZER(GameRegistry.findItem("Metallurgy", "fertilizer")) { + + @Override + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return BONEMEAL.apply(stack, player, world, bc); + } + }, + + GARDEN_CORE_COMPOST(GameRegistry.findItem("GardenCore", "compost_pile")) { + + @Override + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return BONEMEAL.apply(stack, player, world, bc); + } + }, + + MAGICALCROPS_FERTILIZER(GameRegistry.findItem("magicalcrops", "magicalcrops_MagicalCropFertilizer")) { + + @Override + public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { + return BONEMEAL.apply(stack, player, world, bc); + } + }; + + private ItemStack stack; + + private Fertilizer(Item item) { + this(new ItemStack(item)); } - }, - BONEMEAL(new ItemStack(Items.dye, 1, 15)) { - - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return stack.getItem().onItemUse(stack, player, world, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f); + private Fertilizer(Block block) { + this(new ItemStack(block)); } - }, - FORESTRY_FERTILIZER_COMPOUND(GameRegistry.findItem("Forestry", "fertilizerCompound")) { - - @Override - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return BONEMEAL.apply(stack, player, world, bc); + private Fertilizer(ItemStack stack) { + this.stack = stack == null || stack.getItem() == null ? null : stack; + if (this.stack != null) { + FarmStationContainer.slotItemsFertilizer.add(this.stack); + } } - }, - BOTANIA_FLORAL_FERTILIZER(GameRegistry.findItem("Botania", "fertilizer")) { + private static final List validFertilizers = Lists.newArrayList(); - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - BlockCoord below = bc.getLocation(ForgeDirection.DOWN); - Block belowBlock = below.getBlock(world); - if(belowBlock == Blocks.dirt || belowBlock == Blocks.grass) { - return stack.getItem().onItemUse(stack, player, world, below.x, below.y, below.z, 1, 0.5f, 0.5f, 0.5f); - } - return false; + static { + for (Fertilizer f : values()) { + if (f.stack != null) { + validFertilizers.add(f); + } + } } + /** + * Returns the singleton instance for the fertilizer that was given as + * parameter. If the given item is no fertilizer, it will return an instance + * of Fertilizer.None. + * + */ + public static Fertilizer getInstance(ItemStack stack) { + for (Fertilizer fertilizer : validFertilizers) { + if (fertilizer.matches(stack)) { + return fertilizer; + } + } + return NONE; + } + + /** + * Returns true if the given item can be used as fertilizer. + */ + public static boolean isFertilizer(ItemStack stack) { + return getInstance(stack) != NONE; + } + + protected boolean matches(ItemStack stack) { + return OreDictionary.itemMatches(this.stack, stack, false); + } + + /** + * Tries to apply the given item on the given block using the type-specific + * method. SFX is played on success. + * + * If the item was successfully applied, the stacksize will be decreased if + * appropriate. The caller will need to check for stacksize 0 and null the + * inventory slot if needed. + * + * @param stack + * @param player + * @param world + * @param bc + * @return true if the fertilizer was applied + */ + public abstract boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc); + public boolean applyOnAir() { - return true; + return false; } public boolean applyOnPlant() { - return false; + return true; } - }, - - METALLURGY_FERTILIZER(GameRegistry.findItem("Metallurgy", "fertilizer")) { - - @Override - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return BONEMEAL.apply(stack, player, world, bc); - } - }, - - GARDEN_CORE_COMPOST(GameRegistry.findItem("GardenCore", "compost_pile")) { - - @Override - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return BONEMEAL.apply(stack, player, world, bc); - } - }, - - MAGICALCROPS_FERTILIZER(GameRegistry.findItem("magicalcrops", "magicalcrops_MagicalCropFertilizer")) { - - @Override - public boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc) { - return BONEMEAL.apply(stack, player, world, bc); - } - }; - - private ItemStack stack; - - private Fertilizer(Item item) { - this(new ItemStack(item)); - } - - private Fertilizer(Block block) { - this(new ItemStack(block)); - } - - private Fertilizer(ItemStack stack) { - this.stack = stack == null || stack.getItem() == null ? null : stack; - if (this.stack != null) { - FarmStationContainer.slotItemsFertilizer.add(this.stack); - } - } - - private static final List validFertilizers = Lists.newArrayList(); - - static { - for (Fertilizer f : values()) { - if(f.stack != null) { - validFertilizers.add(f); - } - } - } - - /** - * Returns the singleton instance for the fertilizer that was given as - * parameter. If the given item is no fertilizer, it will return an instance - * of Fertilizer.None. - * - */ - public static Fertilizer getInstance(ItemStack stack) { - for (Fertilizer fertilizer : validFertilizers) { - if(fertilizer.matches(stack)) { - return fertilizer; - } - } - return NONE; - } - - /** - * Returns true if the given item can be used as fertilizer. - */ - public static boolean isFertilizer(ItemStack stack) { - return getInstance(stack) != NONE; - } - - protected boolean matches(ItemStack stack) { - return OreDictionary.itemMatches(this.stack, stack, false); - } - - /** - * Tries to apply the given item on the given block using the type-specific - * method. SFX is played on success. - * - * If the item was successfully applied, the stacksize will be decreased if - * appropriate. The caller will need to check for stacksize 0 and null the - * inventory slot if needed. - * - * @param stack - * @param player - * @param world - * @param bc - * @return true if the fertilizer was applied - */ - public abstract boolean apply(ItemStack stack, EntityPlayer player, World world, BlockCoord bc); - - public boolean applyOnAir() { - return false; - } - - public boolean applyOnPlant() { - return true; - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 211a8fb7..ad3c7547 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -1,109 +1,107 @@ package crazypants.enderio.machine.farm; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.killera.ContainerKillerJoe; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import org.lwjgl.opengl.GL11; public class GuiFarmStation extends GuiPoweredMachineBase { - private static final int LOCK_ID = 1234; + private static final int LOCK_ID = 1234; - public GuiFarmStation(InventoryPlayer par1InventoryPlayer, TileFarmStation machine) { - super(machine, new FarmStationContainer(par1InventoryPlayer, machine), "farmStation"); - setYSize(ySize + 3); - } - - @SuppressWarnings("unchecked") - @Override - public void initGui() { - super.initGui(); - - int x = getGuiLeft() + 36; - int y = getGuiTop() + 43; - - buttonList.add(createLockButton(TileFarmStation.minSupSlot + 0, x, y)); - buttonList.add(createLockButton(TileFarmStation.minSupSlot + 1, x + 52, y)); - buttonList.add(createLockButton(TileFarmStation.minSupSlot + 2, x, y + 20)); - buttonList.add(createLockButton(TileFarmStation.minSupSlot + 3, x + 52, y + 20)); + public GuiFarmStation(InventoryPlayer par1InventoryPlayer, TileFarmStation machine) { + super(machine, new FarmStationContainer(par1InventoryPlayer, machine), "farmStation"); + setYSize(ySize + 3); + } - ((FarmStationContainer) inventorySlots).createGhostSlots(getGhostSlots()); - } - - private IconButton createLockButton(int slot, int x, int y) { - return new ToggleButton(this, LOCK_ID + slot, x, y, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED).setSelected(getTileEntity().isSlotLocked(slot)); - } + @SuppressWarnings("unchecked") + @Override + public void initGui() { + super.initGui(); - @Override - protected void drawForegroundImpl(int mouseX, int mouseY) { - super.drawForegroundImpl(mouseX, mouseY); - if(!isConfigOverlayEnabled()) { - for(int i=TileFarmStation.minSupSlot ; i<=TileFarmStation.maxSupSlot ; i++) { - if(getTileEntity().isSlotLocked(i)) { - Slot slot = inventorySlots.getSlot(i); - GL11.glEnable(GL11.GL_BLEND); - RenderUtil.renderQuad2D(slot.xDisplayPosition, slot.yDisplayPosition, 0, 16, 16, new Vector4f(0, 0, 0, 0.5)); + int x = getGuiLeft() + 36; + int y = getGuiTop() + 43; + + buttonList.add(createLockButton(TileFarmStation.minSupSlot + 0, x, y)); + buttonList.add(createLockButton(TileFarmStation.minSupSlot + 1, x + 52, y)); + buttonList.add(createLockButton(TileFarmStation.minSupSlot + 2, x, y + 20)); + buttonList.add(createLockButton(TileFarmStation.minSupSlot + 3, x + 52, y + 20)); + + ((FarmStationContainer) inventorySlots).createGhostSlots(getGhostSlots()); + } + + private IconButton createLockButton(int slot, int x, int y) { + return new ToggleButton(this, LOCK_ID + slot, x, y, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED) + .setSelected(getTileEntity().isSlotLocked(slot)); + } + + @Override + protected void drawForegroundImpl(int mouseX, int mouseY) { + super.drawForegroundImpl(mouseX, mouseY); + if (!isConfigOverlayEnabled()) { + for (int i = TileFarmStation.minSupSlot; i <= TileFarmStation.maxSupSlot; i++) { + if (getTileEntity().isSlotLocked(i)) { + Slot slot = inventorySlots.getSlot(i); + GL11.glEnable(GL11.GL_BLEND); + RenderUtil.renderQuad2D( + slot.xDisplayPosition, slot.yDisplayPosition, 0, 16, 16, new Vector4f(0, 0, 0, 0.5)); + } + } } - } } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - - GL11.glEnable(GL11.GL_BLEND); - fr.drawString("SW", sx + 55, sy + 48, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("NW", sx + 55, sy + 66, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("SE", sx + 73, sy + 48, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("NE", sx + 73, sy + 66, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - GL11.glDisable(GL11.GL_BLEND); - - bindGuiTexture(); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - - @Override - protected void actionPerformed(GuiButton b) { - if (b.id >= LOCK_ID+TileFarmStation.minSupSlot && b.id <= LOCK_ID+TileFarmStation.maxSupSlot) { - getTileEntity().toggleLockedState(b.id - LOCK_ID); + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + + GL11.glEnable(GL11.GL_BLEND); + fr.drawString("SW", sx + 55, sy + 48, ColorUtil.getARGB(1f, 1f, 0.35f, 1f), true); + fr.drawString("NW", sx + 55, sy + 66, ColorUtil.getARGB(1f, 1f, 0.35f, 1f), true); + fr.drawString("SE", sx + 73, sy + 48, ColorUtil.getARGB(1f, 1f, 0.35f, 1f), true); + fr.drawString("NE", sx + 73, sy + 66, ColorUtil.getARGB(1f, 1f, 0.35f, 1f), true); + GL11.glDisable(GL11.GL_BLEND); + + bindGuiTexture(); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - super.actionPerformed(b); - } - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - protected String getPowerOutputLabel() { - return EnderIO.lang.localize("farm.gui.baseUse"); - } - - @Override - protected int getPowerHeight() { - return super.getPowerHeight() + 3; - } + @Override + protected void actionPerformed(GuiButton b) { + if (b.id >= LOCK_ID + TileFarmStation.minSupSlot && b.id <= LOCK_ID + TileFarmStation.maxSupSlot) { + getTileEntity().toggleLockedState(b.id - LOCK_ID); + } + super.actionPerformed(b); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + protected String getPowerOutputLabel() { + return EnderIO.lang.localize("farm.gui.baseUse"); + } + + @Override + protected int getPowerHeight() { + return super.getPowerHeight() + 3; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java index 991af4db..4fa95994 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmAction.java @@ -1,64 +1,59 @@ package crazypants.enderio.machine.farm; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.util.ClientUtil; +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class PacketFarmAction implements IMessage, IMessageHandler { - private static Random rand = new Random(); + private static Random rand = new Random(); - private List coords; + private List coords; - public PacketFarmAction() { - } + public PacketFarmAction() {} - public PacketFarmAction(List coords) { - this.coords = coords; - } - - public PacketFarmAction(BlockCoord bc) { - this.coords = new ArrayList(1); - this.coords.add(bc); - } - - @Override - public void toBytes(ByteBuf buffer) { - int size = coords.size(); - buffer.writeInt(size); - for (BlockCoord coord : coords) { - buffer.writeInt(coord.x); - buffer.writeInt(coord.y); - buffer.writeInt(coord.z); + public PacketFarmAction(List coords) { + this.coords = coords; } - } - - @Override - public void fromBytes(ByteBuf buffer) { - int size = buffer.readInt(); - coords = new ArrayList(size); - for (int i = 0; i < size; i++) { - coords.add(new BlockCoord(buffer.readInt(), buffer.readInt(), buffer.readInt())); + public PacketFarmAction(BlockCoord bc) { + this.coords = new ArrayList(1); + this.coords.add(bc); } - } - @Override - public IMessage onMessage(PacketFarmAction message, MessageContext ctx) { - for (BlockCoord bc : message.coords) { - for (int i = 0; i < 15; i++) { - ClientUtil.spawnFarmParcticles(rand, bc); - } + @Override + public void toBytes(ByteBuf buffer) { + int size = coords.size(); + buffer.writeInt(size); + for (BlockCoord coord : coords) { + buffer.writeInt(coord.x); + buffer.writeInt(coord.y); + buffer.writeInt(coord.z); + } + } + + @Override + public void fromBytes(ByteBuf buffer) { + int size = buffer.readInt(); + coords = new ArrayList(size); + for (int i = 0; i < size; i++) { + coords.add(new BlockCoord(buffer.readInt(), buffer.readInt(), buffer.readInt())); + } + } + + @Override + public IMessage onMessage(PacketFarmAction message, MessageContext ctx) { + for (BlockCoord bc : message.coords) { + for (int i = 0; i < 15; i++) { + ClientUtil.spawnFarmParcticles(rand, bc); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java index fc34d951..3b95c455 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java @@ -1,43 +1,41 @@ package crazypants.enderio.machine.farm; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; -public class PacketFarmLockedSlot extends MessageTileEntity implements IMessage, IMessageHandler { +public class PacketFarmLockedSlot extends MessageTileEntity + implements IMessage, IMessageHandler { - public PacketFarmLockedSlot() {} - - private int buttonID; - - public PacketFarmLockedSlot(TileFarmStation tile, int buttonID) { - super(tile); - this.buttonID = buttonID; - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(buttonID); - } + public PacketFarmLockedSlot() {} - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - buttonID = buf.readInt(); - } + private int buttonID; - @Override - public IMessage onMessage(PacketFarmLockedSlot message, MessageContext ctx) { - TileFarmStation te = message.getTileEntity(message.getWorld(ctx)); - if (te != null) { - te.toggleLockedState(message.buttonID); + public PacketFarmLockedSlot(TileFarmStation tile, int buttonID) { + super(tile); + this.buttonID = buttonID; } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(buttonID); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + buttonID = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketFarmLockedSlot message, MessageContext ctx) { + TileFarmStation te = message.getTileEntity(message.getWorld(ctx)); + if (te != null) { + te.toggleLockedState(message.buttonID); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java index bb03afd2..f44dc012 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java @@ -1,45 +1,43 @@ package crazypants.enderio.machine.farm; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; -public class PacketUpdateNotification extends MessageTileEntity implements IMessage, IMessageHandler { +public class PacketUpdateNotification extends MessageTileEntity + implements IMessage, IMessageHandler { - private String notification; + private String notification; - public PacketUpdateNotification() { - } + public PacketUpdateNotification() {} - public PacketUpdateNotification(TileFarmStation tile, String notification) { - super(tile); - this.notification = notification; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - notification = ByteBufUtils.readUTF8String(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - ByteBufUtils.writeUTF8String(buf, notification); - } - - @Override - public IMessage onMessage(PacketUpdateNotification message, MessageContext ctx) { - TileFarmStation te = message.getTileEntity(EnderIO.proxy.getClientWorld()); - if(te != null) { - te.notification = message.notification; + public PacketUpdateNotification(TileFarmStation tile, String notification) { + super(tile); + this.notification = notification; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + notification = ByteBufUtils.readUTF8String(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + ByteBufUtils.writeUTF8String(buf, notification); + } + + @Override + public IMessage onMessage(PacketUpdateNotification message, MessageContext ctx) { + TileFarmStation te = message.getTileEntity(EnderIO.proxy.getClientWorld()); + if (te != null) { + te.notification = message.notification; + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 923df8f4..eab96f1f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -1,25 +1,6 @@ package crazypants.enderio.machine.farm; -import java.util.BitSet; - -import javax.annotation.Nonnull; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemShears; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.EnumSkyBlock; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; @@ -34,768 +15,795 @@ import crazypants.enderio.machine.farm.farmers.IHarvestResult; import crazypants.enderio.machine.farm.farmers.RubberTreeFarmerIC2; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.Capacitors; import crazypants.enderio.tool.ArrayMappingTool; +import java.util.BitSet; +import javax.annotation.Nonnull; +import net.minecraft.block.Block; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemShears; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.EnumSkyBlock; +import net.minecraftforge.common.util.ForgeDirection; public class TileFarmStation extends AbstractPoweredTaskEntity { - private static final int TICKS_PER_WORK = 20; + private static final int TICKS_PER_WORK = 20; - public enum ToolType { - HOE { - @Override - boolean match(ItemStack item) { - for (ItemStack stack : Config.farmHoes) { - if (stack.getItem() == item.getItem()) { - return true; - } - } - return false; - } - }, - - AXE { - @Override - boolean match(ItemStack item) { - return item.getItem().getHarvestLevel(item, "axe") >= 0; - } - }, - TREETAP { - @Override - boolean match(ItemStack item) { - return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; - } - }, - SHEARS { - @Override - boolean match(ItemStack item) { - return item.getItem() instanceof ItemShears; - } - }, - NONE { - @Override - boolean match(ItemStack item) { - return false; - } - }; - - public final boolean itemMatches(ItemStack item) { - if (item == null) { - return false; - } - return match(item) && !isBrokenTinkerTool(item); - } - - private boolean isBrokenTinkerTool(ItemStack item) - { - return item.hasTagCompound() && item.getTagCompound().hasKey("InfiTool") && item.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"); - } - - abstract boolean match(ItemStack item); - - public static boolean isTool(ItemStack stack) { - for (ToolType type : values()) { - if (type.itemMatches(stack)) { - return true; - } - } - return false; - } - - public static ToolType getToolType(ItemStack stack) { - for (ToolType type : values()) { - if (type.itemMatches(stack)) { - return type; - } - } - return NONE; - } - } - - public static final String NOTIFICATION_NO_HOE = "noHoe"; - public static final String NOTIFICATION_NO_AXE = "noAxe"; - public static final String NOTIFICATION_NO_SEEDS = "noSeeds"; - - private BlockCoord lastScanned; - private EntityPlayerMP farmerJoe; - - public static final int NUM_TOOL_SLOTS = 3; - - private static final int minToolSlot = 0; - private static final int maxToolSlot = -1 + NUM_TOOL_SLOTS; - - public static final int NUM_FERTILIZER_SLOTS = 2; - - public static final int minFirtSlot = maxToolSlot + 1; - public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS; - - public static final int NUM_SUPPLY_SLOTS = 4; - - public static final int minSupSlot = maxFirtSlot + 1; - public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS; - - private final BitSet lockedSlots = new BitSet(); - - public String notification = ""; - public boolean sendNotification = false; - - private boolean wasActive; - - public TileFarmStation() { - super(new SlotDefinition(9, 6, 1)); - } - - public int getFarmSize() { - return Config.farmDefaultSize + getUpgradeDist(); - } - - public void actionPerformed(boolean isAxe) { - if(isAxe) { - usePower(Config.farmAxeActionEnergyUseRF); - } else { - usePower(Config.farmActionEnergyUseRF); - } - clearNotification(); - } - - public boolean tillBlock(BlockCoord plantingLocation) { - BlockCoord dirtLoc = plantingLocation.getLocation(ForgeDirection.DOWN); - Block dirtBlock = getBlock(dirtLoc); - if((dirtBlock == Blocks.dirt || dirtBlock == Blocks.grass)) { - if(!hasHoe()) { - setNotification(NOTIFICATION_NO_HOE); - return false; - } - damageHoe(1, dirtLoc); - worldObj.setBlock(dirtLoc.x, dirtLoc.y, dirtLoc.z, Blocks.farmland); - worldObj.playSoundEffect(dirtLoc.x + 0.5F, dirtLoc.y + 0.5F, dirtLoc.z + 0.5F, Blocks.farmland.stepSound.getStepResourcePath(), - (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, Blocks.farmland.stepSound.getPitch() * 0.8F); - actionPerformed(false); - return true; - } else if(dirtBlock == Blocks.farmland) { - return true; - } - return false; - } - - public int getMaxLootingValue() { - int result = 0; - for (int i = minToolSlot; i <= maxToolSlot; i++) { - if(inventory[i] != null) { - int level = getLooting(inventory[i]); - if(level > result) { - result = level; - } - } - } - return result; - } - - private int getUpgradeDist() { - int upg = slotDefinition.getMaxUpgradeSlot(); - if(inventory[upg] == null) { - return 0; - } else { - return Config.farmBonusSize * (EnderIO.itemBasicCapacitor.getCapacitor(inventory[upg]).getTier()-1); - } - } - - public boolean hasHoe() { - return hasTool(ToolType.HOE); - } - - public boolean hasAxe() { - return hasTool(ToolType.AXE); - } - - public boolean hasShears() { - return hasTool(ToolType.SHEARS); - } - - public int getAxeLootingValue() { - ItemStack tool = getTool(ToolType.AXE); - if(tool == null) { - return 0; - } - return getLooting(tool); - } - - public void damageAxe(Block blk, BlockCoord bc) { - damageTool(ToolType.AXE, blk, bc, 1); - } - - public void damageHoe(int i, BlockCoord bc) { - damageTool(ToolType.HOE, null, bc, i); - } - - public void damageShears(Block blk, BlockCoord bc) { - damageTool(ToolType.SHEARS, blk, bc, 1); - } - - public boolean hasTool(ToolType type){ - return getTool(type) != null; - } - - private ItemStack getTool(ToolType type) { - for (int i = minToolSlot; i <= maxToolSlot; i++) { - if(type.itemMatches(inventory[i]) && inventory[i].stackSize>0) { - return inventory[i]; - } - } - return null; - } - - public void damageTool(ToolType type, Block blk, BlockCoord bc, int damage) { - - ItemStack tool = getTool(type); - if(tool == null) { - return; - } - - float rand = worldObj.rand.nextFloat(); - if(rand >= Config.farmToolTakeDamageChance) { - return; - } - - boolean canDamage = canDamage(tool); - if(type == ToolType.AXE) { - tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe); - } else if(type == ToolType.HOE) { - int origDamage = tool.getItemDamage(); - tool.getItem().onItemUse(tool, farmerJoe, worldObj, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f); - if(origDamage == tool.getItemDamage() && canDamage) { - tool.damageItem(1, farmerJoe); - } - } else if(canDamage) { - tool.damageItem(1, farmerJoe); - } - - if(tool.stackSize == 0 || (canDamage && tool.getItemDamage() >= tool.getMaxDamage())) { - destroyTool(type); - } - } - - private boolean canDamage(ItemStack stack) { - return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable(); - } - - private void destroyTool(ToolType type) { - for (int i = minToolSlot; i <= maxToolSlot; i++) { - if(type.itemMatches(inventory[i]) && inventory[i].stackSize==0) { - inventory[i] = null; - markDirty(); - return; - } - } - } - - private int getLooting(ItemStack stack) { - return Math.max( - EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, stack), - EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); - } - - public EntityPlayerMP getFakePlayer() { - return farmerJoe; - } - - public Block getBlock(BlockCoord bc) { - return worldObj.getBlock(bc.x, bc.y, bc.z); - } - - public Block getBlock(int x, int y, int z) { - return worldObj.getBlock(x, y, z); - } - - public int getBlockMeta(BlockCoord bc) { - return worldObj.getBlockMetadata(bc.x, bc.y, bc.z); - } - - public boolean isOpen(BlockCoord bc) { - Block block = worldObj.getBlock(bc.x, bc.y, bc.z); - return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z); - } - - public void setNotification(String unloc) { - String newNote = EnderIO.lang.localize("farm.note." + unloc); - if(!newNote.equals(notification)) { - notification = newNote; - sendNotification = true; - } - } - - public void clearNotification() { - if(hasNotification()) { - notification = ""; - sendNotification = true; - } - } - - public boolean hasNotification() { - return !"".equals(notification); - } - - private void sendNotification() { - PacketHandler.INSTANCE.sendToAll(new PacketUpdateNotification(this, notification)); - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack stack) { - if(stack == null) { - return false; - } - if(i <= maxToolSlot) { - if (ToolType.isTool(stack)) { - for (int j = minToolSlot; j <= maxToolSlot; j++) { - if (ToolType.getToolType(stack).itemMatches(inventory[j])) { - return false; - } - } - return true; - } - return false; - } else if (i <= maxFirtSlot) { - return Fertilizer.isFertilizer(stack); - } else if (i <= maxSupSlot) { - return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); - } else { - return false; - } - } - - @Override - public void doUpdate() { - super.doUpdate(); - if(isActive() != wasActive) { - wasActive = isActive(); - worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); - } - } - - @Override - protected boolean checkProgress(boolean redstoneChecksPassed) { - if(redstoneChecksPassed) { - usePower(); - if(canTick(redstoneChecksPassed)) { - doTick(); - } - } - return false; - } - - protected boolean canTick(boolean redstoneChecksPassed) { - if(!shouldDoWorkThisTick(2)) { - return false; - } - if(getEnergyStored() < getPowerUsePerTick()) { - setNotification("noPower"); - return false; - } - return true; - } - - protected void doTick() { - - if (sendNotification && shouldDoWorkThisTick(TICKS_PER_WORK)) { - sendNotification = false; - sendNotification(); - } - - if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { - setNotification("noPower"); - return; - } - if("noPower".equals(notification)) { - clearNotification(); - } - - BlockCoord bc = null; - int infiniteLoop = 20; - while (bc == null || bc.equals(getLocation()) || !worldObj.getChunkProvider().chunkExists(bc.x >> 4, bc.z >> 4)) { - if (infiniteLoop-- <= 0) { - return; - } - bc = getNextCoord(); - } - - Block block = worldObj.getBlock(bc.x, bc.y, bc.z); - if(block == null) { - return; - } - int meta = worldObj.getBlockMetadata(bc.x, bc.y, bc.z); - if(farmerJoe == null) { - farmerJoe = new FakeFarmPlayer(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId)); - } - - if(isOpen(bc)) { - FarmersCommune.instance.prepareBlock(this, bc, block, meta); - block = worldObj.getBlock(bc.x, bc.y, bc.z); - } - - if(isOutputFull()) { - setNotification("outputFull"); - return; - } - - if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { - setNotification("noPower"); - return; - } - - if(!isOpen(bc)) { - IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta); - if(harvest != null && harvest.getDrops() != null) { - PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); - PacketHandler.INSTANCE.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); - for (EntityItem ei : harvest.getDrops()) { - if(ei != null) { - insertHarvestDrop(ei, bc); - if(!ei.isDead) { - worldObj.spawnEntityInWorld(ei); + public enum ToolType { + HOE { + @Override + boolean match(ItemStack item) { + for (ItemStack stack : Config.farmHoes) { + if (stack.getItem() == item.getItem()) { + return true; + } + } + return false; } - } + }, + + AXE { + @Override + boolean match(ItemStack item) { + return item.getItem().getHarvestLevel(item, "axe") >= 0; + } + }, + TREETAP { + @Override + boolean match(ItemStack item) { + return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; + } + }, + SHEARS { + @Override + boolean match(ItemStack item) { + return item.getItem() instanceof ItemShears; + } + }, + NONE { + @Override + boolean match(ItemStack item) { + return false; + } + }; + + public final boolean itemMatches(ItemStack item) { + if (item == null) { + return false; + } + return match(item) && !isBrokenTinkerTool(item); + } + + private boolean isBrokenTinkerTool(ItemStack item) { + return item.hasTagCompound() + && item.getTagCompound().hasKey("InfiTool") + && item.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"); + } + + abstract boolean match(ItemStack item); + + public static boolean isTool(ItemStack stack) { + for (ToolType type : values()) { + if (type.itemMatches(stack)) { + return true; + } + } + return false; + } + + public static ToolType getToolType(ItemStack stack) { + for (ToolType type : values()) { + if (type.itemMatches(stack)) { + return type; + } + } + return NONE; } - return; - } } - if(!hasPower() && (Config.farmBonemealActionEnergyUseRF > 0 || Config.farmBonemealTryEnergyUseRF > 0)) { - setNotification("noPower"); - return; + public static final String NOTIFICATION_NO_HOE = "noHoe"; + public static final String NOTIFICATION_NO_AXE = "noAxe"; + public static final String NOTIFICATION_NO_SEEDS = "noSeeds"; + + private BlockCoord lastScanned; + private EntityPlayerMP farmerJoe; + + public static final int NUM_TOOL_SLOTS = 3; + + private static final int minToolSlot = 0; + private static final int maxToolSlot = -1 + NUM_TOOL_SLOTS; + + public static final int NUM_FERTILIZER_SLOTS = 2; + + public static final int minFirtSlot = maxToolSlot + 1; + public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS; + + public static final int NUM_SUPPLY_SLOTS = 4; + + public static final int minSupSlot = maxFirtSlot + 1; + public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS; + + private final BitSet lockedSlots = new BitSet(); + + public String notification = ""; + public boolean sendNotification = false; + + private boolean wasActive; + + public TileFarmStation() { + super(new SlotDefinition(9, 6, 1)); } - if (hasBonemeal() && bonemealCooldown-- <= 0) { - Fertilizer fertilizer = Fertilizer.getInstance(inventory[minFirtSlot]); - if ((fertilizer.applyOnPlant() != isOpen(bc)) || (fertilizer.applyOnAir() == worldObj.isAirBlock(bc.x, bc.y, bc.z))) { - farmerJoe.inventory.mainInventory[0] = inventory[minFirtSlot]; - farmerJoe.inventory.currentItem = 0; - if (fertilizer.apply(inventory[minFirtSlot], farmerJoe, worldObj, bc)) { - inventory[minFirtSlot] = farmerJoe.inventory.mainInventory[0]; - PacketHandler.INSTANCE.sendToAllAround(new PacketFarmAction(bc), new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); - if (inventory[minFirtSlot] != null && inventory[minFirtSlot].stackSize == 0) { - inventory[minFirtSlot] = null; - } - usePower(Config.farmBonemealActionEnergyUseRF); - bonemealCooldown = 20; + public int getFarmSize() { + return Config.farmDefaultSize + getUpgradeDist(); + } + + public void actionPerformed(boolean isAxe) { + if (isAxe) { + usePower(Config.farmAxeActionEnergyUseRF); } else { - usePower(Config.farmBonemealTryEnergyUseRF); - bonemealCooldown = 5; + usePower(Config.farmActionEnergyUseRF); } - farmerJoe.inventory.mainInventory[0] = null; - } + clearNotification(); } - } - private int bonemealCooldown = 5; // no need to persist this - - private boolean hasBonemeal() { - if (inventory[minFirtSlot] != null) { - return true; - } - for (int i = minFirtSlot + 1; i <= maxFirtSlot; i++) { - if (inventory[i] != null) { - inventory[minFirtSlot] = inventory[i]; - inventory[i] = null; - return true; - } - } - return false; - } - - private boolean isOutputFull() { - for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { - ItemStack curStack = inventory[i]; - if(curStack == null || curStack.stackSize < curStack.getMaxStackSize()) { + public boolean tillBlock(BlockCoord plantingLocation) { + BlockCoord dirtLoc = plantingLocation.getLocation(ForgeDirection.DOWN); + Block dirtBlock = getBlock(dirtLoc); + if ((dirtBlock == Blocks.dirt || dirtBlock == Blocks.grass)) { + if (!hasHoe()) { + setNotification(NOTIFICATION_NO_HOE); + return false; + } + damageHoe(1, dirtLoc); + worldObj.setBlock(dirtLoc.x, dirtLoc.y, dirtLoc.z, Blocks.farmland); + worldObj.playSoundEffect( + dirtLoc.x + 0.5F, + dirtLoc.y + 0.5F, + dirtLoc.z + 0.5F, + Blocks.farmland.stepSound.getStepResourcePath(), + (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, + Blocks.farmland.stepSound.getPitch() * 0.8F); + actionPerformed(false); + return true; + } else if (dirtBlock == Blocks.farmland) { + return true; + } return false; - } } - return true; - } - public boolean hasSeed(ItemStack seeds, BlockCoord bc) { - int slot = getSupplySlotForCoord(bc); - ItemStack inv = inventory[slot]; - return inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds); - } - - /* - * Returns a fuzzy boolean: - * - * <=0 - break no leaves for saplings - * 50 - break half the leaves for saplings - * 90 - break 90% of the leaves for saplings - */ - public int isLowOnSaplings(BlockCoord bc) { - int slot = getSupplySlotForCoord(bc); - ItemStack inv = inventory[slot]; - - return 90 * (Config.farmSaplingReserveAmount - (inv == null ? 0 : inv.stackSize)) / Config.farmSaplingReserveAmount; - } - - public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock) { - return takeSeedFromSupplies(stack, forBlock, true); - } - - public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock, boolean matchMetadata) { - if(stack == null || forBlock == null) { - return null; - } - int slot = getSupplySlotForCoord(forBlock); - ItemStack inv = inventory[slot]; - if(inv != null) { - if(matchMetadata ? inv.isItemEqual(stack) : inv.getItem() == stack.getItem()) { - if (inv.stackSize <= 1 && isSlotLocked(slot)) { - return null; + public int getMaxLootingValue() { + int result = 0; + for (int i = minToolSlot; i <= maxToolSlot; i++) { + if (inventory[i] != null) { + int level = getLooting(inventory[i]); + if (level > result) { + result = level; + } + } } - - ItemStack result = inv.copy(); - result.stackSize = 1; - - inv = inv.copy(); - inv.stackSize--; - if(inv.stackSize == 0) { - inv = null; - } - setInventorySlotContents(slot, inv); return result; - } } - return null; - } - public ItemStack takeSeedFromSupplies(BlockCoord bc) { - return takeSeedFromSupplies(getSeedTypeInSuppliesFor(bc), bc); - } - - public ItemStack getSeedTypeInSuppliesFor(BlockCoord bc) { - int slot = getSupplySlotForCoord(bc); - ItemStack inv = inventory[slot]; - if(inv != null && (inv.stackSize > 1 || !isSlotLocked(slot))) { - return inv.copy(); - } - return null; - } - - protected int getSupplySlotForCoord(BlockCoord forBlock) { - - if(forBlock.x <= xCoord && forBlock.z > zCoord) { - return minSupSlot; - } else if(forBlock.x > xCoord && forBlock.z > zCoord - 1) { - return minSupSlot + 1; - } else if(forBlock.x < xCoord && forBlock.z <= zCoord) { - return minSupSlot + 2; - } - return minSupSlot + 3; - } - - private void insertHarvestDrop(Entity entity, BlockCoord bc) { - if(!worldObj.isRemote) { - if(entity instanceof EntityItem && !entity.isDead) { - EntityItem item = (EntityItem) entity; - ItemStack stack = item.getEntityItem().copy(); - int numInserted = insertResult(stack, bc); - stack.stackSize -= numInserted; - item.setEntityItemStack(stack); - if(stack.stackSize == 0) { - item.setDead(); + private int getUpgradeDist() { + int upg = slotDefinition.getMaxUpgradeSlot(); + if (inventory[upg] == null) { + return 0; + } else { + return Config.farmBonusSize + * (EnderIO.itemBasicCapacitor.getCapacitor(inventory[upg]).getTier() - 1); } - } - } - } - - - private int insertResult(ItemStack stack, BlockCoord bc) { - - int slot = bc != null ? getSupplySlotForCoord(bc) : minSupSlot; - int[] slots = new int[NUM_SUPPLY_SLOTS]; - int k = 0; - for (int j = slot; j <= maxSupSlot; j++) { - slots[k++] = j; - } - for (int j = minSupSlot; j < slot; j++) { - slots[k++] = j; } - int origSize = stack.stackSize; - stack = stack.copy(); + public boolean hasHoe() { + return hasTool(ToolType.HOE); + } - int inserted = 0; - for (int j = 0; j < slots.length && inserted < stack.stackSize; j++) { - int i = slots[j]; - ItemStack curStack = inventory[i]; - int inventoryStackLimit = getInventoryStackLimit(i); - if(isItemValidForSlot(i, stack) && (curStack == null || curStack.stackSize < inventoryStackLimit)) { - if(curStack == null) { - if (stack.stackSize < inventoryStackLimit) { - inventory[i] = stack.copy(); - inserted = stack.stackSize; - } else { - inventory[i] = stack.copy(); - inserted = inventoryStackLimit; - inventory[i].stackSize = inserted; - } - } else if(curStack.isItemEqual(stack)) { - inserted = Math.min(inventoryStackLimit - curStack.stackSize, stack.stackSize); - inventory[i].stackSize += inserted; + public boolean hasAxe() { + return hasTool(ToolType.AXE); + } + + public boolean hasShears() { + return hasTool(ToolType.SHEARS); + } + + public int getAxeLootingValue() { + ItemStack tool = getTool(ToolType.AXE); + if (tool == null) { + return 0; } - } + return getLooting(tool); } - stack.stackSize -= inserted; - if(inserted >= origSize) { - return origSize; + public void damageAxe(Block blk, BlockCoord bc) { + damageTool(ToolType.AXE, blk, bc, 1); } - ResultStack[] in = new ResultStack[] { new ResultStack(stack) }; - mergeResults(in); - return origSize - (in[0].item == null ? 0 : in[0].item.stackSize); - - } - - private @Nonnull BlockCoord getNextCoord() { - - int size = getFarmSize(); - - BlockCoord loc = getLocation(); - if(lastScanned == null) { - return lastScanned = new BlockCoord(loc.x - size, loc.y, loc.z - size); + public void damageHoe(int i, BlockCoord bc) { + damageTool(ToolType.HOE, null, bc, i); } - int nextX = lastScanned.x + 1; - int nextZ = lastScanned.z; - if(nextX > loc.x + size) { - nextX = loc.x - size; - nextZ += 1; - if(nextZ > loc.z + size) { - nextX = loc.x - size; - nextZ = loc.z - size; - } + public void damageShears(Block blk, BlockCoord bc) { + damageTool(ToolType.SHEARS, blk, bc, 1); } - return lastScanned = new BlockCoord(nextX, lastScanned.y, nextZ); - } - public void toggleLockedState(int slot) { - if (worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, slot)); + public boolean hasTool(ToolType type) { + return getTool(type) != null; } - lockedSlots.flip(slot); - } - public boolean isSlotLocked(int slot) { - return lockedSlots.get(slot); - } - - @Override - public String getInventoryName() { - return EnderIO.blockFarmStation.getLocalizedName(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public String getMachineName() { - return ModObject.blockFarmStation.unlocalisedName; - } - - @Override - public float getProgress() { - return 0.5f; - } - - @Override - public void onCapacitorTypeChange() { - int ppt = calcPowerUsePerTick(); - switch (getCapacitorType()) { - case BASIC_CAPACITOR: - setCapacitor(new BasicCapacitor(0, ppt * 40, 250000, ppt)); - break; - case ACTIVATED_CAPACITOR: - setCapacitor(new BasicCapacitor(0, ppt * 40, 500000, ppt)); - break; - case ENDER_CAPACITOR: - setCapacitor(new BasicCapacitor(0, ppt * 40, 1000000, ppt)); - break; - default: - break; + private ItemStack getTool(ToolType type) { + for (int i = minToolSlot; i <= maxToolSlot; i++) { + if (type.itemMatches(inventory[i]) && inventory[i].stackSize > 0) { + return inventory[i]; + } + } + return null; } - currentTask = createTask(); - } - private int calcPowerUsePerTick() { - return Math.round(Config.farmContinuousEnergyUseRF * (getFarmSize()/(float)Config.farmDefaultSize )); - } + public void damageTool(ToolType type, Block blk, BlockCoord bc, int damage) { - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - currentTask = createTask(); - } + ItemStack tool = getTool(type); + if (tool == null) { + return; + } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - lockedSlots.clear(); - for (int i : nbtRoot.getIntArray("lockedSlots")) { - lockedSlots.set(i); + float rand = worldObj.rand.nextFloat(); + if (rand >= Config.farmToolTakeDamageChance) { + return; + } + + boolean canDamage = canDamage(tool); + if (type == ToolType.AXE) { + tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe); + } else if (type == ToolType.HOE) { + int origDamage = tool.getItemDamage(); + tool.getItem().onItemUse(tool, farmerJoe, worldObj, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f); + if (origDamage == tool.getItemDamage() && canDamage) { + tool.damageItem(1, farmerJoe); + } + } else if (canDamage) { + tool.damageItem(1, farmerJoe); + } + + if (tool.stackSize == 0 || (canDamage && tool.getItemDamage() >= tool.getMaxDamage())) { + destroyTool(type); + } } - int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); - if (slotLayoutVersion == 0) { - inventory = (new ArrayMappingTool("TTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); - } else if (slotLayoutVersion == 1) { - inventory = (new ArrayMappingTool("TTTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); - } else if (slotLayoutVersion == 2) { - inventory = (new ArrayMappingTool("TTTSSSSOOOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + + private boolean canDamage(ItemStack stack) { + return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable(); } - } - IPoweredTask createTask() { - return new ContinuousTask(getPowerUsePerTick()); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("isActive", isActive()); - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - if(!lockedSlots.isEmpty()) { - int[] locked = new int[lockedSlots.cardinality()]; - for (int i=0,bit=-1; (bit=lockedSlots.nextSetBit(bit+1)) >= 0; i++) { - locked[i] = bit; - } - nbtRoot.setIntArray("lockedSlots", locked); + private void destroyTool(ToolType type) { + for (int i = minToolSlot; i <= maxToolSlot; i++) { + if (type.itemMatches(inventory[i]) && inventory[i].stackSize == 0) { + inventory[i] = null; + markDirty(); + return; + } + } } - nbtRoot.setInteger("slotLayoutVersion", 3); - } - @Override - public int getInventoryStackLimit(int slot) { - if (slot >= minSupSlot && slot <= maxSupSlot) { - switch (getCapacitorType()) { - case BASIC_CAPACITOR: - return 16; - case ACTIVATED_CAPACITOR: - return 32; - case ENDER_CAPACITOR: + private int getLooting(ItemStack stack) { + return Math.max( + EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, stack), + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + } + + public EntityPlayerMP getFakePlayer() { + return farmerJoe; + } + + public Block getBlock(BlockCoord bc) { + return worldObj.getBlock(bc.x, bc.y, bc.z); + } + + public Block getBlock(int x, int y, int z) { + return worldObj.getBlock(x, y, z); + } + + public int getBlockMeta(BlockCoord bc) { + return worldObj.getBlockMetadata(bc.x, bc.y, bc.z); + } + + public boolean isOpen(BlockCoord bc) { + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z); + } + + public void setNotification(String unloc) { + String newNote = EnderIO.lang.localize("farm.note." + unloc); + if (!newNote.equals(notification)) { + notification = newNote; + sendNotification = true; + } + } + + public void clearNotification() { + if (hasNotification()) { + notification = ""; + sendNotification = true; + } + } + + public boolean hasNotification() { + return !"".equals(notification); + } + + private void sendNotification() { + PacketHandler.INSTANCE.sendToAll(new PacketUpdateNotification(this, notification)); + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack stack) { + if (stack == null) { + return false; + } + if (i <= maxToolSlot) { + if (ToolType.isTool(stack)) { + for (int j = minToolSlot; j <= maxToolSlot; j++) { + if (ToolType.getToolType(stack).itemMatches(inventory[j])) { + return false; + } + } + return true; + } + return false; + } else if (i <= maxFirtSlot) { + return Fertilizer.isFertilizer(stack); + } else if (i <= maxSupSlot) { + return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); + } else { + return false; + } + } + + @Override + public void doUpdate() { + super.doUpdate(); + if (isActive() != wasActive) { + wasActive = isActive(); + worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); + } + } + + @Override + protected boolean checkProgress(boolean redstoneChecksPassed) { + if (redstoneChecksPassed) { + usePower(); + if (canTick(redstoneChecksPassed)) { + doTick(); + } + } + return false; + } + + protected boolean canTick(boolean redstoneChecksPassed) { + if (!shouldDoWorkThisTick(2)) { + return false; + } + if (getEnergyStored() < getPowerUsePerTick()) { + setNotification("noPower"); + return false; + } + return true; + } + + protected void doTick() { + + if (sendNotification && shouldDoWorkThisTick(TICKS_PER_WORK)) { + sendNotification = false; + sendNotification(); + } + + if (!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { + setNotification("noPower"); + return; + } + if ("noPower".equals(notification)) { + clearNotification(); + } + + BlockCoord bc = null; + int infiniteLoop = 20; + while (bc == null + || bc.equals(getLocation()) + || !worldObj.getChunkProvider().chunkExists(bc.x >> 4, bc.z >> 4)) { + if (infiniteLoop-- <= 0) { + return; + } + bc = getNextCoord(); + } + + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + if (block == null) { + return; + } + int meta = worldObj.getBlockMetadata(bc.x, bc.y, bc.z); + if (farmerJoe == null) { + farmerJoe = new FakeFarmPlayer( + MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId)); + } + + if (isOpen(bc)) { + FarmersCommune.instance.prepareBlock(this, bc, block, meta); + block = worldObj.getBlock(bc.x, bc.y, bc.z); + } + + if (isOutputFull()) { + setNotification("outputFull"); + return; + } + + if (!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { + setNotification("noPower"); + return; + } + + if (!isOpen(bc)) { + IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta); + if (harvest != null && harvest.getDrops() != null) { + PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); + PacketHandler.INSTANCE.sendToAllAround( + pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + for (EntityItem ei : harvest.getDrops()) { + if (ei != null) { + insertHarvestDrop(ei, bc); + if (!ei.isDead) { + worldObj.spawnEntityInWorld(ei); + } + } + } + return; + } + } + + if (!hasPower() && (Config.farmBonemealActionEnergyUseRF > 0 || Config.farmBonemealTryEnergyUseRF > 0)) { + setNotification("noPower"); + return; + } + + if (hasBonemeal() && bonemealCooldown-- <= 0) { + Fertilizer fertilizer = Fertilizer.getInstance(inventory[minFirtSlot]); + if ((fertilizer.applyOnPlant() != isOpen(bc)) + || (fertilizer.applyOnAir() == worldObj.isAirBlock(bc.x, bc.y, bc.z))) { + farmerJoe.inventory.mainInventory[0] = inventory[minFirtSlot]; + farmerJoe.inventory.currentItem = 0; + if (fertilizer.apply(inventory[minFirtSlot], farmerJoe, worldObj, bc)) { + inventory[minFirtSlot] = farmerJoe.inventory.mainInventory[0]; + PacketHandler.INSTANCE.sendToAllAround( + new PacketFarmAction(bc), + new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + if (inventory[minFirtSlot] != null && inventory[minFirtSlot].stackSize == 0) { + inventory[minFirtSlot] = null; + } + usePower(Config.farmBonemealActionEnergyUseRF); + bonemealCooldown = 20; + } else { + usePower(Config.farmBonemealTryEnergyUseRF); + bonemealCooldown = 5; + } + farmerJoe.inventory.mainInventory[0] = null; + } + } + } + + private int bonemealCooldown = 5; // no need to persist this + + private boolean hasBonemeal() { + if (inventory[minFirtSlot] != null) { + return true; + } + for (int i = minFirtSlot + 1; i <= maxFirtSlot; i++) { + if (inventory[i] != null) { + inventory[minFirtSlot] = inventory[i]; + inventory[i] = null; + return true; + } + } + return false; + } + + private boolean isOutputFull() { + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { + ItemStack curStack = inventory[i]; + if (curStack == null || curStack.stackSize < curStack.getMaxStackSize()) { + return false; + } + } + return true; + } + + public boolean hasSeed(ItemStack seeds, BlockCoord bc) { + int slot = getSupplySlotForCoord(bc); + ItemStack inv = inventory[slot]; + return inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds); + } + + /* + * Returns a fuzzy boolean: + * + * <=0 - break no leaves for saplings + * 50 - break half the leaves for saplings + * 90 - break 90% of the leaves for saplings + */ + public int isLowOnSaplings(BlockCoord bc) { + int slot = getSupplySlotForCoord(bc); + ItemStack inv = inventory[slot]; + + return 90 + * (Config.farmSaplingReserveAmount - (inv == null ? 0 : inv.stackSize)) + / Config.farmSaplingReserveAmount; + } + + public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock) { + return takeSeedFromSupplies(stack, forBlock, true); + } + + public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock, boolean matchMetadata) { + if (stack == null || forBlock == null) { + return null; + } + int slot = getSupplySlotForCoord(forBlock); + ItemStack inv = inventory[slot]; + if (inv != null) { + if (matchMetadata ? inv.isItemEqual(stack) : inv.getItem() == stack.getItem()) { + if (inv.stackSize <= 1 && isSlotLocked(slot)) { + return null; + } + + ItemStack result = inv.copy(); + result.stackSize = 1; + + inv = inv.copy(); + inv.stackSize--; + if (inv.stackSize == 0) { + inv = null; + } + setInventorySlotContents(slot, inv); + return result; + } + } + return null; + } + + public ItemStack takeSeedFromSupplies(BlockCoord bc) { + return takeSeedFromSupplies(getSeedTypeInSuppliesFor(bc), bc); + } + + public ItemStack getSeedTypeInSuppliesFor(BlockCoord bc) { + int slot = getSupplySlotForCoord(bc); + ItemStack inv = inventory[slot]; + if (inv != null && (inv.stackSize > 1 || !isSlotLocked(slot))) { + return inv.copy(); + } + return null; + } + + protected int getSupplySlotForCoord(BlockCoord forBlock) { + + if (forBlock.x <= xCoord && forBlock.z > zCoord) { + return minSupSlot; + } else if (forBlock.x > xCoord && forBlock.z > zCoord - 1) { + return minSupSlot + 1; + } else if (forBlock.x < xCoord && forBlock.z <= zCoord) { + return minSupSlot + 2; + } + return minSupSlot + 3; + } + + private void insertHarvestDrop(Entity entity, BlockCoord bc) { + if (!worldObj.isRemote) { + if (entity instanceof EntityItem && !entity.isDead) { + EntityItem item = (EntityItem) entity; + ItemStack stack = item.getEntityItem().copy(); + int numInserted = insertResult(stack, bc); + stack.stackSize -= numInserted; + item.setEntityItemStack(stack); + if (stack.stackSize == 0) { + item.setDead(); + } + } + } + } + + private int insertResult(ItemStack stack, BlockCoord bc) { + + int slot = bc != null ? getSupplySlotForCoord(bc) : minSupSlot; + int[] slots = new int[NUM_SUPPLY_SLOTS]; + int k = 0; + for (int j = slot; j <= maxSupSlot; j++) { + slots[k++] = j; + } + for (int j = minSupSlot; j < slot; j++) { + slots[k++] = j; + } + + int origSize = stack.stackSize; + stack = stack.copy(); + + int inserted = 0; + for (int j = 0; j < slots.length && inserted < stack.stackSize; j++) { + int i = slots[j]; + ItemStack curStack = inventory[i]; + int inventoryStackLimit = getInventoryStackLimit(i); + if (isItemValidForSlot(i, stack) && (curStack == null || curStack.stackSize < inventoryStackLimit)) { + if (curStack == null) { + if (stack.stackSize < inventoryStackLimit) { + inventory[i] = stack.copy(); + inserted = stack.stackSize; + } else { + inventory[i] = stack.copy(); + inserted = inventoryStackLimit; + inventory[i].stackSize = inserted; + } + } else if (curStack.isItemEqual(stack)) { + inserted = Math.min(inventoryStackLimit - curStack.stackSize, stack.stackSize); + inventory[i].stackSize += inserted; + } + } + } + + stack.stackSize -= inserted; + if (inserted >= origSize) { + return origSize; + } + + ResultStack[] in = new ResultStack[] {new ResultStack(stack)}; + mergeResults(in); + return origSize - (in[0].item == null ? 0 : in[0].item.stackSize); + } + + private @Nonnull BlockCoord getNextCoord() { + + int size = getFarmSize(); + + BlockCoord loc = getLocation(); + if (lastScanned == null) { + return lastScanned = new BlockCoord(loc.x - size, loc.y, loc.z - size); + } + + int nextX = lastScanned.x + 1; + int nextZ = lastScanned.z; + if (nextX > loc.x + size) { + nextX = loc.x - size; + nextZ += 1; + if (nextZ > loc.z + size) { + nextX = loc.x - size; + nextZ = loc.z - size; + } + } + return lastScanned = new BlockCoord(nextX, lastScanned.y, nextZ); + } + + public void toggleLockedState(int slot) { + if (worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, slot)); + } + lockedSlots.flip(slot); + } + + public boolean isSlotLocked(int slot) { + return lockedSlots.get(slot); + } + + @Override + public String getInventoryName() { + return EnderIO.blockFarmStation.getLocalizedName(); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockFarmStation.unlocalisedName; + } + + @Override + public float getProgress() { + return 0.5f; + } + + @Override + public void onCapacitorTypeChange() { + int ppt = calcPowerUsePerTick(); + switch (getCapacitorType()) { + case BASIC_CAPACITOR: + setCapacitor(new BasicCapacitor(0, ppt * 40, 250000, ppt)); + break; + case ACTIVATED_CAPACITOR: + setCapacitor(new BasicCapacitor(0, ppt * 40, 500000, ppt)); + break; + case ENDER_CAPACITOR: + setCapacitor(new BasicCapacitor(0, ppt * 40, 1000000, ppt)); + break; + default: + break; + } + currentTask = createTask(); + } + + private int calcPowerUsePerTick() { + return Math.round(Config.farmContinuousEnergyUseRF * (getFarmSize() / (float) Config.farmDefaultSize)); + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + currentTask = createTask(); + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + lockedSlots.clear(); + for (int i : nbtRoot.getIntArray("lockedSlots")) { + lockedSlots.set(i); + } + int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); + if (slotLayoutVersion == 0) { + inventory = (new ArrayMappingTool("TTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + } else if (slotLayoutVersion == 1) { + inventory = (new ArrayMappingTool("TTTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + } else if (slotLayoutVersion == 2) { + inventory = (new ArrayMappingTool("TTTSSSSOOOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + } + } + + IPoweredTask createTask() { + return new ContinuousTask(getPowerUsePerTick()); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("isActive", isActive()); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + if (!lockedSlots.isEmpty()) { + int[] locked = new int[lockedSlots.cardinality()]; + for (int i = 0, bit = -1; (bit = lockedSlots.nextSetBit(bit + 1)) >= 0; i++) { + locked[i] = bit; + } + nbtRoot.setIntArray("lockedSlots", locked); + } + nbtRoot.setInteger("slotLayoutVersion", 3); + } + + @Override + public int getInventoryStackLimit(int slot) { + if (slot >= minSupSlot && slot <= maxSupSlot) { + switch (getCapacitorType()) { + case BASIC_CAPACITOR: + return 16; + case ACTIVATED_CAPACITOR: + return 32; + case ENDER_CAPACITOR: + return 64; + default: + break; + } + } return 64; - default: - break; - } } - return 64; - } - - @Override - public int getInventoryStackLimit() { - // We return the (lowered) input slot limit here, so others who insert into us - // will behave nicely. - return getInventoryStackLimit(minSupSlot); - } + @Override + public int getInventoryStackLimit() { + // We return the (lowered) input slot limit here, so others who insert into us + // will behave nicely. + return getInventoryStackLimit(minSupSlot); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java index b8be2ec9..f9653803 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CocoaFarmer.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.TileFarmStation; import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.init.Blocks; @@ -9,61 +12,48 @@ import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.farm.TileFarmStation; - -public class CocoaFarmer extends CustomSeedFarmer -{ - public CocoaFarmer() - { - super(Blocks.cocoa, new ItemStack(Items.dye,1,3)); +public class CocoaFarmer extends CustomSeedFarmer { + public CocoaFarmer() { + super(Blocks.cocoa, new ItemStack(Items.dye, 1, 3)); this.requiresFarmland = false; if (!Config.farmHarvestJungleWhenCocoa) { - this.disableTreeFarm = true; + this.disableTreeFarm = true; } } @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) - { - return block == getPlantedBlock() && (meta &12)>>2>=2; + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + return block == getPlantedBlock() && (meta & 12) >> 2 >= 2; } @Override - protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc) - { + protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc) { worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - int dir = getPlantDirection(worldObj,bc); - if (dir<0) return false; + int dir = getPlantDirection(worldObj, bc); + if (dir < 0) return false; worldObj.setBlock(bc.x, bc.y, bc.z, getPlantedBlock(), Direction.facingToDirection[dir], 1 | 2); farm.actionPerformed(false); return true; } @Override - protected boolean canPlant(World worldObj, BlockCoord bc) - { - return getPlantDirection(worldObj,bc)>0; + protected boolean canPlant(World worldObj, BlockCoord bc) { + return getPlantDirection(worldObj, bc) > 0; } - private int getPlantDirection(World worldObj, BlockCoord bc) - { - if (!worldObj.isAirBlock(bc.x,bc.y,bc.z)) return -1; - for (int i = 2; i<6; i++) - { + private int getPlantDirection(World worldObj, BlockCoord bc) { + if (!worldObj.isAirBlock(bc.x, bc.y, bc.z)) return -1; + for (int i = 2; i < 6; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); - int x = bc.x+dir.offsetX; - int y = bc.y+dir.offsetY; - int z = bc.z+dir.offsetZ; - if (validBlock( worldObj.getBlock(x, y,z), worldObj.getBlockMetadata(x,y,z)))return i; + int x = bc.x + dir.offsetX; + int y = bc.y + dir.offsetY; + int z = bc.z + dir.offsetZ; + if (validBlock(worldObj.getBlock(x, y, z), worldObj.getBlockMetadata(x, y, z))) return i; } return -1; } - private boolean validBlock(Block block, int metadata) - { + private boolean validBlock(Block block, int metadata) { return block == Blocks.log && BlockLog.func_150165_c(metadata) == 3; } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java index f56d7c87..f0849681 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/CustomSeedFarmer.java @@ -1,9 +1,11 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.machine.farm.FarmStationContainer; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -12,213 +14,214 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.FarmStationContainer; -import crazypants.enderio.machine.farm.TileFarmStation; - public class CustomSeedFarmer implements IFarmerJoe { - protected Block plantedBlock; - protected int plantedBlockMeta; - protected int grownBlockMeta; - protected ItemStack seeds; - protected boolean requiresFarmland = true; - protected List tilledBlocks = new ArrayList(); - protected boolean ignoreSustainCheck = false; - protected boolean disableTreeFarm; + protected Block plantedBlock; + protected int plantedBlockMeta; + protected int grownBlockMeta; + protected ItemStack seeds; + protected boolean requiresFarmland = true; + protected List tilledBlocks = new ArrayList(); + protected boolean ignoreSustainCheck = false; + protected boolean disableTreeFarm; - public CustomSeedFarmer(Block plantedBlock, ItemStack seeds) { - this(plantedBlock, 0, 7, seeds); - } - - public CustomSeedFarmer(Block plantedBlock, int grownBlockMeta, ItemStack seeds) { - this(plantedBlock, 0, grownBlockMeta, seeds); - } - - public CustomSeedFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { - this.plantedBlock = plantedBlock; - this.plantedBlockMeta = plantedBlockMeta; - this.grownBlockMeta = grownBlockMeta; - this.seeds = seeds; - FarmStationContainer.slotItemsSeeds.add(seeds); - addTilledBlock(Blocks.farmland); - Block ztonesSoil = GameRegistry.findBlock("Ztones", "cleanDirt"); - if (ztonesSoil != null) { - addTilledBlock(ztonesSoil); + public CustomSeedFarmer(Block plantedBlock, ItemStack seeds) { + this(plantedBlock, 0, 7, seeds); } - } - - public void addTilledBlock(Block block) { - tilledBlocks.add(block); - } - public boolean isIgnoreGroundCanSustainCheck() { - return ignoreSustainCheck; - } - - public void setIgnoreGroundCanSustainCheck(boolean ignoreSustainCheck) { - this.ignoreSustainCheck = ignoreSustainCheck; - } - - public int getPlantedBlockMeta() { - return plantedBlockMeta; - } - - public Block getPlantedBlock() { - return plantedBlock; - } - - public ItemStack getSeeds() { - return seeds; - } - - public int getFullyGrownBlockMeta() { - return grownBlockMeta; - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - return block == getPlantedBlock() && getFullyGrownBlockMeta() == meta; - } - - @Override - public boolean canPlant(ItemStack stack) { - if(stack == null) { - return false; + public CustomSeedFarmer(Block plantedBlock, int grownBlockMeta, ItemStack seeds) { + this(plantedBlock, 0, grownBlockMeta, seeds); } - return stack.isItemEqual(getSeeds()); - } - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.isOpen(bc)) { - return false; + public CustomSeedFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { + this.plantedBlock = plantedBlock; + this.plantedBlockMeta = plantedBlockMeta; + this.grownBlockMeta = grownBlockMeta; + this.seeds = seeds; + FarmStationContainer.slotItemsSeeds.add(seeds); + addTilledBlock(Blocks.farmland); + Block ztonesSoil = GameRegistry.findBlock("Ztones", "cleanDirt"); + if (ztonesSoil != null) { + addTilledBlock(ztonesSoil); + } } - if(requiresFarmland()) { - World worldObj = farm.getWorldObj(); - if(isGroundTilled(farm, bc)) { + + public void addTilledBlock(Block block) { + tilledBlocks.add(block); + } + + public boolean isIgnoreGroundCanSustainCheck() { + return ignoreSustainCheck; + } + + public void setIgnoreGroundCanSustainCheck(boolean ignoreSustainCheck) { + this.ignoreSustainCheck = ignoreSustainCheck; + } + + public int getPlantedBlockMeta() { + return plantedBlockMeta; + } + + public Block getPlantedBlock() { + return plantedBlock; + } + + public ItemStack getSeeds() { + return seeds; + } + + public int getFullyGrownBlockMeta() { + return grownBlockMeta; + } + + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + return block == getPlantedBlock() && getFullyGrownBlockMeta() == meta; + } + + @Override + public boolean canPlant(ItemStack stack) { + if (stack == null) { + return false; + } + return stack.isItemEqual(getSeeds()); + } + + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!farm.isOpen(bc)) { + return false; + } + if (requiresFarmland()) { + World worldObj = farm.getWorldObj(); + if (isGroundTilled(farm, bc)) { + return plantFromInventory(farm, bc); + } + if (farm.hasSeed(getSeeds(), bc)) { + boolean tilled = tillBlock(farm, bc); + if (!tilled) { + return false; + } + } + } return plantFromInventory(farm, bc); - } - if(farm.hasSeed(getSeeds(), bc)) { - boolean tilled = tillBlock(farm, bc); - if(!tilled) { - return false; + } + + public boolean requiresFarmland() { + return requiresFarmland; + } + + public void setRequiresFarmland(boolean requiresFarmland) { + this.requiresFarmland = requiresFarmland; + } + + protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc) { + World worldObj = farm.getWorldObj(); + if (canPlant(worldObj, bc) && farm.takeSeedFromSupplies(getSeeds(), bc) != null) { + return plant(farm, worldObj, bc); } - } - } - return plantFromInventory(farm, bc); - } - - public boolean requiresFarmland() { - return requiresFarmland; - } - - public void setRequiresFarmland(boolean requiresFarmland) { - this.requiresFarmland = requiresFarmland; - } - - protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc) { - World worldObj = farm.getWorldObj(); - if(canPlant(worldObj, bc) && farm.takeSeedFromSupplies(getSeeds(), bc) != null) { - return plant(farm, worldObj, bc); - } - return false; - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - if(!canHarvest(farm, bc, block, meta)) { - return null; - } - if(!farm.hasHoe()) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - return null; + return false; } - World worldObj = farm.getWorldObj(); - List result = new ArrayList(); + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); - farm.damageHoe(1, bc); - farm.actionPerformed(false); - boolean removed = false; - if(drops != null) { - for (ItemStack stack : drops) { - if(!removed && stack.isItemEqual(getSeeds())) { - stack.stackSize--; - removed = true; - if(stack.stackSize > 0) { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); - } + if (!canHarvest(farm, bc, block, meta)) { + return null; + } + if (!farm.hasHoe()) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + return null; + } + + World worldObj = farm.getWorldObj(); + List result = new ArrayList(); + + ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); + farm.damageHoe(1, bc); + farm.actionPerformed(false); + boolean removed = false; + if (drops != null) { + for (ItemStack stack : drops) { + if (!removed && stack.isItemEqual(getSeeds())) { + stack.stackSize--; + removed = true; + if (stack.stackSize > 0) { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + } + } else { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + } + } + } + + if (removed) { + if (!plant(farm, worldObj, bc)) { + result.add(new EntityItem( + worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, getSeeds().copy())); + worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + } } else { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); } - } + + return new HarvestResult(result, bc); } - if(removed) { - if(!plant(farm, worldObj, bc)) { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, getSeeds().copy())); + protected boolean tillBlock(TileFarmStation farm, BlockCoord plantingLocation) { + World worldObj = farm.getWorldObj(); + BlockCoord dirtLoc = plantingLocation.getLocation(ForgeDirection.DOWN); + Block dirtBlock = farm.getBlock(dirtLoc); + if ((dirtBlock == Blocks.dirt || dirtBlock == Blocks.grass) && farm.hasHoe()) { + farm.damageHoe(1, dirtLoc); + worldObj.setBlock(dirtLoc.x, dirtLoc.y, dirtLoc.z, Blocks.farmland); + worldObj.playSoundEffect( + dirtLoc.x + 0.5F, + dirtLoc.y + 0.5F, + dirtLoc.z + 0.5F, + Blocks.farmland.stepSound.getStepResourcePath(), + (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, + Blocks.farmland.stepSound.getPitch() * 0.8F); + farm.actionPerformed(false); + return true; + } + return false; + } + + protected boolean isGroundTilled(TileFarmStation farm, BlockCoord plantingLocation) { + Block target = farm.getBlock(plantingLocation.getLocation(ForgeDirection.DOWN)); + for (Block tst : tilledBlocks) { + if (tst == target) { + return true; + } + } + return false; + } + + protected boolean canPlant(World worldObj, BlockCoord bc) { + Block target = getPlantedBlock(); + Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); + IPlantable plantable = (IPlantable) getPlantedBlock(); + if (target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) + && target.canBlockStay(worldObj, bc.x, bc.y, bc.z) + && (ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable) + || ignoreSustainCheck)) { + return true; + } + return false; + } + + protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc) { worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - } - } else { - worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + if (canPlant(worldObj, bc)) { + worldObj.setBlock(bc.x, bc.y, bc.z, getPlantedBlock(), getPlantedBlockMeta(), 1 | 2); + farm.actionPerformed(false); + return true; + } + return false; } - return new HarvestResult(result, bc); - } - - protected boolean tillBlock(TileFarmStation farm, BlockCoord plantingLocation) { - World worldObj = farm.getWorldObj(); - BlockCoord dirtLoc = plantingLocation.getLocation(ForgeDirection.DOWN); - Block dirtBlock = farm.getBlock(dirtLoc); - if((dirtBlock == Blocks.dirt || dirtBlock == Blocks.grass) && farm.hasHoe()) { - farm.damageHoe(1, dirtLoc); - worldObj.setBlock(dirtLoc.x, dirtLoc.y, dirtLoc.z, Blocks.farmland); - worldObj.playSoundEffect(dirtLoc.x + 0.5F, dirtLoc.y + 0.5F, dirtLoc.z + 0.5F, Blocks.farmland.stepSound.getStepResourcePath(), - (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F, Blocks.farmland.stepSound.getPitch() * 0.8F); - farm.actionPerformed(false); - return true; + public boolean doesDisableTreeFarm() { + return disableTreeFarm; } - return false; - } - - protected boolean isGroundTilled(TileFarmStation farm, BlockCoord plantingLocation) { - Block target = farm.getBlock(plantingLocation.getLocation(ForgeDirection.DOWN)); - for(Block tst : tilledBlocks) { - if(tst == target) { - return true; - } - } - return false; - } - - protected boolean canPlant(World worldObj, BlockCoord bc) { - Block target = getPlantedBlock(); - Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); - IPlantable plantable = (IPlantable) getPlantedBlock(); - if(target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) && - target.canBlockStay(worldObj, bc.x, bc.y, bc.z) && - (ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable) || ignoreSustainCheck)) { - return true; - } - return false; - } - - protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc) { - worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - if(canPlant(worldObj, bc)) { - worldObj.setBlock(bc.x, bc.y, bc.z, getPlantedBlock(), getPlantedBlockMeta(), 1 | 2); - farm.actionPerformed(false); - return true; - } - return false; - } - - public boolean doesDisableTreeFarm() - { - return disableTreeFarm; - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java index 18d84a97..0d58f8b3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java @@ -1,87 +1,80 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class FarmersCommune implements IFarmerJoe { - public static FarmersCommune instance = new FarmersCommune(); - private static List disableTrees = new ArrayList(); + public static FarmersCommune instance = new FarmersCommune(); + private static List disableTrees = new ArrayList(); - public static void joinCommune(IFarmerJoe joe) { - if (joe instanceof CustomSeedFarmer) - { - CustomSeedFarmer customSeedFarmer = (CustomSeedFarmer) joe; - if (customSeedFarmer.doesDisableTreeFarm()) disableTrees.add(customSeedFarmer.getSeeds()); + public static void joinCommune(IFarmerJoe joe) { + if (joe instanceof CustomSeedFarmer) { + CustomSeedFarmer customSeedFarmer = (CustomSeedFarmer) joe; + if (customSeedFarmer.doesDisableTreeFarm()) disableTrees.add(customSeedFarmer.getSeeds()); + } + instance.farmers.add(joe); } - instance.farmers.add(joe); - } - public static void leaveCommune(IFarmerJoe joe) { - throw new UnsupportedOperationException("As if this would be implemented. The commune is for life!"); - } - - private List farmers = new ArrayList(); - - private FarmersCommune() { - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - for (IFarmerJoe joe : farmers) { - if(joe.canHarvest(farm, bc, block, meta)) { - return true; - } + public static void leaveCommune(IFarmerJoe joe) { + throw new UnsupportedOperationException("As if this would be implemented. The commune is for life!"); } - return false; - } - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - for (IFarmerJoe joe : farmers) { - if (ignoreTreeHarvest(farm, bc, joe)) continue; - if (joe.canHarvest(farm, bc, block, meta)) { - return joe.harvestBlock(farm, bc, block, meta); - } - } - return null; - } + private List farmers = new ArrayList(); - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - for (IFarmerJoe joe : farmers) { - if(joe.prepareBlock(farm, bc, block, meta)) { - return true; - } - } - return false; - } + private FarmersCommune() {} - @Override - public boolean canPlant(ItemStack stack) { - for (IFarmerJoe joe : farmers) { - if(joe.canPlant(stack)) { - return true; - } + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + for (IFarmerJoe joe : farmers) { + if (joe.canHarvest(farm, bc, block, meta)) { + return true; + } + } + return false; } - return false; - } - private boolean ignoreTreeHarvest(TileFarmStation farm, BlockCoord bc, IFarmerJoe joe) - { - ItemStack stack = farm.getSeedTypeInSuppliesFor(bc); - if (!(joe instanceof TreeFarmer) || stack == null) return false; - for (ItemStack disableTreeStack : disableTrees) - { - if (disableTreeStack.isItemEqual(stack)) return true; + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + for (IFarmerJoe joe : farmers) { + if (ignoreTreeHarvest(farm, bc, joe)) continue; + if (joe.canHarvest(farm, bc, block, meta)) { + return joe.harvestBlock(farm, bc, block, meta); + } + } + return null; + } + + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + for (IFarmerJoe joe : farmers) { + if (joe.prepareBlock(farm, bc, block, meta)) { + return true; + } + } + return false; + } + + @Override + public boolean canPlant(ItemStack stack) { + for (IFarmerJoe joe : farmers) { + if (joe.canPlant(stack)) { + return true; + } + } + return false; + } + + private boolean ignoreTreeHarvest(TileFarmStation farm, BlockCoord bc, IFarmerJoe joe) { + ItemStack stack = farm.getSeedTypeInSuppliesFor(bc); + if (!(joe instanceof TreeFarmer) || stack == null) return false; + for (ItemStack disableTreeStack : disableTrees) { + if (disableTreeStack.isItemEqual(stack)) return true; + } + return false; } - return false; - } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java index ea15c760..8c9300cc 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FlowerPicker.java @@ -1,79 +1,73 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.FarmStationContainer; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.FarmStationContainer; -import crazypants.enderio.machine.farm.TileFarmStation; - public class FlowerPicker implements IFarmerJoe { - protected List flowers = new ArrayList(); - - public FlowerPicker() { - } + protected List flowers = new ArrayList(); - public FlowerPicker add(Block... flowers) { - for (Block block : flowers) { - if (block != null) { - this.flowers.add(block); - FarmStationContainer.slotItemsProduce.add(new ItemStack(block)); - } - } - return this; - } + public FlowerPicker() {} - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - return false; - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - for (Block flower : flowers) { - if (block == flower) { - return true; - } - } - return false; - } - - @Override - public boolean canPlant(ItemStack stack) { - return false; - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - if(!farm.hasHoe()) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - return null; + public FlowerPicker add(Block... flowers) { + for (Block block : flowers) { + if (block != null) { + this.flowers.add(block); + FarmStationContainer.slotItemsProduce.add(new ItemStack(block)); + } + } + return this; } - World worldObj = farm.getWorldObj(); - List result = new ArrayList(); - - ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); - farm.damageHoe(1, bc); - farm.actionPerformed(false); - if(drops != null) { - for (ItemStack stack : drops) { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); - } + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + return false; } - worldObj.setBlockToAir(bc.x, bc.y, bc.z); + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + for (Block flower : flowers) { + if (block == flower) { + return true; + } + } + return false; + } - return new HarvestResult(result, bc); - } + @Override + public boolean canPlant(ItemStack stack) { + return false; + } + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + + if (!farm.hasHoe()) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + return null; + } + + World worldObj = farm.getWorldObj(); + List result = new ArrayList(); + + ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); + farm.damageHoe(1, bc); + farm.actionPerformed(false); + if (drops != null) { + for (ItemStack stack : drops) { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + } + } + + worldObj.setBlockToAir(bc.x, bc.y, bc.z); + + return new HarvestResult(result, bc); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java index ddef2ba2..9f10b397 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/ForestryFarmer.java @@ -36,7 +36,7 @@ public class ForestryFarmer implements IFarmerJoe { public boolean canPlant(ItemStack stack) { return stack != null && stack.getItem() == forestrySapling && root.getType(stack) == EnumGermlingType.SAPLING; } - + @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { ItemStack sapling = farm.getSeedTypeInSuppliesFor(bc); @@ -47,22 +47,15 @@ public class ForestryFarmer implements IFarmerJoe { return true; } return false; - } @Override public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { return false; } - @Override public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { return null; } - - - - - } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java index d5a7c912..76c06106 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/HarvestResult.java @@ -1,41 +1,38 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.item.EntityItem; -import com.enderio.core.common.util.BlockCoord; - public class HarvestResult implements IHarvestResult { - List drops; - List harvestedBlocks; + List drops; + List harvestedBlocks; - public HarvestResult(List drops, List harvestedBlocks) { - this.drops = drops; - this.harvestedBlocks = harvestedBlocks; - } + public HarvestResult(List drops, List harvestedBlocks) { + this.drops = drops; + this.harvestedBlocks = harvestedBlocks; + } - public HarvestResult(List drops, BlockCoord harvestedBlock) { - this.drops = drops; - this.harvestedBlocks = new ArrayList(); - harvestedBlocks.add(harvestedBlock); - } + public HarvestResult(List drops, BlockCoord harvestedBlock) { + this.drops = drops; + this.harvestedBlocks = new ArrayList(); + harvestedBlocks.add(harvestedBlock); + } - public HarvestResult() { - drops = new ArrayList(); - harvestedBlocks = new ArrayList(); - } + public HarvestResult() { + drops = new ArrayList(); + harvestedBlocks = new ArrayList(); + } - @Override - public List getDrops() { - return drops; - } - - @Override - public List getHarvestedBlocks() { - return harvestedBlocks; - } + @Override + public List getDrops() { + return drops; + } + @Override + public List getHarvestedBlocks() { + return harvestedBlocks; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java index 98cdf71e..20819df5 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java @@ -1,21 +1,17 @@ package crazypants.enderio.machine.farm.farmers; - +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public interface IFarmerJoe { - boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta); + boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta); - boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta); + boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta); - boolean canPlant(ItemStack stack); - - IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta); + boolean canPlant(ItemStack stack); + IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta); } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java b/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java index 72f3af56..b98ed99e 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/IHarvestResult.java @@ -1,14 +1,12 @@ package crazypants.enderio.machine.farm.farmers; -import java.util.List; - -import net.minecraft.entity.item.EntityItem; - import com.enderio.core.common.util.BlockCoord; +import java.util.List; +import net.minecraft.entity.item.EntityItem; public interface IHarvestResult { - List getDrops(); - List getHarvestedBlocks(); + List getDrops(); + List getHarvestedBlocks(); } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java index 4a43e1bc..28416b5f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/ManaBeanFarmer.java @@ -1,21 +1,17 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.enderio.core.common.util.BlockCoord; - -public class ManaBeanFarmer extends CustomSeedFarmer -{ - public ManaBeanFarmer(Block block, ItemStack stack) - { +public class ManaBeanFarmer extends CustomSeedFarmer { + public ManaBeanFarmer(Block block, ItemStack stack) { super(block, stack); this.requiresFarmland = false; } - protected boolean canPlant(World worldObj, BlockCoord bc) - { - return getPlantedBlock().canPlaceBlockOnSide(worldObj,bc.x,bc.y,bc.z,0); + protected boolean canPlant(World worldObj, BlockCoord bc) { + return getPlantedBlock().canPlaceBlockOnSide(worldObj, bc.x, bc.y, bc.z, 0); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java index c7d5508d..024692e4 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java @@ -1,36 +1,34 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class MelonFarmer extends CustomSeedFarmer { - private Block grownBlock; + private Block grownBlock; - public MelonFarmer(Block plantedBlock, Block grownBlock, ItemStack seeds) { - super(plantedBlock, seeds); - this.grownBlock = grownBlock; - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - int xVal = farm.getLocation().x & 1; - int zVal = farm.getLocation().z & 1; - if ((bc.x & 1) != xVal || (bc.z & 1) != zVal) { - //if we have melon seeds, we still want ot return true here so they are not planted by the default plantable - //handlers - return canPlant(farm.getSeedTypeInSuppliesFor(bc)); + public MelonFarmer(Block plantedBlock, Block grownBlock, ItemStack seeds) { + super(plantedBlock, seeds); + this.grownBlock = grownBlock; } - return super.prepareBlock(farm, bc, block, meta); - } - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - return block == grownBlock; - } + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + int xVal = farm.getLocation().x & 1; + int zVal = farm.getLocation().z & 1; + if ((bc.x & 1) != xVal || (bc.z & 1) != zVal) { + // if we have melon seeds, we still want ot return true here so they are not planted by the default + // plantable + // handlers + return canPlant(farm.getSeedTypeInSuppliesFor(bc)); + } + return super.prepareBlock(farm, bc, block, meta); + } + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + return block == grownBlock; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java index 4f42b720..22745c58 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java @@ -1,80 +1,82 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.farm.TileFarmStation; - public class NaturaBerryFarmer extends PickableFarmer { - public NaturaBerryFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { - super(plantedBlock, plantedBlockMeta, grownBlockMeta, seeds); - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - if(block != getPlantedBlock()) { - return null; - } - if(!farm.hasHoe()) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - return null; + public NaturaBerryFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { + super(plantedBlock, plantedBlockMeta, grownBlockMeta, seeds); } - IHarvestResult res = new HarvestResult(); + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - BlockCoord checkBlock = bc; - for (int i = 0; i < 5 && farm.hasHoe(); i++) { - meta = farm.getBlockMeta(checkBlock); - block = farm.getBlock(checkBlock); - - if(super.canHarvest(farm, bc, block, meta)) { // redundant check because our canHarvest checks all 5 blocks so a bush may be invalid in the stack of 5 - IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); - - if(blockRes != null) { - res.getHarvestedBlocks().add(checkBlock); - List addToDrops = blockRes.getDrops(); - for (EntityItem stack : addToDrops) { - res.getDrops().add(stack); - } + if (block != getPlantedBlock()) { + return null; + } + if (!farm.hasHoe()) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + return null; } - } - checkBlock = checkBlock.getLocation(ForgeDirection.UP); + IHarvestResult res = new HarvestResult(); + + BlockCoord checkBlock = bc; + for (int i = 0; i < 5 && farm.hasHoe(); i++) { + meta = farm.getBlockMeta(checkBlock); + block = farm.getBlock(checkBlock); + + if (super.canHarvest( + farm, bc, block, + meta)) { // redundant check because our canHarvest checks all 5 blocks so a bush may be invalid in + // the stack of 5 + IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); + + if (blockRes != null) { + res.getHarvestedBlocks().add(checkBlock); + List addToDrops = blockRes.getDrops(); + for (EntityItem stack : addToDrops) { + res.getDrops().add(stack); + } + } + } + + checkBlock = checkBlock.getLocation(ForgeDirection.UP); + } + + if (res.getHarvestedBlocks().isEmpty()) { + return null; + } + + return res; } - if(res.getHarvestedBlocks().isEmpty()) { - return null; + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!Config.farmEssenceBerriesEnabled + && "tile.ore.berries.two".equals(block.getUnlocalizedName()) + && meta == grownBlockMeta) { + return false; + } + + BlockCoord checkBlock = bc; + + for (int i = 0; i < 5; i++) { + meta = farm.getBlockMeta(checkBlock); + block = checkBlock.getBlock(farm.getWorldObj()); + if (super.canHarvest(farm, checkBlock, block, meta)) { + return true; + } + checkBlock = checkBlock.getLocation(ForgeDirection.UP); + } + + return false; } - - return res; - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!Config.farmEssenceBerriesEnabled && "tile.ore.berries.two".equals(block.getUnlocalizedName()) && meta == grownBlockMeta) { - return false; - } - - BlockCoord checkBlock = bc; - - for (int i = 0; i < 5; i++) { - meta = farm.getBlockMeta(checkBlock); - block = checkBlock.getBlock(farm.getWorldObj()); - if(super.canHarvest(farm, checkBlock, block, meta)) { - return true; - } - checkBlock = checkBlock.getLocation(ForgeDirection.UP); - } - - return false; - } -} \ No newline at end of file +} diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java index 4585eeb1..156d06e0 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -7,28 +9,22 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class NetherWartFarmer extends CustomSeedFarmer { - public NetherWartFarmer() { - super(Blocks.nether_wart, 3, new ItemStack(Items.nether_wart)); - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - if(!farm.isOpen(bc)) { - return false; + public NetherWartFarmer() { + super(Blocks.nether_wart, 3, new ItemStack(Items.nether_wart)); } - World worldObj = farm.getWorldObj(); - BlockCoord grn = bc.getLocation(ForgeDirection.DOWN); - Block blk = worldObj.getBlock(grn.x, grn.y, grn.z); - - return plantFromInventory(farm, bc); - } + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!farm.isOpen(bc)) { + return false; + } + World worldObj = farm.getWorldObj(); + BlockCoord grn = bc.getLocation(ForgeDirection.DOWN); + Block blk = worldObj.getBlock(grn.x, grn.y, grn.z); + + return plantFromInventory(farm, bc); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java index ed59b850..a320d7f7 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java @@ -1,62 +1,58 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class PickableFarmer extends CustomSeedFarmer { - - public PickableFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { - super(plantedBlock, plantedBlockMeta, grownBlockMeta, seeds); - } - public PickableFarmer(Block plantedBlock, int grownBlockMeta, ItemStack seeds) { - super(plantedBlock, grownBlockMeta, seeds); - } - - public PickableFarmer(Block plantedBlock, ItemStack seeds) { - super(plantedBlock, seeds); - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - if(!canHarvest(farm, bc, block, meta)) { - return null; + public PickableFarmer(Block plantedBlock, int plantedBlockMeta, int grownBlockMeta, ItemStack seeds) { + super(plantedBlock, plantedBlockMeta, grownBlockMeta, seeds); } - if(!farm.hasHoe()) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - return null; - } - EntityPlayerMP player = farm.getFakePlayer(); - World world = farm.getWorldObj(); - player.theItemInWorldManager.activateBlockOrUseItem(player, player.worldObj, null, bc.x, bc.y, bc.z, 0, 0, 0, 0); - - List drops = new ArrayList(); - - ItemStack[] inv = player.inventory.mainInventory; - for(int slot=0;slot < inv.length;slot++) { - ItemStack stack = inv[slot]; - if(stack != null) { - inv[slot] = null; - - EntityItem entityitem = new EntityItem(world, bc.x + 0.5, bc.y + 1, bc.z + 0.5, stack); - drops.add(entityitem); - } - } - farm.actionPerformed(false); - farm.damageHoe(1, bc); - return new HarvestResult(drops, bc); - } - + public PickableFarmer(Block plantedBlock, int grownBlockMeta, ItemStack seeds) { + super(plantedBlock, grownBlockMeta, seeds); + } + + public PickableFarmer(Block plantedBlock, ItemStack seeds) { + super(plantedBlock, seeds); + } + + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + + if (!canHarvest(farm, bc, block, meta)) { + return null; + } + if (!farm.hasHoe()) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + return null; + } + EntityPlayerMP player = farm.getFakePlayer(); + World world = farm.getWorldObj(); + player.theItemInWorldManager.activateBlockOrUseItem( + player, player.worldObj, null, bc.x, bc.y, bc.z, 0, 0, 0, 0); + + List drops = new ArrayList(); + + ItemStack[] inv = player.inventory.mainInventory; + for (int slot = 0; slot < inv.length; slot++) { + ItemStack stack = inv[slot]; + if (stack != null) { + inv[slot] = null; + + EntityItem entityitem = new EntityItem(world, bc.x + 0.5, bc.y + 1, bc.z + 0.5, stack); + drops.add(entityitem); + } + } + farm.actionPerformed(false); + farm.damageHoe(1, bc); + return new HarvestResult(drops, bc); + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java index e69e93d6..9574ca12 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java @@ -1,10 +1,11 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import net.minecraft.block.Block; import net.minecraft.block.BlockStem; import net.minecraft.block.IGrowable; @@ -16,177 +17,173 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class PlantableFarmer implements IFarmerJoe { - private Set harvestExcludes = new HashSet(); + private Set harvestExcludes = new HashSet(); - public void addHarvestExlude(Block block) { - harvestExcludes.add(block); - } - - @Override - public boolean canPlant(ItemStack stack) { - if(stack == null) { - return false; - } - return stack.getItem() instanceof IPlantable; - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(block == null) { - return false; + public void addHarvestExlude(Block block) { + harvestExcludes.add(block); } - ItemStack seedStack = farm.getSeedTypeInSuppliesFor(bc); - if(seedStack == null) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_SEEDS); - return false; - } - - if(!(seedStack.getItem() instanceof IPlantable)) { - return false; - } - - IPlantable plantable = (IPlantable) seedStack.getItem(); - EnumPlantType type = plantable.getPlantType(farm.getWorldObj(), bc.x, bc.y, bc.z); - if(type == null) { - return false; - } - Block ground = farm.getBlock(bc.getLocation(ForgeDirection.DOWN)); - if(type == EnumPlantType.Nether) { - if(ground != Blocks.soul_sand) { - return false; - } - return plantFromInventory(farm, bc, plantable); - } - - if(type == EnumPlantType.Crop) { - farm.tillBlock(bc); - return plantFromInventory(farm, bc, plantable); - } - - if (type == EnumPlantType.Water) { - return plantFromInventory(farm, bc, plantable); - } - - return false; - } - - // From BlockBush, as a reference - // @Override - // public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) - // { - // if (this == Blocks.wheat) return Crop; - // if (this == Blocks.carrots) return Crop; - // if (this == Blocks.potatoes) return Crop; - // if (this == Blocks.melon_stem) return Crop; - // if (this == Blocks.pumpkin_stem) return Crop; - // if (this == Blocks.deadbush) return Desert; - // if (this == Blocks.waterlily) return Water; - // if (this == Blocks.red_mushroom) return Cave; - // if (this == Blocks.brown_mushroom) return Cave; - // if (this == Blocks.nether_wart) return Nether; - // if (this == Blocks.sapling) return Plains; - // if (this == Blocks.tallgrass) return Plains; - // if (this == Blocks.double_plant) return Plains; - // if (this == Blocks.red_flower) return Plains; - // if (this == Blocks.yellow_flower) return Plains; - // return Plains; - // } - - protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc, IPlantable plantable) { - World worldObj = farm.getWorldObj(); - if(canPlant(worldObj, bc, plantable) && farm.takeSeedFromSupplies(bc) != null) { - return plant(farm, worldObj, bc, plantable); - } - return false; - } - - protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) { - worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - Block target = plantable.getPlant(null, 0, 0, 0); - int meta = plantable.getPlantMetadata(null, 0, 0, 0); - worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2); - farm.actionPerformed(false); - return true; - } - - protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) { - Block target = plantable.getPlant(null, 0, 0, 0); - Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); - if(target != null && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) && - target.canBlockStay(worldObj, bc.x, bc.y, bc.z) && - ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable)) { - return true; - } - return false; - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!harvestExcludes.contains(block) && block instanceof IGrowable && !(block instanceof BlockStem)) { - return !((IGrowable) block).func_149851_a(farm.getWorldObj(), bc.x, bc.y, bc.z, true); - } - return false; - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!canHarvest(farm, bc, block, meta)) { - return null; - } - if(!farm.hasHoe()) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - return null; - } - - World worldObj = farm.getWorldObj(); - List result = new ArrayList(); - - ItemStack removedPlantable = null; - - ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); - farm.damageHoe(1, bc); - farm.actionPerformed(false); - boolean removed = false; - if(drops != null) { - for (ItemStack stack : drops) { - if(stack != null && !removed && isPlantableForBlock(stack, block)) { - stack.stackSize--; - removed = true; - removedPlantable = stack.copy(); - if(stack.stackSize > 0) { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); - } - } else { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + @Override + public boolean canPlant(ItemStack stack) { + if (stack == null) { + return false; } - } + return stack.getItem() instanceof IPlantable; } - if(removed) { - if(!plant(farm, worldObj, bc, (IPlantable) removedPlantable.getItem())) { - result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, removedPlantable.copy())); + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (block == null) { + return false; + } + + ItemStack seedStack = farm.getSeedTypeInSuppliesFor(bc); + if (seedStack == null) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_SEEDS); + return false; + } + + if (!(seedStack.getItem() instanceof IPlantable)) { + return false; + } + + IPlantable plantable = (IPlantable) seedStack.getItem(); + EnumPlantType type = plantable.getPlantType(farm.getWorldObj(), bc.x, bc.y, bc.z); + if (type == null) { + return false; + } + Block ground = farm.getBlock(bc.getLocation(ForgeDirection.DOWN)); + if (type == EnumPlantType.Nether) { + if (ground != Blocks.soul_sand) { + return false; + } + return plantFromInventory(farm, bc, plantable); + } + + if (type == EnumPlantType.Crop) { + farm.tillBlock(bc); + return plantFromInventory(farm, bc, plantable); + } + + if (type == EnumPlantType.Water) { + return plantFromInventory(farm, bc, plantable); + } + + return false; + } + + // From BlockBush, as a reference + // @Override + // public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) + // { + // if (this == Blocks.wheat) return Crop; + // if (this == Blocks.carrots) return Crop; + // if (this == Blocks.potatoes) return Crop; + // if (this == Blocks.melon_stem) return Crop; + // if (this == Blocks.pumpkin_stem) return Crop; + // if (this == Blocks.deadbush) return Desert; + // if (this == Blocks.waterlily) return Water; + // if (this == Blocks.red_mushroom) return Cave; + // if (this == Blocks.brown_mushroom) return Cave; + // if (this == Blocks.nether_wart) return Nether; + // if (this == Blocks.sapling) return Plains; + // if (this == Blocks.tallgrass) return Plains; + // if (this == Blocks.double_plant) return Plains; + // if (this == Blocks.red_flower) return Plains; + // if (this == Blocks.yellow_flower) return Plains; + // return Plains; + // } + + protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc, IPlantable plantable) { + World worldObj = farm.getWorldObj(); + if (canPlant(worldObj, bc, plantable) && farm.takeSeedFromSupplies(bc) != null) { + return plant(farm, worldObj, bc, plantable); + } + return false; + } + + protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) { worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - } - } else { - worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + Block target = plantable.getPlant(null, 0, 0, 0); + int meta = plantable.getPlantMetadata(null, 0, 0, 0); + worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2); + farm.actionPerformed(false); + return true; } - return new HarvestResult(result, bc); - } - - private boolean isPlantableForBlock(ItemStack stack, Block block) { - if(!(stack.getItem() instanceof IPlantable)) { - return false; + protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) { + Block target = plantable.getPlant(null, 0, 0, 0); + Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); + if (target != null + && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) + && target.canBlockStay(worldObj, bc.x, bc.y, bc.z) + && ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable)) { + return true; + } + return false; } - IPlantable plantable = (IPlantable) stack.getItem(); - return plantable.getPlant(null, 0, 0, 0) == block; - } + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!harvestExcludes.contains(block) && block instanceof IGrowable && !(block instanceof BlockStem)) { + return !((IGrowable) block).func_149851_a(farm.getWorldObj(), bc.x, bc.y, bc.z, true); + } + return false; + } + + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!canHarvest(farm, bc, block, meta)) { + return null; + } + if (!farm.hasHoe()) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + return null; + } + + World worldObj = farm.getWorldObj(); + List result = new ArrayList(); + + ItemStack removedPlantable = null; + + ArrayList drops = block.getDrops(worldObj, bc.x, bc.y, bc.z, meta, farm.getMaxLootingValue()); + farm.damageHoe(1, bc); + farm.actionPerformed(false); + boolean removed = false; + if (drops != null) { + for (ItemStack stack : drops) { + if (stack != null && !removed && isPlantableForBlock(stack, block)) { + stack.stackSize--; + removed = true; + removedPlantable = stack.copy(); + if (stack.stackSize > 0) { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + } + } else { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, stack.copy())); + } + } + } + + if (removed) { + if (!plant(farm, worldObj, bc, (IPlantable) removedPlantable.getItem())) { + result.add(new EntityItem(worldObj, bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, removedPlantable.copy())); + worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + } + } else { + worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + } + + return new HarvestResult(result, bc); + } + + private boolean isPlantableForBlock(ItemStack stack, Block block) { + if (!(stack.getItem() instanceof IPlantable)) { + return false; + } + IPlantable plantable = (IPlantable) stack.getItem(); + return plantable.getPlant(null, 0, 0, 0) == block; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java index b2145b7b..5da9b2a6 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/RubberTreeFarmerIC2.java @@ -1,90 +1,92 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.machine.farm.FarmStationContainer; +import crazypants.enderio.machine.farm.TileFarmStation; +import crazypants.enderio.machine.farm.TileFarmStation.ToolType; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.machine.farm.FarmStationContainer; -import crazypants.enderio.machine.farm.TileFarmStation; -import crazypants.enderio.machine.farm.TileFarmStation.ToolType; - public class RubberTreeFarmerIC2 extends TreeFarmer { - public static Class treeTap; - private ItemStack stickyResin; + public static Class treeTap; + private ItemStack stickyResin; - public RubberTreeFarmerIC2() { - super(true, GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood")); - Item item = GameRegistry.findItem("IC2", "itemTreetap"); - if(item != null) { - treeTap = item.getClass(); - } - item = GameRegistry.findItem("IC2", "itemHarz"); - if(item != null) { - stickyResin = new ItemStack(item); - FarmStationContainer.slotItemsProduce.add(stickyResin); - } - } - - public boolean isValid() { - return woods != null && woods.length > 0 && sapling != null && saplingItem != null && treeTap != null && stickyResin != null; - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.hasAxe()) { - for(int x=-1;x<2;x++) { - for(int z=-1;z<2;z++) { - Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z); - if(isWood(blk) || sapling == blk) { - return false; - } + public RubberTreeFarmerIC2() { + super(true, GameRegistry.findBlock("IC2", "blockRubSapling"), GameRegistry.findBlock("IC2", "blockRubWood")); + Item item = GameRegistry.findItem("IC2", "itemTreetap"); + if (item != null) { + treeTap = item.getClass(); } - } - } - return super.prepareBlock(farm, bc, block, meta); - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(farm.hasAxe()) { - return super.harvestBlock(farm, bc, block, meta); - } - HarvestResult res = new HarvestResult(); - int y = bc.y; - boolean done = false; - while (!done && farm.hasTool(ToolType.TREETAP)) { - bc = new BlockCoord(bc.x, y, bc.z); - block = farm.getBlock(bc); - if(!isWood(block)) { - done = true; - } else { - meta = farm.getBlockMeta(bc); - if(attemptHarvest(res, farm.getWorldObj(), bc.x, y, bc.z, meta)) { - farm.damageTool(ToolType.TREETAP, woods[0], bc, 1); + item = GameRegistry.findItem("IC2", "itemHarz"); + if (item != null) { + stickyResin = new ItemStack(item); + FarmStationContainer.slotItemsProduce.add(stickyResin); } - } - y++; } - return res; - } - private boolean attemptHarvest(HarvestResult res, World world, int x, int y, int z, int meta) { - if(meta > 1 && meta < 6) { - world.setBlockMetadataWithNotify(x, y, z, meta + 6, 3); - world.scheduleBlockUpdate(x, y, z, woods[0], woods[0].tickRate(world)); - ItemStack drop = stickyResin.copy(); - drop.stackSize = world.rand.nextInt(3) + 1; - EntityItem dropEnt = new EntityItem(world, x + 0.5, y + 1, z + 0.5, drop); - res.getDrops().add(dropEnt); - return true; - } - return false; - } + public boolean isValid() { + return woods != null + && woods.length > 0 + && sapling != null + && saplingItem != null + && treeTap != null + && stickyResin != null; + } + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (!farm.hasAxe()) { + for (int x = -1; x < 2; x++) { + for (int z = -1; z < 2; z++) { + Block blk = farm.getBlock(bc.x + x, bc.y, bc.z + z); + if (isWood(blk) || sapling == blk) { + return false; + } + } + } + } + return super.prepareBlock(farm, bc, block, meta); + } + + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (farm.hasAxe()) { + return super.harvestBlock(farm, bc, block, meta); + } + HarvestResult res = new HarvestResult(); + int y = bc.y; + boolean done = false; + while (!done && farm.hasTool(ToolType.TREETAP)) { + bc = new BlockCoord(bc.x, y, bc.z); + block = farm.getBlock(bc); + if (!isWood(block)) { + done = true; + } else { + meta = farm.getBlockMeta(bc); + if (attemptHarvest(res, farm.getWorldObj(), bc.x, y, bc.z, meta)) { + farm.damageTool(ToolType.TREETAP, woods[0], bc, 1); + } + } + y++; + } + return res; + } + + private boolean attemptHarvest(HarvestResult res, World world, int x, int y, int z, int meta) { + if (meta > 1 && meta < 6) { + world.setBlockMetadataWithNotify(x, y, z, meta + 6, 3); + world.scheduleBlockUpdate(x, y, z, woods[0], woods[0].tickRate(world)); + ItemStack drop = stickyResin.copy(); + drop.stackSize = world.rand.nextInt(3) + 1; + EntityItem dropEnt = new EntityItem(world, x + 0.5, y + 1, z + 0.5, drop); + res.getDrops().add(dropEnt); + return true; + } + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java index ae6c4e95..055c60a6 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java @@ -1,107 +1,108 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class StemFarmer extends CustomSeedFarmer { - private static final HeightCompatator COMP = new HeightCompatator(); + private static final HeightCompatator COMP = new HeightCompatator(); - public StemFarmer(Block plantedBlock, ItemStack seeds) { - super(plantedBlock, seeds); - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(plantedBlock == block) { - return true; + public StemFarmer(Block plantedBlock, ItemStack seeds) { + super(plantedBlock, seeds); } - return plantFromInventory(farm, bc); - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - BlockCoord up = bc.getLocation(ForgeDirection.UP); - Block upBLock = farm.getBlock(up); - return upBLock == plantedBlock; - } - - @Override - public boolean canPlant(ItemStack stack) { - return seeds.isItemEqual(stack); - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - - HarvestResult res = new HarvestResult(); - BlockCoord harvestCoord = bc; - boolean done = false; - do{ - harvestCoord = harvestCoord.getLocation(ForgeDirection.UP); - boolean hasHoe = farm.hasHoe(); - if(plantedBlock == farm.getBlock(harvestCoord) && hasHoe) { - res.harvestedBlocks.add(harvestCoord); - ArrayList drops = plantedBlock.getDrops(farm.getWorldObj(), harvestCoord.x, harvestCoord.y, harvestCoord.z, meta, farm.getMaxLootingValue()); - if(drops != null) { - for(ItemStack drop : drops) { - res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); - } - } - farm.damageHoe(1, harvestCoord); - farm.actionPerformed(false); - } else { - if (!hasHoe) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); - } else { - farm.clearNotification(); - } - done = true; - } - } while(!done); - - List toClear = new ArrayList(res.getHarvestedBlocks()); - Collections.sort(toClear, COMP); - for (BlockCoord coord : toClear) { - farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); - } - - return res; - } - - @Override - protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc) { - World worldObj = farm.getWorldObj(); - if(canPlant(worldObj, bc) && farm.takeSeedFromSupplies(seeds, bc) != null) { - return plant(farm, worldObj, bc); - } - return false; - } - - private static class HeightCompatator implements Comparator { @Override - public int compare(BlockCoord o1, BlockCoord o2) { - return -compare(o1.y, o2.y); + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (plantedBlock == block) { + return true; + } + return plantFromInventory(farm, bc); } - public static int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); + @Override + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + BlockCoord up = bc.getLocation(ForgeDirection.UP); + Block upBLock = farm.getBlock(up); + return upBLock == plantedBlock; } - } + @Override + public boolean canPlant(ItemStack stack) { + return seeds.isItemEqual(stack); + } + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + + HarvestResult res = new HarvestResult(); + BlockCoord harvestCoord = bc; + boolean done = false; + do { + harvestCoord = harvestCoord.getLocation(ForgeDirection.UP); + boolean hasHoe = farm.hasHoe(); + if (plantedBlock == farm.getBlock(harvestCoord) && hasHoe) { + res.harvestedBlocks.add(harvestCoord); + ArrayList drops = plantedBlock.getDrops( + farm.getWorldObj(), + harvestCoord.x, + harvestCoord.y, + harvestCoord.z, + meta, + farm.getMaxLootingValue()); + if (drops != null) { + for (ItemStack drop : drops) { + res.drops.add( + new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); + } + } + farm.damageHoe(1, harvestCoord); + farm.actionPerformed(false); + } else { + if (!hasHoe) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); + } else { + farm.clearNotification(); + } + done = true; + } + } while (!done); + + List toClear = new ArrayList(res.getHarvestedBlocks()); + Collections.sort(toClear, COMP); + for (BlockCoord coord : toClear) { + farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); + } + + return res; + } + + @Override + protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc) { + World worldObj = farm.getWorldObj(); + if (canPlant(worldObj, bc) && farm.takeSeedFromSupplies(seeds, bc) != null) { + return plant(farm, worldObj, bc); + } + return false; + } + + private static class HeightCompatator implements Comparator { + + @Override + public int compare(BlockCoord o1, BlockCoord o2) { + return -compare(o1.y, o2.y); + } + + public static int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index 6d2423c4..daa3cf97 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -1,11 +1,13 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.farm.FarmStationContainer; +import crazypants.enderio.machine.farm.TileFarmStation; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; - -import scala.actors.threadpool.Arrays; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -16,192 +18,193 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.farm.FarmStationContainer; -import crazypants.enderio.machine.farm.TileFarmStation; - public class TreeFarmer implements IFarmerJoe { - private static final HeightComparator comp = new HeightComparator(); + private static final HeightComparator comp = new HeightComparator(); - protected Block sapling; - protected ItemStack saplingItem; - protected Block[] woods; - - protected TreeHarvestUtil harvester = new TreeHarvestUtil(); - private boolean ignoreMeta; + protected Block sapling; + protected ItemStack saplingItem; + protected Block[] woods; - public TreeFarmer(Block sapling, Block... wood) { - this.sapling = sapling; - if(sapling != null) { - saplingItem = new ItemStack(sapling); - FarmStationContainer.slotItemsSeeds.add(saplingItem); - } - woods = wood; - for (Block awood : woods) { - FarmStationContainer.slotItemsProduce.add(new ItemStack(awood)); - } - } + protected TreeHarvestUtil harvester = new TreeHarvestUtil(); + private boolean ignoreMeta; - public TreeFarmer(boolean ignoreMeta, Block sapling, Block... wood) { - this(sapling,wood); - this.ignoreMeta = ignoreMeta; - } - - @Override - public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - return isWood(block); - } - - protected boolean isWood(Block block) { - for(Block wood : woods) { - if(block == wood) { - return true; - } - } - return false; - } - - @Override - public boolean canPlant(ItemStack stack) { - return stack != null && stack.getItem() == saplingItem.getItem(); - } - - @Override - public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(block == sapling) { - return true; - } - return plantFromInventory(farm, bc, block, meta); - } - - protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - World worldObj = farm.getWorldObj(); - if(canPlant(worldObj, bc)) { - ItemStack seed = farm.takeSeedFromSupplies(saplingItem, bc, false); - if(seed != null) { - return plant(farm, worldObj, bc, seed); - } - } - return false; - } - - protected boolean canPlant(World worldObj, BlockCoord bc) { - Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); - IPlantable plantable = (IPlantable) sapling; - if(sapling.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) && - sapling.canBlockStay(worldObj, bc.x, bc.y, bc.z) && - ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable)) { - return true; - } - return false; - } - - protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, ItemStack seed) { - worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); - if(canPlant(worldObj, bc)) { - worldObj.setBlock(bc.x, bc.y, bc.z, sapling, seed.getItemDamage(), 1 | 2); - farm.actionPerformed(false); - return true; - } - return false; - } - - @Override - public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - - boolean hasAxe = farm.hasAxe(); - - if(!hasAxe) { - return null; - } - - HarvestResult res = new HarvestResult(); - harvester.harvest(farm, this, bc, res); - Collections.sort(res.harvestedBlocks, comp); - - List actualHarvests = new ArrayList(); - - // avoid calling this in a loop - boolean hasShears = farm.hasShears(); - int noShearingPercentage = farm.isLowOnSaplings(bc); - int shearCount = 0; - - for (int i = 0; i < res.harvestedBlocks.size() && hasAxe; i++) { - BlockCoord coord = res.harvestedBlocks.get(i); - Block blk = farm.getBlock(coord); - - ArrayList drops; - boolean wasSheared = false; - boolean wasAxed = false; - boolean wasWood = isWood(blk); - - if (blk instanceof IShearable && hasShears && ((shearCount / res.harvestedBlocks.size() + noShearingPercentage) < 100)) { - drops = ((IShearable)blk).onSheared(null, farm.getWorldObj(), coord.x, coord.y, coord.z, 0); - wasSheared = true; - shearCount += 100; - } else { - drops = blk.getDrops(farm.getWorldObj(), coord.x, coord.y, coord.z, farm.getBlockMeta(coord), farm.getAxeLootingValue()); - wasAxed = true; - } - - if(drops != null) { - for (ItemStack drop : drops) { - res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); + public TreeFarmer(Block sapling, Block... wood) { + this.sapling = sapling; + if (sapling != null) { + saplingItem = new ItemStack(sapling); + FarmStationContainer.slotItemsSeeds.add(saplingItem); } - } - - if (wasAxed && !wasWood) { - wasAxed = Config.farmAxeDamageOnLeafBreak; - int leaveMeta = farm.getBlockMeta(coord); - if(TreeHarvestUtil.canDropApples(blk, leaveMeta)) { - if(farm.getWorldObj().rand.nextInt(200) == 0) { - res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); - } + woods = wood; + for (Block awood : woods) { + FarmStationContainer.slotItemsProduce.add(new ItemStack(awood)); } - } - - farm.actionPerformed(wasWood || wasSheared); - if(wasAxed) { - farm.damageAxe(blk, coord); - hasAxe = farm.hasAxe(); - } else if (wasSheared) { - farm.damageShears(blk, coord); - hasShears = farm.hasShears(); - } - - farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); - actualHarvests.add(coord); } - - if (!hasAxe) { - farm.setNotification(TileFarmStation.NOTIFICATION_NO_AXE); + + public TreeFarmer(boolean ignoreMeta, Block sapling, Block... wood) { + this(sapling, wood); + this.ignoreMeta = ignoreMeta; } - - res.harvestedBlocks.clear(); - res.harvestedBlocks.addAll(actualHarvests); - - return res; - } - - public boolean getIgnoreMeta() - { - return ignoreMeta; - } - - private static class HeightComparator implements Comparator { @Override - public int compare(BlockCoord o1, BlockCoord o2) { - return compare(o2.y, o1.y); //reverse order + public boolean canHarvest(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + return isWood(block); } - //same as 1.7 Integer.compare - public static int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); + protected boolean isWood(Block block) { + for (Block wood : woods) { + if (block == wood) { + return true; + } + } + return false; } - } + @Override + public boolean canPlant(ItemStack stack) { + return stack != null && stack.getItem() == saplingItem.getItem(); + } + + @Override + public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + if (block == sapling) { + return true; + } + return plantFromInventory(farm, bc, block, meta); + } + + protected boolean plantFromInventory(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + World worldObj = farm.getWorldObj(); + if (canPlant(worldObj, bc)) { + ItemStack seed = farm.takeSeedFromSupplies(saplingItem, bc, false); + if (seed != null) { + return plant(farm, worldObj, bc, seed); + } + } + return false; + } + + protected boolean canPlant(World worldObj, BlockCoord bc) { + Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z); + IPlantable plantable = (IPlantable) sapling; + if (sapling.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z) + && sapling.canBlockStay(worldObj, bc.x, bc.y, bc.z) + && ground.canSustainPlant(worldObj, bc.x, bc.y - 1, bc.z, ForgeDirection.UP, plantable)) { + return true; + } + return false; + } + + protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, ItemStack seed) { + worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2); + if (canPlant(worldObj, bc)) { + worldObj.setBlock(bc.x, bc.y, bc.z, sapling, seed.getItemDamage(), 1 | 2); + farm.actionPerformed(false); + return true; + } + return false; + } + + @Override + public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { + + boolean hasAxe = farm.hasAxe(); + + if (!hasAxe) { + return null; + } + + HarvestResult res = new HarvestResult(); + harvester.harvest(farm, this, bc, res); + Collections.sort(res.harvestedBlocks, comp); + + List actualHarvests = new ArrayList(); + + // avoid calling this in a loop + boolean hasShears = farm.hasShears(); + int noShearingPercentage = farm.isLowOnSaplings(bc); + int shearCount = 0; + + for (int i = 0; i < res.harvestedBlocks.size() && hasAxe; i++) { + BlockCoord coord = res.harvestedBlocks.get(i); + Block blk = farm.getBlock(coord); + + ArrayList drops; + boolean wasSheared = false; + boolean wasAxed = false; + boolean wasWood = isWood(blk); + + if (blk instanceof IShearable + && hasShears + && ((shearCount / res.harvestedBlocks.size() + noShearingPercentage) < 100)) { + drops = ((IShearable) blk).onSheared(null, farm.getWorldObj(), coord.x, coord.y, coord.z, 0); + wasSheared = true; + shearCount += 100; + } else { + drops = blk.getDrops( + farm.getWorldObj(), + coord.x, + coord.y, + coord.z, + farm.getBlockMeta(coord), + farm.getAxeLootingValue()); + wasAxed = true; + } + + if (drops != null) { + for (ItemStack drop : drops) { + res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); + } + } + + if (wasAxed && !wasWood) { + wasAxed = Config.farmAxeDamageOnLeafBreak; + int leaveMeta = farm.getBlockMeta(coord); + if (TreeHarvestUtil.canDropApples(blk, leaveMeta)) { + if (farm.getWorldObj().rand.nextInt(200) == 0) { + res.drops.add(new EntityItem( + farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); + } + } + } + + farm.actionPerformed(wasWood || wasSheared); + if (wasAxed) { + farm.damageAxe(blk, coord); + hasAxe = farm.hasAxe(); + } else if (wasSheared) { + farm.damageShears(blk, coord); + hasShears = farm.hasShears(); + } + + farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); + actualHarvests.add(coord); + } + + if (!hasAxe) { + farm.setNotification(TileFarmStation.NOTIFICATION_NO_AXE); + } + + res.harvestedBlocks.clear(); + res.harvestedBlocks.addAll(actualHarvests); + + return res; + } + + public boolean getIgnoreMeta() { + return ignoreMeta; + } + + private static class HeightComparator implements Comparator { + + @Override + public int compare(BlockCoord o1, BlockCoord o2) { + return compare(o2.y, o1.y); // reverse order + } + + // same as 1.7 Integer.compare + public static int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java index 1104c81b..4bdde340 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.farm.farmers; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.farm.TileFarmStation; import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockNewLeaf; @@ -7,140 +9,128 @@ import net.minecraft.block.BlockOldLeaf; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.farm.TileFarmStation; - public class TreeHarvestUtil { - public static boolean canDropApples(Block block, int meta) { - return - (block instanceof BlockOldLeaf && (meta == 0 || meta == 8)) || //oak - (block instanceof BlockNewLeaf && (meta == 1 || meta == 9)); //giant oak - } - - private int horizontalRange; - private int verticalRange; - private BlockCoord origin; - - public TreeHarvestUtil() { - } - - public void harvest(TileFarmStation farm, TreeFarmer farmer, BlockCoord bc, HarvestResult res) { - horizontalRange = farm.getFarmSize() + 7; - verticalRange = 30; - harvest(farm.getWorldObj(), farm.getLocation(), bc, res, farmer.getIgnoreMeta()); - } - - public void harvest(World world, BlockCoord bc, HarvestResult res) { - horizontalRange = 12; - verticalRange = 30; - origin = new BlockCoord(bc); - Block wood = world.getBlock(bc.x, bc.y, bc.z); - int woodMeta = world.getBlockMetadata(bc.x, bc.y, bc.z); - harvestUp(world, bc, res, new HarvestTarget(wood, woodMeta)); - } - - private void harvest(World world, BlockCoord origin, BlockCoord bc, HarvestResult res, boolean ignoreMeta) { - this.origin = new BlockCoord(origin); - Block wood = world.getBlock(bc.x, bc.y, bc.z); - int woodMeta = world.getBlockMetadata(bc.x, bc.y, bc.z); - if (ignoreMeta) - { - harvestUp(world, bc, res, new BaseHarvestTarget(wood)); - } - else - { - harvestUp(world, bc, res, new HarvestTarget(wood, woodMeta)); - } - } - - protected void harvestUp(World world, BlockCoord bc, HarvestResult res, BaseHarvestTarget target) { - - if(!isInHarvestBounds(bc) || res.harvestedBlocks.contains(bc)) { - return; + public static boolean canDropApples(Block block, int meta) { + return (block instanceof BlockOldLeaf && (meta == 0 || meta == 8)) + || // oak + (block instanceof BlockNewLeaf && (meta == 1 || meta == 9)); // giant oak } - Block blk = world.getBlock(bc.x, bc.y,bc.z); - boolean isLeaves = blk instanceof BlockLeaves; - if(target.isTarget(blk, world.getBlockMetadata(bc.x, bc.y, bc.z)) || isLeaves) { - res.harvestedBlocks.add(bc); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir != ForgeDirection.DOWN) { - harvestUp(world, bc.getLocation(dir), res, target); + private int horizontalRange; + private int verticalRange; + private BlockCoord origin; + + public TreeHarvestUtil() {} + + public void harvest(TileFarmStation farm, TreeFarmer farmer, BlockCoord bc, HarvestResult res) { + horizontalRange = farm.getFarmSize() + 7; + verticalRange = 30; + harvest(farm.getWorldObj(), farm.getLocation(), bc, res, farmer.getIgnoreMeta()); + } + + public void harvest(World world, BlockCoord bc, HarvestResult res) { + horizontalRange = 12; + verticalRange = 30; + origin = new BlockCoord(bc); + Block wood = world.getBlock(bc.x, bc.y, bc.z); + int woodMeta = world.getBlockMetadata(bc.x, bc.y, bc.z); + harvestUp(world, bc, res, new HarvestTarget(wood, woodMeta)); + } + + private void harvest(World world, BlockCoord origin, BlockCoord bc, HarvestResult res, boolean ignoreMeta) { + this.origin = new BlockCoord(origin); + Block wood = world.getBlock(bc.x, bc.y, bc.z); + int woodMeta = world.getBlockMetadata(bc.x, bc.y, bc.z); + if (ignoreMeta) { + harvestUp(world, bc, res, new BaseHarvestTarget(wood)); + } else { + harvestUp(world, bc, res, new HarvestTarget(wood, woodMeta)); } - } - } else { - // check the sides for connected wood - harvestAdjacentWood(world, bc, res, target); - //and another check for large oaks, where wood can be surrounded by leaves - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir.offsetY == 0) { - BlockCoord loc = bc.getLocation(dir); - Block targetBlock = world.getBlock(loc.x,loc.y,loc.z); - if(targetBlock instanceof BlockLeaves) { + } + + protected void harvestUp(World world, BlockCoord bc, HarvestResult res, BaseHarvestTarget target) { + + if (!isInHarvestBounds(bc) || res.harvestedBlocks.contains(bc)) { + return; + } + + Block blk = world.getBlock(bc.x, bc.y, bc.z); + boolean isLeaves = blk instanceof BlockLeaves; + if (target.isTarget(blk, world.getBlockMetadata(bc.x, bc.y, bc.z)) || isLeaves) { + res.harvestedBlocks.add(bc); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir != ForgeDirection.DOWN) { + harvestUp(world, bc.getLocation(dir), res, target); + } + } + } else { + // check the sides for connected wood harvestAdjacentWood(world, bc, res, target); - } + // and another check for large oaks, where wood can be surrounded by leaves + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir.offsetY == 0) { + BlockCoord loc = bc.getLocation(dir); + Block targetBlock = world.getBlock(loc.x, loc.y, loc.z); + if (targetBlock instanceof BlockLeaves) { + harvestAdjacentWood(world, bc, res, target); + } + } + } } - } } - } - - private void harvestAdjacentWood(World world, BlockCoord bc, HarvestResult res, BaseHarvestTarget target) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir.offsetY == 0) { - BlockCoord loc = bc.getLocation(dir); - Block targetBlock = world.getBlock(loc.x, loc.y, loc.z); - if(target.isTarget(targetBlock, world.getBlockMetadata(loc.x, loc.y, loc.z))) { - harvestUp(world, bc.getLocation(dir), res, target); + private void harvestAdjacentWood(World world, BlockCoord bc, HarvestResult res, BaseHarvestTarget target) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir.offsetY == 0) { + BlockCoord loc = bc.getLocation(dir); + Block targetBlock = world.getBlock(loc.x, loc.y, loc.z); + if (target.isTarget(targetBlock, world.getBlockMetadata(loc.x, loc.y, loc.z))) { + harvestUp(world, bc.getLocation(dir), res, target); + } + } } - } - } - } - - private boolean isInHarvestBounds(BlockCoord bc) { - - int dist = Math.abs(origin.x - bc.x); - if(dist > horizontalRange) { - return false; - } - dist = Math.abs(origin.z - bc.z); - if(dist > horizontalRange) { - return false; - } - dist = Math.abs(origin.y - bc.y); - if(dist > verticalRange) { - return false; - } - return true; - } - - private static final class HarvestTarget extends BaseHarvestTarget - { - private final int woodMeta; - - HarvestTarget(Block wood, int woodMeta) { - super(wood); - this.woodMeta = woodMeta; } - boolean isTarget(Block blk, int meta) { - return super.isTarget(blk,meta) && ((meta & 3) == (woodMeta & 3)); - } - } + private boolean isInHarvestBounds(BlockCoord bc) { - private static class BaseHarvestTarget - { - private final Block wood; - - BaseHarvestTarget(Block wood) { - this.wood = wood; + int dist = Math.abs(origin.x - bc.x); + if (dist > horizontalRange) { + return false; + } + dist = Math.abs(origin.z - bc.z); + if (dist > horizontalRange) { + return false; + } + dist = Math.abs(origin.y - bc.y); + if (dist > verticalRange) { + return false; + } + return true; } - boolean isTarget(Block blk, int meta) { - return blk == wood; - } - } + private static final class HarvestTarget extends BaseHarvestTarget { + private final int woodMeta; + HarvestTarget(Block wood, int woodMeta) { + super(wood); + this.woodMeta = woodMeta; + } + + boolean isTarget(Block blk, int meta) { + return super.isTarget(blk, meta) && ((meta & 3) == (woodMeta & 3)); + } + } + + private static class BaseHarvestTarget { + private final Block wood; + + BaseHarvestTarget(Block wood) { + this.wood = wood; + } + + boolean isTarget(Block blk, int meta) { + return blk == wood; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java index 702a3d87..d624a31f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java +++ b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java @@ -1,31 +1,30 @@ package crazypants.enderio.machine.generator; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.AbstractPoweredMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.IInternalPowerProvider; +import net.minecraftforge.common.util.ForgeDirection; public abstract class AbstractGeneratorEntity extends AbstractPoweredMachineEntity implements IInternalPowerProvider { - //RF API Power + // RF API Power - public AbstractGeneratorEntity(SlotDefinition slotDefinition) { - super(slotDefinition); - } + public AbstractGeneratorEntity(SlotDefinition slotDefinition) { + super(slotDefinition); + } - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index b5ace06b..d7efcf23 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -1,13 +1,5 @@ package crazypants.enderio.machine.generator.combustion; -import java.util.Random; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; @@ -16,124 +8,134 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; +import java.util.Random; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockCombustionGenerator extends AbstractMachineBlock { - public static int renderId = -1; + public static int renderId = -1; - private IIcon overlayPullSides, overlayPullTopBottom, overlayDisabledNoCenter; + private IIcon overlayPullSides, overlayPullTopBottom, overlayDisabledNoCenter; - public static BlockCombustionGenerator create() { - PacketHandler.INSTANCE.registerMessage(PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT); + public static BlockCombustionGenerator create() { + PacketHandler.INSTANCE.registerMessage( + PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT); - BlockCombustionGenerator gen = new BlockCombustionGenerator(); - gen.init(); - return gen; - } - - protected BlockCombustionGenerator() { - super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class); - } - - @Override - public int getLightOpacity() { - return 0; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCombustionGenerator) { - return new ContainerCombustionEngine(player.inventory, (TileCombustionGenerator) te); + BlockCombustionGenerator gen = new BlockCombustionGenerator(); + gen.init(); + return gen; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCombustionGenerator) { - return new GuiCombustionGenerator(player.inventory, (TileCombustionGenerator) te); + protected BlockCombustionGenerator() { + super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_COMBUSTION_GEN; - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @SideOnly(Side.CLIENT) - @Override - protected void registerOverlayIcons(IIconRegister iIconRegister) { - super.registerOverlayIcons(iIconRegister); - overlayPullSides = iIconRegister.registerIcon("enderio:overlays/pullSides"); - overlayPullTopBottom = iIconRegister.registerIcon("enderio:overlays/pullTopBottom"); - overlayDisabledNoCenter = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter"); - } - - @Override - public IIcon getOverlayIconForMode(TileCombustionGenerator tile, ForgeDirection face, IoMode mode) { - if(face.offsetY == 0 || mode == IoMode.NONE) { - return super.getOverlayIconForMode(tile, face, mode); + @Override + public int getLightOpacity() { + return 0; } - return mode == IoMode.PULL ? face.offsetY == 0 ? overlayPullSides : overlayPullTopBottom : overlayDisabledNoCenter; - } - @Override - protected String getMachineFrontIconKey(boolean active) { - return getBackIconKey(active); - } - - @Override - protected String getModelIconKey(boolean active) { - return "enderio:combustionGenModel"; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - // If active, randomly throw some smoke around - if(isActive(world, x, y, z)) { - - TileEntity te = world.getTileEntity(x, y, z); - int facing = 3; - if(te instanceof AbstractMachineEntity) { - AbstractMachineEntity me = (AbstractMachineEntity) te; - facing = me.facing; - } - ForgeDirection dir = ForgeDirection.getOrientation(facing); - float startX = x + (dir.offsetX == 0 ? 0.5f : 0f); - float startY = y + 0.5f; - float startZ = z + (dir.offsetZ == 0 ? 0.5f : 0f); - - if(dir.offsetX == 1) { - startX++; - } else if(dir.offsetZ == 1) { - startZ++; - } - - for (int i = 0; i < 2; i++) { - float xOffset = 0; - float yOffset = 0; - float zOffset = 0; - world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCombustionGenerator) { + return new ContainerCombustionEngine(player.inventory, (TileCombustionGenerator) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCombustionGenerator) { + return new GuiCombustionGenerator(player.inventory, (TileCombustionGenerator) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_COMBUSTION_GEN; + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + overlayPullSides = iIconRegister.registerIcon("enderio:overlays/pullSides"); + overlayPullTopBottom = iIconRegister.registerIcon("enderio:overlays/pullTopBottom"); + overlayDisabledNoCenter = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter"); + } + + @Override + public IIcon getOverlayIconForMode(TileCombustionGenerator tile, ForgeDirection face, IoMode mode) { + if (face.offsetY == 0 || mode == IoMode.NONE) { + return super.getOverlayIconForMode(tile, face, mode); + } + return mode == IoMode.PULL + ? face.offsetY == 0 ? overlayPullSides : overlayPullTopBottom + : overlayDisabledNoCenter; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return getBackIconKey(active); + } + + @Override + protected String getModelIconKey(boolean active) { + return "enderio:combustionGenModel"; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // If active, randomly throw some smoke around + if (isActive(world, x, y, z)) { + + TileEntity te = world.getTileEntity(x, y, z); + int facing = 3; + if (te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity) te; + facing = me.facing; + } + ForgeDirection dir = ForgeDirection.getOrientation(facing); + float startX = x + (dir.offsetX == 0 ? 0.5f : 0f); + float startY = y + 0.5f; + float startZ = z + (dir.offsetZ == 0 ? 0.5f : 0f); + + if (dir.offsetX == 1) { + startX++; + } else if (dir.offsetZ == 1) { + startZ++; + } + + for (int i = 0; i < 2; i++) { + float xOffset = 0; + float yOffset = 0; + float zOffset = 0; + world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + } + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModel.java b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModel.java index 98efd26b..a89e7f93 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModel.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModel.java @@ -10,267 +10,267 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -//We're not going to use this anymore +// We're not going to use this anymore @Deprecated public class CombustionGeneratorModel extends ModelBase { - //fields - ModelRenderer Engine; - ModelRenderer Chamber1; - ModelRenderer Chamber2; - ModelRenderer Tesla1; - ModelRenderer Tesla2; - ModelRenderer Tesla3; - ModelRenderer Tesla4; - ModelRenderer Tesla5; - ModelRenderer Tesla6; - ModelRenderer Base; - ModelRenderer Base6; - ModelRenderer Base5; - ModelRenderer Base1; - ModelRenderer Base4; - ModelRenderer Base2; - ModelRenderer Base3; - ModelRenderer Support1; - ModelRenderer Chimney4; - ModelRenderer Support2; - ModelRenderer Chimney3; - ModelRenderer Support3; - ModelRenderer Chimney2; - ModelRenderer Support4; - ModelRenderer Chimney1; - ModelRenderer Chimney; + // fields + ModelRenderer Engine; + ModelRenderer Chamber1; + ModelRenderer Chamber2; + ModelRenderer Tesla1; + ModelRenderer Tesla2; + ModelRenderer Tesla3; + ModelRenderer Tesla4; + ModelRenderer Tesla5; + ModelRenderer Tesla6; + ModelRenderer Base; + ModelRenderer Base6; + ModelRenderer Base5; + ModelRenderer Base1; + ModelRenderer Base4; + ModelRenderer Base2; + ModelRenderer Base3; + ModelRenderer Support1; + ModelRenderer Chimney4; + ModelRenderer Support2; + ModelRenderer Chimney3; + ModelRenderer Support3; + ModelRenderer Chimney2; + ModelRenderer Support4; + ModelRenderer Chimney1; + ModelRenderer Chimney; - public CombustionGeneratorModel() { - textureWidth = 128; - textureHeight = 128; + public CombustionGeneratorModel() { + textureWidth = 128; + textureHeight = 128; - Engine = new ModelRenderer(this, 0, 32); - Engine.addBox(-7.5F, 0F, -7.5F, 15, 4, 15); - Engine.setRotationPoint(0F, 12F, 0F); - Engine.setTextureSize(256, 256); - Engine.mirror = true; - setRotation(Engine, 0F, 0F, 0F); + Engine = new ModelRenderer(this, 0, 32); + Engine.addBox(-7.5F, 0F, -7.5F, 15, 4, 15); + Engine.setRotationPoint(0F, 12F, 0F); + Engine.setTextureSize(256, 256); + Engine.mirror = true; + setRotation(Engine, 0F, 0F, 0F); - Chamber1 = new ModelRenderer(this, 0, 76); - Chamber1.mirror = true; - Chamber1.addBox(0F, -9F, -8F, 8, 9, 16); - Chamber1.setRotationPoint(8F, 13F, 0F); - Chamber1.setTextureSize(256, 256); - Chamber1.mirror = true; - setRotation(Chamber1, 0F, 0F, -1.466077F); - Chamber1.mirror = false; + Chamber1 = new ModelRenderer(this, 0, 76); + Chamber1.mirror = true; + Chamber1.addBox(0F, -9F, -8F, 8, 9, 16); + Chamber1.setRotationPoint(8F, 13F, 0F); + Chamber1.setTextureSize(256, 256); + Chamber1.mirror = true; + setRotation(Chamber1, 0F, 0F, -1.466077F); + Chamber1.mirror = false; - Chamber2 = new ModelRenderer(this, 0, 52); - Chamber2.mirror = true; - Chamber2.addBox(0F, -8F, -8F, 9, 8, 16); - Chamber2.setRotationPoint(-8F, 13F, 0F); - Chamber2.setTextureSize(256, 256); - Chamber2.mirror = true; - setRotation(Chamber2, 0F, 0F, -0.122173F); - Chamber2.mirror = false; + Chamber2 = new ModelRenderer(this, 0, 52); + Chamber2.mirror = true; + Chamber2.addBox(0F, -8F, -8F, 9, 8, 16); + Chamber2.setRotationPoint(-8F, 13F, 0F); + Chamber2.setTextureSize(256, 256); + Chamber2.mirror = true; + setRotation(Chamber2, 0F, 0F, -0.122173F); + Chamber2.mirror = false; - Tesla1 = new ModelRenderer(this, 34, 52); - Tesla1.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla1.setRotationPoint(5F, 4F, 5F); - Tesla1.setTextureSize(256, 256); - Tesla1.mirror = true; - setRotation(Tesla1, 0F, 0F, 0.1570796F); + Tesla1 = new ModelRenderer(this, 34, 52); + Tesla1.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla1.setRotationPoint(5F, 4F, 5F); + Tesla1.setTextureSize(256, 256); + Tesla1.mirror = true; + setRotation(Tesla1, 0F, 0F, 0.1570796F); - Tesla2 = new ModelRenderer(this, 34, 52); - Tesla2.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla2.setRotationPoint(5F, 4F, -5F); - Tesla2.setTextureSize(256, 256); - Tesla2.mirror = true; - setRotation(Tesla2, 0F, 0F, 0.1570796F); + Tesla2 = new ModelRenderer(this, 34, 52); + Tesla2.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla2.setRotationPoint(5F, 4F, -5F); + Tesla2.setTextureSize(256, 256); + Tesla2.mirror = true; + setRotation(Tesla2, 0F, 0F, 0.1570796F); - Tesla3 = new ModelRenderer(this, 34, 52); - Tesla3.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla3.setRotationPoint(5F, 4F, 0F); - Tesla3.setTextureSize(256, 256); - Tesla3.mirror = true; - setRotation(Tesla3, 0F, 0F, 0.1570796F); - Tesla4 = new ModelRenderer(this, 34, 52); - Tesla4.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla4.setRotationPoint(-5F, 4F, -5F); - Tesla4.setTextureSize(256, 256); - Tesla4.mirror = true; - setRotation(Tesla4, 0F, 0F, -0.1570796F); - Tesla5 = new ModelRenderer(this, 34, 52); - Tesla5.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla5.setRotationPoint(-5F, 4F, 5F); - Tesla5.setTextureSize(256, 256); - Tesla5.mirror = true; - setRotation(Tesla5, 0F, 0F, -0.1570796F); - Tesla6 = new ModelRenderer(this, 34, 52); - Tesla6.addBox(-1F, -4F, -1F, 2, 5, 2); - Tesla6.setRotationPoint(-5F, 4F, 0F); - Tesla6.setTextureSize(256, 256); - Tesla6.mirror = true; - setRotation(Tesla6, 0F, 0F, -0.1570796F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(-8F, -4F, -8F, 16, 4, 15); - Base.setRotationPoint(0F, 24F, 1F); - Base.setTextureSize(256, 256); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); + Tesla3 = new ModelRenderer(this, 34, 52); + Tesla3.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla3.setRotationPoint(5F, 4F, 0F); + Tesla3.setTextureSize(256, 256); + Tesla3.mirror = true; + setRotation(Tesla3, 0F, 0F, 0.1570796F); + Tesla4 = new ModelRenderer(this, 34, 52); + Tesla4.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla4.setRotationPoint(-5F, 4F, -5F); + Tesla4.setTextureSize(256, 256); + Tesla4.mirror = true; + setRotation(Tesla4, 0F, 0F, -0.1570796F); + Tesla5 = new ModelRenderer(this, 34, 52); + Tesla5.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla5.setRotationPoint(-5F, 4F, 5F); + Tesla5.setTextureSize(256, 256); + Tesla5.mirror = true; + setRotation(Tesla5, 0F, 0F, -0.1570796F); + Tesla6 = new ModelRenderer(this, 34, 52); + Tesla6.addBox(-1F, -4F, -1F, 2, 5, 2); + Tesla6.setRotationPoint(-5F, 4F, 0F); + Tesla6.setTextureSize(256, 256); + Tesla6.mirror = true; + setRotation(Tesla6, 0F, 0F, -0.1570796F); + Base = new ModelRenderer(this, 0, 0); + Base.addBox(-8F, -4F, -8F, 16, 4, 15); + Base.setRotationPoint(0F, 24F, 1F); + Base.setTextureSize(256, 256); + Base.mirror = true; + setRotation(Base, 0F, 0F, 0F); - Base6 = new ModelRenderer(this, 48, 4); - Base6.mirror = true; - Base6.addBox(-1F, -2F, -1F, 1, 2, 1); - Base6.setRotationPoint(2F, 23F, -7F); - Base6.setTextureSize(256, 256); - Base6.mirror = true; - setRotation(Base6, 0F, 0F, 0F); - Base6.mirror = false; + Base6 = new ModelRenderer(this, 48, 4); + Base6.mirror = true; + Base6.addBox(-1F, -2F, -1F, 1, 2, 1); + Base6.setRotationPoint(2F, 23F, -7F); + Base6.setTextureSize(256, 256); + Base6.mirror = true; + setRotation(Base6, 0F, 0F, 0F); + Base6.mirror = false; - Base5 = new ModelRenderer(this, 48, 4); - Base5.mirror = true; - Base5.addBox(-1F, -2F, -1F, 1, 2, 1); - Base5.setRotationPoint(-1F, 23F, -7F); - Base5.setTextureSize(256, 256); - Base5.mirror = true; - setRotation(Base5, 0F, 0F, 0F); - Base5.mirror = false; + Base5 = new ModelRenderer(this, 48, 4); + Base5.mirror = true; + Base5.addBox(-1F, -2F, -1F, 1, 2, 1); + Base5.setRotationPoint(-1F, 23F, -7F); + Base5.setTextureSize(256, 256); + Base5.mirror = true; + setRotation(Base5, 0F, 0F, 0F); + Base5.mirror = false; - Base1 = new ModelRenderer(this, 0, 0); - Base1.addBox(-2F, -4F, -1F, 4, 4, 1); - Base1.setRotationPoint(-6F, 24F, -7F); - Base1.setTextureSize(256, 256); - Base1.mirror = true; - setRotation(Base1, 0F, 0F, 0F); + Base1 = new ModelRenderer(this, 0, 0); + Base1.addBox(-2F, -4F, -1F, 4, 4, 1); + Base1.setRotationPoint(-6F, 24F, -7F); + Base1.setTextureSize(256, 256); + Base1.mirror = true; + setRotation(Base1, 0F, 0F, 0F); - Base4 = new ModelRenderer(this, 48, 0); - Base4.mirror = true; - Base4.addBox(-4F, -1F, -1F, 8, 1, 1); - Base4.setRotationPoint(0F, 24F, -7F); - Base4.setTextureSize(256, 256); - Base4.mirror = true; - setRotation(Base4, 0F, 0F, 0F); - Base4.mirror = false; + Base4 = new ModelRenderer(this, 48, 0); + Base4.mirror = true; + Base4.addBox(-4F, -1F, -1F, 8, 1, 1); + Base4.setRotationPoint(0F, 24F, -7F); + Base4.setTextureSize(256, 256); + Base4.mirror = true; + setRotation(Base4, 0F, 0F, 0F); + Base4.mirror = false; - Base2 = new ModelRenderer(this, 0, 0); - Base2.addBox(-2F, -4F, -1F, 4, 4, 1); - Base2.setRotationPoint(6F, 24F, -7F); - Base2.setTextureSize(256, 256); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); + Base2 = new ModelRenderer(this, 0, 0); + Base2.addBox(-2F, -4F, -1F, 4, 4, 1); + Base2.setRotationPoint(6F, 24F, -7F); + Base2.setTextureSize(256, 256); + Base2.mirror = true; + setRotation(Base2, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 48, 0); - Base3.mirror = true; - Base3.addBox(-4F, -1F, -1F, 8, 1, 1); - Base3.setRotationPoint(0F, 21F, -7F); - Base3.setTextureSize(256, 256); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base3.mirror = false; + Base3 = new ModelRenderer(this, 48, 0); + Base3.mirror = true; + Base3.addBox(-4F, -1F, -1F, 8, 1, 1); + Base3.setRotationPoint(0F, 21F, -7F); + Base3.setTextureSize(256, 256); + Base3.mirror = true; + setRotation(Base3, 0F, 0F, 0F); + Base3.mirror = false; - Support1 = new ModelRenderer(this, 0, 5); - Support1.addBox(-1F, -4F, -1F, 2, 4, 2); - Support1.setRotationPoint(-7F, 20F, -7F); - Support1.setTextureSize(256, 256); - Support1.mirror = true; - setRotation(Support1, 0F, 0F, 0F); + Support1 = new ModelRenderer(this, 0, 5); + Support1.addBox(-1F, -4F, -1F, 2, 4, 2); + Support1.setRotationPoint(-7F, 20F, -7F); + Support1.setTextureSize(256, 256); + Support1.mirror = true; + setRotation(Support1, 0F, 0F, 0F); - Chimney4 = new ModelRenderer(this, 25, 20); - Chimney4.mirror = true; - Chimney4.addBox(-3F, -4F, -1F, 6, 4, 1); - Chimney4.setRotationPoint(-4F, 20F, 0F); - Chimney4.setTextureSize(256, 256); - Chimney4.mirror = true; - setRotation(Chimney4, 0F, 1.570796F, 0F); - Chimney4.mirror = false; + Chimney4 = new ModelRenderer(this, 25, 20); + Chimney4.mirror = true; + Chimney4.addBox(-3F, -4F, -1F, 6, 4, 1); + Chimney4.setRotationPoint(-4F, 20F, 0F); + Chimney4.setTextureSize(256, 256); + Chimney4.mirror = true; + setRotation(Chimney4, 0F, 1.570796F, 0F); + Chimney4.mirror = false; - Support2 = new ModelRenderer(this, 0, 5); - Support2.addBox(-1F, -4F, -1F, 2, 4, 2); - Support2.setRotationPoint(7F, 20F, -7F); - Support2.setTextureSize(256, 256); - Support2.mirror = true; - setRotation(Support2, 0F, 0F, 0F); + Support2 = new ModelRenderer(this, 0, 5); + Support2.addBox(-1F, -4F, -1F, 2, 4, 2); + Support2.setRotationPoint(7F, 20F, -7F); + Support2.setTextureSize(256, 256); + Support2.mirror = true; + setRotation(Support2, 0F, 0F, 0F); - Chimney3 = new ModelRenderer(this, 25, 20); - Chimney3.mirror = true; - Chimney3.addBox(-3F, -4F, 0F, 6, 4, 1); - Chimney3.setRotationPoint(4F, 20F, 0F); - Chimney3.setTextureSize(256, 256); - Chimney3.mirror = true; - setRotation(Chimney3, 0F, 1.570796F, 0F); - Chimney3.mirror = false; + Chimney3 = new ModelRenderer(this, 25, 20); + Chimney3.mirror = true; + Chimney3.addBox(-3F, -4F, 0F, 6, 4, 1); + Chimney3.setRotationPoint(4F, 20F, 0F); + Chimney3.setTextureSize(256, 256); + Chimney3.mirror = true; + setRotation(Chimney3, 0F, 1.570796F, 0F); + Chimney3.mirror = false; - Support3 = new ModelRenderer(this, 0, 5); - Support3.addBox(-1F, -4F, -1F, 2, 4, 2); - Support3.setRotationPoint(-7F, 20F, 7F); - Support3.setTextureSize(256, 256); - Support3.mirror = true; - setRotation(Support3, 0F, 0F, 0F); + Support3 = new ModelRenderer(this, 0, 5); + Support3.addBox(-1F, -4F, -1F, 2, 4, 2); + Support3.setRotationPoint(-7F, 20F, 7F); + Support3.setTextureSize(256, 256); + Support3.mirror = true; + setRotation(Support3, 0F, 0F, 0F); - Chimney2 = new ModelRenderer(this, 25, 20); - Chimney2.addBox(-3F, -4F, 0F, 6, 4, 1); - Chimney2.setRotationPoint(0F, 20F, 4F); - Chimney2.setTextureSize(256, 256); - Chimney2.mirror = true; - setRotation(Chimney2, 0F, 0F, 0F); + Chimney2 = new ModelRenderer(this, 25, 20); + Chimney2.addBox(-3F, -4F, 0F, 6, 4, 1); + Chimney2.setRotationPoint(0F, 20F, 4F); + Chimney2.setTextureSize(256, 256); + Chimney2.mirror = true; + setRotation(Chimney2, 0F, 0F, 0F); - Support4 = new ModelRenderer(this, 0, 5); - Support4.addBox(-1F, -4F, -1F, 2, 4, 2); - Support4.setRotationPoint(7F, 20F, 7F); - Support4.setTextureSize(256, 256); - Support4.mirror = true; - setRotation(Support4, 0F, 0F, 0F); + Support4 = new ModelRenderer(this, 0, 5); + Support4.addBox(-1F, -4F, -1F, 2, 4, 2); + Support4.setRotationPoint(7F, 20F, 7F); + Support4.setTextureSize(256, 256); + Support4.mirror = true; + setRotation(Support4, 0F, 0F, 0F); - Chimney1 = new ModelRenderer(this, 25, 20); - Chimney1.addBox(-3F, -4F, -1F, 6, 4, 1); - Chimney1.setRotationPoint(0F, 20F, -4F); - Chimney1.setTextureSize(256, 256); - Chimney1.mirror = true; - setRotation(Chimney1, 0F, 0F, 0F); + Chimney1 = new ModelRenderer(this, 25, 20); + Chimney1.addBox(-3F, -4F, -1F, 6, 4, 1); + Chimney1.setRotationPoint(0F, 20F, -4F); + Chimney1.setTextureSize(256, 256); + Chimney1.mirror = true; + setRotation(Chimney1, 0F, 0F, 0F); - Chimney = new ModelRenderer(this, 0, 20); - Chimney.addBox(-4F, -4F, -4F, 8, 4, 8); - Chimney.setRotationPoint(0F, 20F, 0F); - Chimney.setTextureSize(256, 256); - Chimney.mirror = true; - setRotation(Chimney, 0F, 0F, 0F); - } + Chimney = new ModelRenderer(this, 0, 20); + Chimney.addBox(-4F, -4F, -4F, 8, 4, 8); + Chimney.setRotationPoint(0F, 20F, 0F); + Chimney.setTextureSize(256, 256); + Chimney.mirror = true; + setRotation(Chimney, 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); - Engine.render(f5); - Chamber1.render(f5); - Chamber2.render(f5); - Tesla1.render(f5); - Tesla2.render(f5); - Tesla3.render(f5); - Tesla4.render(f5); - Tesla5.render(f5); - Tesla6.render(f5); - Base.render(f5); - Base6.render(f5); - Base5.render(f5); - Base1.render(f5); - Base4.render(f5); - Base2.render(f5); - Base3.render(f5); - Support1.render(f5); - Chimney4.render(f5); - Support2.render(f5); - Chimney3.render(f5); - Support3.render(f5); - Chimney2.render(f5); - Support4.render(f5); - Chimney1.render(f5); - Chimney.render(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); + Engine.render(f5); + Chamber1.render(f5); + Chamber2.render(f5); + Tesla1.render(f5); + Tesla2.render(f5); + Tesla3.render(f5); + Tesla4.render(f5); + Tesla5.render(f5); + Tesla6.render(f5); + Base.render(f5); + Base6.render(f5); + Base5.render(f5); + Base1.render(f5); + Base4.render(f5); + Base2.render(f5); + Base3.render(f5); + Support1.render(f5); + Chimney4.render(f5); + Support2.render(f5); + Chimney3.render(f5); + Support3.render(f5); + Chimney2.render(f5); + Support4.render(f5); + Chimney1.render(f5); + Chimney.render(f5); + } - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = 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 f2, float f3, float f4, float f5) - // { - // super.setRotationAngles(f, f1, f2, f3, f4, f5); - // } + // public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) + // { + // super.setRotationAngles(f, f1, f2, f3, f4, f5); + // } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java index 57b0b748..47c38b23 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/CombustionGeneratorModelRenderer.java @@ -1,5 +1,8 @@ package crazypants.enderio.machine.generator.combustion; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,112 +12,99 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) @Deprecated public class CombustionGeneratorModelRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final String TEXTURE = "enderio:models/combustionGenerator.png"; + private static final String TEXTURE = "enderio:models/combustionGenerator.png"; - private CombustionGeneratorModel model = new CombustionGeneratorModel(); + private CombustionGeneratorModel model = new CombustionGeneratorModel(); - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - World world = te.getWorldObj(); - TileCombustionGenerator gen = (TileCombustionGenerator)te; -// GL11.glEnable(GL11.GL_LIGHTING); -// GL11.glEnable(GL12.GL_RESCALE_NORMAL); -// GL11.glDisable(GL11.GL_CULL_FACE); + World world = te.getWorldObj(); + TileCombustionGenerator gen = (TileCombustionGenerator) te; + // GL11.glEnable(GL11.GL_LIGHTING); + // GL11.glEnable(GL12.GL_RESCALE_NORMAL); + // GL11.glDisable(GL11.GL_CULL_FACE); + float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - - - float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - - - GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y, (float)z); - renderModel(gen.facing); - GL11.glPopMatrix(); - } - - private void renderModel(int facing) { - - GL11.glPushMatrix(); - - GL11.glTranslatef(0.5F, 1, 0.5F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glScalef(1, 0.667f, 1); - - ForgeDirection dir = ForgeDirection.getOrientation(facing); - if(dir == ForgeDirection.SOUTH) { - facing = 0; - - } else if(dir == ForgeDirection.WEST) { - facing = -1; + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + renderModel(gen.facing); + GL11.glPopMatrix(); } - GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(TEXTURE); - model.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + private void renderModel(int facing) { - GL11.glTranslatef(-0.5F, -1, -0.5F); - GL11.glPopMatrix(); + GL11.glPushMatrix(); - } + GL11.glTranslatef(0.5F, 1, 0.5F); + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glScalef(1, 0.667f, 1); - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } + ForgeDirection dir = ForgeDirection.getOrientation(facing); + if (dir == ForgeDirection.SOUTH) { + facing = 0; - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } + } else if (dir == ForgeDirection.WEST) { + facing = -1; + } + GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { -// if(true) { -// switch (type) { -// case ENTITY: -// renderItem(0f, 0f, 0f); -// return; -// case EQUIPPED: -// case EQUIPPED_FIRST_PERSON: -// renderItem(0f, 1f, 1f); -// return; -// case INVENTORY: -// renderItem(0f, 0f, 0f); -// return; -// default: -// renderItem(0f, 0f, 0f); -// return; -// } -// } else { - renderItem(0, 0, 0); -// } - } + RenderUtil.bindTexture(TEXTURE); + model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - private void renderItem(float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - renderModel(ForgeDirection.NORTH.ordinal()); - GL11.glPopMatrix(); - } + GL11.glTranslatef(-0.5F, -1, -0.5F); + GL11.glPopMatrix(); + } + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + // if(true) { + // switch (type) { + // case ENTITY: + // renderItem(0f, 0f, 0f); + // return; + // case EQUIPPED: + // case EQUIPPED_FIRST_PERSON: + // renderItem(0f, 1f, 1f); + // return; + // case INVENTORY: + // renderItem(0f, 0f, 0f); + // return; + // default: + // renderItem(0f, 0f, 0f); + // return; + // } + // } else { + renderItem(0, 0, 0); + // } + } + + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + renderModel(ForgeDirection.NORTH.ordinal()); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java b/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java index 1c9de92f..700ad62a 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java @@ -1,17 +1,15 @@ package crazypants.enderio.machine.generator.combustion; -import net.minecraft.entity.player.InventoryPlayer; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.gui.AbstractMachineContainer; +import net.minecraft.entity.player.InventoryPlayer; public class ContainerCombustionEngine extends AbstractMachineContainer { - public ContainerCombustionEngine(InventoryPlayer playerInv, AbstractMachineEntity te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - } + public ContainerCombustionEngine(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) {} } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 1aac62a7..43104b31 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -1,157 +1,183 @@ package crazypants.enderio.machine.generator.combustion; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiCombustionGenerator extends GuiPoweredMachineBase { - public GuiCombustionGenerator(InventoryPlayer par1InventoryPlayer, TileCombustionGenerator te) { - super(te, new ContainerCombustionEngine(par1InventoryPlayer, te), "combustionGen"); + public GuiCombustionGenerator(InventoryPlayer par1InventoryPlayer, TileCombustionGenerator te) { + super(te, new ContainerCombustionEngine(par1InventoryPlayer, te), "combustionGen"); - addToolTip(new GuiToolTip(new Rectangle(114, 21, 15, 47), "") { + addToolTip(new GuiToolTip(new Rectangle(114, 21, 15, 47), "") { - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("combustionGenerator.coolantTank"); - if(getTileEntity().getCoolantTank().getFluid() != null) { - heading += ": " + getTileEntity().getCoolantTank().getFluid().getLocalizedName(); + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("combustionGenerator.coolantTank"); + if (getTileEntity().getCoolantTank().getFluid() != null) { + heading += + ": " + getTileEntity().getCoolantTank().getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().getCoolantTank())); + } + }); + + addToolTip(new GuiToolTip(new Rectangle(48, 21, 15, 47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("combustionGenerator.fuelTank"); + if (getTileEntity().getFuelTank().getFluid() != null) { + heading += ": " + getTileEntity().getFuelTank().getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().getFuelTank())); + } + }); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + public void renderSlotHighlights(IoMode mode) { + super.renderSlotHighlights(mode); + + if (mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { + int x = 48 - 2; + int y = 21 - 2; + int w = 15 + 4; + int h = 47 + 4; + renderSlotHighlight(PULL_COLOR, x, y, w, h); + x = 114 - 2; + renderSlotHighlight(PULL_COLOR, x, y, w, h); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().getCoolantTank())); - } + } - }); + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + TileCombustionGenerator gen = getTileEntity(); - addToolTip(new GuiToolTip(new Rectangle(48, 21, 15, 47), "") { - - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("combustionGenerator.fuelTank"); - if(getTileEntity().getFuelTank().getFluid() != null) { - heading += ": " + getTileEntity().getFuelTank().getFluid().getLocalizedName(); + FontRenderer fr = getFontRenderer(); + int output = 0; + if (gen.isActive()) { + output = gen.getGeneratedLastTick(); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().getFuelTank())); - } + String txt = EnderIO.lang.localize("combustionGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + int sw = fr.getStringWidth(txt); + fr.drawStringWithShadow( + txt, guiLeft + xSize / 2 - sw / 2, guiTop + fr.FONT_HEIGHT / 2 + 3, ColorUtil.getRGB(Color.WHITE)); - }); + int x = guiLeft + 48; + int y = guiTop + 21; + if (gen.getCoolantTank().getFluidAmount() > 0) { + x = guiLeft + 114; + // right tank + RenderUtil.renderGuiTank( + gen.getCoolantTank().getFluid(), + 4000, + gen.getCoolantTank().getFluidAmount() - 1000, + x, + y, + zLevel, + 15, + 47); - } + if (gen.isActive()) { + txt = gen.getNumTicksPerMbCoolant() + " " + EnderIO.lang.localize("power.tmb"); + sw = fr.getStringWidth(txt); + fr.drawStringWithShadow( + txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 47, ColorUtil.getRGB(Color.WHITE)); + } - @Override - protected boolean showRecipeButton() { - return false; - } + x = guiLeft + 72; + y = guiTop + 14; + // center coolant chamber + RenderUtil.renderGuiTank( + gen.getCoolantTank().getFluid(), + 1000, + Math.min(gen.getCoolantTank().getFluidAmount(), 1000), + x, + y + 14, + zLevel, + 33, + 33); + // draw some gui over the top again to make the center shape + bindGuiTexture(); + drawTexturedModalRect(x, y + 14, 0, 223, 33, 33); + y += 7; + } - @Override - public void renderSlotHighlights(IoMode mode) { - super.renderSlotHighlights(mode); + if (gen.getFuelTank().getFluidAmount() > 0) { + // left tank + x = guiLeft + 48; - if(mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { - int x = 48 - 2; - int y = 21 - 2; - int w = 15 + 4; - int h = 47 + 4; - renderSlotHighlight(PULL_COLOR, x, y, w, h); - x = 114 - 2; - renderSlotHighlight(PULL_COLOR, x, y, w, h); + RenderUtil.renderGuiTank( + gen.getFuelTank().getFluid(), + 4000, + gen.getFuelTank().getFluidAmount() - 1000, + x, + y, + zLevel, + 15, + 47); + + if (gen.isActive()) { + txt = gen.getNumTicksPerMbFuel() + " " + EnderIO.lang.localize("power.tmb"); + sw = fr.getStringWidth(txt); + fr.drawStringWithShadow( + txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 47, ColorUtil.getRGB(Color.WHITE)); + } + + // center tank + RenderUtil.renderGuiTank( + gen.getFuelTank().getFluid(), + 1000, + Math.min(gen.getFuelTank().getFluidAmount(), 1000), + guiLeft + 81, + guiTop + 38, + zLevel, + 14, + 14); + } + + bindGuiTexture(); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - TileCombustionGenerator gen = getTileEntity(); - - FontRenderer fr = getFontRenderer(); - int output = 0; - if(gen.isActive()) { - output = gen.getGeneratedLastTick(); - } - String txt = EnderIO.lang.localize("combustionGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr(); - int sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, guiTop + fr.FONT_HEIGHT / 2 + 3, ColorUtil.getRGB(Color.WHITE)); - - int x = guiLeft + 48; - int y = guiTop + 21; - if(gen.getCoolantTank().getFluidAmount() > 0) { - x = guiLeft + 114; - //right tank - RenderUtil.renderGuiTank(gen.getCoolantTank().getFluid(), 4000, gen.getCoolantTank().getFluidAmount() - 1000, x, y, zLevel, 15, 47); - - if(gen.isActive()) { - txt = gen.getNumTicksPerMbCoolant() + " " + EnderIO.lang.localize("power.tmb"); - sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 47, ColorUtil.getRGB(Color.WHITE)); - } - - x = guiLeft + 72; - y = guiTop + 14; - //center coolant chamber - RenderUtil.renderGuiTank(gen.getCoolantTank().getFluid(), 1000, Math.min(gen.getCoolantTank().getFluidAmount(), 1000), x, y + 14, zLevel, 33, 33); - //draw some gui over the top again to make the center shape - bindGuiTexture(); - drawTexturedModalRect(x, y + 14, 0, 223, 33, 33); - y += 7; + @Override + protected int getPowerX() { + return 10; } - if(gen.getFuelTank().getFluidAmount() > 0) { - //left tank - x = guiLeft + 48; - - RenderUtil.renderGuiTank(gen.getFuelTank().getFluid(), 4000, gen.getFuelTank().getFluidAmount() - 1000, x, y, zLevel, 15, 47); - - if(gen.isActive()) { - txt = gen.getNumTicksPerMbFuel() + " " + EnderIO.lang.localize("power.tmb"); - sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 47, ColorUtil.getRGB(Color.WHITE)); - } - - //center tank - RenderUtil - .renderGuiTank(gen.getFuelTank().getFluid(), 1000, Math.min(gen.getFuelTank().getFluidAmount(), 1000), guiLeft + 81, guiTop + 38, zLevel, 14, 14); + @Override + protected int getPowerY() { + return 13; } - bindGuiTexture(); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - - @Override - protected int getPowerX() { - return 10; - } - - @Override - protected int getPowerY() { - return 13; - } - - @Override - protected int getPowerHeight() { - return 60; - } - -} \ No newline at end of file + @Override + protected int getPowerHeight() { + return 60; + } +} diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java index 83147b32..7785a756 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/PacketCombustionTank.java @@ -1,53 +1,51 @@ package crazypants.enderio.machine.generator.combustion; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.util.ClientUtil; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; -public class PacketCombustionTank extends MessageTileEntity implements IMessageHandler { +public class PacketCombustionTank extends MessageTileEntity + implements IMessageHandler { - public NBTTagCompound nbtRoot; + public NBTTagCompound nbtRoot; - public PacketCombustionTank() { - } + public PacketCombustionTank() {} - public PacketCombustionTank(TileCombustionGenerator tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.getCoolantTank().getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.getCoolantTank().writeToNBT(tankRoot); - nbtRoot.setTag("coolantTank", tankRoot); + public PacketCombustionTank(TileCombustionGenerator tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + if (tile.getCoolantTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.getCoolantTank().writeToNBT(tankRoot); + nbtRoot.setTag("coolantTank", tankRoot); + } + if (tile.getFuelTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.getFuelTank().writeToNBT(tankRoot); + nbtRoot.setTag("fuelTank", tankRoot); + } } - if(tile.getFuelTank().getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.getFuelTank().writeToNBT(tankRoot); - nbtRoot.setTag("fuelTank", tankRoot); + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - @Override - public IMessage onMessage(PacketCombustionTank message, MessageContext ctx) { - ClientUtil.setTankNBT(message, message.x, message.y, message.z); - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + nbtRoot = NetworkUtil.readNBTTagCompound(buf); + } + @Override + public IMessage onMessage(PacketCombustionTank message, MessageContext ctx) { + ClientUtil.setTankNBT(message, message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index c1b15f03..cbc6269c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -1,5 +1,17 @@ package crazypants.enderio.machine.generator.combustion; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import crazypants.enderio.ModObject; +import crazypants.enderio.fluid.FluidFuelRegister; +import crazypants.enderio.fluid.IFluidCoolant; +import crazypants.enderio.fluid.IFluidFuel; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.AbstractGeneratorEntity; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDistributor; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,435 +23,424 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; - -import crazypants.enderio.ModObject; -import crazypants.enderio.fluid.FluidFuelRegister; -import crazypants.enderio.fluid.IFluidCoolant; -import crazypants.enderio.fluid.IFluidFuel; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.AbstractGeneratorEntity; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerDistributor; - public class TileCombustionGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess { - private final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); - private final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); - private boolean tanksDirty; + private final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); + private final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); + private boolean tanksDirty; - private int ticksRemaingFuel; - private int ticksRemaingCoolant; - private boolean active; + private int ticksRemaingFuel; + private int ticksRemaingCoolant; + private boolean active; - private PowerDistributor powerDis; + private PowerDistributor powerDis; - private int generated; + private int generated; - private boolean inPause = false; - - private boolean generatedDirty = false; + private boolean inPause = false; - private int maxOutputTick = 1280; + private boolean generatedDirty = false; - private static int IO_MB_TICK = 250; + private int maxOutputTick = 1280; - private IFluidFuel curFuel; - private IFluidCoolant curCoolant; + private static int IO_MB_TICK = 250; - public TileCombustionGenerator() { - super(new SlotDefinition(-1, -1, -1, -1, -1, -1)); - } + private IFluidFuel curFuel; + private IFluidCoolant curCoolant; - @Override - protected boolean doPull(ForgeDirection dir) { - boolean res = super.doPull(dir); - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0) { - if(canFill(dir, info.fluid.getFluid())) { - FluidStack canPull = info.fluid.copy(); - canPull.amount = Math.min(IO_MB_TICK, canPull.amount); - FluidStack drained = target.drain(dir.getOpposite(), canPull, false); - if(drained != null && drained.amount > 0) { - int filled = fill(dir, drained, false); - if(filled > 0) { - drained = target.drain(dir.getOpposite(), filled, true); - fill(dir, drained, true); - return res; + public TileCombustionGenerator() { + super(new SlotDefinition(-1, -1, -1, -1, -1, -1)); + } + + @Override + protected boolean doPull(ForgeDirection dir) { + boolean res = super.doPull(dir); + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { + FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + if (infos != null) { + for (FluidTankInfo info : infos) { + if (info.fluid != null && info.fluid.amount > 0) { + if (canFill(dir, info.fluid.getFluid())) { + FluidStack canPull = info.fluid.copy(); + canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + FluidStack drained = target.drain(dir.getOpposite(), canPull, false); + if (drained != null && drained.amount > 0) { + int filled = fill(dir, drained, false); + if (filled > 0) { + drained = target.drain(dir.getOpposite(), filled, true); + fill(dir, drained, true); + return res; + } + } + } + } } - } } - } } - } + + return res; } - return res; - } - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; - } - - @Override - public String getMachineName() { - return ModObject.blockCombustionGenerator.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public boolean isActive() { - return active; - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { - return 0; - } - int res = 0; - - IFluidCoolant cool = FluidFuelRegister.instance.getCoolant(resource.getFluid()); - if(cool != null) { - res = getCoolantTank().fill(resource, doFill); - } else { - IFluidFuel f = FluidFuelRegister.instance.getFuel(resource.getFluid()); - if(f != null) { - res = getFuelTank().fill(resource, doFill); - } - } - if(res > 0) { - tanksDirty = true; - } - return res; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - @Override - public void onNeighborBlockChange(Block blockId) { - super.onNeighborBlockChange(blockId); - if(powerDis != null) { - powerDis.neighboursChanged(); - } - } - - @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - boolean res = false; - - if(!redstoneChecksPassed) { - if(active) { - active = false; - res = true; - } - return res; - } else { - - int lastGenerated = generated; - - boolean isActive = generateEnergy(); - if(isActive != active) { - active = isActive; - res = true; - } - if(lastGenerated != generated) { - generatedDirty = true; - } - - if(getEnergyStored() >= getMaxEnergyStored()) { - inPause = true; - } - - transmitEnergy(); + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; } - if(tanksDirty && shouldDoWorkThisTick(10)) { - PacketHandler.sendToAllAround(new PacketCombustionTank(this), this); - tanksDirty = false; - } - - if(generatedDirty && shouldDoWorkThisTick(10)) { - generatedDirty = false; - res = true; + @Override + public String getMachineName() { + return ModObject.blockCombustionGenerator.unlocalisedName; } - return res; - } - - private boolean transmitEnergy() { - if(getEnergyStored() <= 0) { - return false; - } - if(powerDis == null) { - powerDis = new PowerDistributor(new BlockCoord(this)); - } - int transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, getEnergyStored())); - setEnergyStored(getEnergyStored() - transmitted); - return transmitted > 0; - } - - private boolean generateEnergy() { - - generated = 0; - - if((ticksRemaingCoolant <= 0 && getCoolantTank().getFluidAmount() <= 0) || - (ticksRemaingFuel <= 0 && getFuelTank().getFluidAmount() <= 0) || - getEnergyStored() >= getMaxEnergyStored()) { - return false; - } - - //once full, don't start again until we have drained 10 seconds worth of power to prevent - //flickering on and off constantly when powering a machine that draws less than this produces - if(inPause) { - int powerPerCycle = getPowerPerCycle(); - if (getEnergyStored() >= (getMaxEnergyStored() - (powerPerCycle * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { return false; - } } - inPause = false; - ticksRemaingFuel--; - if(ticksRemaingFuel <= 0) { - curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); - if(curFuel == null) { + @Override + public boolean isActive() { + return active; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (resource == null || resource.getFluid() == null || !canFill(from, resource.getFluid())) { + return 0; + } + int res = 0; + + IFluidCoolant cool = FluidFuelRegister.instance.getCoolant(resource.getFluid()); + if (cool != null) { + res = getCoolantTank().fill(resource, doFill); + } else { + IFluidFuel f = FluidFuelRegister.instance.getFuel(resource.getFluid()); + if (f != null) { + res = getFuelTank().fill(resource, doFill); + } + } + if (res > 0) { + tanksDirty = true; + } + return res; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } + + @Override + public void onNeighborBlockChange(Block blockId) { + super.onNeighborBlockChange(blockId); + if (powerDis != null) { + powerDis.neighboursChanged(); + } + } + + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { + boolean res = false; + + if (!redstoneChecksPassed) { + if (active) { + active = false; + res = true; + } + return res; + } else { + + int lastGenerated = generated; + + boolean isActive = generateEnergy(); + if (isActive != active) { + active = isActive; + res = true; + } + if (lastGenerated != generated) { + generatedDirty = true; + } + + if (getEnergyStored() >= getMaxEnergyStored()) { + inPause = true; + } + + transmitEnergy(); + } + + if (tanksDirty && shouldDoWorkThisTick(10)) { + PacketHandler.sendToAllAround(new PacketCombustionTank(this), this); + tanksDirty = false; + } + + if (generatedDirty && shouldDoWorkThisTick(10)) { + generatedDirty = false; + res = true; + } + + return res; + } + + private boolean transmitEnergy() { + if (getEnergyStored() <= 0) { + return false; + } + if (powerDis == null) { + powerDis = new PowerDistributor(new BlockCoord(this)); + } + int transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, getEnergyStored())); + setEnergyStored(getEnergyStored() - transmitted); + return transmitted > 0; + } + + private boolean generateEnergy() { + + generated = 0; + + if ((ticksRemaingCoolant <= 0 && getCoolantTank().getFluidAmount() <= 0) + || (ticksRemaingFuel <= 0 && getFuelTank().getFluidAmount() <= 0) + || getEnergyStored() >= getMaxEnergyStored()) { + return false; + } + + // once full, don't start again until we have drained 10 seconds worth of power to prevent + // flickering on and off constantly when powering a machine that draws less than this produces + if (inPause) { + int powerPerCycle = getPowerPerCycle(); + if (getEnergyStored() >= (getMaxEnergyStored() - (powerPerCycle * 200)) + && getEnergyStored() > (getMaxEnergyStored() / 8)) { + return false; + } + } + inPause = false; + + ticksRemaingFuel--; + if (ticksRemaingFuel <= 0) { + curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); + if (curFuel == null) { + return false; + } + FluidStack drained = getFuelTank().drain(100, true); + if (drained == null) { + return false; + } + ticksRemaingFuel = getNumTicksPerMbFuel(curFuel) * drained.amount; + + tanksDirty = true; + } else if (curFuel == null) { + curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); + if (curFuel == null) { + return false; + } + } + + ticksRemaingCoolant--; + if (ticksRemaingCoolant <= 0) { + updateCoolantFromTank(); + if (curCoolant == null) { + return false; + } + FluidStack drained = getCoolantTank().drain(100, true); + if (drained == null) { + return false; + } + ticksRemaingCoolant = getNumTicksPerMbCoolant(curCoolant, curFuel) * drained.amount; + } else if (curCoolant == null) { + updateCoolantFromTank(); + if (curCoolant == null) { + return false; + } + } + + generated = getPowerPerCycle(); + setEnergyStored(getEnergyStored() + generated); + + return getFuelTank().getFluidAmount() > 0 && getCoolantTank().getFluidAmount() > 0; + } + + protected void updateCoolantFromTank() { + curCoolant = FluidFuelRegister.instance.getCoolant(getCoolantTank().getFluid()); + } + + private int getPowerPerCycle() { + return curFuel == null ? 0 : curFuel.getPowerPerCycle(); + } + + public int getNumTicksPerMbFuel() { + if (getFuelTank().getFluidAmount() <= 0) { + return 0; + } + return getNumTicksPerMbFuel( + FluidFuelRegister.instance.getFuel(getFuelTank().getFluid().getFluid())); + } + + public int getNumTicksPerMbCoolant() { + if (getFuelTank().getFluidAmount() <= 0) { + return 0; + } + if (worldObj.isRemote) { + curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); + updateCoolantFromTank(); + } + return getNumTicksPerMbCoolant(curCoolant, curFuel); + } + + static int getNumTicksPerMbFuel(IFluidFuel fuel) { + if (fuel == null) { + return 0; + } + return fuel.getTotalBurningTime() / 1000; + } + + public static float HEAT_PER_RF = 0.00023F; + + static int getNumTicksPerMbCoolant(IFluidCoolant coolant, IFluidFuel fuel) { + if (coolant == null || fuel == null) { + return 0; + } + float power = fuel.getPowerPerCycle(); + float cooling = coolant.getDegreesCoolingPerMB(100); + double toCool = 1d / (HEAT_PER_RF * power); + int numTicks = (int) Math.round(toCool / (cooling * 1000)); + return numTicks; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (isSideDisabled(from.ordinal()) || fluid == null) { + return false; + } + return FluidFuelRegister.instance.getCoolant(fluid) != null + || FluidFuelRegister.instance.getFuel(fluid) != null; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { return false; - } - FluidStack drained = getFuelTank().drain(100, true); - if(drained == null) { - return false; - } - ticksRemaingFuel = getNumTicksPerMbFuel(curFuel) * drained.amount; - - tanksDirty = true; - } else if(curFuel == null) { - curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); - if(curFuel == null) { - return false; - } } - ticksRemaingCoolant--; - if(ticksRemaingCoolant <= 0) { - updateCoolantFromTank(); - if(curCoolant == null) { - return false; - } - FluidStack drained = getCoolantTank().drain(100, true); - if(drained == null) { - return false; - } - ticksRemaingCoolant = getNumTicksPerMbCoolant(curCoolant, curFuel) * drained.amount; - } else if(curCoolant == null) { - updateCoolantFromTank(); - if(curCoolant == null) { - return false; - } + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (isSideDisabled(from.ordinal())) { + return new FluidTankInfo[0]; + } + return new FluidTankInfo[] {getCoolantTank().getInfo(), getFuelTank().getInfo()}; } - - generated = getPowerPerCycle(); - setEnergyStored(getEnergyStored() + generated); - - return getFuelTank().getFluidAmount() > 0 && getCoolantTank().getFluidAmount() > 0; - } - - protected void updateCoolantFromTank() { - curCoolant = FluidFuelRegister.instance.getCoolant(getCoolantTank().getFluid()); - } - - private int getPowerPerCycle() { - return curFuel == null ? 0 : curFuel.getPowerPerCycle(); - } - - public int getNumTicksPerMbFuel() { - if(getFuelTank().getFluidAmount() <= 0) { - return 0; - } - return getNumTicksPerMbFuel(FluidFuelRegister.instance.getFuel(getFuelTank().getFluid().getFluid())); - } - - public int getNumTicksPerMbCoolant() { - if(getFuelTank().getFluidAmount() <= 0) { - return 0; - } - if(worldObj.isRemote) { - curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); - updateCoolantFromTank(); - } - return getNumTicksPerMbCoolant(curCoolant, curFuel); - } - - static int getNumTicksPerMbFuel(IFluidFuel fuel) { - if(fuel == null) { - return 0; - } - return fuel.getTotalBurningTime() / 1000; - } - - public static float HEAT_PER_RF = 0.00023F; - - static int getNumTicksPerMbCoolant(IFluidCoolant coolant, IFluidFuel fuel) { - if(coolant == null || fuel == null) { - return 0; - } - float power = fuel.getPowerPerCycle(); - float cooling = coolant.getDegreesCoolingPerMB(100); - double toCool = 1d / (HEAT_PER_RF * power); - int numTicks = (int) Math.round(toCool / (cooling * 1000)); - return numTicks; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(isSideDisabled(from.ordinal()) || fluid == null) { - return false; - } - return FluidFuelRegister.instance.getCoolant(fluid) != null || FluidFuelRegister.instance.getFuel(fluid) != null; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(isSideDisabled(from.ordinal())) { - return new FluidTankInfo[0]; - } - return new FluidTankInfo[] { getCoolantTank().getInfo(), getFuelTank().getInfo() }; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - active = nbtRoot.getBoolean("active"); - generated = nbtRoot.getInteger("generatedRF"); - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - if(nbtRoot.hasKey("coolantTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("coolantTank"); - if(tankRoot != null) { - getCoolantTank().readFromNBT(tankRoot); - } else { - getCoolantTank().setFluid(null); - } - } else { - getCoolantTank().setFluid(null); + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + active = nbtRoot.getBoolean("active"); + generated = nbtRoot.getInteger("generatedRF"); } - if(nbtRoot.hasKey("fuelTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); - if(tankRoot != null) { - getFuelTank().readFromNBT(tankRoot); - } else { - getFuelTank().setFluid(null); - } - } else { - getFuelTank().setFluid(null); + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + if (nbtRoot.hasKey("coolantTank")) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("coolantTank"); + if (tankRoot != null) { + getCoolantTank().readFromNBT(tankRoot); + } else { + getCoolantTank().setFluid(null); + } + } else { + getCoolantTank().setFluid(null); + } + + if (nbtRoot.hasKey("fuelTank")) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("fuelTank"); + if (tankRoot != null) { + getFuelTank().readFromNBT(tankRoot); + } else { + getFuelTank().setFluid(null); + } + } else { + getFuelTank().setFluid(null); + } + + ticksRemaingFuel = nbtRoot.getInteger("ticksRemaingFuel"); + ticksRemaingCoolant = nbtRoot.getInteger("ticksRemaingCoolant"); } - ticksRemaingFuel = nbtRoot.getInteger("ticksRemaingFuel"); - ticksRemaingCoolant = nbtRoot.getInteger("ticksRemaingCoolant"); - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - if(getCoolantTank().getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - getCoolantTank().writeToNBT(tankRoot); - nbtRoot.setTag("coolantTank", tankRoot); + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + if (getCoolantTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + getCoolantTank().writeToNBT(tankRoot); + nbtRoot.setTag("coolantTank", tankRoot); + } + if (getFuelTank().getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + getFuelTank().writeToNBT(tankRoot); + nbtRoot.setTag("fuelTank", tankRoot); + } + nbtRoot.setInteger("ticksRemaingFuel", ticksRemaingFuel); + nbtRoot.setInteger("ticksRemaingCoolant", ticksRemaingCoolant); } - if(getFuelTank().getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - getFuelTank().writeToNBT(tankRoot); - nbtRoot.setTag("fuelTank", tankRoot); + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("active", active); + nbtRoot.setInteger("generatedRF", generated); } - nbtRoot.setInteger("ticksRemaingFuel", ticksRemaingFuel); - nbtRoot.setInteger("ticksRemaingCoolant", ticksRemaingCoolant); - } - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("active", active); - nbtRoot.setInteger("generatedRF", generated); - } - - public int getGeneratedLastTick() { - if(!active) { - return 0; + public int getGeneratedLastTick() { + if (!active) { + return 0; + } + return generated; } - return generated; - } - @Override - public int getPowerUsePerTick() { - if(getFuelTank().getFluidAmount() <= 0) { - return 0; + @Override + public int getPowerUsePerTick() { + if (getFuelTank().getFluidAmount() <= 0) { + return 0; + } + IFluidFuel fuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); + if (fuel == null) { + return 0; + } + return fuel.getPowerPerCycle(); } - IFluidFuel fuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid()); - if(fuel == null) { - return 0; - } - return fuel.getPowerPerCycle(); - } - public FluidTank getCoolantTank() { - return coolantTank; - } - - public FluidTank getFuelTank() { - return fuelTank; - } - - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null) { - if (FluidFuelRegister.instance.getCoolant(forFluidType.getFluid()) != null) { + public FluidTank getCoolantTank() { return coolantTank; - } - if (FluidFuelRegister.instance.getFuel(forFluidType.getFluid()) != null) { - return fuelTank; - } } - return null; - } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { /* coolantTank, fuelTank */}; - } + public FluidTank getFuelTank() { + return fuelTank; + } - @Override - public void setTanksDirty() { - tanksDirty = true; - } + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + if (forFluidType != null) { + if (FluidFuelRegister.instance.getCoolant(forFluidType.getFluid()) != null) { + return coolantTank; + } + if (FluidFuelRegister.instance.getFuel(forFluidType.getFluid()) != null) { + return fuelTank; + } + } + return null; + } + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] { + /* coolantTank, fuelTank */ + }; + } + + @Override + public void setTanksDirty() { + tanksDirty = true; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index d02f8b11..d1a746ec 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -1,13 +1,5 @@ package crazypants.enderio.machine.generator.combustion; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.render.IRenderFace; import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; @@ -17,65 +9,89 @@ import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4f; import com.enderio.core.common.vecmath.Vertex; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; public class TranslatedCubeRenderer { - public static TranslatedCubeRenderer instance = new TranslatedCubeRenderer(); + public static TranslatedCubeRenderer instance = new TranslatedCubeRenderer(); - private XFormRenderer xformRenderer = new XFormRenderer(); + private XFormRenderer xformRenderer = new XFormRenderer(); - private CustomCubeRenderer ccr = new CustomCubeRenderer(); + private CustomCubeRenderer ccr = new CustomCubeRenderer(); - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, boolean enableLighting) { - renderBoundingBox(x, y, z, block, bb, vt, null, enableLighting); - } - - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt) { - renderBoundingBox(x, y, z, block, bb, vt, null); - } - - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, IIcon overrideTexture) { - renderBoundingBox(x, y, z, block, bb, vt, overrideTexture, true); - } - - public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, IIcon overrideTexture, boolean doLighting) { - block.setBlockBounds(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - xformRenderer.xform = vt; - xformRenderer.enableLighting = doLighting; - ccr.setOverrideTexture(overrideTexture); - ccr.renderBlock(Minecraft.getMinecraft().theWorld, block, x, y, z, xformRenderer); - ccr.setOverrideTexture(null); - block.setBlockBounds(0, 0, 0, 1, 1, 1); - } - - private class XFormRenderer implements IRenderFace { - - VertexTransform xform; - boolean enableLighting = true; - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - if(xform != null) { - Vector3d xyz = new Vector3d(x,y,z); - for (Vertex v : refVertices) { - v.xyz.sub(xyz); - xform.apply(v); - if(!enableLighting) { - v.brightness = 15 << 20 | 15 << 4; - float col = RenderUtil.getColorMultiplierForFace(face); - v.color = new Vector4f(col,col,col,1); - v.normal = null; - } - } - } - Tessellator.instance.addTranslation((float)x, (float)y, (float)z); - RenderUtil.addVerticesToTesselator(refVertices); - Tessellator.instance.addTranslation(-(float)x,- (float)y, -(float)z); + public void renderBoundingBox( + int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, boolean enableLighting) { + renderBoundingBox(x, y, z, block, bb, vt, null, enableLighting); + } + + public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt) { + renderBoundingBox(x, y, z, block, bb, vt, null); + } + + public void renderBoundingBox( + int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, IIcon overrideTexture) { + renderBoundingBox(x, y, z, block, bb, vt, overrideTexture, true); + } + + public void renderBoundingBox( + int x, + int y, + int z, + Block block, + BoundingBox bb, + VertexTransform vt, + IIcon overrideTexture, + boolean doLighting) { + block.setBlockBounds(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + xformRenderer.xform = vt; + xformRenderer.enableLighting = doLighting; + ccr.setOverrideTexture(overrideTexture); + ccr.renderBlock(Minecraft.getMinecraft().theWorld, block, x, y, z, xformRenderer); + ccr.setOverrideTexture(null); + block.setBlockBounds(0, 0, 0, 1, 1, 1); + } + + private class XFormRenderer implements IRenderFace { + + VertexTransform xform; + boolean enableLighting = true; + + @Override + public void renderFace( + CustomRenderBlocks rb, + ForgeDirection face, + Block par1Block, + double x, + double y, + double z, + IIcon texture, + List refVertices, + boolean translateToXyz) { + if (xform != null) { + Vector3d xyz = new Vector3d(x, y, z); + for (Vertex v : refVertices) { + v.xyz.sub(xyz); + xform.apply(v); + if (!enableLighting) { + v.brightness = 15 << 20 | 15 << 4; + float col = RenderUtil.getColorMultiplierForFace(face); + v.color = new Vector4f(col, col, col, 1); + v.normal = null; + } + } + } + Tessellator.instance.addTranslation((float) x, (float) y, (float) z); + RenderUtil.addVerticesToTesselator(refVertices); + Tessellator.instance.addTranslation(-(float) x, -(float) y, -(float) z); + } + } + + public CustomCubeRenderer getRenderer() { + return ccr; } - } - - public CustomCubeRenderer getRenderer() { - return ccr; - } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java index eba5e5b9..a21be9c5 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java @@ -1,79 +1,80 @@ package crazypants.enderio.machine.generator.stirling; -import java.util.Random; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import java.util.Random; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockStirlingGenerator extends AbstractMachineBlock { - public static BlockStirlingGenerator create() { + public static BlockStirlingGenerator create() { - PacketHandler.INSTANCE.registerMessage(PacketBurnTime.class, PacketBurnTime.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketBurnTime.class, PacketBurnTime.class, PacketHandler.nextID(), Side.CLIENT); - BlockStirlingGenerator gen = new BlockStirlingGenerator(); - gen.init(); - return gen; - } - - protected BlockStirlingGenerator() { - super(ModObject.blockStirlingGenerator, TileEntityStirlingGenerator.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new StirlingGeneratorContainer(player.inventory, (TileEntityStirlingGenerator) world.getTileEntity(x, y, z)); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiStirlingGenerator(player.inventory, (TileEntityStirlingGenerator) world.getTileEntity(x, y, z)); - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_STIRLING_GEN; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:stirlingGenFrontOn"; + BlockStirlingGenerator gen = new BlockStirlingGenerator(); + gen.init(); + return gen; } - return "enderio:stirlingGenFrontOff"; - } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - TileEntityStirlingGenerator te = (TileEntityStirlingGenerator) world.getTileEntity(x, y, z); - if(te != null && te.isActive()) { - ForgeDirection front = ForgeDirection.values()[te.facing]; + protected BlockStirlingGenerator() { + super(ModObject.blockStirlingGenerator, TileEntityStirlingGenerator.class); + } - for (int i = 0; i < 2; i++) { - double px = x + 0.5 + front.offsetX * 0.6; - double pz = z + 0.5 + front.offsetZ * 0.6; - double v = 0.05; - double vx = 0; - double vz = 0; - - if(front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { - px += world.rand.nextFloat() * 0.9 - 0.45; - vz += front == ForgeDirection.NORTH ? -v : v; - } else { - pz += world.rand.nextFloat() * 0.9 - 0.45; - vx += front == ForgeDirection.WEST ? -v : v; + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new StirlingGeneratorContainer( + player.inventory, (TileEntityStirlingGenerator) world.getTileEntity(x, y, z)); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiStirlingGenerator(player.inventory, (TileEntityStirlingGenerator) world.getTileEntity(x, y, z)); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_STIRLING_GEN; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:stirlingGenFrontOn"; + } + return "enderio:stirlingGenFrontOff"; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + TileEntityStirlingGenerator te = (TileEntityStirlingGenerator) world.getTileEntity(x, y, z); + if (te != null && te.isActive()) { + ForgeDirection front = ForgeDirection.values()[te.facing]; + + for (int i = 0; i < 2; i++) { + double px = x + 0.5 + front.offsetX * 0.6; + double pz = z + 0.5 + front.offsetZ * 0.6; + double v = 0.05; + double vx = 0; + double vz = 0; + + if (front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { + px += world.rand.nextFloat() * 0.9 - 0.45; + vz += front == ForgeDirection.NORTH ? -v : v; + } else { + pz += world.rand.nextFloat() * 0.9 - 0.45; + vx += front == ForgeDirection.WEST ? -v : v; + } + + world.spawnParticle("smoke", px, y + 0.1, pz, vx, 0, vz); + } } - - world.spawnParticle("smoke", px, y + 0.1, pz, vx, 0, vz); - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index e32f0563..acaddcc6 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -1,20 +1,7 @@ package crazypants.enderio.machine.generator.stirling; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Rectangle; -import java.text.MessageFormat; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.EnumChatFormatting; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -22,101 +9,117 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.Capacitors; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Rectangle; +import java.text.MessageFormat; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiStirlingGenerator extends GuiPoweredMachineBase { - public GuiStirlingGenerator(InventoryPlayer par1InventoryPlayer, TileEntityStirlingGenerator te) { - super(te, new StirlingGeneratorContainer(par1InventoryPlayer, te), "stirlingGenerator"); + public GuiStirlingGenerator(InventoryPlayer par1InventoryPlayer, TileEntityStirlingGenerator te) { + super(te, new StirlingGeneratorContainer(par1InventoryPlayer, te), "stirlingGenerator"); - final StirlingGeneratorContainer c = (StirlingGeneratorContainer)inventorySlots; - Rectangle r = new Rectangle(c.getUpgradeOffset(), new Dimension(16, 16)); - MessageFormat fmt = new MessageFormat(EnderIO.lang.localize("stirlingGenerator.upgrades")); - ttMan.addToolTip(new GuiToolTip(r, - EnderIO.lang.localize("stirlingGenerator.upgradeslot"), - formatUpgrade(fmt, Capacitors.ACTIVATED_CAPACITOR), - formatUpgrade(fmt, Capacitors.ENDER_CAPACITOR)) { - @Override - public boolean shouldDraw() { - return !c.getUpgradeSlot().getHasStack() && super.shouldDraw(); - } - }); + final StirlingGeneratorContainer c = (StirlingGeneratorContainer) inventorySlots; + Rectangle r = new Rectangle(c.getUpgradeOffset(), new Dimension(16, 16)); + MessageFormat fmt = new MessageFormat(EnderIO.lang.localize("stirlingGenerator.upgrades")); + ttMan.addToolTip( + new GuiToolTip( + r, + EnderIO.lang.localize("stirlingGenerator.upgradeslot"), + formatUpgrade(fmt, Capacitors.ACTIVATED_CAPACITOR), + formatUpgrade(fmt, Capacitors.ENDER_CAPACITOR)) { + @Override + public boolean shouldDraw() { + return !c.getUpgradeSlot().getHasStack() && super.shouldDraw(); + } + }); - addProgressTooltip(80, 52, 14, 14); - } - - private float getFactor(Capacitors upgrade) { - return getTileEntity().getEnergyMultiplier() * - getTileEntity().getBurnTimeMultiplier(); - } - - private String formatUpgrade(MessageFormat fmt, Capacitors upgrade) { - float efficiency = getFactor(upgrade) / getFactor(Capacitors.BASIC_CAPACITOR); - Object[] args = new Object[] { - EnderIO.lang.localizeExact(upgrade.unlocalisedName.concat(".name")), - efficiency, - EnumChatFormatting.WHITE, - EnumChatFormatting.GRAY - }; - return fmt.format(args, new StringBuffer(), null).toString(); - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - protected String formatProgressTooltip(int scaledProgress, float remaining) { - int totalBurnTime = getTileEntity().totalBurnTime; - int remainingTicks = (int)(remaining * totalBurnTime); - int remainingSecs = remainingTicks / 20; - int remainingRF = getTileEntity().getPowerUsePerTick() * remainingTicks; - return MessageFormat.format(EnderIO.lang.localize("stirlingGenerator.remaining"), - remaining, remainingSecs / 60, remainingSecs % 60, remainingRF); - } - - @Override - protected int scaleProgressForTooltip(float progress) { - int totalBurnTime = getTileEntity().totalBurnTime; - int scale = Math.max(100, (totalBurnTime+19)/20); - return (int)(progress * scale); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - int scaled; - - if(shouldRenderProgress()) { - scaled = getProgressScaled(12); - drawTexturedModalRect(sx + 80, sy + 64 - scaled, 176, 12 - scaled, 14, scaled + 2); + addProgressTooltip(80, 52, 14, 14); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - FontRenderer fr = getFontRenderer(); - int y = guiTop + fr.FONT_HEIGHT / 2 + 3; - - int output = 0; - if(getTileEntity().isActive()) { - output = getTileEntity().getPowerUsePerTick(); + private float getFactor(Capacitors upgrade) { + return getTileEntity().getEnergyMultiplier() * getTileEntity().getBurnTimeMultiplier(); } - String txt = EnderIO.lang.localize("stirlingGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr(); - int sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE)); - txt = String.format("%s %d%%", EnderIO.lang.localize("stirlingGenerator.burnRate"), - Math.round(getTileEntity().getBurnTimeMultiplier() / Config.stirlingGeneratorBurnTimeMultipliers[0] * 100)); - sw = fr.getStringWidth(txt); - y += fr.FONT_HEIGHT + 3; - fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE)); + private String formatUpgrade(MessageFormat fmt, Capacitors upgrade) { + float efficiency = getFactor(upgrade) / getFactor(Capacitors.BASIC_CAPACITOR); + Object[] args = new Object[] { + EnderIO.lang.localizeExact(upgrade.unlocalisedName.concat(".name")), + efficiency, + EnumChatFormatting.WHITE, + EnumChatFormatting.GRAY + }; + return fmt.format(args, new StringBuffer(), null).toString(); + } - } + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + protected String formatProgressTooltip(int scaledProgress, float remaining) { + int totalBurnTime = getTileEntity().totalBurnTime; + int remainingTicks = (int) (remaining * totalBurnTime); + int remainingSecs = remainingTicks / 20; + int remainingRF = getTileEntity().getPowerUsePerTick() * remainingTicks; + return MessageFormat.format( + EnderIO.lang.localize("stirlingGenerator.remaining"), + remaining, + remainingSecs / 60, + remainingSecs % 60, + remainingRF); + } + + @Override + protected int scaleProgressForTooltip(float progress) { + int totalBurnTime = getTileEntity().totalBurnTime; + int scale = Math.max(100, (totalBurnTime + 19) / 20); + return (int) (progress * scale); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + int scaled; + + if (shouldRenderProgress()) { + scaled = getProgressScaled(12); + drawTexturedModalRect(sx + 80, sy + 64 - scaled, 176, 12 - scaled, 14, scaled + 2); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + FontRenderer fr = getFontRenderer(); + int y = guiTop + fr.FONT_HEIGHT / 2 + 3; + + int output = 0; + if (getTileEntity().isActive()) { + output = getTileEntity().getPowerUsePerTick(); + } + String txt = EnderIO.lang.localize("stirlingGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + int sw = fr.getStringWidth(txt); + fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE)); + + txt = String.format( + "%s %d%%", + EnderIO.lang.localize("stirlingGenerator.burnRate"), + Math.round(getTileEntity().getBurnTimeMultiplier() + / Config.stirlingGeneratorBurnTimeMultipliers[0] + * 100)); + sw = fr.getStringWidth(txt); + y += fr.FONT_HEIGHT + 3; + fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, y, ColorUtil.getRGB(Color.WHITE)); + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java index 3cfaf3f7..a251b466 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/PacketBurnTime.java @@ -1,45 +1,43 @@ package crazypants.enderio.machine.generator.stirling; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.util.ClientUtil; +import io.netty.buffer.ByteBuf; -public class PacketBurnTime extends MessageTileEntity implements IMessageHandler { +public class PacketBurnTime extends MessageTileEntity + implements IMessageHandler { - public int burnTime; - public int totalBurnTime; - - public PacketBurnTime() { - } + public int burnTime; + public int totalBurnTime; - public PacketBurnTime(TileEntityStirlingGenerator tile) { - super(tile); - burnTime = tile.burnTime; - totalBurnTime = tile.totalBurnTime; - } + public PacketBurnTime() {} - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(burnTime); - buf.writeInt(totalBurnTime); - } + public PacketBurnTime(TileEntityStirlingGenerator tile) { + super(tile); + burnTime = tile.burnTime; + totalBurnTime = tile.totalBurnTime; + } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - burnTime = buf.readInt(); - totalBurnTime = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketBurnTime message, MessageContext ctx) { - ClientUtil.setStirlingBurnTime(message, message.x, message.y, message.z); - return null; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(burnTime); + buf.writeInt(totalBurnTime); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + burnTime = buf.readInt(); + totalBurnTime = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketBurnTime message, MessageContext ctx) { + ClientUtil.setStirlingBurnTime(message, message.x, message.y, message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java b/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java index 902c7250..6162524b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java @@ -1,24 +1,23 @@ package crazypants.enderio.machine.generator.stirling; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class StirlingGeneratorContainer extends AbstractMachineContainer { - public StirlingGeneratorContainer(InventoryPlayer playerInv, TileEntityStirlingGenerator te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 80, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - } + public StirlingGeneratorContainer(InventoryPlayer playerInv, TileEntityStirlingGenerator te) { + super(playerInv, te); + } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 80, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index 37a567c2..79f72e6e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -1,5 +1,13 @@ package crazypants.enderio.machine.generator.stirling; +import com.enderio.core.api.common.util.IProgressTile; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.AbstractGeneratorEntity; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDistributor; import net.minecraft.block.Block; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -9,211 +17,198 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.common.util.IProgressTile; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.AbstractGeneratorEntity; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.PowerDistributor; - public class TileEntityStirlingGenerator extends AbstractGeneratorEntity implements ISidedInventory, IProgressTile { - // public for alloy smelter - public static final String SOUND_NAME = "generator.stirling"; + // public for alloy smelter + public static final String SOUND_NAME = "generator.stirling"; - /** How many ticks left until the item is burnt. */ - public int burnTime = 0; - public int totalBurnTime; + /** How many ticks left until the item is burnt. */ + public int burnTime = 0; - private PowerDistributor powerDis; + public int totalBurnTime; - public TileEntityStirlingGenerator() { - super(new SlotDefinition(1, 0)); - } + private PowerDistributor powerDis; - @Override - public String getMachineName() { - return ModObject.blockStirlingGenerator.unlocalisedName; - } - - @Override - public String getInventoryName() { - return "Stirling Generator"; - } - - @Override - public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return TileEntityFurnace.isItemFuel(itemstack); - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - return new int[] { 0 }; - } - - @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { - return isItemValidForSlot(i, itemstack); - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - return !TileEntityFurnace.isItemFuel(itemstack); - } - - @Override - public boolean isActive() { - return burnTime > 0; - } - - @Override - public float getProgress() { - if(totalBurnTime <= 0) { - return 0; - } - return (float) burnTime / (float) totalBurnTime; - } - - @Override - public void setProgress(float progress) { - burnTime = (int) (totalBurnTime * progress); - } - - @Override - public TileEntity getTileEntity() { - return this; - } - - @Override - public String getSoundName() { - return SOUND_NAME; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - burnTime = nbtRoot.getInteger("burnTime"); - totalBurnTime = nbtRoot.getInteger("totalBurnTime"); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setInteger("burnTime", burnTime); - nbtRoot.setInteger("totalBurnTime", totalBurnTime); - } - - @Override - public void onNeighborBlockChange(Block blockId) { - super.onNeighborBlockChange(blockId); - if(powerDis != null) { - powerDis.neighboursChanged(); - } - } - - @Override - public int getPowerUsePerTick() { - return Math.round(Config.stirlingGeneratorBaseRfPerTick * getEnergyMultiplier()); - } - - public int getBurnTime(ItemStack item) { - return Math.round(TileEntityFurnace.getItemBurnTime(item) * getBurnTimeMultiplier()); - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - boolean needsUpdate = false; - boolean sendBurnTimePacket = false; - - if(burnTime > 0) { - if(getEnergyStored() < getMaxEnergyStored()) { - setEnergyStored(getEnergyStored() + getPowerUsePerTick()); - } - burnTime--; - sendBurnTimePacket = shouldDoWorkThisTick(20,-1) || burnTime == 0; + public TileEntityStirlingGenerator() { + super(new SlotDefinition(1, 0)); } - transmitEnergy(); + @Override + public String getMachineName() { + return ModObject.blockStirlingGenerator.unlocalisedName; + } - if(redstoneCheckPassed) { + @Override + public String getInventoryName() { + return "Stirling Generator"; + } - if(burnTime <= 0 && getEnergyStored() < getMaxEnergyStored()) { - if(inventory[0] != null && inventory[0].stackSize > 0) { - burnTime = getBurnTime(inventory[0]); - if(burnTime > 0) { - totalBurnTime = burnTime; - ItemStack containedItem = inventory[0].getItem().getContainerItem(inventory[0]); - if(containedItem != null) { - inventory[0] = containedItem; - } else { - decrStackSize(0, 1); - } - needsUpdate = true; - } + @Override + public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return TileEntityFurnace.isItemFuel(itemstack); + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + return new int[] {0}; + } + + @Override + public boolean canInsertItem(int i, ItemStack itemstack, int j) { + return isItemValidForSlot(i, itemstack); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return !TileEntityFurnace.isItemFuel(itemstack); + } + + @Override + public boolean isActive() { + return burnTime > 0; + } + + @Override + public float getProgress() { + if (totalBurnTime <= 0) { + return 0; } - } - } - if(!needsUpdate && sendBurnTimePacket) { - PacketHandler.sendToAllAround(new PacketBurnTime(this), this); + return (float) burnTime / (float) totalBurnTime; } - return needsUpdate; - } - - @Override - protected boolean doPush(ForgeDirection dir) { - if(inventory[0] == null) { - return false; + @Override + public void setProgress(float progress) { + burnTime = (int) (totalBurnTime * progress); } - if(!shouldDoWorkThisTick(20)) { - return false; + @Override + public TileEntity getTileEntity() { + return this; } - if(!canExtractItem(0, inventory[0], 0)) { - return false; + @Override + public String getSoundName() { + return SOUND_NAME; } - BlockCoord loc = getLocation().getLocation(dir); - TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); - - return doPush(dir, te, 0, 0); - } - - public float getEnergyMultiplier() { - int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorEnergyMultipliers.length); - return (float)Config.stirlingGeneratorEnergyMultipliers[tier-1]; - } - - public float getBurnTimeMultiplier() { - int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorBurnTimeMultipliers.length); - return (float)Config.stirlingGeneratorBurnTimeMultipliers[tier-1]; - } - - - //private PowerDistributor powerDis; - private boolean transmitEnergy() { - if(powerDis == null) { - powerDis = new PowerDistributor(new BlockCoord(this)); + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + burnTime = nbtRoot.getInteger("burnTime"); + totalBurnTime = nbtRoot.getInteger("totalBurnTime"); } - int canTransmit = Math.min(getEnergyStored(), getPowerUsePerTick() * 2); - if(canTransmit <= 0) { - return false; + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setInteger("burnTime", burnTime); + nbtRoot.setInteger("totalBurnTime", totalBurnTime); } - int transmitted = powerDis.transmitEnergy(worldObj, canTransmit); - setEnergyStored(getEnergyStored() - transmitted); - return transmitted > 0; - } - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public void onNeighborBlockChange(Block blockId) { + super.onNeighborBlockChange(blockId); + if (powerDis != null) { + powerDis.neighboursChanged(); + } + } + @Override + public int getPowerUsePerTick() { + return Math.round(Config.stirlingGeneratorBaseRfPerTick * getEnergyMultiplier()); + } + public int getBurnTime(ItemStack item) { + return Math.round(TileEntityFurnace.getItemBurnTime(item) * getBurnTimeMultiplier()); + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean needsUpdate = false; + boolean sendBurnTimePacket = false; + + if (burnTime > 0) { + if (getEnergyStored() < getMaxEnergyStored()) { + setEnergyStored(getEnergyStored() + getPowerUsePerTick()); + } + burnTime--; + sendBurnTimePacket = shouldDoWorkThisTick(20, -1) || burnTime == 0; + } + + transmitEnergy(); + + if (redstoneCheckPassed) { + + if (burnTime <= 0 && getEnergyStored() < getMaxEnergyStored()) { + if (inventory[0] != null && inventory[0].stackSize > 0) { + burnTime = getBurnTime(inventory[0]); + if (burnTime > 0) { + totalBurnTime = burnTime; + ItemStack containedItem = inventory[0].getItem().getContainerItem(inventory[0]); + if (containedItem != null) { + inventory[0] = containedItem; + } else { + decrStackSize(0, 1); + } + needsUpdate = true; + } + } + } + } + if (!needsUpdate && sendBurnTimePacket) { + PacketHandler.sendToAllAround(new PacketBurnTime(this), this); + } + + return needsUpdate; + } + + @Override + protected boolean doPush(ForgeDirection dir) { + if (inventory[0] == null) { + return false; + } + + if (!shouldDoWorkThisTick(20)) { + return false; + } + + if (!canExtractItem(0, inventory[0], 0)) { + return false; + } + + BlockCoord loc = getLocation().getLocation(dir); + TileEntity te = worldObj.getTileEntity(loc.x, loc.y, loc.z); + + return doPush(dir, te, 0, 0); + } + + public float getEnergyMultiplier() { + int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorEnergyMultipliers.length); + return (float) Config.stirlingGeneratorEnergyMultipliers[tier - 1]; + } + + public float getBurnTimeMultiplier() { + int tier = + MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.stirlingGeneratorBurnTimeMultipliers.length); + return (float) Config.stirlingGeneratorBurnTimeMultipliers[tier - 1]; + } + + // private PowerDistributor powerDis; + private boolean transmitEnergy() { + if (powerDis == null) { + powerDis = new PowerDistributor(new BlockCoord(this)); + } + int canTransmit = Math.min(getEnergyStored(), getPowerUsePerTick() * 2); + if (canTransmit <= 0) { + return false; + } + int transmitted = powerDis.transmitEnergy(worldObj, canTransmit); + setEnergyStored(getEnergyStored() - transmitted); + return transmitted > 0; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index 2f296ae3..76a7e44a 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -1,8 +1,16 @@ package crazypants.enderio.machine.generator.zombie; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; +import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; import java.util.List; import java.util.Random; - import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; @@ -11,157 +19,151 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; - public class BlockZombieGenerator extends AbstractMachineBlock { - public static class BlockFrankenZombieGenerator extends BlockZombieGenerator { - - public BlockFrankenZombieGenerator() { - super(ModObject.blockFrankenzombieGenerator, TileFrankenZombieGenerator.class); - } - - public static BlockFrankenZombieGenerator create() { - BlockFrankenZombieGenerator gen = new BlockFrankenZombieGenerator(); - gen.init(); - return gen; - } - - public GeneratorType getGeneratorType(){ - return GeneratorType.FRANKENZOMBIE; - } - - } - - public static class BlockEnderGenerator extends BlockZombieGenerator { - - public BlockEnderGenerator() { - super(ModObject.blockEnderGenerator, TileEnderGenerator.class); - } - - public static BlockEnderGenerator create() { - BlockEnderGenerator gen = new BlockEnderGenerator(); - gen.init(); - return gen; - } - - public GeneratorType getGeneratorType(){ - return GeneratorType.ENDER; - } - - } - - public static BlockZombieGenerator create() { - BlockZombieGenerator gen = new BlockZombieGenerator(); - gen.init(); - return gen; - } - - protected BlockZombieGenerator() { - this(ModObject.blockZombieGenerator, TileZombieGenerator.class); - } - - protected BlockZombieGenerator(ModObject obj, Class clazz) { - super(obj, (Class) clazz, Material.anvil); - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { - return false; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new ContainerZombieGenerator(player.inventory, (TileZombieGenerator) world.getTileEntity(x, y, z)); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiZombieGenerator(player.inventory, (TileZombieGenerator) world.getTileEntity(x, y, z)); - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_ZOMBIE_GEN; - } - - @Override - public int getLightOpacity() { - return 0; - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:stirlingGenFrontOn"; - } - return "enderio:stirlingGenFrontOff"; - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - - if(rand.nextInt(3) == 0) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileZombieGenerator && ((TileZombieGenerator) te).isActive()) { - for (int i = 0; i < 2; i++) { - float xOffset = 0.5f + (world.rand.nextFloat() * 2.0F - 1.0F) * 0.3f; - float yOffset = 0.1f; - float zOffset = 0.5f + (world.rand.nextFloat() * 2.0F - 1.0F) * 0.3f; - - EntityFX fx = new BubbleFX(world, x + xOffset, y + yOffset, z + zOffset, 0, 0.5, 0); - Minecraft.getMinecraft().effectRenderer.addEffect(fx); + public static class BlockFrankenZombieGenerator extends BlockZombieGenerator { + public BlockFrankenZombieGenerator() { + super(ModObject.blockFrankenzombieGenerator, TileFrankenZombieGenerator.class); } - if(Config.machineSoundsEnabled) { - float volume = (Config.machineSoundVolume * 0.045f); - world.playSound(x + 0.5, y + 1, z + 0.5, EnderIO.DOMAIN + ":generator.zombie.bubble", volume, world.rand.nextFloat() * 0.75f, false); + public static BlockFrankenZombieGenerator create() { + BlockFrankenZombieGenerator gen = new BlockFrankenZombieGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType() { + return GeneratorType.FRANKENZOMBIE; } - } } - } - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileZombieGenerator) { - tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + EnderIO.lang.localize("fluid.millibucket.abr")); + public static class BlockEnderGenerator extends BlockZombieGenerator { + + public BlockEnderGenerator() { + super(ModObject.blockEnderGenerator, TileEnderGenerator.class); + } + + public static BlockEnderGenerator create() { + BlockEnderGenerator gen = new BlockEnderGenerator(); + gen.init(); + return gen; + } + + public GeneratorType getGeneratorType() { + return GeneratorType.ENDER; + } } - } - public GeneratorType getGeneratorType(){ - return GeneratorType.ZOMBIE; - } + public static BlockZombieGenerator create() { + BlockZombieGenerator gen = new BlockZombieGenerator(); + gen.init(); + return gen; + } + protected BlockZombieGenerator() { + this(ModObject.blockZombieGenerator, TileZombieGenerator.class); + } + + protected BlockZombieGenerator(ModObject obj, Class clazz) { + super(obj, (Class) clazz, Material.anvil); + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { + return false; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerZombieGenerator(player.inventory, (TileZombieGenerator) world.getTileEntity(x, y, z)); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiZombieGenerator(player.inventory, (TileZombieGenerator) world.getTileEntity(x, y, z)); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_ZOMBIE_GEN; + } + + @Override + public int getLightOpacity() { + return 0; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:stirlingGenFrontOn"; + } + return "enderio:stirlingGenFrontOff"; + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + + if (rand.nextInt(3) == 0) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileZombieGenerator && ((TileZombieGenerator) te).isActive()) { + for (int i = 0; i < 2; i++) { + float xOffset = 0.5f + (world.rand.nextFloat() * 2.0F - 1.0F) * 0.3f; + float yOffset = 0.1f; + float zOffset = 0.5f + (world.rand.nextFloat() * 2.0F - 1.0F) * 0.3f; + + EntityFX fx = new BubbleFX(world, x + xOffset, y + yOffset, z + zOffset, 0, 0.5, 0); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); + } + + if (Config.machineSoundsEnabled) { + float volume = (Config.machineSoundVolume * 0.045f); + world.playSound( + x + 0.5, + y + 1, + z + 0.5, + EnderIO.DOMAIN + ":generator.zombie.bubble", + volume, + world.rand.nextFloat() * 0.75f, + false); + } + } + } + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te != null && te instanceof TileZombieGenerator) { + tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + + EnderIO.lang.localize("fluid.millibucket.abr")); + } + } + + public GeneratorType getGeneratorType() { + return GeneratorType.ZOMBIE; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BubbleFX.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BubbleFX.java index 3abcfa90..0c6e2477 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BubbleFX.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BubbleFX.java @@ -1,35 +1,34 @@ package crazypants.enderio.machine.generator.zombie; -import net.minecraft.client.particle.EntityBubbleFX; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.particle.EntityBubbleFX; +import net.minecraft.world.World; @SideOnly(Side.CLIENT) public class BubbleFX extends EntityBubbleFX { - private final double yLimit; + private final double yLimit; - public BubbleFX(World world, double x, double y, double z, double motionX, double motionY, double motionZ) { - super(world, x, y, z, motionX, motionY, motionZ); - setRBGColorF(0.6f, 0.6f, 0.5f); - yLimit = Math.floor(y) + 0.9; - } - - @Override - public void onUpdate() { - prevPosX = posX; - prevPosY = posY; - prevPosZ = posZ; - motionY += 0.002D; - moveEntity(motionX, motionY, motionZ); - motionX *= 0.8500000238418579D; - motionY *= 0.8500000238418579D; - motionZ *= 0.8500000238418579D; - - if(particleMaxAge-- <= 0 || posY > yLimit) { - setDead(); + public BubbleFX(World world, double x, double y, double z, double motionX, double motionY, double motionZ) { + super(world, x, y, z, motionX, motionY, motionZ); + setRBGColorF(0.6f, 0.6f, 0.5f); + yLimit = Math.floor(y) + 0.9; } - } + @Override + public void onUpdate() { + prevPosX = posX; + prevPosY = posY; + prevPosZ = posZ; + motionY += 0.002D; + moveEntity(motionX, motionY, motionZ); + motionX *= 0.8500000238418579D; + motionY *= 0.8500000238418579D; + motionZ *= 0.8500000238418579D; + + if (particleMaxAge-- <= 0 || posY > yLimit) { + setDead(); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java index a539b3c1..5b8083ff 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java @@ -1,17 +1,15 @@ package crazypants.enderio.machine.generator.zombie; -import net.minecraft.entity.player.InventoryPlayer; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.gui.AbstractMachineContainer; +import net.minecraft.entity.player.InventoryPlayer; public class ContainerZombieGenerator extends AbstractMachineContainer { - public ContainerZombieGenerator(InventoryPlayer playerInv, AbstractMachineEntity te) { - super(playerInv, te); - } + public ContainerZombieGenerator(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - } - + @Override + protected void addMachineSlots(InventoryPlayer playerInv) {} } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java index 9f8424f4..7b51c1fd 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GeneratorType.java @@ -1,19 +1,17 @@ package crazypants.enderio.machine.generator.zombie; public enum GeneratorType { + ZOMBIE("enderio:models/ZombieJar.png"), + FRANKENZOMBIE("enderio:models/FrankenzombieJar.png"), + ENDER("enderio:models/EnderJar.png"); - ZOMBIE("enderio:models/ZombieJar.png"), - FRANKENZOMBIE("enderio:models/FrankenzombieJar.png"), - ENDER("enderio:models/EnderJar.png"); + String texturePath; - String texturePath; + GeneratorType(String texture) { + this.texturePath = texture; + } - GeneratorType(String texture){ - this.texturePath = texture; - } - - - public String getTexture(){ - return texturePath; - } + public String getTexture() { + return texturePath; + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 9088dc88..4c92da32 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -1,98 +1,103 @@ package crazypants.enderio.machine.generator.zombie; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiZombieGenerator extends GuiPoweredMachineBase { - public GuiZombieGenerator(InventoryPlayer inventory, final TileZombieGenerator tileEntity) { - super(tileEntity, new ContainerZombieGenerator(inventory, tileEntity), "zombieGenerator"); + public GuiZombieGenerator(InventoryPlayer inventory, final TileZombieGenerator tileEntity) { + super(tileEntity, new ContainerZombieGenerator(inventory, tileEntity), "zombieGenerator"); - addToolTip(new GuiToolTip(new Rectangle(80, 21, 15, 47), "") { + addToolTip(new GuiToolTip(new Rectangle(80, 21, 15, 47), "") { - @Override - protected void updateText() { - text.clear(); - String heading = (tileEntity instanceof TileEnderGenerator) ? EnderIO.lang.localize("enderGenerator.fuelTank") : EnderIO.lang.localize("zombieGenerator.fuelTank"); - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); - if(tileEntity.fuelTank.getFluidAmount() < tileEntity.getActivationAmount()) { - text.add(EnderIO.lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); + @Override + protected void updateText() { + text.clear(); + String heading = (tileEntity instanceof TileEnderGenerator) + ? EnderIO.lang.localize("enderGenerator.fuelTank") + : EnderIO.lang.localize("zombieGenerator.fuelTank"); + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); + if (tileEntity.fuelTank.getFluidAmount() < tileEntity.getActivationAmount()) { + text.add(EnderIO.lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); + } + } + }); + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + public void renderSlotHighlights(IoMode mode) { + super.renderSlotHighlights(mode); + + if (mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { + int x = 78; + int y = 19; + int w = 15 + 4; + int h = 47 + 4; + renderSlotHighlight(PULL_COLOR, x, y, w, h); } - } - }); - - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - public void renderSlotHighlights(IoMode mode) { - super.renderSlotHighlights(mode); - - if(mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { - int x = 78; - int y = 19; - int w = 15 + 4; - int h = 47 + 4; - renderSlotHighlight(PULL_COLOR, x, y, w, h); } - } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + TileZombieGenerator gen = getTileEntity(); - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - TileZombieGenerator gen = getTileEntity(); + FontRenderer fr = getFontRenderer(); + int output = 0; + if (gen.isActive()) { + output = gen.getOutputPerTick(); + } + String txt = EnderIO.lang.localize("combustionGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + int sw = fr.getStringWidth(txt); + fr.drawStringWithShadow( + txt, guiLeft + xSize / 2 - sw / 2, guiTop + fr.FONT_HEIGHT / 2 + 3, ColorUtil.getRGB(Color.WHITE)); - FontRenderer fr = getFontRenderer(); - int output = 0; - if(gen.isActive()) { - output = gen.getOutputPerTick(); + int x = guiLeft + 80; + int y = guiTop + 21; + if (gen.fuelTank.getFluidAmount() > 0) { + + RenderUtil.renderGuiTank( + gen.fuelTank.getFluid(), + gen.fuelTank.getCapacity(), + gen.fuelTank.getFluidAmount(), + x, + y, + zLevel, + 16, + 47); + + if (gen.isActive()) { + txt = gen.tickPerBucketOfFuel / 1000 + " " + EnderIO.lang.localize("power.tmb"); + sw = fr.getStringWidth(txt); + fr.drawStringWithShadow( + txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 46, ColorUtil.getRGB(Color.WHITE)); + } + } + + bindGuiTexture(); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - String txt = EnderIO.lang.localize("combustionGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr(); - int sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, guiLeft + xSize / 2 - sw / 2, guiTop + fr.FONT_HEIGHT / 2 + 3, ColorUtil.getRGB(Color.WHITE)); - - int x = guiLeft + 80; - int y = guiTop + 21; - if(gen.fuelTank.getFluidAmount() > 0) { - - RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), gen.fuelTank.getCapacity(), gen.fuelTank.getFluidAmount(), x, y, zLevel, 16, 47); - - if(gen.isActive()) { - txt = gen.tickPerBucketOfFuel / 1000 + " " + EnderIO.lang.localize("power.tmb"); - sw = fr.getStringWidth(txt); - fr.drawStringWithShadow(txt, x - sw / 2 + 7, y + fr.FONT_HEIGHT / 2 + 46, ColorUtil.getRGB(Color.WHITE)); - } - } - - bindGuiTexture(); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java index 73724fa0..6f49c2e8 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/IHasNutrientTank.java @@ -4,6 +4,5 @@ import crazypants.enderio.tool.SmartTank; public interface IHasNutrientTank { - SmartTank getNutrientTank(); - + SmartTank getNutrientTank(); } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ModelZombieJar.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ModelZombieJar.java index 85d09578..b80d184d 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ModelZombieJar.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ModelZombieJar.java @@ -6,257 +6,255 @@ import net.minecraft.entity.Entity; public class ModelZombieJar extends ModelBase { - ModelRenderer Head; - ModelRenderer electrode1; - ModelRenderer electrode2; - ModelRenderer electrode3; - ModelRenderer electrode4; - ModelRenderer electrode5; - ModelRenderer electrode6; - ModelRenderer electrode7; - ModelRenderer electrode8; - ModelRenderer electrode9; - ModelRenderer electrode10; - ModelRenderer electrode11; - ModelRenderer electrode12; - ModelRenderer glass1; - ModelRenderer glass2; - ModelRenderer glass3; - ModelRenderer glass4; - ModelRenderer top; - ModelRenderer Lid1; - ModelRenderer bottom; - ModelRenderer Lid2; - ModelRenderer Lid3; - ModelRenderer Lid4; - ModelRenderer Lid5; + ModelRenderer Head; + ModelRenderer electrode1; + ModelRenderer electrode2; + ModelRenderer electrode3; + ModelRenderer electrode4; + ModelRenderer electrode5; + ModelRenderer electrode6; + ModelRenderer electrode7; + ModelRenderer electrode8; + ModelRenderer electrode9; + ModelRenderer electrode10; + ModelRenderer electrode11; + ModelRenderer electrode12; + ModelRenderer glass1; + ModelRenderer glass2; + ModelRenderer glass3; + ModelRenderer glass4; + ModelRenderer top; + ModelRenderer Lid1; + ModelRenderer bottom; + ModelRenderer Lid2; + ModelRenderer Lid3; + ModelRenderer Lid4; + ModelRenderer Lid5; - public ModelZombieJar() { - this(0.0f); - } + public ModelZombieJar() { + this(0.0f); + } - public ModelZombieJar(float par1) { - Head = new ModelRenderer(this, 0, 0); - Head.setTextureSize(64, 64); - Head.addBox(-4F, -4F, -4F, 8, 8, 8); - Head.setRotationPoint(0F, -8F, 1F); - electrode1 = new ModelRenderer(this, 31, 40); - electrode1.setTextureSize(64, 64); - electrode1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode1.setRotationPoint(-2.872653F, -11.50361F, -2.60217F); - electrode2 = new ModelRenderer(this, 31, 40); - electrode2.setTextureSize(64, 64); - electrode2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode2.setRotationPoint(-0.2268921F, -9.821873F, -3.016515F); - electrode3 = new ModelRenderer(this, 31, 40); - electrode3.setTextureSize(64, 64); - electrode3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode3.setRotationPoint(2.875378F, -10.08223F, -3.571606F); - electrode4 = new ModelRenderer(this, 31, 40); - electrode4.setTextureSize(64, 64); - electrode4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode4.setRotationPoint(3.996085F, -9.873959F, -2.810457F); - electrode5 = new ModelRenderer(this, 31, 40); - electrode5.setTextureSize(64, 64); - electrode5.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode5.setRotationPoint(4.288532F, -8.994526F, 0.2129618F); - electrode6 = new ModelRenderer(this, 31, 40); - electrode6.setTextureSize(64, 64); - electrode6.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode6.setRotationPoint(5.037488F, -10.05719F, 3.095634F); - electrode7 = new ModelRenderer(this, 31, 40); - electrode7.setTextureSize(64, 64); - electrode7.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode7.setRotationPoint(-1.494982F, -11.74601F, 5.210991F); - electrode8 = new ModelRenderer(this, 31, 40); - electrode8.setTextureSize(64, 64); - electrode8.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode8.setRotationPoint(1.150779F, -10.06427F, 4.796647F); - electrode9 = new ModelRenderer(this, 31, 40); - electrode9.setTextureSize(64, 64); - electrode9.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode9.setRotationPoint(4.253049F, -10.32463F, 4.241555F); - electrode10 = new ModelRenderer(this, 31, 40); - electrode10.setTextureSize(64, 64); - electrode10.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode10.setRotationPoint(-3.667958F, -11.76913F, -1.517876F); - electrode11 = new ModelRenderer(this, 31, 40); - electrode11.setTextureSize(64, 64); - electrode11.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode11.setRotationPoint(-3.37551F, -10.8897F, 1.505543F); - electrode12 = new ModelRenderer(this, 31, 40); - electrode12.setTextureSize(64, 64); - electrode12.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); - electrode12.setRotationPoint(-2.626554F, -11.95237F, 4.388215F); - glass1 = new ModelRenderer(this, 36, 2); - glass1.setTextureSize(64, 64); - glass1.addBox(-6F, -7F, 0F, 12, 14, 0); - glass1.setRotationPoint(0F, -8F, -5F); - glass2 = new ModelRenderer(this, 36, 2); - glass2.setTextureSize(64, 64); - glass2.addBox(-6F, -7F, 0F, 12, 14, 0); - glass2.setRotationPoint(-6F, -8F, 1F); - glass3 = new ModelRenderer(this, 36, 2); - glass3.setTextureSize(64, 64); - glass3.addBox(-6F, -7F, 0F, 12, 14, 0); - glass3.setRotationPoint(0F, -8F, 7F); - glass4 = new ModelRenderer(this, 36, 2); - glass4.setTextureSize(64, 64); - glass4.addBox(-6F, -7F, 0F, 12, 14, 0); - glass4.setRotationPoint(6F, -8F, 1F); - top = new ModelRenderer(this, 1, 17); - top.setTextureSize(64, 64); - top.addBox(-6F, -0.5F, -6F, 12, 1, 12); - top.setRotationPoint(0F, -15.5F, 1F); - Lid1 = new ModelRenderer(this, 4, 33); - Lid1.setTextureSize(64, 64); - Lid1.addBox(-4.5F, -1F, -4.5F, 9, 2, 9); - Lid1.setRotationPoint(0F, -17F, 1F); - bottom = new ModelRenderer(this, 1, 17); - bottom.setTextureSize(64, 64); - bottom.addBox(-6F, -0.5F, -6F, 12, 1, 12); - bottom.setRotationPoint(0F, -0.5F, 1F); - Lid2 = new ModelRenderer(this, 12, 41); - Lid2.setTextureSize(64, 64); - Lid2.addBox(-4F, -1F, -0.5F, 8, 2, 1); - Lid2.setRotationPoint(0F, -17F, -4F); - Lid3 = new ModelRenderer(this, 12, 41); - Lid3.setTextureSize(64, 64); - Lid3.addBox(-4F, -1F, -0.5F, 8, 2, 1); - Lid3.setRotationPoint(0F, -17F, 6F); - Lid4 = new ModelRenderer(this, 5, 34); - Lid4.setTextureSize(64, 64); - Lid4.addBox(-0.5F, -1F, -4F, 1, 2, 8); - Lid4.setRotationPoint(5F, -17F, 1F); - Lid5 = new ModelRenderer(this, 5, 34); - Lid5.setTextureSize(64, 64); - Lid5.addBox(-0.5F, -1F, -4F, 1, 2, 8); - Lid5.setRotationPoint(-5F, -17F, 1F); - } + public ModelZombieJar(float par1) { + Head = new ModelRenderer(this, 0, 0); + Head.setTextureSize(64, 64); + Head.addBox(-4F, -4F, -4F, 8, 8, 8); + Head.setRotationPoint(0F, -8F, 1F); + electrode1 = new ModelRenderer(this, 31, 40); + electrode1.setTextureSize(64, 64); + electrode1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode1.setRotationPoint(-2.872653F, -11.50361F, -2.60217F); + electrode2 = new ModelRenderer(this, 31, 40); + electrode2.setTextureSize(64, 64); + electrode2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode2.setRotationPoint(-0.2268921F, -9.821873F, -3.016515F); + electrode3 = new ModelRenderer(this, 31, 40); + electrode3.setTextureSize(64, 64); + electrode3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode3.setRotationPoint(2.875378F, -10.08223F, -3.571606F); + electrode4 = new ModelRenderer(this, 31, 40); + electrode4.setTextureSize(64, 64); + electrode4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode4.setRotationPoint(3.996085F, -9.873959F, -2.810457F); + electrode5 = new ModelRenderer(this, 31, 40); + electrode5.setTextureSize(64, 64); + electrode5.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode5.setRotationPoint(4.288532F, -8.994526F, 0.2129618F); + electrode6 = new ModelRenderer(this, 31, 40); + electrode6.setTextureSize(64, 64); + electrode6.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode6.setRotationPoint(5.037488F, -10.05719F, 3.095634F); + electrode7 = new ModelRenderer(this, 31, 40); + electrode7.setTextureSize(64, 64); + electrode7.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode7.setRotationPoint(-1.494982F, -11.74601F, 5.210991F); + electrode8 = new ModelRenderer(this, 31, 40); + electrode8.setTextureSize(64, 64); + electrode8.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode8.setRotationPoint(1.150779F, -10.06427F, 4.796647F); + electrode9 = new ModelRenderer(this, 31, 40); + electrode9.setTextureSize(64, 64); + electrode9.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode9.setRotationPoint(4.253049F, -10.32463F, 4.241555F); + electrode10 = new ModelRenderer(this, 31, 40); + electrode10.setTextureSize(64, 64); + electrode10.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode10.setRotationPoint(-3.667958F, -11.76913F, -1.517876F); + electrode11 = new ModelRenderer(this, 31, 40); + electrode11.setTextureSize(64, 64); + electrode11.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode11.setRotationPoint(-3.37551F, -10.8897F, 1.505543F); + electrode12 = new ModelRenderer(this, 31, 40); + electrode12.setTextureSize(64, 64); + electrode12.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1); + electrode12.setRotationPoint(-2.626554F, -11.95237F, 4.388215F); + glass1 = new ModelRenderer(this, 36, 2); + glass1.setTextureSize(64, 64); + glass1.addBox(-6F, -7F, 0F, 12, 14, 0); + glass1.setRotationPoint(0F, -8F, -5F); + glass2 = new ModelRenderer(this, 36, 2); + glass2.setTextureSize(64, 64); + glass2.addBox(-6F, -7F, 0F, 12, 14, 0); + glass2.setRotationPoint(-6F, -8F, 1F); + glass3 = new ModelRenderer(this, 36, 2); + glass3.setTextureSize(64, 64); + glass3.addBox(-6F, -7F, 0F, 12, 14, 0); + glass3.setRotationPoint(0F, -8F, 7F); + glass4 = new ModelRenderer(this, 36, 2); + glass4.setTextureSize(64, 64); + glass4.addBox(-6F, -7F, 0F, 12, 14, 0); + glass4.setRotationPoint(6F, -8F, 1F); + top = new ModelRenderer(this, 1, 17); + top.setTextureSize(64, 64); + top.addBox(-6F, -0.5F, -6F, 12, 1, 12); + top.setRotationPoint(0F, -15.5F, 1F); + Lid1 = new ModelRenderer(this, 4, 33); + Lid1.setTextureSize(64, 64); + Lid1.addBox(-4.5F, -1F, -4.5F, 9, 2, 9); + Lid1.setRotationPoint(0F, -17F, 1F); + bottom = new ModelRenderer(this, 1, 17); + bottom.setTextureSize(64, 64); + bottom.addBox(-6F, -0.5F, -6F, 12, 1, 12); + bottom.setRotationPoint(0F, -0.5F, 1F); + Lid2 = new ModelRenderer(this, 12, 41); + Lid2.setTextureSize(64, 64); + Lid2.addBox(-4F, -1F, -0.5F, 8, 2, 1); + Lid2.setRotationPoint(0F, -17F, -4F); + Lid3 = new ModelRenderer(this, 12, 41); + Lid3.setTextureSize(64, 64); + Lid3.addBox(-4F, -1F, -0.5F, 8, 2, 1); + Lid3.setRotationPoint(0F, -17F, 6F); + Lid4 = new ModelRenderer(this, 5, 34); + Lid4.setTextureSize(64, 64); + Lid4.addBox(-0.5F, -1F, -4F, 1, 2, 8); + Lid4.setRotationPoint(5F, -17F, 1F); + Lid5 = new ModelRenderer(this, 5, 34); + Lid5.setTextureSize(64, 64); + Lid5.addBox(-0.5F, -1F, -4F, 1, 2, 8); + Lid5.setRotationPoint(-5F, -17F, 1F); + } - @Override - public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - - Head.rotateAngleX = 0.03054326F; - Head.rotateAngleY = 0.1745329F; - Head.rotateAngleZ = 0.2392846F; - Head.renderWithRotation(par7); + @Override + public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) { - electrode1.rotateAngleX = 0.03054326F; - electrode1.rotateAngleY = 0.1745329F; - electrode1.rotateAngleZ = 0.2392846F; - electrode1.renderWithRotation(par7); + Head.rotateAngleX = 0.03054326F; + Head.rotateAngleY = 0.1745329F; + Head.rotateAngleZ = 0.2392846F; + Head.renderWithRotation(par7); - electrode2.rotateAngleX = 0.03054326F; - electrode2.rotateAngleY = 0.1745329F; - electrode2.rotateAngleZ = 0.2392846F; - electrode2.renderWithRotation(par7); + electrode1.rotateAngleX = 0.03054326F; + electrode1.rotateAngleY = 0.1745329F; + electrode1.rotateAngleZ = 0.2392846F; + electrode1.renderWithRotation(par7); - electrode3.rotateAngleX = 0.03054326F; - electrode3.rotateAngleY = 0.1745329F; - electrode3.rotateAngleZ = 0.2392846F; - electrode3.renderWithRotation(par7); + electrode2.rotateAngleX = 0.03054326F; + electrode2.rotateAngleY = 0.1745329F; + electrode2.rotateAngleZ = 0.2392846F; + electrode2.renderWithRotation(par7); - electrode4.rotateAngleX = 0.03054326F; - electrode4.rotateAngleY = 0.1745329F; - electrode4.rotateAngleZ = 0.2392846F; - electrode4.renderWithRotation(par7); + electrode3.rotateAngleX = 0.03054326F; + electrode3.rotateAngleY = 0.1745329F; + electrode3.rotateAngleZ = 0.2392846F; + electrode3.renderWithRotation(par7); - electrode5.rotateAngleX = 0.03054326F; - electrode5.rotateAngleY = 0.1745329F; - electrode5.rotateAngleZ = 0.2392846F; - electrode5.renderWithRotation(par7); + electrode4.rotateAngleX = 0.03054326F; + electrode4.rotateAngleY = 0.1745329F; + electrode4.rotateAngleZ = 0.2392846F; + electrode4.renderWithRotation(par7); - electrode6.rotateAngleX = 0.03054326F; - electrode6.rotateAngleY = 0.1745329F; - electrode6.rotateAngleZ = 0.2392846F; - electrode6.renderWithRotation(par7); + electrode5.rotateAngleX = 0.03054326F; + electrode5.rotateAngleY = 0.1745329F; + electrode5.rotateAngleZ = 0.2392846F; + electrode5.renderWithRotation(par7); - electrode7.rotateAngleX = 0.03054326F; - electrode7.rotateAngleY = 0.1745329F; - electrode7.rotateAngleZ = 0.2392846F; - electrode7.renderWithRotation(par7); + electrode6.rotateAngleX = 0.03054326F; + electrode6.rotateAngleY = 0.1745329F; + electrode6.rotateAngleZ = 0.2392846F; + electrode6.renderWithRotation(par7); - electrode8.rotateAngleX = 0.03054326F; - electrode8.rotateAngleY = 0.1745329F; - electrode8.rotateAngleZ = 0.2392846F; - electrode8.renderWithRotation(par7); + electrode7.rotateAngleX = 0.03054326F; + electrode7.rotateAngleY = 0.1745329F; + electrode7.rotateAngleZ = 0.2392846F; + electrode7.renderWithRotation(par7); - electrode9.rotateAngleX = 0.03054326F; - electrode9.rotateAngleY = 0.1745329F; - electrode9.rotateAngleZ = 0.2392846F; - electrode9.renderWithRotation(par7); + electrode8.rotateAngleX = 0.03054326F; + electrode8.rotateAngleY = 0.1745329F; + electrode8.rotateAngleZ = 0.2392846F; + electrode8.renderWithRotation(par7); - electrode10.rotateAngleX = 0.03054326F; - electrode10.rotateAngleY = 0.1745329F; - electrode10.rotateAngleZ = 0.2392846F; - electrode10.renderWithRotation(par7); + electrode9.rotateAngleX = 0.03054326F; + electrode9.rotateAngleY = 0.1745329F; + electrode9.rotateAngleZ = 0.2392846F; + electrode9.renderWithRotation(par7); - electrode11.rotateAngleX = 0.03054326F; - electrode11.rotateAngleY = 0.1745329F; - electrode11.rotateAngleZ = 0.2392846F; - electrode11.renderWithRotation(par7); + electrode10.rotateAngleX = 0.03054326F; + electrode10.rotateAngleY = 0.1745329F; + electrode10.rotateAngleZ = 0.2392846F; + electrode10.renderWithRotation(par7); - electrode12.rotateAngleX = 0.03054326F; - electrode12.rotateAngleY = 0.1745329F; - electrode12.rotateAngleZ = 0.2392846F; - electrode12.renderWithRotation(par7); + electrode11.rotateAngleX = 0.03054326F; + electrode11.rotateAngleY = 0.1745329F; + electrode11.rotateAngleZ = 0.2392846F; + electrode11.renderWithRotation(par7); - glass1.rotateAngleX = 0F; - glass1.rotateAngleY = 0F; - glass1.rotateAngleZ = 0F; - glass1.renderWithRotation(par7); + electrode12.rotateAngleX = 0.03054326F; + electrode12.rotateAngleY = 0.1745329F; + electrode12.rotateAngleZ = 0.2392846F; + electrode12.renderWithRotation(par7); - glass2.rotateAngleX = 0F; - glass2.rotateAngleY = -1.570796F; - glass2.rotateAngleZ = 0F; - glass2.renderWithRotation(par7); + glass1.rotateAngleX = 0F; + glass1.rotateAngleY = 0F; + glass1.rotateAngleZ = 0F; + glass1.renderWithRotation(par7); - glass3.rotateAngleX = 0F; - glass3.rotateAngleY = 0F; - glass3.rotateAngleZ = 0F; - glass3.renderWithRotation(par7); + glass2.rotateAngleX = 0F; + glass2.rotateAngleY = -1.570796F; + glass2.rotateAngleZ = 0F; + glass2.renderWithRotation(par7); - glass4.rotateAngleX = 0F; - glass4.rotateAngleY = -1.570796F; - glass4.rotateAngleZ = 0F; - glass4.renderWithRotation(par7); + glass3.rotateAngleX = 0F; + glass3.rotateAngleY = 0F; + glass3.rotateAngleZ = 0F; + glass3.renderWithRotation(par7); - top.rotateAngleX = 0F; - top.rotateAngleY = 0F; - top.rotateAngleZ = 0F; - top.renderWithRotation(par7); + glass4.rotateAngleX = 0F; + glass4.rotateAngleY = -1.570796F; + glass4.rotateAngleZ = 0F; + glass4.renderWithRotation(par7); - Lid1.rotateAngleX = 0F; - Lid1.rotateAngleY = 0F; - Lid1.rotateAngleZ = 0F; - Lid1.renderWithRotation(par7); + top.rotateAngleX = 0F; + top.rotateAngleY = 0F; + top.rotateAngleZ = 0F; + top.renderWithRotation(par7); - bottom.rotateAngleX = 0F; - bottom.rotateAngleY = 0F; - bottom.rotateAngleZ = 0F; - bottom.renderWithRotation(par7); + Lid1.rotateAngleX = 0F; + Lid1.rotateAngleY = 0F; + Lid1.rotateAngleZ = 0F; + Lid1.renderWithRotation(par7); - Lid2.rotateAngleX = 0F; - Lid2.rotateAngleY = 0F; - Lid2.rotateAngleZ = 0F; - Lid2.renderWithRotation(par7); + bottom.rotateAngleX = 0F; + bottom.rotateAngleY = 0F; + bottom.rotateAngleZ = 0F; + bottom.renderWithRotation(par7); - Lid3.rotateAngleX = 0F; - Lid3.rotateAngleY = 0F; - Lid3.rotateAngleZ = 0F; - Lid3.renderWithRotation(par7); + Lid2.rotateAngleX = 0F; + Lid2.rotateAngleY = 0F; + Lid2.rotateAngleZ = 0F; + Lid2.renderWithRotation(par7); - Lid4.rotateAngleX = 0F; - Lid4.rotateAngleY = 0F; - Lid4.rotateAngleZ = 0F; - Lid4.renderWithRotation(par7); + Lid3.rotateAngleX = 0F; + Lid3.rotateAngleY = 0F; + Lid3.rotateAngleZ = 0F; + Lid3.renderWithRotation(par7); - Lid5.rotateAngleX = 0F; - Lid5.rotateAngleY = 0F; - Lid5.rotateAngleZ = 0F; - Lid5.renderWithRotation(par7); - - } + Lid4.rotateAngleX = 0F; + Lid4.rotateAngleY = 0F; + Lid4.rotateAngleZ = 0F; + Lid4.renderWithRotation(par7); + Lid5.rotateAngleX = 0F; + Lid5.rotateAngleY = 0F; + Lid5.rotateAngleZ = 0F; + Lid5.renderWithRotation(par7); + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java index 2cc96d8d..2b290ceb 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/PacketNutrientTank.java @@ -1,47 +1,45 @@ package crazypants.enderio.machine.generator.zombie; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketNutrientTank extends MessageTileEntity implements IMessageHandler { +public class PacketNutrientTank extends MessageTileEntity + implements IMessageHandler { - private int amount; + private int amount; - public PacketNutrientTank() { - } + public PacketNutrientTank() {} - public PacketNutrientTank(T tile) { - super(tile); - amount = tile.getNutrientTank().getFluidAmount(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(amount); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - amount = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketNutrientTank message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity tile = message.getTileEntity(player.worldObj); - if (tile instanceof IHasNutrientTank) { - ((IHasNutrientTank) tile).getNutrientTank().setFluidAmount(message.amount); + public PacketNutrientTank(T tile) { + super(tile); + amount = tile.getNutrientTank().getFluidAmount(); } - return null; - } -} \ No newline at end of file + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(amount); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + amount = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketNutrientTank message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity tile = message.getTileEntity(player.worldObj); + if (tile instanceof IHasNutrientTank) { + ((IHasNutrientTank) tile).getNutrientTank().setFluidAmount(message.amount); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index a3c18c82..9335009f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -1,5 +1,17 @@ package crazypants.enderio.machine.generator.zombie; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.AbstractGeneratorEntity; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDistributor; +import crazypants.enderio.tool.SmartTank; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,326 +24,312 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; +public class TileZombieGenerator extends AbstractGeneratorEntity + implements IFluidHandler, ITankAccess, IHasNutrientTank { -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.AbstractGeneratorEntity; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerDistributor; -import crazypants.enderio.tool.SmartTank; + public static class TileFrankenZombieGenerator extends TileZombieGenerator { -public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { - - public static class TileFrankenZombieGenerator extends TileZombieGenerator { - - public TileFrankenZombieGenerator() { - baseOutputPerTick = Config.frankenzombieGeneratorRfPerTick; - tickPerBucketOfFuel = Config.frankenzombieGeneratorTicksPerBucketFuel; - } - - @Override - public String getMachineName() { - return ModObject.blockFrankenzombieGenerator.unlocalisedName; - } - } - - public static class TileEnderGenerator extends TileZombieGenerator { - - public TileEnderGenerator() { - baseOutputPerTick = Config.enderGeneratorRfPerTick; - tickPerBucketOfFuel = Config.enderGeneratorTicksPerBucketFuel; - } - - @Override - public String getMachineName() { - return ModObject.blockEnderGenerator.unlocalisedName; - } - - @Override - protected Fluid getFluidType() { - return EnderIO.fluidEnderDistillation; - } - } - - private static int IO_MB_TICK = 250; - - final SmartTank fuelTank; - - int baseOutputPerTick; - int tickPerBucketOfFuel; - int minimumTankLevel; - - private boolean tanksDirty; - private boolean active = false; - private PowerDistributor powerDis; - - private int ticksRemaingFuel; - private boolean inPause; - - public TileZombieGenerator() { - super(new SlotDefinition(0, 0, 1)); - fuelTank = new SmartTank(getFluidType(), FluidContainerRegistry.BUCKET_VOLUME * 2); - baseOutputPerTick = Config.zombieGeneratorRfPerTick; - tickPerBucketOfFuel = Config.zombieGeneratorTicksPerBucketFuel; - minimumTankLevel = (int) (fuelTank.getCapacity()*0.7F); - } - - - @Override - public String getMachineName() { - return ModObject.blockZombieGenerator.unlocalisedName; - } - - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; - } - - @Override - protected boolean doPull(ForgeDirection dir) { - boolean res = super.doPull(dir); - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0) { - if(canFill(dir, info.fluid.getFluid())) { - FluidStack canPull = info.fluid.copy(); - canPull.amount = Math.min(IO_MB_TICK, canPull.amount); - FluidStack drained = target.drain(dir.getOpposite(), canPull, false); - if(drained != null && drained.amount > 0) { - int filled = fill(dir, drained, false); - if(filled > 0) { - drained = target.drain(dir.getOpposite(), filled, true); - fill(dir, drained, true); - return res; - } - } - } - } + public TileFrankenZombieGenerator() { + baseOutputPerTick = Config.frankenzombieGeneratorRfPerTick; + tickPerBucketOfFuel = Config.frankenzombieGeneratorTicksPerBucketFuel; } - } - } - return res; - } - @Override - public int getPowerUsePerTick() { - return getOutputPerTick(); - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public boolean isActive() { - return active; - } - - @Override - public void onNeighborBlockChange(Block blockId) { - super.onNeighborBlockChange(blockId); - if(powerDis != null) { - powerDis.neighboursChanged(); - } - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - boolean res = false; - - if(!redstoneCheckPassed) { - if(active) { - active = false; - res = true; - } - return res; - } else { - - boolean isActive = generateEnergy(); - if(isActive != active) { - active = isActive; - res = true; - } - - if(getEnergyStored() >= getMaxEnergyStored()) { - inPause = true; - } - - transmitEnergy(); + @Override + public String getMachineName() { + return ModObject.blockFrankenzombieGenerator.unlocalisedName; + } } - if(tanksDirty) { - PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); - tanksDirty = false; + public static class TileEnderGenerator extends TileZombieGenerator { + + public TileEnderGenerator() { + baseOutputPerTick = Config.enderGeneratorRfPerTick; + tickPerBucketOfFuel = Config.enderGeneratorTicksPerBucketFuel; + } + + @Override + public String getMachineName() { + return ModObject.blockEnderGenerator.unlocalisedName; + } + + @Override + protected Fluid getFluidType() { + return EnderIO.fluidEnderDistillation; + } } - return res; - } + private static int IO_MB_TICK = 250; - private boolean generateEnergy() { + final SmartTank fuelTank; - //once full, don't start again until we have drained 10 seconds worth of power to prevent - //flickering on and off constantly when powering a machine that draws less than this produces - if (inPause && getEnergyStored() >= (getMaxEnergyStored() - (getOutputPerTick() * 200)) && getEnergyStored() > (getMaxEnergyStored() / 8)) { - return false; - } - inPause = false; + int baseOutputPerTick; + int tickPerBucketOfFuel; + int minimumTankLevel; - if(fuelTank.getFluidAmount() < getActivationAmount()) { - return false; + private boolean tanksDirty; + private boolean active = false; + private PowerDistributor powerDis; + + private int ticksRemaingFuel; + private boolean inPause; + + public TileZombieGenerator() { + super(new SlotDefinition(0, 0, 1)); + fuelTank = new SmartTank(getFluidType(), FluidContainerRegistry.BUCKET_VOLUME * 2); + baseOutputPerTick = Config.zombieGeneratorRfPerTick; + tickPerBucketOfFuel = Config.zombieGeneratorTicksPerBucketFuel; + minimumTankLevel = (int) (fuelTank.getCapacity() * 0.7F); } - - ticksRemaingFuel--; - if(ticksRemaingFuel <= 0) { - fuelTank.drain(1, true); - ticksRemaingFuel = tickPerBucketOfFuel/1000; - tanksDirty = true; + @Override + public String getMachineName() { + return ModObject.blockZombieGenerator.unlocalisedName; } - setEnergyStored(getEnergyStored() + getOutputPerTick()); - return true; - } - int getActivationAmount() { - return minimumTankLevel; - } - - private boolean transmitEnergy() { - if(getEnergyStored() <= 0) { - return false; + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; } - if(powerDis == null) { - powerDis = new PowerDistributor(new BlockCoord(this)); + + @Override + protected boolean doPull(ForgeDirection dir) { + boolean res = super.doPull(dir); + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { + FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + if (infos != null) { + for (FluidTankInfo info : infos) { + if (info.fluid != null && info.fluid.amount > 0) { + if (canFill(dir, info.fluid.getFluid())) { + FluidStack canPull = info.fluid.copy(); + canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + FluidStack drained = target.drain(dir.getOpposite(), canPull, false); + if (drained != null && drained.amount > 0) { + int filled = fill(dir, drained, false); + if (filled > 0) { + drained = target.drain(dir.getOpposite(), filled, true); + fill(dir, drained, true); + return res; + } + } + } + } + } + } + } + return res; } - int transmitted = powerDis.transmitEnergy(worldObj, Math.min(getOutputPerTick() * 2, getEnergyStored())); - setEnergyStored(getEnergyStored() - transmitted); - return transmitted > 0; - } - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - int res = fuelTank.fill(resource, doFill); - if(res > 0 && doFill) { - tanksDirty = true; + @Override + public int getPowerUsePerTick() { + return getOutputPerTick(); } - return res; - } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return fuelTank.canFill(fluid); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { fuelTank.getInfo() }; - } - - public int getFluidStored(ForgeDirection from) { - return fuelTank.getFluidAmount(); - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - active = nbtRoot.getBoolean("active"); - } - - @Override - public boolean shouldRenderInPass(int pass) { - if(pass == 0) { - return true; + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return false; } - if(pass == 1) { - return fuelTank.getFluidAmount() > 0; + + @Override + public boolean isActive() { + return active; } - return false; - } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - fuelTank.readCommon("fuelTank", nbtRoot); - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - fuelTank.writeCommon("fuelTank", nbtRoot); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("active", active); - } - - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null && forFluidType.getFluid() == getFluidType()) { - return fuelTank; + @Override + public void onNeighborBlockChange(Block blockId) { + super.onNeighborBlockChange(blockId); + if (powerDis != null) { + powerDis.neighboursChanged(); + } } - return null; - } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { /* fuelTank */}; - } + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean res = false; - @Override - public void setTanksDirty() { - tanksDirty = true; - } + if (!redstoneCheckPassed) { + if (active) { + active = false; + res = true; + } + return res; + } else { - @Override - public SmartTank getNutrientTank() { - return fuelTank; - } + boolean isActive = generateEnergy(); + if (isActive != active) { + active = isActive; + res = true; + } - protected Fluid getFluidType() { - return EnderIO.fluidNutrientDistillation; - } + if (getEnergyStored() >= getMaxEnergyStored()) { + inPause = true; + } - public int getTicksPerBucketOfFuel() { - return tickPerBucketOfFuel; - } + transmitEnergy(); + } - public GeneratorType getGeneratorType(){ - return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType(); - } + if (tanksDirty) { + PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); + tanksDirty = false; + } - public int getOutputPerTick(){ - int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.zombieGeneratorsEnergyMultipliers.length); - return (int)(baseOutputPerTick*Config.zombieGeneratorsEnergyMultipliers[tier-1]); + return res; + } - } + private boolean generateEnergy() { + // once full, don't start again until we have drained 10 seconds worth of power to prevent + // flickering on and off constantly when powering a machine that draws less than this produces + if (inPause + && getEnergyStored() >= (getMaxEnergyStored() - (getOutputPerTick() * 200)) + && getEnergyStored() > (getMaxEnergyStored() / 8)) { + return false; + } + inPause = false; + + if (fuelTank.getFluidAmount() < getActivationAmount()) { + return false; + } + + ticksRemaingFuel--; + if (ticksRemaingFuel <= 0) { + fuelTank.drain(1, true); + ticksRemaingFuel = tickPerBucketOfFuel / 1000; + tanksDirty = true; + } + setEnergyStored(getEnergyStored() + getOutputPerTick()); + return true; + } + + int getActivationAmount() { + return minimumTankLevel; + } + + private boolean transmitEnergy() { + if (getEnergyStored() <= 0) { + return false; + } + if (powerDis == null) { + powerDis = new PowerDistributor(new BlockCoord(this)); + } + int transmitted = powerDis.transmitEnergy(worldObj, Math.min(getOutputPerTick() * 2, getEnergyStored())); + setEnergyStored(getEnergyStored() - transmitted); + return transmitted > 0; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + int res = fuelTank.fill(resource, doFill); + if (res > 0 && doFill) { + tanksDirty = true; + } + return res; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return fuelTank.canFill(fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {fuelTank.getInfo()}; + } + + public int getFluidStored(ForgeDirection from) { + return fuelTank.getFluidAmount(); + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + active = nbtRoot.getBoolean("active"); + } + + @Override + public boolean shouldRenderInPass(int pass) { + if (pass == 0) { + return true; + } + if (pass == 1) { + return fuelTank.getFluidAmount() > 0; + } + return false; + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + fuelTank.readCommon("fuelTank", nbtRoot); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + fuelTank.writeCommon("fuelTank", nbtRoot); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("active", active); + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + if (forFluidType != null && forFluidType.getFluid() == getFluidType()) { + return fuelTank; + } + return null; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] { + /* fuelTank */ + }; + } + + @Override + public void setTanksDirty() { + tanksDirty = true; + } + + @Override + public SmartTank getNutrientTank() { + return fuelTank; + } + + protected Fluid getFluidType() { + return EnderIO.fluidNutrientDistillation; + } + + public int getTicksPerBucketOfFuel() { + return tickPerBucketOfFuel; + } + + public GeneratorType getGeneratorType() { + return ((BlockZombieGenerator) worldObj.getBlock(xCoord, yCoord, zCoord)).getGeneratorType(); + } + + public int getOutputPerTick() { + int tier = MathHelper.clamp_int(getCapacitor().getTier(), 1, Config.zombieGeneratorsEnergyMultipliers.length); + return (int) (baseOutputPerTick * Config.zombieGeneratorsEnergyMultipliers[tier - 1]); + } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 11c463e9..34e89356 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java @@ -1,19 +1,12 @@ package crazypants.enderio.machine.generator.zombie; -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockFrankenZombieGenerator; -import crazypants.enderio.machine.generator.zombie.BlockZombieGenerator.BlockEnderGenerator; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileFrankenZombieGenerator; import crazypants.util.RenderPassHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; @@ -27,135 +20,132 @@ import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTank; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private ModelZombieJar model = new ModelZombieJar(); + private ModelZombieJar model = new ModelZombieJar(); - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - World world = te.getWorldObj(); - TileZombieGenerator gen = (TileZombieGenerator) te; + World world = te.getWorldObj(); + TileZombieGenerator gen = (TileZombieGenerator) te; - float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - if (RenderPassHelper.getEntityRenderPass() == 0) { - renderModel(gen.getGeneratorType(), gen.facing); - } else if (RenderPassHelper.getEntityRenderPass() == 1) { - renderFluid(gen); + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + if (RenderPassHelper.getEntityRenderPass() == 0) { + renderModel(gen.getGeneratorType(), gen.facing); + } else if (RenderPassHelper.getEntityRenderPass() == 1) { + renderFluid(gen); + } + GL11.glPopMatrix(); } - GL11.glPopMatrix(); - } - protected void renderFluid(TileZombieGenerator gen) { - FluidTank tank = gen.fuelTank; - if(tank.getFluidAmount() <= 0) { - return; + protected void renderFluid(TileZombieGenerator gen) { + FluidTank tank = gen.fuelTank; + if (tank.getFluidAmount() <= 0) { + return; + } + IIcon icon = tank.getFluid().getFluid().getStillIcon(); + if (icon != null) { + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + + ForgeDirection facingDir = ForgeDirection.values()[gen.facing]; + double facingOffset = 0.075; + + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85); + float fullness = (float) (tank.getFluidAmount()) / (tank.getCapacity()); + Vector3d absFac = ForgeDirectionOffsets.absolueOffset(facingDir); + + double scaleX = absFac.x == 0 ? 0.95 : 1 - facingOffset / 2; + double scaleY = 0.85 * fullness; + double scaleZ = absFac.z == 0 ? 0.95 : 1 - facingOffset / 2; + + bb = bb.scale(scaleX, 0.85 * fullness, scaleZ); + + float ty = -(0.85f - (bb.maxY - bb.minY)) / 2; + Vector3d transOffset = ForgeDirectionOffsets.offsetScaled(facingDir, -facingOffset); + bb = bb.translate((float) transOffset.x, ty, (float) transOffset.z); + + int brightness; + if (gen.getWorldObj() == null) { + brightness = 15 << 20 | 15 << 4; + } else { + brightness = gen.getWorldObj().getLightBrightnessForSkyBlocks(gen.xCoord, gen.yCoord, gen.zCoord, 0); + } + tes.setBrightness(brightness); + + CubeRenderer.render(bb, icon); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDepthMask(false); + tes.draw(); + GL11.glDepthMask(true); + GL11.glPopAttrib(); + } } - IIcon icon = tank.getFluid().getFluid().getStillIcon(); - if(icon != null) { - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - ForgeDirection facingDir = ForgeDirection.values()[gen.facing]; - double facingOffset = 0.075; + private void renderModel(GeneratorType gen, int facing) { - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85); - float fullness = (float) (tank.getFluidAmount()) / (tank.getCapacity()); - Vector3d absFac = ForgeDirectionOffsets.absolueOffset(facingDir); + GL11.glPushMatrix(); - double scaleX = absFac.x == 0 ? 0.95 : 1 - facingOffset / 2; - double scaleY = 0.85 * fullness; - double scaleZ = absFac.z == 0 ? 0.95 : 1 - facingOffset / 2; + GL11.glTranslatef(0.5F, 0, 0.5F); + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glScalef(1.2f, 0.9f, 1.2f); - bb = bb.scale(scaleX, 0.85 * fullness, scaleZ); + ForgeDirection dir = ForgeDirection.getOrientation(facing); + if (dir == ForgeDirection.SOUTH) { + facing = 0; - float ty = -(0.85f - (bb.maxY - bb.minY)) / 2; - Vector3d transOffset = ForgeDirectionOffsets.offsetScaled(facingDir, -facingOffset); - bb = bb.translate((float) transOffset.x, ty, (float) transOffset.z); + } else if (dir == ForgeDirection.WEST) { + facing = -1; + } + GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - int brightness; - if(gen.getWorldObj() == null) { - brightness = 15 << 20 | 15 << 4; - } else { - brightness = gen.getWorldObj().getLightBrightnessForSkyBlocks(gen.xCoord, gen.yCoord, gen.zCoord, 0); - } - tes.setBrightness(brightness); - - CubeRenderer.render(bb, icon); - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - tes.draw(); - GL11.glDepthMask(true); - GL11.glPopAttrib(); + RenderUtil.bindTexture(gen.getTexture()); + model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + GL11.glTranslatef(-0.5F, 0, -0.5F); + GL11.glPopMatrix(); } - } - private void renderModel(GeneratorType gen, int facing) { - - GL11.glPushMatrix(); - - GL11.glTranslatef(0.5F, 0, 0.5F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glScalef(1.2f, 0.9f, 1.2f); - - ForgeDirection dir = ForgeDirection.getOrientation(facing); - if(dir == ForgeDirection.SOUTH) { - facing = 0; - - } else if(dir == ForgeDirection.WEST) { - facing = -1; + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(gen.getTexture()); - model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } - GL11.glTranslatef(-0.5F, 0, -0.5F); - GL11.glPopMatrix(); - - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderItem(((BlockZombieGenerator) Block.getBlockFromItem(item.getItem())).getGeneratorType(),0,0,0); - - } - - private void renderItem(GeneratorType gen, float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - renderModel(gen,ForgeDirection.SOUTH.ordinal()); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderItem(((BlockZombieGenerator) Block.getBlockFromItem(item.getItem())).getGeneratorType(), 0, 0, 0); + } + private void renderItem(GeneratorType gen, float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + renderModel(gen, ForgeDirection.SOUTH.ordinal()); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index ba74e13b..07302e1e 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -1,195 +1,197 @@ package crazypants.enderio.machine.gui; +import com.enderio.core.api.common.util.IProgressTile; +import com.enderio.core.common.ContainerEnder; +import com.enderio.core.common.util.Util; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.SlotDefinition; import java.awt.Point; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.api.common.util.IProgressTile; -import com.enderio.core.common.ContainerEnder; -import com.enderio.core.common.util.Util; - -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.SlotDefinition; - public abstract class AbstractMachineContainer extends ContainerEnder { - - protected Slot upgradeSlot; - public AbstractMachineContainer(InventoryPlayer playerInv, T te) { - super(playerInv, te); - } - - @Override - protected void addSlots(InventoryPlayer playerInv) { - addMachineSlots(playerInv); - - final T te = getInv(); - if(te.getSlotDefinition().getNumUpgradeSlots() == 1) { - upgradeSlot = new Slot(te, te.getSlotDefinition().getMinUpgradeSlot(), getUpgradeOffset().x, getUpgradeOffset().y) { + protected Slot upgradeSlot; - @Override - public int getSlotStackLimit() { - return 1; + public AbstractMachineContainer(InventoryPlayer playerInv, T te) { + super(playerInv, te); + } + + @Override + protected void addSlots(InventoryPlayer playerInv) { + addMachineSlots(playerInv); + + final T te = getInv(); + if (te.getSlotDefinition().getNumUpgradeSlots() == 1) { + upgradeSlot = + new Slot( + te, + te.getSlotDefinition().getMinUpgradeSlot(), + getUpgradeOffset().x, + getUpgradeOffset().y) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack itemStack) { + return te.isItemValidForSlot(te.getSlotDefinition().getMinUpgradeSlot(), itemStack); + } + }; + addSlotToContainer(upgradeSlot); + } + } + + @Override + public Point getPlayerInventoryOffset() { + return new Point(8, 84); + } + + @Override + public Point getUpgradeOffset() { + return new Point(12, 60); + } + + public Slot getUpgradeSlot() { + return upgradeSlot; + } + + /** + * ATTN: Do not access any non-static field from this method. Your object has + * not yet been constructed when it is called! + */ + protected abstract void addMachineSlots(InventoryPlayer playerInv); + + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotNumber) { + SlotDefinition slotDef = getInv().getSlotDefinition(); + + ItemStack copystack = null; + Slot slot = (Slot) inventorySlots.get(slotNumber); + if (slot != null && slot.getHasStack()) { + ItemStack origStack = slot.getStack(); + copystack = origStack.copy(); + + boolean merged = false; + for (SlotRange range : getTargetSlotsForTransfer(slotNumber, slot)) { + if (mergeItemStack(origStack, range.start, range.end, range.reverse)) { + merged = true; + break; + } + } + + if (!merged) { + return null; + } + + if (slotDef.isOutputSlot(slot.getSlotIndex())) { + slot.onSlotChange(origStack, copystack); + } + + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + if (origStack.stackSize == copystack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); } - @Override - public boolean isItemValid(ItemStack itemStack) { - return te.isItemValidForSlot(te.getSlotDefinition().getMinUpgradeSlot(), itemStack); + return copystack; + } + + protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { + return slotDef.getNumSlots(); + } + + protected SlotRange getPlayerInventorySlotRange(boolean reverse) { + return new SlotRange(startPlayerSlot, endHotBarSlot, reverse); + } + + protected SlotRange getPlayerInventoryWithoutHotbarSlotRange() { + return new SlotRange(startPlayerSlot, endPlayerSlot, false); + } + + protected SlotRange getPlayerHotbarSlotRange() { + return new SlotRange(startHotBarSlot, endHotBarSlot, false); + } + + protected void addInventorySlotRange(List res, int start, int end) { + for (int i = start; i < end; i++) { + int slotNumber = getSlotFromInventory(getInv(), i).slotNumber; + res.add(new SlotRange(slotNumber, slotNumber + 1, false)); } - }; - addSlotToContainer(upgradeSlot); } - } - @Override - public Point getPlayerInventoryOffset() { - return new Point(8,84); - } - - @Override - public Point getUpgradeOffset() { - return new Point(12,60); - } - - public Slot getUpgradeSlot() { - return upgradeSlot; - } - - /** - * ATTN: Do not access any non-static field from this method. Your object has - * not yet been constructed when it is called! - */ - protected abstract void addMachineSlots(InventoryPlayer playerInv); - - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotNumber) { - SlotDefinition slotDef = getInv().getSlotDefinition(); - - ItemStack copystack = null; - Slot slot = (Slot) inventorySlots.get(slotNumber); - if(slot != null && slot.getHasStack()) { - ItemStack origStack = slot.getStack(); - copystack = origStack.copy(); - - boolean merged = false; - for(SlotRange range : getTargetSlotsForTransfer(slotNumber, slot)) { - if(mergeItemStack(origStack, range.start, range.end, range.reverse)) { - merged = true; - break; + protected void addInputSlotRanges(List res) { + SlotDefinition slotDef = getInv().getSlotDefinition(); + if (slotDef.getNumInputSlots() > 0) { + addInventorySlotRange(res, slotDef.getMinInputSlot(), slotDef.getMaxInputSlot() + 1); } - } - - if(!merged) { - return null; - } - - if (slotDef.isOutputSlot(slot.getSlotIndex())) { - slot.onSlotChange(origStack, copystack); - } - - if(origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - if(origStack.stackSize == copystack.stackSize) { - return null; - } - - slot.onPickupFromSlot(entityPlayer, origStack); } - return copystack; - } - - protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { - return slotDef.getNumSlots(); - } - - protected SlotRange getPlayerInventorySlotRange(boolean reverse) { - return new SlotRange(startPlayerSlot, endHotBarSlot, reverse); - } - - protected SlotRange getPlayerInventoryWithoutHotbarSlotRange() { - return new SlotRange(startPlayerSlot, endPlayerSlot, false); - } - - protected SlotRange getPlayerHotbarSlotRange() { - return new SlotRange(startHotBarSlot, endHotBarSlot, false); - } - - protected void addInventorySlotRange(List res, int start, int end) { - for (int i = start; i < end; i++) { - int slotNumber = getSlotFromInventory(getInv(), i).slotNumber; - res.add(new SlotRange(slotNumber, slotNumber + 1, false)); + protected void addUpgradeSlotRanges(List res) { + SlotDefinition slotDef = getInv().getSlotDefinition(); + if (slotDef.getNumUpgradeSlots() > 0) { + addInventorySlotRange(res, slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1); + } } - } - protected void addInputSlotRanges(List res) { - SlotDefinition slotDef = getInv().getSlotDefinition(); - if(slotDef.getNumInputSlots() > 0) { - addInventorySlotRange(res, slotDef.getMinInputSlot(), slotDef.getMaxInputSlot() + 1); + protected void addPlayerSlotRanges(List res, int slotIndex) { + if (slotIndex < endPlayerSlot) { + res.add(getPlayerHotbarSlotRange()); + } + if (slotIndex >= startHotBarSlot && slotIndex < endHotBarSlot) { + res.add(getPlayerInventoryWithoutHotbarSlotRange()); + } } - } - protected void addUpgradeSlotRanges(List res) { - SlotDefinition slotDef = getInv().getSlotDefinition(); - if(slotDef.getNumUpgradeSlots() > 0) { - addInventorySlotRange(res, slotDef.getMinUpgradeSlot(), slotDef.getMaxUpgradeSlot() + 1); + protected List getTargetSlotsForTransfer(int slotNumber, Slot slot) { + if (slot.inventory == getInv()) { + SlotDefinition slotDef = getInv().getSlotDefinition(); + if (slotDef.isInputSlot(slot.getSlotIndex()) || slotDef.isUpgradeSlot(slot.getSlotIndex())) { + return Collections.singletonList(getPlayerInventorySlotRange(false)); + } + if (slotDef.isOutputSlot(slot.getSlotIndex())) { + return Collections.singletonList(getPlayerInventorySlotRange(true)); + } + } else if (slotNumber >= startPlayerSlot) { + List res = new ArrayList(); + addInputSlotRanges(res); + addUpgradeSlotRanges(res); + addPlayerSlotRanges(res, slotNumber); + return res; + } + return Collections.emptyList(); } - } - protected void addPlayerSlotRanges(List res, int slotIndex) { - if (slotIndex < endPlayerSlot) { - res.add(getPlayerHotbarSlotRange()); + protected int getProgressScaled(int scale) { + if (getInv() instanceof IProgressTile) { + Util.getProgressScaled(scale, (IProgressTile) getInv()); + } + return 0; } - if (slotIndex >= startHotBarSlot && slotIndex < endHotBarSlot) { - res.add(getPlayerInventoryWithoutHotbarSlotRange()); - } - } - protected List getTargetSlotsForTransfer(int slotNumber, Slot slot) { - if (slot.inventory == getInv()) { - SlotDefinition slotDef = getInv().getSlotDefinition(); - if (slotDef.isInputSlot(slot.getSlotIndex()) || slotDef.isUpgradeSlot(slot.getSlotIndex())) { - return Collections.singletonList(getPlayerInventorySlotRange(false)); - } - if (slotDef.isOutputSlot(slot.getSlotIndex())) { - return Collections.singletonList(getPlayerInventorySlotRange(true)); - } - } else if (slotNumber >= startPlayerSlot) { - List res = new ArrayList(); - addInputSlotRanges(res); - addUpgradeSlotRanges(res); - addPlayerSlotRanges(res, slotNumber); - return res; - } - return Collections.emptyList(); - } + public static class SlotRange { + final int start; + final int end; + final boolean reverse; - protected int getProgressScaled(int scale) { - if(getInv() instanceof IProgressTile) { - Util.getProgressScaled(scale, (IProgressTile) getInv()); + public SlotRange(int start, int end, boolean reverse) { + this.start = start; + this.end = end; + this.reverse = reverse; + } } - return 0; - } - - public static class SlotRange { - final int start; - final int end; - final boolean reverse; - - public SlotRange(int start, int end, boolean reverse) { - this.start = start; - this.end = end; - this.reverse = reverse; - } - } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java index 82df1f74..3bb9e4b5 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -1,54 +1,52 @@ package crazypants.enderio.machine.gui; -import java.util.ArrayList; - -import org.lwjgl.input.Keyboard; - import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.handlers.SpecialTooltipHandler; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.PacketIoMode; import crazypants.enderio.network.PacketHandler; +import java.util.ArrayList; +import org.lwjgl.input.Keyboard; public class GuiButtonIoConfig extends ToggleButton { - private final IIoConfigurable config; - private final GuiOverlayIoConfig configOverlay; + private final IIoConfigurable config; + private final GuiOverlayIoConfig configOverlay; - @SuppressWarnings("LeakingThisInConstructor") - public GuiButtonIoConfig(IGuiScreen gui, int id, int x, int y, IIoConfigurable config, GuiOverlayIoConfig configOverlay) { - super(gui, id, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); - this.config = config; - this.configOverlay = configOverlay; - this.configOverlay.setConfigB(this); + @SuppressWarnings("LeakingThisInConstructor") + public GuiButtonIoConfig( + IGuiScreen gui, int id, int x, int y, IIoConfigurable config, GuiOverlayIoConfig configOverlay) { + super(gui, id, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); + this.config = config; + this.configOverlay = configOverlay; + this.configOverlay.setConfigB(this); - String configTooltip = EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip"); - setUnselectedToolTip(configTooltip); + String configTooltip = EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip"); + setUnselectedToolTip(configTooltip); - ArrayList list = new ArrayList(); - list.add(configTooltip); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); - if(list.size() > 1) { - setSelectedToolTip(list.toArray(new String[list.size()])); + ArrayList list = new ArrayList(); + list.add(configTooltip); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); + if (list.size() > 1) { + setSelectedToolTip(list.toArray(new String[list.size()])); + } } - } - @Override - protected boolean toggleSelected() { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - if(!configOverlay.isVisible()) { - return false; - } - config.clearAllIoModes(); - PacketHandler.INSTANCE.sendToServer(new PacketIoMode(config)); - } else { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); + @Override + protected boolean toggleSelected() { + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + if (!configOverlay.isVisible()) { + return false; + } + config.clearAllIoModes(); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(config)); + } else { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + return true; } - return true; - } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 7435baec..2f01b44a 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -1,16 +1,5 @@ package crazypants.enderio.machine.gui; -import java.awt.Rectangle; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; @@ -18,7 +7,6 @@ import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector4f; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; @@ -27,187 +15,196 @@ import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; +import java.awt.Rectangle; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import org.lwjgl.opengl.GL11; public abstract class GuiMachineBase extends GuiContainerBaseEIO { - public static final Vector4f PUSH_COLOR = new Vector4f(0.8f, 0.4f, 0.1f, 0.5f); - public static final Vector4f PULL_COLOR = new Vector4f(0.1f, 0.4f, 0.8f, 0.5f); + public static final Vector4f PUSH_COLOR = new Vector4f(0.8f, 0.4f, 0.1f, 0.5f); + public static final Vector4f PULL_COLOR = new Vector4f(0.1f, 0.4f, 0.8f, 0.5f); - public static final int BUTTON_SIZE = 16; - private static final int CONFIG_ID = 8962349; - private static final int RECIPE_ID = CONFIG_ID + 1; + public static final int BUTTON_SIZE = 16; + private static final int CONFIG_ID = 8962349; + private static final int RECIPE_ID = CONFIG_ID + 1; - private final T tileEntity; + private final T tileEntity; - protected RedstoneModeButton redstoneButton; + protected RedstoneModeButton redstoneButton; - private final GuiOverlayIoConfig configOverlay; + private final GuiOverlayIoConfig configOverlay; - protected final GuiButtonIoConfig configB; - - protected IconButton recipeButton; + protected final GuiButtonIoConfig configB; - protected List progressTooltips; - protected int lastProgressTooltipValue = -1; + protected IconButton recipeButton; - protected GuiMachineBase(T machine, Container par1Container, String... guiTexture) { - super(par1Container, guiTexture); - tileEntity = machine; - - xSize = getXSize(); - ySize = getYSize(); - int x = getXSize() - 5 - BUTTON_SIZE; - int y = 5; - redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); + protected List progressTooltips; + protected int lastProgressTooltipValue = -1; - configOverlay = new GuiOverlayIoConfig(machine); - addOverlay(configOverlay); + protected GuiMachineBase(T machine, Container par1Container, String... guiTexture) { + super(par1Container, guiTexture); + tileEntity = machine; - y += 19; - configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); + xSize = getXSize(); + ySize = getYSize(); + int x = getXSize() - 5 - BUTTON_SIZE; + int y = 5; + redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); - y += 19; - recipeButton = new IconButton(this, RECIPE_ID, x, y, IconEIO.RECIPE); - recipeButton.visible = false; - recipeButton.setIconMargin(1, 1); - } + configOverlay = new GuiOverlayIoConfig(machine); + addOverlay(configOverlay); - @Override - public void initGui() { - super.initGui(); - redstoneButton.onGuiInit(); - configB.onGuiInit(); - recipeButton.onGuiInit(); - } + y += 19; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); - protected boolean showRecipeButton() { - return EnderIO.proxy.isNeiInstalled(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) buttonList.get(i); - guibutton.drawButton(mc, 0, 0); + y += 19; + recipeButton = new IconButton(this, RECIPE_ID, x, y, IconEIO.RECIPE); + recipeButton.visible = false; + recipeButton.setIconMargin(1, 1); } - if(showRecipeButton()) { - recipeButton.visible = true; + @Override + public void initGui() { + super.initGui(); + redstoneButton.onGuiInit(); + configB.onGuiInit(); + recipeButton.onGuiInit(); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - renderSlotHighlights(); - } - - public void renderSlotHighlights() { - SelectedFace sel = configOverlay.getSelection(); - if(sel != null) { - IoMode mode = sel.config.getIoMode(sel.face); - if(mode != null) { - renderSlotHighlights(mode); - } + protected boolean showRecipeButton() { + return EnderIO.proxy.isNeiInstalled(); } - } - public void renderSlotHighlights(IoMode mode) { - SlotDefinition slotDef = tileEntity.getSlotDefinition(); + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + super.drawGuiContainerBackgroundLayer(par1, par2, par3); - for (Slot invSlot : (List) inventorySlots.inventorySlots) { - if (invSlot.inventory == tileEntity) { - if ((mode == IoMode.PULL || mode == IoMode.PUSH_PULL) && slotDef.isInputSlot(invSlot.getSlotIndex())) { - renderSlotHighlight(invSlot, PULL_COLOR); - } else if ((mode == IoMode.PUSH || mode == IoMode.PUSH_PULL) && slotDef.isOutputSlot(invSlot.getSlotIndex())) { - renderSlotHighlight(invSlot, PUSH_COLOR); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) buttonList.get(i); + guibutton.drawButton(mc, 0, 0); } - } - } - } - protected void renderSlotHighlight(int slot, Vector4f col) { - Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); - renderSlotHighlight(col, invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); - } + if (showRecipeButton()) { + recipeButton.visible = true; + } - protected void renderSlotHighlight(Slot invSlot, Vector4f col) { - renderSlotHighlight(col, invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); - } + super.drawGuiContainerBackgroundLayer(par1, par2, par3); - protected void renderSlotHighlight(Vector4f col, int x, int y, int width, int height) { - GL11.glEnable(GL11.GL_BLEND); - RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y, 0, width, height, col); - GL11.glDisable(GL11.GL_BLEND); - } - - protected boolean isConfigOverlayEnabled() { - return configOverlay.isVisible(); - } - - protected T getTileEntity() { - return tileEntity; - } - - protected void addProgressTooltip(int x, int y, int w, int h) { - if(progressTooltips == null) { - progressTooltips = new ArrayList(); + renderSlotHighlights(); } - GuiToolTip tt = new GuiToolTip(new Rectangle(x, y, w, h), (String[])null); - progressTooltips.add(tt); - addToolTip(tt); - } - - protected final void updateProgressTooltips(int scaledProgress, float progress) { - if(lastProgressTooltipValue == scaledProgress || progressTooltips == null) { - return; - } - lastProgressTooltipValue = scaledProgress; - - if(scaledProgress < 0) { - for(GuiToolTip tt : progressTooltips) { - tt.setVisible(false); - } - return; + public void renderSlotHighlights() { + SelectedFace sel = configOverlay.getSelection(); + if (sel != null) { + IoMode mode = sel.config.getIoMode(sel.face); + if (mode != null) { + renderSlotHighlights(mode); + } + } } - String msg = formatProgressTooltip(scaledProgress, progress); - String[] tooltip = msg.split("\\|"); - for(GuiToolTip tt : progressTooltips) { - tt.setToolTipText(tooltip); - tt.setVisible(true); + public void renderSlotHighlights(IoMode mode) { + SlotDefinition slotDef = tileEntity.getSlotDefinition(); + + for (Slot invSlot : (List) inventorySlots.inventorySlots) { + if (invSlot.inventory == tileEntity) { + if ((mode == IoMode.PULL || mode == IoMode.PUSH_PULL) && slotDef.isInputSlot(invSlot.getSlotIndex())) { + renderSlotHighlight(invSlot, PULL_COLOR); + } else if ((mode == IoMode.PUSH || mode == IoMode.PUSH_PULL) + && slotDef.isOutputSlot(invSlot.getSlotIndex())) { + renderSlotHighlight(invSlot, PUSH_COLOR); + } + } + } } - } - protected String formatProgressTooltip(int scaledProgress, float progress) { - return MessageFormat.format(EnderIO.lang.localize("gui.progress"), scaledProgress); - } + protected void renderSlotHighlight(int slot, Vector4f col) { + Slot invSlot = (Slot) inventorySlots.inventorySlots.get(slot); + renderSlotHighlight(col, invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); + } - protected int scaleProgressForTooltip(float progress) { - return (int) (progress * 100); - } + protected void renderSlotHighlight(Slot invSlot, Vector4f col) { + renderSlotHighlight(col, invSlot.xDisplayPosition, invSlot.yDisplayPosition, 16, 16); + } - protected boolean shouldRenderProgress() { - if(tileEntity instanceof IProgressTile) { - float progress = ((IProgressTile) tileEntity).getProgress(); - if(progress > 0 && progress < 1) { - updateProgressTooltips(scaleProgressForTooltip(progress), progress); - return true; - } else { - updateProgressTooltips(-1, -1); + protected void renderSlotHighlight(Vector4f col, int x, int y, int width, int height) { + GL11.glEnable(GL11.GL_BLEND); + RenderUtil.renderQuad2D(getGuiLeft() + x, getGuiTop() + y, 0, width, height, col); + GL11.glDisable(GL11.GL_BLEND); + } + + protected boolean isConfigOverlayEnabled() { + return configOverlay.isVisible(); + } + + protected T getTileEntity() { + return tileEntity; + } + + protected void addProgressTooltip(int x, int y, int w, int h) { + if (progressTooltips == null) { + progressTooltips = new ArrayList(); + } + + GuiToolTip tt = new GuiToolTip(new Rectangle(x, y, w, h), (String[]) null); + progressTooltips.add(tt); + addToolTip(tt); + } + + protected final void updateProgressTooltips(int scaledProgress, float progress) { + if (lastProgressTooltipValue == scaledProgress || progressTooltips == null) { + return; + } + lastProgressTooltipValue = scaledProgress; + + if (scaledProgress < 0) { + for (GuiToolTip tt : progressTooltips) { + tt.setVisible(false); + } + return; + } + + String msg = formatProgressTooltip(scaledProgress, progress); + String[] tooltip = msg.split("\\|"); + for (GuiToolTip tt : progressTooltips) { + tt.setToolTipText(tooltip); + tt.setVisible(true); + } + } + + protected String formatProgressTooltip(int scaledProgress, float progress) { + return MessageFormat.format(EnderIO.lang.localize("gui.progress"), scaledProgress); + } + + protected int scaleProgressForTooltip(float progress) { + return (int) (progress * 100); + } + + protected boolean shouldRenderProgress() { + if (tileEntity instanceof IProgressTile) { + float progress = ((IProgressTile) tileEntity).getProgress(); + if (progress > 0 && progress < 1) { + updateProgressTooltips(scaleProgressForTooltip(progress), progress); + return true; + } else { + updateProgressTooltips(-1, -1); + return false; + } + } return false; - } } - return false; - } - protected int getProgressScaled(int scale) { - if(getTileEntity() instanceof IProgressTile) { - return Util.getProgressScaled(scale, (IProgressTile) getTileEntity()); + protected int getProgressScaled(int scale) { + if (getTileEntity() instanceof IProgressTile) { + return Util.getProgressScaled(scale, (IProgressTile) getTileEntity()); + } + return 0; } - return 0; - } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index 0d9be381..ace07f66 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -1,127 +1,123 @@ package crazypants.enderio.machine.gui; -import java.awt.Color; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; - import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; +import java.awt.Color; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; public class GuiOverlayIoConfig implements IGuiOverlay { - private boolean visible = false; - private ToggleButton configB; + private boolean visible = false; + private ToggleButton configB; - private IGuiScreen screen; + private IGuiScreen screen; - private Rectangle bounds; - int height = 80; + private Rectangle bounds; + int height = 80; - private IoConfigRenderer renderer; + private IoConfigRenderer renderer; - private List coords = new ArrayList(); + private List coords = new ArrayList(); - public GuiOverlayIoConfig(IIoConfigurable ioConf) { - coords.add(ioConf.getLocation()); - } - - public GuiOverlayIoConfig(Collection bc) { - coords.addAll(bc); - } - - public void setConfigB(ToggleButton configB) { - this.configB = configB; - } - - @Override - public void init(IGuiScreen screen) { - this.screen = screen; - renderer = new IoConfigRenderer(coords) { - - @Override - protected String getLabelForMode(IoMode mode) { - return GuiOverlayIoConfig.this.getLabelForMode(mode); - } - - }; - renderer.init(); - bounds = new Rectangle(screen.getOverlayOffsetX() + 5, screen.getYSize() - height -5, screen.getXSize() - 10, height); - } - - protected String getLabelForMode(IoMode mode) { - return mode.getLocalisedName(); - } - - @Override - public void draw(int mouseX, int mouseY, float partialTick) { - - RenderUtil.renderQuad2D(bounds.x, bounds.y, 0, bounds.width, bounds.height, ColorUtil.getRGB(Color.black)); - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - - int vpx = ( (screen.getGuiLeft() + bounds.x - screen.getOverlayOffsetX())* scaledresolution.getScaleFactor()); - int vpy = (screen.getGuiTop() + 4) * scaledresolution.getScaleFactor(); - int w = bounds.width * scaledresolution.getScaleFactor(); - int h = bounds.height * scaledresolution.getScaleFactor(); - - renderer.drawScreen(mouseX, mouseY, partialTick, new Rectangle(vpx,vpy,w,h), bounds); - - } - - @Override - public boolean handleMouseInput(int x, int y, int b) { - if(!isMouseInBounds(x, y)) { - renderer.handleMouseInput(); - return false; + public GuiOverlayIoConfig(IIoConfigurable ioConf) { + coords.add(ioConf.getLocation()); } - renderer.handleMouseInput(); - return true; - } - - @Override - public boolean isMouseInBounds(int mouseX, int mouseY) { - int x = mouseX - screen.getGuiLeft(); - int y = mouseY - screen.getGuiTop(); - if(bounds.contains(x,y)) { - return true; + public GuiOverlayIoConfig(Collection bc) { + coords.addAll(bc); } - return false; - } - @Override - public void setVisible(boolean visible) { - this.visible = visible; - if(configB != null) { - configB.setSelected(visible); + public void setConfigB(ToggleButton configB) { + this.configB = configB; } - } - @Override - public boolean isVisible() { - return visible; - } + @Override + public void init(IGuiScreen screen) { + this.screen = screen; + renderer = new IoConfigRenderer(coords) { - @Override - public Rectangle getBounds() { - return bounds; - } + @Override + protected String getLabelForMode(IoMode mode) { + return GuiOverlayIoConfig.this.getLabelForMode(mode); + } + }; + renderer.init(); + bounds = new Rectangle( + screen.getOverlayOffsetX() + 5, screen.getYSize() - height - 5, screen.getXSize() - 10, height); + } - public SelectedFace getSelection() { - return visible ? renderer.getSelection() : null; - } + protected String getLabelForMode(IoMode mode) { + return mode.getLocalisedName(); + } + + @Override + public void draw(int mouseX, int mouseY, float partialTick) { + + RenderUtil.renderQuad2D(bounds.x, bounds.y, 0, bounds.width, bounds.height, ColorUtil.getRGB(Color.black)); + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + + int vpx = ((screen.getGuiLeft() + bounds.x - screen.getOverlayOffsetX()) * scaledresolution.getScaleFactor()); + int vpy = (screen.getGuiTop() + 4) * scaledresolution.getScaleFactor(); + int w = bounds.width * scaledresolution.getScaleFactor(); + int h = bounds.height * scaledresolution.getScaleFactor(); + + renderer.drawScreen(mouseX, mouseY, partialTick, new Rectangle(vpx, vpy, w, h), bounds); + } + + @Override + public boolean handleMouseInput(int x, int y, int b) { + if (!isMouseInBounds(x, y)) { + renderer.handleMouseInput(); + return false; + } + + renderer.handleMouseInput(); + return true; + } + + @Override + public boolean isMouseInBounds(int mouseX, int mouseY) { + int x = mouseX - screen.getGuiLeft(); + int y = mouseY - screen.getGuiTop(); + if (bounds.contains(x, y)) { + return true; + } + return false; + } + + @Override + public void setVisible(boolean visible) { + this.visible = visible; + if (configB != null) { + configB.setSelected(visible); + } + } + + @Override + public boolean isVisible() { + return visible; + } + + @Override + public Rectangle getBounds() { + return bounds; + } + + public SelectedFace getSelection() { + return visible ? renderer.getSelection() : null; + } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 868dc940..2113bc30 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -1,102 +1,103 @@ package crazypants.enderio.machine.gui; -import java.awt.Rectangle; -import java.util.List; - -import net.minecraft.inventory.Container; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; - import crazypants.enderio.machine.AbstractPoweredMachineEntity; import crazypants.enderio.machine.power.PowerDisplayUtil; +import java.awt.Rectangle; +import java.util.List; +import net.minecraft.inventory.Container; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; public abstract class GuiPoweredMachineBase extends GuiMachineBase { - protected static final int POWER_Y = 14; - protected final int POWER_X = 15; - protected static final int POWER_WIDTH = 10; - protected static final int POWER_HEIGHT = 42; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + protected static final int POWER_Y = 14; + protected final int POWER_X = 15; + protected static final int POWER_WIDTH = 10; + protected static final int POWER_HEIGHT = 42; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - public GuiPoweredMachineBase(T machine, Container container, String... guiTexture) { - super(machine, container, guiTexture); - if(renderPowerBar()) { - addToolTip(new GuiToolTip(new Rectangle(getPowerX(), getPowerY(), getPowerWidth(), getPowerHeight()), "") { + public GuiPoweredMachineBase(T machine, Container container, String... guiTexture) { + super(machine, container, guiTexture); + if (renderPowerBar()) { + addToolTip(new GuiToolTip(new Rectangle(getPowerX(), getPowerY(), getPowerWidth(), getPowerHeight()), "") { - @Override - protected void updateText() { - text.clear(); - if(renderPowerBar()) { - updatePowerBarTooltip(text); - } + @Override + protected void updateText() { + text.clear(); + if (renderPowerBar()) { + updatePowerBarTooltip(text); + } + } + }); } - - }); } - } - protected String getPowerOutputLabel() { - return StatCollector.translateToLocal("enderio.gui.max"); - } - - protected int getPowerOutputValue() { - return getTileEntity().getPowerUsePerTick(); - } - - protected void updatePowerBarTooltip(List text) { - text.add(getPowerOutputLabel() + " " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr()); - text.add(PowerDisplayUtil.formatStoredPower(getTileEntity().getEnergyStored(), getTileEntity().getMaxEnergyStored())); - } - - public void renderPowerBar(int k, int l) { - if(renderPowerBar()) { - int i1 = getTileEntity().getEnergyStoredScaled(getPowerHeight()); - // x, y, u, v, width, height - drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, getPowerU(), getPowerV(), getPowerWidth(), i1); + protected String getPowerOutputLabel() { + return StatCollector.translateToLocal("enderio.gui.max"); } - } - protected int getPowerX() { - return POWER_X; - } + protected int getPowerOutputValue() { + return getTileEntity().getPowerUsePerTick(); + } - protected int getPowerY() { - return POWER_Y; - } + protected void updatePowerBarTooltip(List text) { + text.add(getPowerOutputLabel() + " " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + text.add(PowerDisplayUtil.formatStoredPower( + getTileEntity().getEnergyStored(), getTileEntity().getMaxEnergyStored())); + } - protected int getPowerWidth() { - return POWER_WIDTH; - } + public void renderPowerBar(int k, int l) { + if (renderPowerBar()) { + int i1 = getTileEntity().getEnergyStoredScaled(getPowerHeight()); + // x, y, u, v, width, height + drawTexturedModalRect( + k + getPowerX(), + l + (getPowerY() + getPowerHeight()) - i1, + getPowerU(), + getPowerV(), + getPowerWidth(), + i1); + } + } - protected int getPowerHeight() { - return POWER_HEIGHT; - } + protected int getPowerX() { + return POWER_X; + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + protected int getPowerY() { + return POWER_Y; + } - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; - renderPowerBar(k, l); + protected int getPowerWidth() { + return POWER_WIDTH; + } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + protected int getPowerHeight() { + return POWER_HEIGHT; + } - protected int getPowerV() { - return 31; - } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - protected int getPowerU() { - return 176; - } + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + renderPowerBar(k, l); - protected boolean renderPowerBar() { - return true; - } + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + protected int getPowerV() { + return 31; + } + + protected int getPowerU() { + return 176; + } + + protected boolean renderPowerBar() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index c3fcd8d0..d6bf6925 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -1,9 +1,23 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.PlayerUtil; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; +import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerHandlerUtil; import java.text.NumberFormat; import java.util.Random; import java.util.UUID; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -19,244 +33,231 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.PlayerUtil; -import com.enderio.core.common.util.Util; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; -import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerHandlerUtil; - public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTooltipProvider { - static final NumberFormat NF = NumberFormat.getIntegerInstance(); + static final NumberFormat NF = NumberFormat.getIntegerInstance(); - public static BlockHyperCube create() { + public static BlockHyperCube create() { - PacketHandler.INSTANCE.registerMessage(PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketStoredPower.class, PacketStoredPower.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketStoredPower.class, PacketStoredPower.class, PacketHandler.nextID(), Side.CLIENT); - BlockHyperCube result = new BlockHyperCube(); - result.init(); + BlockHyperCube result = new BlockHyperCube(); + result.init(); - //TODO:1.7 Not getting the client event - ConnectionHandler ch = new ConnectionHandler(); - FMLCommonHandler.instance().bus().register(ch); - MinecraftForge.EVENT_BUS.register(ch); + // TODO:1.7 Not getting the client event + ConnectionHandler ch = new ConnectionHandler(); + FMLCommonHandler.instance().bus().register(ch); + MinecraftForge.EVENT_BUS.register(ch); - return result; - } - - private BlockHyperCube() { - super(ModObject.blockHyperCube.unlocalisedName, TileHyperCube.class); - setCreativeTab(null); - } - - @Override - protected void init() { - super.init(); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_HYPER_CUBE, this); - } - - public IIcon getPortalIcon() { - return blockIcon; - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:tesseractPortal"); - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return 8; - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - if(world.isRemote) { - return; - } - TileHyperCube tr = (TileHyperCube) world.getTileEntity(x, y, z); - tr.onBlockAdded(); - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - if(world.isRemote) { - return; - } - TileHyperCube te = (TileHyperCube) world.getTileEntity(x, y, z); - te.onNeighborBlockChange(); - - } - - private void setChannelOnItem(TileHyperCube hc, ItemStack itemStack) { - Channel chan = hc.getChannel(); - if(chan != null) { - NBTTagCompound tag = itemStack.getTagCompound(); - if(tag == null) { - tag = new NBTTagCompound(); - itemStack.setTagCompound(tag); - } - tag.setString("channelName", chan.name); - tag.setBoolean("channelIsPublic", chan.isPublic()); - if(!chan.isPublic()) { - tag.setString("channelUser", chan.user.toString()); - } - } - } - - private void setIoOnItem(TileHyperCube hc, ItemStack itemStack) { - NBTTagCompound tag = itemStack.getTagCompound(); - if(tag == null) { - tag = new NBTTagCompound(); - itemStack.setTagCompound(tag); - } - for (SubChannel sc : SubChannel.values()) { - tag.setShort("sendRecieve" + sc.ordinal(), (short) hc.getModeForChannel(sc).ordinal()); - } - } - - private void setIoOnTransciever(TileHyperCube hc, ItemStack itemStack) { - NBTTagCompound tag = itemStack.getTagCompound(); - if(tag == null) { - return; - } - for (SubChannel sc : SubChannel.values()) { - if(tag.hasKey("sendRecieve" + sc.ordinal())) { - hc.setModeForChannel(sc, IoMode.values()[tag.getShort("sendRecieve" + sc.ordinal())]); - } - } - } - - private Channel getChannelFromItem(ItemStack itemStack) { - NBTTagCompound tag = itemStack.getTagCompound(); - if(tag == null) { - return null; + return result; } - String channelName = tag.getString("channelName"); - if(channelName == null || channelName.trim().isEmpty()) { - return null; + private BlockHyperCube() { + super(ModObject.blockHyperCube.unlocalisedName, TileHyperCube.class); + setCreativeTab(null); } - UUID user = null; - if(!tag.getBoolean("channelIsPublic")) { - user = PlayerUtil.getPlayerUIDUnstable(tag.getString("channelUser")); + @Override + protected void init() { + super.init(); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_HYPER_CUBE, this); } - return new Channel(channelName, user); - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileHyperCube) { - TileHyperCube hc = (TileHyperCube) te; - hc.onBreakBlock(); - ItemStack itemStack = new ItemStack(this); - PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getEnergyStored()); - setChannelOnItem(hc, itemStack); - setIoOnItem(hc, itemStack); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - ItemRecieveBuffer rb = hc.getRecieveBuffer(); - Util.dropItems(world, rb, x, y, z, true); - - } + public IIcon getPortalIcon() { + return blockIcon; } - return super.removedByPlayer(world, player, x, y, z); - } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - if(world.isRemote) { - return; + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileHyperCube) { - TileHyperCube cb = (TileHyperCube) te; - cb.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(stack)); - if(player instanceof EntityPlayerMP) { - cb.setOwner(PlayerUtil.getPlayerUUID(((EntityPlayerMP) player).getGameProfile().getName())); - } - cb.setChannel(getChannelFromItem(stack)); - setIoOnTransciever(cb, stack); + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:tesseractPortal"); } - world.markBlockForUpdate(x, y, z); - } - @Override - public int quantityDropped(Random r) { - return 0; - } - - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_HYPER_CUBE, world, x, y, z); + @Override + public int getRenderType() { + return -1; } - return true; - } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new ContainerHyperCube(); - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileHyperCube) { - TileHyperCube hc = (TileHyperCube) te; - return new GuiHyperCube(hc); + @Override + public boolean isOpaqueCube() { + return false; } - return null; - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + return 8; + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + if (world.isRemote) { + return; + } + TileHyperCube tr = (TileHyperCube) world.getTileEntity(x, y, z); + tr.onBlockAdded(); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + if (world.isRemote) { + return; + } + TileHyperCube te = (TileHyperCube) world.getTileEntity(x, y, z); + te.onNeighborBlockChange(); + } + + private void setChannelOnItem(TileHyperCube hc, ItemStack itemStack) { + Channel chan = hc.getChannel(); + if (chan != null) { + NBTTagCompound tag = itemStack.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + itemStack.setTagCompound(tag); + } + tag.setString("channelName", chan.name); + tag.setBoolean("channelIsPublic", chan.isPublic()); + if (!chan.isPublic()) { + tag.setString("channelUser", chan.user.toString()); + } + } + } + + private void setIoOnItem(TileHyperCube hc, ItemStack itemStack) { + NBTTagCompound tag = itemStack.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + itemStack.setTagCompound(tag); + } + for (SubChannel sc : SubChannel.values()) { + tag.setShort("sendRecieve" + sc.ordinal(), (short) + hc.getModeForChannel(sc).ordinal()); + } + } + + private void setIoOnTransciever(TileHyperCube hc, ItemStack itemStack) { + NBTTagCompound tag = itemStack.getTagCompound(); + if (tag == null) { + return; + } + for (SubChannel sc : SubChannel.values()) { + if (tag.hasKey("sendRecieve" + sc.ordinal())) { + hc.setModeForChannel(sc, IoMode.values()[tag.getShort("sendRecieve" + sc.ordinal())]); + } + } + } + + private Channel getChannelFromItem(ItemStack itemStack) { + NBTTagCompound tag = itemStack.getTagCompound(); + if (tag == null) { + return null; + } + + String channelName = tag.getString("channelName"); + if (channelName == null || channelName.trim().isEmpty()) { + return null; + } + + UUID user = null; + if (!tag.getBoolean("channelIsPublic")) { + user = PlayerUtil.getPlayerUIDUnstable(tag.getString("channelUser")); + } + return new Channel(channelName, user); + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileHyperCube) { + TileHyperCube hc = (TileHyperCube) te; + hc.onBreakBlock(); + ItemStack itemStack = new ItemStack(this); + PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getEnergyStored()); + setChannelOnItem(hc, itemStack); + setIoOnItem(hc, itemStack); + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + ItemRecieveBuffer rb = hc.getRecieveBuffer(); + Util.dropItems(world, rb, x, y, z, true); + } + } + return super.removedByPlayer(world, player, x, y, z); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + if (world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileHyperCube) { + TileHyperCube cb = (TileHyperCube) te; + cb.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(stack)); + if (player instanceof EntityPlayerMP) { + cb.setOwner(PlayerUtil.getPlayerUUID( + ((EntityPlayerMP) player).getGameProfile().getName())); + } + cb.setChannel(getChannelFromItem(stack)); + setIoOnTransciever(cb, stack); + } + world.markBlockForUpdate(x, y, z); + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_HYPER_CUBE, world, x, y, z); + } + return true; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerHyperCube(); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileHyperCube) { + TileHyperCube hc = (TileHyperCube) te; + return new GuiHyperCube(hc); + } + return null; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java index 79050866..fbde42f0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java @@ -4,58 +4,50 @@ import java.util.UUID; public class Channel { - final String name; - final UUID user; + final String name; + final UUID user; - Channel(String name, UUID uuid) { - this.name = trim(name); - this.user = uuid; - } - - public boolean isPublic() { - return user == null; - } - - private String trim(String str) { - if(str == null) { - return null; + Channel(String name, UUID uuid) { + this.name = trim(name); + this.user = uuid; } - str = str.trim(); - if(str.isEmpty()) { - return null; + + public boolean isPublic() { + return user == null; } - return str; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((user == null) ? 0 : user.hashCode()); - return result; - } + private String trim(String str) { + if (str == null) { + return null; + } + str = str.trim(); + if (str.isEmpty()) { + return null; + } + return str; + } - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - Channel other = (Channel) obj; - if(name == null) { - if(other.name != null) - return false; - } else if(!name.equals(other.name)) - return false; - if(user == null) { - if(other.user != null) - return false; - } else if(!user.equals(other.user)) - return false; - return true; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((user == null) ? 0 : user.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + Channel other = (Channel) obj; + if (name == null) { + if (other.name != null) return false; + } else if (!name.equals(other.name)) return false; + if (user == null) { + if (other.user != null) return false; + } else if (!user.equals(other.user)) return false; + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java index 25d10590..7d78618a 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ClientChannelRegister.java @@ -6,65 +6,63 @@ import java.util.List; public class ClientChannelRegister { - static final ClientChannelRegister instance = new ClientChannelRegister(); + static final ClientChannelRegister instance = new ClientChannelRegister(); - private final List publicChannels = new ArrayList(); - private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); + private final List publicChannels = new ArrayList(); + private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final List privateChannels = new ArrayList(); - private final List privateChannelsRO = Collections.unmodifiableList(privateChannels); + private final List privateChannels = new ArrayList(); + private final List privateChannelsRO = Collections.unmodifiableList(privateChannels); - void setPublicChannels(List channels) { - publicChannels.clear(); - publicChannels.addAll(channels); - } - - void setPrivateChannels(List channels) { - privateChannels.clear(); - privateChannels.addAll(channels); - } - - public List getPublicChannels() { - return publicChannelsRO; - } - - public List getPrivateChannels() { - return privateChannelsRO; - } - - void addChannel(Channel channel) { - if(channel == null) { - return; - } - if(channel.isPublic()) { - if(!publicChannels.contains(channel)) { - publicChannels.add(channel); - } - } else { - if(!privateChannels.contains(channel)) { - privateChannels.add(channel); - } - } - } - - public void channelAdded(Channel channel) { - if(channel.isPublic() && !publicChannels.contains(channel)) { - publicChannels.add(channel); - } - } - - public void reset() { - publicChannels.clear(); - privateChannels.clear(); - } - - public void channelRemoved(Channel c) { - if(c.isPublic()) { - publicChannels.remove(c); - } else { - privateChannels.remove(c); + void setPublicChannels(List channels) { + publicChannels.clear(); + publicChannels.addAll(channels); } - } + void setPrivateChannels(List channels) { + privateChannels.clear(); + privateChannels.addAll(channels); + } + public List getPublicChannels() { + return publicChannelsRO; + } + + public List getPrivateChannels() { + return privateChannelsRO; + } + + void addChannel(Channel channel) { + if (channel == null) { + return; + } + if (channel.isPublic()) { + if (!publicChannels.contains(channel)) { + publicChannels.add(channel); + } + } else { + if (!privateChannels.contains(channel)) { + privateChannels.add(channel); + } + } + } + + public void channelAdded(Channel channel) { + if (channel.isPublic() && !publicChannels.contains(channel)) { + publicChannels.add(channel); + } + } + + public void reset() { + publicChannels.clear(); + privateChannels.clear(); + } + + public void channelRemoved(Channel c) { + if (c.isPublic()) { + publicChannels.remove(c); + } else { + privateChannels.remove(c); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java index 56f82bbb..86c83a88 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -1,216 +1,208 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.common.util.InventoryWrapper; +import crazypants.enderio.ModObject; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.InventoryWrapper; - -import crazypants.enderio.ModObject; - public class CompositeInventory implements ISidedInventory { - private final List inventories = new ArrayList(); - private int size = 0; + private final List inventories = new ArrayList(); + private int size = 0; - public void addInventory(CompositeInventory inv) { - for (InvEntry ie : inv.inventories) { - addInventory(ie.inv, ie.side); - } - } - - public void addInventory(IInventory inv, ForgeDirection side) { - if(inv == null) { - return; - } - inventories.add(new InvEntry(inv, size, side)); - updateSize(); - } - - public void removeInventory(IInventory inv) { - if(inv == null) { - return; - } - InvEntry remove = null; - for (InvEntry ie : inventories) { - if(ie.inv == inv || ie.origInv == inv) { - remove = ie; - break; - } - } - if(remove != null) { - inventories.remove(remove); - updateSize(); - } - } - - private void updateSize() { - size = 0; - for (InvEntry inv : inventories) { - if(inv != null && inv.inv != null) { - inv.startIndex = size; - inv.endIndex = inv.startIndex + inv.inv.getSizeInventory() - 1; - size += inv.inv.getSizeInventory(); - } - } - } - - @Override - public int getSizeInventory() { - return size; - } - - @Override - public ItemStack getStackInSlot(int i) { - for (InvEntry inv : inventories) { - if(inv.containsSlot(i)) { - return inv.inv.getStackInSlot(inv.getSlot(i)); - } - } - return null; - } - - @Override - public ItemStack decrStackSize(int slot, int j) { - for (InvEntry inv : inventories) { - if(inv.containsSlot(slot)) { - return inv.inv.decrStackSize(inv.getSlot(slot), j); - } - } - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemStack) { - for (InvEntry inv : inventories) { - if(inv.containsSlot(slot)) { - inv.inv.setInventorySlotContents(inv.getSlot(slot), itemStack); - return; - } - } - - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - List resList = new ArrayList(); - for (InvEntry inv : inventories) { - int[] slots = inv.inv.getAccessibleSlotsFromSide(inv.side.ordinal()); - if(slots != null) { - for (int i = 0; i < slots.length; i++) { - resList.add(slots[i]); + public void addInventory(CompositeInventory inv) { + for (InvEntry ie : inv.inventories) { + addInventory(ie.inv, ie.side); } - } } - int[] result = new int[resList.size()]; - for (int i = 0; i < result.length; i++) { - result[i] = resList.get(i); - } - return result; - } - - @Override - public boolean canInsertItem(int slot, ItemStack item, int side) { - for (InvEntry inv : inventories) { - if(inv != null && inv.containsSlot(slot)) { - return inv.inv.canInsertItem(inv.getSlot(slot), item, side); - } - } - return false; - } - - @Override - public boolean canExtractItem(int slot, ItemStack item, int side) { - for (InvEntry inv : inventories) { - if(inv != null && inv.containsSlot(slot)) { - return inv.inv.canExtractItem(inv.getSlot(slot), item, side); - } - } - return false; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack item) { - for (InvEntry inv : inventories) { - if(inv != null && inv.containsSlot(slot)) { - return inv.inv.isItemValidForSlot(inv.getSlot(slot), item); - } - } - return false; - } - - @Override - public void markDirty() { - for (InvEntry inv : inventories) { - if(inv != null) { - inv.inv.markDirty(); - } - } - } - - //---------------- Inventory - - @Override - public String getInventoryName() { - return ModObject.blockHyperCube.unlocalisedName; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return false; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - private static class InvEntry { - IInventory origInv; - ISidedInventory inv; - int startIndex; - int endIndex; - ForgeDirection side; - - InvEntry(IInventory inventory, int startIndex, ForgeDirection side) { - this.origInv = inventory; - inv = InventoryWrapper.asSidedInventory(inventory); - this.endIndex = startIndex + inv.getSizeInventory() - 1; - this.side = side; + public void addInventory(IInventory inv, ForgeDirection side) { + if (inv == null) { + return; + } + inventories.add(new InvEntry(inv, size, side)); + updateSize(); } - boolean containsSlot(int index) { - return index >= startIndex && index <= endIndex; + public void removeInventory(IInventory inv) { + if (inv == null) { + return; + } + InvEntry remove = null; + for (InvEntry ie : inventories) { + if (ie.inv == inv || ie.origInv == inv) { + remove = ie; + break; + } + } + if (remove != null) { + inventories.remove(remove); + updateSize(); + } } - int getSlot(int index) { - return index - startIndex; + private void updateSize() { + size = 0; + for (InvEntry inv : inventories) { + if (inv != null && inv.inv != null) { + inv.startIndex = size; + inv.endIndex = inv.startIndex + inv.inv.getSizeInventory() - 1; + size += inv.inv.getSizeInventory(); + } + } } - } + @Override + public int getSizeInventory() { + return size; + } + @Override + public ItemStack getStackInSlot(int i) { + for (InvEntry inv : inventories) { + if (inv.containsSlot(i)) { + return inv.inv.getStackInSlot(inv.getSlot(i)); + } + } + return null; + } + + @Override + public ItemStack decrStackSize(int slot, int j) { + for (InvEntry inv : inventories) { + if (inv.containsSlot(slot)) { + return inv.inv.decrStackSize(inv.getSlot(slot), j); + } + } + return null; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemStack) { + for (InvEntry inv : inventories) { + if (inv.containsSlot(slot)) { + inv.inv.setInventorySlotContents(inv.getSlot(slot), itemStack); + return; + } + } + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + List resList = new ArrayList(); + for (InvEntry inv : inventories) { + int[] slots = inv.inv.getAccessibleSlotsFromSide(inv.side.ordinal()); + if (slots != null) { + for (int i = 0; i < slots.length; i++) { + resList.add(slots[i]); + } + } + } + + int[] result = new int[resList.size()]; + for (int i = 0; i < result.length; i++) { + result[i] = resList.get(i); + } + return result; + } + + @Override + public boolean canInsertItem(int slot, ItemStack item, int side) { + for (InvEntry inv : inventories) { + if (inv != null && inv.containsSlot(slot)) { + return inv.inv.canInsertItem(inv.getSlot(slot), item, side); + } + } + return false; + } + + @Override + public boolean canExtractItem(int slot, ItemStack item, int side) { + for (InvEntry inv : inventories) { + if (inv != null && inv.containsSlot(slot)) { + return inv.inv.canExtractItem(inv.getSlot(slot), item, side); + } + } + return false; + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack item) { + for (InvEntry inv : inventories) { + if (inv != null && inv.containsSlot(slot)) { + return inv.inv.isItemValidForSlot(inv.getSlot(slot), item); + } + } + return false; + } + + @Override + public void markDirty() { + for (InvEntry inv : inventories) { + if (inv != null) { + inv.inv.markDirty(); + } + } + } + + // ---------------- Inventory + + @Override + public String getInventoryName() { + return ModObject.blockHyperCube.unlocalisedName; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return false; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + private static class InvEntry { + IInventory origInv; + ISidedInventory inv; + int startIndex; + int endIndex; + ForgeDirection side; + + InvEntry(IInventory inventory, int startIndex, ForgeDirection side) { + this.origInv = inventory; + inv = InventoryWrapper.asSidedInventory(inventory); + this.endIndex = startIndex + inv.getSizeInventory() - 1; + this.side = side; + } + + boolean containsSlot(int index) { + return index >= startIndex && index <= endIndex; + } + + int getSlot(int index) { + return index - startIndex; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java index e170dc5c..5cac1086 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java @@ -1,23 +1,22 @@ package crazypants.enderio.machine.hypercube; -import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.player.EntityPlayerMP; public class ConnectionHandler { - //to lazy to create a new class - @SubscribeEvent - public void onPlayerLoggon(PlayerLoggedInEvent evt) { - PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, true), (EntityPlayerMP) evt.player); - PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, false), (EntityPlayerMP) evt.player); - } - - @SubscribeEvent - public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { - ClientChannelRegister.instance.reset(); - } + // to lazy to create a new class + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, true), (EntityPlayerMP) evt.player); + PacketHandler.INSTANCE.sendTo(new PacketChannelList(evt.player, false), (EntityPlayerMP) evt.player); + } + @SubscribeEvent + public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { + ClientChannelRegister.instance.reset(); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ContainerHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/ContainerHyperCube.java index 1e0fd416..2fcd9ab0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ContainerHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ContainerHyperCube.java @@ -5,9 +5,8 @@ import net.minecraft.inventory.Container; public class ContainerHyperCube extends Container { - @Override - public boolean canInteractWith(EntityPlayer arg0) { - return true; - } - + @Override + public boolean canInteractWith(EntityPlayer arg0) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java index ac8fa358..d0627a4d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiChannelList.java @@ -1,90 +1,87 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.client.gui.widget.GuiScrollableList; +import com.enderio.core.client.render.ColorUtil; import java.awt.Color; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import com.enderio.core.client.gui.widget.GuiScrollableList; -import com.enderio.core.client.render.ColorUtil; - public class GuiChannelList extends GuiScrollableList { - private List channels = new ArrayList(); + private List channels = new ArrayList(); - private Channel activeChannel; + private Channel activeChannel; - private final GuiHyperCube parent; + private final GuiHyperCube parent; - public GuiChannelList(GuiHyperCube parent, int width, int height, int originX, int originY) { - super(width, height, originX, originY, Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 4); - this.parent = parent; - } - - void setChannels(List val) { - if(val == null) { - channels = Collections.emptyList(); + public GuiChannelList(GuiHyperCube parent, int width, int height, int originX, int originY) { + super(width, height, originX, originY, Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 4); + this.parent = parent; } - channels = val; - } - void setActiveChannel(Channel channel) { - activeChannel = channel; - } - - @Override - public int getNumElements() { - return isActiveChannelListed() ? channels.size() : channels.size() + 1; - } - - @Override - public Channel getElementAt(int index) { - if(!isActiveChannelListed()) { - if(index == 0) { - return activeChannel; - } - index--; + void setChannels(List val) { + if (val == null) { + channels = Collections.emptyList(); + } + channels = val; } - if(index < 0 || index >= channels.size()) { - return null; - } - return channels.get(index); - } - protected boolean isActiveChannelListed() { - return activeChannel == null || channels.contains(activeChannel); - } + void setActiveChannel(Channel channel) { + activeChannel = channel; + } - @Override - protected boolean elementClicked(int i, boolean flag) { - if(getElementAt(i) == null) { - return false; - } else { - return true; + @Override + public int getNumElements() { + return isActiveChannelListed() ? channels.size() : channels.size() + 1; } - } - @Override - protected void drawElement(int index, int xPosition, int yPosition, int rowHeight, Tessellator tessellator) { - if(index < 0 || index >= channels.size()) { - return; + @Override + public Channel getElementAt(int index) { + if (!isActiveChannelListed()) { + if (index == 0) { + return activeChannel; + } + index--; + } + if (index < 0 || index >= channels.size()) { + return null; + } + return channels.get(index); } - Channel c = getElementAt(index); - if(c == null) { - return; - } - int col = ColorUtil.getRGB(Color.white); - if(c.equals(activeChannel)) { - if(isActiveChannelListed()) { - col = ColorUtil.getRGB(Color.cyan); - } else { - col = ColorUtil.getRGB(Color.red); - } - } - parent.drawString(parent.getFontRenderer(), c.name, xPosition + margin, yPosition + margin / 2, col); - } + protected boolean isActiveChannelListed() { + return activeChannel == null || channels.contains(activeChannel); + } + + @Override + protected boolean elementClicked(int i, boolean flag) { + if (getElementAt(i) == null) { + return false; + } else { + return true; + } + } + + @Override + protected void drawElement(int index, int xPosition, int yPosition, int rowHeight, Tessellator tessellator) { + if (index < 0 || index >= channels.size()) { + return; + } + Channel c = getElementAt(index); + if (c == null) { + return; + } + int col = ColorUtil.getRGB(Color.white); + if (c.equals(activeChannel)) { + if (isActiveChannelListed()) { + col = ColorUtil.getRGB(Color.cyan); + } else { + col = ColorUtil.getRGB(Color.red); + } + } + parent.drawString(parent.getFontRenderer(), c.name, xPosition + margin, yPosition + margin / 2, col); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index c81e70ef..8214ce67 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -1,15 +1,5 @@ package crazypants.enderio.machine.hypercube; -import java.awt.Color; -import java.awt.Rectangle; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.ListSelectionListener; import com.enderio.core.client.gui.button.IconButton; @@ -18,10 +8,8 @@ import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.PlayerUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; @@ -30,411 +18,422 @@ import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import org.lwjgl.opengl.GL11; public class GuiHyperCube extends GuiContainerBaseEIO { - protected static final int POWER_INPUT_BUTTON_ID = 1; - protected static final int POWER_OUTPUT_BUTTON_ID = 2; - protected static final int ADD_BUTTON_ID = 3; - protected static final int PRIVATE_BUTTON_ID = 4; + protected static final int POWER_INPUT_BUTTON_ID = 1; + protected static final int POWER_OUTPUT_BUTTON_ID = 2; + protected static final int ADD_BUTTON_ID = 3; + protected static final int PRIVATE_BUTTON_ID = 4; - protected static final int SELECT_PRIVATE_BUTTON_ID = 5; - protected static final int SELECT_PUBLIC_BUTTON_ID = 6; + protected static final int SELECT_PRIVATE_BUTTON_ID = 5; + protected static final int SELECT_PUBLIC_BUTTON_ID = 6; - protected static final int DELETE_PRIVATE_BUTTON_ID = 7; - protected static final int DELETE_PUBLIC_BUTTON_ID = 8; + protected static final int DELETE_PRIVATE_BUTTON_ID = 7; + protected static final int DELETE_PUBLIC_BUTTON_ID = 8; - protected static final int POWER_MODE_BUTTON_ID = 9; - protected static final int FLUID_MODE_BUTTON_ID = 10; - private static final int ITEM_MODE_BUTTON_ID = 11; + protected static final int POWER_MODE_BUTTON_ID = 9; + protected static final int FLUID_MODE_BUTTON_ID = 10; + private static final int ITEM_MODE_BUTTON_ID = 11; - private static final int POWER_X = 227; - private static final int POWER_Y = 46; - private static final int POWER_WIDTH = 10; - private static final int POWER_HEIGHT = 66; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + private static final int POWER_X = 227; + private static final int POWER_Y = 46; + private static final int POWER_WIDTH = 10; + private static final int POWER_HEIGHT = 66; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - private final TileHyperCube cube; + private final TileHyperCube cube; - private IconButton addButton; - private ToggleButton privateButton; + private IconButton addButton; + private ToggleButton privateButton; - private TextFieldEnder newChannelTF; + private TextFieldEnder newChannelTF; - private GuiChannelList publicChannelList; - private GuiChannelList privateChannelList; - private ListSelectionListener selectionListener; + private GuiChannelList publicChannelList; + private GuiChannelList privateChannelList; + private ListSelectionListener selectionListener; - private IconButton selectPublicB; - private IconButton deletePublicB; + private IconButton selectPublicB; + private IconButton deletePublicB; - private IconButton selectPrivateB; - private IconButton deletePrivateB; + private IconButton selectPrivateB; + private IconButton deletePrivateB; - private IconButton powerB; - private IconButton fluidB; - private IconButton itemB; + private IconButton powerB; + private IconButton fluidB; + private IconButton itemB; - private RedstoneModeButton rsB; + private RedstoneModeButton rsB; - public GuiHyperCube(TileHyperCube te) { - super(new ContainerHyperCube(), "hyperCube"); - this.cube = te; + public GuiHyperCube(TileHyperCube te) { + super(new ContainerHyperCube(), "hyperCube"); + this.cube = te; - xSize = 245; - ySize = 145; + xSize = 245; + ySize = 145; - addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { - @Override - protected void updateText() { - text.clear(); - text.add(PowerDisplayUtil.formatPower(cube.getEnergyStored()) + " / " - + PowerDisplayUtil.formatPower(cube.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); - } + @Override + protected void updateText() { + text.clear(); + text.add(PowerDisplayUtil.formatPower(cube.getEnergyStored()) + " / " + + PowerDisplayUtil.formatPower(cube.getMaxEnergyStored()) + " " + + PowerDisplayUtil.abrevation()); + } + }); - }); + addButton = new IconButton(this, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); + addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); + addButton.enabled = false; - addButton = new IconButton(this, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); - addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); - addButton.enabled = false; + privateButton = new ToggleButton(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); + privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); + privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); - privateButton = new ToggleButton(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); - privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); - privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); + deletePublicB = new IconButton(this, DELETE_PUBLIC_BUTTON_ID, 74, 117, IconEIO.MINUS); + deletePublicB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); + selectPublicB = new IconButton(this, SELECT_PUBLIC_BUTTON_ID, 95, 117, IconEIO.TICK); + selectPublicB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); - deletePublicB = new IconButton(this, DELETE_PUBLIC_BUTTON_ID, 74, 117, IconEIO.MINUS); - deletePublicB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); - selectPublicB = new IconButton(this, SELECT_PUBLIC_BUTTON_ID, 95, 117, IconEIO.TICK); - selectPublicB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); + deletePrivateB = new IconButton(this, DELETE_PRIVATE_BUTTON_ID, 183, 117, IconEIO.MINUS); + deletePrivateB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); + selectPrivateB = new IconButton(this, SELECT_PRIVATE_BUTTON_ID, 204, 117, IconEIO.TICK); + selectPrivateB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); - deletePrivateB = new IconButton(this, DELETE_PRIVATE_BUTTON_ID, 183, 117, IconEIO.MINUS); - deletePrivateB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); - selectPrivateB = new IconButton(this, SELECT_PRIVATE_BUTTON_ID, 204, 117, IconEIO.TICK); - selectPrivateB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); + int x = 163; + int y = 12; + itemB = new IconButton(this, ITEM_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_ITEM); + itemB.setIconMargin(3, 3); - int x = 163; - int y = 12; - itemB = new IconButton(this, ITEM_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_ITEM); - itemB.setIconMargin(3, 3); + x += 18; + powerB = new IconButton(this, POWER_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_POWER); + powerB.setIconMargin(3, 3); - x += 18; - powerB = new IconButton(this, POWER_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_POWER); - powerB.setIconMargin(3, 3); + x += 18; + fluidB = new IconButton(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); + fluidB.setIconMargin(3, 3); - x += 18; - fluidB = new IconButton(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); - fluidB.setIconMargin(3, 3); + x += 24; + rsB = new RedstoneModeButton(this, 99, x, y, te, new BlockCoord(te)); - x += 24; - rsB = new RedstoneModeButton(this, 99, x, y, te, new BlockCoord(te)); + updateIoButtons(); - updateIoButtons(); + int w = 104; + int h = 68; + x = 7; + y = 45; - int w = 104; - int h = 68; - x = 7; - y = 45; + Channel activeChannel = cube.getChannel(); + publicChannelList = new GuiChannelList(this, w, h, x, y); + publicChannelList.setChannels(ClientChannelRegister.instance.getPublicChannels()); + publicChannelList.setShowSelectionBox(true); + publicChannelList.setScrollButtonIds(100, 101); + publicChannelList.setActiveChannel(isPublic(activeChannel) ? activeChannel : null); - Channel activeChannel = cube.getChannel(); - publicChannelList = new GuiChannelList(this, w, h, x, y); - publicChannelList.setChannels(ClientChannelRegister.instance.getPublicChannels()); - publicChannelList.setShowSelectionBox(true); - publicChannelList.setScrollButtonIds(100, 101); - publicChannelList.setActiveChannel(isPublic(activeChannel) ? activeChannel : null); + x = x + 5 + w; + privateChannelList = new GuiChannelList(this, w, h, x, y); + privateChannelList.setChannels(ClientChannelRegister.instance.getPrivateChannels()); + privateChannelList.setShowSelectionBox(true); + privateChannelList.setScrollButtonIds(102, 103); + privateChannelList.setActiveChannel(isPrivate(activeChannel) ? activeChannel : null); - x = x + 5 + w; - privateChannelList = new GuiChannelList(this, w, h, x, y); - privateChannelList.setChannels(ClientChannelRegister.instance.getPrivateChannels()); - privateChannelList.setShowSelectionBox(true); - privateChannelList.setScrollButtonIds(102, 103); - privateChannelList.setActiveChannel(isPrivate(activeChannel) ? activeChannel : null); + selectionListener = new ListSelectionListener() { - selectionListener = new ListSelectionListener() { + @Override + public void selectionChanged(GuiScrollableList list, int selectedIndex) { + Channel selected = list.getSelectedElement(); + if (selected != null) { + GuiChannelList clear = list == publicChannelList ? privateChannelList : publicChannelList; + clear.setSelection(-1); + } + } + }; - @Override - public void selectionChanged(GuiScrollableList list, int selectedIndex) { - Channel selected = list.getSelectedElement(); - if(selected != null) { - GuiChannelList clear = list == publicChannelList ? privateChannelList : publicChannelList; - clear.setSelection(-1); + publicChannelList.addSelectionListener(selectionListener); + privateChannelList.addSelectionListener(selectionListener); + + y = 12; + x = 8; + newChannelTF = new TextFieldEnder(Minecraft.getMinecraft().fontRenderer, x, y, 103, 16); + newChannelTF.setCanLoseFocus(false); + newChannelTF.setMaxStringLength(32); + newChannelTF.setFocused(true); + textFields.add(newChannelTF); + } + + private void updateIoButtons() { + IoMode mode = cube.getModeForChannel(SubChannel.POWER); + if (mode.isRecieveEnabled() || mode.isSendEnabled()) { + powerB.setIcon(IconEIO.WRENCH_OVERLAY_POWER); + } else { + powerB.setIcon(IconEIO.WRENCH_OVERLAY_POWER_OFF); + } + powerB.setToolTip(EnderIO.lang.localize("gui.trans.powerMode"), mode.getLocalisedName()); + + mode = cube.getModeForChannel(SubChannel.FLUID); + if (mode.isRecieveEnabled() || mode.isSendEnabled()) { + fluidB.setIcon(IconEIO.WRENCH_OVERLAY_FLUID); + } else { + fluidB.setIcon(IconEIO.WRENCH_OVERLAY_FLUID_OFF); + } + fluidB.setToolTip(EnderIO.lang.localize("gui.trans.fluidMode"), mode.getLocalisedName()); + + mode = cube.getModeForChannel(SubChannel.ITEM); + if (mode.isRecieveEnabled() || mode.isSendEnabled()) { + itemB.setIcon(IconEIO.WRENCH_OVERLAY_ITEM); + } else { + itemB.setIcon(IconEIO.WRENCH_OVERLAY_ITEM_OFF); + } + itemB.setToolTip(EnderIO.lang.localize("gui.trans.itemMode"), mode.getLocalisedName()); + } + + private boolean isPublic(Channel chan) { + if (chan == null) { + return false; + } + return chan.isPublic(); + } + + private boolean isPrivate(Channel chan) { + if (chan == null) { + return false; + } + return !chan.isPublic(); + } + + @Override + public void initGui() { + super.initGui(); + + buttonList.clear(); + + privateButton.onGuiInit(); + addButton.onGuiInit(); + selectPrivateB.onGuiInit(); + selectPublicB.onGuiInit(); + deletePrivateB.onGuiInit(); + deletePublicB.onGuiInit(); + + powerB.onGuiInit(); + fluidB.onGuiInit(); + itemB.onGuiInit(); + + publicChannelList.onGuiInit(this); + privateChannelList.onGuiInit(this); + + rsB.onGuiInit(); + } + + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + + if (par1GuiButton.id == FLUID_MODE_BUTTON_ID) { + + IoMode curMode = cube.getModeForChannel(SubChannel.FLUID); + IoMode nextMode = curMode.next(); + cube.setModeForChannel(SubChannel.FLUID, nextMode); + + updateIoButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); + + } else if (par1GuiButton.id == POWER_MODE_BUTTON_ID) { + + IoMode curMode = cube.getModeForChannel(SubChannel.POWER); + IoMode nextMode = curMode.next(); + cube.setModeForChannel(SubChannel.POWER, nextMode); + + updateIoButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); + + } else if (par1GuiButton.id == ITEM_MODE_BUTTON_ID) { + + IoMode curMode = cube.getModeForChannel(SubChannel.ITEM); + IoMode nextMode = curMode.next(); + cube.setModeForChannel(SubChannel.ITEM, nextMode); + + updateIoButtons(); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); + + } else if (par1GuiButton.id == ADD_BUTTON_ID) { + + Channel c; + if (privateButton.isSelected()) { + c = new Channel( + newChannelTF.getText(), + PlayerUtil.getPlayerUUID(Minecraft.getMinecraft() + .thePlayer + .getGameProfile() + .getName())); + } else { + c = new Channel(newChannelTF.getText(), null); + } + ClientChannelRegister.instance.addChannel(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(true, c)); + setActiveChannel(c); + + if (privateButton.isSelected()) { + privateChannelList.setSelection(c); + } else { + publicChannelList.setSelection(c); + } + + } else if (par1GuiButton.id == SELECT_PUBLIC_BUTTON_ID || par1GuiButton.id == SELECT_PRIVATE_BUTTON_ID) { + Channel c = (par1GuiButton.id == SELECT_PUBLIC_BUTTON_ID) + ? publicChannelList.getSelectedElement() + : privateChannelList.getSelectedElement(); + if (c != null) { + setActiveChannel(c); + } + } else if (par1GuiButton.id == DELETE_PRIVATE_BUTTON_ID || par1GuiButton.id == DELETE_PUBLIC_BUTTON_ID) { + Channel c = (par1GuiButton.id == DELETE_PUBLIC_BUTTON_ID) + ? publicChannelList.getSelectedElement() + : privateChannelList.getSelectedElement(); + if (c != null) { + if (c.equals(cube.getChannel())) { + setActiveChannel(null); + } + ClientChannelRegister.instance.channelRemoved(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(false, c)); + } + } + } + + private void setActiveChannel(Channel c) { + cube.setChannel(c); + publicChannelList.setActiveChannel(isPublic(c) ? c : null); + privateChannelList.setActiveChannel(isPrivate(c) ? c : null); + + PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); + } + + @Override + public boolean doesGuiPauseGame() { + return false; + } + + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + if (par2 == 1) { + for (IGuiOverlay overlay : overlays) { + if (overlay.isVisible()) { + overlay.setVisible(false); + return; + } + } + this.mc.thePlayer.closeScreen(); + } + addButton.enabled = newChannelTF.getText().trim().length() > 0; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + int i1 = cube.getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 245, 0, POWER_WIDTH, i1); + + boolean chanSel = publicChannelList.getSelectedElement() != null; + selectPublicB.enabled = chanSel; + deletePublicB.enabled = chanSel; + + chanSel = privateChannelList.getSelectedElement() != null; + selectPrivateB.enabled = chanSel; + deletePrivateB.enabled = chanSel; + + publicChannelList.drawScreen(mouseX, mouseY, partialTick); + privateChannelList.drawScreen(mouseX, mouseY, partialTick); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) this.buttonList.get(i); + guibutton.drawButton(this.mc, 0, 0); } - } - }; + int x = guiLeft + 12; + int y = guiTop + 35; + int rgb = ColorUtil.getRGB(Color.white); + drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.publicHeading"), x, y, rgb); - publicChannelList.addSelectionListener(selectionListener); - privateChannelList.addSelectionListener(selectionListener); + x += 109; + drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.privateHeading"), x, y, rgb); - y = 12; - x = 8; - newChannelTF = new TextFieldEnder(Minecraft.getMinecraft().fontRenderer, x, y, 103, 16); - newChannelTF.setCanLoseFocus(false); - newChannelTF.setMaxStringLength(32); - newChannelTF.setFocused(true); - textFields.add(newChannelTF); - } + IoMode fluidMode = cube.getModeForChannel(SubChannel.FLUID); + IoMode powerMode = cube.getModeForChannel(SubChannel.POWER); + IoMode itemMode = cube.getModeForChannel(SubChannel.ITEM); - private void updateIoButtons() { - IoMode mode = cube.getModeForChannel(SubChannel.POWER); - if(mode.isRecieveEnabled() || mode.isSendEnabled()) { - powerB.setIcon(IconEIO.WRENCH_OVERLAY_POWER); - } else { - powerB.setIcon(IconEIO.WRENCH_OVERLAY_POWER_OFF); - } - powerB.setToolTip(EnderIO.lang.localize("gui.trans.powerMode"), mode.getLocalisedName()); - - mode = cube.getModeForChannel(SubChannel.FLUID); - if(mode.isRecieveEnabled() || mode.isSendEnabled()) { - fluidB.setIcon(IconEIO.WRENCH_OVERLAY_FLUID); - } else { - fluidB.setIcon(IconEIO.WRENCH_OVERLAY_FLUID_OFF); - } - fluidB.setToolTip(EnderIO.lang.localize("gui.trans.fluidMode"), mode.getLocalisedName()); - - mode = cube.getModeForChannel(SubChannel.ITEM); - if(mode.isRecieveEnabled() || mode.isSendEnabled()) { - itemB.setIcon(IconEIO.WRENCH_OVERLAY_ITEM); - } else { - itemB.setIcon(IconEIO.WRENCH_OVERLAY_ITEM_OFF); - } - itemB.setToolTip(EnderIO.lang.localize("gui.trans.itemMode"), mode.getLocalisedName()); - } - - private boolean isPublic(Channel chan) { - if(chan == null) { - return false; - } - return chan.isPublic(); - } - - private boolean isPrivate(Channel chan) { - if(chan == null) { - return false; - } - return !chan.isPublic(); - } - - @Override - public void initGui() { - super.initGui(); - - buttonList.clear(); - - privateButton.onGuiInit(); - addButton.onGuiInit(); - selectPrivateB.onGuiInit(); - selectPublicB.onGuiInit(); - deletePrivateB.onGuiInit(); - deletePublicB.onGuiInit(); - - powerB.onGuiInit(); - fluidB.onGuiInit(); - itemB.onGuiInit(); - - publicChannelList.onGuiInit(this); - privateChannelList.onGuiInit(this); - - rsB.onGuiInit(); - - } - - @Override - protected void actionPerformed(GuiButton par1GuiButton) { - - if(par1GuiButton.id == FLUID_MODE_BUTTON_ID) { - - IoMode curMode = cube.getModeForChannel(SubChannel.FLUID); - IoMode nextMode = curMode.next(); - cube.setModeForChannel(SubChannel.FLUID, nextMode); - - updateIoButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); - - } else if(par1GuiButton.id == POWER_MODE_BUTTON_ID) { - - IoMode curMode = cube.getModeForChannel(SubChannel.POWER); - IoMode nextMode = curMode.next(); - cube.setModeForChannel(SubChannel.POWER, nextMode); - - updateIoButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); - - } else if(par1GuiButton.id == ITEM_MODE_BUTTON_ID) { - - IoMode curMode = cube.getModeForChannel(SubChannel.ITEM); - IoMode nextMode = curMode.next(); - cube.setModeForChannel(SubChannel.ITEM, nextMode); - - updateIoButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); - - } else if(par1GuiButton.id == ADD_BUTTON_ID) { - - Channel c; - if(privateButton.isSelected()) { - c = new Channel(newChannelTF.getText(), PlayerUtil.getPlayerUUID(Minecraft.getMinecraft().thePlayer.getGameProfile().getName())); - } else { - c = new Channel(newChannelTF.getText(), null); - } - ClientChannelRegister.instance.addChannel(c); - PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(true, c)); - setActiveChannel(c); - - if(privateButton.isSelected()) { - privateChannelList.setSelection(c); - } else { - publicChannelList.setSelection(c); - } - - } else if(par1GuiButton.id == SELECT_PUBLIC_BUTTON_ID || par1GuiButton.id == SELECT_PRIVATE_BUTTON_ID) { - Channel c = (par1GuiButton.id == SELECT_PUBLIC_BUTTON_ID) ? publicChannelList.getSelectedElement() : privateChannelList.getSelectedElement(); - if(c != null) { - setActiveChannel(c); - } - } else if(par1GuiButton.id == DELETE_PRIVATE_BUTTON_ID || par1GuiButton.id == DELETE_PUBLIC_BUTTON_ID) { - Channel c = (par1GuiButton.id == DELETE_PUBLIC_BUTTON_ID) ? publicChannelList.getSelectedElement() : privateChannelList.getSelectedElement(); - if(c != null) { - if(c.equals(cube.getChannel())) { - setActiveChannel(null); + x = 163; + if (itemMode.isRecieveEnabled()) { + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } - ClientChannelRegister.instance.channelRemoved(c); - PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(false, c)); - } - } - - } - - private void setActiveChannel(Channel c) { - cube.setChannel(c); - publicChannelList.setActiveChannel(isPublic(c) ? c : null); - privateChannelList.setActiveChannel(isPrivate(c) ? c : null); - - PacketHandler.INSTANCE.sendToServer(new PacketClientState(cube)); - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - if(par2 == 1) { - for (IGuiOverlay overlay : overlays) { - if(overlay.isVisible()) { - overlay.setVisible(false); - return; + x += 18; + if (powerMode.isRecieveEnabled()) { + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + } + x += 18; + if (fluidMode.isRecieveEnabled()) { + IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } - } - this.mc.thePlayer.closeScreen(); - } - addButton.enabled = newChannelTF.getText().trim().length() > 0; - } - @Override - protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - int i1 = cube.getEnergyStoredScaled(POWER_HEIGHT); - drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 245, 0, POWER_WIDTH, i1); - - boolean chanSel = publicChannelList.getSelectedElement() != null; - selectPublicB.enabled = chanSel; - deletePublicB.enabled = chanSel; - - chanSel = privateChannelList.getSelectedElement() != null; - selectPrivateB.enabled = chanSel; - deletePrivateB.enabled = chanSel; - - publicChannelList.drawScreen(mouseX, mouseY, partialTick); - privateChannelList.drawScreen(mouseX, mouseY, partialTick); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) this.buttonList.get(i); - guibutton.drawButton(this.mc, 0, 0); + x = 163; + if (itemMode.isSendEnabled()) { + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); + } + x += 18; + if (powerMode.isSendEnabled()) { + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); + } + x += 18; + if (fluidMode.isSendEnabled()) { + IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); + } } - int x = guiLeft + 12; - int y = guiTop + 35; - int rgb = ColorUtil.getRGB(Color.white); - drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.publicHeading"), x, y, rgb); - - x += 109; - drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.privateHeading"), x, y, rgb); - - IoMode fluidMode = cube.getModeForChannel(SubChannel.FLUID); - IoMode powerMode = cube.getModeForChannel(SubChannel.POWER); - IoMode itemMode = cube.getModeForChannel(SubChannel.ITEM); - - x = 163; - if(itemMode.isRecieveEnabled()) { - IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); - } - x += 18; - if(powerMode.isRecieveEnabled()) { - IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); - } - x += 18; - if(fluidMode.isRecieveEnabled()) { - IconEIO.map.render(IconEIO.INPUT_OLD, guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + @Override + public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + super.drawHoveringText(par1List, par2, par3, font); + GL11.glPopAttrib(); + GL11.glPopAttrib(); } - x = 163; - if(itemMode.isSendEnabled()) { - IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); - } - x += 18; - if(powerMode.isSendEnabled()) { - IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); - } - x += 18; - if(fluidMode.isSendEnabled()) { - IconEIO.map.render(IconEIO.OUTPUT_OLD, guiLeft + x, guiTop + 29, 15, 7, 0, true); + @Override + public int getGuiLeft() { + return guiLeft; } - } + @Override + public int getGuiTop() { + return guiTop; + } - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - super.drawHoveringText(par1List, par2, par3, font); - GL11.glPopAttrib(); - GL11.glPopAttrib(); - } + @Override + public int getXSize() { + return xSize; + } - @Override - public int getGuiLeft() { - return guiLeft; - } - - @Override - public int getGuiTop() { - return guiTop; - } - - @Override - public int getXSize() { - return xSize; - } - - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } - - @Override - public int getOverlayOffsetX() { - return 0; - } + @Override + public FontRenderer getFontRenderer() { + return Minecraft.getMinecraft().fontRenderer; + } + @Override + public int getOverlayOffsetX() { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index d800a99d..32f1b818 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.common.util.PlayerUtil; +import crazypants.enderio.Log; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -13,160 +15,153 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.UUID; - import org.apache.commons.io.IOUtils; -import com.enderio.core.common.util.PlayerUtil; - -import crazypants.enderio.Log; - public class HyperCubeConfig { - private static final String KEY_PUBLIC_CHANNELS = "public.chanels"; + private static final String KEY_PUBLIC_CHANNELS = "public.chanels"; - private static final String DELIM = "~"; - private static final String DELIM_ESC = "/:/"; + private static final String DELIM = "~"; + private static final String DELIM_ESC = "/:/"; - private static final String KEY_USERS = "users"; + private static final String KEY_USERS = "users"; - private static final String KEY_USER_CHANNEL = ".channels"; + private static final String KEY_USER_CHANNEL = ".channels"; - private final Properties props = new Properties(); + private final Properties props = new Properties(); - private final List publicChannels = new ArrayList(); + private final List publicChannels = new ArrayList(); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); - private final File file; + private final File file; - public HyperCubeConfig(File file) { - this.file = file; - if(file.exists()) { - load(file); - } - } - - public List getPublicChannels() { - return publicChannels; - } - - public void setPublicChannels(Collection chans) { - publicChannels.clear(); - publicChannels.addAll(chans); - } - - public Map> getUserChannels() { - return userChannels; - } - - public void setUserChannels(Map> channels) { - userChannels.clear(); - userChannels.putAll(channels); - } - - public void save() { - props.clear(); - - setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels); - - StringBuilder userListStr = new StringBuilder(); - Iterator>> itr = userChannels.entrySet().iterator(); - while (itr.hasNext()) { - Entry> entry = itr.next(); - UUID user = entry.getKey(); - - List channels = entry.getValue(); - if(user != null && channels != null && !channels.isEmpty()) { - userListStr.append(user.toString()); - setChannelListProperty(user + KEY_USER_CHANNEL, channels); - } - if(itr.hasNext()) { - userListStr.append(DELIM); - } - } - - if(userListStr.length() > 0) { - props.setProperty(KEY_USERS, userListStr.toString()); - } - - FileOutputStream fos = null; - try { - file.getParentFile().mkdirs(); - fos = new FileOutputStream(file); - props.store(fos, null); - } catch (IOException ex) { - Log.warn("HyperCubeConfig: could not save hypercube config:" + ex); - } finally { - IOUtils.closeQuietly(fos); - } - - } - - private void setChannelListProperty(String key, List channels) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < channels.size(); i++) { - //DELIM_ESC; - String name = channels.get(i).name; - if(name != null) { - name = name.trim(); - name = name.replaceAll(DELIM, DELIM_ESC); - if(name.length() > 0) { - sb.append(name); + public HyperCubeConfig(File file) { + this.file = file; + if (file.exists()) { + load(file); } - } - if(i != channels.size() - 1) { - sb.append(DELIM); - } - } - props.setProperty(key, sb.toString()); - } - - private void load(File file) { - FileInputStream fis = null; - try { - fis = new FileInputStream(file); - props.load(fis); - } catch (Exception e) { - Log.error("HyperCubeConfig: Could not load config file: " + e); - return; - } finally { - IOUtils.closeQuietly(fis); - } - publicChannels.clear(); - loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels); - - userChannels.clear(); - List users = new ArrayList(); - String usersStr = props.getProperty(KEY_USERS, ""); - String[] usersSplit = usersStr.split(DELIM); - for (String user : usersSplit) { - if(user != null) { - users.add(user); - } } - for (String user : users) { - List channels = new ArrayList(); - UUID uuid=PlayerUtil.getPlayerUIDUnstable(user); - loadChannelList(user + KEY_USER_CHANNEL, uuid, channels); - if(!channels.isEmpty()) { - userChannels.put(uuid, channels); - } + public List getPublicChannels() { + return publicChannels; } - } + public void setPublicChannels(Collection chans) { + publicChannels.clear(); + publicChannels.addAll(chans); + } - private void loadChannelList(String key, UUID user, List channels) { - String chans = props.getProperty(key, ""); - //chans = chans.replaceAll(DELIM_ESC, DELIM); - String[] chanSplit = chans.split(DELIM); - for (String chan : chanSplit) { - if(chan != null) { - chan = chan.trim(); - if(!chan.isEmpty()) { - channels.add(new Channel(chan.replaceAll(DELIM_ESC, DELIM), user)); + public Map> getUserChannels() { + return userChannels; + } + + public void setUserChannels(Map> channels) { + userChannels.clear(); + userChannels.putAll(channels); + } + + public void save() { + props.clear(); + + setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels); + + StringBuilder userListStr = new StringBuilder(); + Iterator>> itr = userChannels.entrySet().iterator(); + while (itr.hasNext()) { + Entry> entry = itr.next(); + UUID user = entry.getKey(); + + List channels = entry.getValue(); + if (user != null && channels != null && !channels.isEmpty()) { + userListStr.append(user.toString()); + setChannelListProperty(user + KEY_USER_CHANNEL, channels); + } + if (itr.hasNext()) { + userListStr.append(DELIM); + } + } + + if (userListStr.length() > 0) { + props.setProperty(KEY_USERS, userListStr.toString()); + } + + FileOutputStream fos = null; + try { + file.getParentFile().mkdirs(); + fos = new FileOutputStream(file); + props.store(fos, null); + } catch (IOException ex) { + Log.warn("HyperCubeConfig: could not save hypercube config:" + ex); + } finally { + IOUtils.closeQuietly(fos); + } + } + + private void setChannelListProperty(String key, List channels) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < channels.size(); i++) { + // DELIM_ESC; + String name = channels.get(i).name; + if (name != null) { + name = name.trim(); + name = name.replaceAll(DELIM, DELIM_ESC); + if (name.length() > 0) { + sb.append(name); + } + } + if (i != channels.size() - 1) { + sb.append(DELIM); + } + } + props.setProperty(key, sb.toString()); + } + + private void load(File file) { + FileInputStream fis = null; + try { + fis = new FileInputStream(file); + props.load(fis); + } catch (Exception e) { + Log.error("HyperCubeConfig: Could not load config file: " + e); + return; + } finally { + IOUtils.closeQuietly(fis); + } + publicChannels.clear(); + loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels); + + userChannels.clear(); + List users = new ArrayList(); + String usersStr = props.getProperty(KEY_USERS, ""); + String[] usersSplit = usersStr.split(DELIM); + for (String user : usersSplit) { + if (user != null) { + users.add(user); + } + } + + for (String user : users) { + List channels = new ArrayList(); + UUID uuid = PlayerUtil.getPlayerUIDUnstable(user); + loadChannelList(user + KEY_USER_CHANNEL, uuid, channels); + if (!channels.isEmpty()) { + userChannels.put(uuid, channels); + } + } + } + + private void loadChannelList(String key, UUID user, List channels) { + String chans = props.getProperty(key, ""); + // chans = chans.replaceAll(DELIM_ESC, DELIM); + String[] chanSplit = chans.split(DELIM); + for (String chan : chanSplit) { + if (chan != null) { + chan = chan.trim(); + if (!chan.isEmpty()) { + channels.add(new Channel(chan.replaceAll(DELIM_ESC, DELIM), user)); + } + } } - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java index 714e1ab4..2c3b9084 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel.java @@ -1,41 +1,39 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.client.render.RenderUtil; import net.minecraft.client.model.ModelBase; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - public class HyperCubeModel extends ModelBase implements IModel { - public static final float SCALE = 1 / 16f; + public static final float SCALE = 1 / 16f; - private static final String TEXTURE = "enderio:models/hyperCube.png"; - private static final String MODEL = "enderio:models/hyperCube.obj"; + private static final String TEXTURE = "enderio:models/hyperCube.png"; + private static final String MODEL = "enderio:models/hyperCube.obj"; - private IModelCustom model; + private IModelCustom model; - public HyperCubeModel() { - model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); - } + public HyperCubeModel() { + model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); + } - @Override - public void render() { - GL11.glPushMatrix(); - GL11.glScalef(SCALE, SCALE, SCALE); - RenderUtil.bindTexture(TEXTURE); - model.renderAll(); - GL11.glPopMatrix(); - } + @Override + public void render() { + GL11.glPushMatrix(); + GL11.glScalef(SCALE, SCALE, SCALE); + RenderUtil.bindTexture(TEXTURE); + model.renderAll(); + GL11.glPopMatrix(); + } - @Override - public void render(TileHyperCube cube, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); - render(); - GL11.glPopMatrix(); - } + @Override + public void render(TileHyperCube cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); + render(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java index 03dada65..89e9d5c0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeModel2.java @@ -1,250 +1,247 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.client.render.RenderUtil; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - public class HyperCubeModel2 extends ModelBase implements IModel { - private static final String TEXTURE = "enderio:models/tesseract.png"; + private static final String TEXTURE = "enderio:models/tesseract.png"; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - ModelRenderer Shape24; - ModelRenderer Shape25; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; + ModelRenderer Shape17; + ModelRenderer Shape18; + ModelRenderer Shape19; + ModelRenderer Shape20; + ModelRenderer Shape21; + ModelRenderer Shape22; + ModelRenderer Shape23; + ModelRenderer Shape24; + ModelRenderer Shape25; - public HyperCubeModel2() { - textureWidth = 32; - textureHeight = 32; + public HyperCubeModel2() { + textureWidth = 32; + textureHeight = 32; - Shape1 = new ModelRenderer(this, 0, 7); - Shape1.addBox(0F, 0F, 0F, 6, 1, 6); - Shape1.setRotationPoint(-3F, 24F, -8F); - Shape1.setTextureSize(32, 32); - Shape1.mirror = true; - setRotation(Shape1, 1.570796F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 0); - Shape2.addBox(0F, 0F, 0F, 6, 1, 5); - Shape2.setRotationPoint(7F, 23F, 3F); - Shape2.setTextureSize(32, 32); - Shape2.mirror = true; - setRotation(Shape2, 1.570796F, 1.570796F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 6, 1, 5); - Shape3.setRotationPoint(-3F, 23F, 7F); - Shape3.setTextureSize(32, 32); - Shape3.mirror = true; - setRotation(Shape3, 1.570796F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 7); - Shape4.addBox(0F, 0F, 0F, 6, 1, 6); - Shape4.setRotationPoint(-8F, 24F, 3F); - Shape4.setTextureSize(32, 32); - Shape4.mirror = true; - setRotation(Shape4, 1.570796F, 1.570796F, 0F); - Shape5 = new ModelRenderer(this, 0, 0); - Shape5.addBox(0F, 0F, 0F, 6, 1, 5); - Shape5.setRotationPoint(-3F, 14F, -8F); - Shape5.setTextureSize(32, 32); - Shape5.mirror = true; - setRotation(Shape5, 1.570796F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 7); - Shape6.addBox(0F, 0F, 0F, 6, 1, 6); - Shape6.setRotationPoint(-7F, 13F, 8F); - Shape6.setTextureSize(32, 32); - Shape6.mirror = true; - //setRotation(Shape6, 1.570796F, 1.570796F, 1.570796F); - setRotation(Shape6, 0F, 1.570796F, 1.570796F); - Shape7 = new ModelRenderer(this, 0, 7); - Shape7.addBox(0F, 0F, 0F, 6, 1, 6); - Shape7.setRotationPoint(-8F, 13F, -8F); - Shape7.setTextureSize(32, 32); - Shape7.mirror = true; - setRotation(Shape7, 1.570796F, 0F, 1.570796F); - Shape8 = new ModelRenderer(this, 0, 0); - Shape8.addBox(0F, 0F, 0F, 6, 1, 5); - Shape8.setRotationPoint(-8F, 14F, 3F); - Shape8.setTextureSize(32, 32); - Shape8.mirror = true; - setRotation(Shape8, 1.570796F, 1.570796F, 0F); - Shape9 = new ModelRenderer(this, 0, 7); - Shape9.addBox(0F, 0F, 0F, 6, 1, 6); - Shape9.setRotationPoint(-3F, 23F, 2F); - Shape9.setTextureSize(32, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 7); - Shape10.addBox(0F, 0F, 0F, 6, 1, 6); - Shape10.setRotationPoint(2F, 23F, 3F); - Shape10.setTextureSize(32, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 1.570796F, 0F); - Shape11 = new ModelRenderer(this, 0, 7); - Shape11.addBox(0F, 0F, 0F, 6, 1, 6); - Shape11.setRotationPoint(-3F, 23F, -8F); - Shape11.setTextureSize(32, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 0, 7); - Shape12.addBox(0F, 0F, 0F, 6, 1, 6); - Shape12.setRotationPoint(-8F, 23F, 3F); - Shape12.setTextureSize(32, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 1.570796F, 0F); - Shape13 = new ModelRenderer(this, 0, 7); - Shape13.addBox(0F, 0F, 0F, 6, 1, 6); - Shape13.setRotationPoint(-8F, 8F, 3F); - Shape13.setTextureSize(32, 32); - Shape13.mirror = true; - setRotation(Shape13, 0F, 1.570796F, 0F); - Shape14 = new ModelRenderer(this, 0, 7); - Shape14.addBox(0F, 0F, 0F, 6, 1, 6); - Shape14.setRotationPoint(-3F, 8F, 2F); - Shape14.setTextureSize(32, 32); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - Shape15 = new ModelRenderer(this, 0, 7); - Shape15.addBox(0F, 0F, 0F, 6, 1, 6); - Shape15.setRotationPoint(-3F, 8F, -8F); - Shape15.setTextureSize(32, 32); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 0, 7); - Shape16.addBox(0F, 0F, 0F, 6, 1, 6); - Shape16.setRotationPoint(2F, 8F, 3F); - Shape16.setTextureSize(32, 32); - Shape16.mirror = true; - setRotation(Shape16, 0F, 1.570796F, 0F); - Shape17 = new ModelRenderer(this, 0, 7); - Shape17.addBox(0F, 0F, 0F, 6, 1, 6); - Shape17.setRotationPoint(7F, 14F, 3F); - Shape17.setTextureSize(32, 32); - Shape17.mirror = true; - setRotation(Shape17, 1.570796F, 1.570796F, 0F); - Shape18 = new ModelRenderer(this, 0, 7); - Shape18.addBox(0F, 0F, 0F, 6, 1, 6); - Shape18.setRotationPoint(-7F, 13F, -2F); - Shape18.setTextureSize(32, 32); - Shape18.mirror = true; - setRotation(Shape18, 0F, 1.570796F, 1.570796F); - Shape19 = new ModelRenderer(this, 0, 7); - Shape19.addBox(0F, 0F, 0F, 6, 1, 6); - Shape19.setRotationPoint(8F, 13F, -2F); - Shape19.setTextureSize(32, 32); - Shape19.mirror = true; - setRotation(Shape19, 0F, 1.570796F, 1.570796F); - Shape20 = new ModelRenderer(this, 0, 7); - Shape20.addBox(0F, 0F, 0F, 6, 1, 6); - Shape20.setRotationPoint(8F, 13F, 8F); - Shape20.setTextureSize(32, 32); - Shape20.mirror = true; - setRotation(Shape20, 0F, 1.570796F, 1.570796F); - Shape21 = new ModelRenderer(this, 0, 7); - Shape21.addBox(0F, 0F, 0F, 6, 1, 6); - Shape21.setRotationPoint(-3F, 14F, 7F); - Shape21.setTextureSize(32, 32); - Shape21.mirror = true; - setRotation(Shape21, 1.570796F, 0F, 0F); - Shape22 = new ModelRenderer(this, 0, 7); - Shape22.addBox(0F, 0F, 0F, 6, 1, 6); - Shape22.setRotationPoint(2F, 13F, -8F); - Shape22.setTextureSize(32, 32); - Shape22.mirror = true; - setRotation(Shape22, 1.570796F, 0F, 1.570796F); - Shape23 = new ModelRenderer(this, 0, 0); - Shape23.addBox(0F, 0F, 0F, 6, 1, 5); - Shape23.setRotationPoint(-8F, 13F, 7F); - Shape23.setTextureSize(32, 32); - Shape23.mirror = true; - setRotation(Shape23, 1.570796F, 0F, 1.570796F); - Shape24 = new ModelRenderer(this, 0, 7); - Shape24.addBox(0F, 0F, 0F, 6, 1, 6); - Shape24.setRotationPoint(2F, 13F, 7F); - Shape24.setTextureSize(32, 32); - Shape24.mirror = true; - setRotation(Shape24, 1.570796F, 0F, 1.570796F); - Shape25 = new ModelRenderer(this, 0, 15); - Shape25.addBox(0F, 0F, 0F, 8, 8, 8); - Shape25.setRotationPoint(-4F, 12F, -4F); - Shape25.setTextureSize(32, 32); - Shape25.mirror = true; - setRotation(Shape25, 0F, 0F, 0F); - } + Shape1 = new ModelRenderer(this, 0, 7); + Shape1.addBox(0F, 0F, 0F, 6, 1, 6); + Shape1.setRotationPoint(-3F, 24F, -8F); + Shape1.setTextureSize(32, 32); + Shape1.mirror = true; + setRotation(Shape1, 1.570796F, 0F, 0F); + Shape2 = new ModelRenderer(this, 0, 0); + Shape2.addBox(0F, 0F, 0F, 6, 1, 5); + Shape2.setRotationPoint(7F, 23F, 3F); + Shape2.setTextureSize(32, 32); + Shape2.mirror = true; + setRotation(Shape2, 1.570796F, 1.570796F, 0F); + Shape3 = new ModelRenderer(this, 0, 0); + Shape3.addBox(0F, 0F, 0F, 6, 1, 5); + Shape3.setRotationPoint(-3F, 23F, 7F); + Shape3.setTextureSize(32, 32); + Shape3.mirror = true; + setRotation(Shape3, 1.570796F, 0F, 0F); + Shape4 = new ModelRenderer(this, 0, 7); + Shape4.addBox(0F, 0F, 0F, 6, 1, 6); + Shape4.setRotationPoint(-8F, 24F, 3F); + Shape4.setTextureSize(32, 32); + Shape4.mirror = true; + setRotation(Shape4, 1.570796F, 1.570796F, 0F); + Shape5 = new ModelRenderer(this, 0, 0); + Shape5.addBox(0F, 0F, 0F, 6, 1, 5); + Shape5.setRotationPoint(-3F, 14F, -8F); + Shape5.setTextureSize(32, 32); + Shape5.mirror = true; + setRotation(Shape5, 1.570796F, 0F, 0F); + Shape6 = new ModelRenderer(this, 0, 7); + Shape6.addBox(0F, 0F, 0F, 6, 1, 6); + Shape6.setRotationPoint(-7F, 13F, 8F); + Shape6.setTextureSize(32, 32); + Shape6.mirror = true; + // setRotation(Shape6, 1.570796F, 1.570796F, 1.570796F); + setRotation(Shape6, 0F, 1.570796F, 1.570796F); + Shape7 = new ModelRenderer(this, 0, 7); + Shape7.addBox(0F, 0F, 0F, 6, 1, 6); + Shape7.setRotationPoint(-8F, 13F, -8F); + Shape7.setTextureSize(32, 32); + Shape7.mirror = true; + setRotation(Shape7, 1.570796F, 0F, 1.570796F); + Shape8 = new ModelRenderer(this, 0, 0); + Shape8.addBox(0F, 0F, 0F, 6, 1, 5); + Shape8.setRotationPoint(-8F, 14F, 3F); + Shape8.setTextureSize(32, 32); + Shape8.mirror = true; + setRotation(Shape8, 1.570796F, 1.570796F, 0F); + Shape9 = new ModelRenderer(this, 0, 7); + Shape9.addBox(0F, 0F, 0F, 6, 1, 6); + Shape9.setRotationPoint(-3F, 23F, 2F); + Shape9.setTextureSize(32, 32); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + Shape10 = new ModelRenderer(this, 0, 7); + Shape10.addBox(0F, 0F, 0F, 6, 1, 6); + Shape10.setRotationPoint(2F, 23F, 3F); + Shape10.setTextureSize(32, 32); + Shape10.mirror = true; + setRotation(Shape10, 0F, 1.570796F, 0F); + Shape11 = new ModelRenderer(this, 0, 7); + Shape11.addBox(0F, 0F, 0F, 6, 1, 6); + Shape11.setRotationPoint(-3F, 23F, -8F); + Shape11.setTextureSize(32, 32); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); + Shape12 = new ModelRenderer(this, 0, 7); + Shape12.addBox(0F, 0F, 0F, 6, 1, 6); + Shape12.setRotationPoint(-8F, 23F, 3F); + Shape12.setTextureSize(32, 32); + Shape12.mirror = true; + setRotation(Shape12, 0F, 1.570796F, 0F); + Shape13 = new ModelRenderer(this, 0, 7); + Shape13.addBox(0F, 0F, 0F, 6, 1, 6); + Shape13.setRotationPoint(-8F, 8F, 3F); + Shape13.setTextureSize(32, 32); + Shape13.mirror = true; + setRotation(Shape13, 0F, 1.570796F, 0F); + Shape14 = new ModelRenderer(this, 0, 7); + Shape14.addBox(0F, 0F, 0F, 6, 1, 6); + Shape14.setRotationPoint(-3F, 8F, 2F); + Shape14.setTextureSize(32, 32); + Shape14.mirror = true; + setRotation(Shape14, 0F, 0F, 0F); + Shape15 = new ModelRenderer(this, 0, 7); + Shape15.addBox(0F, 0F, 0F, 6, 1, 6); + Shape15.setRotationPoint(-3F, 8F, -8F); + Shape15.setTextureSize(32, 32); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0F); + Shape16 = new ModelRenderer(this, 0, 7); + Shape16.addBox(0F, 0F, 0F, 6, 1, 6); + Shape16.setRotationPoint(2F, 8F, 3F); + Shape16.setTextureSize(32, 32); + Shape16.mirror = true; + setRotation(Shape16, 0F, 1.570796F, 0F); + Shape17 = new ModelRenderer(this, 0, 7); + Shape17.addBox(0F, 0F, 0F, 6, 1, 6); + Shape17.setRotationPoint(7F, 14F, 3F); + Shape17.setTextureSize(32, 32); + Shape17.mirror = true; + setRotation(Shape17, 1.570796F, 1.570796F, 0F); + Shape18 = new ModelRenderer(this, 0, 7); + Shape18.addBox(0F, 0F, 0F, 6, 1, 6); + Shape18.setRotationPoint(-7F, 13F, -2F); + Shape18.setTextureSize(32, 32); + Shape18.mirror = true; + setRotation(Shape18, 0F, 1.570796F, 1.570796F); + Shape19 = new ModelRenderer(this, 0, 7); + Shape19.addBox(0F, 0F, 0F, 6, 1, 6); + Shape19.setRotationPoint(8F, 13F, -2F); + Shape19.setTextureSize(32, 32); + Shape19.mirror = true; + setRotation(Shape19, 0F, 1.570796F, 1.570796F); + Shape20 = new ModelRenderer(this, 0, 7); + Shape20.addBox(0F, 0F, 0F, 6, 1, 6); + Shape20.setRotationPoint(8F, 13F, 8F); + Shape20.setTextureSize(32, 32); + Shape20.mirror = true; + setRotation(Shape20, 0F, 1.570796F, 1.570796F); + Shape21 = new ModelRenderer(this, 0, 7); + Shape21.addBox(0F, 0F, 0F, 6, 1, 6); + Shape21.setRotationPoint(-3F, 14F, 7F); + Shape21.setTextureSize(32, 32); + Shape21.mirror = true; + setRotation(Shape21, 1.570796F, 0F, 0F); + Shape22 = new ModelRenderer(this, 0, 7); + Shape22.addBox(0F, 0F, 0F, 6, 1, 6); + Shape22.setRotationPoint(2F, 13F, -8F); + Shape22.setTextureSize(32, 32); + Shape22.mirror = true; + setRotation(Shape22, 1.570796F, 0F, 1.570796F); + Shape23 = new ModelRenderer(this, 0, 0); + Shape23.addBox(0F, 0F, 0F, 6, 1, 5); + Shape23.setRotationPoint(-8F, 13F, 7F); + Shape23.setTextureSize(32, 32); + Shape23.mirror = true; + setRotation(Shape23, 1.570796F, 0F, 1.570796F); + Shape24 = new ModelRenderer(this, 0, 7); + Shape24.addBox(0F, 0F, 0F, 6, 1, 6); + Shape24.setRotationPoint(2F, 13F, 7F); + Shape24.setTextureSize(32, 32); + Shape24.mirror = true; + setRotation(Shape24, 1.570796F, 0F, 1.570796F); + Shape25 = new ModelRenderer(this, 0, 15); + Shape25.addBox(0F, 0F, 0F, 8, 8, 8); + Shape25.setRotationPoint(-4F, 12F, -4F); + Shape25.setTextureSize(32, 32); + Shape25.mirror = true; + setRotation(Shape25, 0F, 0F, 0F); + } - @Override - public void render() { + @Override + public void render() { - RenderUtil.bindTexture(TEXTURE); - GL11.glPushMatrix(); - GL11.glTranslatef(0.5f, -1.5f, 0.5f); - GL11.glPushMatrix(); + RenderUtil.bindTexture(TEXTURE); + GL11.glPushMatrix(); + GL11.glTranslatef(0.5f, -1.5f, 0.5f); + GL11.glPushMatrix(); - float f5 = 0.0625f; - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.render(f5); - Shape24.render(f5); - //Shape25.render(f5); + float f5 = 0.0625f; + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + Shape10.render(f5); + Shape11.render(f5); + Shape12.render(f5); + Shape13.render(f5); + Shape14.render(f5); + Shape15.render(f5); + Shape16.render(f5); + Shape17.render(f5); + Shape18.render(f5); + Shape19.render(f5); + Shape20.render(f5); + Shape21.render(f5); + Shape22.render(f5); + Shape23.render(f5); + Shape24.render(f5); + // Shape25.render(f5); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - } + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(TileHyperCube cube, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y + 1, (float) z); - render(); - GL11.glPopMatrix(); - } + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + @Override + public void render(TileHyperCube cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y + 1, (float) z); + render(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java index 969c9fca..7658fccd 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.hypercube; +import crazypants.enderio.Log; import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -7,146 +8,142 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - import net.minecraftforge.common.DimensionManager; -import crazypants.enderio.Log; public class HyperCubeRegister { - private static final String CATEGORY_PUBLIC_CHANNELS = "PublicChannels"; - private static final String CATEGORY_PRIVATE_CHANNELS = "PrivateChannels"; - private static final String KEY_PUBLIC_CHANNELS = "names"; + private static final String CATEGORY_PUBLIC_CHANNELS = "PublicChannels"; + private static final String CATEGORY_PRIVATE_CHANNELS = "PrivateChannels"; + private static final String KEY_PUBLIC_CHANNELS = "names"; - public static HyperCubeRegister instance; + public static HyperCubeRegister instance; - private final Map> channelMapping = new HashMap>(); + private final Map> channelMapping = new HashMap>(); - private final List publicChannels = new ArrayList(); - private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); + private final List publicChannels = new ArrayList(); + private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); - //private Configuration config; - private HyperCubeConfig conf; + // private Configuration config; + private HyperCubeConfig conf; - public static void load() { - instance = new HyperCubeRegister(); - instance.innerLoad(); - } - - public static void unload() { - instance = new HyperCubeRegister(); - } - - private void innerLoad() { - File f = DimensionManager.getCurrentSaveRootDirectory(); - conf = new HyperCubeConfig(new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.cfg")); - publicChannels.addAll(conf.getPublicChannels()); - userChannels.putAll(conf.getUserChannels()); - } - - public synchronized List getChannelsForUser(UUID user) { - List result = userChannels.get(user); - if(result == null) { - result = new ArrayList(); - userChannels.put(user, result); - } - return result; - } - - public synchronized void register(TileHyperCube cube) { - List cubes = innerGetCubesForChannel(cube.getChannel()); - if(cubes != null && !cubes.contains(cube)) { - cubes.add(cube); - } - } - - public synchronized void deregister(TileHyperCube cube, Channel channel) { - List cubes = innerGetCubesForChannel(channel); - if(cubes != null) { - cubes.remove(cube); - } - } - - public synchronized void deregister(TileHyperCube cube) { - List cubes = innerGetCubesForChannel(cube.getChannel()); - if(cubes != null) { - cubes.remove(cube); - } - } - - public synchronized List getCubesForChannel(Channel channel) { - List chans = innerGetCubesForChannel(channel); - if(chans == null) { - return Collections.emptyList(); - } - return new ArrayList(chans); - } - - public synchronized void addChannel(Channel channel) { - if(channel == null || channel.name == null) { - return; - } - if(channel.user == null) { - if(!publicChannels.contains(channel)) { - publicChannels.add(channel); - updateConfig(); - } - } else { - List channels = getChannelsForUser(channel.user); - if(!channels.contains(channel)) { - channels.add(channel); - updateConfig(); - } - } - } - - public void removeChannel(Channel channel) { - if(channel == null || channel.name == null) { - return; - } - if(channel.user == null) { - if(publicChannels.contains(channel)) { - publicChannels.remove(channel); - updateConfig(); - } - } else { - List channels = getChannelsForUser(channel.user); - if(channels.contains(channel)) { - channels.remove(channel); - updateConfig(); - } + public static void load() { + instance = new HyperCubeRegister(); + instance.innerLoad(); } - } - - private void updateConfig() { - - if(conf == null) { - Log.warn("HyperCubeRegister.updateConfig: Config was null."); - return; + public static void unload() { + instance = new HyperCubeRegister(); } - conf.setPublicChannels(publicChannels); - conf.setUserChannels(userChannels); - conf.save(); - - } - - private List innerGetCubesForChannel(Channel channel) { - if(channel == null) { - return null; + private void innerLoad() { + File f = DimensionManager.getCurrentSaveRootDirectory(); + conf = new HyperCubeConfig( + new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.cfg")); + publicChannels.addAll(conf.getPublicChannels()); + userChannels.putAll(conf.getUserChannels()); } - List result = channelMapping.get(channel); - if(result == null) { - result = new ArrayList(); - channelMapping.put(channel, result); + + public synchronized List getChannelsForUser(UUID user) { + List result = userChannels.get(user); + if (result == null) { + result = new ArrayList(); + userChannels.put(user, result); + } + return result; } - return result; - } - public List getPublicChannels() { - return publicChannelsRO; - } + public synchronized void register(TileHyperCube cube) { + List cubes = innerGetCubesForChannel(cube.getChannel()); + if (cubes != null && !cubes.contains(cube)) { + cubes.add(cube); + } + } + public synchronized void deregister(TileHyperCube cube, Channel channel) { + List cubes = innerGetCubesForChannel(channel); + if (cubes != null) { + cubes.remove(cube); + } + } + + public synchronized void deregister(TileHyperCube cube) { + List cubes = innerGetCubesForChannel(cube.getChannel()); + if (cubes != null) { + cubes.remove(cube); + } + } + + public synchronized List getCubesForChannel(Channel channel) { + List chans = innerGetCubesForChannel(channel); + if (chans == null) { + return Collections.emptyList(); + } + return new ArrayList(chans); + } + + public synchronized void addChannel(Channel channel) { + if (channel == null || channel.name == null) { + return; + } + if (channel.user == null) { + if (!publicChannels.contains(channel)) { + publicChannels.add(channel); + updateConfig(); + } + } else { + List channels = getChannelsForUser(channel.user); + if (!channels.contains(channel)) { + channels.add(channel); + updateConfig(); + } + } + } + + public void removeChannel(Channel channel) { + if (channel == null || channel.name == null) { + return; + } + if (channel.user == null) { + if (publicChannels.contains(channel)) { + publicChannels.remove(channel); + updateConfig(); + } + } else { + List channels = getChannelsForUser(channel.user); + if (channels.contains(channel)) { + channels.remove(channel); + updateConfig(); + } + } + } + + private void updateConfig() { + + if (conf == null) { + Log.warn("HyperCubeRegister.updateConfig: Config was null."); + return; + } + + conf.setPublicChannels(publicChannels); + conf.setUserChannels(userChannels); + conf.save(); + } + + private List innerGetCubesForChannel(Channel channel) { + if (channel == null) { + return null; + } + List result = channelMapping.get(channel); + if (result == null) { + result = new ArrayList(); + channelMapping.put(channel, result); + } + return result; + } + + public List getPublicChannels() { + return publicChannelsRO; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java index 4f19f419..8648809b 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java @@ -1,5 +1,12 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -7,124 +14,113 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; - @SideOnly(Side.CLIENT) public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private IModel model; + private IModel model; - private BoundingBox bb; + private BoundingBox bb; - private boolean adjustForItem = false; + private boolean adjustForItem = false; - public HyperCubeRenderer() { - float scale = 0.7f; - if(Config.useAlternateTesseractModel) { - model = new HyperCubeModel2(); - scale = 0.8f; - adjustForItem = true; - } else { - model = new HyperCubeModel(); - } - bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); - } - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { - - TileHyperCube cube = (TileHyperCube) te; - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - model.render(cube, x, y, z); - - if(cube.getChannel() != null) { - //if(cube.getEnergyStored() > 0) { - renderPower(te.getWorldObj(), x, y, z, cube.getChannel() != null); - //} + public HyperCubeRenderer() { + float scale = 0.7f; + if (Config.useAlternateTesseractModel) { + model = new HyperCubeModel2(); + scale = 0.8f; + adjustForItem = true; + } else { + model = new HyperCubeModel(); + } + bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - } + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } + TileHyperCube cube = (TileHyperCube) te; - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(adjustForItem) { - switch (type) { - case ENTITY: - renderItem(0f, 0f, 0f); - return; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem(0f, 1f, 1f); - return; - case INVENTORY: - renderItem(0f, 0f, 0f); - return; - default: - renderItem(0f, 0f, 0f); - return; - } - } else { - renderItem(0, 0, 0); + model.render(cube, x, y, z); + + if (cube.getChannel() != null) { + // if(cube.getEnergyStored() > 0) { + renderPower(te.getWorldObj(), x, y, z, cube.getChannel() != null); + // } + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); } - } - private void renderPower(World world, double x, double y, double z, boolean isActive) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - - RenderUtil.bindBlockTexture(); - IIcon icon = EnderIO.blockHyperCube.getPortalIcon(); - - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(!isActive) { - GL11.glColor4f(0, 1, 1, 0.5f); - } else { - GL11.glColor4f(1, 1, 1, 1f); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - CubeRenderer.render(bb, icon); - tessellator.draw(); - GL11.glPopMatrix(); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (adjustForItem) { + switch (type) { + case ENTITY: + renderItem(0f, 0f, 0f); + return; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + renderItem(0f, 1f, 1f); + return; + case INVENTORY: + renderItem(0f, 0f, 0f); + return; + default: + renderItem(0f, 0f, 0f); + return; + } + } else { + renderItem(0, 0, 0); + } + } - private void renderItem(float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - model.render(); - GL11.glPopMatrix(); - } + private void renderPower(World world, double x, double y, double z, boolean isActive) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + + RenderUtil.bindBlockTexture(); + IIcon icon = EnderIO.blockHyperCube.getPortalIcon(); + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if (!isActive) { + GL11.glColor4f(0, 1, 1, 0.5f); + } else { + GL11.glColor4f(1, 1, 1, 1f); + } + CubeRenderer.render(bb, icon); + tessellator.draw(); + + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_BLEND); + } + + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + model.render(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/IModel.java b/src/main/java/crazypants/enderio/machine/hypercube/IModel.java index f03ec0c4..6820c56f 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/IModel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/IModel.java @@ -2,8 +2,7 @@ package crazypants.enderio.machine.hypercube; public interface IModel { - void render(TileHyperCube cube, double x, double y, double z); - - void render(); + void render(TileHyperCube cube, double x, double y, double z); + void render(); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java b/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java index fb2d7a61..1fd1c6c4 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/ItemRecieveBuffer.java @@ -1,91 +1,88 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.common.util.ArrayInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.common.util.ArrayInventory; - public class ItemRecieveBuffer extends ArrayInventory implements ISidedInventory { - private static final int[] ALL_SLOTS = new int[] { 0, 1, 2, 3, 4, 5 }; - private boolean recieveEnabled; + private static final int[] ALL_SLOTS = new int[] {0, 1, 2, 3, 4, 5}; + private boolean recieveEnabled; - TileHyperCube hc; + TileHyperCube hc; - public ItemRecieveBuffer(TileHyperCube hc) { - super(6); - this.hc = hc; - } + public ItemRecieveBuffer(TileHyperCube hc) { + super(6); + this.hc = hc; + } - public boolean isEmpty() { - for (ItemStack stack : items) { - if(stack != null) { + public boolean isEmpty() { + for (ItemStack stack : items) { + if (stack != null) { + return false; + } + } + return true; + } + + public ItemStack[] getItems() { + return items; + } + + public void setRecieveEnabled(boolean canRecieveItems) { + recieveEnabled = canRecieveItems; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + return ALL_SLOTS; + } + + @Override + public boolean canInsertItem(int slot, ItemStack itemStack, int side) { + if (!recieveEnabled || side < 0 || side >= items.length || slot != side || itemStack == null) { + return false; + } + ItemStack item = items[slot]; + if (item == null) { + return true; + } return false; - } - } - return true; - } - - public ItemStack[] getItems() { - return items; - } - - public void setRecieveEnabled(boolean canRecieveItems) { - recieveEnabled = canRecieveItems; - } - - @Override - public int[] getAccessibleSlotsFromSide(int side) { - return ALL_SLOTS; - } - - @Override - public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - if(!recieveEnabled || side < 0 || side >= items.length || slot != side || itemStack == null) { - return false; - } - ItemStack item = items[slot]; - if(item == null) { - return true; - } - return false; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - super.setInventorySlotContents(slot, stack); - hc.pushRecieveBuffer(); - } - - @Override - public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return true; - } - - public void readFromNBT(NBTTagCompound nbtRoot) { - items = new ItemStack[6]; - for (int i = 0; i < items.length; i++) { - String key = "recieveBuffer" + i; - if(nbtRoot.hasKey(key)) { - NBTTagCompound stackRoot = nbtRoot.getCompoundTag(key); - items[i] = ItemStack.loadItemStackFromNBT(stackRoot); - } else { - items[i] = null; - } - } - } - - public void writeToNBT(NBTTagCompound nbtRoot) { - for (int i = 0; i < items.length; i++) { - ItemStack stack = items[i]; - if(stack != null) { - NBTTagCompound stackRoot = new NBTTagCompound(); - stack.writeToNBT(stackRoot); - nbtRoot.setTag("recieveBuffer" + i, stackRoot); - } } - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + super.setInventorySlotContents(slot, stack); + hc.pushRecieveBuffer(); + } + @Override + public boolean canExtractItem(int slot, ItemStack itemStack, int side) { + return true; + } + + public void readFromNBT(NBTTagCompound nbtRoot) { + items = new ItemStack[6]; + for (int i = 0; i < items.length; i++) { + String key = "recieveBuffer" + i; + if (nbtRoot.hasKey(key)) { + NBTTagCompound stackRoot = nbtRoot.getCompoundTag(key); + items[i] = ItemStack.loadItemStackFromNBT(stackRoot); + } else { + items[i] = null; + } + } + } + + public void writeToNBT(NBTTagCompound nbtRoot) { + for (int i = 0; i < items.length; i++) { + ItemStack stack = items[i]; + if (stack != null) { + NBTTagCompound stackRoot = new NBTTagCompound(); + stack.writeToNBT(stackRoot); + nbtRoot.setTag("recieveBuffer" + i, stackRoot); + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index 64995a76..8bb9d54f 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine.hypercube; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.util.PlayerUtil; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -11,60 +8,59 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; public class PacketAddRemoveChannel implements IMessage, IMessageHandler { - private boolean isAdd; - private Channel channel; + private boolean isAdd; + private Channel channel; - public PacketAddRemoveChannel() { - } + public PacketAddRemoveChannel() {} - public PacketAddRemoveChannel(boolean isAdd, Channel channel) { - this.isAdd = isAdd; - this.channel = channel; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(isAdd); - buf.writeBoolean(channel.isPublic()); - ByteBufUtils.writeUTF8String(buf, channel.name); - if(!channel.isPublic()) { - ByteBufUtils.writeUTF8String(buf, channel.user.toString()); + public PacketAddRemoveChannel(boolean isAdd, Channel channel) { + this.isAdd = isAdd; + this.channel = channel; } - } - @Override - public void fromBytes(ByteBuf data) { - isAdd = data.readBoolean(); - - boolean isPublic = data.readBoolean(); - String name = ByteBufUtils.readUTF8String(data); - String user = null; - if(!isPublic) { - user = ByteBufUtils.readUTF8String(data); + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(isAdd); + buf.writeBoolean(channel.isPublic()); + ByteBufUtils.writeUTF8String(buf, channel.name); + if (!channel.isPublic()) { + ByteBufUtils.writeUTF8String(buf, channel.user.toString()); + } } - channel = new Channel(name, PlayerUtil.getPlayerUIDUnstable(user)); - } - @Override - public IMessage onMessage(PacketAddRemoveChannel message, MessageContext ctx) { - if(FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { - if(message.isAdd) { - HyperCubeRegister.instance.addChannel(message.channel); - } else { - HyperCubeRegister.instance.removeChannel(message.channel); - } - PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(message.isAdd, message.channel)); - } else { - if(message.isAdd) { - ClientChannelRegister.instance.channelAdded(message.channel); - } else { - ClientChannelRegister.instance.channelRemoved(message.channel); - } + @Override + public void fromBytes(ByteBuf data) { + isAdd = data.readBoolean(); + + boolean isPublic = data.readBoolean(); + String name = ByteBufUtils.readUTF8String(data); + String user = null; + if (!isPublic) { + user = ByteBufUtils.readUTF8String(data); + } + channel = new Channel(name, PlayerUtil.getPlayerUIDUnstable(user)); } - return null; - } + @Override + public IMessage onMessage(PacketAddRemoveChannel message, MessageContext ctx) { + if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + if (message.isAdd) { + HyperCubeRegister.instance.addChannel(message.channel); + } else { + HyperCubeRegister.instance.removeChannel(message.channel); + } + PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(message.isAdd, message.channel)); + } else { + if (message.isAdd) { + ClientChannelRegister.instance.channelAdded(message.channel); + } else { + ClientChannelRegister.instance.channelRemoved(message.channel); + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index d126be8f..ef3b4ccc 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -1,96 +1,87 @@ package crazypants.enderio.machine.hypercube; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import net.minecraft.entity.player.EntityPlayer; - import com.enderio.core.common.util.PlayerUtil; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import net.minecraft.entity.player.EntityPlayer; -public class PacketChannelList implements IMessage, IMessageHandler { +public class PacketChannelList implements IMessage, IMessageHandler { - private boolean isPrivate; - private List channels; - private UUID userId; + private boolean isPrivate; + private List channels; + private UUID userId; - public PacketChannelList() { - } + public PacketChannelList() {} - public PacketChannelList(EntityPlayer player, boolean isPrivate) { - this(PlayerUtil.getPlayerUUID(player.getGameProfile().getName()), isPrivate); - } - - public PacketChannelList(UUID uuid, boolean isPrivate) { - this.userId = uuid; - this.isPrivate = isPrivate; - if(isPrivate && uuid == null) { - throw new RuntimeException("Null user ID."); + public PacketChannelList(EntityPlayer player, boolean isPrivate) { + this(PlayerUtil.getPlayerUUID(player.getGameProfile().getName()), isPrivate); } - List res; - if(isPrivate) { - res = HyperCubeRegister.instance.getChannelsForUser(uuid); - } else { - res = HyperCubeRegister.instance.getPublicChannels(); + public PacketChannelList(UUID uuid, boolean isPrivate) { + this.userId = uuid; + this.isPrivate = isPrivate; + if (isPrivate && uuid == null) { + throw new RuntimeException("Null user ID."); + } + + List res; + if (isPrivate) { + res = HyperCubeRegister.instance.getChannelsForUser(uuid); + } else { + res = HyperCubeRegister.instance.getPublicChannels(); + } + + if (res != null && !res.isEmpty()) { + channels = new ArrayList(res); + } else { + channels = new ArrayList(); + } } - if(res != null && !res.isEmpty()) { - channels = new ArrayList(res); - } else { - channels = new ArrayList(); - } - } - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeBoolean(isPrivate); - if(isPrivate) { - buffer.writeLong(userId.getMostSignificantBits()); - buffer.writeLong(userId.getLeastSignificantBits()); - } - buffer.writeInt(channels.size()); - for (Channel channel : channels) { - ByteBufUtils.writeUTF8String(buffer, channel.name); + @Override + public void toBytes(ByteBuf buffer) { + buffer.writeBoolean(isPrivate); + if (isPrivate) { + buffer.writeLong(userId.getMostSignificantBits()); + buffer.writeLong(userId.getLeastSignificantBits()); + } + buffer.writeInt(channels.size()); + for (Channel channel : channels) { + ByteBufUtils.writeUTF8String(buffer, channel.name); + } } - } + @Override + public void fromBytes(ByteBuf buffer) { + isPrivate = buffer.readBoolean(); + if (isPrivate) { + long long1 = buffer.readLong(); + long long2 = buffer.readLong(); - @Override - public void fromBytes(ByteBuf buffer) { - isPrivate = buffer.readBoolean(); - if(isPrivate) { - long long1=buffer.readLong(); - long long2=buffer.readLong(); - - userId = new UUID(long1,long2); - } else { - userId = null; + userId = new UUID(long1, long2); + } else { + userId = null; + } + int numChannels = buffer.readInt(); + channels = new ArrayList(); + for (int i = 0; i < numChannels; i++) { + channels.add(new Channel(ByteBufUtils.readUTF8String(buffer), userId)); + } } - int numChannels = buffer.readInt(); - channels = new ArrayList(); - for (int i = 0; i < numChannels; i++) { - channels.add(new Channel(ByteBufUtils.readUTF8String(buffer), userId)); + + @Override + public IMessage onMessage(PacketChannelList message, MessageContext ctx) { + if (message.isPrivate) { + ClientChannelRegister.instance.setPrivateChannels(message.channels); + } else { + ClientChannelRegister.instance.setPublicChannels(message.channels); + } + return null; } - } - - @Override - public IMessage onMessage(PacketChannelList message, MessageContext ctx) { - if(message.isPrivate) { - ClientChannelRegister.instance.setPrivateChannels(message.channels); - } else { - ClientChannelRegister.instance.setPublicChannels(message.channels); - } - return null; - } - - - } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index e1993171..0b81df9b 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -1,113 +1,104 @@ package crazypants.enderio.machine.hypercube; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.util.PlayerUtil; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketClientState implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private List modes; - private Channel selectedChannel; + private int x; + private int y; + private int z; + private List modes; + private Channel selectedChannel; - public PacketClientState() { - } + public PacketClientState() {} - public PacketClientState(TileHyperCube te) { - x = te.xCoord; - y = te.yCoord; - z = te.zCoord; - modes = new ArrayList(SubChannel.values().length); - for (SubChannel sc : SubChannel.values()) { - modes.add(te.getModeForChannel(sc)); - } - selectedChannel = te.getChannel(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - - if(selectedChannel == null) { - ByteBufUtils.writeUTF8String(buf, ""); - ByteBufUtils.writeUTF8String(buf, ""); - } else { - ByteBufUtils.writeUTF8String(buf, selectedChannel.name); - if(selectedChannel.isPublic()) { - ByteBufUtils.writeUTF8String(buf, ""); - } else { - ByteBufUtils.writeUTF8String(buf, selectedChannel.user.toString()); - } + public PacketClientState(TileHyperCube te) { + x = te.xCoord; + y = te.yCoord; + z = te.zCoord; + modes = new ArrayList(SubChannel.values().length); + for (SubChannel sc : SubChannel.values()) { + modes.add(te.getModeForChannel(sc)); + } + selectedChannel = te.getChannel(); } - for (IoMode mode : modes) { - buf.writeShort(mode.ordinal()); - } - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - - String name = ByteBufUtils.readUTF8String(buf); - String user = ByteBufUtils.readUTF8String(buf); - selectedChannel = null; - if(name != null && name.trim().length() > 0) { - if(user != null && user.trim().length() > 0) { - selectedChannel = new Channel(name, PlayerUtil.getPlayerUIDUnstable(user)); - } else { - selectedChannel = new Channel(name, null); - } + if (selectedChannel == null) { + ByteBufUtils.writeUTF8String(buf, ""); + ByteBufUtils.writeUTF8String(buf, ""); + } else { + ByteBufUtils.writeUTF8String(buf, selectedChannel.name); + if (selectedChannel.isPublic()) { + ByteBufUtils.writeUTF8String(buf, ""); + } else { + ByteBufUtils.writeUTF8String(buf, selectedChannel.user.toString()); + } + } + for (IoMode mode : modes) { + buf.writeShort(mode.ordinal()); + } } - modes = new ArrayList(SubChannel.values().length); - for (SubChannel sc : SubChannel.values()) { - short ordinal = buf.readShort(); - modes.add(IoMode.values()[ordinal]); + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + + String name = ByteBufUtils.readUTF8String(buf); + String user = ByteBufUtils.readUTF8String(buf); + selectedChannel = null; + if (name != null && name.trim().length() > 0) { + if (user != null && user.trim().length() > 0) { + selectedChannel = new Channel(name, PlayerUtil.getPlayerUIDUnstable(user)); + } else { + selectedChannel = new Channel(name, null); + } + } + + modes = new ArrayList(SubChannel.values().length); + for (SubChannel sc : SubChannel.values()) { + short ordinal = buf.readShort(); + modes.add(IoMode.values()[ordinal]); + } } - } + @Override + public IMessage onMessage(PacketClientState message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileHyperCube) { + TileHyperCube hc = (TileHyperCube) te; - @Override - public IMessage onMessage(PacketClientState message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileHyperCube) { - TileHyperCube hc = (TileHyperCube) te; + SubChannel[] vals = SubChannel.values(); + for (int i = 0; i < vals.length; i++) { + SubChannel sc = vals[i]; + IoMode mode = message.modes.get(i); + hc.setModeForChannel(sc, mode); + } - SubChannel[] vals = SubChannel.values(); - for (int i = 0; i < vals.length; i++) { - SubChannel sc = vals[i]; - IoMode mode = message.modes.get(i); - hc.setModeForChannel(sc, mode); - } + hc.setChannel(message.selectedChannel); - hc.setChannel(message.selectedChannel); - - player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + } + return null; } - return null; - - } - } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java index 962739da..f5c60c8c 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java @@ -1,56 +1,53 @@ package crazypants.enderio.machine.hypercube; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketStoredPower implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private int storedEnergy; + private int x; + private int y; + private int z; + private int storedEnergy; - public PacketStoredPower() { - } + public PacketStoredPower() {} - public PacketStoredPower(TileHyperCube ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - storedEnergy = ent.getEnergyStored(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(storedEnergy); - - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - storedEnergy = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketStoredPower message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileHyperCube) { - TileHyperCube me = (TileHyperCube) te; - me.setEnergyStored(message.storedEnergy); + public PacketStoredPower(TileHyperCube ent) { + x = ent.xCoord; + y = ent.yCoord; + z = ent.zCoord; + storedEnergy = ent.getEnergyStored(); } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(storedEnergy); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + storedEnergy = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketStoredPower message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileHyperCube) { + TileHyperCube me = (TileHyperCube) te; + me.setEnergyStored(message.storedEnergy); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index d203f6b0..acfeec5c 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -1,12 +1,25 @@ package crazypants.enderio.machine.hypercube; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.PlayerUtil; +import com.enderio.core.common.vecmath.VecmathUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IRedstoneModeControlable; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.IInternalPowerHandler; +import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.PowerHandlerUtil; import java.util.ArrayList; import java.util.Collections; import java.util.EnumMap; import java.util.List; import java.util.ListIterator; import java.util.UUID; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -20,879 +33,850 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.PlayerUtil; -import com.enderio.core.common.vecmath.VecmathUtil; +public class TileHyperCube extends TileEntityEio + implements IInternalPowerHandler, IFluidHandler, ISidedInventory, IRedstoneModeControlable { -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IRedstoneModeControlable; -import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.IInternalPowerHandler; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.PowerHandlerUtil; + private static final double ENERGY_LOSS = Config.transceiverEnergyLoss; -public class TileHyperCube extends TileEntityEio implements IInternalPowerHandler, IFluidHandler, ISidedInventory, IRedstoneModeControlable { + private static final int ENERGY_UPKEEP = Config.transceiverUpkeepCostRF; - private static final double ENERGY_LOSS = Config.transceiverEnergyLoss; + private static final float MILLIBUCKET_TRANSMISSION_COST = Config.transceiverBucketTransmissionCostRF / 1000F; - private static final int ENERGY_UPKEEP = Config.transceiverUpkeepCostRF; + public static enum IoMode { + SEND("gui.send"), + RECIEVE("gui.receive"), + BOTH("gui.sendReceive"), + NEITHER("gui.disabled"); - private static final float MILLIBUCKET_TRANSMISSION_COST = Config.transceiverBucketTransmissionCostRF / 1000F; - - public static enum IoMode { - - SEND("gui.send"), - RECIEVE("gui.receive"), - BOTH("gui.sendReceive"), - NEITHER("gui.disabled"); - - public static IoMode next(IoMode mode) { - int index = mode.ordinal() + 1; - if(index >= values().length) { - index = 0; - } - return values()[index]; - } - - public static boolean isRecieveEnabled(IoMode mode) { - return mode == RECIEVE || mode == BOTH; - } - - public static boolean isSendEnabled(IoMode mode) { - return mode == SEND || mode == BOTH; - } - - private final String unlocalisedName; - - private IoMode(String unlocalisedName) { - this.unlocalisedName = unlocalisedName; - } - - public boolean isRecieveEnabled() { - return isRecieveEnabled(this); - } - - public boolean isSendEnabled() { - return isSendEnabled(this); - } - - public IoMode next() { - return next(this); - } - - public String getUnlocalisedName() { - return unlocalisedName; - } - - public String getLocalisedName() { - return EnderIO.lang.localize(unlocalisedName); - } - } - - public static enum SubChannel { - POWER, - FLUID, - ITEM - } - - private final BasicCapacitor internalCapacitor = new BasicCapacitor(Config.transceiverMaxIoRF, 25000); - - private int lastSyncPowerStored = 0; - private int storedEnergyRF; - - private final List receptors = new ArrayList(); - private ListIterator receptorIterator = receptors.listIterator(); - private boolean receptorsDirty = true; - - private final List fluidHandlers = new ArrayList(); - private boolean fluidHandlersDirty = true; - - private CompositeInventory localInventory = new CompositeInventory(); - private boolean inventoriesDirty = true; - - private Channel channel = null; - private Channel registeredChannel = null; - private UUID owner; - - private boolean init = true; - - private float milliBucketsTransfered = 0; - - private EnumMap ioModes = new EnumMap(SubChannel.class); - - private ItemRecieveBuffer recieveBuffer; - - protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; - protected boolean redstoneCheckPassed; - private boolean redstoneStateDirty = true; - private boolean isConnected = false; - - public TileHyperCube() { - redstoneControlMode = RedstoneControlMode.IGNORE; - recieveBuffer = new ItemRecieveBuffer(this); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return redstoneControlMode; - } - - @Override - public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { - this.redstoneControlMode = redstoneControlMode; - redstoneStateDirty = true; - updateBlock(); - } - - public IoMode getModeForChannel(SubChannel channel) { - IoMode mode = ioModes.get(channel); - if(mode == null) { - return IoMode.NEITHER; - } - return mode; - } - - public void setModeForChannel(SubChannel channel, IoMode mode) { - ioModes.put(channel, mode); - } - - public Channel getChannel() { - return channel; - } - - public void setChannel(Channel channel) { - this.channel = channel; - } - - int getEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * ((double)getEnergyStored() / getMaxEnergyStored())), 0, scale); - } - - public void onBreakBlock() { - HyperCubeRegister.instance.deregister(this); - } - - public void onBlockAdded() { - HyperCubeRegister.instance.register(this); - } - - public void setOwner(UUID owner) { - this.owner = owner; - } - - private boolean canMaintainConnection() { - if(channel == null || HyperCubeRegister.instance == null || !redstoneCheckPassed) { - return false; - } - List cons = HyperCubeRegister.instance.getCubesForChannel(channel); - for (TileHyperCube cube : cons) { - if(cube != this && cube.getEnergyStored() <= 0) { - return false; - } - } - return cons != null && cons.size() > 1 && getEnergyStored() > 0; - } - - private void sendEnergyToOtherNodes() { - - List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); - if(cubes == null || cubes.isEmpty()) { - return; - } - - if(canSendPower()) { - - for (TileHyperCube cube : cubes) { - int stored = getEnergyStored(); - if(stored > 0 && cube != null && cube != this && cube.canRecievePower()) { - int curPower = cube.getEnergyStored(); - int requires = cube.getMaxEnergyStored() - curPower; - int transfer = Math.min(requires, stored); - transfer = Math.min(transfer, Config.transceiverMaxIoRF); - cube.setEnergyStored(curPower + (int)Math.round((1 - ENERGY_LOSS) * transfer)); - setEnergyStored(getEnergyStored() - transfer); + public static IoMode next(IoMode mode) { + int index = mode.ordinal() + 1; + if (index >= values().length) { + index = 0; + } + return values()[index]; } - } + public static boolean isRecieveEnabled(IoMode mode) { + return mode == RECIEVE || mode == BOTH; + } + + public static boolean isSendEnabled(IoMode mode) { + return mode == SEND || mode == BOTH; + } + + private final String unlocalisedName; + + private IoMode(String unlocalisedName) { + this.unlocalisedName = unlocalisedName; + } + + public boolean isRecieveEnabled() { + return isRecieveEnabled(this); + } + + public boolean isSendEnabled() { + return isSendEnabled(this); + } + + public IoMode next() { + return next(this); + } + + public String getUnlocalisedName() { + return unlocalisedName; + } + + public String getLocalisedName() { + return EnderIO.lang.localize(unlocalisedName); + } } - } - - @Override - public void onChunkUnload() { - if(HyperCubeRegister.instance != null) { - HyperCubeRegister.instance.deregister(this); - } - fluidHandlersDirty = true; - receptorsDirty = true; - inventoriesDirty = true; - } - - public void onNeighborBlockChange() { - receptorsDirty = true; - fluidHandlersDirty = true; - inventoriesDirty = true; - redstoneStateDirty = true; - updateInventories(); - } - - @Override - public void doUpdate() { - if(worldObj.isRemote) { - return; - } // else is server, do all logic only on the server - - - - // Pay upkeep cost - storedEnergyRF -= ENERGY_UPKEEP; - // Pay fluid transmission cost - storedEnergyRF -= (MILLIBUCKET_TRANSMISSION_COST * milliBucketsTransfered); - - // update power status - storedEnergyRF = Math.max(storedEnergyRF, 0); - - milliBucketsTransfered = 0; - - boolean prevRedCheck = redstoneCheckPassed; - if(redstoneStateDirty) { - redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); - redstoneStateDirty = false; + public static enum SubChannel { + POWER, + FLUID, + ITEM } - if(!redstoneCheckPassed) { - if(registeredChannel != null) { - HyperCubeRegister.instance.deregister(this, registeredChannel); - registeredChannel = null; - } + private final BasicCapacitor internalCapacitor = new BasicCapacitor(Config.transceiverMaxIoRF, 25000); + private int lastSyncPowerStored = 0; + private int storedEnergyRF; + + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + private boolean receptorsDirty = true; + + private final List fluidHandlers = new ArrayList(); + private boolean fluidHandlersDirty = true; + + private CompositeInventory localInventory = new CompositeInventory(); + private boolean inventoriesDirty = true; + + private Channel channel = null; + private Channel registeredChannel = null; + private UUID owner; + + private boolean init = true; + + private float milliBucketsTransfered = 0; + + private EnumMap ioModes = + new EnumMap(SubChannel.class); + + private ItemRecieveBuffer recieveBuffer; + + protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; + protected boolean redstoneCheckPassed; + private boolean redstoneStateDirty = true; + private boolean isConnected = false; + + public TileHyperCube() { + redstoneControlMode = RedstoneControlMode.IGNORE; + recieveBuffer = new ItemRecieveBuffer(this); } - if(storedEnergyRF > 0) { - transmitEnergy(); - sendEnergyToOtherNodes(); + @Override + public RedstoneControlMode getRedstoneControlMode() { + return redstoneControlMode; } - updateInventories(); - pushRecieveBuffer(); - - // check we are still connected (i.e. we haven't run out of power or started - // receiving power) - boolean requiresClientSync = false; - - boolean stillConnected = canMaintainConnection(); - if(isConnected != stillConnected) { - fluidHandlersDirty = true; - isConnected = stillConnected; - requiresClientSync = true; - } - updateFluidHandlers(); - - if(redstoneCheckPassed && (registeredChannel == null ? channel != null : !registeredChannel.equals(channel))) { - if(registeredChannel != null) { - HyperCubeRegister.instance.deregister(this, registeredChannel); - } - HyperCubeRegister.instance.register(this); - registeredChannel = channel; + @Override + public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { + this.redstoneControlMode = redstoneControlMode; + redstoneStateDirty = true; + updateBlock(); } - requiresClientSync |= prevRedCheck != redstoneCheckPassed; - - boolean powerChanged = lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(21); - if(powerChanged) { - lastSyncPowerStored = storedEnergyRF; - EnderIO.packetPipeline.sendToAllAround(new PacketStoredPower(this), this); + public IoMode getModeForChannel(SubChannel channel) { + IoMode mode = ioModes.get(channel); + if (mode == null) { + return IoMode.NEITHER; + } + return mode; } - if(requiresClientSync) { - - // this will cause 'getPacketDescription()' to be called and its result - // will be sent to the PacketHandler on the other end of - // client/server connection - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - // And this will make sure our current tile entity state is saved - markDirty(); + public void setModeForChannel(SubChannel channel, IoMode mode) { + ioModes.put(channel, mode); } - } - - private boolean canSendFluid() { - return getModeForChannel(SubChannel.FLUID).isSendEnabled(); - } - - private boolean canSendPower() { - return getModeForChannel(SubChannel.POWER).isSendEnabled(); - } - - private boolean canSendItems() { - return getModeForChannel(SubChannel.ITEM).isSendEnabled() && redstoneCheckPassed; - } - - private boolean canRecieveFluid() { - return getModeForChannel(SubChannel.FLUID).isRecieveEnabled(); - } - - private boolean canRecievePower() { - return getModeForChannel(SubChannel.POWER).isRecieveEnabled(); - } - - private boolean canRecieveItems() { - return getModeForChannel(SubChannel.ITEM).isRecieveEnabled(); - } - - //-------------------------- Power ----------------------------------------------- - - private boolean transmitEnergy() { - - if(!getModeForChannel(SubChannel.POWER).isRecieveEnabled() || !redstoneCheckPassed || getEnergyStored() <= 0) { - return false; + public Channel getChannel() { + return channel; } - int canTransmit = Math.min(getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); - int transmitted = 0; - - updatePowersReceptors(); - - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = receptors.listIterator(); + public void setChannel(Channel channel) { + this.channel = channel; } - int appliedCount = 0; - int numReceptors = receptors.size(); - while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { - Receptor receptor = receptorIterator.next(); - IPowerInterface pp = receptor.receptor; - if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - float used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - transmitted += used; - canTransmit -= used; - } - if(canTransmit <= 0) { - break; - } + int getEnergyStoredScaled(int scale) { + return (int) + VecmathUtil.clamp(Math.round(scale * ((double) getEnergyStored() / getMaxEnergyStored())), 0, scale); + } - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { + public void onBreakBlock() { + HyperCubeRegister.instance.deregister(this); + } + + public void onBlockAdded() { + HyperCubeRegister.instance.register(this); + } + + public void setOwner(UUID owner) { + this.owner = owner; + } + + private boolean canMaintainConnection() { + if (channel == null || HyperCubeRegister.instance == null || !redstoneCheckPassed) { + return false; + } + List cons = HyperCubeRegister.instance.getCubesForChannel(channel); + for (TileHyperCube cube : cons) { + if (cube != this && cube.getEnergyStored() <= 0) { + return false; + } + } + return cons != null && cons.size() > 1 && getEnergyStored() > 0; + } + + private void sendEnergyToOtherNodes() { + + List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); + if (cubes == null || cubes.isEmpty()) { + return; + } + + if (canSendPower()) { + + for (TileHyperCube cube : cubes) { + int stored = getEnergyStored(); + if (stored > 0 && cube != null && cube != this && cube.canRecievePower()) { + int curPower = cube.getEnergyStored(); + int requires = cube.getMaxEnergyStored() - curPower; + int transfer = Math.min(requires, stored); + transfer = Math.min(transfer, Config.transceiverMaxIoRF); + cube.setEnergyStored(curPower + (int) Math.round((1 - ENERGY_LOSS) * transfer)); + setEnergyStored(getEnergyStored() - transfer); + } + } + } + } + + @Override + public void onChunkUnload() { + if (HyperCubeRegister.instance != null) { + HyperCubeRegister.instance.deregister(this); + } + fluidHandlersDirty = true; + receptorsDirty = true; + inventoriesDirty = true; + } + + public void onNeighborBlockChange() { + receptorsDirty = true; + fluidHandlersDirty = true; + inventoriesDirty = true; + redstoneStateDirty = true; + updateInventories(); + } + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + return; + } // else is server, do all logic only on the server + + // Pay upkeep cost + storedEnergyRF -= ENERGY_UPKEEP; + // Pay fluid transmission cost + storedEnergyRF -= (MILLIBUCKET_TRANSMISSION_COST * milliBucketsTransfered); + + // update power status + storedEnergyRF = Math.max(storedEnergyRF, 0); + + milliBucketsTransfered = 0; + + boolean prevRedCheck = redstoneCheckPassed; + if (redstoneStateDirty) { + redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); + redstoneStateDirty = false; + } + + if (!redstoneCheckPassed) { + if (registeredChannel != null) { + HyperCubeRegister.instance.deregister(this, registeredChannel); + registeredChannel = null; + } + } + + if (storedEnergyRF > 0) { + transmitEnergy(); + sendEnergyToOtherNodes(); + } + + updateInventories(); + pushRecieveBuffer(); + + // check we are still connected (i.e. we haven't run out of power or started + // receiving power) + boolean requiresClientSync = false; + + boolean stillConnected = canMaintainConnection(); + if (isConnected != stillConnected) { + fluidHandlersDirty = true; + isConnected = stillConnected; + requiresClientSync = true; + } + updateFluidHandlers(); + + if (redstoneCheckPassed && (registeredChannel == null ? channel != null : !registeredChannel.equals(channel))) { + if (registeredChannel != null) { + HyperCubeRegister.instance.deregister(this, registeredChannel); + } + HyperCubeRegister.instance.register(this); + registeredChannel = channel; + } + + requiresClientSync |= prevRedCheck != redstoneCheckPassed; + + boolean powerChanged = lastSyncPowerStored != storedEnergyRF && shouldDoWorkThisTick(21); + if (powerChanged) { + lastSyncPowerStored = storedEnergyRF; + EnderIO.packetPipeline.sendToAllAround(new PacketStoredPower(this), this); + } + + if (requiresClientSync) { + + // this will cause 'getPacketDescription()' to be called and its result + // will be sent to the PacketHandler on the other end of + // client/server connection + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + // And this will make sure our current tile entity state is saved + markDirty(); + } + } + + private boolean canSendFluid() { + return getModeForChannel(SubChannel.FLUID).isSendEnabled(); + } + + private boolean canSendPower() { + return getModeForChannel(SubChannel.POWER).isSendEnabled(); + } + + private boolean canSendItems() { + return getModeForChannel(SubChannel.ITEM).isSendEnabled() && redstoneCheckPassed; + } + + private boolean canRecieveFluid() { + return getModeForChannel(SubChannel.FLUID).isRecieveEnabled(); + } + + private boolean canRecievePower() { + return getModeForChannel(SubChannel.POWER).isRecieveEnabled(); + } + + private boolean canRecieveItems() { + return getModeForChannel(SubChannel.ITEM).isRecieveEnabled(); + } + + // -------------------------- Power ----------------------------------------------- + + private boolean transmitEnergy() { + + if (!getModeForChannel(SubChannel.POWER).isRecieveEnabled() || !redstoneCheckPassed || getEnergyStored() <= 0) { + return false; + } + + int canTransmit = Math.min(getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); + int transmitted = 0; + + updatePowersReceptors(); + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + + int appliedCount = 0; + int numReceptors = receptors.size(); + while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + Receptor receptor = receptorIterator.next(); + IPowerInterface pp = receptor.receptor; + if (pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { + float used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); + transmitted += used; + canTransmit -= used; + } + if (canTransmit <= 0) { + break; + } + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + appliedCount++; + } + setEnergyStored(getEnergyStored() - transmitted); + + return transmitted > 0; + } + + // RF Power + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (getModeForChannel(SubChannel.POWER) != IoMode.RECIEVE) { + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } + return 0; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return storedEnergyRF; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + if (getModeForChannel(SubChannel.POWER) == IoMode.RECIEVE) { + return 0; + } + return internalCapacitor.getMaxEnergyReceived(); + } + + @Override + public int getEnergyStored() { + return storedEnergyRF; + } + + @Override + public int getMaxEnergyStored() { + return internalCapacitor.getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (!canSendFluid()) { + return 0; + } + FluidStack in = resource.copy(); + int result = 0; + for (NetworkFluidHandler h : getNetworkHandlers()) { + if (h.node.canRecieveFluid() && h.handler.canFill(h.dirOp, in.getFluid())) { + int filled = h.handler.fill(h.dirOp, in, doFill); + in.amount -= filled; + result += filled; + } + } + if (doFill) { + milliBucketsTransfered += result; + } + return result; + } + + private void updatePowersReceptors() { + if (!receptorsDirty) { + return; + } + receptors.clear(); + BlockCoord myLoc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord checkLoc = myLoc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + IPowerInterface pi = PowerHandlerUtil.create(te); + if (pi != null) { + receptors.add(new Receptor(pi, dir)); + } + } receptorIterator = receptors.listIterator(); - } - appliedCount++; - } - setEnergyStored(getEnergyStored() - transmitted); - - return transmitted > 0; - - } - - // RF Power - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(getModeForChannel(SubChannel.POWER) != IoMode.RECIEVE) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - return 0; - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return true; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return storedEnergyRF; - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - if(getModeForChannel(SubChannel.POWER) == IoMode.RECIEVE) { - return 0; - } - return internalCapacitor.getMaxEnergyReceived(); - } - - @Override - public int getEnergyStored() { - return storedEnergyRF; - } - - @Override - public int getMaxEnergyStored() { - return internalCapacitor.getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(!canSendFluid()) { - return 0; - } - FluidStack in = resource.copy(); - int result = 0; - for (NetworkFluidHandler h : getNetworkHandlers()) { - if(h.node.canRecieveFluid() && h.handler.canFill(h.dirOp, in.getFluid())) { - int filled = h.handler.fill(h.dirOp, in, doFill); - in.amount -= filled; - result += filled; - } - } - if(doFill) { - milliBucketsTransfered += result; - } - return result; - } - - private void updatePowersReceptors() { - if(!receptorsDirty) { - return; - } - receptors.clear(); - BlockCoord myLoc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord checkLoc = myLoc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - IPowerInterface pi = PowerHandlerUtil.create(te); - if(pi != null) { - receptors.add(new Receptor(pi, dir)); - } - } - receptorIterator = receptors.listIterator(); - receptorsDirty = false; - } - - //----------------------- Fluids ----------------------------------------------- - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(!canRecieveFluid() || resource == null) { - return null; + receptorsDirty = false; } - FluidStack in = resource.copy(); - FluidStack result = null; - for (NetworkFluidHandler h : getNetworkHandlers()) { - if(h.node.canSendFluid() && h.handler.canDrain(h.dirOp, in.getFluid())) { - FluidStack res = h.handler.drain(h.dirOp, in, false); - if(res != null) { - if(result == null) { - result = res.copy(); - if(doDrain) { - h.handler.drain(h.dirOp, in, true); + // ----------------------- Fluids ----------------------------------------------- + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (!canRecieveFluid() || resource == null) { + return null; + } + + FluidStack in = resource.copy(); + FluidStack result = null; + for (NetworkFluidHandler h : getNetworkHandlers()) { + if (h.node.canSendFluid() && h.handler.canDrain(h.dirOp, in.getFluid())) { + FluidStack res = h.handler.drain(h.dirOp, in, false); + if (res != null) { + if (result == null) { + result = res.copy(); + if (doDrain) { + h.handler.drain(h.dirOp, in, true); + } + + } else if (result.isFluidEqual(res)) { + result.amount += res.amount; + if (doDrain) { + h.handler.drain(h.dirOp, in, true); + } + in.amount -= res.amount; + } + } } + } + return result; + } - } else if(result.isFluidEqual(res)) { - result.amount += res.amount; - if(doDrain) { - h.handler.drain(h.dirOp, in, true); + @Override + public FluidStack drain(ForgeDirection from, int maxDrainIn, boolean doDrain) { + if (!canRecieveFluid()) { + return null; + } + int maxDrain = maxDrainIn; + FluidStack result = null; + for (NetworkFluidHandler h : getNetworkHandlers()) { + if (h.node.canSendFluid()) { + FluidStack res = h.handler.drain(h.dirOp, maxDrain, false); + if (res != null) { + if (result == null) { + result = res.copy(); + if (doDrain) { + h.handler.drain(h.dirOp, maxDrain, true); + } + maxDrain -= res.amount; + } else if (result.isFluidEqual(res)) { + result.amount += res.amount; + if (doDrain) { + h.handler.drain(h.dirOp, maxDrain, true); + } + maxDrain -= res.amount; + } + } } - in.amount -= res.amount; - } } - } + return result; } - return result; - } - @Override - public FluidStack drain(ForgeDirection from, int maxDrainIn, boolean doDrain) { - if(!canRecieveFluid()) { - return null; - } - int maxDrain = maxDrainIn; - FluidStack result = null; - for (NetworkFluidHandler h : getNetworkHandlers()) { - if(h.node.canSendFluid()) { - FluidStack res = h.handler.drain(h.dirOp, maxDrain, false); - if(res != null) { - if(result == null) { - result = res.copy(); - if(doDrain) { - h.handler.drain(h.dirOp, maxDrain, true); + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (!canSendFluid()) { + return false; + } + for (NetworkFluidHandler h : getNetworkHandlers()) { + if (h.node.canRecieveFluid()) { + if (h.handler.canFill(h.dirOp, fluid)) { + return true; + } } - maxDrain -= res.amount; - } else if(result.isFluidEqual(res)) { - result.amount += res.amount; - if(doDrain) { - h.handler.drain(h.dirOp, maxDrain, true); + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (!canRecieveFluid()) { + return false; + } + for (NetworkFluidHandler h : getNetworkHandlers()) { + if (h.node.canSendFluid()) { + if (h.handler.canDrain(h.dirOp, fluid)) { + return true; + } } - maxDrain -= res.amount; - } } - } + return false; } - return result; - } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(!canSendFluid()) { - return false; - } - for (NetworkFluidHandler h : getNetworkHandlers()) { - if(h.node.canRecieveFluid()) { - if(h.handler.canFill(h.dirOp, fluid)) { - return true; + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + List res = new ArrayList(); + for (NetworkFluidHandler h : getNetworkHandlers()) { + FluidTankInfo[] ti = h.handler.getTankInfo(h.dirOp); + if (ti != null) { + for (FluidTankInfo t : ti) { + if (t != null) { + res.add(t); + } + } + } } - } - } - return false; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(!canRecieveFluid()) { - return false; - } - for (NetworkFluidHandler h : getNetworkHandlers()) { - if(h.node.canSendFluid()) { - if(h.handler.canDrain(h.dirOp, fluid)) { - return true; + if (res.isEmpty()) { + return new FluidTankInfo[] {new FluidTankInfo(null, 0)}; + } else { + return res.toArray(new FluidTankInfo[res.size()]); } - } } - return false; - } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - List res = new ArrayList(); - for (NetworkFluidHandler h : getNetworkHandlers()) { - FluidTankInfo[] ti = h.handler.getTankInfo(h.dirOp); - if(ti != null) { - for (FluidTankInfo t : ti) { - if(t != null) { - res.add(t); - } + private List getNetworkHandlers() { + if (HyperCubeRegister.instance == null || !redstoneCheckPassed) { + return Collections.emptyList(); } - } - } - if(res.isEmpty()) { - return new FluidTankInfo[] { new FluidTankInfo(null, 0) }; - } else { - return res.toArray(new FluidTankInfo[res.size()]); - } - } - - private List getNetworkHandlers() { - if(HyperCubeRegister.instance == null || !redstoneCheckPassed) { - return Collections.emptyList(); - } - List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); - if(cubes == null || cubes.isEmpty()) { - return Collections.emptyList(); - } - List result = new ArrayList(); - for (TileHyperCube cube : cubes) { - if(cube != this && cube != null) { - List handlers = cube.fluidHandlers; - if(handlers != null && !handlers.isEmpty()) { - result.addAll(handlers); + List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); + if (cubes == null || cubes.isEmpty()) { + return Collections.emptyList(); } - } - } - return result; - - } - - private void updateFluidHandlers() { - if(!fluidHandlersDirty) { - return; - } - fluidHandlers.clear(); - if(isConnected) { - BlockCoord myLoc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord checkLoc = myLoc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(te instanceof IFluidHandler && !(te instanceof TileHyperCube)) { - IFluidHandler fh = (IFluidHandler) te; - fluidHandlers.add(new NetworkFluidHandler(this, fh, dir)); - } - } - fluidHandlersDirty = false; - } - } - - //------- Item / Inventory --------------------------------------------------------------------- - - public ItemRecieveBuffer getRecieveBuffer() { - return recieveBuffer; - } - - private void updateInventories() { - - recieveBuffer.setRecieveEnabled(canSendItems()); - - if(!inventoriesDirty) { - return; - } - - localInventory = new CompositeInventory(); - - BlockCoord myLoc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord checkLoc = myLoc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(te instanceof IInventory && !(te instanceof TileHyperCube)) { - localInventory.addInventory((IInventory) te, dir); - } - } - inventoriesDirty = false; - - } - - void pushRecieveBuffer() { - - if(recieveBuffer.isEmpty()) { - return; - } - List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); - if(cubes == null || cubes.isEmpty()) { - return; - } - - for (int i = 0; i < recieveBuffer.getSizeInventory(); i++) { - ItemStack toPush = recieveBuffer.getStackInSlot(i); - if(toPush != null) { + List result = new ArrayList(); for (TileHyperCube cube : cubes) { - if(toPush != null && cube != this && cube != null && cube.canRecieveItems()) { - toPush = cube.recieveItems(toPush); - recieveBuffer.getItems()[i] = toPush; - } + if (cube != this && cube != null) { + List handlers = cube.fluidHandlers; + if (handlers != null && !handlers.isEmpty()) { + result.addAll(handlers); + } + } } - } + return result; } - } - - private ItemStack recieveItems(ItemStack toPush) { - if(toPush == null) { - return null; + private void updateFluidHandlers() { + if (!fluidHandlersDirty) { + return; + } + fluidHandlers.clear(); + if (isConnected) { + BlockCoord myLoc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord checkLoc = myLoc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (te instanceof IFluidHandler && !(te instanceof TileHyperCube)) { + IFluidHandler fh = (IFluidHandler) te; + fluidHandlers.add(new NetworkFluidHandler(this, fh, dir)); + } + } + fluidHandlersDirty = false; + } } - ItemStack result = toPush.copy(); - //TODO: need to cache this - BlockCoord myLoc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord checkLoc = myLoc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - result.stackSize -= ItemUtil.doInsertItem(te, result, dir.getOpposite()); - if(result.stackSize <= 0) { + + // ------- Item / Inventory --------------------------------------------------------------------- + + public ItemRecieveBuffer getRecieveBuffer() { + return recieveBuffer; + } + + private void updateInventories() { + + recieveBuffer.setRecieveEnabled(canSendItems()); + + if (!inventoriesDirty) { + return; + } + + localInventory = new CompositeInventory(); + + BlockCoord myLoc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord checkLoc = myLoc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (te instanceof IInventory && !(te instanceof TileHyperCube)) { + localInventory.addInventory((IInventory) te, dir); + } + } + inventoriesDirty = false; + } + + void pushRecieveBuffer() { + + if (recieveBuffer.isEmpty()) { + return; + } + List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); + if (cubes == null || cubes.isEmpty()) { + return; + } + + for (int i = 0; i < recieveBuffer.getSizeInventory(); i++) { + ItemStack toPush = recieveBuffer.getStackInSlot(i); + if (toPush != null) { + for (TileHyperCube cube : cubes) { + if (toPush != null && cube != this && cube != null && cube.canRecieveItems()) { + toPush = cube.recieveItems(toPush); + recieveBuffer.getItems()[i] = toPush; + } + } + } + } + } + + private ItemStack recieveItems(ItemStack toPush) { + if (toPush == null) { + return null; + } + ItemStack result = toPush.copy(); + // TODO: need to cache this + BlockCoord myLoc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord checkLoc = myLoc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + result.stackSize -= ItemUtil.doInsertItem(te, result, dir.getOpposite()); + if (result.stackSize <= 0) { + return null; + } + } + return result; + } + + private ISidedInventory getRemoteInventory() { + + CompositeInventory res = new CompositeInventory(); + res.addInventory(recieveBuffer, ForgeDirection.UNKNOWN); + + if (!canSendItems()) { + return res; + } + + if (HyperCubeRegister.instance == null) { + return res; + } + List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); + if (cubes == null || cubes.isEmpty()) { + return res; + } + for (TileHyperCube cube : cubes) { + if (cube != this && cube != null && cube.canRecieveItems()) { + if (cube.inventoriesDirty) { + cube.updateInventories(); + } + res.addInventory(cube.localInventory); + } + } + + return res; + } + + @Override + public int getSizeInventory() { + return getRemoteInventory().getSizeInventory(); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public ItemStack getStackInSlot(int i) { + return getRemoteInventory().getStackInSlot(i); + } + + @Override + public ItemStack decrStackSize(int i, int j) { + return getRemoteInventory().decrStackSize(i, j); + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + getRemoteInventory().setInventorySlotContents(i, itemstack); + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + return getRemoteInventory().getAccessibleSlotsFromSide(var1); + } + + @Override + public boolean canInsertItem(int i, ItemStack itemstack, int j) { + return getRemoteInventory().canInsertItem(i, itemstack, j); + } + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return getRemoteInventory().canExtractItem(i, itemstack, j); + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return getRemoteInventory().isItemValidForSlot(i, itemstack); + } + + @Override + public String getInventoryName() { + return ModObject.blockHyperCube.unlocalisedName; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return false; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public ItemStack getStackInSlotOnClosing(int i) { return null; - } - } - return result; - - } - - private ISidedInventory getRemoteInventory() { - - CompositeInventory res = new CompositeInventory(); - res.addInventory(recieveBuffer, ForgeDirection.UNKNOWN); - - if(!canSendItems()) { - return res; } - if(HyperCubeRegister.instance == null) { - return res; - } - List cubes = HyperCubeRegister.instance.getCubesForChannel(channel); - if(cubes == null || cubes.isEmpty()) { - return res; - } - for (TileHyperCube cube : cubes) { - if(cube != this && cube != null && cube.canRecieveItems()) { - if(cube.inventoriesDirty) { - cube.updateInventories(); + // ---- Serialisation --------------------------------------------------------- + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + + int energy; + if (nbtRoot.hasKey("storedEnergy")) { + energy = (int) (nbtRoot.getFloat("storedEnergy") * 10); + } else { + energy = nbtRoot.getInteger("storedEnergyRF"); + } + setEnergyStored(energy); + + String channelName = nbtRoot.getString("channelName"); + UUID channelUser = PlayerUtil.getPlayerUIDUnstable(nbtRoot.getString("channelUser")); + if (channelName != null && !channelName.isEmpty()) { + channel = new Channel(channelName, channelUser); + } else { + channel = null; + } + + owner = PlayerUtil.getPlayerUIDUnstable(nbtRoot.getString("owner")); + + for (SubChannel subChannel : SubChannel.values()) { + String key = "subChannel" + subChannel.ordinal(); + if (nbtRoot.hasKey(key)) { + setModeForChannel(subChannel, IoMode.values()[nbtRoot.getShort(key)]); + } + } + + recieveBuffer.readFromNBT(nbtRoot); + + if (nbtRoot.hasKey("rsMode")) { + redstoneControlMode = RedstoneControlMode.values()[nbtRoot.getShort("rsMode")]; + } else { + redstoneControlMode = RedstoneControlMode.IGNORE; } - res.addInventory(cube.localInventory); - } } - return res; - } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + nbtRoot.setInteger("storedEnergyRF", storedEnergyRF); + if (channel != null) { + nbtRoot.setString("channelName", channel.name); + if (channel.user != null) { + nbtRoot.setString("channelUser", channel.user.toString()); + } + } + if (owner != null) { + nbtRoot.setString("owner", owner.toString()); + } - @Override - public int getSizeInventory() { - return getRemoteInventory().getSizeInventory(); - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public ItemStack getStackInSlot(int i) { - return getRemoteInventory().getStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getRemoteInventory().decrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getRemoteInventory().setInventorySlotContents(i, itemstack); - - } - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - return getRemoteInventory().getAccessibleSlotsFromSide(var1); - } - - @Override - public boolean canInsertItem(int i, ItemStack itemstack, int j) { - return getRemoteInventory().canInsertItem(i, itemstack, j); - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - return getRemoteInventory().canExtractItem(i, itemstack, j); - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return getRemoteInventory().isItemValidForSlot(i, itemstack); - } - - @Override - public String getInventoryName() { - return ModObject.blockHyperCube.unlocalisedName; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return false; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - //---- Serialisation --------------------------------------------------------- - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - - int energy; - if(nbtRoot.hasKey("storedEnergy")) { - energy = (int)(nbtRoot.getFloat("storedEnergy") * 10); - } else { - energy = nbtRoot.getInteger("storedEnergyRF"); - } - setEnergyStored(energy); - - - String channelName = nbtRoot.getString("channelName"); - UUID channelUser = PlayerUtil.getPlayerUIDUnstable(nbtRoot.getString("channelUser")); - if(channelName != null && !channelName.isEmpty()) { - channel = new Channel(channelName,channelUser); - } else { - channel = null; + for (SubChannel subChannel : SubChannel.values()) { + IoMode mode = getModeForChannel(subChannel); + nbtRoot.setShort("subChannel" + subChannel.ordinal(), (short) mode.ordinal()); + } + if (redstoneControlMode != null) { + nbtRoot.setShort("rsMode", (short) redstoneControlMode.ordinal()); + } + recieveBuffer.writeToNBT(nbtRoot); } - owner = PlayerUtil.getPlayerUIDUnstable(nbtRoot.getString("owner")); + static class Receptor { + IPowerInterface receptor; + ForgeDirection fromDir; - for (SubChannel subChannel : SubChannel.values()) { - String key = "subChannel" + subChannel.ordinal(); - if(nbtRoot.hasKey(key)) { - setModeForChannel(subChannel, IoMode.values()[nbtRoot.getShort(key)]); - } + private Receptor(IPowerInterface rec, ForgeDirection fromDir) { + receptor = rec; + this.fromDir = fromDir; + } } - recieveBuffer.readFromNBT(nbtRoot); + static class NetworkFluidHandler { + final TileHyperCube node; + final IFluidHandler handler; + final ForgeDirection dir; + final ForgeDirection dirOp; - if(nbtRoot.hasKey("rsMode")) { - redstoneControlMode = RedstoneControlMode.values()[nbtRoot.getShort("rsMode")]; - } else { - redstoneControlMode = RedstoneControlMode.IGNORE; - } - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - nbtRoot.setInteger("storedEnergyRF", storedEnergyRF); - if(channel != null) { - nbtRoot.setString("channelName", channel.name); - if(channel.user != null) { - nbtRoot.setString("channelUser", channel.user.toString()); - } - } - if(owner != null) { - nbtRoot.setString("owner", owner.toString()); + private NetworkFluidHandler(TileHyperCube node, IFluidHandler handler, ForgeDirection dir) { + this.node = node; + this.handler = handler; + this.dir = dir; + dirOp = dir.getOpposite(); + } } - for (SubChannel subChannel : SubChannel.values()) { - IoMode mode = getModeForChannel(subChannel); - nbtRoot.setShort("subChannel" + subChannel.ordinal(), (short) mode.ordinal()); + @Override + public boolean displayPower() { + return true; } - if(redstoneControlMode != null) { - nbtRoot.setShort("rsMode", (short) redstoneControlMode.ordinal()); - } - recieveBuffer.writeToNBT(nbtRoot); - } - - static class Receptor { - IPowerInterface receptor; - ForgeDirection fromDir; - - private Receptor(IPowerInterface rec, ForgeDirection fromDir) { - receptor = rec; - this.fromDir = fromDir; - } - } - - static class NetworkFluidHandler { - final TileHyperCube node; - final IFluidHandler handler; - final ForgeDirection dir; - final ForgeDirection dirOp; - - private NetworkFluidHandler(TileHyperCube node, IFluidHandler handler, ForgeDirection dir) { - this.node = node; - this.handler = handler; - this.dir = dir; - dirOp = dir.getOpposite(); - } - } - - @Override - public boolean displayPower() { - return true; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index 3e7e72c0..1cc21468 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -1,15 +1,5 @@ package crazypants.enderio.machine.invpanel; -import java.util.Random; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,173 +9,200 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import java.util.Random; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; public class BlockInventoryPanel extends AbstractMachineBlock { - private static final float BLOCK_SIZE = 3f / 16f; + private static final float BLOCK_SIZE = 3f / 16f; - public static BlockInventoryPanel create() { - PacketHandler.INSTANCE.registerMessage(PacketItemInfo.class, PacketItemInfo.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketItemList.class, PacketItemList.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketRequestMissingItems.class, PacketRequestMissingItems.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketFetchItem.class, PacketFetchItem.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketMoveItems.class, PacketMoveItems.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketDatabaseReset.class, PacketDatabaseReset.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketGuiSettings.class, PacketGuiSettings.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketStoredCraftingRecipe.class, PacketStoredCraftingRecipe.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketSetExtractionDisabled.class, PacketSetExtractionDisabled.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketUpdateExtractionDisabled.class, PacketUpdateExtractionDisabled.class, PacketHandler.nextID(), Side.CLIENT); + public static BlockInventoryPanel create() { + PacketHandler.INSTANCE.registerMessage( + PacketItemInfo.class, PacketItemInfo.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketItemList.class, PacketItemList.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketRequestMissingItems.class, PacketRequestMissingItems.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketFetchItem.class, PacketFetchItem.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketMoveItems.class, PacketMoveItems.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketDatabaseReset.class, PacketDatabaseReset.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketGuiSettings.class, PacketGuiSettings.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketStoredCraftingRecipe.class, + PacketStoredCraftingRecipe.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketSetExtractionDisabled.class, + PacketSetExtractionDisabled.class, + PacketHandler.nextID(), + Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketUpdateExtractionDisabled.class, + PacketUpdateExtractionDisabled.class, + PacketHandler.nextID(), + Side.CLIENT); - BlockInventoryPanel panel = new BlockInventoryPanel(); - panel.init(); - return panel; - } - - public BlockInventoryPanel() { - super(ModObject.blockInventoryPanel, TileInventoryPanel.class); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemInventoryPanel.class, modObject.unlocalisedName); - GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); - EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); - } - - @Override - public int getRenderType() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean isBlockSolid(IBlockAccess world, int x, int y, int z, int blockSide) { - int facing = getFacing(world, x, y, z); - return ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] == 2; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean isBlockNormalCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public void setBlockBoundsForItemRender() { - setBlockBounds(0.0f, 0.0f, 0.5f - BLOCK_SIZE / 2, 1.0f, 1.0f, 0.5f + BLOCK_SIZE / 2); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return getBoundingBox(world, x, y, z); - } - - @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - return getBoundingBox(world, x, y, z); - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { - AxisAlignedBB bb = getBoundingBox(0, 0, 0, getFacing(world, x, y, z)); - setBlockBounds(bb); - } - - public AxisAlignedBB getBoundingBox(IBlockAccess world, int x, int y, int z) { - int facing = getFacing(world, x, y, z); - return getBoundingBox(x, y, z, facing); - } - - public AxisAlignedBB getBoundingBox(int x, int y, int z, int facing) { - switch (facing) { - case 0: - return AxisAlignedBB.getBoundingBox(x, y + (1 - BLOCK_SIZE), z, x + 1, y + 1, z + 1); - case 1: - return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + BLOCK_SIZE, z + 1); - case 2: - return AxisAlignedBB.getBoundingBox(x, y, z + (1- BLOCK_SIZE), x + 1, y + 1, z + 1); - case 3: - return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + BLOCK_SIZE); - case 4: - return AxisAlignedBB.getBoundingBox(x + (1 - BLOCK_SIZE), y, z, x + 1, y + 1, z + 1); - case 5: - return AxisAlignedBB.getBoundingBox(x, y, z, x + BLOCK_SIZE, y + 1, z + 1); - default: - return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + BlockInventoryPanel panel = new BlockInventoryPanel(); + panel.init(); + return panel; } - } - private int getFacing(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileInventoryPanel) { - return ((TileInventoryPanel) te).getFacing(); + public BlockInventoryPanel() { + super(ModObject.blockInventoryPanel, TileInventoryPanel.class); } - return 0; - } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - // this is handled by BlockItemInventoryPanel.placeBlockAt - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_INVENTORY_PANEL; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:invPanelFrontOn"; + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemInventoryPanel.class, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } - return "enderio:invPanelFrontOff"; - } - // @Override - // protected String getTopIconKey(boolean active) { - // return "enderio:invPanelSide"; - // } - // - // @Override - // protected String getSideIconKey(boolean active) { - // return "enderio:invPanelSide"; - // } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - // This is used to render the block as an item - return iconBuffer[0][blockSide + 6]; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileInventoryPanel) { - return new InventoryPanelContainer(player.inventory, (TileInventoryPanel) te); + @Override + public int getRenderType() { + return 0; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileInventoryPanel te = (TileInventoryPanel) world.getTileEntity(x, y, z); - return new GuiInventoryPanel(te, new InventoryPanelContainer(player.inventory, te)); - } + @Override + @SideOnly(Side.CLIENT) + public boolean isBlockSolid(IBlockAccess world, int x, int y, int z, int blockSide) { + int facing = getFacing(world, x, y, z); + return ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] == 2; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean isBlockNormalCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public void setBlockBoundsForItemRender() { + setBlockBounds(0.0f, 0.0f, 0.5f - BLOCK_SIZE / 2, 1.0f, 1.0f, 0.5f + BLOCK_SIZE / 2); + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return getBoundingBox(world, x, y, z); + } + + @Override + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + return getBoundingBox(world, x, y, z); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + AxisAlignedBB bb = getBoundingBox(0, 0, 0, getFacing(world, x, y, z)); + setBlockBounds(bb); + } + + public AxisAlignedBB getBoundingBox(IBlockAccess world, int x, int y, int z) { + int facing = getFacing(world, x, y, z); + return getBoundingBox(x, y, z, facing); + } + + public AxisAlignedBB getBoundingBox(int x, int y, int z, int facing) { + switch (facing) { + case 0: + return AxisAlignedBB.getBoundingBox(x, y + (1 - BLOCK_SIZE), z, x + 1, y + 1, z + 1); + case 1: + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + BLOCK_SIZE, z + 1); + case 2: + return AxisAlignedBB.getBoundingBox(x, y, z + (1 - BLOCK_SIZE), x + 1, y + 1, z + 1); + case 3: + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + BLOCK_SIZE); + case 4: + return AxisAlignedBB.getBoundingBox(x + (1 - BLOCK_SIZE), y, z, x + 1, y + 1, z + 1); + case 5: + return AxisAlignedBB.getBoundingBox(x, y, z, x + BLOCK_SIZE, y + 1, z + 1); + default: + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + } + } + + private int getFacing(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileInventoryPanel) { + return ((TileInventoryPanel) te).getFacing(); + } + return 0; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + // this is handled by BlockItemInventoryPanel.placeBlockAt + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) {} + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_INVENTORY_PANEL; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:invPanelFrontOn"; + } + return "enderio:invPanelFrontOff"; + } + + // @Override + // protected String getTopIconKey(boolean active) { + // return "enderio:invPanelSide"; + // } + // + // @Override + // protected String getSideIconKey(boolean active) { + // return "enderio:invPanelSide"; + // } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int blockSide, int blockMeta) { + // This is used to render the block as an item + return iconBuffer[0][blockSide + 6]; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileInventoryPanel) { + return new InventoryPanelContainer(player.inventory, (TileInventoryPanel) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileInventoryPanel te = (TileInventoryPanel) world.getTileEntity(x, y, z); + return new GuiInventoryPanel(te, new InventoryPanelContainer(player.inventory, te)); + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockItemInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockItemInventoryPanel.java index 0f51d334..0dcfae06 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockItemInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockItemInventoryPanel.java @@ -9,25 +9,35 @@ import net.minecraft.world.World; public class BlockItemInventoryPanel extends ItemBlock { - public BlockItemInventoryPanel(Block b) { - super(b); - } - - @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(!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - return false; + public BlockItemInventoryPanel(Block b) { + super(b); } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - teInvPanel.setFacing((short) side); - teInvPanel.readFromItemStack(stack); - if(!world.isRemote) { - world.markBlockForUpdate(x, y, z); - } - } - return true; - } + @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 (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.setFacing((short) side); + teInvPanel.readFromItemStack(stack); + if (!world.isRemote) { + world.markBlockForUpdate(x, y, z); + } + } + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 5ce48122..0eec372a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -1,24 +1,6 @@ package crazypants.enderio.machine.invpanel; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import codechicken.nei.LayoutManager; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.gui.button.ToggleButton; @@ -29,9 +11,7 @@ import com.enderio.core.client.gui.widget.VScrollbar; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.Lang; import com.enderio.core.common.util.ItemUtil; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,7 +19,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.enchanter.ContainerEnchanter; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.machine.invpanel.client.CraftingHelper; import crazypants.enderio.machine.invpanel.client.DatabaseView; @@ -48,619 +27,662 @@ import crazypants.enderio.machine.invpanel.client.ItemEntry; import crazypants.enderio.machine.invpanel.client.SortOrder; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.SmartTank; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiInventoryPanel extends GuiMachineBase { - private static final Rectangle inventoryArea = new Rectangle(24+107, 27, 108, 90); + private static final Rectangle inventoryArea = new Rectangle(24 + 107, 27, 108, 90); - private static final Rectangle btnRefill = new Rectangle(24+85, 32, 20, 20); + private static final Rectangle btnRefill = new Rectangle(24 + 85, 32, 20, 20); - private static final Rectangle btnReturnArea = new Rectangle(24+6, 72, 5 * 18, 8); + private static final Rectangle btnReturnArea = new Rectangle(24 + 6, 72, 5 * 18, 8); - private static final int ID_SORT = 9876; - private static final int ID_CLEAR = 9877; - private static final int ID_SYNC = 9878; + private static final int ID_SORT = 9876; + private static final int ID_CLEAR = 9877; + private static final int ID_SYNC = 9878; - private static final int GHOST_COLUMNS = 6; - private static final int GHOST_ROWS = 5; + private static final int GHOST_COLUMNS = 6; + private static final int GHOST_ROWS = 5; - private final DatabaseView view; + private final DatabaseView view; - private final TextFieldEnder tfFilter; - private final IconButton btnSort; - private final ToggleButton btnSync; - private final GuiToolTip ttRefill; - private final VScrollbar scrollbar; - private final MultiIconButton btnClear; - private final GuiToolTip ttSetReceipe; + private final TextFieldEnder tfFilter; + private final IconButton btnSort; + private final ToggleButton btnSync; + private final GuiToolTip ttRefill; + private final VScrollbar scrollbar; + private final MultiIconButton btnClear; + private final GuiToolTip ttSetReceipe; - private int scrollPos; - private int ghostSlotTooltipStacksize; + private int scrollPos; + private int ghostSlotTooltipStacksize; - private final String headerCrafting; - private final String headerReturn; - private final String headerStorage; - private final String headerInventory; - private final String infoTextFilter; - private final String infoTextOffline; + private final String headerCrafting; + private final String headerReturn; + private final String headerStorage; + private final String headerInventory; + private final String infoTextFilter; + private final String infoTextOffline; - private CraftingHelper craftingHelper; + private CraftingHelper craftingHelper; - private final Rectangle btnAddStoredRecipe = new Rectangle(); + private final Rectangle btnAddStoredRecipe = new Rectangle(); - public GuiInventoryPanel(TileInventoryPanel te, Container container) { - super(te, container, "inventorypanel"); - redstoneButton.visible = false; - configB.visible = false; + public GuiInventoryPanel(TileInventoryPanel te, Container container) { + super(te, container, "inventorypanel"); + redstoneButton.visible = false; + configB.visible = false; - for (int y = 0; y < GHOST_ROWS; y++) { - for (int x = 0; x < GHOST_COLUMNS; x++) { - ghostSlots.add(new InvSlot(24 + 108 + x * 18, 28 + y * 18)); - } - } - - for (int i = 0; i < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES; i++) { - ghostSlots.add(new RecipeSlot(i, 7, 7 + i * 20)); - } - - this.view = new DatabaseView(); - - int sortMode = te.getGuiSortMode(); - int sortOrderIdx = sortMode >> 1; - SortOrder[] orders = SortOrder.values(); - if(sortOrderIdx >= 0 && te.getGuiSortMode() < orders.length) { - view.setSortOrder(orders[sortOrderIdx], (sortMode & 1) != 0); - } - - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - - btnSync = new ToggleButton(this, ID_SYNC, 24 + 233, 46, IconEIO.CROSS, IconEIO.TICK); - btnSync.setToolTip(EnderIO.lang.localize("gui.inventorypanel.tooltip.sync")); - btnSync.setSelectedToolTip(EnderIO.lang.localize("gui.enabled")); - btnSync.setUnselectedToolTip(EnderIO.lang.localize("gui.disabled")); - btnSync.setSelected(getTileEntity().getGuiSync()); - if (!Loader.isModLoaded("NotEnoughItems")) { - btnSync.enabled = false; - } - - tfFilter = new TextFieldEnder(fr, 24+108, 11, 106, 10); - tfFilter.setEnableBackgroundDrawing(false); - - setText(tfFilter, te.getGuiFilterString()); - btnSort = new IconButton(this, ID_SORT, 24+233, 27, getSortOrderIcon()) { - @Override - public boolean mousePressed(Minecraft mc, int x, int y) { - return mousePressedButton(mc, x, y, 0); - } - - @Override - public boolean mousePressedButton(Minecraft mc, int x, int y, int button) { - if(button <= 1 && super.checkMousePress(mc, x, y)) { - toggleSortOrder(button == 0); - return true; - } - return false; - } - }; - - scrollbar = new VScrollbar(this, 24+215, 27, 90); - btnClear = new MultiIconButton(this, ID_CLEAR, 24+65, 60, EnderWidget.X_BUT, EnderWidget.X_BUT_PRESSED, EnderWidget.X_BUT_HOVER); - - textFields.add(tfFilter); - - headerCrafting = EnderIO.lang.localize("gui.inventorypanel.header.crafting"); - headerReturn = EnderIO.lang.localize("gui.inventorypanel.header.return"); - headerStorage = EnderIO.lang.localize("gui.inventorypanel.header.storage"); - headerInventory = EnderIO.lang.localizeExact("container.inventory"); - infoTextFilter = EnderIO.lang.localize("gui.inventorypanel.info.filter"); - infoTextOffline = EnderIO.lang.localize("gui.inventorypanel.info.offline"); - - ArrayList list = new ArrayList(); - - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); - addToolTip(new GuiToolTip(btnReturnArea, list) { - @Override - public boolean shouldDraw() { - return super.shouldDraw() && !getTileEntity().isExtractionDisabled(); - } - }); - - list.clear(); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.storage.line"); - addToolTip(new GuiToolTip(btnReturnArea, list) { - @Override - public boolean shouldDraw() { - return super.shouldDraw() && getTileEntity().isExtractionDisabled(); - } - }); - - list.clear(); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.filterslot.line"); - addToolTip(new GuiToolTip(new Rectangle(InventoryPanelContainer.FILTER_SLOT_X, InventoryPanelContainer.FILTER_SLOT_Y, 16, 16), list) { - @Override - public boolean shouldDraw() { - return !getContainer().getSlotFilter().getHasStack() && super.shouldDraw(); - } - }); - - list.clear(); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.refill.line"); - ttRefill = new GuiToolTip(btnRefill, list); - ttRefill.setVisible(false); - addToolTip(ttRefill); - - list.clear(); - - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.setrecipe.line"); - ttSetReceipe = new GuiToolTip(btnRefill, list) { - @Override - public boolean shouldDraw() { - return super.shouldDraw() && getContainer().hasCraftingRecipe(); - } - }; - addToolTip(ttSetReceipe); - - list.clear(); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.clear.line"); - btnClear.setToolTip(list.toArray(new String[list.size()])); - - if (!Config.inventoryPanelFree) { - addToolTip(new GuiToolTip(new Rectangle(36, 133, 16, 47), "") { - @Override - protected void updateText() { - text.clear(); - text.add(EnderIO.lang.localize("gui.inventorypanel.tooltip.fuelTank")); - text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); - } - }); - } - - list.clear(); - SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.addrecipe.line"); - addToolTip(new GuiToolTip(btnAddStoredRecipe, list)); - } - - @Override - public void onGuiClosed() { - int sortMode = (view.getSortOrder().ordinal() << 1); - if(view.isSortOrderInverted()) { - sortMode |= 1; - } - getTileEntity().setGuiParameter(sortMode, tfFilter.getText(), btnSync.isSelected()); - super.onGuiClosed(); - } - - public void setCraftingHelper(CraftingHelper craftingHelper) { - if(this.craftingHelper != null) { - this.craftingHelper.remove(); - } - this.craftingHelper = craftingHelper; - ttRefill.setVisible(craftingHelper != null); - ttSetReceipe.setVisible(craftingHelper == null); - if(craftingHelper != null) { - craftingHelper.install(); - } - } - - public void fillFromStoredRecipe(int index, boolean shift) { - StoredCraftingRecipe recipe = getTileEntity().getStoredCraftingRecipe(index); - if(recipe == null) { - return; - } - if(getContainer().clearCraftingGrid()) { - CraftingHelper helper = CraftingHelper.createFromRecipe(recipe); - setCraftingHelper(helper); - helper.refill(this, shift ? 64 : 1); - } - } - - @Override - public void initGui() { - super.initGui(); - updateSortButton(); - btnSort.onGuiInit(); - btnClear.onGuiInit(); - btnSync.onGuiInit(); - addScrollbar(scrollbar); - ((InventoryPanelContainer) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - public void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if (b.id == ID_CLEAR) { - if (getContainer().clearCraftingGrid()) { - setCraftingHelper(null); - } - } else if (b.id == ID_SYNC) { - if (Loader.isModLoaded("NotEnoughItems")) { - updateNEI(((ToggleButton) b).isSelected() ? tfFilter.getText() : ""); - } - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = guiLeft; - int sy = guiTop; - - drawTexturedModalRect(sx + 24, sy, 0, 0, 232, ySize); - drawTexturedModalRect(sx + 24 + 232, sy, 232, 0, 24, 68); - - if(craftingHelper != null) { - boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); - int iconX = hover ? (isShiftKeyDown() ? 48 : 24) : 0; - drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); - } else if(getContainer().hasCraftingRecipe()) { - boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); - int iconX = hover ? 96 : 72; - drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); - } - - TileInventoryPanel te = getTileEntity(); - - int y = sy; - int numStoredRecipes = te.getStoredCraftingRecipes(); - if(numStoredRecipes == 1) { - drawTexturedModalRect(sx, y, 227, 225, 28, 30); y += 30; - } else if(numStoredRecipes > 1) { - drawTexturedModalRect(sx, y, 227, 225, 28, 24); y += 24; - for(int i = 1; i < numStoredRecipes - 1; i++) { - drawTexturedModalRect(sx, y, 198, 229, 28, 20); y += 20; - } - drawTexturedModalRect(sx, y, 198, 229, 28, 26); y += 26; - } - - if(numStoredRecipes < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES && getContainer().hasNewCraftingRecipe()) { - y += 2; - btnAddStoredRecipe.x = 13; - btnAddStoredRecipe.y = y - sy; - btnAddStoredRecipe.width = 12; - btnAddStoredRecipe.height = 14; - boolean hover = btnAddStoredRecipe.contains(mouseX - sx, mouseY - sy); - drawTexturedModalRect(sx + 13, y, 182, hover ? 241 : 225, 15, 14); - } else { - btnAddStoredRecipe.width = 0; - btnAddStoredRecipe.height = 0; - } - - SmartTank fuelTank = te.fuelTank; - if (!Config.inventoryPanelFree) { - drawTexturedModalRect(sx + 35, sy + 132, 232, 163, 18, 49); - if (fuelTank.getFluidAmount() > 0) { - RenderUtil.renderGuiTank(fuelTank.getFluid(), fuelTank.getCapacity(), fuelTank.getFluidAmount(), sx + 24 + 12, sy + 132, zLevel, 16, 47); - } - } - - int headerColor = 0x404040; - int focusedColor = 0x648494; - FontRenderer fr = getFontRenderer(); - fr.drawString(headerCrafting, sx + 24 + 7, sy + 6, headerColor); - fr.drawString(te.isExtractionDisabled() ? headerStorage : headerReturn, sx + 24 + 7, sy + 72, - btnReturnArea.contains(mouseX - sx, mouseY - sy) ? focusedColor : headerColor); - fr.drawString(headerInventory, sx + 24 + 38, sy + 120, headerColor); - - super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); - - view.setDatabase(getDatabase()); - view.setItemFilter(te.getItemFilter()); - view.updateFilter(tfFilter.getText()); - - boolean update = view.sortItems(); - scrollbar.setScrollMax(Math.max(0, (view.getNumEntries() + GHOST_COLUMNS - 1) / GHOST_COLUMNS - GHOST_ROWS)); - if(update || scrollPos != scrollbar.getScrollPos()) { - updateGhostSlots(); - } - - if(te.isActive()) { - tfFilter.setEnabled(true); - if(!tfFilter.isFocused() && tfFilter.getText().isEmpty()) { - fr.drawString(infoTextFilter, tfFilter.xPosition, tfFilter.yPosition, 0x707070); - } - } else { - tfFilter.setEnabled(false); - setText(tfFilter, ""); - fr.drawString(infoTextOffline, tfFilter.xPosition, tfFilter.yPosition, 0x707070); - } - } - - @Override - protected void onTextFieldChanged(TextFieldEnder tf, String old) { - if (tf == tfFilter && btnSync.isSelected() && tfFilter.isFocused() && Loader.isModLoaded("NotEnoughItems")) { - updateNEI(tfFilter.getText()); - } - } - - private void updateNEI(String text) { - LayoutManager.searchField.setText(text); - } - - @Override - protected void drawFakeItemStack(int x, int y, ItemStack stack) { - FontRenderer font = stack.getItem().getFontRenderer(stack); - if(font == null) { - font = fontRendererObj; - } - String str = null; - if(stack.stackSize >= 1000) { - int value = stack.stackSize / 1000; - String unit = "k"; - if(value >= 1000) { - value /= 1000; - unit = "m"; - } - str = value + unit; - } else if(stack.stackSize > 1) { - str = Integer.toString(stack.stackSize); - } - itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, stack, x, y); - if(str != null) { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPushMatrix(); - GL11.glTranslatef(x + 16, y + 16, 0); - font.drawStringWithShadow(str, 1 - font.getStringWidth(str), -8, 0xFFFFFF); - GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } - itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, stack, x, y, ""); - } - - @Override - protected void drawGhostSlotTooltip(GhostSlot slot, int mouseX, int mouseY) { - ItemStack stack = slot.getStack(); - if(stack != null) { - ghostSlotTooltipStacksize = stack.stackSize; - try { - renderToolTip(stack, mouseX, mouseY); - } finally { - ghostSlotTooltipStacksize = 0; - } - } - } - - @Override - public void drawHoveringText(List list, int mouseX, int mouseY, FontRenderer font) { - if(ghostSlotTooltipStacksize >= 1000) { - list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.inventorypanel.tooltip.itemsstored", Integer.toString(ghostSlotTooltipStacksize))); - } - super.drawHoveringText(list, mouseX, mouseY, font); - } - - public InventoryPanelContainer getContainer() { - return (InventoryPanelContainer) inventorySlots; - } - - public InventoryDatabaseClient getDatabase() { - return getTileEntity().getDatabaseClient(); - } - - private IconEIO getSortOrderIcon() { - SortOrder order = view.getSortOrder(); - boolean invert = view.isSortOrderInverted(); - switch (order) { - case NAME: - return invert ? IconEIO.SORT_NAME_UP : IconEIO.SORT_NAME_DOWN; - case COUNT: - return invert ? IconEIO.SORT_SIZE_UP : IconEIO.SORT_SIZE_DOWN; - case MOD: - return invert ? IconEIO.SORT_MOD_UP : IconEIO.SORT_MOD_DOWN; - default: - return null; - } - } - - void toggleSortOrder(boolean next) { - SortOrder order = view.getSortOrder(); - SortOrder[] values = SortOrder.values(); - int idx = order.ordinal(); - if(next && view.isSortOrderInverted()) { - order = values[(idx + 1) % values.length]; - } else if(!next && !view.isSortOrderInverted()) { - if(idx == 0) { - idx = values.length; - } - order = values[idx - 1]; - } - view.setSortOrder(order, !view.isSortOrderInverted()); - updateSortButton(); - } - - private void updateSortButton() { - SortOrder order = view.getSortOrder(); - ArrayList list = new ArrayList(); - SpecialTooltipHandler.addTooltipFromResources(list, - "enderio.gui.inventorypanel.tooltip.sort." + order.name().toLowerCase(Locale.US) + (view.isSortOrderInverted() ? "_up" : "_down") + ".line"); - btnSort.setIcon(getSortOrderIcon()); - btnSort.setToolTip(list.toArray(new String[list.size()])); - } - - private void updateGhostSlots() { - scrollPos = scrollbar.getScrollPos(); - - int index = scrollPos * GHOST_COLUMNS; - int count = view.getNumEntries(); - for (int i = 0; i < GHOST_ROWS * GHOST_COLUMNS; i++, index++) { - InvSlot slot = (InvSlot) ghostSlots.get(i); - if(index < count) { - slot.entry = view.getItemEntry(index); - slot.stack = slot.entry.makeItemStack(); - } else { - slot.entry = null; - slot.stack = null; - } - } - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - public int getXSize() { - return 280; - } - - @Override - public int getYSize() { - return 212; - } - - @Override - protected void mouseClicked(int x, int y, int button) { - super.mouseClicked(x, y, button); - - x -= guiLeft; - y -= guiTop; - - if(btnRefill.contains(x, y)) { - if(craftingHelper != null) { - playClickSound(); - craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); - } else if(getContainer().hasCraftingRecipe()) { - playClickSound(); - setCraftingHelper(CraftingHelper.createFromSlots(getContainer().getCraftingGridSlots())); - } - } - - if(btnAddStoredRecipe.contains(x, y)) { - TileInventoryPanel te = getTileEntity(); - if(te.getStoredCraftingRecipes() < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES && getContainer().hasNewCraftingRecipe()) { - StoredCraftingRecipe recipe = new StoredCraftingRecipe(); - if(recipe.loadFromCraftingGrid(getContainer().getCraftingGridSlots())) { - playClickSound(); - te.addStoredCraftingRecipe(recipe); - } - } - } - - if(btnReturnArea.contains(x, y)) { - TileInventoryPanel te = getTileEntity(); - playClickSound(); - te.setExtractionDisabled(!te.isExtractionDisabled()); - } - } - - private void playClickSound() { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - } - - @Override - protected void mouseWheel(int x, int y, int delta) { - super.mouseWheel(x, y, delta); - - if(draggingScrollbar == null) { - x -= guiLeft; - y -= guiTop; - - boolean shift = isShiftKeyDown(); - - if(inventoryArea.contains(x, y)) { - if(!shift) { - scrollbar.scrollBy(-Integer.signum(delta)); - } else if(hoverGhostSlot instanceof InvSlot) { - InvSlot invSlot = (InvSlot) hoverGhostSlot; - InventoryDatabaseClient db = getDatabase(); - if(invSlot.stack != null && invSlot.entry != null && db != null) { - ItemStack itemStack = mc.thePlayer.inventory.getItemStack(); - if (itemStack == null || ItemUtil.areStackMergable(itemStack, invSlot.stack)) { - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), invSlot.entry, -1, 1)); + for (int y = 0; y < GHOST_ROWS; y++) { + for (int x = 0; x < GHOST_COLUMNS; x++) { + ghostSlots.add(new InvSlot(24 + 108 + x * 18, 28 + y * 18)); } - } } - } + + for (int i = 0; i < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES; i++) { + ghostSlots.add(new RecipeSlot(i, 7, 7 + i * 20)); + } + + this.view = new DatabaseView(); + + int sortMode = te.getGuiSortMode(); + int sortOrderIdx = sortMode >> 1; + SortOrder[] orders = SortOrder.values(); + if (sortOrderIdx >= 0 && te.getGuiSortMode() < orders.length) { + view.setSortOrder(orders[sortOrderIdx], (sortMode & 1) != 0); + } + + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + + btnSync = new ToggleButton(this, ID_SYNC, 24 + 233, 46, IconEIO.CROSS, IconEIO.TICK); + btnSync.setToolTip(EnderIO.lang.localize("gui.inventorypanel.tooltip.sync")); + btnSync.setSelectedToolTip(EnderIO.lang.localize("gui.enabled")); + btnSync.setUnselectedToolTip(EnderIO.lang.localize("gui.disabled")); + btnSync.setSelected(getTileEntity().getGuiSync()); + if (!Loader.isModLoaded("NotEnoughItems")) { + btnSync.enabled = false; + } + + tfFilter = new TextFieldEnder(fr, 24 + 108, 11, 106, 10); + tfFilter.setEnableBackgroundDrawing(false); + + setText(tfFilter, te.getGuiFilterString()); + btnSort = new IconButton(this, ID_SORT, 24 + 233, 27, getSortOrderIcon()) { + @Override + public boolean mousePressed(Minecraft mc, int x, int y) { + return mousePressedButton(mc, x, y, 0); + } + + @Override + public boolean mousePressedButton(Minecraft mc, int x, int y, int button) { + if (button <= 1 && super.checkMousePress(mc, x, y)) { + toggleSortOrder(button == 0); + return true; + } + return false; + } + }; + + scrollbar = new VScrollbar(this, 24 + 215, 27, 90); + btnClear = new MultiIconButton( + this, ID_CLEAR, 24 + 65, 60, EnderWidget.X_BUT, EnderWidget.X_BUT_PRESSED, EnderWidget.X_BUT_HOVER); + + textFields.add(tfFilter); + + headerCrafting = EnderIO.lang.localize("gui.inventorypanel.header.crafting"); + headerReturn = EnderIO.lang.localize("gui.inventorypanel.header.return"); + headerStorage = EnderIO.lang.localize("gui.inventorypanel.header.storage"); + headerInventory = EnderIO.lang.localizeExact("container.inventory"); + infoTextFilter = EnderIO.lang.localize("gui.inventorypanel.info.filter"); + infoTextOffline = EnderIO.lang.localize("gui.inventorypanel.info.offline"); + + ArrayList list = new ArrayList(); + + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); + addToolTip(new GuiToolTip(btnReturnArea, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && !getTileEntity().isExtractionDisabled(); + } + }); + + list.clear(); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.storage.line"); + addToolTip(new GuiToolTip(btnReturnArea, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && getTileEntity().isExtractionDisabled(); + } + }); + + list.clear(); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.filterslot.line"); + addToolTip( + new GuiToolTip( + new Rectangle( + InventoryPanelContainer.FILTER_SLOT_X, InventoryPanelContainer.FILTER_SLOT_Y, 16, 16), + list) { + @Override + public boolean shouldDraw() { + return !getContainer().getSlotFilter().getHasStack() && super.shouldDraw(); + } + }); + + list.clear(); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.refill.line"); + ttRefill = new GuiToolTip(btnRefill, list); + ttRefill.setVisible(false); + addToolTip(ttRefill); + + list.clear(); + + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.setrecipe.line"); + ttSetReceipe = new GuiToolTip(btnRefill, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && getContainer().hasCraftingRecipe(); + } + }; + addToolTip(ttSetReceipe); + + list.clear(); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.clear.line"); + btnClear.setToolTip(list.toArray(new String[list.size()])); + + if (!Config.inventoryPanelFree) { + addToolTip(new GuiToolTip(new Rectangle(36, 133, 16, 47), "") { + @Override + protected void updateText() { + text.clear(); + text.add(EnderIO.lang.localize("gui.inventorypanel.tooltip.fuelTank")); + text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); + } + }); + } + + list.clear(); + SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.addrecipe.line"); + addToolTip(new GuiToolTip(btnAddStoredRecipe, list)); } - } - @Override - protected void ghostSlotClicked(GhostSlot slot, int x, int y, int button) { - if(slot instanceof InvSlot) { - InvSlot invSlot = (InvSlot) slot; - InventoryDatabaseClient db = getDatabase(); - if(invSlot.entry != null && invSlot.stack != null && db != null) { - int targetSlot; - int count = Math.min(invSlot.stack.stackSize, invSlot.stack.getMaxStackSize()); + @Override + public void onGuiClosed() { + int sortMode = (view.getSortOrder().ordinal() << 1); + if (view.isSortOrderInverted()) { + sortMode |= 1; + } + getTileEntity().setGuiParameter(sortMode, tfFilter.getText(), btnSync.isSelected()); + super.onGuiClosed(); + } - if(button == 0) { - if(isShiftKeyDown()) { - InventoryPlayer playerInv = mc.thePlayer.inventory; - targetSlot = playerInv.getFirstEmptyStack(); - if(targetSlot >= 0) { - targetSlot = getContainer().getSlotIndex(playerInv, targetSlot); + public void setCraftingHelper(CraftingHelper craftingHelper) { + if (this.craftingHelper != null) { + this.craftingHelper.remove(); + } + this.craftingHelper = craftingHelper; + ttRefill.setVisible(craftingHelper != null); + ttSetReceipe.setVisible(craftingHelper == null); + if (craftingHelper != null) { + craftingHelper.install(); + } + } + + public void fillFromStoredRecipe(int index, boolean shift) { + StoredCraftingRecipe recipe = getTileEntity().getStoredCraftingRecipe(index); + if (recipe == null) { + return; + } + if (getContainer().clearCraftingGrid()) { + CraftingHelper helper = CraftingHelper.createFromRecipe(recipe); + setCraftingHelper(helper); + helper.refill(this, shift ? 64 : 1); + } + } + + @Override + public void initGui() { + super.initGui(); + updateSortButton(); + btnSort.onGuiInit(); + btnClear.onGuiInit(); + btnSync.onGuiInit(); + addScrollbar(scrollbar); + ((InventoryPanelContainer) inventorySlots).createGhostSlots(getGhostSlots()); + } + + @Override + public void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == ID_CLEAR) { + if (getContainer().clearCraftingGrid()) { + setCraftingHelper(null); } - if(targetSlot < 0) { - return; + } else if (b.id == ID_SYNC) { + if (Loader.isModLoaded("NotEnoughItems")) { + updateNEI(((ToggleButton) b).isSelected() ? tfFilter.getText() : ""); } - } else { - targetSlot = -1; - } - } else if(button == 1) { - targetSlot = -1; - if(isCtrlKeyDown()) { - count = 1; - } else { - count = (count + 1) / 2; - } + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = guiLeft; + int sy = guiTop; + + drawTexturedModalRect(sx + 24, sy, 0, 0, 232, ySize); + drawTexturedModalRect(sx + 24 + 232, sy, 232, 0, 24, 68); + + if (craftingHelper != null) { + boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); + int iconX = hover ? (isShiftKeyDown() ? 48 : 24) : 0; + drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); + } else if (getContainer().hasCraftingRecipe()) { + boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); + int iconX = hover ? 96 : 72; + drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); + } + + TileInventoryPanel te = getTileEntity(); + + int y = sy; + int numStoredRecipes = te.getStoredCraftingRecipes(); + if (numStoredRecipes == 1) { + drawTexturedModalRect(sx, y, 227, 225, 28, 30); + y += 30; + } else if (numStoredRecipes > 1) { + drawTexturedModalRect(sx, y, 227, 225, 28, 24); + y += 24; + for (int i = 1; i < numStoredRecipes - 1; i++) { + drawTexturedModalRect(sx, y, 198, 229, 28, 20); + y += 20; + } + drawTexturedModalRect(sx, y, 198, 229, 28, 26); + y += 26; + } + + if (numStoredRecipes < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES + && getContainer().hasNewCraftingRecipe()) { + y += 2; + btnAddStoredRecipe.x = 13; + btnAddStoredRecipe.y = y - sy; + btnAddStoredRecipe.width = 12; + btnAddStoredRecipe.height = 14; + boolean hover = btnAddStoredRecipe.contains(mouseX - sx, mouseY - sy); + drawTexturedModalRect(sx + 13, y, 182, hover ? 241 : 225, 15, 14); } else { - return; + btnAddStoredRecipe.width = 0; + btnAddStoredRecipe.height = 0; } - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), invSlot.entry, targetSlot, count)); - } - } else if(slot instanceof RecipeSlot) { - RecipeSlot recipeSlot = (RecipeSlot) slot; - if(recipeSlot.isVisible()) { - if(button == 0) { - fillFromStoredRecipe(recipeSlot.index, isShiftKeyDown()); - } else if(button == 1) { - getTileEntity().removeStoredCraftingRecipe(recipeSlot.index); + SmartTank fuelTank = te.fuelTank; + if (!Config.inventoryPanelFree) { + drawTexturedModalRect(sx + 35, sy + 132, 232, 163, 18, 49); + if (fuelTank.getFluidAmount() > 0) { + RenderUtil.renderGuiTank( + fuelTank.getFluid(), + fuelTank.getCapacity(), + fuelTank.getFluidAmount(), + sx + 24 + 12, + sy + 132, + zLevel, + 16, + 47); + } } - } - } - } - class InvSlot extends GhostSlot { - ItemEntry entry; - ItemStack stack; + int headerColor = 0x404040; + int focusedColor = 0x648494; + FontRenderer fr = getFontRenderer(); + fr.drawString(headerCrafting, sx + 24 + 7, sy + 6, headerColor); + fr.drawString( + te.isExtractionDisabled() ? headerStorage : headerReturn, + sx + 24 + 7, + sy + 72, + btnReturnArea.contains(mouseX - sx, mouseY - sy) ? focusedColor : headerColor); + fr.drawString(headerInventory, sx + 24 + 38, sy + 120, headerColor); - InvSlot(int x, int y) { - this.x = x; - this.y = y; - this.grayOut = false; - this.stackSizeLimit = Integer.MAX_VALUE; + super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); + + view.setDatabase(getDatabase()); + view.setItemFilter(te.getItemFilter()); + view.updateFilter(tfFilter.getText()); + + boolean update = view.sortItems(); + scrollbar.setScrollMax(Math.max(0, (view.getNumEntries() + GHOST_COLUMNS - 1) / GHOST_COLUMNS - GHOST_ROWS)); + if (update || scrollPos != scrollbar.getScrollPos()) { + updateGhostSlots(); + } + + if (te.isActive()) { + tfFilter.setEnabled(true); + if (!tfFilter.isFocused() && tfFilter.getText().isEmpty()) { + fr.drawString(infoTextFilter, tfFilter.xPosition, tfFilter.yPosition, 0x707070); + } + } else { + tfFilter.setEnabled(false); + setText(tfFilter, ""); + fr.drawString(infoTextOffline, tfFilter.xPosition, tfFilter.yPosition, 0x707070); + } } @Override - public ItemStack getStack() { - return stack; + protected void onTextFieldChanged(TextFieldEnder tf, String old) { + if (tf == tfFilter && btnSync.isSelected() && tfFilter.isFocused() && Loader.isModLoaded("NotEnoughItems")) { + updateNEI(tfFilter.getText()); + } } - } - class RecipeSlot extends GhostSlot { - final int index; - - RecipeSlot(int index, int x, int y) { - this.index = index; - this.x = x; - this.y = y; + private void updateNEI(String text) { + LayoutManager.searchField.setText(text); } @Override - public ItemStack getStack() { - TileInventoryPanel te = getTileEntity(); - StoredCraftingRecipe recipe = te.getStoredCraftingRecipe(index); - return recipe != null ? recipe.getResult(te) : null; + protected void drawFakeItemStack(int x, int y, ItemStack stack) { + FontRenderer font = stack.getItem().getFontRenderer(stack); + if (font == null) { + font = fontRendererObj; + } + String str = null; + if (stack.stackSize >= 1000) { + int value = stack.stackSize / 1000; + String unit = "k"; + if (value >= 1000) { + value /= 1000; + unit = "m"; + } + str = value + unit; + } else if (stack.stackSize > 1) { + str = Integer.toString(stack.stackSize); + } + itemRender.renderItemAndEffectIntoGUI(font, mc.renderEngine, stack, x, y); + if (str != null) { + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPushMatrix(); + GL11.glTranslatef(x + 16, y + 16, 0); + font.drawStringWithShadow(str, 1 - font.getStringWidth(str), -8, 0xFFFFFF); + GL11.glPopMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + } + itemRender.renderItemOverlayIntoGUI(font, mc.renderEngine, stack, x, y, ""); } @Override - public boolean isVisible() { - return index < getTileEntity().getStoredCraftingRecipes(); + protected void drawGhostSlotTooltip(GhostSlot slot, int mouseX, int mouseY) { + ItemStack stack = slot.getStack(); + if (stack != null) { + ghostSlotTooltipStacksize = stack.stackSize; + try { + renderToolTip(stack, mouseX, mouseY); + } finally { + ghostSlotTooltipStacksize = 0; + } + } + } + + @Override + public void drawHoveringText(List list, int mouseX, int mouseY, FontRenderer font) { + if (ghostSlotTooltipStacksize >= 1000) { + list.add(EnumChatFormatting.WHITE + + EnderIO.lang.localize( + "gui.inventorypanel.tooltip.itemsstored", Integer.toString(ghostSlotTooltipStacksize))); + } + super.drawHoveringText(list, mouseX, mouseY, font); + } + + public InventoryPanelContainer getContainer() { + return (InventoryPanelContainer) inventorySlots; + } + + public InventoryDatabaseClient getDatabase() { + return getTileEntity().getDatabaseClient(); + } + + private IconEIO getSortOrderIcon() { + SortOrder order = view.getSortOrder(); + boolean invert = view.isSortOrderInverted(); + switch (order) { + case NAME: + return invert ? IconEIO.SORT_NAME_UP : IconEIO.SORT_NAME_DOWN; + case COUNT: + return invert ? IconEIO.SORT_SIZE_UP : IconEIO.SORT_SIZE_DOWN; + case MOD: + return invert ? IconEIO.SORT_MOD_UP : IconEIO.SORT_MOD_DOWN; + default: + return null; + } + } + + void toggleSortOrder(boolean next) { + SortOrder order = view.getSortOrder(); + SortOrder[] values = SortOrder.values(); + int idx = order.ordinal(); + if (next && view.isSortOrderInverted()) { + order = values[(idx + 1) % values.length]; + } else if (!next && !view.isSortOrderInverted()) { + if (idx == 0) { + idx = values.length; + } + order = values[idx - 1]; + } + view.setSortOrder(order, !view.isSortOrderInverted()); + updateSortButton(); + } + + private void updateSortButton() { + SortOrder order = view.getSortOrder(); + ArrayList list = new ArrayList(); + SpecialTooltipHandler.addTooltipFromResources( + list, + "enderio.gui.inventorypanel.tooltip.sort." + order.name().toLowerCase(Locale.US) + + (view.isSortOrderInverted() ? "_up" : "_down") + ".line"); + btnSort.setIcon(getSortOrderIcon()); + btnSort.setToolTip(list.toArray(new String[list.size()])); + } + + private void updateGhostSlots() { + scrollPos = scrollbar.getScrollPos(); + + int index = scrollPos * GHOST_COLUMNS; + int count = view.getNumEntries(); + for (int i = 0; i < GHOST_ROWS * GHOST_COLUMNS; i++, index++) { + InvSlot slot = (InvSlot) ghostSlots.get(i); + if (index < count) { + slot.entry = view.getItemEntry(index); + slot.stack = slot.entry.makeItemStack(); + } else { + slot.entry = null; + slot.stack = null; + } + } + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + public int getXSize() { + return 280; + } + + @Override + public int getYSize() { + return 212; + } + + @Override + protected void mouseClicked(int x, int y, int button) { + super.mouseClicked(x, y, button); + + x -= guiLeft; + y -= guiTop; + + if (btnRefill.contains(x, y)) { + if (craftingHelper != null) { + playClickSound(); + craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + } else if (getContainer().hasCraftingRecipe()) { + playClickSound(); + setCraftingHelper(CraftingHelper.createFromSlots(getContainer().getCraftingGridSlots())); + } + } + + if (btnAddStoredRecipe.contains(x, y)) { + TileInventoryPanel te = getTileEntity(); + if (te.getStoredCraftingRecipes() < TileInventoryPanel.MAX_STORED_CRAFTING_RECIPES + && getContainer().hasNewCraftingRecipe()) { + StoredCraftingRecipe recipe = new StoredCraftingRecipe(); + if (recipe.loadFromCraftingGrid(getContainer().getCraftingGridSlots())) { + playClickSound(); + te.addStoredCraftingRecipe(recipe); + } + } + } + + if (btnReturnArea.contains(x, y)) { + TileInventoryPanel te = getTileEntity(); + playClickSound(); + te.setExtractionDisabled(!te.isExtractionDisabled()); + } + } + + private void playClickSound() { + mc.getSoundHandler() + .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } + + @Override + protected void mouseWheel(int x, int y, int delta) { + super.mouseWheel(x, y, delta); + + if (draggingScrollbar == null) { + x -= guiLeft; + y -= guiTop; + + boolean shift = isShiftKeyDown(); + + if (inventoryArea.contains(x, y)) { + if (!shift) { + scrollbar.scrollBy(-Integer.signum(delta)); + } else if (hoverGhostSlot instanceof InvSlot) { + InvSlot invSlot = (InvSlot) hoverGhostSlot; + InventoryDatabaseClient db = getDatabase(); + if (invSlot.stack != null && invSlot.entry != null && db != null) { + ItemStack itemStack = mc.thePlayer.inventory.getItemStack(); + if (itemStack == null || ItemUtil.areStackMergable(itemStack, invSlot.stack)) { + PacketHandler.INSTANCE.sendToServer( + new PacketFetchItem(db.getGeneration(), invSlot.entry, -1, 1)); + } + } + } + } + } + } + + @Override + protected void ghostSlotClicked(GhostSlot slot, int x, int y, int button) { + if (slot instanceof InvSlot) { + InvSlot invSlot = (InvSlot) slot; + InventoryDatabaseClient db = getDatabase(); + if (invSlot.entry != null && invSlot.stack != null && db != null) { + int targetSlot; + int count = Math.min(invSlot.stack.stackSize, invSlot.stack.getMaxStackSize()); + + if (button == 0) { + if (isShiftKeyDown()) { + InventoryPlayer playerInv = mc.thePlayer.inventory; + targetSlot = playerInv.getFirstEmptyStack(); + if (targetSlot >= 0) { + targetSlot = getContainer().getSlotIndex(playerInv, targetSlot); + } + if (targetSlot < 0) { + return; + } + } else { + targetSlot = -1; + } + } else if (button == 1) { + targetSlot = -1; + if (isCtrlKeyDown()) { + count = 1; + } else { + count = (count + 1) / 2; + } + } else { + return; + } + + PacketHandler.INSTANCE.sendToServer( + new PacketFetchItem(db.getGeneration(), invSlot.entry, targetSlot, count)); + } + } else if (slot instanceof RecipeSlot) { + RecipeSlot recipeSlot = (RecipeSlot) slot; + if (recipeSlot.isVisible()) { + if (button == 0) { + fillFromStoredRecipe(recipeSlot.index, isShiftKeyDown()); + } else if (button == 1) { + getTileEntity().removeStoredCraftingRecipe(recipeSlot.index); + } + } + } + } + + class InvSlot extends GhostSlot { + ItemEntry entry; + ItemStack stack; + + InvSlot(int x, int y) { + this.x = x; + this.y = y; + this.grayOut = false; + this.stackSizeLimit = Integer.MAX_VALUE; + } + + @Override + public ItemStack getStack() { + return stack; + } + } + + class RecipeSlot extends GhostSlot { + final int index; + + RecipeSlot(int index, int x, int y) { + this.index = index; + this.x = x; + this.y = y; + } + + @Override + public ItemStack getStack() { + TileInventoryPanel te = getTileEntity(); + StoredCraftingRecipe recipe = te.getStoredCraftingRecipe(index); + return recipe != null ? recipe.getResult(te) : null; + } + + @Override + public boolean isVisible() { + return index < getTileEntity().getStoredCraftingRecipes(); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java index 786b753e..09daff52 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabase.java @@ -2,153 +2,152 @@ package crazypants.enderio.machine.invpanel; import java.util.ArrayList; import java.util.HashMap; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public abstract class InventoryDatabase { - private static final Item META_EXTRACTOR = new Item(); + private static final Item META_EXTRACTOR = new Item(); - private static final int SIMPLE_ITEMID_BITS = 12; - private static final int SIMPLE_META_BITS = 4; - private static final int SIMPLE_MAX_ITEMID = 1 << SIMPLE_ITEMID_BITS; - private static final int SIMPLE_MAX_META = 1 << SIMPLE_META_BITS; - private static final int SIMPLE_META_MASK = SIMPLE_MAX_META - 1; + private static final int SIMPLE_ITEMID_BITS = 12; + private static final int SIMPLE_META_BITS = 4; + private static final int SIMPLE_MAX_ITEMID = 1 << SIMPLE_ITEMID_BITS; + private static final int SIMPLE_MAX_META = 1 << SIMPLE_META_BITS; + private static final int SIMPLE_META_MASK = SIMPLE_MAX_META - 1; - protected static final int COMPLEX_DBINDEX_START = 1 << (SIMPLE_ITEMID_BITS + SIMPLE_META_BITS); + protected static final int COMPLEX_DBINDEX_START = 1 << (SIMPLE_ITEMID_BITS + SIMPLE_META_BITS); - protected final HashMap simpleRegsitry; - protected final HashMap complexRegistry; - protected final ArrayList complexItems; + protected final HashMap simpleRegsitry; + protected final HashMap complexRegistry; + protected final ArrayList complexItems; - protected int generation; + protected int generation; - public InventoryDatabase() { - simpleRegsitry = new HashMap(); - complexRegistry = new HashMap(); - complexItems = new ArrayList(); - } - - public int getGeneration() { - return generation; - } - - public ItemEntry lookupItem(ItemStack stack, ItemEntry hint, boolean create) { - if(stack == null || stack.getItem() == null) { - return null; - } - - int itemID = Item.getIdFromItem(stack.getItem()); - int meta = META_EXTRACTOR.getDamage(stack); - NBTTagCompound nbt = stack.stackTagCompound; - - if(nbt != null && nbt.hasNoTags()) { - nbt = null; + public InventoryDatabase() { + simpleRegsitry = new HashMap(); + complexRegistry = new HashMap(); + complexItems = new ArrayList(); } - if(hint != null && hint.equals(itemID, meta, nbt)) { - return hint; + public int getGeneration() { + return generation; } - if(nbt == null && itemID < SIMPLE_MAX_ITEMID && meta < SIMPLE_MAX_META) { - return getSimpleItem(itemID, meta, create); - } else { - return getComplexItem(itemID, meta, nbt, create); - } - } + public ItemEntry lookupItem(ItemStack stack, ItemEntry hint, boolean create) { + if (stack == null || stack.getItem() == null) { + return null; + } - protected abstract ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt); + int itemID = Item.getIdFromItem(stack.getItem()); + int meta = META_EXTRACTOR.getDamage(stack); + NBTTagCompound nbt = stack.stackTagCompound; - protected ItemEntry createItemEntry(int dbId, int itemID, int meta, NBTTagCompound nbt) { - int hash = computeComplexHash(itemID, meta, nbt); - return createItemEntry(dbId, hash, itemID, meta, nbt); - } + if (nbt != null && nbt.hasNoTags()) { + nbt = null; + } - private ItemEntry getComplexItem(int itemID, int meta, NBTTagCompound nbt, boolean create) { - int hash = computeComplexHash(itemID, meta, nbt); - ItemEntryKey key = new ItemEntryKey(hash, itemID, meta, nbt); - ItemEntry entry = complexRegistry.get(key); - if(entry == null && create) { - if(nbt != null) { - nbt = (NBTTagCompound) nbt.copy(); - } - entry = createItemEntry(COMPLEX_DBINDEX_START + complexItems.size(), hash, itemID, meta, nbt); - complexItems.add(entry); - complexRegistry.put(entry, entry); - } - return entry; - } + if (hint != null && hint.equals(itemID, meta, nbt)) { + return hint; + } - private static int computeComplexHash(int itemID, int meta, NBTTagCompound nbt) { - int hash = ((itemID * 257) ^ meta) * 17; - if(nbt != null) { - hash ^= nbt.hashCode(); - } - return hash; - } - - private ItemEntry getSimpleItem(int itemID, int meta, boolean create) { - Integer dbID = (itemID << SIMPLE_META_BITS) | meta; - ItemEntry entry = simpleRegsitry.get(dbID); - if(entry == null && create) { - entry = createItemEntry(dbID, dbID, itemID, meta, null); - simpleRegsitry.put(dbID, entry); - } - return entry; - } - - protected ItemEntry getSimpleItem(int dbID) { - int itemID = dbID >> SIMPLE_META_BITS; - int meta = dbID & SIMPLE_META_MASK; - return getSimpleItem(itemID, meta, true); - } - - public ItemEntry getItem(int dbID) { - if(dbID < COMPLEX_DBINDEX_START) { - return getSimpleItem(dbID); + if (nbt == null && itemID < SIMPLE_MAX_ITEMID && meta < SIMPLE_MAX_META) { + return getSimpleItem(itemID, meta, create); + } else { + return getComplexItem(itemID, meta, nbt, create); + } } - int dbIndex = dbID - COMPLEX_DBINDEX_START; - if(dbIndex < complexItems.size()) { - return complexItems.get(dbIndex); - } - return null; - } + protected abstract ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt); - public ItemEntry getExistingItem(int dbID) { - if(dbID < COMPLEX_DBINDEX_START) { - return simpleRegsitry.get(dbID); - } - return getItem(dbID); - } - - static final class ItemEntryKey { - public final int hash; - public final int itemID; - public final int meta; - public final NBTTagCompound nbt; - - ItemEntryKey(int hash, int itemID, int meta, NBTTagCompound nbt) { - this.hash = hash; - this.itemID = itemID; - this.meta = meta; - this.nbt = nbt; + protected ItemEntry createItemEntry(int dbId, int itemID, int meta, NBTTagCompound nbt) { + int hash = computeComplexHash(itemID, meta, nbt); + return createItemEntry(dbId, hash, itemID, meta, nbt); } - @Override - public int hashCode() { - return hash; + private ItemEntry getComplexItem(int itemID, int meta, NBTTagCompound nbt, boolean create) { + int hash = computeComplexHash(itemID, meta, nbt); + ItemEntryKey key = new ItemEntryKey(hash, itemID, meta, nbt); + ItemEntry entry = complexRegistry.get(key); + if (entry == null && create) { + if (nbt != null) { + nbt = (NBTTagCompound) nbt.copy(); + } + entry = createItemEntry(COMPLEX_DBINDEX_START + complexItems.size(), hash, itemID, meta, nbt); + complexItems.add(entry); + complexRegistry.put(entry, entry); + } + return entry; } - @Override - public boolean equals(Object obj) { - if(obj instanceof ItemEntryBase) { - final ItemEntryBase other = (ItemEntryBase) obj; - return other.equals(itemID, meta, nbt); - } - return false; + private static int computeComplexHash(int itemID, int meta, NBTTagCompound nbt) { + int hash = ((itemID * 257) ^ meta) * 17; + if (nbt != null) { + hash ^= nbt.hashCode(); + } + return hash; + } + + private ItemEntry getSimpleItem(int itemID, int meta, boolean create) { + Integer dbID = (itemID << SIMPLE_META_BITS) | meta; + ItemEntry entry = simpleRegsitry.get(dbID); + if (entry == null && create) { + entry = createItemEntry(dbID, dbID, itemID, meta, null); + simpleRegsitry.put(dbID, entry); + } + return entry; + } + + protected ItemEntry getSimpleItem(int dbID) { + int itemID = dbID >> SIMPLE_META_BITS; + int meta = dbID & SIMPLE_META_MASK; + return getSimpleItem(itemID, meta, true); + } + + public ItemEntry getItem(int dbID) { + if (dbID < COMPLEX_DBINDEX_START) { + return getSimpleItem(dbID); + } + + int dbIndex = dbID - COMPLEX_DBINDEX_START; + if (dbIndex < complexItems.size()) { + return complexItems.get(dbIndex); + } + return null; + } + + public ItemEntry getExistingItem(int dbID) { + if (dbID < COMPLEX_DBINDEX_START) { + return simpleRegsitry.get(dbID); + } + return getItem(dbID); + } + + static final class ItemEntryKey { + public final int hash; + public final int itemID; + public final int meta; + public final NBTTagCompound nbt; + + ItemEntryKey(int hash, int itemID, int meta, NBTTagCompound nbt) { + this.hash = hash; + this.itemID = itemID; + this.meta = meta; + this.nbt = nbt; + } + + @Override + public int hashCode() { + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ItemEntryBase) { + final ItemEntryBase other = (ItemEntryBase) obj; + return other.equals(itemID, meta, nbt); + } + return false; + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index 42685675..e6420bf3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -1,5 +1,16 @@ package crazypants.enderio.machine.invpanel; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.util.ItemUtil; +import cpw.mods.fml.common.FMLCommonHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.Log; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import crazypants.enderio.machine.invpanel.server.ChangeLog; +import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; +import crazypants.enderio.machine.invpanel.server.ItemEntry; +import crazypants.enderio.network.PacketHandler; import java.awt.Point; import java.io.IOException; import java.util.ArrayList; @@ -8,7 +19,6 @@ import java.util.HashSet; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -24,452 +34,452 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.util.ItemUtil; - -import cpw.mods.fml.common.FMLCommonHandler; -import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; -import crazypants.enderio.machine.gui.AbstractMachineContainer; -import crazypants.enderio.machine.invpanel.server.ChangeLog; -import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; -import crazypants.enderio.machine.invpanel.server.ItemEntry; -import crazypants.enderio.network.PacketHandler; - public class InventoryPanelContainer extends AbstractMachineContainer implements ChangeLog { - public static final int CRAFTING_GRID_X = 24+7; - public static final int CRAFTING_GRID_Y = 16; + public static final int CRAFTING_GRID_X = 24 + 7; + public static final int CRAFTING_GRID_Y = 16; - public static final int RETURN_INV_X = 24+7; - public static final int RETURN_INV_Y = 82; + public static final int RETURN_INV_X = 24 + 7; + public static final int RETURN_INV_Y = 82; - public static final int FILTER_SLOT_X = 24+233; - public static final int FILTER_SLOT_Y = 7; + public static final int FILTER_SLOT_X = 24 + 233; + public static final int FILTER_SLOT_Y = 7; - private final HashSet changedItems; + private final HashSet changedItems; - private Slot slotFilter; + private Slot slotFilter; - private int slotCraftResult; - private int firstSlotReturn; - private int endSlotReturn; - private int firstSlotCraftingGrid; - private int endSlotCraftingGrid; + private int slotCraftResult; + private int firstSlotReturn; + private int endSlotReturn; + private int firstSlotCraftingGrid; + private int endSlotCraftingGrid; - private boolean updateReturnAreaSlots; - private boolean storedRecipeExists; + private boolean updateReturnAreaSlots; + private boolean storedRecipeExists; - public InventoryPanelContainer(InventoryPlayer playerInv, TileInventoryPanel te) { - super(playerInv, te); - te.eventHandler = this; + public InventoryPanelContainer(InventoryPlayer playerInv, TileInventoryPanel te) { + super(playerInv, te); + te.eventHandler = this; - if(te.getWorldObj().isRemote) { - changedItems = null; - } else { - changedItems = new HashSet(); - } - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - slotCraftResult = inventorySlots.size(); - addSlotToContainer(new SlotCrafting(playerInv.player, getInv(), getInv(), TileInventoryPanel.SLOT_CRAFTING_RESULT, CRAFTING_GRID_X + 59, - CRAFTING_GRID_Y + 18) { - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack p_82870_2_) { - FMLCommonHandler.instance().firePlayerCraftingEvent(player, p_82870_2_, getInv()); - for (int i = TileInventoryPanel.SLOT_CRAFTING_START; i < TileInventoryPanel.SLOT_CRAFTING_RESULT; i++) { - ItemStack itemstack = getInv().getStackInSlot(i); - if(itemstack == null) - continue; - - getInv().decrStackSize(i, 1); - if(!itemstack.getItem().hasContainerItem(itemstack)) - continue; - - ItemStack containerIS = itemstack.getItem().getContainerItem(itemstack); - if(containerIS != null && containerIS.isItemStackDamageable() && containerIS.getItemDamage() > containerIS.getMaxDamage()) { - MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, containerIS)); - } else { - if(itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { - if(ItemUtil.doInsertItem(getInv(), 10, 20, itemstack) > 0) - continue; - if(player.inventory.addItemStackToInventory(containerIS)) - continue; - } - if(getInv().getStackInSlot(i) == null) { - getInv().setInventorySlotContents(i, containerIS); - } else { - player.dropPlayerItemWithRandomChoice(containerIS, false); - } - } - } - } - - @Override - public ItemStack decrStackSize(int p_75209_1_) { - if (this.getHasStack()) { - // on a right click we are asked to craft half a result. Ignore that. - return super.decrStackSize(this.getStack().stackSize); - } - return super.decrStackSize(p_75209_1_); - } - - }); - - firstSlotCraftingGrid = inventorySlots.size(); - for (int y = 0, i = TileInventoryPanel.SLOT_CRAFTING_START; y < 3; y++) { - for (int x = 0; x < 3; x++, i++) { - addSlotToContainer(new Slot(getInv(), i, CRAFTING_GRID_X + x * 18, CRAFTING_GRID_Y + y * 18)); - } - } - endSlotCraftingGrid = inventorySlots.size(); - - slotFilter = addSlotToContainer(new Slot(getInv(), TileInventoryPanel.SLOT_VIEW_FILTER, FILTER_SLOT_X, FILTER_SLOT_Y) { - @Override - public int getSlotStackLimit() { - return 1; - } - }); - - firstSlotReturn = inventorySlots.size(); - for (int y = 0, i = TileInventoryPanel.SLOT_RETURN_START; y < 2; y++) { - for (int x = 0; x < 5; x++, i++) { - addSlotToContainer(new Slot(getInv(), i, RETURN_INV_X + x * 18, RETURN_INV_Y + y * 18)); - } - } - endSlotReturn = inventorySlots.size(); - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, FILTER_SLOT_X, FILTER_SLOT_Y)); - } - - @Override - public Point getPlayerInventoryOffset() { - return new Point(24+39, 130); - } - - @Override - public void onContainerClosed(EntityPlayer player) { - super.onContainerClosed(player); - if(!getInv().getWorldObj().isRemote) { - ((TileInventoryPanel) getInv()).eventHandler = null; - } - removeChangeLog(); - } - - public TileInventoryPanel getInventoryPanel() { - return (TileInventoryPanel) getInv(); - } - - public Slot getSlotFilter() { - return slotFilter; - } - - @SuppressWarnings("unchecked") - public List getCraftingGridSlots() { - return inventorySlots.subList(firstSlotCraftingGrid, endSlotCraftingGrid); - } - - @SuppressWarnings("unchecked") - public List getReturnAreaSlots() { - return inventorySlots.subList(firstSlotReturn, endSlotReturn); - } - - @SuppressWarnings("unchecked") - public List getPlayerInventorySlots() { - return inventorySlots.subList(startPlayerSlot, endPlayerSlot); - } - - @SuppressWarnings("unchecked") - public List getPlayerHotbarSlots() { - return inventorySlots.subList(startHotBarSlot, endHotBarSlot); - } - - private void removeChangeLog() { - if(changedItems != null) { - InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); - if(db != null) { - db.removeChangeLog(this); - } - } - } - - @Override - public void removeCraftingFromCrafters(ICrafting crafting) { - super.removeCraftingFromCrafters(crafting); - removeChangeLog(); - } - - @Override - public void addCraftingToCrafters(ICrafting crafting) { - if(changedItems != null) { - sendChangeLog(); - } - super.addCraftingToCrafters(crafting); - if(changedItems != null) { - InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); - if(db != null) { - db.addChangeLog(this); - if(crafting instanceof EntityPlayerMP) { - try { - byte[] compressed = db.compressItemList(); - PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); - PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); - } catch (IOException ex) { - Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, "Exception while compressing item list", ex); - } - } - } - } - } - - @Override - public void onCraftMatrixChanged(IInventory inv) { - InventoryCrafting tmp = new InventoryCrafting(new Container() { - @Override - public boolean canInteractWith(EntityPlayer ep) { - return false; - } - }, 3, 3); - - for (int i = 0; i < 9; i++) { - tmp.setInventorySlotContents(i, getInv().getStackInSlot(i)); - } - - getInv().setInventorySlotContents(9, CraftingManager.getInstance().findMatchingRecipe(tmp, getInv().getWorldObj())); - - checkCraftingRecipes(); - } - - public void checkCraftingRecipes() { - storedRecipeExists = false; - int storedCraftingRecipes = getInventoryPanel().getStoredCraftingRecipes(); - if(hasCraftingRecipe() && storedCraftingRecipes > 0) { - List craftingGrid = getCraftingGridSlots(); - for(int idx = 0; idx < storedCraftingRecipes; idx++) { - if(getInventoryPanel().getStoredCraftingRecipe(idx).isEqual(craftingGrid)) { - storedRecipeExists = true; - break; - } - } - } - } - - @Override - public boolean func_94530_a(ItemStack par1, Slot slot) { - return !(slot instanceof SlotCrafting) && super.func_94530_a(par1, slot); - } - - public boolean clearCraftingGrid() { - boolean cleared = true; - for (Slot slot : getCraftingGridSlots()) { - if(slot.getHasStack()) { - moveItemsToReturnArea(slot.slotNumber); - if(slot.getHasStack()) { - cleared = false; - } - } - } - return cleared; - } - - public boolean hasCraftingRecipe() { - return getSlot(slotCraftResult).getHasStack(); - } - - public boolean hasNewCraftingRecipe() { - return hasCraftingRecipe() && !storedRecipeExists; - } - - @Override - protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { - if((slotIndex == slotCraftResult) || (slotIndex >= firstSlotReturn && slotIndex < endSlotReturn)) { - return Collections.singletonList(getPlayerInventorySlotRange(true)); - } - if(slotIndex >= firstSlotCraftingGrid && slotIndex < endSlotCraftingGrid) { - ArrayList res = new ArrayList(); - res.add(new SlotRange(firstSlotReturn, endSlotReturn, false)); - res.add(getPlayerInventorySlotRange(false)); - return res; - } - if(slotIndex >= startPlayerSlot) { - return Collections.singletonList(new SlotRange(firstSlotReturn, endSlotReturn, false)); - } - return Collections.emptyList(); - } - - @Override - protected boolean mergeItemStack(ItemStack par1ItemStack, int fromIndex, int toIndex, boolean reversOrder) { - if(!super.mergeItemStack(par1ItemStack, fromIndex, toIndex, reversOrder)) { - return false; - } - if(fromIndex < endSlotReturn && toIndex > firstSlotReturn) { - updateReturnAreaSlots = true; - } - return true; - } - - @Override - public void detectAndSendChanges() { - if(updateReturnAreaSlots) { - updateReturnAreaSlots = false; - sendReturnAreaSlots(); - } - super.detectAndSendChanges(); - } - - @SuppressWarnings("unchecked") - private void sendReturnAreaSlots() { - for (int slotIdx = firstSlotReturn; slotIdx < endSlotReturn; slotIdx++) { - ItemStack stack = ((Slot) inventorySlots.get(slotIdx)).getStack(); - if(stack != null) { - stack = stack.copy(); - } - inventoryItemStacks.set(slotIdx, stack); - for (Object crafter : this.crafters) { - ((ICrafting) crafter).sendSlotContents(this, slotIdx, stack); - } - } - } - - @Override - public void entryChanged(ItemEntry entry) { - changedItems.add(entry); - } - - @Override - public void databaseReset() { - changedItems.clear(); - - } - - @Override - public void sendChangeLog() { - if(!changedItems.isEmpty() && !crafters.isEmpty()) { - InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); - if(db != null) { - try { - byte[] compressed = db.compressChangedItems(changedItems); - PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); - for (Object crafting : crafters) { - if(crafting instanceof EntityPlayerMP) { - PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); - } - } - } catch (IOException ex) { - Logger.getLogger(InventoryPanelContainer.class.getName()).log(Level.SEVERE, "Exception while compressing changed items", ex); - } - } - } - changedItems.clear(); - } - - public int getSlotIndex(IInventory inv, int index) { - for (int i = 0; i < inventorySlots.size(); i++) { - Slot slot = (Slot) inventorySlots.get(i); - if(slot.isSlotInInventory(inv, index)) { - return i; - } - } - return -1; - } - - public void executeFetchItems(EntityPlayerMP player, int generation, int dbID, int targetSlot, int count) { - TileInventoryPanel te = getInventoryPanel(); - InventoryDatabaseServer db = te.getDatabaseServer(); - if(db == null || db.getGeneration() != generation || !db.isCurrent()) { - return; - } - ItemEntry entry = db.getExistingItem(dbID); - if(entry != null) { - ItemStack targetStack; - Slot slot; - int maxStackSize; - - if(targetSlot < 0) { - slot = null; - targetStack = player.inventory.getItemStack(); - maxStackSize = player.inventory.getInventoryStackLimit(); - } else { - slot = getSlot(targetSlot); - targetStack = slot.getStack(); - maxStackSize = slot.getSlotStackLimit(); - } - - ItemStack tmpStack = new ItemStack(entry.getItem(), 0, entry.meta); - - Log.info("Loading item from ID " + entry.itemID + ". Result: " + Item.itemRegistry.getNameForObject(tmpStack.getItem()) + " side: " + FMLCommonHandler.instance().getEffectiveSide()); - - tmpStack.stackTagCompound = entry.nbt; - maxStackSize = Math.min(maxStackSize, tmpStack.getMaxStackSize()); - - if(targetStack != null && targetStack.stackSize > 0) { - if(!ItemUtil.areStackMergable(tmpStack, targetStack)) { - return; - } - } else { - targetStack = tmpStack.copy(); - } - - count = Math.min(count, maxStackSize - targetStack.stackSize); - if(count > 0) { - int extracted = db.extractItems(entry, count, te); - if(extracted > 0) { - targetStack.stackSize += extracted; - - sendChangeLog(); - - if(slot != null) { - slot.putStack(targetStack); - } else { - player.inventory.setItemStack(targetStack); - player.updateHeldItem(); - } - } - } - } - } - - public boolean moveItemsToReturnArea(int fromSlot) { - return moveItems(fromSlot, firstSlotReturn, endSlotReturn, Short.MAX_VALUE); - } - - public boolean moveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { - if(!executeMoveItems(fromSlot, toSlotStart, toSlotEnd, amount)) { - return false; - } - if(getInv().getWorldObj().isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketMoveItems(fromSlot, toSlotStart, toSlotEnd, amount)); - } - return true; - } - - public boolean executeMoveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { - if((fromSlot >= toSlotStart && fromSlot < toSlotEnd) || toSlotEnd <= toSlotStart || amount <= 0) { - return false; - } - - Slot srcSlot = getSlot(fromSlot); - ItemStack src = srcSlot.getStack(); - if(src != null) { - ItemStack toMove = src.copy(); - toMove.stackSize = Math.min(src.stackSize, amount); - int remaining = src.stackSize - toMove.stackSize; - if(mergeItemStack(toMove, toSlotStart, toSlotEnd, false)) { - remaining += toMove.stackSize; - if(remaining == 0) { - srcSlot.putStack(null); + if (te.getWorldObj().isRemote) { + changedItems = null; } else { - src.stackSize = remaining; - srcSlot.onSlotChanged(); + changedItems = new HashSet(); + } + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + slotCraftResult = inventorySlots.size(); + addSlotToContainer( + new SlotCrafting( + playerInv.player, + getInv(), + getInv(), + TileInventoryPanel.SLOT_CRAFTING_RESULT, + CRAFTING_GRID_X + 59, + CRAFTING_GRID_Y + 18) { + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack p_82870_2_) { + FMLCommonHandler.instance().firePlayerCraftingEvent(player, p_82870_2_, getInv()); + for (int i = TileInventoryPanel.SLOT_CRAFTING_START; + i < TileInventoryPanel.SLOT_CRAFTING_RESULT; + i++) { + ItemStack itemstack = getInv().getStackInSlot(i); + if (itemstack == null) continue; + + getInv().decrStackSize(i, 1); + if (!itemstack.getItem().hasContainerItem(itemstack)) continue; + + ItemStack containerIS = itemstack.getItem().getContainerItem(itemstack); + if (containerIS != null + && containerIS.isItemStackDamageable() + && containerIS.getItemDamage() > containerIS.getMaxDamage()) { + MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(player, containerIS)); + } else { + if (itemstack.getItem().doesContainerItemLeaveCraftingGrid(itemstack)) { + if (ItemUtil.doInsertItem(getInv(), 10, 20, itemstack) > 0) continue; + if (player.inventory.addItemStackToInventory(containerIS)) continue; + } + if (getInv().getStackInSlot(i) == null) { + getInv().setInventorySlotContents(i, containerIS); + } else { + player.dropPlayerItemWithRandomChoice(containerIS, false); + } + } + } + } + + @Override + public ItemStack decrStackSize(int p_75209_1_) { + if (this.getHasStack()) { + // on a right click we are asked to craft half a result. Ignore that. + return super.decrStackSize(this.getStack().stackSize); + } + return super.decrStackSize(p_75209_1_); + } + }); + + firstSlotCraftingGrid = inventorySlots.size(); + for (int y = 0, i = TileInventoryPanel.SLOT_CRAFTING_START; y < 3; y++) { + for (int x = 0; x < 3; x++, i++) { + addSlotToContainer(new Slot(getInv(), i, CRAFTING_GRID_X + x * 18, CRAFTING_GRID_Y + y * 18)); + } + } + endSlotCraftingGrid = inventorySlots.size(); + + slotFilter = addSlotToContainer( + new Slot(getInv(), TileInventoryPanel.SLOT_VIEW_FILTER, FILTER_SLOT_X, FILTER_SLOT_Y) { + @Override + public int getSlotStackLimit() { + return 1; + } + }); + + firstSlotReturn = inventorySlots.size(); + for (int y = 0, i = TileInventoryPanel.SLOT_RETURN_START; y < 2; y++) { + for (int x = 0; x < 5; x++, i++) { + addSlotToContainer(new Slot(getInv(), i, RETURN_INV_X + x * 18, RETURN_INV_Y + y * 18)); + } + } + endSlotReturn = inventorySlots.size(); + } + + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, FILTER_SLOT_X, FILTER_SLOT_Y)); + } + + @Override + public Point getPlayerInventoryOffset() { + return new Point(24 + 39, 130); + } + + @Override + public void onContainerClosed(EntityPlayer player) { + super.onContainerClosed(player); + if (!getInv().getWorldObj().isRemote) { + ((TileInventoryPanel) getInv()).eventHandler = null; + } + removeChangeLog(); + } + + public TileInventoryPanel getInventoryPanel() { + return (TileInventoryPanel) getInv(); + } + + public Slot getSlotFilter() { + return slotFilter; + } + + @SuppressWarnings("unchecked") + public List getCraftingGridSlots() { + return inventorySlots.subList(firstSlotCraftingGrid, endSlotCraftingGrid); + } + + @SuppressWarnings("unchecked") + public List getReturnAreaSlots() { + return inventorySlots.subList(firstSlotReturn, endSlotReturn); + } + + @SuppressWarnings("unchecked") + public List getPlayerInventorySlots() { + return inventorySlots.subList(startPlayerSlot, endPlayerSlot); + } + + @SuppressWarnings("unchecked") + public List getPlayerHotbarSlots() { + return inventorySlots.subList(startHotBarSlot, endHotBarSlot); + } + + private void removeChangeLog() { + if (changedItems != null) { + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if (db != null) { + db.removeChangeLog(this); + } + } + } + + @Override + public void removeCraftingFromCrafters(ICrafting crafting) { + super.removeCraftingFromCrafters(crafting); + removeChangeLog(); + } + + @Override + public void addCraftingToCrafters(ICrafting crafting) { + if (changedItems != null) { + sendChangeLog(); + } + super.addCraftingToCrafters(crafting); + if (changedItems != null) { + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if (db != null) { + db.addChangeLog(this); + if (crafting instanceof EntityPlayerMP) { + try { + byte[] compressed = db.compressItemList(); + PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); + PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); + } catch (IOException ex) { + Logger.getLogger(InventoryPanelContainer.class.getName()) + .log(Level.SEVERE, "Exception while compressing item list", ex); + } + } + } + } + } + + @Override + public void onCraftMatrixChanged(IInventory inv) { + InventoryCrafting tmp = new InventoryCrafting( + new Container() { + @Override + public boolean canInteractWith(EntityPlayer ep) { + return false; + } + }, + 3, + 3); + + for (int i = 0; i < 9; i++) { + tmp.setInventorySlotContents(i, getInv().getStackInSlot(i)); + } + + getInv().setInventorySlotContents( + 9, CraftingManager.getInstance().findMatchingRecipe(tmp, getInv().getWorldObj())); + + checkCraftingRecipes(); + } + + public void checkCraftingRecipes() { + storedRecipeExists = false; + int storedCraftingRecipes = getInventoryPanel().getStoredCraftingRecipes(); + if (hasCraftingRecipe() && storedCraftingRecipes > 0) { + List craftingGrid = getCraftingGridSlots(); + for (int idx = 0; idx < storedCraftingRecipes; idx++) { + if (getInventoryPanel().getStoredCraftingRecipe(idx).isEqual(craftingGrid)) { + storedRecipeExists = true; + break; + } + } + } + } + + @Override + public boolean func_94530_a(ItemStack par1, Slot slot) { + return !(slot instanceof SlotCrafting) && super.func_94530_a(par1, slot); + } + + public boolean clearCraftingGrid() { + boolean cleared = true; + for (Slot slot : getCraftingGridSlots()) { + if (slot.getHasStack()) { + moveItemsToReturnArea(slot.slotNumber); + if (slot.getHasStack()) { + cleared = false; + } + } + } + return cleared; + } + + public boolean hasCraftingRecipe() { + return getSlot(slotCraftResult).getHasStack(); + } + + public boolean hasNewCraftingRecipe() { + return hasCraftingRecipe() && !storedRecipeExists; + } + + @Override + protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { + if ((slotIndex == slotCraftResult) || (slotIndex >= firstSlotReturn && slotIndex < endSlotReturn)) { + return Collections.singletonList(getPlayerInventorySlotRange(true)); + } + if (slotIndex >= firstSlotCraftingGrid && slotIndex < endSlotCraftingGrid) { + ArrayList res = new ArrayList(); + res.add(new SlotRange(firstSlotReturn, endSlotReturn, false)); + res.add(getPlayerInventorySlotRange(false)); + return res; + } + if (slotIndex >= startPlayerSlot) { + return Collections.singletonList(new SlotRange(firstSlotReturn, endSlotReturn, false)); + } + return Collections.emptyList(); + } + + @Override + protected boolean mergeItemStack(ItemStack par1ItemStack, int fromIndex, int toIndex, boolean reversOrder) { + if (!super.mergeItemStack(par1ItemStack, fromIndex, toIndex, reversOrder)) { + return false; + } + if (fromIndex < endSlotReturn && toIndex > firstSlotReturn) { + updateReturnAreaSlots = true; } return true; - } } - return false; - } + + @Override + public void detectAndSendChanges() { + if (updateReturnAreaSlots) { + updateReturnAreaSlots = false; + sendReturnAreaSlots(); + } + super.detectAndSendChanges(); + } + + @SuppressWarnings("unchecked") + private void sendReturnAreaSlots() { + for (int slotIdx = firstSlotReturn; slotIdx < endSlotReturn; slotIdx++) { + ItemStack stack = ((Slot) inventorySlots.get(slotIdx)).getStack(); + if (stack != null) { + stack = stack.copy(); + } + inventoryItemStacks.set(slotIdx, stack); + for (Object crafter : this.crafters) { + ((ICrafting) crafter).sendSlotContents(this, slotIdx, stack); + } + } + } + + @Override + public void entryChanged(ItemEntry entry) { + changedItems.add(entry); + } + + @Override + public void databaseReset() { + changedItems.clear(); + } + + @Override + public void sendChangeLog() { + if (!changedItems.isEmpty() && !crafters.isEmpty()) { + InventoryDatabaseServer db = getInventoryPanel().getDatabaseServer(); + if (db != null) { + try { + byte[] compressed = db.compressChangedItems(changedItems); + PacketItemList pil = new PacketItemList(getInventoryPanel(), db.getGeneration(), compressed); + for (Object crafting : crafters) { + if (crafting instanceof EntityPlayerMP) { + PacketHandler.sendTo(pil, (EntityPlayerMP) crafting); + } + } + } catch (IOException ex) { + Logger.getLogger(InventoryPanelContainer.class.getName()) + .log(Level.SEVERE, "Exception while compressing changed items", ex); + } + } + } + changedItems.clear(); + } + + public int getSlotIndex(IInventory inv, int index) { + for (int i = 0; i < inventorySlots.size(); i++) { + Slot slot = (Slot) inventorySlots.get(i); + if (slot.isSlotInInventory(inv, index)) { + return i; + } + } + return -1; + } + + public void executeFetchItems(EntityPlayerMP player, int generation, int dbID, int targetSlot, int count) { + TileInventoryPanel te = getInventoryPanel(); + InventoryDatabaseServer db = te.getDatabaseServer(); + if (db == null || db.getGeneration() != generation || !db.isCurrent()) { + return; + } + ItemEntry entry = db.getExistingItem(dbID); + if (entry != null) { + ItemStack targetStack; + Slot slot; + int maxStackSize; + + if (targetSlot < 0) { + slot = null; + targetStack = player.inventory.getItemStack(); + maxStackSize = player.inventory.getInventoryStackLimit(); + } else { + slot = getSlot(targetSlot); + targetStack = slot.getStack(); + maxStackSize = slot.getSlotStackLimit(); + } + + ItemStack tmpStack = new ItemStack(entry.getItem(), 0, entry.meta); + + Log.info("Loading item from ID " + entry.itemID + ". Result: " + + Item.itemRegistry.getNameForObject(tmpStack.getItem()) + " side: " + + FMLCommonHandler.instance().getEffectiveSide()); + + tmpStack.stackTagCompound = entry.nbt; + maxStackSize = Math.min(maxStackSize, tmpStack.getMaxStackSize()); + + if (targetStack != null && targetStack.stackSize > 0) { + if (!ItemUtil.areStackMergable(tmpStack, targetStack)) { + return; + } + } else { + targetStack = tmpStack.copy(); + } + + count = Math.min(count, maxStackSize - targetStack.stackSize); + if (count > 0) { + int extracted = db.extractItems(entry, count, te); + if (extracted > 0) { + targetStack.stackSize += extracted; + + sendChangeLog(); + + if (slot != null) { + slot.putStack(targetStack); + } else { + player.inventory.setItemStack(targetStack); + player.updateHeldItem(); + } + } + } + } + } + + public boolean moveItemsToReturnArea(int fromSlot) { + return moveItems(fromSlot, firstSlotReturn, endSlotReturn, Short.MAX_VALUE); + } + + public boolean moveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { + if (!executeMoveItems(fromSlot, toSlotStart, toSlotEnd, amount)) { + return false; + } + if (getInv().getWorldObj().isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketMoveItems(fromSlot, toSlotStart, toSlotEnd, amount)); + } + return true; + } + + public boolean executeMoveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { + if ((fromSlot >= toSlotStart && fromSlot < toSlotEnd) || toSlotEnd <= toSlotStart || amount <= 0) { + return false; + } + + Slot srcSlot = getSlot(fromSlot); + ItemStack src = srcSlot.getStack(); + if (src != null) { + ItemStack toMove = src.copy(); + toMove.stackSize = Math.min(src.stackSize, amount); + int remaining = src.stackSize - toMove.stackSize; + if (mergeItemStack(toMove, toSlotStart, toSlotEnd, false)) { + remaining += toMove.stackSize; + if (remaining == 0) { + srcSlot.putStack(null); + } else { + src.stackSize = remaining; + srcSlot.onSlotChanged(); + } + return true; + } + } + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java b/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java index acdbcba9..b3a1c851 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/ItemEntryBase.java @@ -5,44 +5,47 @@ import net.minecraft.nbt.NBTTagCompound; public class ItemEntryBase { - public final int dbID; - public final int hash; - public final int itemID; - public final int meta; - public final NBTTagCompound nbt; + public final int dbID; + public final int hash; + public final int itemID; + public final int meta; + public final NBTTagCompound nbt; - protected ItemEntryBase(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { - this.dbID = dbID; - this.hash = hash; - this.itemID = itemID; - this.meta = meta; - this.nbt = nbt; - } - - @Override - public int hashCode() { - return hash; - } - - @Override - public boolean equals(Object obj) { - if(obj instanceof ItemEntryBase) { - ItemEntryBase other = (ItemEntryBase) obj; - return this.dbID == other.dbID; + protected ItemEntryBase(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { + this.dbID = dbID; + this.hash = hash; + this.itemID = itemID; + this.meta = meta; + this.nbt = nbt; } - return false; - } - boolean equals(int itemID, int meta, NBTTagCompound nbt) { - return this.itemID == itemID && this.meta == meta && ((this.nbt == nbt) || (this.nbt != null && this.nbt.equals(nbt))); - } + @Override + public int hashCode() { + return hash; + } - public Item getItem() { - return Item.getItemById(itemID); - } + @Override + public boolean equals(Object obj) { + if (obj instanceof ItemEntryBase) { + ItemEntryBase other = (ItemEntryBase) obj; + return this.dbID == other.dbID; + } + return false; + } - @Override - public String toString() { - return "ItemEntryBase{" + "dbID=" + dbID + ", hash=" + hash + ", itemID=" + itemID + ", meta=" + meta + ", nbt=" + nbt + '}'; - } + boolean equals(int itemID, int meta, NBTTagCompound nbt) { + return this.itemID == itemID + && this.meta == meta + && ((this.nbt == nbt) || (this.nbt != null && this.nbt.equals(nbt))); + } + + public Item getItem() { + return Item.getItemById(itemID); + } + + @Override + public String toString() { + return "ItemEntryBase{" + "dbID=" + dbID + ", hash=" + hash + ", itemID=" + itemID + ", meta=" + meta + ", nbt=" + + nbt + '}'; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java index 88043e1b..d259d5b5 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketDatabaseReset.java @@ -1,35 +1,34 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.invpanel.client.ClientDatabaseManager; +import io.netty.buffer.ByteBuf; public class PacketDatabaseReset implements IMessage, IMessageHandler { - private int generation; + private int generation; - public PacketDatabaseReset() { - } + public PacketDatabaseReset() {} - public PacketDatabaseReset(int generation) { - this.generation = generation; - } + public PacketDatabaseReset(int generation) { + this.generation = generation; + } - @Override - public void fromBytes(ByteBuf bb) { - this.generation = bb.readInt(); - } + @Override + public void fromBytes(ByteBuf bb) { + this.generation = bb.readInt(); + } - @Override - public void toBytes(ByteBuf bb) { - bb.writeInt(generation); - } + @Override + public void toBytes(ByteBuf bb) { + bb.writeInt(generation); + } - @Override - public IMessage onMessage(PacketDatabaseReset message, MessageContext ctx) { - ClientDatabaseManager.INSTANCE.destroyDatabase(message.generation); - return null; - } + @Override + public IMessage onMessage(PacketDatabaseReset message, MessageContext ctx) { + ClientDatabaseManager.INSTANCE.destroyDatabase(message.generation); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java index 661eecd9..af5d3767 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketFetchItem.java @@ -1,56 +1,56 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; import crazypants.enderio.machine.invpanel.client.ItemEntry; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; public class PacketFetchItem implements IMessage, IMessageHandler { - private int generation; - private int dbID; - private int targetSlot; - private int count; + private int generation; + private int dbID; + private int targetSlot; + private int count; - public PacketFetchItem() { - } + public PacketFetchItem() {} - public PacketFetchItem(int generation, ItemEntry entry, int targetSlot, int count) { - this.generation = generation; - this.dbID = entry.dbID; - this.targetSlot = targetSlot; - this.count = count; - Log.info("Looking up item " + Item.itemRegistry.getNameForObject(entry.getItem()) + ". ID: " + entry.itemID + " side: " + FMLCommonHandler.instance().getEffectiveSide()); - } - - @Override - public void fromBytes(ByteBuf bb) { - generation = bb.readInt(); - dbID = bb.readInt(); - targetSlot = bb.readShort(); - count = bb.readShort(); - } - - @Override - public void toBytes(ByteBuf bb) { - bb.writeInt(generation); - bb.writeInt(dbID); - bb.writeShort(targetSlot); - bb.writeShort(count); - } - - @Override - public IMessage onMessage(PacketFetchItem message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if(player.openContainer instanceof InventoryPanelContainer) { - InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; - ipc.executeFetchItems(player, message.generation, message.dbID, message.targetSlot, message.count); + public PacketFetchItem(int generation, ItemEntry entry, int targetSlot, int count) { + this.generation = generation; + this.dbID = entry.dbID; + this.targetSlot = targetSlot; + this.count = count; + Log.info("Looking up item " + Item.itemRegistry.getNameForObject(entry.getItem()) + ". ID: " + entry.itemID + + " side: " + FMLCommonHandler.instance().getEffectiveSide()); + } + + @Override + public void fromBytes(ByteBuf bb) { + generation = bb.readInt(); + dbID = bb.readInt(); + targetSlot = bb.readShort(); + count = bb.readShort(); + } + + @Override + public void toBytes(ByteBuf bb) { + bb.writeInt(generation); + bb.writeInt(dbID); + bb.writeShort(targetSlot); + bb.writeShort(count); + } + + @Override + public IMessage onMessage(PacketFetchItem message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + if (player.openContainer instanceof InventoryPanelContainer) { + InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; + ipc.executeFetchItems(player, message.generation, message.dbID, message.targetSlot, message.count); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java index d0b86572..9d0a7acf 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java @@ -1,57 +1,56 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; -public class PacketGuiSettings extends MessageTileEntity implements IMessageHandler { +public class PacketGuiSettings extends MessageTileEntity + implements IMessageHandler { - private int sortMode; - private String filterString; - private boolean sync; - - public PacketGuiSettings() { - filterString = ""; - } + private int sortMode; + private String filterString; + private boolean sync; - public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString, boolean sync) { - super(tile); - this.sortMode = sortMode; - this.filterString = filterString; - this.sync = sync; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - sortMode = buf.readInt(); - filterString = ByteBufUtils.readUTF8String(buf); - sync = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(sortMode); - ByteBufUtils.writeUTF8String(buf, filterString); - buf.writeBoolean(sync); - } - - @Override - public IMessage onMessage(PacketGuiSettings message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - teInvPanel.setGuiParameter(message.sortMode, message.filterString, message.sync); + public PacketGuiSettings() { + filterString = ""; + } + + public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString, boolean sync) { + super(tile); + this.sortMode = sortMode; + this.filterString = filterString; + this.sync = sync; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + sortMode = buf.readInt(); + filterString = ByteBufUtils.readUTF8String(buf); + sync = buf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(sortMode); + ByteBufUtils.writeUTF8String(buf, filterString); + buf.writeBoolean(sync); + } + + @Override + public IMessage onMessage(PacketGuiSettings message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.setGuiParameter(message.sortMode, message.filterString, message.sync); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java index 97f72584..d10132b4 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java @@ -1,18 +1,7 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -20,53 +9,61 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.machine.invpanel.server.ItemEntry; +import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketItemInfo extends MessageTileEntity implements IMessageHandler { +public class PacketItemInfo extends MessageTileEntity + implements IMessageHandler { - private int generation; - private byte[] compressed; + private int generation; + private byte[] compressed; - public PacketItemInfo() { - } + public PacketItemInfo() {} - public PacketItemInfo(TileInventoryPanel tile, InventoryDatabaseServer db, List items) { - super(tile); - this.generation = db.generation; - try { - compressed = db.compressItemInfo(items); - } catch (IOException ex) { - Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while compressing items", ex); - compressed = new byte[0]; + public PacketItemInfo(TileInventoryPanel tile, InventoryDatabaseServer db, List items) { + super(tile); + this.generation = db.generation; + try { + compressed = db.compressItemInfo(items); + } catch (IOException ex) { + Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while compressing items", ex); + compressed = new byte[0]; + } } - } - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - generation = buf.readInt(); - compressed = NetworkUtil.readByteArray(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(generation); - NetworkUtil.writeByteArray(buf, compressed); - } - - @Override - public IMessage onMessage(PacketItemInfo message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); - try { - db.readCompressedItems(message.compressed); - } catch (IOException ex) { - Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading item info", ex); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + generation = buf.readInt(); + compressed = NetworkUtil.readByteArray(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(generation); + NetworkUtil.writeByteArray(buf, compressed); + } + + @Override + public IMessage onMessage(PacketItemInfo message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); + try { + db.readCompressedItems(message.compressed); + } catch (IOException ex) { + Logger.getLogger(PacketItemInfo.class.getName()) + .log(Level.SEVERE, "Exception while reading item info", ex); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java index 38c40fc0..5f94b7bb 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java @@ -1,70 +1,67 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketItemList extends MessageTileEntity implements IMessageHandler { +public class PacketItemList extends MessageTileEntity + implements IMessageHandler { - private int generation; - private byte[] compressed; + private int generation; + private byte[] compressed; - public PacketItemList() { - } + public PacketItemList() {} - public PacketItemList(TileInventoryPanel tile, int generation, byte[] compressed) { - super(tile); - this.generation = generation; - this.compressed = compressed; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - generation = buf.readInt(); - compressed = NetworkUtil.readByteArray(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(generation); - NetworkUtil.writeByteArray(buf, compressed); - } - - @Override - public IMessage onMessage(PacketItemList message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); - try { - List missingItems = db.readCompressedItemList(message.compressed); - if(missingItems != null) { - PacketHandler.INSTANCE.sendToServer(new PacketRequestMissingItems(teInvPanel, db.getGeneration(), missingItems)); - } - } catch (IOException ex) { - Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading item list", ex); - } + public PacketItemList(TileInventoryPanel tile, int generation, byte[] compressed) { + super(tile); + this.generation = generation; + this.compressed = compressed; } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + generation = buf.readInt(); + compressed = NetworkUtil.readByteArray(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(generation); + NetworkUtil.writeByteArray(buf, compressed); + } + + @Override + public IMessage onMessage(PacketItemList message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + InventoryDatabaseClient db = teInvPanel.getDatabaseClient(message.generation); + try { + List missingItems = db.readCompressedItemList(message.compressed); + if (missingItems != null) { + PacketHandler.INSTANCE.sendToServer( + new PacketRequestMissingItems(teInvPanel, db.getGeneration(), missingItems)); + } + } catch (IOException ex) { + Logger.getLogger(PacketItemInfo.class.getName()) + .log(Level.SEVERE, "Exception while reading item list", ex); + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketMoveItems.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketMoveItems.java index 09b1a009..1d39d0fb 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketMoveItems.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketMoveItems.java @@ -1,51 +1,50 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; public class PacketMoveItems implements IMessage, IMessageHandler { - private int fromSlot; - private int toSlotStart; - private int toSlotEnd; - private int amount; + private int fromSlot; + private int toSlotStart; + private int toSlotEnd; + private int amount; - public PacketMoveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { - this.fromSlot = fromSlot; - this.toSlotStart = toSlotStart; - this.toSlotEnd = toSlotEnd; - this.amount = amount; - } - - public PacketMoveItems() { - } - - @Override - public void fromBytes(ByteBuf bb) { - fromSlot = bb.readShort(); - toSlotStart = bb.readShort(); - toSlotEnd = bb.readShort(); - amount = bb.readShort(); - } - - @Override - public void toBytes(ByteBuf bb) { - bb.writeShort(fromSlot); - bb.writeShort(toSlotStart); - bb.writeShort(toSlotEnd); - bb.writeShort(amount); - } - - @Override - public IMessage onMessage(PacketMoveItems message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if(player.openContainer instanceof InventoryPanelContainer) { - InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; - ipc.executeMoveItems(message.fromSlot, message.toSlotStart, message.toSlotEnd, message.amount); + public PacketMoveItems(int fromSlot, int toSlotStart, int toSlotEnd, int amount) { + this.fromSlot = fromSlot; + this.toSlotStart = toSlotStart; + this.toSlotEnd = toSlotEnd; + this.amount = amount; + } + + public PacketMoveItems() {} + + @Override + public void fromBytes(ByteBuf bb) { + fromSlot = bb.readShort(); + toSlotStart = bb.readShort(); + toSlotEnd = bb.readShort(); + amount = bb.readShort(); + } + + @Override + public void toBytes(ByteBuf bb) { + bb.writeShort(fromSlot); + bb.writeShort(toSlotStart); + bb.writeShort(toSlotEnd); + bb.writeShort(amount); + } + + @Override + public IMessage onMessage(PacketMoveItems message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + if (player.openContainer instanceof InventoryPanelContainer) { + InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; + ipc.executeMoveItems(message.fromSlot, message.toSlotStart, message.toSlotEnd, message.amount); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java index 3042f8c8..da44245a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java @@ -1,83 +1,79 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; - -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.CompressedDataOutput; import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.machine.invpanel.server.ItemEntry; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; -public class PacketRequestMissingItems extends MessageTileEntity implements IMessageHandler { +public class PacketRequestMissingItems extends MessageTileEntity + implements IMessageHandler { - private byte[] compressed; + private byte[] compressed; - public PacketRequestMissingItems() { - } + public PacketRequestMissingItems() {} - public PacketRequestMissingItems(TileInventoryPanel tile, int generation, List missingIDs) { - super(tile); - try { - CompressedDataOutput cdo = new CompressedDataOutput(); - try { - cdo.writeVariable(generation); - cdo.writeVariable(missingIDs.size()); - for (Integer id : missingIDs) { - cdo.writeVariable(id - InventoryDatabase.COMPLEX_DBINDEX_START); - } - compressed = cdo.getCompressed(); - } finally { - cdo.close(); - } - } catch (IOException ex) { - compressed = new byte[0]; - } - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - compressed = NetworkUtil.readByteArray(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeByteArray(buf, compressed); - } - - @Override - public IMessage onMessage(PacketRequestMissingItems message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - InventoryDatabaseServer db = teInvPanel.getDatabaseServer(); - if(db != null) { + public PacketRequestMissingItems(TileInventoryPanel tile, int generation, List missingIDs) { + super(tile); try { - List items = db.decompressMissingItems(message.compressed); - if(!items.isEmpty()) { - PacketHandler.sendTo(new PacketItemInfo(teInvPanel, db, items), player); - } + CompressedDataOutput cdo = new CompressedDataOutput(); + try { + cdo.writeVariable(generation); + cdo.writeVariable(missingIDs.size()); + for (Integer id : missingIDs) { + cdo.writeVariable(id - InventoryDatabase.COMPLEX_DBINDEX_START); + } + compressed = cdo.getCompressed(); + } finally { + cdo.close(); + } } catch (IOException ex) { - Logger.getLogger(PacketItemInfo.class.getName()).log(Level.SEVERE, "Exception while reading missing item IDs", ex); + compressed = new byte[0]; } - } } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + compressed = NetworkUtil.readByteArray(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + NetworkUtil.writeByteArray(buf, compressed); + } + + @Override + public IMessage onMessage(PacketRequestMissingItems message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + InventoryDatabaseServer db = teInvPanel.getDatabaseServer(); + if (db != null) { + try { + List items = db.decompressMissingItems(message.compressed); + if (!items.isEmpty()) { + PacketHandler.sendTo(new PacketItemInfo(teInvPanel, db, items), player); + } + } catch (IOException ex) { + Logger.getLogger(PacketItemInfo.class.getName()) + .log(Level.SEVERE, "Exception while reading missing item IDs", ex); + } + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketSetExtractionDisabled.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketSetExtractionDisabled.java index a9eb59e9..ad555059 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketSetExtractionDisabled.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketSetExtractionDisabled.java @@ -1,48 +1,45 @@ package crazypants.enderio.machine.invpanel; +import com.enderio.core.common.network.MessageTileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; -import com.enderio.core.common.network.MessageTileEntity; +public class PacketSetExtractionDisabled extends MessageTileEntity + implements IMessageHandler { -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; + private boolean extractionDisabled; -public class PacketSetExtractionDisabled extends MessageTileEntity implements IMessageHandler { + public PacketSetExtractionDisabled() {} - private boolean extractionDisabled; - - public PacketSetExtractionDisabled() { - } - - public PacketSetExtractionDisabled(TileInventoryPanel tile, boolean extractionDisabled) { - super(tile); - this.extractionDisabled = extractionDisabled; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - extractionDisabled = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeBoolean(extractionDisabled); - } - - @Override - public IMessage onMessage(PacketSetExtractionDisabled message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - teInvPanel.setExtractionDisabled(message.extractionDisabled); + public PacketSetExtractionDisabled(TileInventoryPanel tile, boolean extractionDisabled) { + super(tile); + this.extractionDisabled = extractionDisabled; } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + extractionDisabled = buf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(extractionDisabled); + } + + @Override + public IMessage onMessage(PacketSetExtractionDisabled message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.setExtractionDisabled(message.extractionDisabled); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketStoredCraftingRecipe.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketStoredCraftingRecipe.java index c9d8ca72..273745ae 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketStoredCraftingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketStoredCraftingRecipe.java @@ -1,74 +1,71 @@ package crazypants.enderio.machine.invpanel; +import com.enderio.core.common.network.NetworkUtil; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.common.network.NetworkUtil; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; - public class PacketStoredCraftingRecipe implements IMessage, IMessageHandler { - public static final int ACTION_ADD = 0; - public static final int ACTION_DELETE = 1; + public static final int ACTION_ADD = 0; + public static final int ACTION_DELETE = 1; - private int action; - private int index; - private StoredCraftingRecipe recipe; + private int action; + private int index; + private StoredCraftingRecipe recipe; - public PacketStoredCraftingRecipe() { - } + public PacketStoredCraftingRecipe() {} - public PacketStoredCraftingRecipe(int action, int index, StoredCraftingRecipe recipe) { - this.action = action; - this.index = index; - this.recipe = recipe; - } - - @Override - public void fromBytes(ByteBuf buf) { - action = buf.readUnsignedByte(); - index = buf.readUnsignedByte(); - NBTTagCompound nbt = NetworkUtil.readNBTTagCompound(buf); - if(nbt != null) { - recipe = new StoredCraftingRecipe(); - if(!recipe.readFromNBT(nbt)) { - recipe = null; - } + public PacketStoredCraftingRecipe(int action, int index, StoredCraftingRecipe recipe) { + this.action = action; + this.index = index; + this.recipe = recipe; } - } - @Override - public void toBytes(ByteBuf buf) { - buf.writeByte(action); - buf.writeByte(index); - NBTTagCompound nbt = null; - if(recipe != null) { - nbt = new NBTTagCompound(); - recipe.writeToNBT(nbt); + @Override + public void fromBytes(ByteBuf buf) { + action = buf.readUnsignedByte(); + index = buf.readUnsignedByte(); + NBTTagCompound nbt = NetworkUtil.readNBTTagCompound(buf); + if (nbt != null) { + recipe = new StoredCraftingRecipe(); + if (!recipe.readFromNBT(nbt)) { + recipe = null; + } + } } - NetworkUtil.writeNBTTagCompound(nbt, buf); - } - @Override - public IMessage onMessage(PacketStoredCraftingRecipe message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - if(player.openContainer instanceof InventoryPanelContainer) { - InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; - switch (message.action) { - case ACTION_ADD: - if(message.recipe != null) { - ipc.getInventoryPanel().addStoredCraftingRecipe(message.recipe); - } - break; - case ACTION_DELETE: - ipc.getInventoryPanel().removeStoredCraftingRecipe(message.index); - break; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeByte(action); + buf.writeByte(index); + NBTTagCompound nbt = null; + if (recipe != null) { + nbt = new NBTTagCompound(); + recipe.writeToNBT(nbt); + } + NetworkUtil.writeNBTTagCompound(nbt, buf); + } + + @Override + public IMessage onMessage(PacketStoredCraftingRecipe message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + if (player.openContainer instanceof InventoryPanelContainer) { + InventoryPanelContainer ipc = (InventoryPanelContainer) player.openContainer; + switch (message.action) { + case ACTION_ADD: + if (message.recipe != null) { + ipc.getInventoryPanel().addStoredCraftingRecipe(message.recipe); + } + break; + case ACTION_DELETE: + ipc.getInventoryPanel().removeStoredCraftingRecipe(message.index); + break; + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketUpdateExtractionDisabled.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketUpdateExtractionDisabled.java index dc5c1ff7..0a06d3d9 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketUpdateExtractionDisabled.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketUpdateExtractionDisabled.java @@ -1,49 +1,46 @@ package crazypants.enderio.machine.invpanel; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketUpdateExtractionDisabled extends MessageTileEntity implements IMessageHandler { +public class PacketUpdateExtractionDisabled extends MessageTileEntity + implements IMessageHandler { - private boolean extractionDisabled; + private boolean extractionDisabled; - public PacketUpdateExtractionDisabled() { - } + public PacketUpdateExtractionDisabled() {} - public PacketUpdateExtractionDisabled(TileInventoryPanel tile, boolean extractionDisabled) { - super(tile); - this.extractionDisabled = extractionDisabled; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - extractionDisabled = buf.readBoolean(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeBoolean(extractionDisabled); - } - - @Override - public IMessage onMessage(PacketUpdateExtractionDisabled message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileInventoryPanel) { - TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - teInvPanel.updateExtractionDisabled(message.extractionDisabled); + public PacketUpdateExtractionDisabled(TileInventoryPanel tile, boolean extractionDisabled) { + super(tile); + this.extractionDisabled = extractionDisabled; } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + extractionDisabled = buf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(extractionDisabled); + } + + @Override + public IMessage onMessage(PacketUpdateExtractionDisabled message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileInventoryPanel) { + TileInventoryPanel teInvPanel = (TileInventoryPanel) te; + teInvPanel.updateExtractionDisabled(message.extractionDisabled); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/StoredCraftingRecipe.java b/src/main/java/crazypants/enderio/machine/invpanel/StoredCraftingRecipe.java index 461dd9fb..a43b16a8 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/StoredCraftingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/StoredCraftingRecipe.java @@ -1,7 +1,7 @@ package crazypants.enderio.machine.invpanel; +import com.enderio.core.common.util.ItemUtil; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -10,103 +10,104 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.common.util.ItemUtil; - public class StoredCraftingRecipe { - private final ItemStack[] slots; + private final ItemStack[] slots; - private boolean updateResult; - private ItemStack result; + private boolean updateResult; + private ItemStack result; - public StoredCraftingRecipe() { - slots = new ItemStack[9]; - } - - public boolean loadFromCraftingGrid(List craftingGrid) { - if (craftingGrid.size() != 9) { - return false; - } - int count = 0; - for(int slotIdx = 0; slotIdx < 9 && slotIdx < craftingGrid.size(); slotIdx++) { - Slot slot = craftingGrid.get(slotIdx); - ItemStack stack = slot.getStack(); - if(stack != null) { - stack = stack.copy(); - stack.stackSize = 1; - slots[slotIdx] = stack; - count++; - } - } - return count > 0; - } - - public ItemStack get(int index) { - return slots[index]; - } - - public boolean isEqual(List craftingGrid) { - for(int slotIdx = 0; slotIdx < 9; slotIdx++) { - ItemStack a = slots[slotIdx]; - ItemStack b = craftingGrid.get(slotIdx).getStack(); - if((a != null || b != null) && !ItemUtil.areStacksEqual(a, b)) { - return false; - } - } - return true; - } - - public void writeToNBT(NBTTagCompound nbtRoot) { - for(int slotIdx = 0; slotIdx < 9; slotIdx++) { - ItemStack itemStack = slots[slotIdx]; - if(itemStack != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStack.writeToNBT(itemStackNBT); - nbtRoot.setTag(Integer.toString(slotIdx), itemStackNBT); - } - } - } - - public boolean readFromNBT(NBTTagCompound nbtRoot) { - boolean hasSlots = false; - for(int slotIdx = 0; slotIdx < 9; slotIdx++) { - NBTTagCompound itemStackNBT = (NBTTagCompound) nbtRoot.getTag(Integer.toString(slotIdx)); - if(itemStackNBT != null) { - slots[slotIdx] = ItemStack.loadItemStackFromNBT(itemStackNBT); - hasSlots = true; - } else { - slots[slotIdx] = null; - } - } - updateResult = true; - result = null; - return hasSlots; - } - - public ItemStack getResult(TileInventoryPanel te) { - if(updateResult) { - findCraftingResult(te); - } - return result; - } - - private void findCraftingResult(TileInventoryPanel te) { - InventoryCrafting tmp = new InventoryCrafting(new Container() { - @Override - public boolean canInteractWith(EntityPlayer ep) { - return false; - } - }, 3, 3); - - for (int i = 0; i < 9; i++) { - tmp.setInventorySlotContents(i, slots[i]); + public StoredCraftingRecipe() { + slots = new ItemStack[9]; } - result = CraftingManager.getInstance().findMatchingRecipe(tmp, te.getWorldObj()); - if(result != null) { - result = result.copy(); - result.stackSize = 1; + public boolean loadFromCraftingGrid(List craftingGrid) { + if (craftingGrid.size() != 9) { + return false; + } + int count = 0; + for (int slotIdx = 0; slotIdx < 9 && slotIdx < craftingGrid.size(); slotIdx++) { + Slot slot = craftingGrid.get(slotIdx); + ItemStack stack = slot.getStack(); + if (stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + slots[slotIdx] = stack; + count++; + } + } + return count > 0; + } + + public ItemStack get(int index) { + return slots[index]; + } + + public boolean isEqual(List craftingGrid) { + for (int slotIdx = 0; slotIdx < 9; slotIdx++) { + ItemStack a = slots[slotIdx]; + ItemStack b = craftingGrid.get(slotIdx).getStack(); + if ((a != null || b != null) && !ItemUtil.areStacksEqual(a, b)) { + return false; + } + } + return true; + } + + public void writeToNBT(NBTTagCompound nbtRoot) { + for (int slotIdx = 0; slotIdx < 9; slotIdx++) { + ItemStack itemStack = slots[slotIdx]; + if (itemStack != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStack.writeToNBT(itemStackNBT); + nbtRoot.setTag(Integer.toString(slotIdx), itemStackNBT); + } + } + } + + public boolean readFromNBT(NBTTagCompound nbtRoot) { + boolean hasSlots = false; + for (int slotIdx = 0; slotIdx < 9; slotIdx++) { + NBTTagCompound itemStackNBT = (NBTTagCompound) nbtRoot.getTag(Integer.toString(slotIdx)); + if (itemStackNBT != null) { + slots[slotIdx] = ItemStack.loadItemStackFromNBT(itemStackNBT); + hasSlots = true; + } else { + slots[slotIdx] = null; + } + } + updateResult = true; + result = null; + return hasSlots; + } + + public ItemStack getResult(TileInventoryPanel te) { + if (updateResult) { + findCraftingResult(te); + } + return result; + } + + private void findCraftingResult(TileInventoryPanel te) { + InventoryCrafting tmp = new InventoryCrafting( + new Container() { + @Override + public boolean canInteractWith(EntityPlayer ep) { + return false; + } + }, + 3, + 3); + + for (int i = 0; i < 9; i++) { + tmp.setInventorySlotContents(i, slots[i]); + } + + result = CraftingManager.getInstance().findMatchingRecipe(tmp, te.getWorldObj()); + if (result != null) { + result = result.copy(); + result.stackSize = 1; + } + updateResult = false; } - updateResult = false; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 59fb37cc..ee1a0d5b 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -1,20 +1,6 @@ package crazypants.enderio.machine.invpanel; -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - import com.enderio.core.api.common.util.ITankAccess; - import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.TileConduitBundle; @@ -33,420 +19,435 @@ import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; import crazypants.enderio.machine.invpanel.server.InventoryDatabaseServer; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.SmartTank; +import java.util.ArrayList; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileInventoryPanel extends AbstractMachineEntity implements IFluidHandler, ITankAccess, IHasNutrientTank { - public static final int SLOT_CRAFTING_START = 0; - public static final int SLOT_CRAFTING_RESULT = 9; - public static final int SLOT_VIEW_FILTER = 10; - public static final int SLOT_RETURN_START = 11; + public static final int SLOT_CRAFTING_START = 0; + public static final int SLOT_CRAFTING_RESULT = 9; + public static final int SLOT_VIEW_FILTER = 10; + public static final int SLOT_RETURN_START = 11; - public static final int MAX_STORED_CRAFTING_RECIPES = 6; + public static final int MAX_STORED_CRAFTING_RECIPES = 6; - protected final SmartTank fuelTank; - protected boolean tanksDirty; + protected final SmartTank fuelTank; + protected boolean tanksDirty; - private InventoryDatabaseServer dbServer; - private InventoryDatabaseClient dbClient; + private InventoryDatabaseServer dbServer; + private InventoryDatabaseClient dbClient; - private boolean active; - private boolean extractionDisabled; + private boolean active; + private boolean extractionDisabled; - public InventoryPanelContainer eventHandler; - private IItemFilter itemFilter; + public InventoryPanelContainer eventHandler; + private IItemFilter itemFilter; - private int guiSortMode; - private String guiFilterString = ""; - private boolean guiSync; + private int guiSortMode; + private String guiFilterString = ""; + private boolean guiSync; - private final ArrayList storedCraftingRecipes; + private final ArrayList storedCraftingRecipes; - public TileInventoryPanel() { - super(new SlotDefinition(0, 8, 11, 20, 21, 20)); - this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, Config.inventoryPanelFree ? 0 : 2000); - this.storedCraftingRecipes = new ArrayList(); - } - - public InventoryDatabaseServer getDatabaseServer() { - return dbServer; - } - - public InventoryDatabaseClient getDatabaseClient(int generation) { - if(dbClient != null && dbClient.getGeneration() != generation) { - ClientDatabaseManager.INSTANCE.destroyDatabase(dbClient.getGeneration()); - dbClient = null; - } - if(dbClient == null) { - dbClient = ClientDatabaseManager.INSTANCE.getOrCreateDatabase(generation); - } - return dbClient; - } - - public InventoryDatabaseClient getDatabaseClient() { - return dbClient; - } - - @Override - public boolean canInsertItem(int slot, ItemStack var2, int side) { - return false; - } - - @Override - protected boolean canExtractItem(int slot, ItemStack itemstack) { - return !extractionDisabled && super.canExtractItem(slot, itemstack); - } - - @Override - protected boolean isMachineItemValidForSlot(int slot, ItemStack stack) { - if(slot == SLOT_VIEW_FILTER && stack != null) { - return FilterRegister.isItemFilter(stack) && FilterRegister.isFilterSet(stack); - } - return true; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack res = super.decrStackSize(fromSlot, amount); - if(res != null && fromSlot < SLOT_CRAFTING_RESULT && eventHandler != null) { - eventHandler.onCraftMatrixChanged(this); - } - if(res != null && fromSlot == SLOT_VIEW_FILTER) { - updateItemFilter(); - } - return res; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - super.setInventorySlotContents(slot, contents); - if(slot < SLOT_CRAFTING_RESULT && eventHandler != null) { - eventHandler.onCraftMatrixChanged(this); - } - if(slot == SLOT_VIEW_FILTER) { - updateItemFilter(); - } - } - - private void updateItemFilter() { - itemFilter = FilterRegister.getFilterForUpgrade(inventory[SLOT_VIEW_FILTER]); - } - - public IItemFilter getItemFilter() { - return itemFilter; - } - - @Override - public boolean isActive() { - return Config.inventoryPanelFree || active; - } - - @Override - public void doUpdate() { - if(worldObj.isRemote) { - updateEntityClient(); - return; + public TileInventoryPanel() { + super(new SlotDefinition(0, 8, 11, 20, 21, 20)); + this.fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, Config.inventoryPanelFree ? 0 : 2000); + this.storedCraftingRecipes = new ArrayList(); } - if(shouldDoWorkThisTick(20)) { - scanNetwork(); + public InventoryDatabaseServer getDatabaseServer() { + return dbServer; } - if(forceClientUpdate) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - markDirty(); - } - - if(tanksDirty) { - tanksDirty = false; - PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); - } - } - - private void scanNetwork() { - ForgeDirection facingDir = getFacingDir(); - ForgeDirection backside = facingDir.getOpposite(); - - ItemConduitNetwork icn = null; - - TileEntity te = worldObj.getTileEntity(xCoord + backside.offsetX, yCoord + backside.offsetY, zCoord + backside.offsetZ); - if(te instanceof TileConduitBundle) { - TileConduitBundle teCB = (TileConduitBundle) te; - ItemConduit conduit = teCB.getConduit(ItemConduit.class); - if(conduit != null) { - icn = (ItemConduitNetwork) conduit.getNetwork(); - } - } - - if(icn != null) { - dbServer = icn.getDatabase(); - dbServer.sendChangeLogs(); - refuelPower(dbServer); - - if(active != dbServer.isOperational()) { - active = dbServer.isOperational(); - forceClientUpdate = true; - } - } else { - if(active) { - forceClientUpdate = true; - } - dbServer = null; - active = false; - } - } - - public float getAvailablePower() { - return getPower() * Config.inventoryPanelPowerPerMB; - } - - public void refuelPower(InventoryDatabaseServer db) { - float missingPower = Config.inventoryPanelPowerPerMB * 0.5f - db.getPower(); - if(missingPower > 0) { - int amount = (int) Math.ceil(missingPower / Config.inventoryPanelPowerPerMB); - amount = Math.min(amount, getPower()); - if(amount > 0) { - useNutrient(amount); - dbServer.addPower(amount * Config.inventoryPanelPowerPerMB); - } - } - } - - public void useNutrient(int amount) { - fuelTank.drain(amount, true); - tanksDirty = true; - } - - private int getPower() { - return Config.inventoryPanelFree ? 100 : fuelTank.getFluidAmount(); - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - return false; - } - - public int getGuiSortMode() { - return guiSortMode; - } - - public String getGuiFilterString() { - return guiFilterString; - } - - public boolean getGuiSync() { - return guiSync; - } - - public void setGuiParameter(int sortMode, String filterString, boolean sync) { - this.guiSortMode = sortMode; - this.guiFilterString = filterString; - this.guiSync = sync; - if(worldObj != null && worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString, sync)); - } else { - markDirty(); - } - } - - public int getStoredCraftingRecipes() { - return storedCraftingRecipes.size(); - } - - public StoredCraftingRecipe getStoredCraftingRecipe(int index) { - if(index < 0 || index >= storedCraftingRecipes.size()) { - return null; - } - return storedCraftingRecipes.get(index); - } - - public void addStoredCraftingRecipe(StoredCraftingRecipe recipe) { - if(worldObj != null && worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketStoredCraftingRecipe(PacketStoredCraftingRecipe.ACTION_ADD, 0, recipe)); - } else { - storedCraftingRecipes.add(recipe); - markDirty(); - updateBlock(); - } - } - - public void removeStoredCraftingRecipe(int index) { - if(worldObj != null && worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketStoredCraftingRecipe(PacketStoredCraftingRecipe.ACTION_DELETE, index, null)); - } else if(index >= 0 && index < storedCraftingRecipes.size()) { - storedCraftingRecipes.remove(index); - markDirty(); - updateBlock(); - } - } - - public boolean isExtractionDisabled() { - return extractionDisabled; - } - - public void setExtractionDisabled(boolean extractionDisabled) { - if(worldObj != null) { - if(worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketSetExtractionDisabled(this, extractionDisabled)); - } else if(this.extractionDisabled != extractionDisabled) { - this.extractionDisabled = extractionDisabled; - PacketHandler.INSTANCE.sendToDimension(new PacketUpdateExtractionDisabled(this, extractionDisabled), worldObj.provider.dimensionId); - } - } - } - - /** - * This is called by PacketUpdateExtractionDisabled on the client side - * @param extractionDisabled if extraction is disabled - */ - void updateExtractionDisabled(boolean extractionDisabled) { - this.extractionDisabled = extractionDisabled; - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - fuelTank.writeCommon("fuelTank", nbtRoot); - nbtRoot.setInteger("guiSortMode", guiSortMode); - nbtRoot.setString("guiFilterString", guiFilterString); - nbtRoot.setBoolean("guiSync", guiSync); - nbtRoot.setBoolean("extractionDisabled", extractionDisabled); - - if(!storedCraftingRecipes.isEmpty()) { - NBTTagList recipesNBT = new NBTTagList(); - for(StoredCraftingRecipe recipe : storedCraftingRecipes) { - NBTTagCompound recipeNBT = new NBTTagCompound(); - recipe.writeToNBT(recipeNBT); - recipesNBT.appendTag(recipeNBT); - } - nbtRoot.setTag("craftingRecipes", recipesNBT); - } - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - fuelTank.readCommon("fuelTank", nbtRoot); - guiSortMode = nbtRoot.getInteger("guiSortMode"); - guiFilterString = nbtRoot.getString("guiFilterString"); - guiSync = nbtRoot.getBoolean("guiSync"); - extractionDisabled = nbtRoot.getBoolean("extractionDisabled"); - faceModes = null; - - storedCraftingRecipes.clear(); - NBTTagList recipesNBT = (NBTTagList) nbtRoot.getTag("craftingRecipes"); - if(recipesNBT != null) { - for (int idx = 0; idx < recipesNBT.tagCount() && storedCraftingRecipes.size() < MAX_STORED_CRAFTING_RECIPES; idx++) { - NBTTagCompound recipeNBT = recipesNBT.getCompoundTagAt(idx); - StoredCraftingRecipe recipe = new StoredCraftingRecipe(); - if(recipe.readFromNBT(recipeNBT)) { - storedCraftingRecipes.add(recipe); + public InventoryDatabaseClient getDatabaseClient(int generation) { + if (dbClient != null && dbClient.getGeneration() != generation) { + ClientDatabaseManager.INSTANCE.destroyDatabase(dbClient.getGeneration()); + dbClient = null; } - } + if (dbClient == null) { + dbClient = ClientDatabaseManager.INSTANCE.getOrCreateDatabase(generation); + } + return dbClient; } - if(eventHandler != null) { - eventHandler.checkCraftingRecipes(); + public InventoryDatabaseClient getDatabaseClient() { + return dbClient; } - } - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - active = nbtRoot.getBoolean("active"); - updateItemFilter(); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - nbtRoot.setBoolean("active", active); - } - - @Override - public String getMachineName() { - return ModObject.blockInventoryPanel.unlocalisedName; - } - - @Override - public IoMode getIoMode(ForgeDirection face) { - return face == getIODirection() ? IoMode.NONE : IoMode.DISABLED; - } - - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - } - - @Override - public IoMode toggleIoModeForFace(ForgeDirection faceHit) { - return getIoMode(faceHit); - } - - private ForgeDirection getIODirection() { - return getFacingDir().getOpposite(); - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(from != getIODirection()) { - return 0; + @Override + public boolean canInsertItem(int slot, ItemStack var2, int side) { + return false; } - int res = fuelTank.fill(resource, doFill); - if(res > 0 && doFill) { - tanksDirty = true; + + @Override + protected boolean canExtractItem(int slot, ItemStack itemstack) { + return !extractionDisabled && super.canExtractItem(slot, itemstack); } - return res; - } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return from == getIODirection() && fuelTank.canFill(fluid); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(from == getIODirection()) { - return new FluidTankInfo[] { fuelTank.getInfo() }; - } else { - return new FluidTankInfo[0]; + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack stack) { + if (slot == SLOT_VIEW_FILTER && stack != null) { + return FilterRegister.isItemFilter(stack) && FilterRegister.isFilterSet(stack); + } + return true; } - } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - if(forFluidType != null && fuelTank.canFill(forFluidType.getFluid())) { - return fuelTank; + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack res = super.decrStackSize(fromSlot, amount); + if (res != null && fromSlot < SLOT_CRAFTING_RESULT && eventHandler != null) { + eventHandler.onCraftMatrixChanged(this); + } + if (res != null && fromSlot == SLOT_VIEW_FILTER) { + updateItemFilter(); + } + return res; } - return null; - } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[0]; - } + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + super.setInventorySlotContents(slot, contents); + if (slot < SLOT_CRAFTING_RESULT && eventHandler != null) { + eventHandler.onCraftMatrixChanged(this); + } + if (slot == SLOT_VIEW_FILTER) { + updateItemFilter(); + } + } - @Override - public void setTanksDirty() { - tanksDirty = true; - } + private void updateItemFilter() { + itemFilter = FilterRegister.getFilterForUpgrade(inventory[SLOT_VIEW_FILTER]); + } - @Override - public SmartTank getNutrientTank() { - return fuelTank; - } + public IItemFilter getItemFilter() { + return itemFilter; + } + @Override + public boolean isActive() { + return Config.inventoryPanelFree || active; + } + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + updateEntityClient(); + return; + } + + if (shouldDoWorkThisTick(20)) { + scanNetwork(); + } + + if (forceClientUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); + } + + if (tanksDirty) { + tanksDirty = false; + PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); + } + } + + private void scanNetwork() { + ForgeDirection facingDir = getFacingDir(); + ForgeDirection backside = facingDir.getOpposite(); + + ItemConduitNetwork icn = null; + + TileEntity te = + worldObj.getTileEntity(xCoord + backside.offsetX, yCoord + backside.offsetY, zCoord + backside.offsetZ); + if (te instanceof TileConduitBundle) { + TileConduitBundle teCB = (TileConduitBundle) te; + ItemConduit conduit = teCB.getConduit(ItemConduit.class); + if (conduit != null) { + icn = (ItemConduitNetwork) conduit.getNetwork(); + } + } + + if (icn != null) { + dbServer = icn.getDatabase(); + dbServer.sendChangeLogs(); + refuelPower(dbServer); + + if (active != dbServer.isOperational()) { + active = dbServer.isOperational(); + forceClientUpdate = true; + } + } else { + if (active) { + forceClientUpdate = true; + } + dbServer = null; + active = false; + } + } + + public float getAvailablePower() { + return getPower() * Config.inventoryPanelPowerPerMB; + } + + public void refuelPower(InventoryDatabaseServer db) { + float missingPower = Config.inventoryPanelPowerPerMB * 0.5f - db.getPower(); + if (missingPower > 0) { + int amount = (int) Math.ceil(missingPower / Config.inventoryPanelPowerPerMB); + amount = Math.min(amount, getPower()); + if (amount > 0) { + useNutrient(amount); + dbServer.addPower(amount * Config.inventoryPanelPowerPerMB); + } + } + } + + public void useNutrient(int amount) { + fuelTank.drain(amount, true); + tanksDirty = true; + } + + private int getPower() { + return Config.inventoryPanelFree ? 100 : fuelTank.getFluidAmount(); + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + return false; + } + + public int getGuiSortMode() { + return guiSortMode; + } + + public String getGuiFilterString() { + return guiFilterString; + } + + public boolean getGuiSync() { + return guiSync; + } + + public void setGuiParameter(int sortMode, String filterString, boolean sync) { + this.guiSortMode = sortMode; + this.guiFilterString = filterString; + this.guiSync = sync; + if (worldObj != null && worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString, sync)); + } else { + markDirty(); + } + } + + public int getStoredCraftingRecipes() { + return storedCraftingRecipes.size(); + } + + public StoredCraftingRecipe getStoredCraftingRecipe(int index) { + if (index < 0 || index >= storedCraftingRecipes.size()) { + return null; + } + return storedCraftingRecipes.get(index); + } + + public void addStoredCraftingRecipe(StoredCraftingRecipe recipe) { + if (worldObj != null && worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer( + new PacketStoredCraftingRecipe(PacketStoredCraftingRecipe.ACTION_ADD, 0, recipe)); + } else { + storedCraftingRecipes.add(recipe); + markDirty(); + updateBlock(); + } + } + + public void removeStoredCraftingRecipe(int index) { + if (worldObj != null && worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer( + new PacketStoredCraftingRecipe(PacketStoredCraftingRecipe.ACTION_DELETE, index, null)); + } else if (index >= 0 && index < storedCraftingRecipes.size()) { + storedCraftingRecipes.remove(index); + markDirty(); + updateBlock(); + } + } + + public boolean isExtractionDisabled() { + return extractionDisabled; + } + + public void setExtractionDisabled(boolean extractionDisabled) { + if (worldObj != null) { + if (worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketSetExtractionDisabled(this, extractionDisabled)); + } else if (this.extractionDisabled != extractionDisabled) { + this.extractionDisabled = extractionDisabled; + PacketHandler.INSTANCE.sendToDimension( + new PacketUpdateExtractionDisabled(this, extractionDisabled), worldObj.provider.dimensionId); + } + } + } + + /** + * This is called by PacketUpdateExtractionDisabled on the client side + * @param extractionDisabled if extraction is disabled + */ + void updateExtractionDisabled(boolean extractionDisabled) { + this.extractionDisabled = extractionDisabled; + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + fuelTank.writeCommon("fuelTank", nbtRoot); + nbtRoot.setInteger("guiSortMode", guiSortMode); + nbtRoot.setString("guiFilterString", guiFilterString); + nbtRoot.setBoolean("guiSync", guiSync); + nbtRoot.setBoolean("extractionDisabled", extractionDisabled); + + if (!storedCraftingRecipes.isEmpty()) { + NBTTagList recipesNBT = new NBTTagList(); + for (StoredCraftingRecipe recipe : storedCraftingRecipes) { + NBTTagCompound recipeNBT = new NBTTagCompound(); + recipe.writeToNBT(recipeNBT); + recipesNBT.appendTag(recipeNBT); + } + nbtRoot.setTag("craftingRecipes", recipesNBT); + } + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + fuelTank.readCommon("fuelTank", nbtRoot); + guiSortMode = nbtRoot.getInteger("guiSortMode"); + guiFilterString = nbtRoot.getString("guiFilterString"); + guiSync = nbtRoot.getBoolean("guiSync"); + extractionDisabled = nbtRoot.getBoolean("extractionDisabled"); + faceModes = null; + + storedCraftingRecipes.clear(); + NBTTagList recipesNBT = (NBTTagList) nbtRoot.getTag("craftingRecipes"); + if (recipesNBT != null) { + for (int idx = 0; + idx < recipesNBT.tagCount() && storedCraftingRecipes.size() < MAX_STORED_CRAFTING_RECIPES; + idx++) { + NBTTagCompound recipeNBT = recipesNBT.getCompoundTagAt(idx); + StoredCraftingRecipe recipe = new StoredCraftingRecipe(); + if (recipe.readFromNBT(recipeNBT)) { + storedCraftingRecipes.add(recipe); + } + } + } + + if (eventHandler != null) { + eventHandler.checkCraftingRecipes(); + } + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + active = nbtRoot.getBoolean("active"); + updateItemFilter(); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + nbtRoot.setBoolean("active", active); + } + + @Override + public String getMachineName() { + return ModObject.blockInventoryPanel.unlocalisedName; + } + + @Override + public IoMode getIoMode(ForgeDirection face) { + return face == getIODirection() ? IoMode.NONE : IoMode.DISABLED; + } + + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) {} + + @Override + public IoMode toggleIoModeForFace(ForgeDirection faceHit) { + return getIoMode(faceHit); + } + + private ForgeDirection getIODirection() { + return getFacingDir().getOpposite(); + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (from != getIODirection()) { + return 0; + } + int res = fuelTank.fill(resource, doFill); + if (res > 0 && doFill) { + tanksDirty = true; + } + return res; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return from == getIODirection() && fuelTank.canFill(fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (from == getIODirection()) { + return new FluidTankInfo[] {fuelTank.getInfo()}; + } else { + return new FluidTankInfo[0]; + } + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + if (forFluidType != null && fuelTank.canFill(forFluidType.getFluid())) { + return fuelTank; + } + return null; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[0]; + } + + @Override + public void setTanksDirty() { + tanksDirty = true; + } + + @Override + public SmartTank getNutrientTank() { + return fuelTank; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java index 2fa6ae95..0fc0ecf4 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ClientDatabaseManager.java @@ -1,39 +1,38 @@ package crazypants.enderio.machine.invpanel.client; -import java.util.HashMap; - import cpw.mods.fml.common.FMLCommonHandler; - -import crazypants.enderio.Log; -import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; +import crazypants.enderio.Log; +import java.util.HashMap; public class ClientDatabaseManager { - public static final ClientDatabaseManager INSTANCE = new ClientDatabaseManager(); + public static final ClientDatabaseManager INSTANCE = new ClientDatabaseManager(); - public ClientDatabaseManager() { - FMLCommonHandler.instance().bus().register(this); - } - - private final HashMap dbRegistry = new HashMap(); - - public InventoryDatabaseClient getOrCreateDatabase(int generation) { - InventoryDatabaseClient db = dbRegistry.get(generation); - if(db == null) { - db = new InventoryDatabaseClient(generation); - dbRegistry.put(generation, db); + public ClientDatabaseManager() { + FMLCommonHandler.instance().bus().register(this); } - return db; - } - public void destroyDatabase(int generation) { - dbRegistry.remove(generation); - } + private final HashMap dbRegistry = + new HashMap(); - @SubscribeEvent - public void on(ClientDisconnectionFromServerEvent event) { - Log.info("Clearing Inventory Panel Client Database"); - dbRegistry.clear(); - } + public InventoryDatabaseClient getOrCreateDatabase(int generation) { + InventoryDatabaseClient db = dbRegistry.get(generation); + if (db == null) { + db = new InventoryDatabaseClient(generation); + dbRegistry.put(generation, db); + } + return db; + } + + public void destroyDatabase(int generation) { + dbRegistry.remove(generation); + } + + @SubscribeEvent + public void on(ClientDisconnectionFromServerEvent event) { + Log.info("Clearing Inventory Panel Client Database"); + dbRegistry.clear(); + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CountComparator.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CountComparator.java index ad237e9e..3b401c0a 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/CountComparator.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CountComparator.java @@ -4,17 +4,16 @@ import java.text.Collator; class CountComparator extends NameComparator { - public CountComparator(Collator collator) { - super(collator); - } - - @Override - public int compare(ItemEntry a, ItemEntry b) { - int res = b.count - a.count; - if(res == 0) { - res = super.compare(a, b); + public CountComparator(Collator collator) { + super(collator); } - return res; - } + @Override + public int compare(ItemEntry a, ItemEntry b) { + int res = b.count - a.count; + if (res == 0) { + res = super.compare(a, b); + } + return res; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java index 58df6e7a..31c468bb 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java @@ -1,239 +1,239 @@ package crazypants.enderio.machine.invpanel.client; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import com.enderio.core.common.util.ItemUtil; - import crazypants.enderio.machine.invpanel.GuiInventoryPanel; import crazypants.enderio.machine.invpanel.InventoryPanelContainer; import crazypants.enderio.machine.invpanel.PacketFetchItem; import crazypants.enderio.machine.invpanel.StoredCraftingRecipe; import crazypants.enderio.network.PacketHandler; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class CraftingHelper { - final ItemStack[][] ingredients; + final ItemStack[][] ingredients; - protected CraftingHelper(ItemStack[][] ingredients) { - this.ingredients = ingredients; - } - - public static CraftingHelper createFromRecipe(StoredCraftingRecipe recipe) { - ItemStack[][] ingredients = new ItemStack[9][]; - for (int idx = 0; idx < 9; idx++) { - ItemStack stack = recipe.get(idx); - if(stack != null) { - ingredients[idx] = new ItemStack[] { stack }; - } + protected CraftingHelper(ItemStack[][] ingredients) { + this.ingredients = ingredients; } - return new CraftingHelperNEI(ingredients); - } - public static CraftingHelper createFromSlots(List slots) { - if (slots.size() != 9) { - return null; - } - ItemStack[][] ingredients = new ItemStack[9][]; - int count = 0; - for (int idx = 0; idx < 9; idx++) { - Slot slot = slots.get(idx); - ItemStack stack = slot.getStack(); - if(stack != null) { - stack = stack.copy(); - stack.stackSize = 1; - ingredients[idx] = new ItemStack[] { stack }; - count++; - } - } - if (count > 0) { - return new CraftingHelperNEI(ingredients); - } - return null; - } - - public void install() { - } - - public void remove() { - } - - public void refill(GuiInventoryPanel gui, int amount) { - InventoryPanelContainer container = gui.getContainer(); - InventoryDatabaseClient db = gui.getDatabase(); - List craftingGrid = container.getCraftingGridSlots(); - int slotsToProcess = (1 << 9) - 1; - boolean madeProgress; - int maxAmount = 64; - do { - Candidate[] candidates = new Candidate[9]; - for (int idx = 0; idx < 9; idx++) { - if ((slotsToProcess & (1 << idx)) != 0) { - ItemStack[] pstack = ingredients[idx]; - Slot slot = craftingGrid.get(idx); - ItemStack stack = slot.getStack(); - if (pstack == null) { + public static CraftingHelper createFromRecipe(StoredCraftingRecipe recipe) { + ItemStack[][] ingredients = new ItemStack[9][]; + for (int idx = 0; idx < 9; idx++) { + ItemStack stack = recipe.get(idx); if (stack != null) { - return; + ingredients[idx] = new ItemStack[] {stack}; } - } else { - Candidate candidate; + } + return new CraftingHelperNEI(ingredients); + } + + public static CraftingHelper createFromSlots(List slots) { + if (slots.size() != 9) { + return null; + } + ItemStack[][] ingredients = new ItemStack[9][]; + int count = 0; + for (int idx = 0; idx < 9; idx++) { + Slot slot = slots.get(idx); + ItemStack stack = slot.getStack(); if (stack != null) { - if (!isStackCompatible(pstack, stack)) { - return; - } - candidate = findCandidates(stack, gui, db, candidates); - } else { - candidate = findAllCandidates(pstack, gui, db, candidates); + stack = stack.copy(); + stack.stackSize = 1; + ingredients[idx] = new ItemStack[] {stack}; + count++; } - if (candidate == null) { - return; - } - candidate.used++; - candidates[idx] = candidate; - } } - } - int targetAmount = maxAmount; - int currentAmount = 0; - for (int idx = 0; idx < 9; idx++) { - Candidate candidate = candidates[idx]; - if (candidate != null) { - Slot slot = craftingGrid.get(idx); - int current = getSlotStackSize(slot); - int maxStackSize = candidate.stack.getMaxStackSize(); - currentAmount = Math.max(currentAmount, current); - if (candidate.stack.isStackable() && maxStackSize > 1) { - targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); - } + if (count > 0) { + return new CraftingHelperNEI(ingredients); } - } - targetAmount = Math.min(targetAmount, currentAmount + amount); - madeProgress = false; - for (int idx = 0; idx < 9; idx++) { - final int mask = 1 << idx; - Candidate candidate = candidates[idx]; - if (candidate != null) { - Slot slot = craftingGrid.get(idx); - for (Slot srcSlot : candidate.sourceSlots) { - int current = getSlotStackSize(slot); - if (current >= targetAmount) { - break; - } - if (container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber + 1, targetAmount - current)) { - slotsToProcess &= ~mask; - madeProgress = true; - } - } - int current = getSlotStackSize(slot); - if (candidate.entry != null) { - if (current < targetAmount) { - int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); - slotsToProcess &= ~mask; - current += toMove; - } - } - if (current > 0) { - maxAmount = Math.min(maxAmount, current); - } - } - } - } while (madeProgress && slotsToProcess != 0); - } - - private static int getSlotStackSize(Slot slot) { - ItemStack stack = slot.getStack(); - return (stack != null) ? stack.stackSize : 0; - } - - private static boolean isStackCompatible(ItemStack[] pstack, ItemStack stack) { - for (ItemStack istack : pstack) { - if (ItemUtil.areStackMergable(stack, istack)) { - return true; - } + return null; } - return false; - } - private Candidate findAllCandidates(ItemStack[] pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - Candidate bestInventory = null; - Candidate bestNetwork = null; - for (ItemStack istack : pstack) { - Candidate candidate = findCandidates(istack, gui, db, candidates); - if (candidate.available > 0) { - if (bestInventory == null || bestInventory.available < candidate.available) { - bestInventory = candidate; - } - } - if (candidate.entry != null) { - if (bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { - bestNetwork = candidate; - } - } - } - if (bestInventory != null) { - return bestInventory; - } else { - return bestNetwork; - } - } + public void install() {} - private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - for (Candidate candidate : candidates) { - if (candidate != null && ItemUtil.areStackMergable(candidate.stack, stack)) { + public void remove() {} + + public void refill(GuiInventoryPanel gui, int amount) { + InventoryPanelContainer container = gui.getContainer(); + InventoryDatabaseClient db = gui.getDatabase(); + List craftingGrid = container.getCraftingGridSlots(); + int slotsToProcess = (1 << 9) - 1; + boolean madeProgress; + int maxAmount = 64; + do { + Candidate[] candidates = new Candidate[9]; + for (int idx = 0; idx < 9; idx++) { + if ((slotsToProcess & (1 << idx)) != 0) { + ItemStack[] pstack = ingredients[idx]; + Slot slot = craftingGrid.get(idx); + ItemStack stack = slot.getStack(); + if (pstack == null) { + if (stack != null) { + return; + } + } else { + Candidate candidate; + if (stack != null) { + if (!isStackCompatible(pstack, stack)) { + return; + } + candidate = findCandidates(stack, gui, db, candidates); + } else { + candidate = findAllCandidates(pstack, gui, db, candidates); + } + if (candidate == null) { + return; + } + candidate.used++; + candidates[idx] = candidate; + } + } + } + int targetAmount = maxAmount; + int currentAmount = 0; + for (int idx = 0; idx < 9; idx++) { + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + int current = getSlotStackSize(slot); + int maxStackSize = candidate.stack.getMaxStackSize(); + currentAmount = Math.max(currentAmount, current); + if (candidate.stack.isStackable() && maxStackSize > 1) { + targetAmount = + Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); + } + } + } + targetAmount = Math.min(targetAmount, currentAmount + amount); + madeProgress = false; + for (int idx = 0; idx < 9; idx++) { + final int mask = 1 << idx; + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + for (Slot srcSlot : candidate.sourceSlots) { + int current = getSlotStackSize(slot); + if (current >= targetAmount) { + break; + } + if (container.moveItems( + srcSlot.slotNumber, slot.slotNumber, slot.slotNumber + 1, targetAmount - current)) { + slotsToProcess &= ~mask; + madeProgress = true; + } + } + int current = getSlotStackSize(slot); + if (candidate.entry != null) { + if (current < targetAmount) { + int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); + PacketHandler.INSTANCE.sendToServer( + new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); + slotsToProcess &= ~mask; + current += toMove; + } + } + if (current > 0) { + maxAmount = Math.min(maxAmount, current); + } + } + } + } while (madeProgress && slotsToProcess != 0); + } + + private static int getSlotStackSize(Slot slot) { + ItemStack stack = slot.getStack(); + return (stack != null) ? stack.stackSize : 0; + } + + private static boolean isStackCompatible(ItemStack[] pstack, ItemStack stack) { + for (ItemStack istack : pstack) { + if (ItemUtil.areStackMergable(stack, istack)) { + return true; + } + } + return false; + } + + private Candidate findAllCandidates( + ItemStack[] pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + Candidate bestInventory = null; + Candidate bestNetwork = null; + for (ItemStack istack : pstack) { + Candidate candidate = findCandidates(istack, gui, db, candidates); + if (candidate.available > 0) { + if (bestInventory == null || bestInventory.available < candidate.available) { + bestInventory = candidate; + } + } + if (candidate.entry != null) { + if (bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { + bestNetwork = candidate; + } + } + } + if (bestInventory != null) { + return bestInventory; + } else { + return bestNetwork; + } + } + + private Candidate findCandidates( + ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + for (Candidate candidate : candidates) { + if (candidate != null && ItemUtil.areStackMergable(candidate.stack, stack)) { + return candidate; + } + } + Candidate candidate = new Candidate(stack); + InventoryPanelContainer container = gui.getContainer(); + if (container.getInventoryPanel().isExtractionDisabled()) { + findCandidates(candidate, stack, container.getReturnAreaSlots()); + } + findCandidates(candidate, stack, container.getPlayerInventorySlots()); + findCandidates(candidate, stack, container.getPlayerHotbarSlots()); + if (candidate.available == 0 && db != null) { + candidate.entry = db.lookupItem(stack, null, false); + if (candidate.entry != null && candidate.entry.getCount() <= 0) { + candidate.entry = null; + } + } return candidate; - } - } - Candidate candidate = new Candidate(stack); - InventoryPanelContainer container = gui.getContainer(); - if(container.getInventoryPanel().isExtractionDisabled()) { - findCandidates(candidate, stack, container.getReturnAreaSlots()); - } - findCandidates(candidate, stack, container.getPlayerInventorySlots()); - findCandidates(candidate, stack, container.getPlayerHotbarSlots()); - if (candidate.available == 0 && db != null) { - candidate.entry = db.lookupItem(stack, null, false); - if (candidate.entry != null && candidate.entry.getCount() <= 0) { - candidate.entry = null; - } - } - return candidate; - } - - private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { - for (Slot slot : slots) { - ItemStack slotStack = slot.getStack(); - if (slotStack != null && ItemUtil.areStackMergable(slotStack, stack)) { - candidates.sourceSlots.add(slot); - candidates.available += slotStack.stackSize; - } - } - } - - static class Candidate { - final ItemStack stack; - final ArrayList sourceSlots = new ArrayList(); - ItemEntry entry; - int available; - int used; - - public Candidate(ItemStack stack) { - this.stack = stack; } - public int getAvailable() { - int avail = available; - if(entry != null) { - avail += entry.getCount(); - } - if(avail > 0 && used > 1) { - avail = Math.max(1, avail / used); - } - return avail; + private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { + for (Slot slot : slots) { + ItemStack slotStack = slot.getStack(); + if (slotStack != null && ItemUtil.areStackMergable(slotStack, stack)) { + candidates.sourceSlots.add(slot); + candidates.available += slotStack.stackSize; + } + } + } + + static class Candidate { + final ItemStack stack; + final ArrayList sourceSlots = new ArrayList(); + ItemEntry entry; + int available; + int used; + + public Candidate(ItemStack stack) { + this.stack = stack; + } + + public int getAvailable() { + int avail = available; + if (entry != null) { + avail += entry.getCount(); + } + if (avail > 0 && used > 1) { + avail = Math.max(1, avail / used); + } + return avail; + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java index cc18c4e3..9b8b6e68 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelperNEI.java @@ -1,49 +1,50 @@ package crazypants.enderio.machine.invpanel.client; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.Optional; import codechicken.nei.LayoutManager; import codechicken.nei.PositionedStack; import codechicken.nei.api.DefaultOverlayRenderer; import codechicken.nei.api.IRecipeOverlayRenderer; -import crazypants.enderio.machine.invpanel.InventoryPanelContainer; +import cpw.mods.fml.common.Optional; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; public class CraftingHelperNEI extends CraftingHelper { - public Object overlayRenderer; + public Object overlayRenderer; - public CraftingHelperNEI(ItemStack[][] ingredients) { - super(ingredients); - } - - @Override - @Optional.Method(modid = "NotEnoughItems") - public void install() { - super.install(); - if(overlayRenderer != null) { - LayoutManager.overlayRenderer = (IRecipeOverlayRenderer) overlayRenderer; - } else { - List list = new ArrayList(); - for(int y = 0; y < 3; y++) { - for(int x = 0; x < 3; x++) { - ItemStack[] ingredient = ingredients[y*3+x]; - if(ingredient != null) { - list.add(new PositionedStack(ingredient, - InventoryPanelNEIOverlayHandler.NEI_OFFSET_X + x*18, - InventoryPanelNEIOverlayHandler.NEI_OFFSET_Y + y*18)); - } - } - } - LayoutManager.overlayRenderer = new DefaultOverlayRenderer(list, InventoryPanelNEIOverlayHandler.positioner); + public CraftingHelperNEI(ItemStack[][] ingredients) { + super(ingredients); } - } - @Override - @Optional.Method(modid = "NotEnoughItems") - public void remove() { - super.remove(); - LayoutManager.overlayRenderer = null; - } + @Override + @Optional.Method(modid = "NotEnoughItems") + public void install() { + super.install(); + if (overlayRenderer != null) { + LayoutManager.overlayRenderer = (IRecipeOverlayRenderer) overlayRenderer; + } else { + List list = new ArrayList(); + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 3; x++) { + ItemStack[] ingredient = ingredients[y * 3 + x]; + if (ingredient != null) { + list.add(new PositionedStack( + ingredient, + InventoryPanelNEIOverlayHandler.NEI_OFFSET_X + x * 18, + InventoryPanelNEIOverlayHandler.NEI_OFFSET_Y + y * 18)); + } + } + } + LayoutManager.overlayRenderer = + new DefaultOverlayRenderer(list, InventoryPanelNEIOverlayHandler.positioner); + } + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public void remove() { + super.remove(); + LayoutManager.overlayRenderer = null; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java index 00f5a58c..1cd00920 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/DatabaseView.java @@ -11,160 +11,168 @@ import net.minecraft.client.Minecraft; public class DatabaseView { - public static final Locale LOCALE; + public static final Locale LOCALE; - static { - String languageCode = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); - int idx = languageCode.indexOf('_'); - if(idx > 0) { - String lang = languageCode.substring(0, idx); - String country = languageCode.substring(idx+1); - LOCALE = new Locale(lang, country); - } else { - LOCALE = new Locale(languageCode); - } - } - - private final ArrayList filteredItems; - - private InventoryDatabaseClient database; - private int dbItemsChangeCount; - private int dbCountChangeCount; - - private SortOrder order = SortOrder.NAME; - private boolean invertSortOrder; - private boolean needsSorting; - private IItemFilter itemFilter; - private String currentFilter; - private boolean needsFiltering; - private boolean needsNewFiltering; - - private final Collator collator; - - public DatabaseView() { - filteredItems = new ArrayList(); - currentFilter = ""; - collator = Collator.getInstance(LOCALE); - } - - public void setDatabase(InventoryDatabaseClient database) { - if(this.database != database) { - this.database = database; - if(database != null) { - this.dbItemsChangeCount = database.getItemsChangeCount(); - this.dbCountChangeCount = database.getCountChangeCount(); - } - this.needsSorting = true; - this.needsFiltering = true; - this.needsNewFiltering = true; - } - } - - public void setSortOrder(SortOrder order, boolean invert) { - if(this.order != order || this.invertSortOrder != invert) { - this.order = order; - this.invertSortOrder = invert; - this.needsSorting = true; - } - } - - public void setItemFilter(IItemFilter itemFilter) { - if(this.itemFilter != itemFilter) { - this.itemFilter = itemFilter; - needsNewFiltering = true; - needsFiltering = true; - } - } - - public void updateFilter(String newFilter) { - newFilter = newFilter.trim(); - - if(!currentFilter.equals(newFilter)) { - if(newFilter.length() < currentFilter.length() || - !newFilter.regionMatches(0, currentFilter, 0, currentFilter.length())) { - needsNewFiltering = true; - } - needsFiltering = true; - currentFilter = newFilter; - } - } - - public SortOrder getSortOrder() { - return order; - } - - public boolean isSortOrderInverted() { - return invertSortOrder; - } - - public boolean sortItems() { - boolean changed = false; - - if(database != null) { - if(dbItemsChangeCount != database.getItemsChangeCount()) { - dbItemsChangeCount = database.getItemsChangeCount(); - needsSorting = true; - needsFiltering = true; - needsNewFiltering = true; - } - - if(dbCountChangeCount != database.getCountChangeCount()) { - dbCountChangeCount = database.getCountChangeCount(); - if(order == SortOrder.COUNT) { - needsSorting = true; + static { + String languageCode = Minecraft.getMinecraft() + .getLanguageManager() + .getCurrentLanguage() + .getLanguageCode(); + int idx = languageCode.indexOf('_'); + if (idx > 0) { + String lang = languageCode.substring(0, idx); + String country = languageCode.substring(idx + 1); + LOCALE = new Locale(lang, country); + } else { + LOCALE = new Locale(languageCode); } - } } - if(needsFiltering) { - if(needsNewFiltering) { - filteredItems.clear(); - if(database != null) { - database.getItems(filteredItems); - } - needsSorting = true; - } + private final ArrayList filteredItems; - ItemFilter filter = ItemFilter.parse(currentFilter, LOCALE, itemFilter); - if(filter != null) { - Iterator iter = filteredItems.iterator(); - while(iter.hasNext()) { - ItemEntry entry = iter.next(); - if(!filter.matches(entry)) { - iter.remove(); + private InventoryDatabaseClient database; + private int dbItemsChangeCount; + private int dbCountChangeCount; + + private SortOrder order = SortOrder.NAME; + private boolean invertSortOrder; + private boolean needsSorting; + private IItemFilter itemFilter; + private String currentFilter; + private boolean needsFiltering; + private boolean needsNewFiltering; + + private final Collator collator; + + public DatabaseView() { + filteredItems = new ArrayList(); + currentFilter = ""; + collator = Collator.getInstance(LOCALE); + } + + public void setDatabase(InventoryDatabaseClient database) { + if (this.database != database) { + this.database = database; + if (database != null) { + this.dbItemsChangeCount = database.getItemsChangeCount(); + this.dbCountChangeCount = database.getCountChangeCount(); + } + this.needsSorting = true; + this.needsFiltering = true; + this.needsNewFiltering = true; + } + } + + public void setSortOrder(SortOrder order, boolean invert) { + if (this.order != order || this.invertSortOrder != invert) { + this.order = order; + this.invertSortOrder = invert; + this.needsSorting = true; + } + } + + public void setItemFilter(IItemFilter itemFilter) { + if (this.itemFilter != itemFilter) { + this.itemFilter = itemFilter; + needsNewFiltering = true; + needsFiltering = true; + } + } + + public void updateFilter(String newFilter) { + newFilter = newFilter.trim(); + + if (!currentFilter.equals(newFilter)) { + if (newFilter.length() < currentFilter.length() + || !newFilter.regionMatches(0, currentFilter, 0, currentFilter.length())) { + needsNewFiltering = true; + } + needsFiltering = true; + currentFilter = newFilter; + } + } + + public SortOrder getSortOrder() { + return order; + } + + public boolean isSortOrderInverted() { + return invertSortOrder; + } + + public boolean sortItems() { + boolean changed = false; + + if (database != null) { + if (dbItemsChangeCount != database.getItemsChangeCount()) { + dbItemsChangeCount = database.getItemsChangeCount(); + needsSorting = true; + needsFiltering = true; + needsNewFiltering = true; + } + + if (dbCountChangeCount != database.getCountChangeCount()) { + dbCountChangeCount = database.getCountChangeCount(); + if (order == SortOrder.COUNT) { + needsSorting = true; + } + } + } + + if (needsFiltering) { + if (needsNewFiltering) { + filteredItems.clear(); + if (database != null) { + database.getItems(filteredItems); + } + needsSorting = true; + } + + ItemFilter filter = ItemFilter.parse(currentFilter, LOCALE, itemFilter); + if (filter != null) { + Iterator iter = filteredItems.iterator(); + while (iter.hasNext()) { + ItemEntry entry = iter.next(); + if (!filter.matches(entry)) { + iter.remove(); + changed = true; + } + } + } + + needsFiltering = false; + needsNewFiltering = false; + } + + if (needsSorting) { + Comparator cmp; + switch (order) { + case NAME: + cmp = new NameComparator(collator); + break; + case MOD: + cmp = new ModComparator(collator); + break; + default: + cmp = new CountComparator(collator); + break; + } + if (invertSortOrder) { + cmp = Collections.reverseOrder(cmp); + } + Collections.sort(filteredItems, cmp); changed = true; - } + needsSorting = false; } - } - needsFiltering = false; - needsNewFiltering = false; + return changed; } - if(needsSorting) { - Comparator cmp; - switch (order) { - case NAME: cmp = new NameComparator(collator); break; - case MOD: cmp = new ModComparator(collator); break; - default: cmp = new CountComparator(collator); break; - } - if(invertSortOrder) { - cmp = Collections.reverseOrder(cmp); - } - Collections.sort(filteredItems, cmp); - changed = true; - needsSorting = false; + public int getNumEntries() { + return filteredItems.size(); } - return changed; - } - - public int getNumEntries() { - return filteredItems.size(); - } - - public ItemEntry getItemEntry(int index) { - return filteredItems.get(index); - } - + public ItemEntry getItemEntry(int index) { + return filteredItems.get(index); + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java index 30fe0b72..f7ca22af 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryDatabaseClient.java @@ -1,163 +1,159 @@ package crazypants.enderio.machine.invpanel.client; +import com.enderio.core.common.network.CompressedDataInput; import crazypants.enderio.machine.invpanel.InventoryDatabase; - import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; - -import com.enderio.core.common.network.CompressedDataInput; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; public class InventoryDatabaseClient extends InventoryDatabase { - private final ArrayList clientItems; - private final HashSet requestedItems; + private final ArrayList clientItems; + private final HashSet requestedItems; - private int itemsChangeCount; - private int countChangeCount; + private int itemsChangeCount; + private int countChangeCount; - InventoryDatabaseClient(int generation) { - this.generation = generation; - clientItems = new ArrayList(); - requestedItems = new HashSet(); - } - - public int getItemsChangeCount() { - return itemsChangeCount; - } - - public int getCountChangeCount() { - return countChangeCount; - } - - public void getItems(List outList) { - outList.addAll(clientItems); - } - - public void readCompressedItems(byte[] compressed) throws IOException { - CompressedDataInput cdi = new CompressedDataInput(compressed); - try { - int numEntries = cdi.readVariable(); - for(int i=0 ; i> 1; - if((code & 1) == 1) { - nbt = CompressedStreamTools.read(cdi); - } - - // item order can vary, ensure that the slot exists - complexItems.ensureCapacity(dbIndex + 1); - while(complexItems.size() <= dbIndex) { - complexItems.add(null); - } - - ItemEntry entry = complexItems.get(dbIndex); - if(entry == null) { - entry = createItemEntry(dbIndex + COMPLEX_DBINDEX_START, itemID, meta, nbt); - complexItems.set(dbIndex, entry); - complexRegistry.put(entry, entry); - } - - int count = cdi.readVariable(); - setItemCount(entry, count); - } - itemsChangeCount++; - countChangeCount++; - } finally { - cdi.close(); + InventoryDatabaseClient(int generation) { + this.generation = generation; + clientItems = new ArrayList(); + requestedItems = new HashSet(); } - } - public List readCompressedItemList(byte[] compressed) throws IOException { - CompressedDataInput cdi = new CompressedDataInput(compressed); - try { - List missingItems = null; - int changed = cdi.readVariable(); - if(changed > 0) { - for(int i = 0; i < changed; i++) { - int dbID = cdi.readVariable(); - int count = cdi.readVariable(); - ItemEntry entry = getItem(dbID); - if(entry != null) { - setItemCount(entry, count); - } else { - missingItems = addMissingItems(missingItems, dbID); - } + public int getItemsChangeCount() { + return itemsChangeCount; + } + + public int getCountChangeCount() { + return countChangeCount; + } + + public void getItems(List outList) { + outList.addAll(clientItems); + } + + public void readCompressedItems(byte[] compressed) throws IOException { + CompressedDataInput cdi = new CompressedDataInput(compressed); + try { + int numEntries = cdi.readVariable(); + for (int i = 0; i < numEntries; i++) { + int code = cdi.readVariable(); + int itemID = cdi.readVariable(); + int meta = cdi.readVariable(); + NBTTagCompound nbt = null; + + int dbIndex = code >> 1; + if ((code & 1) == 1) { + nbt = CompressedStreamTools.read(cdi); + } + + // item order can vary, ensure that the slot exists + complexItems.ensureCapacity(dbIndex + 1); + while (complexItems.size() <= dbIndex) { + complexItems.add(null); + } + + ItemEntry entry = complexItems.get(dbIndex); + if (entry == null) { + entry = createItemEntry(dbIndex + COMPLEX_DBINDEX_START, itemID, meta, nbt); + complexItems.set(dbIndex, entry); + complexRegistry.put(entry, entry); + } + + int count = cdi.readVariable(); + setItemCount(entry, count); + } + itemsChangeCount++; + countChangeCount++; + } finally { + cdi.close(); } + } - countChangeCount++; - } else { - for(ItemEntry entry : clientItems) { - entry.count = 0; + public List readCompressedItemList(byte[] compressed) throws IOException { + CompressedDataInput cdi = new CompressedDataInput(compressed); + try { + List missingItems = null; + int changed = cdi.readVariable(); + if (changed > 0) { + for (int i = 0; i < changed; i++) { + int dbID = cdi.readVariable(); + int count = cdi.readVariable(); + ItemEntry entry = getItem(dbID); + if (entry != null) { + setItemCount(entry, count); + } else { + missingItems = addMissingItems(missingItems, dbID); + } + } + + countChangeCount++; + } else { + for (ItemEntry entry : clientItems) { + entry.count = 0; + } + clientItems.clear(); + requestedItems.clear(); + + int count = cdi.readVariable(); + while (count > 0) { + int dbID = cdi.readUnsignedShort(); + ItemEntry entry = getSimpleItem(dbID); + entry.count = count; + clientItems.add(entry); + count = cdi.readVariable(); + } + + count = cdi.readVariable(); + int dbID = COMPLEX_DBINDEX_START; + while (count > 0) { + dbID += cdi.readVariable(); + ItemEntry entry = getItem(dbID); + if (entry != null) { + entry.count = count; + clientItems.add(entry); + } else { + missingItems = addMissingItems(missingItems, dbID); + } + count = cdi.readVariable(); + } + itemsChangeCount++; + countChangeCount++; + } + + return missingItems; + } finally { + cdi.close(); } - clientItems.clear(); - requestedItems.clear(); + } - int count = cdi.readVariable(); - while(count > 0) { - int dbID = cdi.readUnsignedShort(); - ItemEntry entry = getSimpleItem(dbID); - entry.count = count; - clientItems.add(entry); - count = cdi.readVariable(); - } - - count = cdi.readVariable(); - int dbID = COMPLEX_DBINDEX_START; - while(count > 0) { - dbID += cdi.readVariable(); - ItemEntry entry = getItem(dbID); - if(entry != null) { - entry.count = count; + private void setItemCount(ItemEntry entry, int count) { + if (entry.count == 0 && count > 0) { clientItems.add(entry); - } else { - missingItems = addMissingItems(missingItems, dbID); - } - count = cdi.readVariable(); + itemsChangeCount++; + } else if (entry.count > 0 && count == 0) { + clientItems.remove(entry); + itemsChangeCount++; } - itemsChangeCount++; - countChangeCount++; - } - - return missingItems; - } finally { - cdi.close(); + entry.count = count; } - } - private void setItemCount(ItemEntry entry, int count) { - if(entry.count == 0 && count > 0) { - clientItems.add(entry); - itemsChangeCount++; - } else if(entry.count > 0 && count == 0) { - clientItems.remove(entry); - itemsChangeCount++; + private List addMissingItems(List list, Integer dbId) { + if (!requestedItems.contains(dbId)) { + if (list == null) { + list = new ArrayList(); + } + list.add(dbId); + requestedItems.add(dbId); + } + return list; } - entry.count = count; - } - private List addMissingItems(List list, Integer dbId) { - if(!requestedItems.contains(dbId)) { - if(list == null) { - list = new ArrayList(); - } - list.add(dbId); - requestedItems.add(dbId); + @Override + protected ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt) { + return new ItemEntry(dbId, hash, itemID, meta, nbt); } - return list; - } - - @Override - protected ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt) { - return new ItemEntry(dbId, hash, itemID, meta, nbt); - } - } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java index f83d4cdd..b61e48c1 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java @@ -15,53 +15,55 @@ import net.minecraft.item.ItemStack; public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { - public static final int NEI_OFFSET_X = 25; - public static final int NEI_OFFSET_Y = 6; + public static final int NEI_OFFSET_X = 25; + public static final int NEI_OFFSET_Y = 6; - private static final int CRAFTING_GRID_OFFSET_X = InventoryPanelContainer.CRAFTING_GRID_X - NEI_OFFSET_X; - private static final int CRAFTING_GRID_OFFSET_Y = InventoryPanelContainer.CRAFTING_GRID_Y - NEI_OFFSET_Y; + private static final int CRAFTING_GRID_OFFSET_X = InventoryPanelContainer.CRAFTING_GRID_X - NEI_OFFSET_X; + private static final int CRAFTING_GRID_OFFSET_Y = InventoryPanelContainer.CRAFTING_GRID_Y - NEI_OFFSET_Y; - public static final IStackPositioner positioner = new OffsetPositioner(CRAFTING_GRID_OFFSET_X, CRAFTING_GRID_OFFSET_Y); + public static final IStackPositioner positioner = + new OffsetPositioner(CRAFTING_GRID_OFFSET_X, CRAFTING_GRID_OFFSET_Y); - @Override - public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift) { - GuiInventoryPanel guiInvPanel = (GuiInventoryPanel) gui; - List ingredients = recipe.getIngredientStacks(recipeIndex); + @Override + public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift) { + GuiInventoryPanel guiInvPanel = (GuiInventoryPanel) gui; + List ingredients = recipe.getIngredientStacks(recipeIndex); - if(shift) { - shift = guiInvPanel.getContainer().clearCraftingGrid(); - } - - ItemStack[][] slots = mapSlots(ingredients, guiInvPanel.getContainer()); - if(slots != null) { - CraftingHelperNEI helper = new CraftingHelperNEI(slots); - helper.overlayRenderer = new DefaultOverlayRenderer(ingredients, positioner); - guiInvPanel.setCraftingHelper(helper); - if(shift) { - helper.refill(guiInvPanel, 64); - } - } else { - guiInvPanel.setCraftingHelper(null); - } - } - - private ItemStack[][] mapSlots(List ingredients, InventoryPanelContainer c) { - ItemStack[][] slots = new ItemStack[9][]; - List craftingGrid = c.getCraftingGridSlots(); - int found = 0; - for(PositionedStack pstack : ingredients) { - for(int idx = 0; idx < 9 ; idx++) { - Slot slot = craftingGrid.get(idx); - if(slot.xDisplayPosition == pstack.relx + CRAFTING_GRID_OFFSET_X && slot.yDisplayPosition == pstack.rely + CRAFTING_GRID_OFFSET_Y) { - slots[idx] = pstack.items; - found++; - break; + if (shift) { + shift = guiInvPanel.getContainer().clearCraftingGrid(); + } + + ItemStack[][] slots = mapSlots(ingredients, guiInvPanel.getContainer()); + if (slots != null) { + CraftingHelperNEI helper = new CraftingHelperNEI(slots); + helper.overlayRenderer = new DefaultOverlayRenderer(ingredients, positioner); + guiInvPanel.setCraftingHelper(helper); + if (shift) { + helper.refill(guiInvPanel, 64); + } + } else { + guiInvPanel.setCraftingHelper(null); } - } } - if(found != ingredients.size()) { - return null; + + private ItemStack[][] mapSlots(List ingredients, InventoryPanelContainer c) { + ItemStack[][] slots = new ItemStack[9][]; + List craftingGrid = c.getCraftingGridSlots(); + int found = 0; + for (PositionedStack pstack : ingredients) { + for (int idx = 0; idx < 9; idx++) { + Slot slot = craftingGrid.get(idx); + if (slot.xDisplayPosition == pstack.relx + CRAFTING_GRID_OFFSET_X + && slot.yDisplayPosition == pstack.rely + CRAFTING_GRID_OFFSET_Y) { + slots[idx] = pstack.items; + found++; + break; + } + } + } + if (found != ingredients.size()) { + return null; + } + return slots; } - return slots; - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemEntry.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemEntry.java index 6fd0171f..225ee8ee 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemEntry.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemEntry.java @@ -9,69 +9,68 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; public class ItemEntry extends ItemEntryBase { - String name; - String modId; - String lowerCaseLocName; - int count; + String name; + String modId; + String lowerCaseLocName; + int count; - public ItemEntry(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { - super(dbID, hash, itemID, meta, nbt); - } - - public int getCount() { - return count; - } - - public ItemStack makeItemStack() { - ItemStack stack = new ItemStack(getItem(), count, meta); - stack.stackTagCompound = nbt; - return stack; - } - - public String getUnlocName() { - if (name == null) { - findUnlocName(); + public ItemEntry(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { + super(dbID, hash, itemID, meta, nbt); } - return name; - } - public String getLowercaseUnlocName(Locale locale) { - if (lowerCaseLocName == null) { - lowerCaseLocName = StatCollector.translateToLocal(getUnlocName()).toLowerCase(locale); + public int getCount() { + return count; } - return lowerCaseLocName; - } - private void findUnlocName() { - ItemStack stack = makeItemStack(); - try { - name = stack.getDisplayName(); - if (name == null || name.isEmpty()) { - name = stack.getItem().getUnlocalizedName(); - if (name == null || name.isEmpty()) { - name = stack.getItem().getClass().getName(); + public ItemStack makeItemStack() { + ItemStack stack = new ItemStack(getItem(), count, meta); + stack.stackTagCompound = nbt; + return stack; + } + + public String getUnlocName() { + if (name == null) { + findUnlocName(); } - } - } catch (Throwable ex) { - name = "Exception: " + ex.getMessage(); + return name; } - } - public String getModId() { - if (modId == null) { - findModId(); + public String getLowercaseUnlocName(Locale locale) { + if (lowerCaseLocName == null) { + lowerCaseLocName = StatCollector.translateToLocal(getUnlocName()).toLowerCase(locale); + } + return lowerCaseLocName; } - return modId; - } - private void findModId() { - Item item = getItem(); - GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item); - if (id != null && id.modId != null) { - modId = id.modId; - } else { - modId = "Unknown"; + private void findUnlocName() { + ItemStack stack = makeItemStack(); + try { + name = stack.getDisplayName(); + if (name == null || name.isEmpty()) { + name = stack.getItem().getUnlocalizedName(); + if (name == null || name.isEmpty()) { + name = stack.getItem().getClass().getName(); + } + } + } catch (Throwable ex) { + name = "Exception: " + ex.getMessage(); + } } - } + public String getModId() { + if (modId == null) { + findModId(); + } + return modId; + } + + private void findModId() { + Item item = getItem(); + GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item); + if (id != null && id.modId != null) { + modId = id.modId; + } else { + modId = "Unknown"; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java index 9cbd81b8..7efe9fa8 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ItemFilter.java @@ -8,109 +8,110 @@ import java.util.regex.Pattern; public abstract class ItemFilter { - private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+"); + private static final Pattern SPLIT_PATTERN = Pattern.compile("\\s+"); - public abstract boolean matches(ItemEntry entry); + public abstract boolean matches(ItemEntry entry); - public static ItemFilter parse(String filter, Locale locale, IItemFilter filterCard) { - ArrayList list = new ArrayList(); - if(filterCard != null) { - list.add(new CardFilter(filterCard)); - } - - String[] parts = SPLIT_PATTERN.split(filter); - for(String part : parts) { - if(part.startsWith("@")) { - part = part.substring(1); - if(!part.isEmpty()) { - list.add(new ModFilter(part, locale)); + public static ItemFilter parse(String filter, Locale locale, IItemFilter filterCard) { + ArrayList list = new ArrayList(); + if (filterCard != null) { + list.add(new CardFilter(filterCard)); } - } else if(!part.isEmpty()) { - list.add(new NameFilter(part, locale)); - } - } - if(list.isEmpty()) { - return null; - } - if(list.size() == 1) { - return list.get(0); - } - return new AndFilter(list.toArray(new ItemFilter[list.size()])); - } - - static class AndFilter extends ItemFilter { - final ItemFilter[] list; - - AndFilter(ItemFilter[] list) { - this.list = list; - } - - @Override - public boolean matches(ItemEntry entry) { - for(ItemFilter f : list) { - if(!f.matches(entry)) { - return false; + String[] parts = SPLIT_PATTERN.split(filter); + for (String part : parts) { + if (part.startsWith("@")) { + part = part.substring(1); + if (!part.isEmpty()) { + list.add(new ModFilter(part, locale)); + } + } else if (!part.isEmpty()) { + list.add(new NameFilter(part, locale)); + } } - } - return true; + + if (list.isEmpty()) { + return null; + } + if (list.size() == 1) { + return list.get(0); + } + return new AndFilter(list.toArray(new ItemFilter[list.size()])); } - @Override - public String toString() { - return Arrays.deepToString(list); - } - } + static class AndFilter extends ItemFilter { + final ItemFilter[] list; - static class ModFilter extends ItemFilter { - final String text; - final Locale locale; + AndFilter(ItemFilter[] list) { + this.list = list; + } - ModFilter(String text, Locale locale) { - this.text = text.toLowerCase(locale); - this.locale = locale; + @Override + public boolean matches(ItemEntry entry) { + for (ItemFilter f : list) { + if (!f.matches(entry)) { + return false; + } + } + return true; + } + + @Override + public String toString() { + return Arrays.deepToString(list); + } } - @Override - public boolean matches(ItemEntry entry) { - return entry.getModId().toLowerCase(locale).contains(text); + static class ModFilter extends ItemFilter { + final String text; + final Locale locale; + + ModFilter(String text, Locale locale) { + this.text = text.toLowerCase(locale); + this.locale = locale; + } + + @Override + public boolean matches(ItemEntry entry) { + return entry.getModId().toLowerCase(locale).contains(text); + } + + @Override + public String toString() { + return "@" + text; + } } - @Override - public String toString() { - return "@" + text; - } - } + static class NameFilter extends ItemFilter { + final String text; + final Locale locale; - static class NameFilter extends ItemFilter { - final String text; - final Locale locale; + NameFilter(String text, Locale locale) { + this.text = text.toLowerCase(locale); + this.locale = locale; + } - NameFilter(String text, Locale locale) { - this.text = text.toLowerCase(locale); - this.locale = locale; + @Override + public boolean matches(ItemEntry entry) { + return entry.getLowercaseUnlocName(locale).contains(text); + } + + @Override + public String toString() { + return text; + } } - @Override - public boolean matches(ItemEntry entry) { - return entry.getLowercaseUnlocName(locale).contains(text); - } + static class CardFilter extends ItemFilter { + final IItemFilter filter; - @Override - public String toString() { - return text; - } - } + CardFilter(IItemFilter filter) { + this.filter = filter; + } - static class CardFilter extends ItemFilter { - final IItemFilter filter; - CardFilter(IItemFilter filter) { - this.filter = filter; + @Override + public boolean matches(ItemEntry entry) { + return filter.doesItemPassFilter(null, entry.makeItemStack()); + } } - - @Override - public boolean matches(ItemEntry entry) { - return filter.doesItemPassFilter(null, entry.makeItemStack()); - } - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/ModComparator.java b/src/main/java/crazypants/enderio/machine/invpanel/client/ModComparator.java index 3e58fb9a..001b2d14 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/ModComparator.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/ModComparator.java @@ -4,19 +4,18 @@ import java.text.Collator; class ModComparator extends NameComparator { - ModComparator(Collator collator) { - super(collator); - } - - @Override - public int compare(ItemEntry a, ItemEntry b) { - String modIdA = a.getModId(); - String modIdB = b.getModId(); - int res = collator.compare(modIdA, modIdB); - if (res == 0) { - res = super.compare(a, b); + ModComparator(Collator collator) { + super(collator); } - return res; - } + @Override + public int compare(ItemEntry a, ItemEntry b) { + String modIdA = a.getModId(); + String modIdB = b.getModId(); + int res = collator.compare(modIdA, modIdB); + if (res == 0) { + res = super.compare(a, b); + } + return res; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/NameComparator.java b/src/main/java/crazypants/enderio/machine/invpanel/client/NameComparator.java index 05cf0ab6..a77abe0f 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/NameComparator.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/NameComparator.java @@ -4,17 +4,16 @@ import java.text.Collator; import java.util.Comparator; class NameComparator implements Comparator { - protected final Collator collator; + protected final Collator collator; - NameComparator(Collator collator) { - this.collator = collator; - } - - @Override - public int compare(ItemEntry a, ItemEntry b) { - String nameA = a.getUnlocName(); - String nameB = b.getUnlocName(); - return collator.compare(nameA, nameB); - } + NameComparator(Collator collator) { + this.collator = collator; + } + @Override + public int compare(ItemEntry a, ItemEntry b) { + String nameA = a.getUnlocName(); + String nameB = b.getUnlocName(); + return collator.compare(nameA, nameB); + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/SortOrder.java b/src/main/java/crazypants/enderio/machine/invpanel/client/SortOrder.java index b2167186..4227400e 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/SortOrder.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/SortOrder.java @@ -1,7 +1,7 @@ package crazypants.enderio.machine.invpanel.client; public enum SortOrder { - NAME, - MOD, - COUNT + NAME, + MOD, + COUNT } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java index e279f14b..b3bded97 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/AbstractInventory.java @@ -3,80 +3,79 @@ package crazypants.enderio.machine.invpanel.server; import net.minecraft.item.ItemStack; abstract class AbstractInventory { - static final SlotKey[] NO_SLOTS = new SlotKey[0]; - SlotKey[] slotKeys = NO_SLOTS; + static final SlotKey[] NO_SLOTS = new SlotKey[0]; + SlotKey[] slotKeys = NO_SLOTS; - protected void setEmpty(InventoryDatabaseServer db) { - if (slotKeys.length != 0) { - reset(db, 0); + protected void setEmpty(InventoryDatabaseServer db) { + if (slotKeys.length != 0) { + reset(db, 0); + } } - } - protected void reset(InventoryDatabaseServer db, int count) { - for (SlotKey slotKey : slotKeys) { - if(slotKey != null) { - slotKey.remove(db); - } + protected void reset(InventoryDatabaseServer db, int count) { + for (SlotKey slotKey : slotKeys) { + if (slotKey != null) { + slotKey.remove(db); + } + } + slotKeys = new SlotKey[count]; } - slotKeys = new SlotKey[count]; - } - protected void updateSlot(InventoryDatabaseServer db, int slot, ItemStack stack) { - if (stack == null) { - emptySlot(db, slot); - } else { - updateSlot(db, slot, stack, stack.stackSize); + protected void updateSlot(InventoryDatabaseServer db, int slot, ItemStack stack) { + if (stack == null) { + emptySlot(db, slot); + } else { + updateSlot(db, slot, stack, stack.stackSize); + } } - } - protected void updateSlot(InventoryDatabaseServer db, int slot, ItemStack stack, int count) { - SlotKey slotKey = slotKeys[slot]; - ItemEntry current = slotKey != null ? slotKey.item : null; - ItemEntry key = db.lookupItem(stack, current, true); - if (key != current) { - updateSlotKey(db, slot, slotKey, key, count); - } else if (slotKey != null && slotKey.count != count) { - slotKey.count = count; - db.entryChanged(current); + protected void updateSlot(InventoryDatabaseServer db, int slot, ItemStack stack, int count) { + SlotKey slotKey = slotKeys[slot]; + ItemEntry current = slotKey != null ? slotKey.item : null; + ItemEntry key = db.lookupItem(stack, current, true); + if (key != current) { + updateSlotKey(db, slot, slotKey, key, count); + } else if (slotKey != null && slotKey.count != count) { + slotKey.count = count; + db.entryChanged(current); + } } - } - protected void emptySlot(InventoryDatabaseServer db, int slot) { - SlotKey slotKey = slotKeys[slot]; - if (slotKey != null) { - slotKey.remove(db); - slotKeys[slot] = null; + protected void emptySlot(InventoryDatabaseServer db, int slot) { + SlotKey slotKey = slotKeys[slot]; + if (slotKey != null) { + slotKey.remove(db); + slotKeys[slot] = null; + } } - } - private void updateSlotKey(InventoryDatabaseServer db, int slot, SlotKey slotKey, ItemEntry key, int count) { - if (slotKey != null) { - slotKey.remove(db); - slotKey = null; + private void updateSlotKey(InventoryDatabaseServer db, int slot, SlotKey slotKey, ItemEntry key, int count) { + if (slotKey != null) { + slotKey.remove(db); + slotKey = null; + } + if (key != null) { + slotKey = new SlotKey(this, slot, key, count); + key.addSlot(slotKey); + db.entryChanged(key); + } + slotKeys[slot] = slotKey; } - if (key != null) { - slotKey = new SlotKey(this, slot, key, count); - key.addSlot(slotKey); - db.entryChanged(key); + + protected void updateCount(InventoryDatabaseServer db, int slot, ItemEntry entry, int count) { + SlotKey slotKey = slotKeys[slot]; + if (slotKey != null && slotKey.count != count && slotKey.item == entry) { + if (count == 0) { + slotKey.remove(db); + slotKeys[slot] = null; + } else { + slotKey.count = count; + db.entryChanged(slotKey.item); + } + } } - slotKeys[slot] = slotKey; - } - protected void updateCount(InventoryDatabaseServer db, int slot, ItemEntry entry, int count) { - SlotKey slotKey = slotKeys[slot]; - if (slotKey != null && slotKey.count != count && slotKey.item == entry) { - if (count == 0) { - slotKey.remove(db); - slotKeys[slot] = null; - } else { - slotKey.count = count; - db.entryChanged(slotKey.item); - } - } - } - - abstract int scanInventory(InventoryDatabaseServer db); - - abstract int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count); + abstract int scanInventory(InventoryDatabaseServer db); + abstract int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLog.java b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLog.java index 4684f666..ee106865 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLog.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLog.java @@ -2,10 +2,9 @@ package crazypants.enderio.machine.invpanel.server; public interface ChangeLog { - void entryChanged(ItemEntry entry); + void entryChanged(ItemEntry entry); - void databaseReset(); - - void sendChangeLog(); + void databaseReset(); + void sendChangeLog(); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java index 140252ff..a5e8e131 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/ChangeLogList.java @@ -3,47 +3,46 @@ package crazypants.enderio.machine.invpanel.server; import java.util.ArrayList; final class ChangeLogList implements ChangeLog { - final ArrayList clList; + final ArrayList clList; - public ChangeLogList(ChangeLog cl0, ChangeLog cl1) { - clList = new ArrayList(2); - clList.add(cl0); - clList.add(cl1); - } - - @Override - public void entryChanged(ItemEntry entry) { - for (ChangeLog cl : clList) { - cl.entryChanged(entry); + public ChangeLogList(ChangeLog cl0, ChangeLog cl1) { + clList = new ArrayList(2); + clList.add(cl0); + clList.add(cl1); } - } - @Override - public void databaseReset() { - for (ChangeLog cl : clList) { - cl.databaseReset(); + @Override + public void entryChanged(ItemEntry entry) { + for (ChangeLog cl : clList) { + cl.entryChanged(entry); + } } - } - @Override - public void sendChangeLog() { - for (ChangeLog cl : clList) { - cl.sendChangeLog(); + @Override + public void databaseReset() { + for (ChangeLog cl : clList) { + cl.databaseReset(); + } } - } - ChangeLog remove(ChangeLog cl) { - clList.remove(cl); - if (clList.size() == 1) { - return clList.get(0); + @Override + public void sendChangeLog() { + for (ChangeLog cl : clList) { + cl.sendChangeLog(); + } } - return this; - } - void add(ChangeLog cl) { - if (!clList.contains(cl)) { - clList.add(cl); + ChangeLog remove(ChangeLog cl) { + clList.remove(cl); + if (clList.size() == 1) { + return clList.get(0); + } + return this; } - } + void add(ChangeLog cl) { + if (!clList.contains(cl)) { + clList.add(cl); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java index 3bbe76ba..2fb4d614 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/DSUInventory.java @@ -4,34 +4,33 @@ import net.minecraft.item.ItemStack; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; class DSUInventory extends AbstractInventory { - final IDeepStorageUnit dsu; + final IDeepStorageUnit dsu; - DSUInventory(IDeepStorageUnit dsu) { - this.dsu = dsu; - this.slotKeys = new SlotKey[1]; - } - - @Override - public int scanInventory(InventoryDatabaseServer db) { - ItemStack stack = dsu.getStoredItemType(); - updateSlot(db, 0, stack); - return 1; - } - - @Override - public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { - ItemStack stack = dsu.getStoredItemType(); - if (db.lookupItem(stack, entry, false) != entry) { - return 0; + DSUInventory(IDeepStorageUnit dsu) { + this.dsu = dsu; + this.slotKeys = new SlotKey[1]; } - int remaining = stack.stackSize; - if (count > remaining) { - count = remaining; - } - remaining -= count; - dsu.setStoredItemCount(remaining); - updateCount(db, 0, entry, remaining); - return count; - } + @Override + public int scanInventory(InventoryDatabaseServer db) { + ItemStack stack = dsu.getStoredItemType(); + updateSlot(db, 0, stack); + return 1; + } + + @Override + public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { + ItemStack stack = dsu.getStoredItemType(); + if (db.lookupItem(stack, entry, false) != entry) { + return 0; + } + int remaining = stack.stackSize; + if (count > remaining) { + count = remaining; + } + remaining -= count; + dsu.setStoredItemCount(remaining); + updateCount(db, 0, entry, remaining); + return count; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/DrawerGroupInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/DrawerGroupInventory.java index be93d634..c8ecd9c1 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/DrawerGroupInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/DrawerGroupInventory.java @@ -5,62 +5,61 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import net.minecraft.item.ItemStack; public class DrawerGroupInventory extends AbstractInventory { - final IDrawerGroup dg; + final IDrawerGroup dg; - public DrawerGroupInventory(IDrawerGroup dg) { - this.dg = dg; - } + public DrawerGroupInventory(IDrawerGroup dg) { + this.dg = dg; + } - @Override - int scanInventory(InventoryDatabaseServer db) { - int count = dg.getDrawerCount(); - if (count == 0) { - setEmpty(db); - return 0; + @Override + int scanInventory(InventoryDatabaseServer db) { + int count = dg.getDrawerCount(); + if (count == 0) { + setEmpty(db); + return 0; + } + if (count != slotKeys.length) { + reset(db, count); + } + for (int i = 0; i < count; i++) { + IDrawer drawer = dg.getDrawer(i); + ItemStack stack; + int quantity; + if (drawer != null + && (quantity = drawer.getStoredItemCount()) > 0 + && (stack = drawer.getStoredItemPrototype()) != null + && drawer.canItemBeExtracted(stack)) { + updateSlot(db, i, stack, quantity); + } else { + emptySlot(db, i); + } + } + return count; } - if (count != slotKeys.length) { - reset(db, count); - } - for (int i = 0; i < count; i++) { - IDrawer drawer = dg.getDrawer(i); - ItemStack stack; - int quantity; - if (drawer != null && - (quantity = drawer.getStoredItemCount()) > 0 && - (stack = drawer.getStoredItemPrototype()) != null && - drawer.canItemBeExtracted(stack)) { - updateSlot(db, i, stack, quantity); - } else { - emptySlot(db, i); - } - } - return count; - } - @Override - int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { - if (slot >= dg.getDrawerCount()) { - return 0; + @Override + int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { + if (slot >= dg.getDrawerCount()) { + return 0; + } + IDrawer drawer = dg.getDrawer(slot); + if (drawer == null) { + return 0; + } + int remaining = drawer.getStoredItemCount(); + if (remaining <= 0) { + return 0; + } + ItemStack stack = drawer.getStoredItemPrototype(); + if (db.lookupItem(stack, entry, false) != entry) { + return 0; + } + if (count > remaining) { + count = remaining; + } + remaining -= count; + drawer.setStoredItemCount(remaining); + updateCount(db, slot, entry, remaining); + return count; } - IDrawer drawer = dg.getDrawer(slot); - if (drawer == null) { - return 0; - } - int remaining = drawer.getStoredItemCount(); - if (remaining <= 0) { - return 0; - } - ItemStack stack = drawer.getStoredItemPrototype(); - if (db.lookupItem(stack, entry, false) != entry) { - return 0; - } - if (count > remaining) { - count = remaining; - } - remaining -= count; - drawer.setStoredItemCount(remaining); - updateCount(db, slot, entry, remaining); - return count; - } - } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java index 9a953d0e..8c9f1b69 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryDatabaseServer.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.invpanel.server; +import com.enderio.core.common.network.CompressedDataInput; +import com.enderio.core.common.network.CompressedDataOutput; import crazypants.enderio.conduit.item.ItemConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.config.Config; @@ -7,7 +9,6 @@ import crazypants.enderio.machine.invpanel.InventoryDatabase; import crazypants.enderio.machine.invpanel.PacketDatabaseReset; import crazypants.enderio.machine.invpanel.TileInventoryPanel; import crazypants.enderio.network.PacketHandler; - import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -15,255 +16,251 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; - -import com.enderio.core.common.network.CompressedDataInput; -import com.enderio.core.common.network.CompressedDataOutput; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; public class InventoryDatabaseServer extends InventoryDatabase { - private static final AtomicInteger nextGeneration = new AtomicInteger(); + private static final AtomicInteger nextGeneration = new AtomicInteger(); - private final ItemConduitNetwork network; - private int networkChangeCount; + private final ItemConduitNetwork network; + private int networkChangeCount; - private AbstractInventory[] inventories; - private int currentInventory; - private ChangeLog changeLog; - private boolean sentToClient; - private int tickPause; - private float power; + private AbstractInventory[] inventories; + private int currentInventory; + private ChangeLog changeLog; + private boolean sentToClient; + private int tickPause; + private float power; - public InventoryDatabaseServer(ItemConduitNetwork network) { - this.network = network; - } - - public ItemConduitNetwork getNetwork() { - return network; - } - - public boolean isCurrent() { - return networkChangeCount == network.getChangeCount(); - } - - public void addChangeLog(ChangeLog cl) { - if(changeLog == null) { - changeLog = cl; - } else if(changeLog instanceof ChangeLogList) { - ((ChangeLogList)changeLog).add(cl); - } else if(changeLog != cl) { - changeLog = new ChangeLogList(changeLog, cl); + public InventoryDatabaseServer(ItemConduitNetwork network) { + this.network = network; } - } - public void removeChangeLog(ChangeLog cl) { - if(changeLog == cl) { - changeLog = null; - } else if(changeLog instanceof ChangeLogList) { - changeLog = ((ChangeLogList)changeLog).remove(cl); + public ItemConduitNetwork getNetwork() { + return network; } - } - public List decompressMissingItems(byte[] compressed) throws IOException { - CompressedDataInput cdi = new CompressedDataInput(compressed); - try { - int pktGeneration = cdi.readVariable(); - if(pktGeneration != generation) { - return Collections.emptyList(); - } - int numIDs = cdi.readVariable(); - ArrayList items = new ArrayList(numIDs); - for(int i = 0; i < numIDs; i++) { - int dbIndex = cdi.readVariable(); - if(dbIndex < complexItems.size()) { - ItemEntry entry = complexItems.get(dbIndex); - items.add(entry); - } - } - return items; - } finally { - cdi.close(); + public boolean isCurrent() { + return networkChangeCount == network.getChangeCount(); } - } - public byte[] compressItemInfo(List items) throws IOException{ - CompressedDataOutput cdo = new CompressedDataOutput(); - try { - int count = items.size(); - cdo.writeVariable(count); - for(ItemEntry entry : items) { - assert entry.dbID >= COMPLEX_DBINDEX_START; - int code = (entry.dbID - COMPLEX_DBINDEX_START) << 1; - if(entry.nbt != null) { - code |= 1; + public void addChangeLog(ChangeLog cl) { + if (changeLog == null) { + changeLog = cl; + } else if (changeLog instanceof ChangeLogList) { + ((ChangeLogList) changeLog).add(cl); + } else if (changeLog != cl) { + changeLog = new ChangeLogList(changeLog, cl); } - cdo.writeVariable(code); - cdo.writeVariable(entry.itemID); - cdo.writeVariable(entry.meta); - if(entry.nbt != null) { - CompressedStreamTools.write(entry.nbt, cdo); - } - cdo.writeVariable(entry.countItems(this)); - } - return cdo.getCompressed(); - } finally { - cdo.close(); } - } - public byte[] compressItemList() throws IOException { - CompressedDataOutput cdo = new CompressedDataOutput(); - try { - cdo.writeByte(0); - for(Map.Entry entry : simpleRegsitry.entrySet()) { - int count = entry.getValue().countItems(this); - if(count > 0) { - cdo.writeVariable(count); - cdo.writeShort(entry.getKey()); + public void removeChangeLog(ChangeLog cl) { + if (changeLog == cl) { + changeLog = null; + } else if (changeLog instanceof ChangeLogList) { + changeLog = ((ChangeLogList) changeLog).remove(cl); } - } - cdo.writeByte(0); - int prevID = COMPLEX_DBINDEX_START; - for(ItemEntry entry : complexItems) { - if(entry != null) { - int count = entry.countItems(this); - if(count > 0) { + } + + public List decompressMissingItems(byte[] compressed) throws IOException { + CompressedDataInput cdi = new CompressedDataInput(compressed); + try { + int pktGeneration = cdi.readVariable(); + if (pktGeneration != generation) { + return Collections.emptyList(); + } + int numIDs = cdi.readVariable(); + ArrayList items = new ArrayList(numIDs); + for (int i = 0; i < numIDs; i++) { + int dbIndex = cdi.readVariable(); + if (dbIndex < complexItems.size()) { + ItemEntry entry = complexItems.get(dbIndex); + items.add(entry); + } + } + return items; + } finally { + cdi.close(); + } + } + + public byte[] compressItemInfo(List items) throws IOException { + CompressedDataOutput cdo = new CompressedDataOutput(); + try { + int count = items.size(); cdo.writeVariable(count); - cdo.writeVariable(entry.dbID - prevID); - prevID = entry.dbID; - } + for (ItemEntry entry : items) { + assert entry.dbID >= COMPLEX_DBINDEX_START; + int code = (entry.dbID - COMPLEX_DBINDEX_START) << 1; + if (entry.nbt != null) { + code |= 1; + } + cdo.writeVariable(code); + cdo.writeVariable(entry.itemID); + cdo.writeVariable(entry.meta); + if (entry.nbt != null) { + CompressedStreamTools.write(entry.nbt, cdo); + } + cdo.writeVariable(entry.countItems(this)); + } + return cdo.getCompressed(); + } finally { + cdo.close(); } - } - cdo.writeByte(0); - sentToClient = true; - return cdo.getCompressed(); - } finally { - cdo.close(); - } - } - - public byte[] compressChangedItems(Collection items) throws IOException { - CompressedDataOutput cdo = new CompressedDataOutput(); - try { - cdo.writeVariable(items.size()); - for(ItemEntry entry : items) { - cdo.writeVariable(entry.dbID); - cdo.writeVariable(entry.countItems(this)); - } - return cdo.getCompressed(); - } finally { - cdo.close(); - } - } - - public void resetDatabase() { - simpleRegsitry.clear(); - complexRegistry.clear(); - complexItems.clear(); - currentInventory = 0; - if(sentToClient) { - PacketHandler.INSTANCE.sendToAll(new PacketDatabaseReset(generation)); - sentToClient = false; - } - } - - public void updateNetworkSources() { - resetDatabase(); - generation = nextGeneration.incrementAndGet(); - networkChangeCount = network.getChangeCount(); - - List sources = network.getInventoryPanelSources(); - if(sources == null || sources.isEmpty()) { - this.inventories = null; - } else { - this.inventories = new AbstractInventory[sources.size()]; - for(int i=0; i 0 && inventories != null; - } - - public int extractItems(ItemEntry entry, int count, TileInventoryPanel te) { - float availablePower = power + te.getAvailablePower(); - availablePower -= Config.inventoryPanelExtractCostPerOperation; - if(availablePower <= 0) { - return 0; - } - if(Config.inventoryPanelExtractCostPerOperation > 0) { - long maxCount = Math.round(Math.floor(availablePower / Config.inventoryPanelExtractCostPerOperation)); - count = (int)Math.min(maxCount, count); - } - if(count > 0) { - int extracted = entry.extractItems(this, count); - power -= Config.inventoryPanelExtractCostPerOperation + extracted * Config.inventoryPanelExtractCostPerOperation; - te.refuelPower(this); - return extracted; - } - return 0; - } - - private void scanNextInventory() { - if(!isOperational()) { - tickPause = 20; - return; + public byte[] compressItemList() throws IOException { + CompressedDataOutput cdo = new CompressedDataOutput(); + try { + cdo.writeByte(0); + for (Map.Entry entry : simpleRegsitry.entrySet()) { + int count = entry.getValue().countItems(this); + if (count > 0) { + cdo.writeVariable(count); + cdo.writeShort(entry.getKey()); + } + } + cdo.writeByte(0); + int prevID = COMPLEX_DBINDEX_START; + for (ItemEntry entry : complexItems) { + if (entry != null) { + int count = entry.countItems(this); + if (count > 0) { + cdo.writeVariable(count); + cdo.writeVariable(entry.dbID - prevID); + prevID = entry.dbID; + } + } + } + cdo.writeByte(0); + sentToClient = true; + return cdo.getCompressed(); + } finally { + cdo.close(); + } } - AbstractInventory inv = inventories[currentInventory]; - int slots = inv.scanInventory(this); - - currentInventory = (currentInventory+1) % inventories.length; - tickPause += 1 + (slots + 8) / 9; - power -= slots * Config.inventoryPanelScanCostPerSlot; - } - - public void tick() { - if(--tickPause <= 0) { - scanNextInventory(); + public byte[] compressChangedItems(Collection items) throws IOException { + CompressedDataOutput cdo = new CompressedDataOutput(); + try { + cdo.writeVariable(items.size()); + for (ItemEntry entry : items) { + cdo.writeVariable(entry.dbID); + cdo.writeVariable(entry.countItems(this)); + } + return cdo.getCompressed(); + } finally { + cdo.close(); + } } - } - void entryChanged(ItemEntry entry) { - if(changeLog != null) { - changeLog.entryChanged(entry); + public void resetDatabase() { + simpleRegsitry.clear(); + complexRegistry.clear(); + complexItems.clear(); + currentInventory = 0; + if (sentToClient) { + PacketHandler.INSTANCE.sendToAll(new PacketDatabaseReset(generation)); + sentToClient = false; + } } - } - public void sendChangeLogs() { - if(changeLog != null) { - changeLog.sendChangeLog(); + public void updateNetworkSources() { + resetDatabase(); + generation = nextGeneration.incrementAndGet(); + networkChangeCount = network.getChangeCount(); + + List sources = network.getInventoryPanelSources(); + if (sources == null || sources.isEmpty()) { + this.inventories = null; + } else { + this.inventories = new AbstractInventory[sources.size()]; + for (int i = 0; i < sources.size(); i++) { + NetworkedInventory ni = sources.get(i); + inventories[i] = InventoryFactory.createInventory(ni); + } + } + + if (changeLog != null) { + changeLog.databaseReset(); + } } - } - @Override - protected ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt) { - return new ItemEntry(dbId, hash, itemID, meta, nbt); - } + public int getNumInventories() { + return (inventories == null) ? 0 : inventories.length; + } - AbstractInventory getInventory(int aiIndex) { - return inventories[aiIndex]; - } + public float getPower() { + return power; + } + public void addPower(float power) { + this.power += power; + } + + public boolean isOperational() { + return power > 0 && inventories != null; + } + + public int extractItems(ItemEntry entry, int count, TileInventoryPanel te) { + float availablePower = power + te.getAvailablePower(); + availablePower -= Config.inventoryPanelExtractCostPerOperation; + if (availablePower <= 0) { + return 0; + } + if (Config.inventoryPanelExtractCostPerOperation > 0) { + long maxCount = Math.round(Math.floor(availablePower / Config.inventoryPanelExtractCostPerOperation)); + count = (int) Math.min(maxCount, count); + } + if (count > 0) { + int extracted = entry.extractItems(this, count); + power -= Config.inventoryPanelExtractCostPerOperation + + extracted * Config.inventoryPanelExtractCostPerOperation; + te.refuelPower(this); + return extracted; + } + return 0; + } + + private void scanNextInventory() { + if (!isOperational()) { + tickPause = 20; + return; + } + + AbstractInventory inv = inventories[currentInventory]; + int slots = inv.scanInventory(this); + + currentInventory = (currentInventory + 1) % inventories.length; + tickPause += 1 + (slots + 8) / 9; + power -= slots * Config.inventoryPanelScanCostPerSlot; + } + + public void tick() { + if (--tickPause <= 0) { + scanNextInventory(); + } + } + + void entryChanged(ItemEntry entry) { + if (changeLog != null) { + changeLog.entryChanged(entry); + } + } + + public void sendChangeLogs() { + if (changeLog != null) { + changeLog.sendChangeLog(); + } + } + + @Override + protected ItemEntry createItemEntry(int dbId, int hash, int itemID, int meta, NBTTagCompound nbt) { + return new ItemEntry(dbId, hash, itemID, meta, nbt); + } + + AbstractInventory getInventory(int aiIndex) { + return inventories[aiIndex]; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java index f4c49701..68f64787 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java @@ -9,47 +9,47 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public abstract class InventoryFactory { - private static final ArrayList factories; + private static final ArrayList factories; - static { - factories = new ArrayList(); - factories.add(new DSUFactory()); - if (Loader.isModLoaded("StorageDrawers")) { - factories.add(new DrawerFactory()); + static { + factories = new ArrayList(); + factories.add(new DSUFactory()); + if (Loader.isModLoaded("StorageDrawers")) { + factories.add(new DrawerFactory()); + } } - } - static AbstractInventory createInventory(NetworkedInventory ni) { - for(InventoryFactory f : factories) { - AbstractInventory ai = f.create(ni); - if (ai != null) { - return ai; - } + static AbstractInventory createInventory(NetworkedInventory ni) { + for (InventoryFactory f : factories) { + AbstractInventory ai = f.create(ni); + if (ai != null) { + return ai; + } + } + return new NormalInventory(ni); } - return new NormalInventory(ni); - } - abstract AbstractInventory create(NetworkedInventory ni); + abstract AbstractInventory create(NetworkedInventory ni); - static class DSUFactory extends InventoryFactory { - @Override - AbstractInventory create(NetworkedInventory ni) { - ISidedInventory inv = ni.getInventory(); - if (inv instanceof IDeepStorageUnit) { - return new DSUInventory((IDeepStorageUnit) inv); - } - return null; + static class DSUFactory extends InventoryFactory { + @Override + AbstractInventory create(NetworkedInventory ni) { + ISidedInventory inv = ni.getInventory(); + if (inv instanceof IDeepStorageUnit) { + return new DSUInventory((IDeepStorageUnit) inv); + } + return null; + } } - } - static class DrawerFactory extends InventoryFactory { - @Override - AbstractInventory create(NetworkedInventory ni) { - ISidedInventory inv = ni.getInventory(); - if (inv instanceof IDrawerGroup) { - return new DrawerGroupInventory((IDrawerGroup) inv); - } - return null; + static class DrawerFactory extends InventoryFactory { + @Override + AbstractInventory create(NetworkedInventory ni) { + ISidedInventory inv = ni.getInventory(); + if (inv instanceof IDrawerGroup) { + return new DrawerGroupInventory((IDrawerGroup) inv); + } + return null; + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java b/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java index 546897ae..9993f7a9 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/ItemEntry.java @@ -5,40 +5,39 @@ import java.util.IdentityHashMap; import net.minecraft.nbt.NBTTagCompound; public class ItemEntry extends ItemEntryBase { - private final IdentityHashMap slots = new IdentityHashMap(); + private final IdentityHashMap slots = new IdentityHashMap(); - public ItemEntry(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { - super(dbID, hash, itemID, meta, nbt); - } - - void addSlot(SlotKey slotKey) { - slots.put(slotKey, slotKey); - } - - void removeSlot(SlotKey slotKey) { - slots.remove(slotKey); - } - - int countItems(InventoryDatabaseServer db) { - int count = 0; - for (SlotKey slotKey : slots.values()) { - count += slotKey.count; + public ItemEntry(int dbID, int hash, int itemID, int meta, NBTTagCompound nbt) { + super(dbID, hash, itemID, meta, nbt); } - return count; - } - int extractItems(InventoryDatabaseServer db, int count) { - int extracted = 0; - SlotKey[] copy = slots.values().toArray(new SlotKey[slots.size()]); - for (SlotKey slotKey : copy) { - int amount = slotKey.inv.extractItem(db, this, slotKey.slot, count); - count -= amount; - extracted += amount; - if (count <= 0) { - break; - } + void addSlot(SlotKey slotKey) { + slots.put(slotKey, slotKey); } - return extracted; - } + void removeSlot(SlotKey slotKey) { + slots.remove(slotKey); + } + + int countItems(InventoryDatabaseServer db) { + int count = 0; + for (SlotKey slotKey : slots.values()) { + count += slotKey.count; + } + return count; + } + + int extractItems(InventoryDatabaseServer db, int count) { + int extracted = 0; + SlotKey[] copy = slots.values().toArray(new SlotKey[slots.size()]); + for (SlotKey slotKey : copy) { + int amount = slotKey.inv.extractItem(db, this, slotKey.slot, count); + count -= amount; + extracted += amount; + if (count <= 0) { + break; + } + } + return extracted; + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java index cd6caa95..602eaf0c 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java @@ -5,60 +5,59 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; class NormalInventory extends AbstractInventory { - final NetworkedInventory ni; + final NetworkedInventory ni; - NormalInventory(NetworkedInventory ni) { - this.ni = ni; - } + NormalInventory(NetworkedInventory ni) { + this.ni = ni; + } - @Override - int scanInventory(InventoryDatabaseServer db) { - ISidedInventory inv = ni.getInventoryRecheck(); - int side = ni.getInventorySide(); - int[] slotIndices = inv.getAccessibleSlotsFromSide(side); - if (slotIndices == null || slotIndices.length == 0) { - setEmpty(db); - return 0; + @Override + int scanInventory(InventoryDatabaseServer db) { + ISidedInventory inv = ni.getInventoryRecheck(); + int side = ni.getInventorySide(); + int[] slotIndices = inv.getAccessibleSlotsFromSide(side); + if (slotIndices == null || slotIndices.length == 0) { + setEmpty(db); + return 0; + } + int count = slotIndices.length; + if (count != slotKeys.length) { + reset(db, count); + } + for (int slot = 0; slot < count; slot++) { + int invSlot = slotIndices[slot]; + ItemStack stack = inv.getStackInSlot(invSlot); + if (stack != null && !inv.canExtractItem(invSlot, stack, side)) { + stack = null; + } + updateSlot(db, slot, stack); + } + return count; } - int count = slotIndices.length; - if (count != slotKeys.length) { - reset(db, count); - } - for (int slot = 0; slot < count; slot++) { - int invSlot = slotIndices[slot]; - ItemStack stack = inv.getStackInSlot(invSlot); - if (stack != null && !inv.canExtractItem(invSlot, stack, side)) { - stack = null; - } - updateSlot(db, slot, stack); - } - return count; - } - @Override - public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { - ISidedInventory inv = ni.getInventoryRecheck(); - int side = ni.getInventorySide(); - int[] slotIndices = inv.getAccessibleSlotsFromSide(side); - if (slotIndices == null || slot >= slotIndices.length) { - return 0; + @Override + public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) { + ISidedInventory inv = ni.getInventoryRecheck(); + int side = ni.getInventorySide(); + int[] slotIndices = inv.getAccessibleSlotsFromSide(side); + if (slotIndices == null || slot >= slotIndices.length) { + return 0; + } + int invSlot = slotIndices[slot]; + ItemStack stack = inv.getStackInSlot(invSlot); + if (stack == null || !inv.canExtractItem(invSlot, stack, side)) { + return 0; + } + if (db.lookupItem(stack, entry, false) != entry) { + return 0; + } + int remaining = stack.stackSize; + if (count > remaining) { + count = remaining; + } + ni.itemExtracted(invSlot, count); + remaining -= count; + updateCount(db, slot, entry, remaining); + return count; } - int invSlot = slotIndices[slot]; - ItemStack stack = inv.getStackInSlot(invSlot); - if (stack == null || !inv.canExtractItem(invSlot, stack, side)) { - return 0; - } - if (db.lookupItem(stack, entry, false) != entry) { - return 0; - } - int remaining = stack.stackSize; - if (count > remaining) { - count = remaining; - } - ni.itemExtracted(invSlot, count); - remaining -= count; - updateCount(db, slot, entry, remaining); - return count; - } - } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/SlotKey.java b/src/main/java/crazypants/enderio/machine/invpanel/server/SlotKey.java index 7c82979a..068426ad 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/SlotKey.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/SlotKey.java @@ -1,20 +1,20 @@ package crazypants.enderio.machine.invpanel.server; public final class SlotKey { - final AbstractInventory inv; - final int slot; - final ItemEntry item; - int count; + final AbstractInventory inv; + final int slot; + final ItemEntry item; + int count; - SlotKey(AbstractInventory inv, int slot, ItemEntry item, int count) { - this.inv = inv; - this.slot = slot; - this.item = item; - this.count = count; - } + SlotKey(AbstractInventory inv, int slot, ItemEntry item, int count) { + this.inv = inv; + this.slot = slot; + this.item = item; + this.count = count; + } - void remove(InventoryDatabaseServer db) { - item.removeSlot(this); - db.entryChanged(item); - } + void remove(InventoryDatabaseServer db) { + item.removeSlot(this); + db.entryChanged(item); + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java index 225db2ac..c3b2bb18 100644 --- a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java @@ -1,11 +1,5 @@ package crazypants.enderio.machine.killera; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; @@ -14,89 +8,103 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.PacketGivePlayerXP; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerEvent; /** * Name proudly created by Xaw4 */ public class BlockKillerJoe extends AbstractMachineBlock { - static final String USERNAME = "KillerJoe"; - - public static BlockKillerJoe create() { - PacketHandler.INSTANCE.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT); - PacketGivePlayerXP.register(); - PacketExperianceContainer.register(); - - BlockKillerJoe res = new BlockKillerJoe(); - MinecraftForge.EVENT_BUS.register(res); - res.init(); - return res; - } + static final String USERNAME = "KillerJoe"; - protected BlockKillerJoe() { - super(ModObject.blockKillerJoe, TileKillerJoe.class); - setStepSound(Block.soundTypeGlass); - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - return 2000; - } - - @SubscribeEvent - public void getKillDisplayName(PlayerEvent.NameFormat nameEvt) { - if(nameEvt.username != null && nameEvt.username.startsWith(USERNAME)) { - nameEvt.displayname = getLocalizedName(); + public static BlockKillerJoe create() { + PacketHandler.INSTANCE.registerMessage( + PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT); + PacketGivePlayerXP.register(); + PacketExperianceContainer.register(); + + BlockKillerJoe res = new BlockKillerJoe(); + MinecraftForge.EVENT_BUS.register(res); + res.init(); + return res; } - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new ContainerKillerJoe(player.inventory, (TileKillerJoe) world.getTileEntity(x, y, z)); - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiKillerJoe(player.inventory, (TileKillerJoe) world.getTileEntity(x, y, z)); - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_KILLER_JOE; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - return "enderio:blankMachinePanel"; - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - protected short getFacingForHeading(int heading) { - switch (heading) { - case 0: - return 3; - case 1: - return 4; - case 2: - return 2; - case 3: - default: - return 5; + protected BlockKillerJoe() { + super(ModObject.blockKillerJoe, TileKillerJoe.class); + setStepSound(Block.soundTypeGlass); + } + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + return 2000; + } + + @SubscribeEvent + public void getKillDisplayName(PlayerEvent.NameFormat nameEvt) { + if (nameEvt.username != null && nameEvt.username.startsWith(USERNAME)) { + nameEvt.displayname = getLocalizedName(); + } + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerKillerJoe(player.inventory, (TileKillerJoe) world.getTileEntity(x, y, z)); + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiKillerJoe(player.inventory, (TileKillerJoe) world.getTileEntity(x, y, z)); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_KILLER_JOE; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return "enderio:blankMachinePanel"; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + protected short getFacingForHeading(int heading) { + switch (heading) { + case 0: + return 3; + case 1: + return 4; + case 2: + return 2; + case 3: + default: + return 5; + } } - } - } diff --git a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java index 6201b7a7..5ca65013 100644 --- a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java @@ -1,42 +1,44 @@ package crazypants.enderio.machine.killera; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import java.util.List; import java.util.Random; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; - -import crazypants.enderio.item.darksteel.DarkSteelItems; -import crazypants.enderio.machine.gui.AbstractMachineContainer; - public class ContainerKillerJoe extends AbstractMachineContainer { - static private final Item[] slotItems = { Items.wooden_sword, Items.stone_sword, Items.iron_sword, Items.golden_sword, - Items.diamond_sword, DarkSteelItems.itemDarkSteelSword }; - static private final Random rand = new Random(); + private static final Item[] slotItems = { + Items.wooden_sword, + Items.stone_sword, + Items.iron_sword, + Items.golden_sword, + Items.diamond_sword, + DarkSteelItems.itemDarkSteelSword + }; + private static final Random rand = new Random(); - public ContainerKillerJoe(InventoryPlayer playerInv, TileKillerJoe te) { - super(playerInv, te); - } + public ContainerKillerJoe(InventoryPlayer playerInv, TileKillerJoe te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 80, 25) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 80, 25)); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 80, 25) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 80, 25)); + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index 0f9d0940..f408adb1 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -1,116 +1,115 @@ package crazypants.enderio.machine.killera; -import java.awt.Rectangle; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.SoundUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiMachineBase; -import crazypants.enderio.machine.invpanel.InventoryPanelContainer; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketGivePlayerXP; +import java.awt.Rectangle; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiKillerJoe extends GuiMachineBase { - private static final int XP_ID = 3489; - private static final int XP10_ID = 34892; + private static final int XP_ID = 3489; + private static final int XP10_ID = 34892; - private IconButton xpB; - private IconButton xp10B; + private IconButton xpB; + private IconButton xp10B; - public GuiKillerJoe(InventoryPlayer inventory, final TileKillerJoe tileEntity) { - super(tileEntity, new ContainerKillerJoe(inventory, tileEntity), "killerJoe"); + public GuiKillerJoe(InventoryPlayer inventory, final TileKillerJoe tileEntity) { + super(tileEntity, new ContainerKillerJoe(inventory, tileEntity), "killerJoe"); - addToolTip(new GuiToolTip(new Rectangle(18, 11, 15, 47), "") { + addToolTip(new GuiToolTip(new Rectangle(18, 11, 15, 47), "") { - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("killerJoe.fuelTank"); - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); - if(tileEntity.fuelTank.getFluidAmount() < tileEntity.getActivationAmount()) { - text.add(EnderIO.lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("killerJoe.fuelTank"); + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); + if (tileEntity.fuelTank.getFluidAmount() < tileEntity.getActivationAmount()) { + text.add(EnderIO.lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); + } + } + }); + + xpB = new IconButton(this, XP_ID, 128, 56, IconEIO.XP); + xpB.setToolTip(EnderIO.lang.localize("killerJoe.giveXp.tooltip")); + + xp10B = new IconButton(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); + xp10B.setToolTip(EnderIO.lang.localize("killerJoe.giveXp10.tooltip")); + } + + @Override + public void initGui() { + super.initGui(); + xpB.onGuiInit(); + xp10B.onGuiInit(); + ((ContainerKillerJoe) inventorySlots).createGhostSlots(getGhostSlots()); + } + + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == XP_ID) { + PacketHandler.INSTANCE.sendToServer(new PacketGivePlayerXP(getTileEntity(), 1)); + SoundUtil.playClientSoundFX("random.orb", getTileEntity()); + } else if (b.id == XP10_ID) { + PacketHandler.INSTANCE.sendToServer(new PacketGivePlayerXP(getTileEntity(), 10)); + SoundUtil.playClientSoundFX("random.orb", getTileEntity()); } - } - - }); - - xpB = new IconButton(this, XP_ID, 128, 56, IconEIO.XP); - xpB.setToolTip(EnderIO.lang.localize("killerJoe.giveXp.tooltip")); - - xp10B = new IconButton(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); - xp10B.setToolTip(EnderIO.lang.localize("killerJoe.giveXp10.tooltip")); - - } - - @Override - public void initGui() { - super.initGui(); - xpB.onGuiInit(); - xp10B.onGuiInit(); - ((ContainerKillerJoe) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == XP_ID) { - PacketHandler.INSTANCE.sendToServer(new PacketGivePlayerXP(getTileEntity(), 1)); - SoundUtil.playClientSoundFX("random.orb", getTileEntity()); - } else if(b.id == XP10_ID) { - PacketHandler.INSTANCE.sendToServer(new PacketGivePlayerXP(getTileEntity(), 10)); - SoundUtil.playClientSoundFX("random.orb", getTileEntity()); - } - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - public void renderSlotHighlights(IoMode mode) { - super.renderSlotHighlights(mode); - - if(mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { - int x = 16; - int y = 9; - int w = 15 + 4; - int h = 47 + 4; - renderSlotHighlight(PULL_COLOR, x, y, w, h); } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - int x = guiLeft + 18; - int y = guiTop + 11; - TileKillerJoe joe = getTileEntity(); - if(joe.fuelTank.getFluidAmount() > 0) { - RenderUtil.renderGuiTank(joe.fuelTank.getFluid(), joe.fuelTank.getCapacity(), joe.fuelTank.getFluidAmount(), x, y, zLevel, 16, 47); + @Override + protected boolean showRecipeButton() { + return false; } - ExperienceBarRenderer.render(this, sx + 56, sy + 62, 65, joe.getContainer()); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + @Override + public void renderSlotHighlights(IoMode mode) { + super.renderSlotHighlights(mode); + + if (mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { + int x = 16; + int y = 9; + int w = 15 + 4; + int h = 47 + 4; + renderSlotHighlight(PULL_COLOR, x, y, w, h); + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + int x = guiLeft + 18; + int y = guiTop + 11; + TileKillerJoe joe = getTileEntity(); + if (joe.fuelTank.getFluidAmount() > 0) { + RenderUtil.renderGuiTank( + joe.fuelTank.getFluid(), + joe.fuelTank.getCapacity(), + joe.fuelTank.getFluidAmount(), + x, + y, + zLevel, + 16, + 47); + } + ExperienceBarRenderer.render(this, sx + 56, sy + 62, 65, joe.getContainer()); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java index cee9d8c6..3478601c 100644 --- a/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/killera/KillerJoeRenderer.java @@ -1,5 +1,13 @@ package crazypants.enderio.machine.killera; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.generator.zombie.ModelZombieJar; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; @@ -14,190 +22,177 @@ import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTank; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.generator.zombie.ModelZombieJar; - @SideOnly(Side.CLIENT) public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final String TEXTURE = "enderio:models/KillerJoe.png"; + private static final String TEXTURE = "enderio:models/KillerJoe.png"; - private static final ItemStack DEFAULT_SWORD = new ItemStack(Items.iron_sword); + private static final ItemStack DEFAULT_SWORD = new ItemStack(Items.iron_sword); - private ModelZombieJar model = new ModelZombieJar(); + private ModelZombieJar model = new ModelZombieJar(); - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - World world = te.getWorldObj(); - TileKillerJoe gen = (TileKillerJoe) te; - float swingProg = gen.getSwingProgress(tick); + World world = te.getWorldObj(); + TileKillerJoe gen = (TileKillerJoe) te; + float swingProg = gen.getSwingProgress(tick); - float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - renderModel(gen.facing); - renderSword(gen.facing, gen.getStackInSlot(0), swingProg); - renderFluid(gen); - GL11.glPopMatrix(); - - } - - private void renderSword(int facing, ItemStack sword, float swingProgress) { - - if(sword == null || sword.getIconIndex() == null) { - return; + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + renderModel(gen.facing); + renderSword(gen.facing, gen.getStackInSlot(0), swingProg); + renderFluid(gen); + GL11.glPopMatrix(); } - ForgeDirection dir = ForgeDirection.getOrientation(facing); - if(dir == ForgeDirection.SOUTH) { - facing = 0; - } else if(dir == ForgeDirection.WEST) { - facing = -1; + private void renderSword(int facing, ItemStack sword, float swingProgress) { + + if (sword == null || sword.getIconIndex() == null) { + return; + } + + ForgeDirection dir = ForgeDirection.getOrientation(facing); + if (dir == ForgeDirection.SOUTH) { + facing = 0; + } else if (dir == ForgeDirection.WEST) { + facing = -1; + } + + // Sword + GL11.glPushMatrix(); + + GL11.glTranslatef(0.5f, 0, 0.5f); + float offset = 90f; + if (dir.offsetX != 0) { + offset *= -1; + } + + GL11.glRotatef((facing * -90F) + offset, 0F, 1F, 0F); + GL11.glTranslatef(-0.5f, 0, -0.5F); + + GL11.glPushMatrix(); + if (swingProgress > 0) { + float f6 = MathHelper.sin(swingProgress * swingProgress * (float) Math.PI); + float f7 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float) Math.PI); + GL11.glRotatef(f6 * 5.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(f7 * 50.0F, 0.0F, 0.0F, 1.0F); + } + GL11.glTranslatef(-0.255f, 0.2f, 0.05f); + + RenderUtil.bindItemTexture(); + + IIcon icon = sword.getIconIndex(); + float f9 = 0.0625F; + float minU = icon.getMinU(); + float maxU = icon.getMaxU(); + float minV = icon.getMinV(); + float maxV = icon.getMaxV(); + ItemRenderer.renderItemIn2D( + Tessellator.instance, maxU, minV, minU, maxV, icon.getIconWidth(), icon.getIconHeight(), f9); + + GL11.glPopMatrix(); + GL11.glPopMatrix(); } - //Sword - GL11.glPushMatrix(); + protected void renderFluid(TileKillerJoe gen) { + FluidTank tank = gen.fuelTank; + if (tank.getFluidAmount() <= 0) { + return; + } + IIcon icon = tank.getFluid().getFluid().getStillIcon(); + if (icon != null) { + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); - GL11.glTranslatef(0.5f, 0, 0.5f); - float offset = 90f; - if(dir.offsetX != 0) { - offset *= -1; + float fullness = (float) (tank.getFluidAmount()) / (tank.getCapacity()); + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85); + bb = bb.scale(1, 0.85 * fullness, 1); + float ty = -(0.85f - (bb.maxY - bb.minY)) / 2; + + Vector3d offset = ForgeDirectionOffsets.offsetScaled(ForgeDirection.values()[gen.facing], -0.075); + bb = bb.translate((float) offset.x, ty, (float) offset.z); + + int brightness; + if (gen.getWorldObj() == null) { + brightness = 15 << 20 | 15 << 4; + } else { + brightness = gen.getWorldObj().getLightBrightnessForSkyBlocks(gen.xCoord, gen.yCoord, gen.zCoord, 0); + } + tes.setBrightness(brightness); + tes.setColorOpaque_F(1, 1, 1); + + CubeRenderer.render(bb, icon); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + GL11.glColor3f(1, 1, 1); + + tes.draw(); + GL11.glDepthMask(true); + GL11.glPopAttrib(); + } } - GL11.glRotatef((facing * -90F) + offset, 0F, 1F, 0F); - GL11.glTranslatef(-0.5f, 0, -0.5F); + private void renderModel(int facing) { - GL11.glPushMatrix(); - if(swingProgress > 0) { - float f6 = MathHelper.sin(swingProgress * swingProgress * (float) Math.PI); - float f7 = MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float) Math.PI); - GL11.glRotatef(f6 * 5.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(f7 * 50.0F, 0.0F, 0.0F, 1.0F); + GL11.glPushMatrix(); + + GL11.glTranslatef(0.5F, 0, 0.5F); + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glScalef(1.2f, 0.9f, 1.2f); + + ForgeDirection dir = ForgeDirection.getOrientation(facing); + if (dir == ForgeDirection.SOUTH) { + facing = 0; + } else if (dir == ForgeDirection.WEST) { + facing = -1; + } + GL11.glRotatef(facing * -90F, 0F, 1F, 0F); + + RenderUtil.bindTexture(TEXTURE); + model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + + GL11.glTranslatef(-0.5F, 0, -0.5F); + GL11.glPopMatrix(); } - GL11.glTranslatef(-0.255f, 0.2f, 0.05f); - RenderUtil.bindItemTexture(); - - IIcon icon = sword.getIconIndex(); - float f9 = 0.0625F; - float minU = icon.getMinU(); - float maxU = icon.getMaxU(); - float minV = icon.getMinV(); - float maxV = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.instance, maxU, minV, minU, maxV, icon.getIconWidth(), icon.getIconHeight(), f9); - - GL11.glPopMatrix(); - GL11.glPopMatrix(); - - } - - protected void renderFluid(TileKillerJoe gen) { - FluidTank tank = gen.fuelTank; - if(tank.getFluidAmount() <= 0) { - return; + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - IIcon icon = tank.getFluid().getFluid().getStillIcon(); - if(icon != null) { - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - float fullness = (float) (tank.getFluidAmount()) / (tank.getCapacity()); - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85); - bb = bb.scale(1, 0.85 * fullness, 1); - float ty = -(0.85f - (bb.maxY - bb.minY)) / 2; - - Vector3d offset = ForgeDirectionOffsets.offsetScaled(ForgeDirection.values()[gen.facing], -0.075); - bb = bb.translate((float) offset.x, ty, (float) offset.z); - - int brightness; - if(gen.getWorldObj() == null) { - brightness = 15 << 20 | 15 << 4; - } else { - brightness = gen.getWorldObj().getLightBrightnessForSkyBlocks(gen.xCoord, gen.yCoord, gen.zCoord, 0); - } - tes.setBrightness(brightness); - tes.setColorOpaque_F(1, 1, 1); - - CubeRenderer.render(bb, icon); - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDepthMask(false); - GL11.glColor3f(1, 1, 1); - - tes.draw(); - GL11.glDepthMask(true); - GL11.glPopAttrib(); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - } - private void renderModel(int facing) { - - GL11.glPushMatrix(); - - GL11.glTranslatef(0.5F, 0, 0.5F); - GL11.glRotatef(180F, 1F, 0F, 0F); - GL11.glScalef(1.2f, 0.9f, 1.2f); - - ForgeDirection dir = ForgeDirection.getOrientation(facing); - if(dir == ForgeDirection.SOUTH) { - facing = 0; - } else if(dir == ForgeDirection.WEST) { - facing = -1; + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderItem(0, 0, 0); } - GL11.glRotatef(facing * -90F, 0F, 1F, 0F); - RenderUtil.bindTexture(TEXTURE); - model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - - GL11.glTranslatef(-0.5F, 0, -0.5F); - GL11.glPopMatrix(); - - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderItem(0, 0, 0); - } - - private void renderItem(float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - renderModel(ForgeDirection.EAST.ordinal()); - renderSword(ForgeDirection.EAST.ordinal(), DEFAULT_SWORD, 0); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + renderModel(ForgeDirection.EAST.ordinal()); + renderSword(ForgeDirection.EAST.ordinal(), DEFAULT_SWORD, 0); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java index c8dc6322..6da89bdf 100644 --- a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java +++ b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java @@ -1,32 +1,27 @@ package crazypants.enderio.machine.killera; -import net.minecraft.entity.player.EntityPlayer; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import net.minecraft.entity.player.EntityPlayer; public class PacketSwing extends MessageTileEntity implements IMessageHandler { - public PacketSwing() { - } + public PacketSwing() {} - public PacketSwing(TileKillerJoe tile) { - super(tile); - } - - @Override - public IMessage onMessage(PacketSwing message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileKillerJoe tile = message.getTileEntity(player.worldObj); - if (tile != null) { - tile.swingWeapon(); + public PacketSwing(TileKillerJoe tile) { + super(tile); } - return null; - } - + @Override + public IMessage onMessage(PacketSwing message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileKillerJoe tile = message.getTileEntity(player.worldObj); + if (tile != null) { + tile.swingWeapon(); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 5e1f9f85..2acf5223 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -1,9 +1,33 @@ package crazypants.enderio.machine.killera; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; +import com.google.common.collect.Sets; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.FakePlayerEIO; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; +import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; +import crazypants.enderio.machine.wireless.WirelessChargedLocation; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.SmartTank; +import crazypants.enderio.xp.ExperienceContainer; +import crazypants.enderio.xp.IHaveExperience; +import crazypants.enderio.xp.PacketExperianceContainer; +import crazypants.enderio.xp.XpUtil; import java.util.List; import java.util.Set; import java.util.UUID; - import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -28,576 +52,557 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector3d; -import com.google.common.collect.Sets; -import com.mojang.authlib.GameProfile; +public class TileKillerJoe extends AbstractMachineEntity + implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.FakePlayerEIO; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.zombie.IHasNutrientTank; -import crazypants.enderio.machine.generator.zombie.PacketNutrientTank; -import crazypants.enderio.machine.wireless.WirelessChargedLocation; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.tool.SmartTank; -import crazypants.enderio.xp.ExperienceContainer; -import crazypants.enderio.xp.IHaveExperience; -import crazypants.enderio.xp.PacketExperianceContainer; -import crazypants.enderio.xp.XpUtil; + public static class ZombieCache { -public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience, ITankAccess, IHasNutrientTank { + private Set cache = Sets.newHashSet(); - public static class ZombieCache { - - private Set cache = Sets.newHashSet(); - - @SubscribeEvent - public void onSummonAid(SummonAidEvent event) { - if (!cache.isEmpty() && cache.remove(event.getSummoner())) { - event.setResult(Result.DENY); - } - } - } - - public static ZombieCache zCache; - - private static final int IO_MB_TICK = 250; - - protected AxisAlignedBB killBounds; - - private int[] frontFaceAndSides; - - protected AxisAlignedBB hooverBounds; - - protected FakePlayer attackera; - - protected WirelessChargedLocation chargedLocation; - - final SmartTank fuelTank = new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); - - int lastFluidLevelUpdate; - - private boolean tanksDirty; - - private boolean isSwingInProgress; - - private int swingProgressInt; - - private float swingProgress; - - private float prevSwingProgress; - - private final ExperienceContainer xpCon = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.killerJoeMaxXpLevel)); - - private boolean hadSword; - - public TileKillerJoe() { - super(new SlotDefinition(1, 0, 0)); - if (zCache == null) { - zCache = new ZombieCache(); - MinecraftForge.EVENT_BUS.register(zCache); - } - } - - @Override - public String getMachineName() { - return ModObject.blockKillerJoe.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null) { - return false; - } - return itemstack.getItem() instanceof ItemSword; - } - - @Override - public boolean isActive() { - return false; - } - - @Override - public void doUpdate() { - updateArmSwingProgress(); - hooverXP(); - if (!worldObj.isRemote) { - getAttackera().onUpdate(); - if(inventory[0] != null != hadSword) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - hadSword = inventory[0] != null; - } - } - super.doUpdate(); - } - - @Override - public ExperienceContainer getContainer() { - return xpCon; - } - - private static final int[] slots = new int[1]; - - @Override - public int[] getAccessibleSlotsFromSide(int var1) { - return slots; - } - - @Override - public boolean canExtractItem(int slot, ItemStack itemstack, int side) { - if(isSideDisabled(side)) { - return false; - } - if(inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) { - return false; - } - return itemstack.getItem() == inventory[slot].getItem(); - } - - @SuppressWarnings("unchecked") - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - - if(!shouldDoWorkThisTick(10)) { - return false; - } - - if(tanksDirty) { - PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); - tanksDirty = false; - } - if(xpCon.isDirty()) { - PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); - xpCon.setDirty(false); - } - - if(!redstoneCheckPassed) { - return false; - } - - if(fuelTank.getFluidAmount() < getActivationAmount()) { - return false; - } - - if(getStackInSlot(0) == null) { - return false; - } - - List entsInBounds = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, getKillBounds()); - if(!entsInBounds.isEmpty()) { - - for (EntityLivingBase ent : entsInBounds) { - if(!ent.isDead && ent.deathTime <= 0 && !ent.isEntityInvulnerable() && ent.hurtResistantTime == 0) { - if(ent instanceof EntityPlayer && ((EntityPlayer) ent).capabilities.disableDamage) { - continue; //Ignore players in creative, can't damage them; - } - boolean togglePvp = false; - if (ent instanceof EntityPlayer && !MinecraftServer.getServer().isPVPEnabled()) { - if (Config.killerPvPoffDisablesSwing) { - continue; - } else if (Config.killerPvPoffIsIgnored) { - togglePvp = true; + @SubscribeEvent + public void onSummonAid(SummonAidEvent event) { + if (!cache.isEmpty() && cache.remove(event.getSummoner())) { + event.setResult(Result.DENY); } - } - if(Config.killerJoeMustSee && !canJoeSee(ent)) { - continue; - } - - if(ent instanceof EntityZombie) { - zCache.cache.add((EntityZombie) ent); - } - FakePlayer fakee = getAttackera(); - fakee.setCurrentItemOrArmor(0, getStackInSlot(0)); - try { - if (togglePvp) { - MinecraftServer.getServer().setAllowPvp(true); - } - fakee.attackTargetEntityWithCurrentItem(ent); - } finally { - if (togglePvp) { - MinecraftServer.getServer().setAllowPvp(false); - } - } - useNutrient(); - swingWeapon(); - if(getStackInSlot(0).stackSize <= 0 || fakee.getCurrentEquippedItem() == null) { - setInventorySlotContents(0, null); - } - return false; } - } } - return false; - } - - int getActivationAmount() { - return (int) (fuelTank.getCapacity() * 0.7f); - } - private boolean canJoeSee(EntityLivingBase ent) - { - Vec3 entPos = Vec3.createVectorHelper(ent.posX, ent.posY + (double) ent.getEyeHeight(), ent.posZ); - for (int facing : frontFaceAndSides) - { - if(this.worldObj.rayTraceBlocks( - Vec3.createVectorHelper(this.xCoord + faceMidPoints[facing][0], this.yCoord + faceMidPoints[facing][1], this.zCoord + faceMidPoints[facing][2]), - entPos) == null) - return true; - } - return false; - } + public static ZombieCache zCache; - @Override - public void setFacing(short facing) - { - super.setFacing(facing); - frontFaceAndSides = new int[] { this.facing, ForgeDirection.ROTATION_MATRIX[0][this.facing], ForgeDirection.ROTATION_MATRIX[1][this.facing] }; - } + private static final int IO_MB_TICK = 250; - private static final double[][] faceMidPoints = new double[][] { { 0.5D, 0.0D, 0.5D }, { 0.5D, 1.0D, 0.5D }, { 0.5D, 0.5D, 0.0D }, { 0.5D, 0.5D, 1.0D }, - { 0.0D, 0.5D, 0.5D }, { 1.0D, 0.5D, 0.5D } }; + protected AxisAlignedBB killBounds; - //------------------------------- XP + private int[] frontFaceAndSides; - public ExperienceContainer getXpContainer() { - return xpCon; - } + protected AxisAlignedBB hooverBounds; - private void hooverXP() { + protected FakePlayer attackera; - double maxDist = Config.killerJoeHooverXpLength; + protected WirelessChargedLocation chargedLocation; - List xp = worldObj.selectEntitiesWithinAABB(EntityXPOrb.class, getHooverBounds(), this); + final SmartTank fuelTank = + new SmartTank(EnderIO.fluidNutrientDistillation, FluidContainerRegistry.BUCKET_VOLUME * 2); - for (EntityXPOrb entity : xp) { - double xDist = (xCoord + 0.5D - entity.posX); - double yDist = (yCoord + 0.5D - entity.posY); - double zDist = (zCoord + 0.5D - entity.posZ); + int lastFluidLevelUpdate; - double totalDistance = Math.sqrt(xDist * xDist + yDist * yDist + zDist * zDist); + private boolean tanksDirty; - if(totalDistance < 1.5) { - hooverXP(entity); - } else { - double d = 1 - (Math.max(0.1, totalDistance) / maxDist); - double speed = 0.01 + (d * 0.02); + private boolean isSwingInProgress; - entity.motionX += xDist / totalDistance * speed; - entity.motionZ += zDist / totalDistance * speed; - entity.motionY += yDist / totalDistance * speed; - if(yDist > 0.5) { - entity.motionY = 0.12; + private int swingProgressInt; + + private float swingProgress; + + private float prevSwingProgress; + + private final ExperienceContainer xpCon = + new ExperienceContainer(XpUtil.getExperienceForLevel(Config.killerJoeMaxXpLevel)); + + private boolean hadSword; + + public TileKillerJoe() { + super(new SlotDefinition(1, 0, 0)); + if (zCache == null) { + zCache = new ZombieCache(); + MinecraftForge.EVENT_BUS.register(zCache); } - - } - } - } - - private void hooverXP(EntityXPOrb entity) { - if(!worldObj.isRemote) { - if(!entity.isDead) { - xpCon.addExperience(entity.getXpValue()); - entity.setDead(); - } - } - } - - @Override - public boolean isEntityApplicable(Entity arg0) { - return true; - } - - //------------------------------- Weapon stuffs - - void swingWeapon() { - if(getStackInSlot(0) == null) { - return; - } - if(!isSwingInProgress || swingProgressInt >= getArmSwingAnimationEnd() / 2 || swingProgressInt < 0) { - swingProgressInt = -1; - isSwingInProgress = true; - if(worldObj instanceof WorldServer) { - PacketHandler.sendToAllAround(new PacketSwing(this), this); - } - } - } - - float getSwingProgress(float p_70678_1_) { - float f1 = swingProgress - prevSwingProgress; - - if(f1 < 0.0F) { - ++f1; - } - - return prevSwingProgress + f1 * p_70678_1_; - } - - private void updateArmSwingProgress() { - - prevSwingProgress = swingProgress; - - int i = getArmSwingAnimationEnd(); - if(isSwingInProgress) { - ++swingProgressInt; - if(swingProgressInt >= i) { - swingProgressInt = 0; - isSwingInProgress = false; - } - } else { - swingProgressInt = 0; - } - swingProgress = (float) swingProgressInt / (float) i; - } - - private int getArmSwingAnimationEnd() { - return 6; - } - - FakePlayer getAttackera() { - if(attackera == null) { - attackera = new Attackera(); - } - return attackera; - } - - WirelessChargedLocation getChargedLocation() { - if(chargedLocation == null) { - chargedLocation = new WirelessChargedLocation(this); - } - return chargedLocation; - } - - private AxisAlignedBB getKillBounds() { - if(killBounds == null) { - BoundingBox bb = new BoundingBox(getLocation()); - Vector3d min = bb.getMin(); - Vector3d max = bb.getMax(); - max.y += Config.killerJoeAttackHeight; - min.y -= Config.killerJoeAttackHeight; - - ForgeDirection facingDir = ForgeDirection.getOrientation(facing); - if(ForgeDirectionOffsets.isPositiveOffset(facingDir)) { - max.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeAttackLength)); - min.add(ForgeDirectionOffsets.forDir(facingDir)); - } else { - min.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeAttackLength)); - max.add(ForgeDirectionOffsets.forDir(facingDir)); - - } - if(facingDir.offsetX == 0) { - min.x -= Config.killerJoeAttackWidth; - max.x += Config.killerJoeAttackWidth; - } else { - min.z -= Config.killerJoeAttackWidth; - max.z += Config.killerJoeAttackWidth; - } - killBounds = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - } - return killBounds; - } - - private AxisAlignedBB getHooverBounds() { - if(hooverBounds == null) { - BoundingBox bb = new BoundingBox(getLocation()); - Vector3d min = bb.getMin(); - Vector3d max = bb.getMax(); - max.y += Config.killerJoeAttackHeight; - min.y -= Config.killerJoeAttackHeight; - - ForgeDirection facingDir = ForgeDirection.getOrientation(facing); - if(ForgeDirectionOffsets.isPositiveOffset(facingDir)) { - max.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeHooverXpLength)); - min.add(ForgeDirectionOffsets.forDir(facingDir)); - } else { - min.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeHooverXpLength)); - max.add(ForgeDirectionOffsets.forDir(facingDir)); - - } - if(facingDir.offsetX == 0) { - min.x -= Config.killerJoeHooverXpWidth * 2; - max.x += Config.killerJoeHooverXpWidth * 2; - } else { - min.z -= Config.killerJoeHooverXpWidth * 2; - max.z += Config.killerJoeHooverXpWidth * 2; - } - hooverBounds = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - } - return hooverBounds; - } - - //------------------------------- Fluid Stuff - - private void useNutrient() { - fuelTank.drain(Config.killerJoeNutrientUsePerAttackMb, true); - tanksDirty = true; - } - - @Override - protected boolean doPull(ForgeDirection dir) { - boolean res = super.doPull(dir); - // BlockCoord loc = getLocation().getLocation(dir); - // IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - // if(target != null) { - // FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); - // if(infos != null) { - // for (FluidTankInfo info : infos) { - // if(info.fluid != null && info.fluid.amount > 0) { - // if(canFill(dir, info.fluid.getFluid())) { - // FluidStack canPull = info.fluid.copy(); - // canPull.amount = Math.min(IO_MB_TICK, canPull.amount); - // FluidStack drained = target.drain(dir.getOpposite(), canPull, false); - // if(drained != null && drained.amount > 0) { - // int filled = fill(dir, drained, false); - // if(filled > 0) { - // drained = target.drain(dir.getOpposite(), filled, true); - // fill(dir, drained, true); - // return res; - // } - // } - // } - // } - // } - // } - // } - FluidUtil.doPull(this, dir, IO_MB_TICK); - return res; - } - - @Override - protected boolean doPush(ForgeDirection dir) { - boolean res = super.doPush(dir); - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - FluidStack canDrain = drain(dir, IO_MB_TICK, false); - if(canDrain != null && canDrain.amount > 0) { - int drained = target.fill(dir.getOpposite(), canDrain, true); - if(drained > 0) { - drain(dir, drained, true); - } - } - } - return res; - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - int res = fuelTank.fill(resource, doFill); - if(res > 0 && doFill) { - tanksDirty = true; - } - return res; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return fuelTank.canFill(fluid); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { fuelTank.getInfo() }; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return xpCon.drain(from, resource, doDrain); - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return xpCon.drain(from, maxDrain, doDrain); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return xpCon.canDrain(from, fluid); - } - - //------------------------------- Save / Load - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - fuelTank.readCommon("fuelTank", nbtRoot); - xpCon.readFromNBT(nbtRoot); - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - fuelTank.writeCommon("fuelTank", nbtRoot); - xpCon.writeToNBT(nbtRoot); - } - - private static final UUID uuid = UUID.fromString("3baa66fa-a69a-11e4-89d3-123b93f75cba"); - private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioKillera]"); - - private class Attackera extends FakePlayerEIO { - - ItemStack prevWeapon; - - public Attackera() { - super(getWorldObj(), getLocation(), DUMMY_PROFILE); } @Override - public void onUpdate() { + public String getMachineName() { + return ModObject.blockKillerJoe.unlocalisedName; + } - setCurrentItemOrArmor(0, getStackInSlot(0)); + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + if (itemstack == null) { + return false; + } + return itemstack.getItem() instanceof ItemSword; + } - ItemStack prev = prevWeapon; - ItemStack cur = getCurrentEquippedItem(); - if(!ItemStack.areItemStacksEqual(cur, prev)) { - if(prev != null) { - getAttributeMap().removeAttributeModifiers(prev.getAttributeModifiers()); + @Override + public boolean isActive() { + return false; + } + + @Override + public void doUpdate() { + updateArmSwingProgress(); + hooverXP(); + if (!worldObj.isRemote) { + getAttackera().onUpdate(); + if (inventory[0] != null != hadSword) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + hadSword = inventory[0] != null; + } + } + super.doUpdate(); + } + + @Override + public ExperienceContainer getContainer() { + return xpCon; + } + + private static final int[] slots = new int[1]; + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + return slots; + } + + @Override + public boolean canExtractItem(int slot, ItemStack itemstack, int side) { + if (isSideDisabled(side)) { + return false; + } + if (inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) { + return false; + } + return itemstack.getItem() == inventory[slot].getItem(); + } + + @SuppressWarnings("unchecked") + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + + if (!shouldDoWorkThisTick(10)) { + return false; } - if(cur != null) { - getAttributeMap().applyAttributeModifiers(cur.getAttributeModifiers()); + if (tanksDirty) { + PacketHandler.sendToAllAround(new PacketNutrientTank(this), this); + tanksDirty = false; + } + if (xpCon.isDirty()) { + PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); + xpCon.setDirty(false); } - prevWeapon = cur == null ? null : cur.copy(); - } - getChargedLocation().chargeItems(inventory.mainInventory); + if (!redstoneCheckPassed) { + return false; + } + + if (fuelTank.getFluidAmount() < getActivationAmount()) { + return false; + } + + if (getStackInSlot(0) == null) { + return false; + } + + List entsInBounds = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, getKillBounds()); + if (!entsInBounds.isEmpty()) { + + for (EntityLivingBase ent : entsInBounds) { + if (!ent.isDead && ent.deathTime <= 0 && !ent.isEntityInvulnerable() && ent.hurtResistantTime == 0) { + if (ent instanceof EntityPlayer && ((EntityPlayer) ent).capabilities.disableDamage) { + continue; // Ignore players in creative, can't damage them; + } + boolean togglePvp = false; + if (ent instanceof EntityPlayer + && !MinecraftServer.getServer().isPVPEnabled()) { + if (Config.killerPvPoffDisablesSwing) { + continue; + } else if (Config.killerPvPoffIsIgnored) { + togglePvp = true; + } + } + if (Config.killerJoeMustSee && !canJoeSee(ent)) { + continue; + } + + if (ent instanceof EntityZombie) { + zCache.cache.add((EntityZombie) ent); + } + FakePlayer fakee = getAttackera(); + fakee.setCurrentItemOrArmor(0, getStackInSlot(0)); + try { + if (togglePvp) { + MinecraftServer.getServer().setAllowPvp(true); + } + fakee.attackTargetEntityWithCurrentItem(ent); + } finally { + if (togglePvp) { + MinecraftServer.getServer().setAllowPvp(false); + } + } + useNutrient(); + swingWeapon(); + if (getStackInSlot(0).stackSize <= 0 || fakee.getCurrentEquippedItem() == null) { + setInventorySlotContents(0, null); + } + return false; + } + } + } + return false; } - } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null && forFluidType.getFluid() == EnderIO.fluidNutrientDistillation) { - return fuelTank; + int getActivationAmount() { + return (int) (fuelTank.getCapacity() * 0.7f); } - /* - * if (forFluidType != null && forFluidType.getFluid() == - * EnderIO.fluidXpJuice) { return xpCon; } - */ - return null; - } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { xpCon /* , fuelTank */}; - } + private boolean canJoeSee(EntityLivingBase ent) { + Vec3 entPos = Vec3.createVectorHelper(ent.posX, ent.posY + (double) ent.getEyeHeight(), ent.posZ); + for (int facing : frontFaceAndSides) { + if (this.worldObj.rayTraceBlocks( + Vec3.createVectorHelper( + this.xCoord + faceMidPoints[facing][0], + this.yCoord + faceMidPoints[facing][1], + this.zCoord + faceMidPoints[facing][2]), + entPos) + == null) return true; + } + return false; + } - @Override - public void setTanksDirty() { - tanksDirty = true; - } + @Override + public void setFacing(short facing) { + super.setFacing(facing); + frontFaceAndSides = new int[] { + this.facing, ForgeDirection.ROTATION_MATRIX[0][this.facing], ForgeDirection.ROTATION_MATRIX[1][this.facing] + }; + } - @Override - public SmartTank getNutrientTank() { - return fuelTank; - } + private static final double[][] faceMidPoints = new double[][] { + {0.5D, 0.0D, 0.5D}, + {0.5D, 1.0D, 0.5D}, + {0.5D, 0.5D, 0.0D}, + {0.5D, 0.5D, 1.0D}, + {0.0D, 0.5D, 0.5D}, + {1.0D, 0.5D, 0.5D} + }; + // ------------------------------- XP + + public ExperienceContainer getXpContainer() { + return xpCon; + } + + private void hooverXP() { + + double maxDist = Config.killerJoeHooverXpLength; + + List xp = worldObj.selectEntitiesWithinAABB(EntityXPOrb.class, getHooverBounds(), this); + + for (EntityXPOrb entity : xp) { + double xDist = (xCoord + 0.5D - entity.posX); + double yDist = (yCoord + 0.5D - entity.posY); + double zDist = (zCoord + 0.5D - entity.posZ); + + double totalDistance = Math.sqrt(xDist * xDist + yDist * yDist + zDist * zDist); + + if (totalDistance < 1.5) { + hooverXP(entity); + } else { + double d = 1 - (Math.max(0.1, totalDistance) / maxDist); + double speed = 0.01 + (d * 0.02); + + entity.motionX += xDist / totalDistance * speed; + entity.motionZ += zDist / totalDistance * speed; + entity.motionY += yDist / totalDistance * speed; + if (yDist > 0.5) { + entity.motionY = 0.12; + } + } + } + } + + private void hooverXP(EntityXPOrb entity) { + if (!worldObj.isRemote) { + if (!entity.isDead) { + xpCon.addExperience(entity.getXpValue()); + entity.setDead(); + } + } + } + + @Override + public boolean isEntityApplicable(Entity arg0) { + return true; + } + + // ------------------------------- Weapon stuffs + + void swingWeapon() { + if (getStackInSlot(0) == null) { + return; + } + if (!isSwingInProgress || swingProgressInt >= getArmSwingAnimationEnd() / 2 || swingProgressInt < 0) { + swingProgressInt = -1; + isSwingInProgress = true; + if (worldObj instanceof WorldServer) { + PacketHandler.sendToAllAround(new PacketSwing(this), this); + } + } + } + + float getSwingProgress(float p_70678_1_) { + float f1 = swingProgress - prevSwingProgress; + + if (f1 < 0.0F) { + ++f1; + } + + return prevSwingProgress + f1 * p_70678_1_; + } + + private void updateArmSwingProgress() { + + prevSwingProgress = swingProgress; + + int i = getArmSwingAnimationEnd(); + if (isSwingInProgress) { + ++swingProgressInt; + if (swingProgressInt >= i) { + swingProgressInt = 0; + isSwingInProgress = false; + } + } else { + swingProgressInt = 0; + } + swingProgress = (float) swingProgressInt / (float) i; + } + + private int getArmSwingAnimationEnd() { + return 6; + } + + FakePlayer getAttackera() { + if (attackera == null) { + attackera = new Attackera(); + } + return attackera; + } + + WirelessChargedLocation getChargedLocation() { + if (chargedLocation == null) { + chargedLocation = new WirelessChargedLocation(this); + } + return chargedLocation; + } + + private AxisAlignedBB getKillBounds() { + if (killBounds == null) { + BoundingBox bb = new BoundingBox(getLocation()); + Vector3d min = bb.getMin(); + Vector3d max = bb.getMax(); + max.y += Config.killerJoeAttackHeight; + min.y -= Config.killerJoeAttackHeight; + + ForgeDirection facingDir = ForgeDirection.getOrientation(facing); + if (ForgeDirectionOffsets.isPositiveOffset(facingDir)) { + max.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeAttackLength)); + min.add(ForgeDirectionOffsets.forDir(facingDir)); + } else { + min.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeAttackLength)); + max.add(ForgeDirectionOffsets.forDir(facingDir)); + } + if (facingDir.offsetX == 0) { + min.x -= Config.killerJoeAttackWidth; + max.x += Config.killerJoeAttackWidth; + } else { + min.z -= Config.killerJoeAttackWidth; + max.z += Config.killerJoeAttackWidth; + } + killBounds = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + } + return killBounds; + } + + private AxisAlignedBB getHooverBounds() { + if (hooverBounds == null) { + BoundingBox bb = new BoundingBox(getLocation()); + Vector3d min = bb.getMin(); + Vector3d max = bb.getMax(); + max.y += Config.killerJoeAttackHeight; + min.y -= Config.killerJoeAttackHeight; + + ForgeDirection facingDir = ForgeDirection.getOrientation(facing); + if (ForgeDirectionOffsets.isPositiveOffset(facingDir)) { + max.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeHooverXpLength)); + min.add(ForgeDirectionOffsets.forDir(facingDir)); + } else { + min.add(ForgeDirectionOffsets.offsetScaled(facingDir, Config.killerJoeHooverXpLength)); + max.add(ForgeDirectionOffsets.forDir(facingDir)); + } + if (facingDir.offsetX == 0) { + min.x -= Config.killerJoeHooverXpWidth * 2; + max.x += Config.killerJoeHooverXpWidth * 2; + } else { + min.z -= Config.killerJoeHooverXpWidth * 2; + max.z += Config.killerJoeHooverXpWidth * 2; + } + hooverBounds = AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + } + return hooverBounds; + } + + // ------------------------------- Fluid Stuff + + private void useNutrient() { + fuelTank.drain(Config.killerJoeNutrientUsePerAttackMb, true); + tanksDirty = true; + } + + @Override + protected boolean doPull(ForgeDirection dir) { + boolean res = super.doPull(dir); + // BlockCoord loc = getLocation().getLocation(dir); + // IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + // if(target != null) { + // FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + // if(infos != null) { + // for (FluidTankInfo info : infos) { + // if(info.fluid != null && info.fluid.amount > 0) { + // if(canFill(dir, info.fluid.getFluid())) { + // FluidStack canPull = info.fluid.copy(); + // canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + // FluidStack drained = target.drain(dir.getOpposite(), canPull, false); + // if(drained != null && drained.amount > 0) { + // int filled = fill(dir, drained, false); + // if(filled > 0) { + // drained = target.drain(dir.getOpposite(), filled, true); + // fill(dir, drained, true); + // return res; + // } + // } + // } + // } + // } + // } + // } + FluidUtil.doPull(this, dir, IO_MB_TICK); + return res; + } + + @Override + protected boolean doPush(ForgeDirection dir) { + boolean res = super.doPush(dir); + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { + FluidStack canDrain = drain(dir, IO_MB_TICK, false); + if (canDrain != null && canDrain.amount > 0) { + int drained = target.fill(dir.getOpposite(), canDrain, true); + if (drained > 0) { + drain(dir, drained, true); + } + } + } + return res; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + int res = fuelTank.fill(resource, doFill); + if (res > 0 && doFill) { + tanksDirty = true; + } + return res; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return fuelTank.canFill(fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {fuelTank.getInfo()}; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return xpCon.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return xpCon.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return xpCon.canDrain(from, fluid); + } + + // ------------------------------- Save / Load + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + fuelTank.readCommon("fuelTank", nbtRoot); + xpCon.readFromNBT(nbtRoot); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + fuelTank.writeCommon("fuelTank", nbtRoot); + xpCon.writeToNBT(nbtRoot); + } + + private static final UUID uuid = UUID.fromString("3baa66fa-a69a-11e4-89d3-123b93f75cba"); + private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioKillera]"); + + private class Attackera extends FakePlayerEIO { + + ItemStack prevWeapon; + + public Attackera() { + super(getWorldObj(), getLocation(), DUMMY_PROFILE); + } + + @Override + public void onUpdate() { + + setCurrentItemOrArmor(0, getStackInSlot(0)); + + ItemStack prev = prevWeapon; + ItemStack cur = getCurrentEquippedItem(); + if (!ItemStack.areItemStacksEqual(cur, prev)) { + if (prev != null) { + getAttributeMap().removeAttributeModifiers(prev.getAttributeModifiers()); + } + + if (cur != null) { + getAttributeMap().applyAttributeModifiers(cur.getAttributeModifiers()); + } + prevWeapon = cur == null ? null : cur.copy(); + } + + getChargedLocation().chargeItems(inventory.mainInventory); + } + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + if (forFluidType != null && forFluidType.getFluid() == EnderIO.fluidNutrientDistillation) { + return fuelTank; + } + /* + * if (forFluidType != null && forFluidType.getFluid() == + * EnderIO.fluidXpJuice) { return xpCon; } + */ + return null; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {xpCon /* , fuelTank */}; + } + + @Override + public void setTanksDirty() { + tanksDirty = true; + } + + @Override + public SmartTank getNutrientTank() { + return fuelTank; + } } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 516ad398..ad6b38c1 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -1,5 +1,13 @@ package crazypants.enderio.machine.light; +import com.enderio.core.common.TileEntityEnder; +import com.enderio.core.common.vecmath.Vector3f; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.api.redstone.IRedstoneConnectable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; @@ -10,199 +18,190 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.vecmath.Vector3f; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.api.redstone.IRedstoneConnectable; - public class BlockElectricLight extends BlockEio implements IRedstoneConnectable { - static final float BLOCK_HEIGHT = 0.05f; - static final float BLOCK_WIDTH = 0.3f; + static final float BLOCK_HEIGHT = 0.05f; + static final float BLOCK_WIDTH = 0.3f; - static final float BLOCK_EDGE_MAX = 0.5f + (BLOCK_WIDTH / 2); - static final float BLOCK_EDGE_MIN = 0.5f - (BLOCK_WIDTH / 2); + static final float BLOCK_EDGE_MAX = 0.5f + (BLOCK_WIDTH / 2); + static final float BLOCK_EDGE_MIN = 0.5f - (BLOCK_WIDTH / 2); - public static int renderId; + public static int renderId; - public static BlockElectricLight create() { - BlockElectricLight result = new BlockElectricLight(); - result.init(); - return result; - } - - private IIcon blockIconOff; - private IIcon blockIconSide; - - public BlockElectricLight() { - super(ModObject.blockElectricLight.unlocalisedName, TileElectricLight.class); - setLightOpacity(0); - setBlockBounds(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN, BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemElectricLight.class, ModObject.blockElectricLight.unlocalisedName); - GameRegistry.registerTileEntity(TileElectricLight.class, ModObject.blockElectricLight.unlocalisedName + "TileEntity"); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); - blockIconOff = iIconRegister.registerIcon("enderio:blockElectricLightFaceOff"); - blockIconSide = iIconRegister.registerIcon("enderio:conduitConnector"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - ForgeDirection onFace = ((TileElectricLight) te).getFace(); - if(side == (onFace.getOpposite().ordinal())) { - boolean on = blockAccess.getBlockMetadata(x, y, z) != 0; - return on ? blockIcon : blockIconOff; - } - return blockIconSide; - } - return getIcon(side, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int par2) { - if(side == ForgeDirection.UP.ordinal()) { - return blockIcon; - } - return blockIconSide; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - if(block != null && block != this) { - return block.getLightValue(world, x, y, z); - } - return world.getBlockMetadata(x, y, z) > 0 ? 15 : 0; - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int x, int y, int z) { - ForgeDirection onFace = ForgeDirection.DOWN; - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - onFace = ((TileElectricLight) te).getFace(); + public static BlockElectricLight create() { + BlockElectricLight result = new BlockElectricLight(); + result.init(); + return result; } - Vector3f min = new Vector3f(); - Vector3f max = new Vector3f(); - switch (onFace) { - case UP: - min.set(BLOCK_EDGE_MIN, 1F - BLOCK_HEIGHT, BLOCK_EDGE_MIN); - max.set(BLOCK_EDGE_MAX, 1F, BLOCK_EDGE_MAX); - break; - case DOWN: - min.set(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN); - max.set(BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); - break; - case EAST: - min.set(1 - BLOCK_HEIGHT, BLOCK_EDGE_MIN, BLOCK_EDGE_MIN); - max.set(1, BLOCK_EDGE_MAX, BLOCK_EDGE_MAX); - break; - case WEST: - min.set(0, BLOCK_EDGE_MIN, BLOCK_EDGE_MIN); - max.set(BLOCK_HEIGHT, BLOCK_EDGE_MAX, BLOCK_EDGE_MAX); - break; - case NORTH: - min.set(BLOCK_EDGE_MIN, BLOCK_EDGE_MIN, 0); - max.set(BLOCK_EDGE_MAX, BLOCK_EDGE_MAX, BLOCK_HEIGHT); - break; - case SOUTH: - min.set(BLOCK_EDGE_MIN, BLOCK_EDGE_MIN, 1 - BLOCK_HEIGHT); - max.set(BLOCK_EDGE_MAX, BLOCK_EDGE_MAX, 1); - break; - case UNKNOWN: - default: - min.set(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN); - max.set(BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); - break; + private IIcon blockIconOff; + private IIcon blockIconSide; + + public BlockElectricLight() { + super(ModObject.blockElectricLight.unlocalisedName, TileElectricLight.class); + setLightOpacity(0); + setBlockBounds(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN, BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); } - setBlockBounds(min.x, min.y, min.z, max.x, max.y, max.z); - } - - @Override - public void setBlockBoundsForItemRender() { - setBlockBounds(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN, BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockID) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - ((TileElectricLight) te).onNeighborBlockChange(blockID); + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemElectricLight.class, ModObject.blockElectricLight.unlocalisedName); + GameRegistry.registerTileEntity( + TileElectricLight.class, ModObject.blockElectricLight.unlocalisedName + "TileEntity"); } - } - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - ((TileElectricLight) te).onBlockRemoved(); + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return null; } - } - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - TileElectricLight light = (TileElectricLight) te; - if(light == null) { - return; + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); + blockIconOff = iIconRegister.registerIcon("enderio:blockElectricLightFaceOff"); + blockIconSide = iIconRegister.registerIcon("enderio:conduitConnector"); } - int meta = light.isInvereted() ? 1 : 0; - if(!light.isRequiresPower()) { - meta += 2; - } else if(light.isWireless()) { - meta += 4; + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + + TileEntity te = blockAccess.getTileEntity(x, y, z); + if (te instanceof TileElectricLight) { + ForgeDirection onFace = ((TileElectricLight) te).getFace(); + if (side == (onFace.getOpposite().ordinal())) { + boolean on = blockAccess.getBlockMetadata(x, y, z) != 0; + return on ? blockIcon : blockIconOff; + } + return blockIconSide; + } + return getIcon(side, 0); } - drop.setItemDamage(meta); - } - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int par2) { + if (side == ForgeDirection.UP.ordinal()) { + return blockIcon; + } + return blockIconSide; + } - /* IRedstoneConnectable */ + @Override + public boolean renderAsNormalBlock() { + return false; + } - @Override - public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { - return true; - } + @Override + public int getRenderType() { + return renderId; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + if (block != null && block != this) { + return block.getLightValue(world, x, y, z); + } + return world.getBlockMetadata(x, y, z) > 0 ? 15 : 0; + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int x, int y, int z) { + ForgeDirection onFace = ForgeDirection.DOWN; + TileEntity te = blockAccess.getTileEntity(x, y, z); + if (te instanceof TileElectricLight) { + onFace = ((TileElectricLight) te).getFace(); + } + + Vector3f min = new Vector3f(); + Vector3f max = new Vector3f(); + switch (onFace) { + case UP: + min.set(BLOCK_EDGE_MIN, 1F - BLOCK_HEIGHT, BLOCK_EDGE_MIN); + max.set(BLOCK_EDGE_MAX, 1F, BLOCK_EDGE_MAX); + break; + case DOWN: + min.set(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN); + max.set(BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); + break; + case EAST: + min.set(1 - BLOCK_HEIGHT, BLOCK_EDGE_MIN, BLOCK_EDGE_MIN); + max.set(1, BLOCK_EDGE_MAX, BLOCK_EDGE_MAX); + break; + case WEST: + min.set(0, BLOCK_EDGE_MIN, BLOCK_EDGE_MIN); + max.set(BLOCK_HEIGHT, BLOCK_EDGE_MAX, BLOCK_EDGE_MAX); + break; + case NORTH: + min.set(BLOCK_EDGE_MIN, BLOCK_EDGE_MIN, 0); + max.set(BLOCK_EDGE_MAX, BLOCK_EDGE_MAX, BLOCK_HEIGHT); + break; + case SOUTH: + min.set(BLOCK_EDGE_MIN, BLOCK_EDGE_MIN, 1 - BLOCK_HEIGHT); + max.set(BLOCK_EDGE_MAX, BLOCK_EDGE_MAX, 1); + break; + case UNKNOWN: + default: + min.set(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN); + max.set(BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); + break; + } + + setBlockBounds(min.x, min.y, min.z, max.x, max.y, max.z); + } + + @Override + public void setBlockBoundsForItemRender() { + setBlockBounds(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN, BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockID) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileElectricLight) { + ((TileElectricLight) te).onNeighborBlockChange(blockID); + } + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileElectricLight) { + ((TileElectricLight) te).onBlockRemoved(); + } + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + TileElectricLight light = (TileElectricLight) te; + if (light == null) { + return; + } + int meta = light.isInvereted() ? 1 : 0; + if (!light.isRequiresPower()) { + meta += 2; + } else if (light.isWireless()) { + meta += 4; + } + drop.setItemDamage(meta); + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + /* IRedstoneConnectable */ + + @Override + public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java index d955c5f1..aefc44ee 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockItemElectricLight.java @@ -1,7 +1,10 @@ package crazypants.enderio.machine.light; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,79 +16,83 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; - public class BlockItemElectricLight extends ItemBlockWithMetadata implements IResourceTooltipProvider { - public enum Type { - ELECTRIC("item.itemElectricLight", false, true, false), - ELECTRIC_INV("item.itemElectricLightInverted", true, true, false), - BASIC("item.itemLight", false, false, false), - BASIC_INV("item.itemLightInverted", true, false, false), - WIRELESS("item.itemWirelessLight", false, true, true), - WIRELESS_INV("item.itemWirelessLightInverted", true, true, true); + public enum Type { + ELECTRIC("item.itemElectricLight", false, true, false), + ELECTRIC_INV("item.itemElectricLightInverted", true, true, false), + BASIC("item.itemLight", false, false, false), + BASIC_INV("item.itemLightInverted", true, false, false), + WIRELESS("item.itemWirelessLight", false, true, true), + WIRELESS_INV("item.itemWirelessLightInverted", true, true, true); - final String unlocName; - final boolean isInverted; - final boolean isPowered; - final boolean isWireless; + final String unlocName; + final boolean isInverted; + final boolean isPowered; + final boolean isWireless; - private Type(String unlocName, boolean isInverted, boolean isPowered, boolean isWireless) { - this.unlocName = unlocName; - this.isInverted = isInverted; - this.isPowered = isPowered; - this.isWireless = isWireless; + private Type(String unlocName, boolean isInverted, boolean isPowered, boolean isWireless) { + this.unlocName = unlocName; + this.isInverted = isInverted; + this.isPowered = isPowered; + this.isWireless = isWireless; + } } - } - - public BlockItemElectricLight(Block block) { - super(block, block); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - meta = MathHelper.clamp_int(meta, 0, Type.values().length - 1); - return Type.values()[meta].unlocName; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(Type type : Type.values()) { - par3List.add(new ItemStack(this,1,type.ordinal())); + public BlockItemElectricLight(Block block) { + super(block, block); + setCreativeTab(EnderIOTab.tabEnderIO); } - } - @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, field_150939_a, 0, 3)) { - return false; + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + meta = MathHelper.clamp_int(meta, 0, Type.values().length - 1); + return Type.values()[meta].unlocName; } - if(world.getBlock(x, y, z) == field_150939_a) { - ForgeDirection onFace = ForgeDirection.values()[side].getOpposite(); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - TileElectricLight el = ((TileElectricLight) te); - el.setFace(onFace); - Type t= Type.values()[metadata]; - el.setInverted(t.isInverted); - el.setRequiresPower(t.isPowered); - el.setWireless(t.isWireless); - } - } - return true; - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(itemStack); - } + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (Type type : Type.values()) { + par3List.add(new ItemStack(this, 1, type.ordinal())); + } + } + + @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, field_150939_a, 0, 3)) { + return false; + } + if (world.getBlock(x, y, z) == field_150939_a) { + ForgeDirection onFace = ForgeDirection.values()[side].getOpposite(); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileElectricLight) { + TileElectricLight el = ((TileElectricLight) te); + el.setFace(onFace); + Type t = Type.values()[metadata]; + el.setInverted(t.isInverted); + el.setRequiresPower(t.isPowered); + el.setWireless(t.isWireless); + } + } + return true; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(itemStack); + } } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java index 97372066..3f0fc432 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java @@ -1,96 +1,94 @@ package crazypants.enderio.machine.light; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; public class BlockLightNode extends BlockEio { - public static BlockLightNode create() { - BlockLightNode result = new BlockLightNode(); - result.init(); - return result; - } - - public BlockLightNode() { - super(ModObject.blockLightNode.unlocalisedName, TileLightNode.class, Material.air); - setCreativeTab(null); - setBlockBounds(0, 0, 0, 0, 0, 0); - setTickRandomly(true); - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean isBlockSolid(IBlockAccess iblockaccess, int x, int y, int z, int l) { - return false; - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return null; - } - - @Override - public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { - return true; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); - if(te != null) { - te.onBlockRemoved(); + public static BlockLightNode create() { + BlockLightNode result = new BlockLightNode(); + result.init(); + return result; } - } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z) > 0 ? 15 : 0; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { - TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); - if(te != null) { - te.onNeighbourChanged(); + public BlockLightNode() { + super(ModObject.blockLightNode.unlocalisedName, TileLightNode.class, Material.air); + setCreativeTab(null); + setBlockBounds(0, 0, 0, 0, 0, 0); + setTickRandomly(true); } - } - @Override - public void updateTick(World world, int x, int y, int z, Random r) { - TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); - if(te != null) { - te.checkParent(); + @Override + public boolean renderAsNormalBlock() { + return false; } - } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); - } + @Override + public boolean isOpaqueCube() { + return false; + } - @Override - public int quantityDropped(Random p_149745_1_) { - return 0; - } + @Override + public boolean isBlockSolid(IBlockAccess iblockaccess, int x, int y, int z, int l) { + return false; + } + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return null; + } + + @Override + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { + return true; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); + if (te != null) { + te.onBlockRemoved(); + } + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z) > 0 ? 15 : 0; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { + TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); + if (te != null) { + te.onNeighbourChanged(); + } + } + + @Override + public void updateTick(World world, int x, int y, int z, Random r) { + TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); + if (te != null) { + te.checkParent(); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); + } + + @Override + public int quantityDropped(Random p_149745_1_) { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index 3b7eebc1..951b3e3a 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -1,60 +1,63 @@ package crazypants.enderio.machine.light; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - BoundingBox bb = new BoundingBox(0, 0, 0, 1, 0.2, 1); - boolean doDraw = false; + BoundingBox bb = new BoundingBox(0, 0, 0, 1, 0.2, 1); + boolean doDraw = false; - Tessellator.instance.startDrawingQuads(); + Tessellator.instance.startDrawingQuads(); - IIcon[] textures = RenderUtil.getBlockTextures(block, metadata); - CubeRenderer.render(bb, textures, null, null); + IIcon[] textures = RenderUtil.getBlockTextures(block, metadata); + CubeRenderer.render(bb, textures, null, null); - Tessellator.instance.draw(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - block.setBlockBoundsBasedOnState(world, x, y, z); - BoundingBox bb = new BoundingBox(block.getBlockBoundsMinX(), block.getBlockBoundsMinY(), block.getBlockBoundsMinZ(), block.getBlockBoundsMaxX(), - block.getBlockBoundsMaxY(), block.getBlockBoundsMaxZ()); - - bb = bb.translate(x, y, z); - RenderUtil.setTesselatorBrightness(world, x, y, z); - - IIcon[] textures = RenderUtil.getBlockTextures(world, x, y, z); - if(renderer.hasOverrideBlockTexture()) { - CubeRenderer.render(bb, renderer.overrideBlockTexture); - } else { - CubeRenderer.render(bb, textures, null, null); + Tessellator.instance.draw(); } - return true; - } + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + block.setBlockBoundsBasedOnState(world, x, y, z); + BoundingBox bb = new BoundingBox( + block.getBlockBoundsMinX(), + block.getBlockBoundsMinY(), + block.getBlockBoundsMinZ(), + block.getBlockBoundsMaxX(), + block.getBlockBoundsMaxY(), + block.getBlockBoundsMaxZ()); - @Override - public int getRenderId() { - return BlockElectricLight.renderId; - } + bb = bb.translate(x, y, z); + RenderUtil.setTesselatorBrightness(world, x, y, z); - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + IIcon[] textures = RenderUtil.getBlockTextures(world, x, y, z); + if (renderer.hasOverrideBlockTexture()) { + CubeRenderer.render(bb, renderer.overrideBlockTexture); + } else { + CubeRenderer.render(bb, textures, null, null); + } + return true; + } + + @Override + public int getRenderId() { + return BlockElectricLight.renderId; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index e36ff802..dc14ec41 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -1,436 +1,435 @@ package crazypants.enderio.machine.light; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.EnumSkyBlock; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.Vector3d; - import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.EnumSkyBlock; +import net.minecraftforge.common.util.ForgeDirection; public class TileElectricLight extends TileEntityEio implements IInternalPowerReceiver { - private ForgeDirection face = ForgeDirection.DOWN; + private ForgeDirection face = ForgeDirection.DOWN; - public static final int RF_USE_PER_TICK = 1; + public static final int RF_USE_PER_TICK = 1; - private boolean init = true; + private boolean init = true; - private List lightNodes; + private List lightNodes; - private int[] lightNodeCoords; + private int[] lightNodeCoords; - private boolean updatingLightNodes = false; + private boolean updatingLightNodes = false; - private boolean lastActive = false; + private boolean lastActive = false; - private boolean isInvereted; + private boolean isInvereted; - private boolean requiresPower = true; - - private WirelessChargedLocation chargedLocation; + private boolean requiresPower = true; - private int energyStoredRF; + private WirelessChargedLocation chargedLocation; - public TileElectricLight() { - } + private int energyStoredRF; - public void onNeighborBlockChange(Block blockID) { - init = true; - } + public TileElectricLight() {} - public void nodeNeighbourChanged(TileLightNode tileLightNode) { - init = true; - } - - public void nodeRemoved(TileLightNode tileLightNode) { - if(!updatingLightNodes) { - init = true; - } - } - - public ForgeDirection getFace() { - return face; - } - - public void setFace(ForgeDirection face) { - this.face = face; - } - - public void setInverted(boolean inverted) { - isInvereted = inverted; - } - - public void setRequiresPower(boolean isPowered) { - requiresPower = isPowered; - } - - public boolean isRequiresPower() { - return requiresPower; - } - - public void setInvereted(boolean isInvereted) { - this.isInvereted = isInvereted; - } - - public boolean isInvereted() { - return isInvereted; - } - - public void setWireless(boolean wireless) { - if(!wireless) { - chargedLocation = null; - } else if(chargedLocation == null) { - chargedLocation = new WirelessChargedLocation(this); - } - } - - public boolean isWireless() { - return chargedLocation != null; - } - - @Override - public void doUpdate() { - if(worldObj.isRemote) { - return; + public void onNeighborBlockChange(Block blockID) { + init = true; } - boolean isActivated = init ? isPoweredRedstone() ^ isInvereted : lastActive; + public void nodeNeighbourChanged(TileLightNode tileLightNode) { + init = true; + } - if(requiresPower) { - if(isActivated) { - if(!hasPower()) { - isActivated = false; + public void nodeRemoved(TileLightNode tileLightNode) { + if (!updatingLightNodes) { + init = true; + } + } + + public ForgeDirection getFace() { + return face; + } + + public void setFace(ForgeDirection face) { + this.face = face; + } + + public void setInverted(boolean inverted) { + isInvereted = inverted; + } + + public void setRequiresPower(boolean isPowered) { + requiresPower = isPowered; + } + + public boolean isRequiresPower() { + return requiresPower; + } + + public void setInvereted(boolean isInvereted) { + this.isInvereted = isInvereted; + } + + public boolean isInvereted() { + return isInvereted; + } + + public void setWireless(boolean wireless) { + if (!wireless) { + chargedLocation = null; + } else if (chargedLocation == null) { + chargedLocation = new WirelessChargedLocation(this); + } + } + + public boolean isWireless() { + return chargedLocation != null; + } + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + return; + } + + boolean isActivated = init ? isPoweredRedstone() ^ isInvereted : lastActive; + + if (requiresPower) { + if (isActivated) { + if (!hasPower()) { + isActivated = false; + } else { + setEnergyStored(getEnergyStored() - RF_USE_PER_TICK); + } + } + + if (init) { + updateLightNodes(); + } + } + + if (isActivated != lastActive || init) { + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isActivated ? 1 : 0, 2); + + if (requiresPower) { + for (TileLightNode ln : lightNodes) { + if (ln != null) { + worldObj.setBlockMetadataWithNotify(ln.xCoord, ln.yCoord, ln.zCoord, isActivated ? 1 : 0, 2); + worldObj.markBlockForUpdate(ln.xCoord, ln.yCoord, ln.zCoord); + worldObj.updateLightByType(EnumSkyBlock.Block, ln.xCoord, ln.yCoord, ln.zCoord); + } + } + } + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); + init = false; + lastActive = isActivated; + } + + if (chargedLocation != null) { + if (energyStoredRF < getMaxEnergyStored()) { + boolean needInit = energyStoredRF == 0; + energyStoredRF += chargedLocation.takeEnergy(Math.min(getMaxEnergyStored() - energyStoredRF, 10)); + if (needInit && energyStoredRF > 0) { + init = true; + } + } + } + } + + public void onBlockRemoved() { + if (!requiresPower) { + return; + } + updatingLightNodes = true; + try { + clearLightNodes(); + } finally { + updatingLightNodes = false; + } + } + + private void updateLightNodes() { + Set before; + if (lightNodes != null && !lightNodes.isEmpty()) { + before = new HashSet(lightNodes.size()); + for (TileLightNode node : lightNodes) { + before.add(node.getLocation()); + } } else { - setEnergyStored(getEnergyStored() - RF_USE_PER_TICK); + before = Collections.emptySet(); } - } + Set after = new HashSet(17); + updatingLightNodes = true; + try { + if (lightNodeCoords != null) { - if(init) { - updateLightNodes(); - } - } + // just loaded + lightNodes = new ArrayList(); + for (int i = 0; i < lightNodeCoords.length; i += 3) { + TileEntity te = + worldObj.getTileEntity(lightNodeCoords[i], lightNodeCoords[i + 1], lightNodeCoords[i + 2]); + if (te instanceof TileLightNode) { + lightNodes.add((TileLightNode) te); + } + } + lightNodeCoords = null; - if(isActivated != lastActive || init) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isActivated ? 1 : 0, 2); + } else if (lightNodes == null) { // just created - if(requiresPower) { - for (TileLightNode ln : lightNodes) { - if(ln != null) { - worldObj.setBlockMetadataWithNotify(ln.xCoord, ln.yCoord, ln.zCoord, isActivated ? 1 : 0, 2); - worldObj.markBlockForUpdate(ln.xCoord, ln.yCoord, ln.zCoord); - worldObj.updateLightByType(EnumSkyBlock.Block, ln.xCoord, ln.yCoord, ln.zCoord); - } + lightNodes = new ArrayList(); + } + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (dir != face && dir != face.getOpposite()) { // don't project behind + // us + Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); + addNodeInDirection(new Vector3d(offset), after); + addNodeInDirection(offset.add(ForgeDirectionOffsets.forDirCopy(face.getOpposite())), after); + } + } + + addNodeInDirection(ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); + + Vector3d[] diags = new Vector3d[2]; + if (face.offsetX != 0) { + diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.UP); + diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); + } else if (face.offsetY != 0) { + diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.EAST); + diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); + } else { + diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.UP); + diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.EAST); + } + addDiaganals(diags, new Vector3d(), after); + addDiaganals(diags, ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); + + if (!before.equals(after)) { + clearLightNodes(); + + for (BlockCoord entry : after) { + worldObj.setBlock(entry.x, entry.y, entry.z, EnderIO.blockLightNode); + TileEntity te = worldObj.getTileEntity(entry.x, entry.y, entry.z); + if (te instanceof TileLightNode) { + TileLightNode ln = (TileLightNode) te; + ln.parentX = xCoord; + ln.parentY = yCoord; + ln.parentZ = zCoord; + lightNodes.add(ln); + } + } + + } else { + init = false; + } + + } finally { + updatingLightNodes = false; } - } - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); - init = false; - lastActive = isActivated; } - - if (chargedLocation != null) { - if (energyStoredRF < getMaxEnergyStored()) { - boolean needInit = energyStoredRF == 0; - energyStoredRF += chargedLocation.takeEnergy(Math.min(getMaxEnergyStored() - energyStoredRF, 10)); - if (needInit && energyStoredRF > 0) { - init = true; + + private void addDiaganals(Vector3d[] diags, Vector3d trans, Set result) { + Vector3d offset = new Vector3d(); + offset.set(diags[0]); + offset.add(diags[1]); + addNodeInDirection(offset.add(trans), result); + + offset.set(diags[0]); + offset.sub(diags[1]); + addNodeInDirection(offset.add(trans), result); + + offset.set(diags[0]); + offset.negate(); + offset.add(diags[1]); + addNodeInDirection(offset.add(trans), result); + + offset.set(diags[0]); + offset.negate(); + offset.sub(diags[1]); + addNodeInDirection(offset.add(trans), result); + } + + private void addNodeInDirection(Vector3d offset, Set result) { + boolean isAir = isAir(offset); + boolean isTransp = isTranparent(offset); + if (isAir || isTransp) { + offset.scale(2); + if (isAir(offset)) { + addLightNode(offset, result); + } else if (isAir) { + offset.scale(0.5); + addLightNode(offset, result); + } } - } } - } - public void onBlockRemoved() { - if(!requiresPower) { - return; + private boolean isLightNode(Vector3d offset) { + return worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) + == EnderIO.blockLightNode; } - updatingLightNodes = true; - try { - clearLightNodes(); - } finally { - updatingLightNodes = false; - } - } - private void updateLightNodes() { - Set before; - if(lightNodes != null && !lightNodes.isEmpty()) { - before = new HashSet(lightNodes.size()); - for (TileLightNode node : lightNodes) { - before.add(node.getLocation()); - } - } else { - before = Collections.emptySet(); - } - Set after = new HashSet(17); - updatingLightNodes = true; - try { - if(lightNodeCoords != null) { - - // just loaded - lightNodes = new ArrayList(); - for (int i = 0; i < lightNodeCoords.length; i += 3) { - TileEntity te = worldObj.getTileEntity(lightNodeCoords[i], lightNodeCoords[i + 1], lightNodeCoords[i + 2]); - if(te instanceof TileLightNode) { - lightNodes.add((TileLightNode) te); - } + private void clearLightNodes() { + if (lightNodes != null) { + for (TileLightNode ln : lightNodes) { + if (worldObj.getBlock(ln.xCoord, ln.yCoord, ln.zCoord) == EnderIO.blockLightNode) { + worldObj.setBlockToAir(ln.xCoord, ln.yCoord, ln.zCoord); + } + } + lightNodes.clear(); } - lightNodeCoords = null; + } - } else if(lightNodes == null) { // just created + private void addLightNode(Vector3d offset, Set result) { + int x = xCoord + (int) offset.x; + int y = yCoord + (int) offset.y; + int z = zCoord + (int) offset.z; - lightNodes = new ArrayList(); - - } - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(dir != face && dir != face.getOpposite()) { // don't project behind - // us - Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); - addNodeInDirection(new Vector3d(offset), after); - addNodeInDirection(offset.add(ForgeDirectionOffsets.forDirCopy(face.getOpposite())), after); + if (isLightNode(offset)) { + TileLightNode te = (TileLightNode) worldObj.getTileEntity(x, y, z); + if (te.parentX != xCoord || te.parentY != yCoord || te.parentZ != zCoord) { + // its somebody else's so leave it alone + return; + } } - } + result.add(new BlockCoord(x, y, z)); + } - addNodeInDirection(ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); + private boolean isRailcraftException(Block id) { + String className = id.getClass().getName(); + return className.equals("mods.railcraft.common.blocks.machine.BlockMachine"); + } - Vector3d[] diags = new Vector3d[2]; - if(face.offsetX != 0) { - diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.UP); - diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); - } else if(face.offsetY != 0) { - diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.EAST); - diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); - } else { - diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.UP); - diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.EAST); - } - addDiaganals(diags, new Vector3d(), after); - addDiaganals(diags, ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); + private boolean isTranparent(Vector3d offset) { + Block id = worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z); + if (isRailcraftException(id)) { + return false; + } + return worldObj.getBlockLightOpacity(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) + == 0; + } - if(!before.equals(after)) { - clearLightNodes(); + private boolean isAir(Vector3d offset) { + return worldObj.isAirBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) + || isLightNode(offset); + } - for (BlockCoord entry : after) { - worldObj.setBlock(entry.x, entry.y, entry.z, EnderIO.blockLightNode); - TileEntity te = worldObj.getTileEntity(entry.x, entry.y, entry.z); - if(te instanceof TileLightNode) { - TileLightNode ln = (TileLightNode) te; - ln.parentX = xCoord; - ln.parentY = yCoord; - ln.parentZ = zCoord; - lightNodes.add(ln); - } + @Override + public void readCustomNBT(NBTTagCompound root) { + + face = ForgeDirection.values()[root.getShort("face")]; + isInvereted = root.getBoolean("isInverted"); + requiresPower = root.getBoolean("requiresPower"); + setWireless(root.getBoolean("isWireless")); + + if (root.hasKey("storedEnergy")) { + float se = root.getFloat("storedEnergy"); + energyStoredRF = (int) (se * 10); + } else { + energyStoredRF = root.getInteger("storedEnergyRF"); } - } else { - init = false; - } - - } finally { - updatingLightNodes = false; + lightNodeCoords = root.getIntArray("lightNodes"); } - } - private void addDiaganals(Vector3d[] diags, Vector3d trans, Set result) { - Vector3d offset = new Vector3d(); - offset.set(diags[0]); - offset.add(diags[1]); - addNodeInDirection(offset.add(trans), result); + @Override + public void writeCustomNBT(NBTTagCompound root) { - offset.set(diags[0]); - offset.sub(diags[1]); - addNodeInDirection(offset.add(trans), result); + root.setShort("face", (short) face.ordinal()); + root.setInteger("storedEnergyRF", energyStoredRF); + root.setBoolean("isInverted", isInvereted); + root.setBoolean("requiresPower", requiresPower); + root.setBoolean("isWireless", isWireless()); - offset.set(diags[0]); - offset.negate(); - offset.add(diags[1]); - addNodeInDirection(offset.add(trans), result); - - offset.set(diags[0]); - offset.negate(); - offset.sub(diags[1]); - addNodeInDirection(offset.add(trans), result); - } - - private void addNodeInDirection(Vector3d offset, Set result) { - boolean isAir = isAir(offset); - boolean isTransp = isTranparent(offset); - if(isAir || isTransp) { - offset.scale(2); - if(isAir(offset)) { - addLightNode(offset, result); - } else if(isAir) { - offset.scale(0.5); - addLightNode(offset, result); - } - } - } - - private boolean isLightNode(Vector3d offset) { - return worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) == EnderIO.blockLightNode; - } - - private void clearLightNodes() { - if(lightNodes != null) { - for (TileLightNode ln : lightNodes) { - if(worldObj.getBlock(ln.xCoord, ln.yCoord, ln.zCoord) == EnderIO.blockLightNode) { - worldObj.setBlockToAir(ln.xCoord, ln.yCoord, ln.zCoord); + if (lightNodes != null) { + int[] lnLoc = new int[lightNodes.size() * 3]; + int index = 0; + for (TileLightNode ln : lightNodes) { + lnLoc[index++] = ln.xCoord; + lnLoc[index++] = ln.yCoord; + lnLoc[index++] = ln.zCoord; + } + root.setIntArray("lightNodes", lnLoc); } - } - lightNodes.clear(); - } - } - - private void addLightNode(Vector3d offset, Set result) { - int x = xCoord + (int) offset.x; - int y = yCoord + (int) offset.y; - int z = zCoord + (int) offset.z; - - if(isLightNode(offset)) { - TileLightNode te = (TileLightNode) worldObj.getTileEntity(x, y, z); - if(te.parentX != xCoord || te.parentY != yCoord || te.parentZ != zCoord) { - // its somebody else's so leave it alone - return; - } - } - result.add(new BlockCoord(x, y, z)); - } - - private boolean isRailcraftException(Block id) { - String className = id.getClass().getName(); - return className.equals("mods.railcraft.common.blocks.machine.BlockMachine"); - } - - private boolean isTranparent(Vector3d offset) { - Block id = worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z); - if(isRailcraftException(id)) { - return false; - } - return worldObj.getBlockLightOpacity(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) == 0; - } - - private boolean isAir(Vector3d offset) { - return worldObj.isAirBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) || isLightNode(offset); - } - - @Override - public void readCustomNBT(NBTTagCompound root) { - - face = ForgeDirection.values()[root.getShort("face")]; - isInvereted = root.getBoolean("isInverted"); - requiresPower = root.getBoolean("requiresPower"); - setWireless(root.getBoolean("isWireless")); - - if(root.hasKey("storedEnergy")) { - float se = root.getFloat("storedEnergy"); - energyStoredRF = (int) (se * 10); - } else { - energyStoredRF = root.getInteger("storedEnergyRF"); } - lightNodeCoords = root.getIntArray("lightNodes"); - } - - @Override - public void writeCustomNBT(NBTTagCompound root) { - - root.setShort("face", (short) face.ordinal()); - root.setInteger("storedEnergyRF", energyStoredRF); - root.setBoolean("isInverted", isInvereted); - root.setBoolean("requiresPower", requiresPower); - root.setBoolean("isWireless", isWireless()); - - if(lightNodes != null) { - int[] lnLoc = new int[lightNodes.size() * 3]; - int index = 0; - for (TileLightNode ln : lightNodes) { - lnLoc[index++] = ln.xCoord; - lnLoc[index++] = ln.yCoord; - lnLoc[index++] = ln.zCoord; - } - root.setIntArray("lightNodes", lnLoc); + public boolean hasPower() { + return energyStoredRF >= RF_USE_PER_TICK; } - } - public boolean hasPower() { - return energyStoredRF >= RF_USE_PER_TICK; - } + // RF Power - // RF Power - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(!requiresPower) { - return 0; + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (!requiresPower) { + return 0; + } + if (energyStoredRF == 0) { + init = true; + } + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } - if (energyStoredRF == 0) { - init = true; + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return requiresPower; } - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return requiresPower; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - if(!requiresPower) { - return 0; + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); } - return Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyReceived(); - } - @Override - public int getEnergyStored() { - if(!requiresPower) { - return 0; + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); } - return energyStoredRF; - } - @Override - public int getMaxEnergyStored() { - if(!requiresPower) { - return 0; + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + if (!requiresPower) { + return 0; + } + return Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyReceived(); } - return 100; - } - @Override - public void setEnergyStored(int stored) { - energyStoredRF = stored; - } + @Override + public int getEnergyStored() { + if (!requiresPower) { + return 0; + } + return energyStoredRF; + } - @Override - public boolean displayPower() { - return isRequiresPower(); - } + @Override + public int getMaxEnergyStored() { + if (!requiresPower) { + return 0; + } + return 100; + } + + @Override + public void setEnergyStored(int stored) { + energyStoredRF = stored; + } + + @Override + public boolean displayPower() { + return isRequiresPower(); + } } diff --git a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java index 2a2e1fea..c8e02531 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java @@ -1,69 +1,69 @@ package crazypants.enderio.machine.light; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; public class TileLightNode extends TileEntityEio { - int parentX; - int parentY; - int parentZ; + int parentX; + int parentY; + int parentZ; - public TileElectricLight getParent() { - TileEntity te = worldObj.getTileEntity(parentX, parentY, parentZ); - if(te instanceof TileElectricLight) { - return (TileElectricLight) te; + public TileElectricLight getParent() { + TileEntity te = worldObj.getTileEntity(parentX, parentY, parentZ); + if (te instanceof TileElectricLight) { + return (TileElectricLight) te; + } + return null; } - return null; - } - @Override - protected boolean shouldUpdate() { - return false; - } - - public void checkParent() { - if(worldObj.blockExists(parentX, parentY, parentZ)) { - if(worldObj.getBlock(parentX, parentY, parentZ) != EnderIO.blockElectricLight) { - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - } + @Override + protected boolean shouldUpdate() { + return false; } - } - public void onNeighbourChanged() { - TileElectricLight p = getParent(); - if(p != null) { - p.nodeNeighbourChanged(this); + public void checkParent() { + if (worldObj.blockExists(parentX, parentY, parentZ)) { + if (worldObj.getBlock(parentX, parentY, parentZ) != EnderIO.blockElectricLight) { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } + } } - } - public void onBlockRemoved() { - TileElectricLight p = getParent(); - if(p != null) { - p.nodeRemoved(this); + public void onNeighbourChanged() { + TileElectricLight p = getParent(); + if (p != null) { + p.nodeNeighbourChanged(this); + } } - } - @Override - public void readCustomNBT(NBTTagCompound root) { - parentX = root.getInteger("parentX"); - parentY = root.getInteger("parentY"); - parentZ = root.getInteger("parentZ"); - } + public void onBlockRemoved() { + TileElectricLight p = getParent(); + if (p != null) { + p.nodeRemoved(this); + } + } - @Override - public void writeCustomNBT(NBTTagCompound root) { - root.setInteger("parentX", parentX); - root.setInteger("parentY", parentY); - root.setInteger("parentZ", parentZ); - } + @Override + public void readCustomNBT(NBTTagCompound root) { + parentX = root.getInteger("parentX"); + parentY = root.getInteger("parentY"); + parentZ = root.getInteger("parentZ"); + } - @Override - public String toString() { - return "TileLightNode [parentX=" + parentX + ", parentY=" + parentY + ", parentZ=" + parentZ + ", xCoord=" + xCoord - + ", yCoord=" + yCoord + ", zCoord=" + zCoord + ", tileEntityInvalid=" + tileEntityInvalid + "]"; - } + @Override + public void writeCustomNBT(NBTTagCompound root) { + root.setInteger("parentX", parentX); + root.setInteger("parentY", parentY); + root.setInteger("parentZ", parentZ); + } + @Override + public String toString() { + return "TileLightNode [parentX=" + parentX + ", parentY=" + parentY + ", parentZ=" + parentZ + ", xCoord=" + + xCoord + ", yCoord=" + yCoord + ", zCoord=" + zCoord + ", tileEntityInvalid=" + tileEntityInvalid + + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 2edd0a5b..7cf4b29d 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -1,80 +1,76 @@ package crazypants.enderio.machine.monitor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.ContainerNoInv; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockPowerMonitor extends AbstractMachineBlock { - public static BlockPowerMonitor create() { + public static BlockPowerMonitor create() { - PacketHandler.INSTANCE.registerMessage(PacketPowerMonitor.class,PacketPowerMonitor.class,PacketHandler.nextID(),Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketPowerInfo.class,PacketPowerInfo.class,PacketHandler.nextID(),Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketPowerMonitor.class, PacketPowerMonitor.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketPowerInfo.class, PacketPowerInfo.class, PacketHandler.nextID(), Side.CLIENT); - BlockPowerMonitor result = new BlockPowerMonitor(); - result.init(); - return result; - } - - protected BlockPowerMonitor() { - super(ModObject.blockPowerMonitor, TilePowerMonitor.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TilePowerMonitor) { - return new ContainerNoInv((TilePowerMonitor) te); + BlockPowerMonitor result = new BlockPowerMonitor(); + result.init(); + return result; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TilePowerMonitor) { - return new GuiPowerMonitor(player.inventory, (TilePowerMonitor) te); + protected BlockPowerMonitor() { + super(ModObject.blockPowerMonitor, TilePowerMonitor.class); } - return null; - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_POWER_MONITOR; - } - - - @Override - public boolean canProvidePower() { - return true; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - return "enderio:powerMonitor"; - } - - @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, - int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TilePowerMonitor) { - - return ((TilePowerMonitor) te).getRednetOutputValue(ForgeDirection.values()[side], DyeColor.RED.ordinal()); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TilePowerMonitor) { + return new ContainerNoInv((TilePowerMonitor) te); + } + return null; } - return 0; - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TilePowerMonitor) { + return new GuiPowerMonitor(player.inventory, (TilePowerMonitor) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_POWER_MONITOR; + } + + @Override + public boolean canProvidePower() { + return true; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return "enderio:powerMonitor"; + } + + @Override + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TilePowerMonitor) { + + return ((TilePowerMonitor) te).getRednetOutputValue(ForgeDirection.values()[side], DyeColor.RED.ordinal()); + } + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index e973d64c..de1ff217 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -3,408 +3,400 @@ package crazypants.enderio.machine.monitor; import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPower; import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPowerFloat; -import java.awt.Color; -import java.awt.Rectangle; -import java.text.NumberFormat; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.CheckBox; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.ContainerNoInv; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import java.text.NumberFormat; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class GuiPowerMonitor extends GuiContainerBaseEIO { - private static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); + private static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); - private static final int ICON_SIZE = 16; + private static final int ICON_SIZE = 16; - private static final int SPACING = 6; + private static final int SPACING = 6; - private static final int MARGIN = 7; + private static final int MARGIN = 7; - private static final int WIDTH = 210; - private static final int HEIGHT = 146; + private static final int WIDTH = 210; + private static final int HEIGHT = 146; - private static final int POWER_X = 185; - private static final int POWER_Y = 9; - private static final int POWER_WIDTH = 10; - private static final int POWER_HEIGHT = 130; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + private static final int POWER_X = 185; + private static final int POWER_Y = 9; + private static final int POWER_WIDTH = 10; + private static final int POWER_HEIGHT = 130; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - private final TilePowerMonitor te; + private final TilePowerMonitor te; - private boolean isRedstoneMode = false; + private boolean isRedstoneMode = false; - private CheckBox enabledB; + private CheckBox enabledB; - private TextFieldEnder startTF; - private TextFieldEnder endTF; + private TextFieldEnder startTF; + private TextFieldEnder endTF; - private String titleStr; + private String titleStr; - private String engineTxt1; - private String engineTxt2; - private String engineTxt3; - private String engineTxt4; - private String engineTxt5; - private String engineTxt6; + private String engineTxt1; + private String engineTxt2; + private String engineTxt3; + private String engineTxt4; + private String engineTxt5; + private String engineTxt6; - private String monHeading1; - private String monHeading2; - private String monHeading3; - private String monHeading4; - private String monHeading5; + private String monHeading1; + private String monHeading2; + private String monHeading3; + private String monHeading4; + private String monHeading5; - private String noNetworkError; + private String noNetworkError; - public GuiPowerMonitor(InventoryPlayer playerInv, final TilePowerMonitor te) { - super(new ContainerNoInv(te), "powerMonitor"); - this.te = te; - xSize = WIDTH; - ySize = HEIGHT; + public GuiPowerMonitor(InventoryPlayer playerInv, final TilePowerMonitor te) { + super(new ContainerNoInv(te), "powerMonitor"); + this.te = te; + xSize = WIDTH; + ySize = HEIGHT; - titleStr = EnderIO.lang.localize("gui.powerMonitor.engineControl"); - engineTxt1 = EnderIO.lang.localize("gui.powerMonitor.engineSection1"); - engineTxt2 = EnderIO.lang.localize("gui.powerMonitor.engineSection2"); - engineTxt3 = EnderIO.lang.localize("gui.powerMonitor.engineSection3"); - engineTxt4 = EnderIO.lang.localize("gui.powerMonitor.engineSection4"); - engineTxt5 = EnderIO.lang.localize("gui.powerMonitor.engineSection5"); - engineTxt6 = EnderIO.lang.localize("gui.powerMonitor.engineSection6"); + titleStr = EnderIO.lang.localize("gui.powerMonitor.engineControl"); + engineTxt1 = EnderIO.lang.localize("gui.powerMonitor.engineSection1"); + engineTxt2 = EnderIO.lang.localize("gui.powerMonitor.engineSection2"); + engineTxt3 = EnderIO.lang.localize("gui.powerMonitor.engineSection3"); + engineTxt4 = EnderIO.lang.localize("gui.powerMonitor.engineSection4"); + engineTxt5 = EnderIO.lang.localize("gui.powerMonitor.engineSection5"); + engineTxt6 = EnderIO.lang.localize("gui.powerMonitor.engineSection6"); - monHeading1 = EnderIO.lang.localize("gui.powerMonitor.monHeading1"); - monHeading2 = EnderIO.lang.localize("gui.powerMonitor.monHeading2"); - monHeading3 = EnderIO.lang.localize("gui.powerMonitor.monHeading3"); - monHeading4 = EnderIO.lang.localize("gui.powerMonitor.monHeading4"); - monHeading5 = EnderIO.lang.localize("gui.powerMonitor.monHeading5"); + monHeading1 = EnderIO.lang.localize("gui.powerMonitor.monHeading1"); + monHeading2 = EnderIO.lang.localize("gui.powerMonitor.monHeading2"); + monHeading3 = EnderIO.lang.localize("gui.powerMonitor.monHeading3"); + monHeading4 = EnderIO.lang.localize("gui.powerMonitor.monHeading4"); + monHeading5 = EnderIO.lang.localize("gui.powerMonitor.monHeading5"); - noNetworkError = EnderIO.lang.localize("gui.powerMonitor.noNetworkError"); + noNetworkError = EnderIO.lang.localize("gui.powerMonitor.noNetworkError"); - addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { - @Override - protected void updateText() { - text.clear(); - text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getMaxEnergyStored()) + " " - + PowerDisplayUtil.abrevation()); - } + @Override + protected void updateText() { + text.clear(); + text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getMaxEnergyStored()) + " " + + PowerDisplayUtil.abrevation()); + } + }); - }); + int x = MARGIN + Minecraft.getMinecraft().fontRenderer.getStringWidth(titleStr) + SPACING; - int x = MARGIN + Minecraft.getMinecraft().fontRenderer.getStringWidth(titleStr) + SPACING; + enabledB = new CheckBox(this, 21267, x, 8); + enabledB.setSelectedToolTip(EnderIO.lang.localize("gui.enabled")); + enabledB.setUnselectedToolTip(EnderIO.lang.localize("gui.disabled")); + enabledB.setSelected(te.engineControlEnabled); - enabledB = new CheckBox(this, 21267, x, 8); - enabledB.setSelectedToolTip(EnderIO.lang.localize("gui.enabled")); - enabledB.setUnselectedToolTip(EnderIO.lang.localize("gui.disabled")); - enabledB.setSelected(te.engineControlEnabled); - - - x = MARGIN + getFontRenderer().getStringWidth(engineTxt2) + 4; - int y = MARGIN + ICON_SIZE + ICON_SIZE + getFontRenderer().FONT_HEIGHT; - startTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); - startTF.setCanLoseFocus(true); - startTF.setMaxStringLength(3); - startTF.setVisible(false); - startTF.setText(INT_NF.format(te.asPercentInt(te.startLevel))); - - y = y + getFontRenderer().FONT_HEIGHT + ICON_SIZE + ICON_SIZE + 4; - x = 5 + MARGIN + getFontRenderer().getStringWidth(engineTxt5); - endTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); - endTF.setCanLoseFocus(true); - endTF.setMaxStringLength(3); - endTF.setVisible(false); - endTF.setText(INT_NF.format(te.asPercentInt(te.stopLevel))); - - textFields.add(startTF); - textFields.add(endTF); - } - - @Override - public void initGui() { - super.initGui(); - - buttonList.clear(); - if (isRedstoneMode) { - enabledB.onGuiInit(); - } - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - @Override - public int getOverlayOffsetX() { - return 0; - } - - @Override - protected void mouseClicked(int x, int y, int par3) { - super.mouseClicked(x, y, par3); - - x = (x - guiLeft); - y = (y - guiTop); - if(x > 200 && x < 220) { - if(y >= SPACING && y < 30) { - isRedstoneMode = false; - enabledB.detach(); + x = MARGIN + getFontRenderer().getStringWidth(engineTxt2) + 4; + int y = MARGIN + ICON_SIZE + ICON_SIZE + getFontRenderer().FONT_HEIGHT; + startTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); + startTF.setCanLoseFocus(true); + startTF.setMaxStringLength(3); startTF.setVisible(false); + startTF.setText(INT_NF.format(te.asPercentInt(te.startLevel))); + + y = y + getFontRenderer().FONT_HEIGHT + ICON_SIZE + ICON_SIZE + 4; + x = 5 + MARGIN + getFontRenderer().getStringWidth(engineTxt5); + endTF = new TextFieldEnder(getFontRenderer(), x, y, 28, 14); + endTF.setCanLoseFocus(true); + endTF.setMaxStringLength(3); endTF.setVisible(false); - } else if(y >= 30 + SPACING && y < 60) { - isRedstoneMode = true; - enabledB.onGuiInit(); - startTF.setVisible(true); - endTF.setVisible(true); - } + endTF.setText(INT_NF.format(te.asPercentInt(te.stopLevel))); + + textFields.add(startTF); + textFields.add(endTF); } - } + @Override + public void initGui() { + super.initGui(); - @Override - protected void drawGuiContainerBackgroundLayer(float ptick, int mouseX, int mouseY) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - int i1 = te.getEnergyStoredScaled(POWER_HEIGHT); - drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 245, 0, POWER_WIDTH, i1); - - renderRedstoneTab(sx, sy); - renderInfoTab(sx, sy); - - checkForModifications(); - super.drawGuiContainerBackgroundLayer(ptick, mouseX, mouseY); - } - - private void checkForModifications() { - if(enabledB.isSelected() != te.engineControlEnabled || - getInt(startTF) != te.asPercentInt(te.startLevel) || - getInt(endTF) != te.asPercentInt(te.stopLevel)) { - - te.engineControlEnabled = enabledB.isSelected(); - int i = getInt(startTF); - if(i >= 0) { - te.startLevel = te.asPercentFloat(i); - } - i = getInt(endTF); - if(i >= 0) { - te.stopLevel = te.asPercentFloat(i); - } - PacketHandler.INSTANCE.sendToServer(new PacketPowerMonitor(te)); + buttonList.clear(); + if (isRedstoneMode) { + enabledB.onGuiInit(); + } } - } - - private int getInt(GuiTextField tf) { - String txt = tf.getText(); - if(txt == null) { - return -1; + @Override + public boolean doesGuiPauseGame() { + return false; } - try { - int val = Integer.parseInt(tf.getText()); - if(val >= 0 && val <= 100) { - return val; - } - return -1; - } catch (Exception e) { - return -1; + + @Override + public int getOverlayOffsetX() { + return 0; } - } - private void renderRedstoneTab(int sx, int sy) { - if (isRedstoneMode) { - IconEIO.map.render(IconEIO.ACTIVE_TAB, sx + 200, sy + 30 + SPACING, true); - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, new ItemStack(Items.redstone), sx + 201, sy + 30 + SPACING + 3); - - GL11.glDisable(GL11.GL_LIGHTING); - - int left = guiLeft + MARGIN; - int rgb; - int x = left; - int y = guiTop + MARGIN + SPACING; - if (!enabledB.isSelected()) { - rgb = ColorUtil.getRGB(Color.darkGray); - } else { - rgb = ColorUtil.getRGB(Color.black); - } - FontRenderer fontRenderer = getFontRenderer(); - fontRenderer.drawString(titleStr, x, y, rgb, false); + @Override + protected void mouseClicked(int x, int y, int par3) { + super.mouseClicked(x, y, par3); - x = left + fontRenderer.getStringWidth(titleStr) + SPACING + ICON_SIZE + SPACING; - y = guiTop + 14; - if (!enabledB.isSelected()) { - rgb = ColorUtil.getRGB(Color.darkGray); - enabledB.drawButton(mc, guiLeft, guiTop); - } else { - // rgb = ColorUtil.getRGB(Color.blue); - // rgb = ColorUtil.getRGB(0, 18, 127); - rgb = ColorUtil.getRGB(Color.black); - } - - enabledB.drawButton(mc, guiLeft, guiTop); - - y += SPACING + ICON_SIZE; - x = left; - - String txt = engineTxt1; - fontRenderer.drawString(txt, x, y, rgb, false); - - y += SPACING + fontRenderer.FONT_HEIGHT; - - x = left; - txt = engineTxt2; - fontRenderer.drawString(txt, x, y, rgb, false); - - x = left + fontRenderer.getStringWidth(txt) + SPACING + startTF.getWidth() + 12; - txt = engineTxt3; - fontRenderer.drawString(txt, x, y, rgb, false); - - x = left; - y += ICON_SIZE + fontRenderer.FONT_HEIGHT + SPACING; - txt = engineTxt4; - fontRenderer.drawString(txt, x, y, rgb, false); - - x = left; - y += SPACING + fontRenderer.FONT_HEIGHT; - txt = engineTxt5; - fontRenderer.drawString(txt, x, y, rgb, false); - x += fontRenderer.getStringWidth(txt); - - txt = engineTxt3; - x += MARGIN + endTF.getWidth() + 10; - fontRenderer.drawString(txt, x, y, rgb, false); - } else { - IconEIO.map.render(IconEIO.INACTIVE_TAB, sx + 200, sy + 30 + SPACING, true); - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, new ItemStack(Items.redstone), sx + 201, sy + 30 + SPACING + 3); + x = (x - guiLeft); + y = (y - guiTop); + if (x > 200 && x < 220) { + if (y >= SPACING && y < 30) { + isRedstoneMode = false; + enabledB.detach(); + startTF.setVisible(false); + endTF.setVisible(false); + } else if (y >= 30 + SPACING && y < 60) { + isRedstoneMode = true; + enabledB.onGuiInit(); + startTF.setVisible(true); + endTF.setVisible(true); + } + } } - } - private void renderInfoTab(int sx, int sy) { - if (!isRedstoneMode) { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - IconEIO.map.render(IconEIO.ACTIVE_TAB, sx + 200, sy + SPACING, true); + @Override + protected void drawGuiContainerBackgroundLayer(float ptick, int mouseX, int mouseY) { - int headingCol = ColorUtil.getRGB(Color.white); - int valuesCol = ColorUtil.getRGB(Color.black); - int rgb; - int x = guiLeft + MARGIN; - int y = guiTop + MARGIN; + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; - int sectionGap = SPACING; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - FontRenderer fontRenderer = getFontRenderer(); - if (te.maxPowerInConduits == 0) { - fontRenderer.drawSplitString(noNetworkError, x, y, 170, ColorUtil.getRGB(Color.red)); - return; - } + int i1 = te.getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 245, 0, POWER_WIDTH, i1); - rgb = headingCol; - StringBuilder sb = new StringBuilder(); - sb.append(monHeading1); - fontRenderer.drawString(sb.toString(), x, y, rgb, true); + renderRedstoneTab(sx, sy); + renderInfoTab(sx, sy); - rgb = valuesCol; - y += fontRenderer.FONT_HEIGHT + 2; - sb = new StringBuilder(); - sb.append(formatPower(te.powerInConduits)); - sb.append(" "); - sb.append(PowerDisplayUtil.ofStr()); - sb.append(" "); - sb.append(formatPower(te.maxPowerInConduits)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - fontRenderer.drawString(sb.toString(), x, y, rgb, false); - - rgb = headingCol; - y += fontRenderer.FONT_HEIGHT + sectionGap; - sb = new StringBuilder(); - sb.append(monHeading2); - fontRenderer.drawString(sb.toString(), x, y, rgb, true); - - rgb = valuesCol; - y += fontRenderer.FONT_HEIGHT + 2; - sb = new StringBuilder(); - sb.append(formatPower(te.powerInCapBanks)); - sb.append(" "); - sb.append(PowerDisplayUtil.ofStr()); - sb.append(" "); - sb.append(formatPower(te.maxPowerInCapBanks)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - fontRenderer.drawString(sb.toString(), x, y, rgb, false); - - rgb = headingCol; - y += fontRenderer.FONT_HEIGHT + sectionGap; - sb = new StringBuilder(); - sb.append(monHeading3); - fontRenderer.drawString(sb.toString(), x, y, rgb, true); - - rgb = valuesCol; - y += fontRenderer.FONT_HEIGHT + 2; - sb = new StringBuilder(); - sb.append(formatPower(te.powerInMachines)); - sb.append(" "); - sb.append(PowerDisplayUtil.ofStr()); - sb.append(" "); - sb.append(formatPower(te.maxPowerInMachines)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - fontRenderer.drawString(sb.toString(), x, y, rgb, false); - - rgb = headingCol; - y += fontRenderer.FONT_HEIGHT + sectionGap; - sb = new StringBuilder(); - sb.append(monHeading4); - fontRenderer.drawString(sb.toString(), x, y, rgb, true); - - rgb = valuesCol; - y += fontRenderer.FONT_HEIGHT + 2; - sb = new StringBuilder(); - sb.append(formatPowerFloat(te.aveRfSent)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append(PowerDisplayUtil.perTickStr()); - fontRenderer.drawString(sb.toString(), x, y, rgb, false); - - rgb = headingCol; - y += fontRenderer.FONT_HEIGHT + sectionGap; - sb = new StringBuilder(); - sb.append(monHeading5); - fontRenderer.drawString(sb.toString(), x, y, rgb, true); - - rgb = valuesCol; - y += fontRenderer.FONT_HEIGHT + 2; - sb = new StringBuilder(); - sb.append(formatPowerFloat(te.aveRfReceived)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append(PowerDisplayUtil.perTickStr()); - fontRenderer.drawString(sb.toString(), x, y, rgb, false); - } else { - IconEIO.map.render(IconEIO.INACTIVE_TAB, sx + 200, sy + SPACING, true); + checkForModifications(); + super.drawGuiContainerBackgroundLayer(ptick, mouseX, mouseY); } - } + private void checkForModifications() { + if (enabledB.isSelected() != te.engineControlEnabled + || getInt(startTF) != te.asPercentInt(te.startLevel) + || getInt(endTF) != te.asPercentInt(te.stopLevel)) { + + te.engineControlEnabled = enabledB.isSelected(); + int i = getInt(startTF); + if (i >= 0) { + te.startLevel = te.asPercentFloat(i); + } + i = getInt(endTF); + if (i >= 0) { + te.stopLevel = te.asPercentFloat(i); + } + PacketHandler.INSTANCE.sendToServer(new PacketPowerMonitor(te)); + } + } + + private int getInt(GuiTextField tf) { + String txt = tf.getText(); + if (txt == null) { + return -1; + } + try { + int val = Integer.parseInt(tf.getText()); + if (val >= 0 && val <= 100) { + return val; + } + return -1; + } catch (Exception e) { + return -1; + } + } + + private void renderRedstoneTab(int sx, int sy) { + if (isRedstoneMode) { + IconEIO.map.render(IconEIO.ACTIVE_TAB, sx + 200, sy + 30 + SPACING, true); + itemRender.renderItemIntoGUI( + fontRendererObj, mc.renderEngine, new ItemStack(Items.redstone), sx + 201, sy + 30 + SPACING + 3); + + GL11.glDisable(GL11.GL_LIGHTING); + + int left = guiLeft + MARGIN; + int rgb; + int x = left; + int y = guiTop + MARGIN + SPACING; + if (!enabledB.isSelected()) { + rgb = ColorUtil.getRGB(Color.darkGray); + } else { + rgb = ColorUtil.getRGB(Color.black); + } + FontRenderer fontRenderer = getFontRenderer(); + fontRenderer.drawString(titleStr, x, y, rgb, false); + + x = left + fontRenderer.getStringWidth(titleStr) + SPACING + ICON_SIZE + SPACING; + y = guiTop + 14; + if (!enabledB.isSelected()) { + rgb = ColorUtil.getRGB(Color.darkGray); + enabledB.drawButton(mc, guiLeft, guiTop); + } else { + // rgb = ColorUtil.getRGB(Color.blue); + // rgb = ColorUtil.getRGB(0, 18, 127); + rgb = ColorUtil.getRGB(Color.black); + } + + enabledB.drawButton(mc, guiLeft, guiTop); + + y += SPACING + ICON_SIZE; + x = left; + + String txt = engineTxt1; + fontRenderer.drawString(txt, x, y, rgb, false); + + y += SPACING + fontRenderer.FONT_HEIGHT; + + x = left; + txt = engineTxt2; + fontRenderer.drawString(txt, x, y, rgb, false); + + x = left + fontRenderer.getStringWidth(txt) + SPACING + startTF.getWidth() + 12; + txt = engineTxt3; + fontRenderer.drawString(txt, x, y, rgb, false); + + x = left; + y += ICON_SIZE + fontRenderer.FONT_HEIGHT + SPACING; + txt = engineTxt4; + fontRenderer.drawString(txt, x, y, rgb, false); + + x = left; + y += SPACING + fontRenderer.FONT_HEIGHT; + txt = engineTxt5; + fontRenderer.drawString(txt, x, y, rgb, false); + x += fontRenderer.getStringWidth(txt); + + txt = engineTxt3; + x += MARGIN + endTF.getWidth() + 10; + fontRenderer.drawString(txt, x, y, rgb, false); + } else { + IconEIO.map.render(IconEIO.INACTIVE_TAB, sx + 200, sy + 30 + SPACING, true); + itemRender.renderItemIntoGUI( + fontRendererObj, mc.renderEngine, new ItemStack(Items.redstone), sx + 201, sy + 30 + SPACING + 3); + } + } + + private void renderInfoTab(int sx, int sy) { + if (!isRedstoneMode) { + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + IconEIO.map.render(IconEIO.ACTIVE_TAB, sx + 200, sy + SPACING, true); + + int headingCol = ColorUtil.getRGB(Color.white); + int valuesCol = ColorUtil.getRGB(Color.black); + int rgb; + int x = guiLeft + MARGIN; + int y = guiTop + MARGIN; + + int sectionGap = SPACING; + + FontRenderer fontRenderer = getFontRenderer(); + if (te.maxPowerInConduits == 0) { + fontRenderer.drawSplitString(noNetworkError, x, y, 170, ColorUtil.getRGB(Color.red)); + return; + } + + rgb = headingCol; + StringBuilder sb = new StringBuilder(); + sb.append(monHeading1); + fontRenderer.drawString(sb.toString(), x, y, rgb, true); + + rgb = valuesCol; + y += fontRenderer.FONT_HEIGHT + 2; + sb = new StringBuilder(); + sb.append(formatPower(te.powerInConduits)); + sb.append(" "); + sb.append(PowerDisplayUtil.ofStr()); + sb.append(" "); + sb.append(formatPower(te.maxPowerInConduits)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + fontRenderer.drawString(sb.toString(), x, y, rgb, false); + + rgb = headingCol; + y += fontRenderer.FONT_HEIGHT + sectionGap; + sb = new StringBuilder(); + sb.append(monHeading2); + fontRenderer.drawString(sb.toString(), x, y, rgb, true); + + rgb = valuesCol; + y += fontRenderer.FONT_HEIGHT + 2; + sb = new StringBuilder(); + sb.append(formatPower(te.powerInCapBanks)); + sb.append(" "); + sb.append(PowerDisplayUtil.ofStr()); + sb.append(" "); + sb.append(formatPower(te.maxPowerInCapBanks)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + fontRenderer.drawString(sb.toString(), x, y, rgb, false); + + rgb = headingCol; + y += fontRenderer.FONT_HEIGHT + sectionGap; + sb = new StringBuilder(); + sb.append(monHeading3); + fontRenderer.drawString(sb.toString(), x, y, rgb, true); + + rgb = valuesCol; + y += fontRenderer.FONT_HEIGHT + 2; + sb = new StringBuilder(); + sb.append(formatPower(te.powerInMachines)); + sb.append(" "); + sb.append(PowerDisplayUtil.ofStr()); + sb.append(" "); + sb.append(formatPower(te.maxPowerInMachines)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + fontRenderer.drawString(sb.toString(), x, y, rgb, false); + + rgb = headingCol; + y += fontRenderer.FONT_HEIGHT + sectionGap; + sb = new StringBuilder(); + sb.append(monHeading4); + fontRenderer.drawString(sb.toString(), x, y, rgb, true); + + rgb = valuesCol; + y += fontRenderer.FONT_HEIGHT + 2; + sb = new StringBuilder(); + sb.append(formatPowerFloat(te.aveRfSent)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append(PowerDisplayUtil.perTickStr()); + fontRenderer.drawString(sb.toString(), x, y, rgb, false); + + rgb = headingCol; + y += fontRenderer.FONT_HEIGHT + sectionGap; + sb = new StringBuilder(); + sb.append(monHeading5); + fontRenderer.drawString(sb.toString(), x, y, rgb, true); + + rgb = valuesCol; + y += fontRenderer.FONT_HEIGHT + 2; + sb = new StringBuilder(); + sb.append(formatPowerFloat(te.aveRfReceived)); + sb.append(" "); + sb.append(PowerDisplayUtil.abrevation()); + sb.append(PowerDisplayUtil.perTickStr()); + fontRenderer.drawString(sb.toString(), x, y, rgb, false); + } else { + IconEIO.map.render(IconEIO.INACTIVE_TAB, sx + 200, sy + SPACING, true); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index 3d7074e7..2667abb7 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -1,49 +1,47 @@ package crazypants.enderio.machine.monitor; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; -public class PacketPowerInfo extends MessageTileEntity implements IMessageHandler { +public class PacketPowerInfo extends MessageTileEntity + implements IMessageHandler { - private NBTTagCompound nbtRoot; + private NBTTagCompound nbtRoot; - public PacketPowerInfo() { - } + public PacketPowerInfo() {} - public PacketPowerInfo(TilePowerMonitor tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - tile.writePowerInfoToNBT(nbtRoot); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - public IMessage onMessage(PacketPowerInfo message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TilePowerMonitor te = message.getTileEntity(player.worldObj); - if(te != null) { - te.readPowerInfoFromNBT(message.nbtRoot); + public PacketPowerInfo(TilePowerMonitor tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + tile.writePowerInfoToNBT(nbtRoot); } - return null; - } -} \ No newline at end of file + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + nbtRoot = NetworkUtil.readNBTTagCompound(buf); + } + + @Override + public IMessage onMessage(PacketPowerInfo message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TilePowerMonitor te = message.getTileEntity(player.worldObj); + if (te != null) { + te.readPowerInfoFromNBT(message.nbtRoot); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java index 038a31a2..cff614f7 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -1,69 +1,66 @@ package crazypants.enderio.machine.monitor; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketPowerMonitor implements IMessage, IMessageHandler { - int x; - int y; - int z; - boolean engineControlEnabled; - float startLevel; - float stopLevel; + int x; + int y; + int z; + boolean engineControlEnabled; + float startLevel; + float stopLevel; - public PacketPowerMonitor() { - } + public PacketPowerMonitor() {} - public PacketPowerMonitor(TilePowerMonitor pm) { - x = pm.xCoord; - y = pm.yCoord; - z = pm.zCoord; - engineControlEnabled = pm.engineControlEnabled; - startLevel = pm.startLevel; - stopLevel = pm.stopLevel; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeBoolean(engineControlEnabled); - buf.writeFloat(startLevel); - buf.writeFloat(stopLevel); - - } - - @Override - public void fromBytes(ByteBuf buffer) { - x = buffer.readInt(); - y = buffer.readInt(); - z = buffer.readInt(); - engineControlEnabled = buffer.readBoolean(); - startLevel = buffer.readFloat(); - stopLevel = buffer.readFloat(); - } - - @Override - public IMessage onMessage(PacketPowerMonitor message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(!(te instanceof TilePowerMonitor)) { - Log.warn("createPowerMonitotPacket: Could not handle packet as TileEntity was not a TilePowerMonitor."); - return null; + public PacketPowerMonitor(TilePowerMonitor pm) { + x = pm.xCoord; + y = pm.yCoord; + z = pm.zCoord; + engineControlEnabled = pm.engineControlEnabled; + startLevel = pm.startLevel; + stopLevel = pm.stopLevel; } - TilePowerMonitor pm = (TilePowerMonitor) te; - pm.engineControlEnabled = message.engineControlEnabled; - pm.startLevel = message.startLevel; - pm.stopLevel = message.stopLevel; - player.worldObj.markBlockForUpdate(x, y, z); - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeBoolean(engineControlEnabled); + buf.writeFloat(startLevel); + buf.writeFloat(stopLevel); + } + + @Override + public void fromBytes(ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + engineControlEnabled = buffer.readBoolean(); + startLevel = buffer.readFloat(); + stopLevel = buffer.readFloat(); + } + + @Override + public IMessage onMessage(PacketPowerMonitor message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (!(te instanceof TilePowerMonitor)) { + Log.warn("createPowerMonitotPacket: Could not handle packet as TileEntity was not a TilePowerMonitor."); + return null; + } + TilePowerMonitor pm = (TilePowerMonitor) te; + pm.engineControlEnabled = message.engineControlEnabled; + pm.startLevel = message.startLevel; + pm.stopLevel = message.stopLevel; + player.worldObj.markBlockForUpdate(x, y, z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 5c043bcf..5eb39a70 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -1,11 +1,6 @@ package crazypants.enderio.machine.monitor; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.DyeColor; - import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -20,265 +15,265 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPoweredTile; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IInternalPoweredTile { - int energyPerTick = 1; + int energyPerTick = 1; - int powerInConduits; - int maxPowerInConduits; - long powerInCapBanks; - long maxPowerInCapBanks; - long powerInMachines; - long maxPowerInMachines; - float aveRfSent; - float aveRfReceived; + int powerInConduits; + int maxPowerInConduits; + long powerInCapBanks; + long maxPowerInCapBanks; + long powerInMachines; + long maxPowerInMachines; + float aveRfSent; + float aveRfReceived; - boolean engineControlEnabled = false; - float startLevel = 0.75f; - float stopLevel = 0.99f; + boolean engineControlEnabled = false; + float startLevel = 0.75f; + float stopLevel = 0.99f; - private Signal currentlyEmmittedSignal; + private Signal currentlyEmmittedSignal; - public TilePowerMonitor() { - super(new SlotDefinition(0, 0)); - } - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - return mode == IoMode.NONE; - } - - public int[] getRednetOutputValues(ForgeDirection side) { - if(currentlyEmmittedSignal == null) { - return new int[16]; + public TilePowerMonitor() { + super(new SlotDefinition(0, 0)); } - int[] res = new int[DyeColor.values().length]; - for (DyeColor col : DyeColor.values()) { - res[col.ordinal()] = currentlyEmmittedSignal.color == col ? 15 : 0; + + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + return mode == IoMode.NONE; } - return res; - } - public int getRednetOutputValue(ForgeDirection side, int subnet) { - if(currentlyEmmittedSignal != null) { - return 15; + public int[] getRednetOutputValues(ForgeDirection side) { + if (currentlyEmmittedSignal == null) { + return new int[16]; + } + int[] res = new int[DyeColor.values().length]; + for (DyeColor col : DyeColor.values()) { + res[col.ordinal()] = currentlyEmmittedSignal.color == col ? 15 : 0; + } + return res; } - return 0; - } - public boolean isEngineControlEnabled() { - return this.engineControlEnabled; - } + public int getRednetOutputValue(ForgeDirection side, int subnet) { + if (currentlyEmmittedSignal != null) { + return 15; + } + return 0; + } - public void setEngineControlEnabled(boolean control) { - this.engineControlEnabled = control; - } + public boolean isEngineControlEnabled() { + return this.engineControlEnabled; + } - public float getStartLevel() { - return this.startLevel; - } + public void setEngineControlEnabled(boolean control) { + this.engineControlEnabled = control; + } - public void setStartLevel(float start) { - this.startLevel = start; - } + public float getStartLevel() { + return this.startLevel; + } - public float getStopLevel() { - return this.stopLevel; - } + public void setStartLevel(float start) { + this.startLevel = start; + } - public void setStopLevel(float stop) { - this.stopLevel = stop; - } + public float getStopLevel() { + return this.stopLevel; + } - int asPercentInt(float val) { - return Math.round(val * 100); - } + public void setStopLevel(float stop) { + this.stopLevel = stop; + } - float asPercentFloat(int val) { - return val / 100f; - } + int asPercentInt(float val) { + return Math.round(val * 100); + } - @Override - public String getInventoryName() { - return EnderIO.blockPowerMonitor.getUnlocalizedName(); - } + float asPercentFloat(int val) { + return val / 100f; + } - @Override - public String getMachineName() { - return ModObject.blockPowerMonitor.unlocalisedName; - } + @Override + public String getInventoryName() { + return EnderIO.blockPowerMonitor.getUnlocalizedName(); + } - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return false; - } + @Override + public String getMachineName() { + return ModObject.blockPowerMonitor.unlocalisedName; + } - @Override - public boolean isActive() { - return false; - } + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return false; + } - public float getEnergyPerTick() { - return energyPerTick; - } + @Override + public boolean isActive() { + return false; + } - public float getPowerInConduits() { - return powerInConduits; - } + public float getEnergyPerTick() { + return energyPerTick; + } - public float getMaxPowerInConduits() { - return maxPowerInConduits; - } + public float getPowerInConduits() { + return powerInConduits; + } - public float getPowerInCapBanks() { - return powerInCapBanks; - } + public float getMaxPowerInConduits() { + return maxPowerInConduits; + } - public float getMaxPowerInCapBanks() { - return maxPowerInCapBanks; - } + public float getPowerInCapBanks() { + return powerInCapBanks; + } - public float getPowerInMachines() { - return powerInMachines; - } + public float getMaxPowerInCapBanks() { + return maxPowerInCapBanks; + } - public float getMaxPowerInMachines() { - return maxPowerInMachines; - } + public float getPowerInMachines() { + return powerInMachines; + } - public float getAveRfSent() { - return aveRfSent; - } + public float getMaxPowerInMachines() { + return maxPowerInMachines; + } - public float getAveRfReceived() { - return aveRfReceived; - } + public float getAveRfSent() { + return aveRfSent; + } - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - setEnergyStored(getEnergyStored() - energyPerTick); - - boolean update = worldObj.getWorldInfo().getWorldTotalTime() % 10 == 0; - NetworkPowerManager pm = getPowerManager(); - if(pm != null && update) { - update(pm); - Signal sig = null; - if(!engineControlEnabled) { - sig = null; - } else { - float percentFull = getPercentFull(); - if(currentlyEmmittedSignal == null) { - if(percentFull <= startLevel) { - sig = new Signal(xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN, 15, DyeColor.RED); - } + public float getAveRfReceived() { + return aveRfReceived; + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + setEnergyStored(getEnergyStored() - energyPerTick); + + boolean update = worldObj.getWorldInfo().getWorldTotalTime() % 10 == 0; + NetworkPowerManager pm = getPowerManager(); + if (pm != null && update) { + update(pm); + Signal sig = null; + if (!engineControlEnabled) { + sig = null; + } else { + float percentFull = getPercentFull(); + if (currentlyEmmittedSignal == null) { + if (percentFull <= startLevel) { + sig = new Signal(xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN, 15, DyeColor.RED); + } + } else { + if (percentFull >= stopLevel) { + sig = null; + } else { + sig = currentlyEmmittedSignal; + } + } + } + if (currentlyEmmittedSignal != sig) { + currentlyEmmittedSignal = sig; + broadcastSignal(); + } + } + if (update) { + PacketHandler.sendToAllAround(new PacketPowerInfo(this), this); + } + return false; + } + + private void broadcastSignal() { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, EnderIO.blockPowerMonitor); + } + + private float getPercentFull() { + return (float) (powerInConduits + powerInCapBanks) / (maxPowerInConduits + maxPowerInCapBanks); + } + + private void update(NetworkPowerManager pm) { + powerInConduits = pm.getPowerInConduits(); + maxPowerInConduits = pm.getMaxPowerInConduits(); + powerInCapBanks = pm.getPowerInCapacitorBanks(); + maxPowerInCapBanks = pm.getMaxPowerInCapacitorBanks(); + powerInMachines = pm.getPowerInReceptors(); + maxPowerInMachines = pm.getMaxPowerInReceptors(); + PowerTracker tracker = pm.getNetworkPowerTracker(); + aveRfSent = tracker.getAverageRfTickSent(); + aveRfReceived = tracker.getAverageRfTickRecieved(); + } + + private NetworkPowerManager getPowerManager() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IPowerConduit con = ConduitUtil.getConduit(worldObj, this, dir, IPowerConduit.class); + if (con != null) { + AbstractConduitNetwork n = con.getNetwork(); + if (n instanceof PowerConduitNetwork) { + NetworkPowerManager pm = ((PowerConduitNetwork) n).getPowerManager(); + if (pm != null) { + return pm; + } + } + } + } + return null; + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + readPowerInfoFromNBT(nbtRoot); + } + + public void readPowerInfoFromNBT(NBTTagCompound nbtRoot) { + powerInConduits = nbtRoot.getInteger("powerInConduits"); + maxPowerInConduits = nbtRoot.getInteger("maxPowerInConduits"); + if (nbtRoot.hasKey("powerInCapBanks")) { + powerInCapBanks = nbtRoot.getInteger("powerInCapBanks"); + maxPowerInCapBanks = nbtRoot.getInteger("maxPowerInCapBanks"); } else { - if(percentFull >= stopLevel) { - sig = null; - } else { - sig = currentlyEmmittedSignal; - } + powerInCapBanks = nbtRoot.getLong("powerInCapBanksL"); + maxPowerInCapBanks = nbtRoot.getLong("maxPowerInCapBanksL"); } - } - if(currentlyEmmittedSignal != sig) { - currentlyEmmittedSignal = sig; - broadcastSignal(); - } + powerInMachines = nbtRoot.getLong("powerInMachines"); + maxPowerInMachines = nbtRoot.getLong("maxPowerInMachines"); + aveRfSent = nbtRoot.getFloat("aveRfSent"); + aveRfReceived = nbtRoot.getFloat("aveRfReceived"); + + engineControlEnabled = nbtRoot.getBoolean("engineControlEnabled"); + startLevel = nbtRoot.getFloat("startLevel"); + stopLevel = nbtRoot.getFloat("stopLevel"); } - if(update) { - PacketHandler.sendToAllAround(new PacketPowerInfo(this), this); - } - return false; - } - private void broadcastSignal() { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, EnderIO.blockPowerMonitor); - - } - - private float getPercentFull() { - return (float)(powerInConduits + powerInCapBanks) / (maxPowerInConduits + maxPowerInCapBanks); - } - - private void update(NetworkPowerManager pm) { - powerInConduits = pm.getPowerInConduits(); - maxPowerInConduits = pm.getMaxPowerInConduits(); - powerInCapBanks = pm.getPowerInCapacitorBanks(); - maxPowerInCapBanks = pm.getMaxPowerInCapacitorBanks(); - powerInMachines = pm.getPowerInReceptors(); - maxPowerInMachines = pm.getMaxPowerInReceptors(); - PowerTracker tracker = pm.getNetworkPowerTracker(); - aveRfSent = tracker.getAverageRfTickSent(); - aveRfReceived = tracker.getAverageRfTickRecieved(); - } - - private NetworkPowerManager getPowerManager() { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IPowerConduit con = ConduitUtil.getConduit(worldObj, this, dir, IPowerConduit.class); - if(con != null) { - AbstractConduitNetwork n = con.getNetwork(); - if(n instanceof PowerConduitNetwork) { - NetworkPowerManager pm = ((PowerConduitNetwork) n).getPowerManager(); - if(pm != null) { - return pm; - } - } - } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + writePowerInfoToNBT(nbtRoot); } - return null; - } - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - readPowerInfoFromNBT(nbtRoot); - } + public void writePowerInfoToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setInteger("powerInConduits", powerInConduits); + nbtRoot.setInteger("maxPowerInConduits", maxPowerInConduits); + nbtRoot.setLong("powerInCapBanksL", powerInCapBanks); + nbtRoot.setLong("maxPowerInCapBanksL", maxPowerInCapBanks); + nbtRoot.setLong("powerInMachines", powerInMachines); + nbtRoot.setLong("maxPowerInMachines", maxPowerInMachines); + nbtRoot.setFloat("aveRfSent", aveRfSent); + nbtRoot.setFloat("aveRfReceived", aveRfReceived); - public void readPowerInfoFromNBT(NBTTagCompound nbtRoot) { - powerInConduits = nbtRoot.getInteger("powerInConduits"); - maxPowerInConduits = nbtRoot.getInteger("maxPowerInConduits"); - if(nbtRoot.hasKey("powerInCapBanks")) { - powerInCapBanks = nbtRoot.getInteger("powerInCapBanks"); - maxPowerInCapBanks = nbtRoot.getInteger("maxPowerInCapBanks"); - } else { - powerInCapBanks = nbtRoot.getLong("powerInCapBanksL"); - maxPowerInCapBanks = nbtRoot.getLong("maxPowerInCapBanksL"); + nbtRoot.setBoolean("engineControlEnabled", engineControlEnabled); + nbtRoot.setFloat("startLevel", startLevel); + nbtRoot.setFloat("stopLevel", stopLevel); } - powerInMachines = nbtRoot.getLong("powerInMachines"); - maxPowerInMachines = nbtRoot.getLong("maxPowerInMachines"); - aveRfSent = nbtRoot.getFloat("aveRfSent"); - aveRfReceived = nbtRoot.getFloat("aveRfReceived"); - - engineControlEnabled = nbtRoot.getBoolean("engineControlEnabled"); - startLevel = nbtRoot.getFloat("startLevel"); - stopLevel = nbtRoot.getFloat("stopLevel"); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - writePowerInfoToNBT(nbtRoot); - } - - public void writePowerInfoToNBT(NBTTagCompound nbtRoot) { - nbtRoot.setInteger("powerInConduits", powerInConduits); - nbtRoot.setInteger("maxPowerInConduits", maxPowerInConduits); - nbtRoot.setLong("powerInCapBanksL", powerInCapBanks); - nbtRoot.setLong("maxPowerInCapBanksL", maxPowerInCapBanks); - nbtRoot.setLong("powerInMachines", powerInMachines); - nbtRoot.setLong("maxPowerInMachines", maxPowerInMachines); - nbtRoot.setFloat("aveRfSent", aveRfSent); - nbtRoot.setFloat("aveRfReceived", aveRfReceived); - - nbtRoot.setBoolean("engineControlEnabled", engineControlEnabled); - nbtRoot.setFloat("startLevel", startLevel); - nbtRoot.setFloat("stopLevel", stopLevel); - - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public boolean hasCustomInventoryName() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/BlockObeliskAbstract.java b/src/main/java/crazypants/enderio/machine/obelisk/BlockObeliskAbstract.java index 85bcb4da..a3d8ba5d 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/BlockObeliskAbstract.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/BlockObeliskAbstract.java @@ -1,93 +1,93 @@ package crazypants.enderio.machine.obelisk; -import java.util.Random; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; public abstract class BlockObeliskAbstract extends AbstractMachineBlock { - public static int defaultObeliskRenderId; + public static int defaultObeliskRenderId; - protected BlockObeliskAbstract(ModObject mo, Class teClass) { - super(mo, teClass); - setBlockBounds(0.11f, 0, 0.11f, 0.91f, 0.48f, 0.91f); - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:blockAttractorSideOn"; + protected BlockObeliskAbstract(ModObject mo, Class teClass) { + super(mo, teClass); + setBlockBounds(0.11f, 0, 0.11f, 0.91f, 0.48f, 0.91f); } - return "enderio:blockAttractorSide"; - } - @Override - protected String getSideIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - - @Override - protected String getBackIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - - @Override - protected String getTopIconKey(boolean active) { - return "enderio:blockSoulMachineTop"; - } - - @Override - protected String getBottomIconKey(boolean active) { - return "enderio:obeliskBottom"; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getLightOpacity() { - return 0; - } - - @Override - public int getRenderType() { - return defaultObeliskRenderId; - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - if(isActive(world, x, y, z) && shouldDoWorkThisTick(world, x, y, z, 5)) { - float startX = x + 1.0F; - float startY = y + 0.85F; - float startZ = z + 1.0F; - for (int i = 0; i < 1; i++) { - float xOffset = -0.2F - rand.nextFloat() * 0.6F; - float yOffset = -0.1F + rand.nextFloat() * 0.2F; - float zOffset = -0.2F - rand.nextFloat() * 0.6F; - - EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("spell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); - if(fx != null) { - fx.setRBGColorF(0.2f, 0.2f, 0.8f); - fx.motionY *= 0.5f; + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:blockAttractorSideOn"; + } + return "enderio:blockAttractorSide"; + } + + @Override + protected String getSideIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + + @Override + protected String getBackIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + + @Override + protected String getTopIconKey(boolean active) { + return "enderio:blockSoulMachineTop"; + } + + @Override + protected String getBottomIconKey(boolean active) { + return "enderio:obeliskBottom"; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getLightOpacity() { + return 0; + } + + @Override + public int getRenderType() { + return defaultObeliskRenderId; + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + if (isActive(world, x, y, z) && shouldDoWorkThisTick(world, x, y, z, 5)) { + float startX = x + 1.0F; + float startY = y + 0.85F; + float startZ = z + 1.0F; + for (int i = 0; i < 1; i++) { + float xOffset = -0.2F - rand.nextFloat() * 0.6F; + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = -0.2F - rand.nextFloat() * 0.6F; + + EntityFX fx = Minecraft.getMinecraft() + .renderGlobal + .doSpawnParticle( + "spell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + if (fx != null) { + fx.setRBGColorF(0.2f, 0.2f, 0.8f); + fx.motionY *= 0.5f; + } + } } - - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java index 058b7c9f..06515f77 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java @@ -1,14 +1,5 @@ package crazypants.enderio.machine.obelisk; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; @@ -17,146 +8,148 @@ import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector3f; import com.enderio.core.common.vecmath.Vertex; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class ObeliskRenderer implements ISimpleBlockRenderingHandler { - private static final VertXForm2 xform2 = new VertXForm2(); - private static final VertXForm3 xform3 = new VertXForm3(); + private static final VertXForm2 xform2 = new VertXForm2(); + private static final VertXForm3 xform3 = new VertXForm3(); - private static final float WIDE_PINCH = 0.9f; - private static final float WIDTH = 18f / 32f * WIDE_PINCH; - private static final float HEIGHT = 0.475f; + private static final float WIDE_PINCH = 0.9f; + private static final float WIDTH = 18f / 32f * WIDE_PINCH; + private static final float HEIGHT = 0.475f; - private static final BoundingBox bb1 = BoundingBox.UNIT_CUBE.scale(WIDTH, HEIGHT, 1).translate(0, -0.5f + HEIGHT / 2, 0); - private static final BoundingBox bb2 = BoundingBox.UNIT_CUBE.scale(1, HEIGHT, WIDTH).translate(0, -0.5f + HEIGHT / 2, 0); + private static final BoundingBox bb1 = + BoundingBox.UNIT_CUBE.scale(WIDTH, HEIGHT, 1).translate(0, -0.5f + HEIGHT / 2, 0); + private static final BoundingBox bb2 = + BoundingBox.UNIT_CUBE.scale(1, HEIGHT, WIDTH).translate(0, -0.5f + HEIGHT / 2, 0); - private static final int BOTTOM = ForgeDirection.DOWN.ordinal(); - private static final int TOP = ForgeDirection.UP.ordinal(); + private static final int BOTTOM = ForgeDirection.DOWN.ordinal(); + private static final int TOP = ForgeDirection.UP.ordinal(); - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_ALPHA_TEST); - Tessellator.instance.startDrawingQuads(); - renderWorldBlock(null, 0, 0, 0, block, 0, renderer); - Tessellator.instance.draw(); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_LIGHTING); - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_ALPHA_TEST); + Tessellator.instance.startDrawingQuads(); + renderWorldBlock(null, 0, 0, 0, block, 0, renderer); + Tessellator.instance.draw(); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_LIGHTING); + } - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - IIcon[] icons; - if (world != null) { // block - RenderUtil.setTesselatorBrightness(world, x, y, z); - if (renderer.hasOverrideBlockTexture()) { // "block breaking" overlay - icons = new IIcon[6]; - for (int i = 0; i < icons.length; i++) { - icons[i] = renderer.overrideBlockTexture; + IIcon[] icons; + if (world != null) { // block + RenderUtil.setTesselatorBrightness(world, x, y, z); + if (renderer.hasOverrideBlockTexture()) { // "block breaking" overlay + icons = new IIcon[6]; + for (int i = 0; i < icons.length; i++) { + icons[i] = renderer.overrideBlockTexture; + } + } else { + icons = RenderUtil.getBlockTextures(world, x, y, z); + } + } else { // item + icons = RenderUtil.getBlockTextures(block, 0); } - } else { - icons = RenderUtil.getBlockTextures(world, x, y, z); - } - } else { // item - icons = RenderUtil.getBlockTextures(block, 0); - } - // bottom texture goes into its own BB - IIcon[] bottomIcons = new IIcon[6]; - for (int i = 1; i < bottomIcons.length; i++) { - bottomIcons[i] = IconUtil.blankTexture; - } - bottomIcons[BOTTOM] = icons[BOTTOM]; - icons[BOTTOM] = IconUtil.blankTexture; + // bottom texture goes into its own BB + IIcon[] bottomIcons = new IIcon[6]; + for (int i = 1; i < bottomIcons.length; i++) { + bottomIcons[i] = IconUtil.blankTexture; + } + bottomIcons[BOTTOM] = icons[BOTTOM]; + icons[BOTTOM] = IconUtil.blankTexture; - Tessellator.instance.addTranslation(x, y, z); + Tessellator.instance.addTranslation(x, y, z); - xform2.isX = false; - CubeRenderer.render(bb1, icons, xform2, true); + xform2.isX = false; + CubeRenderer.render(bb1, icons, xform2, true); - xform2.isX = true; - icons[TOP] = IconUtil.blankTexture; - CubeRenderer.render(bb2, icons, xform2, true); + xform2.isX = true; + icons[TOP] = IconUtil.blankTexture; + CubeRenderer.render(bb2, icons, xform2, true); - CubeRenderer.render(BoundingBox.UNIT_CUBE, bottomIcons, xform3, true); + CubeRenderer.render(BoundingBox.UNIT_CUBE, bottomIcons, xform3, true); - Tessellator.instance.addTranslation(-x, -y, -z); + Tessellator.instance.addTranslation(-x, -y, -z); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockObeliskAbstract.defaultObeliskRenderId; - } - - private static class VertXForm2 implements VertexTransform { - - boolean isX = true; - - public VertXForm2() { + return true; } @Override - public void apply(Vertex vertex) { - apply(vertex.xyz); + public boolean shouldRender3DInInventory(int modelId) { + return true; } @Override - public void apply(Vector3d vec) { - double pinch = WIDE_PINCH; - if(vec.y > 0.2) { - pinch = 0.5; - } - if(isX) { - vec.x -= 0.5; - vec.x *= pinch; - vec.x += 0.5; - } else { - vec.z -= 0.5; - vec.z *= pinch; - vec.z += 0.5; - } + public int getRenderId() { + return BlockObeliskAbstract.defaultObeliskRenderId; } - @Override - public void applyToNormal(Vector3f vec) { + private static class VertXForm2 implements VertexTransform { + + boolean isX = true; + + public VertXForm2() {} + + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + + @Override + public void apply(Vector3d vec) { + double pinch = WIDE_PINCH; + if (vec.y > 0.2) { + pinch = 0.5; + } + if (isX) { + vec.x -= 0.5; + vec.x *= pinch; + vec.x += 0.5; + } else { + vec.z -= 0.5; + vec.z *= pinch; + vec.z += 0.5; + } + } + + @Override + public void applyToNormal(Vector3f vec) {} } - } + private static class VertXForm3 implements VertexTransform { - private static class VertXForm3 implements VertexTransform { + public VertXForm3() {} - public VertXForm3() { + @Override + public void apply(Vertex vertex) { + apply(vertex.xyz); + } + + @Override + public void apply(Vector3d vec) { + vec.x -= 0.5; + vec.x *= WIDE_PINCH; + vec.x += 0.5; + vec.z -= 0.5; + vec.z *= WIDE_PINCH; + vec.z += 0.5; + } + + @Override + public void applyToNormal(Vector3f vec) {} } - - @Override - public void apply(Vertex vertex) { - apply(vertex.xyz); - } - - @Override - public void apply(Vector3d vec) { - vec.x -= 0.5; - vec.x *= WIDE_PINCH; - vec.x += 0.5; - vec.z -= 0.5; - vec.z *= WIDE_PINCH; - vec.z += 0.5; - } - - @Override - public void applyToNormal(Vector3f vec) { - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java index b17eaea5..7af1f540 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java @@ -1,7 +1,12 @@ package crazypants.enderio.machine.obelisk; -import java.util.Random; +import static org.lwjgl.opengl.GL11.*; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -16,128 +21,119 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Timer; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import static org.lwjgl.opengl.GL11.*; - @SideOnly(Side.CLIENT) public class ObeliskSpecialRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private ItemStack floatingStack; + private ItemStack floatingStack; - private Random rand = new Random(); - private ObeliskRenderer blockRen; + private Random rand = new Random(); + private ObeliskRenderer blockRen; - public ObeliskSpecialRenderer(ItemStack itemStack, ObeliskRenderer renderer) { - this.floatingStack = itemStack; - this.blockRen = renderer; - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - GL11.glPushMatrix(); - switch(type) { - case ENTITY: - GL11.glTranslatef(0, 0.25f, 0); - break; - case EQUIPPED: - GL11.glRotatef(22, 0, 0, 1); - GL11.glRotatef(-10, 1, 0, 0); - GL11.glTranslatef(0.3f, -0.4f, -0.4f); - break; - case EQUIPPED_FIRST_PERSON: - GL11.glTranslatef(0.75f, 0, 0); - break; - case INVENTORY: - GL11.glTranslatef(8, 9, 0); - GL11.glScalef(12F, 12F, 12F); - GL11.glScalef(1.0F, 1.0F, -1F); - GL11.glRotatef(210F, 1, 0, 0); - GL11.glRotatef(-45F, 0, 1, 0); - break; - default: - break; + public ObeliskSpecialRenderer(ItemStack itemStack, ObeliskRenderer renderer) { + this.floatingStack = itemStack; + this.blockRen = renderer; } - blockRen.renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); - Timer t = RenderUtil.getTimer(); - renderItemStack(null, Minecraft.getMinecraft().theWorld, 0, 0, 0, t == null ? 0 : t.renderPartialTicks); - GL11.glPopMatrix(); - } - - private EntityItem ei = null; - - @SuppressWarnings("unchecked") - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - - World world = te.getWorldObj(); - float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - - renderItemStack((T) te, world, x, y, z, tick); - } - - protected void renderItemStack(T te, World world, double x, double y, double z, float tick) { - if(ei == null) { - ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te)); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - ei.setEntityItemStack(getFloatingItem(te)); - ei.hoverStart = (float) ((EnderIO.proxy.getTickCount() * 0.05f + (tick * 0.05f)) % (Math.PI * 2)); - ei.age = 0; - - glPushMatrix(); - glPushAttrib(GL_ALL_ATTRIB_BITS); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_ALPHA_TEST); - RenderHelper.enableStandardItemLighting(); - glTranslated(x + 0.5, y + 0.7, z + 0.5); - glScalef(1.1f, 1.1f, 1.1f); - glDepthMask(true); - - if(te != null) { - rand.setSeed(te.xCoord + te.yCoord + te.zCoord); - rand.nextBoolean(); - if(Minecraft.getMinecraft().gameSettings.fancyGraphics) { - glRotatef(rand.nextFloat() * 360f, 0, 1, 0); - } - ei.hoverStart += rand.nextFloat(); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION; } - RenderManager.instance.renderEntityWithPosYaw(ei, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); - glPopAttrib(); - glPopMatrix(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - /** - * @param te CAN BE NULL - */ - protected ItemStack getFloatingItem(T te) { - return floatingStack; - } + GL11.glPushMatrix(); + switch (type) { + case ENTITY: + GL11.glTranslatef(0, 0.25f, 0); + break; + case EQUIPPED: + GL11.glRotatef(22, 0, 0, 1); + GL11.glRotatef(-10, 1, 0, 0); + GL11.glTranslatef(0.3f, -0.4f, -0.4f); + break; + case EQUIPPED_FIRST_PERSON: + GL11.glTranslatef(0.75f, 0, 0); + break; + case INVENTORY: + GL11.glTranslatef(8, 9, 0); + GL11.glScalef(12F, 12F, 12F); + GL11.glScalef(1.0F, 1.0F, -1F); + GL11.glRotatef(210F, 1, 0, 0); + GL11.glRotatef(-45F, 0, 1, 0); + break; + default: + break; + } + blockRen.renderInventoryBlock( + Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); + Timer t = RenderUtil.getTimer(); + renderItemStack(null, Minecraft.getMinecraft().theWorld, 0, 0, 0, t == null ? 0 : t.renderPartialTicks); + GL11.glPopMatrix(); + } + private EntityItem ei = null; + + @SuppressWarnings("unchecked") + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + + World world = te.getWorldObj(); + float f = world.getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = world.getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + + renderItemStack((T) te, world, x, y, z, tick); + } + + protected void renderItemStack(T te, World world, double x, double y, double z, float tick) { + if (ei == null) { + ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te)); + } + + ei.setEntityItemStack(getFloatingItem(te)); + ei.hoverStart = (float) ((EnderIO.proxy.getTickCount() * 0.05f + (tick * 0.05f)) % (Math.PI * 2)); + ei.age = 0; + + glPushMatrix(); + glPushAttrib(GL_ALL_ATTRIB_BITS); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glEnable(GL11.GL_ALPHA_TEST); + RenderHelper.enableStandardItemLighting(); + glTranslated(x + 0.5, y + 0.7, z + 0.5); + glScalef(1.1f, 1.1f, 1.1f); + glDepthMask(true); + + if (te != null) { + rand.setSeed(te.xCoord + te.yCoord + te.zCoord); + rand.nextBoolean(); + if (Minecraft.getMinecraft().gameSettings.fancyGraphics) { + glRotatef(rand.nextFloat() * 360f, 0, 1, 0); + } + ei.hoverStart += rand.nextFloat(); + } + + RenderManager.instance.renderEntityWithPosYaw(ei, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + glPopAttrib(); + glPopMatrix(); + } + + /** + * @param te CAN BE NULL + */ + protected ItemStack getFloatingItem(T te) { + return floatingStack; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java index b4607cf6..c6ccdf2e 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/BlockAttractor.java @@ -1,49 +1,46 @@ package crazypants.enderio.machine.obelisk.attractor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; public class BlockAttractor extends BlockObeliskAbstract { - - public static BlockAttractor create() { - BlockAttractor res = new BlockAttractor(); - res.init(); - MinecraftForge.EVENT_BUS.register(new EndermanFixer()); - return res; - } - - protected BlockAttractor() { - super(ModObject.blockAttractor, TileAttractor.class); - } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileAttractor) { - return new ContainerAttractor(player.inventory, (TileAttractor)te); + public static BlockAttractor create() { + BlockAttractor res = new BlockAttractor(); + res.init(); + MinecraftForge.EVENT_BUS.register(new EndermanFixer()); + return res; } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileAttractor) { - return new GuiAttractor(player.inventory, (TileAttractor)te); - } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_ATTRACTOR; - } + protected BlockAttractor() { + super(ModObject.blockAttractor, TileAttractor.class); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileAttractor) { + return new ContainerAttractor(player.inventory, (TileAttractor) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileAttractor) { + return new GuiAttractor(player.inventory, (TileAttractor) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_ATTRACTOR; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java index e6b94ab4..876e4870 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/ContainerAttractor.java @@ -1,53 +1,49 @@ package crazypants.enderio.machine.obelisk.attractor; -import java.util.ArrayList; -import java.util.List; - import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; import com.enderio.core.client.gui.widget.GhostSlot; - +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import java.util.List; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerAttractor extends AbstractMachineContainer { - public ContainerAttractor(InventoryPlayer playerInv, TileAttractor te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - int x; - int y = 10; - for (int row = 0; row < 3; row++) { - x = 62; - for (int col = 0; col < 4; col++) { - final int index = (row * 4) + col; - addSlotToContainer(new Slot(getInv(), index, x, y) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(index, itemStack); - } - }); - x += 18; - } - y+= 18; + public ContainerAttractor(InventoryPlayer playerInv, TileAttractor te) { + super(playerInv, te); } - } - public void createGhostSlots(List slots) { - int y = 10; - for (int row = 0; row < 3; row++) { - int x = 62; - for (int col = 0; col < 4; col++) { - slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, x, y)); - x += 18; - } - y += 18; + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + int x; + int y = 10; + for (int row = 0; row < 3; row++) { + x = 62; + for (int col = 0; col < 4; col++) { + final int index = (row * 4) + col; + addSlotToContainer(new Slot(getInv(), index, x, y) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(index, itemStack); + } + }); + x += 18; + } + y += 18; + } } - } + public void createGhostSlots(List slots) { + int y = 10; + for (int row = 0; row < 3; row++) { + int x = 62; + for (int col = 0; col < 4; col++) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, x, y)); + x += 18; + } + y += 18; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/EndermanFixer.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/EndermanFixer.java index 86d98966..20435c23 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/EndermanFixer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/EndermanFixer.java @@ -1,15 +1,16 @@ package crazypants.enderio.machine.obelisk.attractor; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.monster.EntityEnderman; import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class EndermanFixer { - @SubscribeEvent - public void onEndermanTeleport(EnderTeleportEvent event) { - if (event.entityLiving instanceof EntityEnderman && event.entityLiving.getEntityData().getBoolean("EIO:tracked")) { - event.setCanceled(true); + @SubscribeEvent + public void onEndermanTeleport(EnderTeleportEvent event) { + if (event.entityLiving instanceof EntityEnderman + && event.entityLiving.getEntityData().getBoolean("EIO:tracked")) { + event.setCanceled(true); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index 95ed25e4..199a5e8c 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -1,78 +1,77 @@ package crazypants.enderio.machine.obelisk.attractor; -import java.awt.Color; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.gui.ExternalConnectionContainer; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import java.awt.Color; +import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiAttractor extends GuiPoweredMachineBase { - private static final int RANGE_ID = 8738924; + private static final int RANGE_ID = 8738924; - private final ToggleButton showRangeB; - - public GuiAttractor(InventoryPlayer par1InventoryPlayer, TileAttractor te) { - super(te, new ContainerAttractor(par1InventoryPlayer, te), "attractor"); + private final ToggleButton showRangeB; - int x = getXSize() - 5 - BUTTON_SIZE; - showRangeB = new ToggleButton(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); - showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); - addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { - @Override - public List getToolTipText() { - return Lists.newArrayList(EnderIO.lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); - } - }); - } + public GuiAttractor(InventoryPlayer par1InventoryPlayer, TileAttractor te) { + super(te, new ContainerAttractor(par1InventoryPlayer, te), "attractor"); - @Override - public void initGui() { - super.initGui(); - showRangeB.onGuiInit(); - showRangeB.setSelected(getTileEntity().isShowingRange()); - ((ContainerAttractor) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == RANGE_ID) { - getTileEntity().setShowRange(showRangeB.isSelected()); + int x = getXSize() - 5 - BUTTON_SIZE; + showRangeB = new ToggleButton(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + @Override + public List getToolTipText() { + return Lists.newArrayList(EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); } - } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + @Override + public void initGui() { + super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(getTileEntity().isShowingRange()); + ((ContainerAttractor) inventorySlots).createGhostSlots(getGhostSlots()); + } - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - int range = (int) getTileEntity().getRange(); - drawCenteredString(fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx/2 + 9, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); - } + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == RANGE_ID) { + getTileEntity().setShowRange(showRangeB.isSelected()); + } + } - @Override - protected boolean showRecipeButton() { - return false; - } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + int range = (int) getTileEntity().getRange(); + drawCenteredString( + fontRendererObj, + EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, + getGuiLeft() + sx / 2 + 9, + getGuiTop() + 68, + ColorUtil.getRGB(Color.white)); + } + + @Override + protected boolean showRecipeButton() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java index e9881cd2..281cd7e8 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/TileAttractor.java @@ -1,15 +1,28 @@ package crazypants.enderio.machine.obelisk.attractor; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3d; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractPowerConsumerEntity; +import crazypants.enderio.machine.FakePlayerEIO; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.ranged.IRanged; +import crazypants.enderio.machine.ranged.RangeEntity; +import crazypants.enderio.power.BasicCapacitor; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; - import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; @@ -22,437 +35,422 @@ import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathEntity; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.common.util.FakePlayer; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector3d; -import com.mojang.authlib.GameProfile; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractPowerConsumerEntity; -import crazypants.enderio.machine.FakePlayerEIO; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.ranged.IRanged; -import crazypants.enderio.machine.ranged.RangeEntity; -import crazypants.enderio.power.BasicCapacitor; - public class TileAttractor extends AbstractPowerConsumerEntity implements IRanged { - private AxisAlignedBB attractorBounds; - private FakePlayer target; - private int rangeSqu; - private int range; - private int powerPerTick; - private Set tracking = new HashSet(); - private int tickCounter = 0; - private int maxMobsAttracted = 20; - - private boolean showingRange; - - public TileAttractor() { - super(new SlotDefinition(12, 0)); - } - - @Override - public float getRange() { - return range; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean isShowingRange() { - return showingRange; - } - - @SideOnly(Side.CLIENT) - public void setShowRange(boolean showRange) { - if(showingRange == showRange) { - return; - } - showingRange = showRange; - if(showingRange) { - worldObj.spawnEntityInWorld(new RangeEntity(this)); - } - } - - @Override - public World getWorld() { - return worldObj; - } - - @Override - public void onCapacitorTypeChange() { - switch (getCapacitor().getTier()) { - case 2: - range = Config.attractorRangeLevelTwo; - powerPerTick = Config.attractorPowerPerTickLevelTwo; - break; - case 3: - case 4: - case 5: - case 6: - case 7: - range = Config.attractorRangeLevelThree; - powerPerTick = Config.attractorPowerPerTickLevelThree; - break; - case 1: - default: - range = Config.attractorRangeLevelOne; - powerPerTick = Config.attractorPowerPerTickLevelOne; - break; - } - rangeSqu = range * range; - - BoundingBox bb = new BoundingBox(new BlockCoord(this)); - bb = bb.scale(range, range, range); - attractorBounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick)); - } - - @Override - public String getMachineName() { - return ModObject.blockAttractor.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - if(!slotDefinition.isInputSlot(i)) { - return false; - } - String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(itemstack); - if(mob == null) { - return false; - } - Class cl = (Class) EntityList.stringToClassMapping.get(mob); - if(cl == null) { - return false; - } - return EntityLiving.class.isAssignableFrom(cl); - } - - @Override - public boolean isActive() { - return hasPower(); - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - if(redstoneCheckPassed && hasPower()) { - usePower(); - } else { - return false; - } - tickCounter++; - if(tickCounter < 10) { - for (EntityLiving ent : tracking) { - onEntityTick(ent); - } - return false; - } - tickCounter = 0; - - Set trackingThisTick = new HashSet(); - List entsInBounds = worldObj.getEntitiesWithinAABB(EntityLiving.class, attractorBounds); - - int candidates = 0; - for (EntityLiving ent : entsInBounds) { - if(!ent.isDead && isMobInFilter(ent)) { - candidates++; - if(tracking.contains(ent)) { - trackingThisTick.add(ent); - onEntityTick(ent); - } else if(tracking.size() < maxMobsAttracted && trackMob(ent)) { - trackingThisTick.add(ent); - onTracked(ent); - } - } - } - for (EntityLiving e : tracking) { - if (!trackingThisTick.contains(e)) { - onUntracked(e); - } - } - tracking.clear(); - tracking = trackingThisTick; - return false; - } - - private void onUntracked(EntityLiving e) { - if (e instanceof EntityEnderman) { - e.getEntityData().setBoolean("EIO:tracked", false); - } - } - - private void onTracked(EntityLiving e) { - if (e instanceof EntityEnderman) { - e.getEntityData().setBoolean("EIO:tracked", true); - } - } - - @Override - public void invalidate() { - super.invalidate(); - for (EntityLiving e : tracking) { - onUntracked(e); - } - tracking.clear(); - } - - protected double usePower() { - return usePower(getPowerUsePerTick()); - } - - protected int usePower(int wantToUse) { - int used = Math.min(getEnergyStored(), wantToUse); - setEnergyStored(Math.max(0, getEnergyStored() - used)); - return used; - } - - @Override - public int getPowerUsePerTick() { - return powerPerTick; - } - - FakePlayer getTarget() { - if(target == null) { - target = new Target(); - } - return target; - } - - public boolean canAttract(String entityId, EntityLiving mob) { - return redstoneCheckPassed && hasPower() && isMobInFilter(entityId) && isMobInRange(mob); - } - - private boolean isMobInRange(EntityLiving mob) { - return isMobInRange(mob, rangeSqu); - } - - private boolean isMobInRange(EntityLiving mob, int range) { - if(mob == null) { - return false; - } - return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= range; - } - - private boolean isMobInFilter(EntityLiving ent) { - return isMobInFilter(EntityList.getEntityString(ent)); - } - - private boolean isMobInFilter(String entityId) { - for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { - if(inventory[i] != null) { - String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(inventory[i]); - if(mob != null && mob.equals(entityId)) { - return true; - } - } - } - return false; - } - - private boolean trackMob(EntityLiving ent) { - if(useSetTarget(ent)) { - ((EntityMob) ent).setTarget(getTarget()); - return true; - } else if(useSpecialCase(ent)) { - return applySpecialCase(ent); - } else { - return attractyUsingAITask(ent); - } - } - - private boolean attractyUsingAITask(EntityLiving ent) { - tracking.add(ent); - List entries = ent.tasks.taskEntries; - boolean hasTask = false; - EntityAIBase remove = null; - boolean isTracked; - for (EntityAITaskEntry entry : entries) { - if(entry.action instanceof AttractTask) { - AttractTask at = (AttractTask) entry.action; - if(at.coord.equals(new BlockCoord(this)) || !at.continueExecuting()) { - remove = entry.action; - } else { - return false; - } - } - } - if(remove != null) { - ent.tasks.removeTask(remove); - } - cancelCurrentTasks(ent); - ent.tasks.addTask(0, new AttractTask(ent, getTarget(), new BlockCoord(this))); - - return true; - } - - private void cancelCurrentTasks(EntityLiving ent) { - Iterator iterator = ent.tasks.taskEntries.iterator(); - - List currentTasks = new ArrayList(); - while (iterator.hasNext()) { - EntityAITaskEntry entityaitaskentry = (EntityAITasks.EntityAITaskEntry)iterator.next(); - if(entityaitaskentry != null) { - currentTasks.add(entityaitaskentry); - } - } - //Only available way to stop current execution is to remove all current tasks, then re-add them - for(EntityAITaskEntry task : currentTasks) { - ent.tasks.removeTask(task.action); - ent.tasks.addTask(task.priority, task.action); - } - } - - private boolean applySpecialCase(EntityLiving ent) { - if(ent instanceof EntitySlime) { - ent.faceEntity(getTarget(), 10.0F, 20.0F); - return true; - } else if(ent instanceof EntitySilverfish) { - PathEntity pathentity = worldObj.getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); - ((EntityCreature) ent).setPathToEntity(pathentity); - return true; - } else if(ent instanceof EntityBlaze) { - return true; - } - return false; - } - - private boolean useSpecialCase(EntityLiving ent) { - return ent instanceof EntitySlime || ent instanceof EntitySilverfish || ent instanceof EntityBlaze; - } - - private void onEntityTick(EntityLiving ent) { - if(ent instanceof EntitySlime) { - ent.faceEntity(getTarget(), 10.0F, 20.0F); - } else if(ent instanceof EntitySilverfish) { - if(tickCounter < 10) { - return; - } - EntitySilverfish sf = (EntitySilverfish) ent; - PathEntity pathentity = worldObj.getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); - sf.setPathToEntity(pathentity); - } else if(ent instanceof EntityBlaze) { - EntityBlaze mob = (EntityBlaze) ent; - - double x = (xCoord + 0.5D - ent.posX); - double y = (yCoord + 1D - ent.posY); - double z = (zCoord + 0.5D - ent.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - if(distance > 1.25) { - double speed = 0.01; - ent.motionX += x / distance * speed; - if(y > 0) { - ent.motionY += (0.30000001192092896D - ent.motionY) * 0.30000001192092896D; - } - ent.motionZ += z / distance * speed; - } - } else if(ent instanceof EntityPigZombie || ent instanceof EntitySpider) { - forceMove(ent); - } else if(ent instanceof EntityEnderman) { - ((EntityEnderman) ent).setTarget(getTarget()); - } - } - - private void forceMove(EntityLiving ent) { - double x = (xCoord + 0.5D - ent.posX); - double y = (yCoord + 1D - ent.posY); - double z = (zCoord + 0.5D - ent.posZ); - double distance = Math.sqrt(x * x + y * y + z * z); - if(distance > 2) { - EntityMob mod = (EntityMob) ent; - mod.faceEntity(getTarget(), 180, 0); - mod.moveEntityWithHeading(0, 1); - if(mod.posY < yCoord) { - mod.setJumping(true); - } else { - mod.setJumping(false); - } - } - } - - private boolean useSetTarget(EntityLiving ent) { - return ent instanceof EntityPigZombie || ent instanceof EntitySpider || ent instanceof EntitySilverfish; - } - - private class Target extends FakePlayerEIO { - - public Target() { - super(getWorldObj(), getLocation(), new GameProfile(null, ModObject.blockAttractor.unlocalisedName + ":" + getLocation())); - posY += 1; - } - } - - private static class AttractTask extends EntityAIBase { - - private EntityLiving mob; - private BlockCoord coord; + private AxisAlignedBB attractorBounds; private FakePlayer target; - private String entityId; - private int updatesSincePathing; + private int rangeSqu; + private int range; + private int powerPerTick; + private Set tracking = new HashSet(); + private int tickCounter = 0; + private int maxMobsAttracted = 20; - private boolean started = false; + private boolean showingRange; - private AttractTask(EntityLiving mob, FakePlayer target, BlockCoord coord) { - this.mob = mob; - this.coord = coord; - this.target = target; - entityId = EntityList.getEntityString(mob); + public TileAttractor() { + super(new SlotDefinition(12, 0)); } @Override - public boolean shouldExecute() { - return continueExecuting(); + public float getRange() { + return range; } @Override - public void resetTask() { - started = false; - updatesSincePathing = 0; + @SideOnly(Side.CLIENT) + public boolean isShowingRange() { + return showingRange; } - @Override - public boolean continueExecuting() { - boolean res = false; - TileEntity te = mob.worldObj.getTileEntity(coord.x, coord.y, coord.z); - if(te instanceof TileAttractor) { - TileAttractor attractor = (TileAttractor) te; - res = attractor.canAttract(entityId, mob); - } - return res; - } - - @Override - public boolean isInterruptible() { - return true; - } - - @Override - public void updateTask() { - if(!started || updatesSincePathing > 20) { - started = true; - int speed = 1; - mob.getNavigator().setAvoidsWater(false); - boolean res = mob.getNavigator().tryMoveToEntityLiving(target, speed); - if(!res) { - mob.getNavigator().tryMoveToXYZ(target.posX, target.posY +1, target.posZ, speed); + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); } - updatesSincePathing = 0; - } else { - updatesSincePathing++; - } } - } + @Override + public World getWorld() { + return worldObj; + } + @Override + public void onCapacitorTypeChange() { + switch (getCapacitor().getTier()) { + case 2: + range = Config.attractorRangeLevelTwo; + powerPerTick = Config.attractorPowerPerTickLevelTwo; + break; + case 3: + case 4: + case 5: + case 6: + case 7: + range = Config.attractorRangeLevelThree; + powerPerTick = Config.attractorPowerPerTickLevelThree; + break; + case 1: + default: + range = Config.attractorRangeLevelOne; + powerPerTick = Config.attractorPowerPerTickLevelOne; + break; + } + rangeSqu = range * range; + + BoundingBox bb = new BoundingBox(new BlockCoord(this)); + bb = bb.scale(range, range, range); + attractorBounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick)); + } + + @Override + public String getMachineName() { + return ModObject.blockAttractor.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + if (!slotDefinition.isInputSlot(i)) { + return false; + } + String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(itemstack); + if (mob == null) { + return false; + } + Class cl = (Class) EntityList.stringToClassMapping.get(mob); + if (cl == null) { + return false; + } + return EntityLiving.class.isAssignableFrom(cl); + } + + @Override + public boolean isActive() { + return hasPower(); + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + if (redstoneCheckPassed && hasPower()) { + usePower(); + } else { + return false; + } + tickCounter++; + if (tickCounter < 10) { + for (EntityLiving ent : tracking) { + onEntityTick(ent); + } + return false; + } + tickCounter = 0; + + Set trackingThisTick = new HashSet(); + List entsInBounds = worldObj.getEntitiesWithinAABB(EntityLiving.class, attractorBounds); + + int candidates = 0; + for (EntityLiving ent : entsInBounds) { + if (!ent.isDead && isMobInFilter(ent)) { + candidates++; + if (tracking.contains(ent)) { + trackingThisTick.add(ent); + onEntityTick(ent); + } else if (tracking.size() < maxMobsAttracted && trackMob(ent)) { + trackingThisTick.add(ent); + onTracked(ent); + } + } + } + for (EntityLiving e : tracking) { + if (!trackingThisTick.contains(e)) { + onUntracked(e); + } + } + tracking.clear(); + tracking = trackingThisTick; + return false; + } + + private void onUntracked(EntityLiving e) { + if (e instanceof EntityEnderman) { + e.getEntityData().setBoolean("EIO:tracked", false); + } + } + + private void onTracked(EntityLiving e) { + if (e instanceof EntityEnderman) { + e.getEntityData().setBoolean("EIO:tracked", true); + } + } + + @Override + public void invalidate() { + super.invalidate(); + for (EntityLiving e : tracking) { + onUntracked(e); + } + tracking.clear(); + } + + protected double usePower() { + return usePower(getPowerUsePerTick()); + } + + protected int usePower(int wantToUse) { + int used = Math.min(getEnergyStored(), wantToUse); + setEnergyStored(Math.max(0, getEnergyStored() - used)); + return used; + } + + @Override + public int getPowerUsePerTick() { + return powerPerTick; + } + + FakePlayer getTarget() { + if (target == null) { + target = new Target(); + } + return target; + } + + public boolean canAttract(String entityId, EntityLiving mob) { + return redstoneCheckPassed && hasPower() && isMobInFilter(entityId) && isMobInRange(mob); + } + + private boolean isMobInRange(EntityLiving mob) { + return isMobInRange(mob, rangeSqu); + } + + private boolean isMobInRange(EntityLiving mob, int range) { + if (mob == null) { + return false; + } + return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) + <= range; + } + + private boolean isMobInFilter(EntityLiving ent) { + return isMobInFilter(EntityList.getEntityString(ent)); + } + + private boolean isMobInFilter(String entityId) { + for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { + if (inventory[i] != null) { + String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(inventory[i]); + if (mob != null && mob.equals(entityId)) { + return true; + } + } + } + return false; + } + + private boolean trackMob(EntityLiving ent) { + if (useSetTarget(ent)) { + ((EntityMob) ent).setTarget(getTarget()); + return true; + } else if (useSpecialCase(ent)) { + return applySpecialCase(ent); + } else { + return attractyUsingAITask(ent); + } + } + + private boolean attractyUsingAITask(EntityLiving ent) { + tracking.add(ent); + List entries = ent.tasks.taskEntries; + boolean hasTask = false; + EntityAIBase remove = null; + boolean isTracked; + for (EntityAITaskEntry entry : entries) { + if (entry.action instanceof AttractTask) { + AttractTask at = (AttractTask) entry.action; + if (at.coord.equals(new BlockCoord(this)) || !at.continueExecuting()) { + remove = entry.action; + } else { + return false; + } + } + } + if (remove != null) { + ent.tasks.removeTask(remove); + } + cancelCurrentTasks(ent); + ent.tasks.addTask(0, new AttractTask(ent, getTarget(), new BlockCoord(this))); + + return true; + } + + private void cancelCurrentTasks(EntityLiving ent) { + Iterator iterator = ent.tasks.taskEntries.iterator(); + + List currentTasks = new ArrayList(); + while (iterator.hasNext()) { + EntityAITaskEntry entityaitaskentry = (EntityAITasks.EntityAITaskEntry) iterator.next(); + if (entityaitaskentry != null) { + currentTasks.add(entityaitaskentry); + } + } + // Only available way to stop current execution is to remove all current tasks, then re-add them + for (EntityAITaskEntry task : currentTasks) { + ent.tasks.removeTask(task.action); + ent.tasks.addTask(task.priority, task.action); + } + } + + private boolean applySpecialCase(EntityLiving ent) { + if (ent instanceof EntitySlime) { + ent.faceEntity(getTarget(), 10.0F, 20.0F); + return true; + } else if (ent instanceof EntitySilverfish) { + PathEntity pathentity = + worldObj.getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); + ((EntityCreature) ent).setPathToEntity(pathentity); + return true; + } else if (ent instanceof EntityBlaze) { + return true; + } + return false; + } + + private boolean useSpecialCase(EntityLiving ent) { + return ent instanceof EntitySlime || ent instanceof EntitySilverfish || ent instanceof EntityBlaze; + } + + private void onEntityTick(EntityLiving ent) { + if (ent instanceof EntitySlime) { + ent.faceEntity(getTarget(), 10.0F, 20.0F); + } else if (ent instanceof EntitySilverfish) { + if (tickCounter < 10) { + return; + } + EntitySilverfish sf = (EntitySilverfish) ent; + PathEntity pathentity = + worldObj.getPathEntityToEntity(ent, getTarget(), getRange(), true, false, false, true); + sf.setPathToEntity(pathentity); + } else if (ent instanceof EntityBlaze) { + EntityBlaze mob = (EntityBlaze) ent; + + double x = (xCoord + 0.5D - ent.posX); + double y = (yCoord + 1D - ent.posY); + double z = (zCoord + 0.5D - ent.posZ); + double distance = Math.sqrt(x * x + y * y + z * z); + if (distance > 1.25) { + double speed = 0.01; + ent.motionX += x / distance * speed; + if (y > 0) { + ent.motionY += (0.30000001192092896D - ent.motionY) * 0.30000001192092896D; + } + ent.motionZ += z / distance * speed; + } + } else if (ent instanceof EntityPigZombie || ent instanceof EntitySpider) { + forceMove(ent); + } else if (ent instanceof EntityEnderman) { + ((EntityEnderman) ent).setTarget(getTarget()); + } + } + + private void forceMove(EntityLiving ent) { + double x = (xCoord + 0.5D - ent.posX); + double y = (yCoord + 1D - ent.posY); + double z = (zCoord + 0.5D - ent.posZ); + double distance = Math.sqrt(x * x + y * y + z * z); + if (distance > 2) { + EntityMob mod = (EntityMob) ent; + mod.faceEntity(getTarget(), 180, 0); + mod.moveEntityWithHeading(0, 1); + if (mod.posY < yCoord) { + mod.setJumping(true); + } else { + mod.setJumping(false); + } + } + } + + private boolean useSetTarget(EntityLiving ent) { + return ent instanceof EntityPigZombie || ent instanceof EntitySpider || ent instanceof EntitySilverfish; + } + + private class Target extends FakePlayerEIO { + + public Target() { + super( + getWorldObj(), + getLocation(), + new GameProfile(null, ModObject.blockAttractor.unlocalisedName + ":" + getLocation())); + posY += 1; + } + } + + private static class AttractTask extends EntityAIBase { + + private EntityLiving mob; + private BlockCoord coord; + private FakePlayer target; + private String entityId; + private int updatesSincePathing; + + private boolean started = false; + + private AttractTask(EntityLiving mob, FakePlayer target, BlockCoord coord) { + this.mob = mob; + this.coord = coord; + this.target = target; + entityId = EntityList.getEntityString(mob); + } + + @Override + public boolean shouldExecute() { + return continueExecuting(); + } + + @Override + public void resetTask() { + started = false; + updatesSincePathing = 0; + } + + @Override + public boolean continueExecuting() { + boolean res = false; + TileEntity te = mob.worldObj.getTileEntity(coord.x, coord.y, coord.z); + if (te instanceof TileAttractor) { + TileAttractor attractor = (TileAttractor) te; + res = attractor.canAttract(entityId, mob); + } + return res; + } + + @Override + public boolean isInterruptible() { + return true; + } + + @Override + public void updateTask() { + if (!started || updatesSincePathing > 20) { + started = true; + int speed = 1; + mob.getNavigator().setAvoidsWater(false); + boolean res = mob.getNavigator().tryMoveToEntityLiving(target, speed); + if (!res) { + mob.getNavigator().tryMoveToXYZ(target.posX, target.posY + 1, target.posZ, speed); + } + updatesSincePathing = 0; + } else { + updatesSincePathing++; + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java index 15fd172f..3f67ad69 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskController.java @@ -1,78 +1,73 @@ package crazypants.enderio.machine.obelisk.aversion; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.config.Config; import java.util.HashMap; import java.util.Map; - import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.passive.EntitySquid; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.config.Config; - public class AversionObeliskController { - public static AversionObeliskController instance = new AversionObeliskController(); - - static { - MinecraftForge.EVENT_BUS.register(AversionObeliskController.instance); - } + public static AversionObeliskController instance = new AversionObeliskController(); - private Map> perWorldGuards = new HashMap>(); + static { + MinecraftForge.EVENT_BUS.register(AversionObeliskController.instance); + } - private AversionObeliskController() { - } + private Map> perWorldGuards = + new HashMap>(); - public void registerGuard(TileAversionObelisk guard) { - if(guard == null) { - return; - } - Map chargers = getGuardsForWorld(guard.getWorldObj()); - chargers.put(guard.getLocation(), guard); - } + private AversionObeliskController() {} - public void deregisterGuard(TileAversionObelisk guard) { - if(guard == null) { - return; + public void registerGuard(TileAversionObelisk guard) { + if (guard == null) { + return; + } + Map chargers = getGuardsForWorld(guard.getWorldObj()); + chargers.put(guard.getLocation(), guard); } - Map chargers = getGuardsForWorld(guard.getWorldObj()); - chargers.remove(guard.getLocation()); - } - - @SubscribeEvent - public void onEntitySpawn(LivingSpawnEvent evt) { - - if(Config.spawnGuardStopAllSlimesDebug && evt.entity instanceof EntitySlime) { - evt.setResult(Result.DENY); - return; + + public void deregisterGuard(TileAversionObelisk guard) { + if (guard == null) { + return; + } + Map chargers = getGuardsForWorld(guard.getWorldObj()); + chargers.remove(guard.getLocation()); } - if(Config.spawnGuardStopAllSquidSpawning && evt.entity.getClass() == EntitySquid.class) { - evt.setResult(Result.DENY); - return; + + @SubscribeEvent + public void onEntitySpawn(LivingSpawnEvent evt) { + + if (Config.spawnGuardStopAllSlimesDebug && evt.entity instanceof EntitySlime) { + evt.setResult(Result.DENY); + return; + } + if (Config.spawnGuardStopAllSquidSpawning && evt.entity.getClass() == EntitySquid.class) { + evt.setResult(Result.DENY); + return; + } + + Map guards = getGuardsForWorld(evt.world); + for (TileAversionObelisk guard : guards.values()) { + if (guard.isSpawnPrevented(evt.entityLiving)) { + evt.setResult(Result.DENY); + return; + } + } } - - - Map guards = getGuardsForWorld(evt.world); - for(TileAversionObelisk guard : guards.values()) { - if(guard.isSpawnPrevented(evt.entityLiving)) { - evt.setResult(Result.DENY); - return; - } - } - } - - private Map getGuardsForWorld(World world) { - Map res = perWorldGuards.get(world.provider.dimensionId); - if(res == null) { - res = new HashMap(); - perWorldGuards.put(world.provider.dimensionId, res); + + private Map getGuardsForWorld(World world) { + Map res = perWorldGuards.get(world.provider.dimensionId); + if (res == null) { + res = new HashMap(); + perWorldGuards.put(world.provider.dimensionId, res); + } + return res; } - return res; - } - } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java index 2e25e6c9..23f06679 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/AversionObeliskRenderer.java @@ -1,32 +1,34 @@ package crazypants.enderio.machine.obelisk.aversion; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.item.skull.BlockEndermanSkull; import crazypants.enderio.machine.obelisk.ObeliskRenderer; import crazypants.enderio.machine.obelisk.ObeliskSpecialRenderer; +import net.minecraft.item.ItemStack; @SideOnly(Side.CLIENT) public class AversionObeliskRenderer extends ObeliskSpecialRenderer { - private ItemStack offStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); - private ItemStack onStack = new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.REANIMATED_TORMENTED.ordinal()); + private ItemStack offStack = + new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.TORMENTED.ordinal()); + private ItemStack onStack = + new ItemStack(EnderIO.blockEndermanSkull, 1, BlockEndermanSkull.SkullType.REANIMATED_TORMENTED.ordinal()); - public AversionObeliskRenderer(ObeliskRenderer renderer) { - super(null, renderer); - } + public AversionObeliskRenderer(ObeliskRenderer renderer) { + super(null, renderer); + } - @Override - protected ItemStack getFloatingItem(TileAversionObelisk te) { - if(te == null) { - return offStack; + @Override + protected ItemStack getFloatingItem(TileAversionObelisk te) { + if (te == null) { + return offStack; + } + TileAversionObelisk sg = te; + if (sg.isActive()) { + return onStack; + } + return offStack; } - TileAversionObelisk sg = te; - if(sg.isActive()) { - return onStack; - } - return offStack; - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java index b72b25a8..72d2014d 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/BlockAversionObelisk.java @@ -1,48 +1,48 @@ package crazypants.enderio.machine.obelisk.aversion; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class BlockAversionObelisk extends BlockObeliskAbstract { - public static BlockAversionObelisk create() { - BlockAversionObelisk res = new BlockAversionObelisk(); - res.init(); + public static BlockAversionObelisk create() { + BlockAversionObelisk res = new BlockAversionObelisk(); + res.init(); - //Just making sure its loaded - AversionObeliskController.instance.toString(); + // Just making sure its loaded + AversionObeliskController.instance.toString(); - return res; - } - - protected BlockAversionObelisk() { - super(ModObject.blockSpawnGuard, TileAversionObelisk.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileAversionObelisk) { - return new ContainerAversionObelisk(player.inventory, (TileAversionObelisk) te); + return res; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileAversionObelisk) { - return new GuiAversionObelisk(player.inventory, (TileAversionObelisk) te); + protected BlockAversionObelisk() { + super(ModObject.blockSpawnGuard, TileAversionObelisk.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_SPAWN_GUARD; - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileAversionObelisk) { + return new ContainerAversionObelisk(player.inventory, (TileAversionObelisk) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileAversionObelisk) { + return new GuiAversionObelisk(player.inventory, (TileAversionObelisk) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_SPAWN_GUARD; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java index 8632fa7c..4046e060 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/ContainerAversionObelisk.java @@ -1,34 +1,33 @@ package crazypants.enderio.machine.obelisk.aversion; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerAversionObelisk extends AbstractMachineContainer { - public ContainerAversionObelisk(InventoryPlayer playerInv, TileAversionObelisk te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - int x; - int y = 10; - for (int row = 0; row < 3; row++) { - x = 62; - for (int col = 0; col < 4; col++) { - final int index = (row * 4) + col; - addSlotToContainer(new Slot(getInv(), index, x, y) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(index, itemStack); - } - }); - x += 18; - } - y+= 18; + public ContainerAversionObelisk(InventoryPlayer playerInv, TileAversionObelisk te) { + super(playerInv, te); } - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + int x; + int y = 10; + for (int row = 0; row < 3; row++) { + x = 62; + for (int col = 0; col < 4; col++) { + final int index = (row * 4) + col; + addSlotToContainer(new Slot(getInv(), index, x, y) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(index, itemStack); + } + }); + x += 18; + } + y += 18; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index ddff09ab..a239c1dd 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -1,77 +1,76 @@ package crazypants.enderio.machine.obelisk.aversion; -import java.awt.Color; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import java.awt.Color; +import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiAversionObelisk extends GuiPoweredMachineBase { - ToggleButton showRangeB; + ToggleButton showRangeB; - private static final int RANGE_ID = 8738924; + private static final int RANGE_ID = 8738924; - public GuiAversionObelisk(InventoryPlayer par1InventoryPlayer, TileAversionObelisk te) { - super(te, new ContainerAversionObelisk(par1InventoryPlayer, te), "attractor"); + public GuiAversionObelisk(InventoryPlayer par1InventoryPlayer, TileAversionObelisk te) { + super(te, new ContainerAversionObelisk(par1InventoryPlayer, te), "attractor"); - int x = getXSize() - 5 - BUTTON_SIZE; - showRangeB = new ToggleButton(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); - showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); - addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { - @Override - public List getToolTipText() { - return Lists.newArrayList(EnderIO.lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); - } - }); - } - - @Override - public void initGui() { - super.initGui(); - showRangeB.onGuiInit(); - showRangeB.setSelected(getTileEntity().isShowingRange()); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - int range = (int) getTileEntity().getRange(); - drawCenteredString(fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx / 2 + 9, getGuiTop() + 68, - ColorUtil.getRGB(Color.white)); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == RANGE_ID) { - getTileEntity().setShowRange(showRangeB.isSelected()); + int x = getXSize() - 5 - BUTTON_SIZE; + showRangeB = new ToggleButton(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); + showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + @Override + public List getToolTipText() { + return Lists.newArrayList(EnderIO.lang.localize( + showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); } - } - @Override - protected boolean showRecipeButton() { - return false; - } + @Override + public void initGui() { + super.initGui(); + showRangeB.onGuiInit(); + showRangeB.setSelected(getTileEntity().isShowingRange()); + } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + int range = (int) getTileEntity().getRange(); + drawCenteredString( + fontRendererObj, + EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, + getGuiLeft() + sx / 2 + 9, + getGuiTop() + 68, + ColorUtil.getRGB(Color.white)); + } + + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == RANGE_ID) { + getTileEntity().setShowRange(showRangeB.isSelected()); + } + } + + @Override + protected boolean showRecipeButton() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java index c9d02a9a..814b52c3 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/TileAversionObelisk.java @@ -1,15 +1,6 @@ package crazypants.enderio.machine.obelisk.aversion; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - import com.enderio.core.client.render.BoundingBox; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -20,160 +11,167 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.ranged.IRanged; import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.power.BasicCapacitor; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileAversionObelisk extends AbstractPowerConsumerEntity implements IRanged { - private int powerPerTick; - private int range; - private boolean registered = false; - private AxisAlignedBB bounds; - - private boolean showingRange; - - public TileAversionObelisk() { - super(new SlotDefinition(12, 0)); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean isShowingRange() { - return showingRange; - } - - @SideOnly(Side.CLIENT) - public void setShowRange(boolean showRange) { - if(showingRange == showRange) { - return; + private int powerPerTick; + private int range; + private boolean registered = false; + private AxisAlignedBB bounds; + + private boolean showingRange; + + public TileAversionObelisk() { + super(new SlotDefinition(12, 0)); } - showingRange = showRange; - if(showingRange) { - worldObj.spawnEntityInWorld(new RangeEntity(this)); + + @Override + @SideOnly(Side.CLIENT) + public boolean isShowingRange() { + return showingRange; } - } - - @Override - public World getWorld() { - return getWorldObj(); - } - @Override - public void invalidate() { - super.invalidate(); - AversionObeliskController.instance.deregisterGuard(this); - registered = false; - } - - @Override - public float getRange() { - return range; - } - - @Override - public void onCapacitorTypeChange() { - switch (getCapacitor().getTier()) { - case 1: - range = Config.spawnGuardRangeLevelOne; - powerPerTick = Config.spawnGuardPowerPerTickLevelOne; - break; - case 2: - range = Config.spawnGuardRangeLevelTwo; - powerPerTick = Config.spawnGuardPowerPerTickLevelTwo; - break; - case 3: - case 4: - case 5: - case 6: - case 7: - range = Config.spawnGuardRangeLevelThree; - powerPerTick = Config.spawnGuardPowerPerTickLevelThree; - break; - } - setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick)); - - BoundingBox bb = new BoundingBox(getLocation()); - bb = bb.scale(range + 0.5f, range + 0.5f, range + 0.5f).translate(0.5f, 0.5f, 0.5f); - bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - } - - @Override - public String getMachineName() { - return ModObject.blockSpawnGuard.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - if(!slotDefinition.isInputSlot(i)) { - return false; - } - String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(itemstack); - if(mob == null) { - return false; - } - Class cl = (Class) EntityList.stringToClassMapping.get(mob); - if(cl == null) { - return false; - } - return EntityLiving.class.isAssignableFrom(cl); - } - - @Override - public boolean isActive() { - return hasPower(); - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - if(redstoneCheckPassed && hasPower()) { - if(!registered) { - AversionObeliskController.instance.registerGuard(this); - registered = true; - } - usePower(); - } - return false; - } - - protected double usePower() { - return usePower(getPowerUsePerTick()); - } - - protected int usePower(int wantToUse) { - int used = Math.min(getEnergyStored(), wantToUse); - setEnergyStored(Math.max(0, getEnergyStored() - used)); - return used; - } - - @Override - public int getPowerUsePerTick() { - return powerPerTick; - } - - public boolean isSpawnPrevented(EntityLivingBase mob) { - return redstoneCheckPassed && hasPower() && isMobInRange(mob) && isMobInFilter(mob); - } - - private boolean isMobInRange(EntityLivingBase mob) { - if(mob == null) { - return false; - } - //return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= rangeSqu; - return bounds.isVecInside(Vec3.createVectorHelper(mob.posX, mob.posY, mob.posZ)); - } - - private boolean isMobInFilter(EntityLivingBase ent) { - return isMobInFilter(EntityList.getEntityString(ent)); - } - - private boolean isMobInFilter(String entityId) { - for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { - if(inventory[i] != null) { - String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(inventory[i]); - if(mob != null && mob.equals(entityId)) { - return true; + @SideOnly(Side.CLIENT) + public void setShowRange(boolean showRange) { + if (showingRange == showRange) { + return; + } + showingRange = showRange; + if (showingRange) { + worldObj.spawnEntityInWorld(new RangeEntity(this)); } - } } - return false; - } + @Override + public World getWorld() { + return getWorldObj(); + } + + @Override + public void invalidate() { + super.invalidate(); + AversionObeliskController.instance.deregisterGuard(this); + registered = false; + } + + @Override + public float getRange() { + return range; + } + + @Override + public void onCapacitorTypeChange() { + switch (getCapacitor().getTier()) { + case 1: + range = Config.spawnGuardRangeLevelOne; + powerPerTick = Config.spawnGuardPowerPerTickLevelOne; + break; + case 2: + range = Config.spawnGuardRangeLevelTwo; + powerPerTick = Config.spawnGuardPowerPerTickLevelTwo; + break; + case 3: + case 4: + case 5: + case 6: + case 7: + range = Config.spawnGuardRangeLevelThree; + powerPerTick = Config.spawnGuardPowerPerTickLevelThree; + break; + } + setCapacitor(new BasicCapacitor(powerPerTick * 8, getCapacitor().getMaxEnergyStored(), powerPerTick)); + + BoundingBox bb = new BoundingBox(getLocation()); + bb = bb.scale(range + 0.5f, range + 0.5f, range + 0.5f).translate(0.5f, 0.5f, 0.5f); + bounds = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + } + + @Override + public String getMachineName() { + return ModObject.blockSpawnGuard.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + if (!slotDefinition.isInputSlot(i)) { + return false; + } + String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(itemstack); + if (mob == null) { + return false; + } + Class cl = (Class) EntityList.stringToClassMapping.get(mob); + if (cl == null) { + return false; + } + return EntityLiving.class.isAssignableFrom(cl); + } + + @Override + public boolean isActive() { + return hasPower(); + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + if (redstoneCheckPassed && hasPower()) { + if (!registered) { + AversionObeliskController.instance.registerGuard(this); + registered = true; + } + usePower(); + } + return false; + } + + protected double usePower() { + return usePower(getPowerUsePerTick()); + } + + protected int usePower(int wantToUse) { + int used = Math.min(getEnergyStored(), wantToUse); + setEnergyStored(Math.max(0, getEnergyStored() - used)); + return used; + } + + @Override + public int getPowerUsePerTick() { + return powerPerTick; + } + + public boolean isSpawnPrevented(EntityLivingBase mob) { + return redstoneCheckPassed && hasPower() && isMobInRange(mob) && isMobInFilter(mob); + } + + private boolean isMobInRange(EntityLivingBase mob) { + if (mob == null) { + return false; + } + // return new Vector3d(mob.posX, mob.posY, mob.posZ).distanceSquared(new Vector3d(xCoord, yCoord, zCoord)) <= + // rangeSqu; + return bounds.isVecInside(Vec3.createVectorHelper(mob.posX, mob.posY, mob.posZ)); + } + + private boolean isMobInFilter(EntityLivingBase ent) { + return isMobInFilter(EntityList.getEntityString(ent)); + } + + private boolean isMobInFilter(String entityId) { + for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { + if (inventory[i] != null) { + String mob = EnderIO.itemSoulVessel.getMobTypeFromStack(inventory[i]); + if (mob != null && mob.equals(entityId)) { + return true; + } + } + } + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java index 9f245e90..73e2c717 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java @@ -1,72 +1,71 @@ package crazypants.enderio.machine.obelisk.inhibitor; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Maps; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.TeleportEntityEvent; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; public class BlockInhibitorObelisk extends BlockObeliskAbstract { - public static BlockInhibitorObelisk instance; - - public static BlockInhibitorObelisk create() { - BlockInhibitorObelisk res = new BlockInhibitorObelisk(); - res.init(); - MinecraftForge.EVENT_BUS.register(res); - return instance = res; - } - - protected BlockInhibitorObelisk() { - super(ModObject.blockInhibitorObelisk, TileInhibitorObelisk.class); - } + public static BlockInhibitorObelisk instance; - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return ID == getGuiId() ? new ContainerInhibitorObelisk(player.inventory, (AbstractMachineEntity) world.getTileEntity(x, y, z)) : null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - if(ID == getGuiId()) { - TileInhibitorObelisk te = (TileInhibitorObelisk) world.getTileEntity(x, y, z); - if(te != null) { - return new GuiInhibitorObelisk(te, new ContainerInhibitorObelisk(player.inventory, te)); - } + public static BlockInhibitorObelisk create() { + BlockInhibitorObelisk res = new BlockInhibitorObelisk(); + res.init(); + MinecraftForge.EVENT_BUS.register(res); + return instance = res; } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_INHIBITOR; - } + protected BlockInhibitorObelisk() { + super(ModObject.blockInhibitorObelisk, TileInhibitorObelisk.class); + } - public Map activeInhibitors = Maps.newHashMap(); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return ID == getGuiId() + ? new ContainerInhibitorObelisk(player.inventory, (AbstractMachineEntity) world.getTileEntity(x, y, z)) + : null; + } - @SubscribeEvent - public void onTeleport(TeleportEntityEvent event) { - for (Entry e : activeInhibitors.entrySet()) { - BlockCoord bc = e.getKey(); - int dist = bc.getDist(new BlockCoord(event.targetX, event.targetY, event.targetZ)); - if(dist < e.getValue()) { - TileEntity te = bc.getTileEntity(event.entity.worldObj); - if(te instanceof TileInhibitorObelisk && ((TileInhibitorObelisk) te).isActive()) { - event.setCanceled(true); + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + if (ID == getGuiId()) { + TileInhibitorObelisk te = (TileInhibitorObelisk) world.getTileEntity(x, y, z); + if (te != null) { + return new GuiInhibitorObelisk(te, new ContainerInhibitorObelisk(player.inventory, te)); + } + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_INHIBITOR; + } + + public Map activeInhibitors = Maps.newHashMap(); + + @SubscribeEvent + public void onTeleport(TeleportEntityEvent event) { + for (Entry e : activeInhibitors.entrySet()) { + BlockCoord bc = e.getKey(); + int dist = bc.getDist(new BlockCoord(event.targetX, event.targetY, event.targetZ)); + if (dist < e.getValue()) { + TileEntity te = bc.getTileEntity(event.entity.worldObj); + if (te instanceof TileInhibitorObelisk && ((TileInhibitorObelisk) te).isActive()) { + event.setCanceled(true); + } + } } - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/ContainerInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/ContainerInhibitorObelisk.java index 826c6645..75170b6e 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/ContainerInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/ContainerInhibitorObelisk.java @@ -1,17 +1,15 @@ package crazypants.enderio.machine.obelisk.inhibitor; -import net.minecraft.entity.player.InventoryPlayer; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.gui.AbstractMachineContainer; +import net.minecraft.entity.player.InventoryPlayer; public class ContainerInhibitorObelisk extends AbstractMachineContainer { - public ContainerInhibitorObelisk(InventoryPlayer playerInv, AbstractMachineEntity te) { - super(playerInv, te); - } + public ContainerInhibitorObelisk(InventoryPlayer playerInv, AbstractMachineEntity te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) {} } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java index fd8425ae..c0a02b30 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/GuiInhibitorObelisk.java @@ -1,36 +1,35 @@ package crazypants.enderio.machine.obelisk.inhibitor; -import java.awt.Color; - -import net.minecraft.inventory.Container; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import java.awt.Color; +import net.minecraft.inventory.Container; +import org.lwjgl.opengl.GL11; public class GuiInhibitorObelisk extends GuiPoweredMachineBase { - public GuiInhibitorObelisk(TileInhibitorObelisk machine, Container container) { - super(machine, container, "inhibitor"); - } + public GuiInhibitorObelisk(TileInhibitorObelisk machine, Container container) { + super(machine, container, "inhibitor"); + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); - int range = (int) getTileEntity().getRange(); - drawCenteredString(fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx / 2 + 9, getGuiTop() + 68, - ColorUtil.getRGB(Color.white)); - } + int range = (int) getTileEntity().getRange(); + drawCenteredString( + fontRendererObj, + EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, + getGuiLeft() + sx / 2 + 9, + getGuiTop() + 68, + ColorUtil.getRGB(Color.white)); + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java index 6e9568ca..017bf0ff 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/inhibitor/TileInhibitorObelisk.java @@ -1,75 +1,75 @@ package crazypants.enderio.machine.obelisk.inhibitor; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.ranged.IRanged; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class TileInhibitorObelisk extends AbstractPowerConsumerEntity implements IRanged { - private float range = 32; - - public TileInhibitorObelisk() { - super(new SlotDefinition(0, 0, 1)); - } + private float range = 32; - @Override - public String getMachineName() { - return ModObject.blockInhibitorObelisk.unlocalisedName; - } + public TileInhibitorObelisk() { + super(new SlotDefinition(0, 0, 1)); + } - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return false; - } + @Override + public String getMachineName() { + return ModObject.blockInhibitorObelisk.unlocalisedName; + } - @Override - public boolean isActive() { - return hasPower(); - } + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return false; + } - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - return redstoneCheckPassed; - } + @Override + public boolean isActive() { + return hasPower(); + } - @Override - public World getWorld() { - return worldObj; - } + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + return redstoneCheckPassed; + } - @Override - public float getRange() { - return range; - } + @Override + public World getWorld() { + return worldObj; + } - public void setRange(float range) { - this.range = range; - BlockInhibitorObelisk.instance.activeInhibitors.put(getLocation(), range); - } + @Override + public float getRange() { + return range; + } - @Override - public boolean isShowingRange() { - return false; - } + public void setRange(float range) { + this.range = range; + BlockInhibitorObelisk.instance.activeInhibitors.put(getLocation(), range); + } - @Override - public void validate() { - super.validate(); - BlockInhibitorObelisk.instance.activeInhibitors.put(getLocation(), range); - } - - @Override - public void invalidate() { - super.invalidate(); - BlockInhibitorObelisk.instance.activeInhibitors.remove(getLocation()); - } + @Override + public boolean isShowingRange() { + return false; + } - @Override - public void onChunkUnload() { - super.onChunkUnload(); - BlockInhibitorObelisk.instance.activeInhibitors.remove(getLocation()); - } + @Override + public void validate() { + super.validate(); + BlockInhibitorObelisk.instance.activeInhibitors.put(getLocation(), range); + } + + @Override + public void invalidate() { + super.invalidate(); + BlockInhibitorObelisk.instance.activeInhibitors.remove(getLocation()); + } + + @Override + public void onChunkUnload() { + super.onChunkUnload(); + BlockInhibitorObelisk.instance.activeInhibitors.remove(getLocation()); + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java index e069e358..59173495 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/BlockWeatherObelisk.java @@ -1,9 +1,5 @@ package crazypants.enderio.machine.obelisk.weather; -import java.util.Random; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -12,42 +8,49 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; import crazypants.enderio.network.PacketHandler; +import java.util.Random; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class BlockWeatherObelisk extends BlockObeliskAbstract { - public static BlockWeatherObelisk create() { - BlockWeatherObelisk ret = new BlockWeatherObelisk(); - ret.init(); - PacketHandler.INSTANCE.registerMessage(PacketActivateWeather.class, PacketActivateWeather.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketActivateWeather.class, PacketActivateWeather.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketWeatherTank.class, PacketWeatherTank.class, PacketHandler.nextID(), Side.CLIENT); - - EntityRegistry.registerModEntity(EntityWeatherRocket.class, "weather_rocket", 33, EnderIO.instance, 64, 3, false); - return ret; - } + public static BlockWeatherObelisk create() { + BlockWeatherObelisk ret = new BlockWeatherObelisk(); + ret.init(); + PacketHandler.INSTANCE.registerMessage( + PacketActivateWeather.class, PacketActivateWeather.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketActivateWeather.class, PacketActivateWeather.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketWeatherTank.class, PacketWeatherTank.class, PacketHandler.nextID(), Side.CLIENT); - private BlockWeatherObelisk() { - super(ModObject.blockWeatherObelisk, TileWeatherObelisk.class); - } + EntityRegistry.registerModEntity( + EntityWeatherRocket.class, "weather_rocket", 33, EnderIO.instance, 64, 3, false); + return ret; + } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new ContainerWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z)); - } + private BlockWeatherObelisk() { + super(ModObject.blockWeatherObelisk, TileWeatherObelisk.class); + } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - return new GuiWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z)); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z)); + } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_WEATHER_OBELISK; - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GuiWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z)); + } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - ; // no active particles - } + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_WEATHER_OBELISK; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + ; // no active particles + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java index 4a42163f..83785d19 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/ContainerWeatherObelisk.java @@ -1,25 +1,25 @@ package crazypants.enderio.machine.obelisk.weather; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerWeatherObelisk extends AbstractMachineContainer { - public static final int MAX_SCALE = 31; - - public ContainerWeatherObelisk(InventoryPlayer playerInv, TileWeatherObelisk te) { - super(playerInv, te); - } + public static final int MAX_SCALE = 31; - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 80, 11) { - @Override - public boolean isItemValid(ItemStack p_75214_1_) { - return getInv().isItemValidForSlot(0, p_75214_1_); - } - }); - } + public ContainerWeatherObelisk(InventoryPlayer playerInv, TileWeatherObelisk te) { + super(playerInv, te); + } + + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 80, 11) { + @Override + public boolean isItemValid(ItemStack p_75214_1_) { + return getInv().isItemValidForSlot(0, p_75214_1_); + } + }); + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityFluidLoadingFX.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityFluidLoadingFX.java index 4ce2b32c..504430be 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityFluidLoadingFX.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityFluidLoadingFX.java @@ -1,9 +1,8 @@ package crazypants.enderio.machine.obelisk.weather; -import java.awt.Color; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.awt.Color; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EntityDropParticleFX; import net.minecraft.client.renderer.Tessellator; @@ -12,41 +11,48 @@ import net.minecraft.world.World; @SideOnly(Side.CLIENT) public class EntityFluidLoadingFX extends EntityDropParticleFX { - public static final int MAX_LIFE = 10; - - public EntityFluidLoadingFX(World world, double x1, double y1, double z1, double x2, double y2, double z2, Color color) { - super(world, x1, y1, z1, Material.water); - this.motionX = (x2 - x1) / MAX_LIFE; - this.motionY = (y2 - y1) / MAX_LIFE; - this.motionZ = (z2 - z1) / MAX_LIFE; - - particleRed = color.getRed() / 256f; - particleGreen = color.getGreen() / 256f; - particleBlue = color.getBlue() / 256f; - - particleGravity = 0; + public static final int MAX_LIFE = 10; - noClip = true; - } - - @Override - public void onUpdate() { - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - this.moveEntity(motionX, motionY, motionZ); - - if (particleAge++ >= MAX_LIFE) { - setDead(); - } - } - - @Override - public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { - if (particleAge >= 2) { - super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); - } - } + public EntityFluidLoadingFX( + World world, double x1, double y1, double z1, double x2, double y2, double z2, Color color) { + super(world, x1, y1, z1, Material.water); + this.motionX = (x2 - x1) / MAX_LIFE; + this.motionY = (y2 - y1) / MAX_LIFE; + this.motionZ = (z2 - z1) / MAX_LIFE; + particleRed = color.getRed() / 256f; + particleGreen = color.getGreen() / 256f; + particleBlue = color.getBlue() / 256f; + + particleGravity = 0; + + noClip = true; + } + + @Override + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + this.moveEntity(motionX, motionY, motionZ); + + if (particleAge++ >= MAX_LIFE) { + setDead(); + } + } + + @Override + public void renderParticle( + Tessellator p_70539_1_, + float p_70539_2_, + float p_70539_3_, + float p_70539_4_, + float p_70539_5_, + float p_70539_6_, + float p_70539_7_) { + if (particleAge >= 2) { + super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityWeatherRocket.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityWeatherRocket.java index e0c0b4a8..203d11f9 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityWeatherRocket.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/EntityWeatherRocket.java @@ -1,106 +1,114 @@ package crazypants.enderio.machine.obelisk.weather; +import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFireworkSparkFX; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.server.MinecraftServer; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; import net.minecraft.world.WorldServer; public class EntityWeatherRocket extends EntityFireworkRocket { - private static final int DATA_ID = 24; + private static final int DATA_ID = 24; - private static final int MAX_AGE = 70; + private static final int MAX_AGE = 70; - public EntityWeatherRocket(World world) { - super(world); - ReflectionHelper.setPrivateValue(EntityFireworkRocket.class, this, MAX_AGE, "field_92055_b", "lifetime"); - } - - public EntityWeatherRocket(World world, WeatherTask task) { - this(world); - this.getDataWatcher().updateObject(DATA_ID, task.ordinal()); - } - - @Override - protected void entityInit() { - super.entityInit(); - this.getDataWatcher().addObject(DATA_ID, 0); - this.getDataWatcher().setObjectWatched(DATA_ID); - } - - @Override - public void onEntityUpdate() { - super.onEntityUpdate(); - if (worldObj.isRemote && ticksExisted % (MAX_AGE / 10) == 0 && ticksExisted > 30) { - doEffect(); + public EntityWeatherRocket(World world) { + super(world); + ReflectionHelper.setPrivateValue(EntityFireworkRocket.class, this, MAX_AGE, "field_92055_b", "lifetime"); } - } - @Override - public void moveEntity(double p_70091_1_, double p_70091_3_, double p_70091_5_) { - super.moveEntity(p_70091_1_, p_70091_3_, p_70091_5_); - } - - @Override - public void setDead() { - super.setDead(); - - WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)]; - MinecraftServer server = MinecraftServer.getServer(); - - if(server != null && server.worldServers.length > 0) { - WorldServer worldserver = server.worldServers[0]; - task.complete(worldserver); + public EntityWeatherRocket(World world, WeatherTask task) { + this(world); + this.getDataWatcher().updateObject(DATA_ID, task.ordinal()); } - } - @Override - public void handleHealthUpdate(byte p_70103_1_) { - } - - @SideOnly(Side.CLIENT) - private void doEffect() { - String s1 = "fireworks.largeBlast"; - if (ticksExisted > 40) { - s1 += "_far"; + @Override + protected void entityInit() { + super.entityInit(); + this.getDataWatcher().addObject(DATA_ID, 0); + this.getDataWatcher().setObjectWatched(DATA_ID); } - this.worldObj.playSound(this.posX, this.posY, this.posZ, s1, 20.0F, 0.95F + this.rand.nextFloat() * 0.1F, true); - double d1 = this.posX; - double d2 = this.posY; - double d3 = this.posZ; - - int size = 5; - double speed = 1; - - for (int j = -size; j <= size; ++j) { - for (int k = -size; k <= size; ++k) { - for (int l = -size; l <= size; ++l) { - double d4 = (double) k + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; - double d5 = (double) j + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; - double d6 = (double) l + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; - double d7 = (double) MathHelper.sqrt_double(d4 * d4 + d5 * d5 + d6 * d6) / speed + this.rand.nextGaussian() * 0.05D; - - EntityFireworkSparkFX entityfireworksparkfx = new EntityFireworkSparkFX(this.worldObj, d1, d2, d3, d4 / d7, d5 / d7, d6 / d7, - Minecraft.getMinecraft().effectRenderer); - - entityfireworksparkfx.setTrail(true); - entityfireworksparkfx.setTwinkle(false); - entityfireworksparkfx.setColour(WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)].color.getRGB()); - - Minecraft.getMinecraft().effectRenderer.addEffect(entityfireworksparkfx); - if (j != -size && j != size && k != -size && k != size) { - l += size * 2 - 1; - } + @Override + public void onEntityUpdate() { + super.onEntityUpdate(); + if (worldObj.isRemote && ticksExisted % (MAX_AGE / 10) == 0 && ticksExisted > 30) { + doEffect(); + } + } + + @Override + public void moveEntity(double p_70091_1_, double p_70091_3_, double p_70091_5_) { + super.moveEntity(p_70091_1_, p_70091_3_, p_70091_5_); + } + + @Override + public void setDead() { + super.setDead(); + + WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)]; + MinecraftServer server = MinecraftServer.getServer(); + + if (server != null && server.worldServers.length > 0) { + WorldServer worldserver = server.worldServers[0]; + task.complete(worldserver); + } + } + + @Override + public void handleHealthUpdate(byte p_70103_1_) {} + + @SideOnly(Side.CLIENT) + private void doEffect() { + String s1 = "fireworks.largeBlast"; + if (ticksExisted > 40) { + s1 += "_far"; + } + this.worldObj.playSound(this.posX, this.posY, this.posZ, s1, 20.0F, 0.95F + this.rand.nextFloat() * 0.1F, true); + + double d1 = this.posX; + double d2 = this.posY; + double d3 = this.posZ; + + int size = 5; + double speed = 1; + + for (int j = -size; j <= size; ++j) { + for (int k = -size; k <= size; ++k) { + for (int l = -size; l <= size; ++l) { + double d4 = (double) k + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; + double d5 = (double) j + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; + double d6 = (double) l + (this.rand.nextDouble() - this.rand.nextDouble()) * 0.5D; + double d7 = (double) MathHelper.sqrt_double(d4 * d4 + d5 * d5 + d6 * d6) / speed + + this.rand.nextGaussian() * 0.05D; + + EntityFireworkSparkFX entityfireworksparkfx = new EntityFireworkSparkFX( + this.worldObj, + d1, + d2, + d3, + d4 / d7, + d5 / d7, + d6 / d7, + Minecraft.getMinecraft().effectRenderer); + + entityfireworksparkfx.setTrail(true); + entityfireworksparkfx.setTwinkle(false); + entityfireworksparkfx.setColour( + WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)].color.getRGB()); + + Minecraft.getMinecraft().effectRenderer.addEffect(entityfireworksparkfx); + if (j != -size && j != size && k != -size && k != size) { + l += size * 2 - 1; + } + } + } } - } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java index 65eaa65b..165a8ca7 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/GuiWeatherObelisk.java @@ -1,142 +1,140 @@ package crazypants.enderio.machine.obelisk.weather; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.obelisk.weather.TileWeatherObelisk.WeatherTask; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import org.lwjgl.opengl.GL11; public class GuiWeatherObelisk extends GuiPoweredMachineBase { - - private IconButton buttonStart; - - public GuiWeatherObelisk(InventoryPlayer inventory, TileWeatherObelisk tileEntity) { - super(tileEntity, new ContainerWeatherObelisk(inventory, tileEntity), "weatherObelisk"); - - addProgressTooltip(79, 29, 18, 31); - - addToolTip(new GuiToolTip(new Rectangle(22, 11, 16, 63), "") { - @Override - protected void updateText() { - text.clear(); - FluidTank tank = getTileEntity().getInputTank(); - String heading = EnderIO.lang.localize("tank.tank"); - if (tank.getFluid() != null) { - heading += ": " + tank.getFluid().getLocalizedName(); + private IconButton buttonStart; + + public GuiWeatherObelisk(InventoryPlayer inventory, TileWeatherObelisk tileEntity) { + super(tileEntity, new ContainerWeatherObelisk(inventory, tileEntity), "weatherObelisk"); + + addProgressTooltip(79, 29, 18, 31); + + addToolTip(new GuiToolTip(new Rectangle(22, 11, 16, 63), "") { + + @Override + protected void updateText() { + text.clear(); + FluidTank tank = getTileEntity().getInputTank(); + String heading = EnderIO.lang.localize("tank.tank"); + if (tank.getFluid() != null) { + heading += ": " + tank.getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().getInputTank())); + } + }); + } + + @Override + public void initGui() { + super.initGui(); + + int x = (xSize / 2) - (BUTTON_SIZE / 2); + int y = 58; + + addButton(buttonStart = new IconButton(this, 0, x, y, IconEIO.TICK)); + buttonStart.onGuiInit(); + + refreshButtons(); + } + + @Override + public void updateScreen() { + super.updateScreen(); + if (getTileEntity().getWorldObj().getTotalWorldTime() % 20 == 0) { + refreshButtons(); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().getInputTank())); - } - }); - } - - @Override - public void initGui() { - super.initGui(); - - int x = (xSize / 2) - (BUTTON_SIZE / 2); - int y = 58; - - addButton(buttonStart = new IconButton(this, 0, x, y, IconEIO.TICK)); - buttonStart.onGuiInit(); - - refreshButtons(); - } - - @Override - public void updateScreen() { - super.updateScreen(); - if(getTileEntity().getWorldObj().getTotalWorldTime() % 20 == 0) { - refreshButtons(); } - } - - private void refreshButtons() { - FluidStack fs = getTileEntity().getInputTank().getFluid(); - if (fs == null) { - buttonStart.enabled = false; - return; + + private void refreshButtons() { + FluidStack fs = getTileEntity().getInputTank().getFluid(); + if (fs == null) { + buttonStart.enabled = false; + return; + } + WeatherTask task = WeatherTask.fromFluid(fs.getFluid()); + buttonStart.enabled = getTileEntity().canStartTask(task); } - WeatherTask task = WeatherTask.fromFluid(fs.getFluid()); - buttonStart.enabled = getTileEntity().canStartTask(task); - } - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - bindGuiTexture(); - - this.drawTexturedModalRect(getGuiLeft(), getGuiTop(), 0, 0, getXSize(), getYSize()); - - int x = getGuiLeft() + 22; - int y = getGuiTop() + 11; - RenderUtil.renderGuiTank(getTileEntity().getInputTank(), x, y, 0, 16, 63); - - bindGuiTexture(); - - drawTexturedModalRect(x, y, 186, 33, 16, 63); - - if(shouldRenderProgress() && getTileEntity().getActiveTask() != null) { - // TODO test - int barHeight = getProgressScaled(ContainerWeatherObelisk.MAX_SCALE); - Color color = getTileEntity().getActiveTask().color; - GL11.glColor3f((float) color.getRed() / 255f, (float) color.getGreen() / 255f, (float) color.getBlue() / 255f); - this.drawTexturedModalRect(getGuiLeft() + 81, getGuiTop() + 58 - barHeight, getXSize(), 32 - barHeight, 12, barHeight); + @Override + protected boolean showRecipeButton() { + return false; } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } - @Override - protected int getPowerHeight() { - return 63; - } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + bindGuiTexture(); - @Override - protected int getPowerU() { - return super.getPowerU(); - } - - @Override - protected int getPowerV() { - return 33; - } - - @Override - protected int getPowerX() { - return super.getPowerX() - 7; - } - - @Override - protected int getPowerY() { - return super.getPowerY() - 3; - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if (b.id >= 0 && b.id <= 2) { - getTileEntity().startTask(); - PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity())); + this.drawTexturedModalRect(getGuiLeft(), getGuiTop(), 0, 0, getXSize(), getYSize()); + + int x = getGuiLeft() + 22; + int y = getGuiTop() + 11; + RenderUtil.renderGuiTank(getTileEntity().getInputTank(), x, y, 0, 16, 63); + + bindGuiTexture(); + + drawTexturedModalRect(x, y, 186, 33, 16, 63); + + if (shouldRenderProgress() && getTileEntity().getActiveTask() != null) { + // TODO test + int barHeight = getProgressScaled(ContainerWeatherObelisk.MAX_SCALE); + Color color = getTileEntity().getActiveTask().color; + GL11.glColor3f( + (float) color.getRed() / 255f, (float) color.getGreen() / 255f, (float) color.getBlue() / 255f); + this.drawTexturedModalRect( + getGuiLeft() + 81, getGuiTop() + 58 - barHeight, getXSize(), 32 - barHeight, 12, barHeight); + } + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + @Override + protected int getPowerHeight() { + return 63; + } + + @Override + protected int getPowerU() { + return super.getPowerU(); + } + + @Override + protected int getPowerV() { + return 33; + } + + @Override + protected int getPowerX() { + return super.getPowerX() - 7; + } + + @Override + protected int getPowerY() { + return super.getPowerY() - 3; + } + + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id >= 0 && b.id <= 2) { + getTileEntity().startTask(); + PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity())); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java index 14ad3aa0..b58cdaf3 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java @@ -1,31 +1,31 @@ package crazypants.enderio.machine.obelisk.weather; import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; -public class PacketActivateWeather extends MessageTileEntity implements IMessageHandler { +public class PacketActivateWeather extends MessageTileEntity + implements IMessageHandler { - public PacketActivateWeather() { - } + public PacketActivateWeather() {} - public PacketActivateWeather(TileWeatherObelisk te) { - super(te); - } - - @Override - public IMessage onMessage(PacketActivateWeather message, MessageContext ctx) { - TileWeatherObelisk te = message.getTileEntity(ctx.side.isServer() ? message.getWorld(ctx) : EnderIO.proxy.getClientWorld()); - if (te != null) { - if (ctx.side.isServer()) { - te.startTask(); - } else { - te.stopTask(); - } + public PacketActivateWeather(TileWeatherObelisk te) { + super(te); + } + + @Override + public IMessage onMessage(PacketActivateWeather message, MessageContext ctx) { + TileWeatherObelisk te = + message.getTileEntity(ctx.side.isServer() ? message.getWorld(ctx) : EnderIO.proxy.getClientWorld()); + if (te != null) { + if (ctx.side.isServer()) { + te.startTask(); + } else { + te.stopTask(); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketWeatherTank.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketWeatherTank.java index d9fd90b7..ba94f700 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketWeatherTank.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketWeatherTank.java @@ -1,48 +1,46 @@ package crazypants.enderio.machine.obelisk.weather; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; -public class PacketWeatherTank extends MessageTileEntity implements IMessageHandler { +public class PacketWeatherTank extends MessageTileEntity + implements IMessageHandler { - private NBTTagCompound tag; + private NBTTagCompound tag; - public PacketWeatherTank() { - } + public PacketWeatherTank() {} - public PacketWeatherTank(TileWeatherObelisk tile) { - super(tile); - tag = tile.getInputTank().writeToNBT(new NBTTagCompound()); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - ByteBufUtils.writeTag(buf, tag); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - tag = ByteBufUtils.readTag(buf); - } - - @Override - public IMessage onMessage(PacketWeatherTank message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileWeatherObelisk tile = message.getTileEntity(player.worldObj); - if (tile != null) { - tile.getInputTank().readFromNBT(message.tag); + public PacketWeatherTank(TileWeatherObelisk tile) { + super(tile); + tag = tile.getInputTank().writeToNBT(new NBTTagCompound()); } - return null; - } -} \ No newline at end of file + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + ByteBufUtils.writeTag(buf, tag); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + tag = ByteBufUtils.readTag(buf); + } + + @Override + public IMessage onMessage(PacketWeatherTank message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileWeatherObelisk tile = message.getTileEntity(player.worldObj); + if (tile != null) { + tile.getInputTank().readFromNBT(message.tag); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java index 75a775b7..883327bc 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/TileWeatherObelisk.java @@ -1,7 +1,17 @@ package crazypants.enderio.machine.obelisk.weather; +import com.enderio.core.api.common.util.IProgressTile; +import com.enderio.core.api.common.util.ITankAccess; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractPowerConsumerEntity; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; import java.awt.Color; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; @@ -16,326 +26,354 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.IProgressTile; -import com.enderio.core.api.common.util.ITankAccess; +public class TileWeatherObelisk extends AbstractPowerConsumerEntity + implements IProgressTile, IFluidHandler, ITankAccess { -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractPowerConsumerEntity; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; + public enum WeatherTask { + CLEAR(Color.YELLOW) { + @Override + void complete(World world) { + rain(world, false); + thunder(world, false); + } + }, + RAIN(new Color(120, 120, 255)) { + @Override + void complete(World world) { + rain(world, true); + thunder(world, false); + } + }, + STORM(Color.DARK_GRAY) { + @Override + void complete(World world) { + rain(world, true); + thunder(world, true); + } + }; -public class TileWeatherObelisk extends AbstractPowerConsumerEntity implements IProgressTile, IFluidHandler, ITankAccess { + final Color color; - public enum WeatherTask { - CLEAR(Color.YELLOW) { - @Override - void complete(World world) { - rain(world, false); - thunder(world, false); - } - }, - RAIN(new Color(120, 120, 255)) { - @Override - void complete(World world) { - rain(world, true); - thunder(world, false); - } - }, - STORM(Color.DARK_GRAY) { - @Override - void complete(World world) { - rain(world, true); - thunder(world, true); - } - }; - - final Color color; - - WeatherTask(Color color) { - this.color = color; - } - - abstract void complete(World world); - - protected void rain(World world, boolean state) { - world.getWorldInfo().setRaining(state); - } - - protected void thunder(World world, boolean state) { - world.getWorldInfo().setThundering(state); - } - - public static boolean worldIsState(WeatherTask task, World world) { - if (world.isRaining()) { - return world.isThundering() ? task == STORM : task == RAIN; - } - return task == CLEAR; - } - - public static WeatherTask fromFluid(Fluid f) { - if (f == EnderIO.fluidLiquidSunshine) { - return CLEAR; - } else if (f == EnderIO.fluidCloudSeed) { - return RAIN; - } else if (f == EnderIO.fluidCloudSeedConcentrated) { - return STORM; - } - return null; - } - } - - private int fluidUsed = 0; - private WeatherTask activeTask = null; - - private boolean canBeActive = true; - private boolean tanksDirty; - - private static final ICapacitor cap = Capacitors.BASIC_CAPACITOR.capacitor; - - private FluidTank inputTank = new FluidTank(8000); - - /* client fields */ - private float progress = 0; // client only - private boolean playedFuse = false; - - public TileWeatherObelisk() { - super(new SlotDefinition(1, 0, 0)); - } - - @Override - public void init() { - setCapacitor(Capacitors.ACTIVATED_CAPACITOR); - } - - @Override - public String getMachineName() { - return ModObject.blockWeatherObelisk.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return i == 0 && itemstack != null && itemstack.getItem() == Items.fireworks; - } - - @Override - public boolean isActive() { - return canBeActive && getActiveTask() != null; - } - - @Override - public float getProgress() { - return isActive() ? worldObj.isRemote ? progress : (float) fluidUsed / 1000 : 0; - } - - @Override - public void setProgress(float progress) { - this.progress = progress; - } - - @Override - protected int getProgressUpdateFreq() { - return 3; - } - - @Override - public TileEntity getTileEntity() { - return this; - } - - @Override - public ICapacitor getCapacitor() { - return cap; - } - - public WeatherTask getActiveTask() { - return activeTask; - } - - @Override - public void doUpdate() { - super.doUpdate(); - if (worldObj.isRemote && isActive() && worldObj.getTotalWorldTime() % 2 == 0) { - doLoadingParticles(); - } - } - - @SideOnly(Side.CLIENT) - private void doLoadingParticles() { - if (progress < 0.9f) { - Color c = getActiveTask().color; - double correction = 0.1; - double xf = xCoord + 0.5 + correction; - double yf = yCoord + 0.8; - double zf = zCoord + 0.5 + correction; - Block b = getBlockType(); - double yi = yCoord + b.getBlockBoundsMaxY() - 0.1; - double offset = 0.3; - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityFluidLoadingFX(worldObj, xCoord + offset + correction, yi, zCoord + offset + correction, xf, yf, zf, c)); - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityFluidLoadingFX(worldObj, xCoord + (1 - offset) + correction, yi, zCoord + offset + correction, xf, yf, zf, c)); - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityFluidLoadingFX(worldObj, xCoord + (1 - offset) + correction, yi, zCoord + (1 - offset) + correction, xf, yf, zf, c)); - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityFluidLoadingFX(worldObj, xCoord + offset + correction, yi, zCoord + (1 - offset) + correction, xf, yf, zf, c)); - } else if (!playedFuse) { - worldObj.playSound(xCoord, yCoord, zCoord, "game.tnt.primed", 1, 1, true); - playedFuse = true; - } - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - boolean res = false; - - if(!redstoneCheckPassed) { - if(canBeActive) { - canBeActive = false; - res = true; - } - return res; - } else { - canBeActive = true; - - if(isActive()) { - if(getEnergyStored() > getPowerUsePerTick() && inputTank.getFluidAmount() > 3) { - setEnergyStored(getEnergyStored() - getPowerUsePerTick()); - - int toUse = 4; - inputTank.drain(toUse, true); - fluidUsed += toUse; - tanksDirty = true; - res = true; + WeatherTask(Color color) { + this.color = color; } - if (fluidUsed >= 1000) { - EntityWeatherRocket e = new EntityWeatherRocket(worldObj, activeTask); - e.setPosition(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - worldObj.spawnEntityInWorld(e); - stopTask(); - res = true; + abstract void complete(World world); + + protected void rain(World world, boolean state) { + world.getWorldInfo().setRaining(state); + } + + protected void thunder(World world, boolean state) { + world.getWorldInfo().setThundering(state); + } + + public static boolean worldIsState(WeatherTask task, World world) { + if (world.isRaining()) { + return world.isThundering() ? task == STORM : task == RAIN; + } + return task == CLEAR; + } + + public static WeatherTask fromFluid(Fluid f) { + if (f == EnderIO.fluidLiquidSunshine) { + return CLEAR; + } else if (f == EnderIO.fluidCloudSeed) { + return RAIN; + } else if (f == EnderIO.fluidCloudSeedConcentrated) { + return STORM; + } + return null; } - } - } - - if(tanksDirty) { - PacketHandler.sendToAllAround(new PacketWeatherTank(this), this); - tanksDirty = false; } - return res; - } + private int fluidUsed = 0; + private WeatherTask activeTask = null; - /** - * If the task can be started based on the current inventory. Does not take - * into account the world's weather state. - * - * @param task - * The task to check - * @return True if the task can be started with the item in the inventory. - */ - public boolean canStartTask(WeatherTask task) { - return getActiveTask() == null && !WeatherTask.worldIsState(task, worldObj) && getStackInSlot(0) != null && inputTank.getFluidAmount() >= 1000; - } + private boolean canBeActive = true; + private boolean tanksDirty; - /** - * @return If the operation was successful. - */ - public boolean startTask() { - if(getActiveTask() == null && inputTank.getFluidAmount() > 0) { - fluidUsed = 0; - WeatherTask task = WeatherTask.fromFluid(inputTank.getFluid().getFluid()); - if(canStartTask(task)) { - decrStackSize(0, 1); - activeTask = task; - return true; - } + private static final ICapacitor cap = Capacitors.BASIC_CAPACITOR.capacitor; + + private FluidTank inputTank = new FluidTank(8000); + + /* client fields */ + private float progress = 0; // client only + private boolean playedFuse = false; + + public TileWeatherObelisk() { + super(new SlotDefinition(1, 0, 0)); } - return false; - } - public void stopTask() { - if (getActiveTask() != null) { - activeTask = null; - fluidUsed = 0; - if (!worldObj.isRemote) { - PacketHandler.INSTANCE.sendToDimension(new PacketActivateWeather(this), worldObj.provider.dimensionId); - } else { - playedFuse = false; - } + @Override + public void init() { + setCapacitor(Capacitors.ACTIVATED_CAPACITOR); } - } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - nbtRoot.setTag("tank", inputTank.writeToNBT(new NBTTagCompound())); - } + @Override + public String getMachineName() { + return ModObject.blockWeatherObelisk.unlocalisedName; + } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - inputTank.readFromNBT(nbtRoot.getCompoundTag("tank")); - } + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return i == 0 && itemstack != null && itemstack.getItem() == Items.fireworks; + } - private boolean isValidFluid(Fluid f) { - return f == EnderIO.fluidLiquidSunshine || f == EnderIO.fluidCloudSeed || f == EnderIO.fluidCloudSeedConcentrated; - } - - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - return forFluidType != null && forFluidType.getFluid() != null && isValidFluid(forFluidType.getFluid()) ? inputTank : null; - } + @Override + public boolean isActive() { + return canBeActive && getActiveTask() != null; + } - FluidTank getInputTank() { - return inputTank; - } - - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[0]; - } + @Override + public float getProgress() { + return isActive() ? worldObj.isRemote ? progress : (float) fluidUsed / 1000 : 0; + } - @Override - public void setTanksDirty() { - tanksDirty = true; - } + @Override + public void setProgress(float progress) { + this.progress = progress; + } - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (resource != null && canFill(from, resource.getFluid())) { - int res = inputTank.fill(resource, doFill); - if (res > 0 && doFill) { + @Override + protected int getProgressUpdateFreq() { + return 3; + } + + @Override + public TileEntity getTileEntity() { + return this; + } + + @Override + public ICapacitor getCapacitor() { + return cap; + } + + public WeatherTask getActiveTask() { + return activeTask; + } + + @Override + public void doUpdate() { + super.doUpdate(); + if (worldObj.isRemote && isActive() && worldObj.getTotalWorldTime() % 2 == 0) { + doLoadingParticles(); + } + } + + @SideOnly(Side.CLIENT) + private void doLoadingParticles() { + if (progress < 0.9f) { + Color c = getActiveTask().color; + double correction = 0.1; + double xf = xCoord + 0.5 + correction; + double yf = yCoord + 0.8; + double zf = zCoord + 0.5 + correction; + Block b = getBlockType(); + double yi = yCoord + b.getBlockBoundsMaxY() - 0.1; + double offset = 0.3; + Minecraft.getMinecraft() + .effectRenderer + .addEffect(new EntityFluidLoadingFX( + worldObj, xCoord + offset + correction, yi, zCoord + offset + correction, xf, yf, zf, c)); + Minecraft.getMinecraft() + .effectRenderer + .addEffect(new EntityFluidLoadingFX( + worldObj, + xCoord + (1 - offset) + correction, + yi, + zCoord + offset + correction, + xf, + yf, + zf, + c)); + Minecraft.getMinecraft() + .effectRenderer + .addEffect(new EntityFluidLoadingFX( + worldObj, + xCoord + (1 - offset) + correction, + yi, + zCoord + (1 - offset) + correction, + xf, + yf, + zf, + c)); + Minecraft.getMinecraft() + .effectRenderer + .addEffect(new EntityFluidLoadingFX( + worldObj, + xCoord + offset + correction, + yi, + zCoord + (1 - offset) + correction, + xf, + yf, + zf, + c)); + } else if (!playedFuse) { + worldObj.playSound(xCoord, yCoord, zCoord, "game.tnt.primed", 1, 1, true); + playedFuse = true; + } + } + + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean res = false; + + if (!redstoneCheckPassed) { + if (canBeActive) { + canBeActive = false; + res = true; + } + return res; + } else { + canBeActive = true; + + if (isActive()) { + if (getEnergyStored() > getPowerUsePerTick() && inputTank.getFluidAmount() > 3) { + setEnergyStored(getEnergyStored() - getPowerUsePerTick()); + + int toUse = 4; + inputTank.drain(toUse, true); + fluidUsed += toUse; + tanksDirty = true; + res = true; + } + + if (fluidUsed >= 1000) { + EntityWeatherRocket e = new EntityWeatherRocket(worldObj, activeTask); + e.setPosition(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + worldObj.spawnEntityInWorld(e); + stopTask(); + res = true; + } + } + } + + if (tanksDirty) { + PacketHandler.sendToAllAround(new PacketWeatherTank(this), this); + tanksDirty = false; + } + + return res; + } + + /** + * If the task can be started based on the current inventory. Does not take + * into account the world's weather state. + * + * @param task + * The task to check + * @return True if the task can be started with the item in the inventory. + */ + public boolean canStartTask(WeatherTask task) { + return getActiveTask() == null + && !WeatherTask.worldIsState(task, worldObj) + && getStackInSlot(0) != null + && inputTank.getFluidAmount() >= 1000; + } + + /** + * @return If the operation was successful. + */ + public boolean startTask() { + if (getActiveTask() == null && inputTank.getFluidAmount() > 0) { + fluidUsed = 0; + WeatherTask task = WeatherTask.fromFluid(inputTank.getFluid().getFluid()); + if (canStartTask(task)) { + decrStackSize(0, 1); + activeTask = task; + return true; + } + } + return false; + } + + public void stopTask() { + if (getActiveTask() != null) { + activeTask = null; + fluidUsed = 0; + if (!worldObj.isRemote) { + PacketHandler.INSTANCE.sendToDimension(new PacketActivateWeather(this), worldObj.provider.dimensionId); + } else { + playedFuse = false; + } + } + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setTag("tank", inputTank.writeToNBT(new NBTTagCompound())); + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + inputTank.readFromNBT(nbtRoot.getCompoundTag("tank")); + } + + private boolean isValidFluid(Fluid f) { + return f == EnderIO.fluidLiquidSunshine + || f == EnderIO.fluidCloudSeed + || f == EnderIO.fluidCloudSeedConcentrated; + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + return forFluidType != null && forFluidType.getFluid() != null && isValidFluid(forFluidType.getFluid()) + ? inputTank + : null; + } + + FluidTank getInputTank() { + return inputTank; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[0]; + } + + @Override + public void setTanksDirty() { tanksDirty = true; - } - return res; } - return 0; - } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (resource != null && canFill(from, resource.getFluid())) { + int res = inputTank.fill(resource, doFill); + if (res > 0 && doFill) { + tanksDirty = true; + } + return res; + } + return 0; + } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return isValidFluid(fluid); - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return isValidFluid(fluid); + } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { inputTank.getInfo() }; - } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {inputTank.getInfo()}; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/WeatherObeliskSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/WeatherObeliskSpecialRenderer.java index 5fd85e69..694f361b 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/WeatherObeliskSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/WeatherObeliskSpecialRenderer.java @@ -1,20 +1,20 @@ package crazypants.enderio.machine.obelisk.weather; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import crazypants.enderio.machine.obelisk.ObeliskRenderer; import crazypants.enderio.machine.obelisk.ObeliskSpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class WeatherObeliskSpecialRenderer extends ObeliskSpecialRenderer { - - public WeatherObeliskSpecialRenderer(ItemStack itemStack, ObeliskRenderer renderer) { - super(itemStack, renderer); - } - @Override - protected void renderItemStack(TileWeatherObelisk te, World world, double x, double y, double z, float tick) { - if (te == null || te.isActive()) { - super.renderItemStack(te, world, x, y, z, tick); + public WeatherObeliskSpecialRenderer(ItemStack itemStack, ObeliskRenderer renderer) { + super(itemStack, renderer); + } + + @Override + protected void renderItemStack(TileWeatherObelisk te, World world, double x, double y, double z, float tick) { + if (te == null || te.isActive()) { + super.renderItemStack(te, world, x, y, z, tick); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java index 610e96d7..3c9b8e40 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java @@ -1,9 +1,12 @@ package crazypants.enderio.machine.obelisk.xp; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.ContainerNoInv; +import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; import java.util.Random; - -import com.enderio.core.common.ContainerEnder; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -11,73 +14,61 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.ContainerNoInv; -import crazypants.enderio.machine.monitor.GuiPowerMonitor; -import crazypants.enderio.machine.monitor.TilePowerMonitor; -import crazypants.enderio.machine.obelisk.BlockObeliskAbstract; public class BlockExperienceObelisk extends BlockObeliskAbstract { - public static BlockExperienceObelisk create() { - BlockExperienceObelisk res = new BlockExperienceObelisk(); - res.init(); - return res; - } - - private BlockExperienceObelisk() { - super(ModObject.blockExperienceObelisk, TileExperienceObelisk.class); - } - - @Override - protected boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { - return true; // always render as active - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - return super.getIcon(blockSide + 6, blockMeta); // always render as active - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileExperienceObelisk) { - return new ContainerNoInv((IInventory) te); + public static BlockExperienceObelisk create() { + BlockExperienceObelisk res = new BlockExperienceObelisk(); + res.init(); + return res; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileExperienceObelisk) { - return new GuiExperienceObelisk(player.inventory, (TileExperienceObelisk) te); + private BlockExperienceObelisk() { + super(ModObject.blockExperienceObelisk, TileExperienceObelisk.class); } - return null; - } + @Override + protected boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { + return true; // always render as active + } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_XP_OBELISK; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int blockSide, int blockMeta) { + return super.getIcon(blockSide + 6, blockMeta); // always render as active + } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - ; // Has no particles - } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileExperienceObelisk) { + return new ContainerNoInv((IInventory) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileExperienceObelisk) { + return new GuiExperienceObelisk(player.inventory, (TileExperienceObelisk) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_XP_OBELISK; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + ; // Has no particles + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java index 0559fb39..39186ada 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java @@ -1,15 +1,6 @@ package crazypants.enderio.machine.obelisk.xp; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.ContainerNoInv; @@ -18,133 +9,153 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiExperienceObelisk extends GuiMachineBase { - - private IconButton p; - private IconButton pp; - private IconButton ppp; - private IconButton m; - private IconButton mm; - private IconButton mmm; + private IconButton p; + private IconButton pp; + private IconButton ppp; - public GuiExperienceObelisk(InventoryPlayer playerInv, TileExperienceObelisk te) { - super(te, new ContainerNoInv(te), "experianceObelisk"); - ySize = 115; + private IconButton m; + private IconButton mm; + private IconButton mmm; - int spacing = 5; - int bw = 20; - int startX = xSize / 2 - bw / 2 - spacing - bw; + public GuiExperienceObelisk(InventoryPlayer playerInv, TileExperienceObelisk te) { + super(te, new ContainerNoInv(te), "experianceObelisk"); + ySize = 115; - int x; - int y; + int spacing = 5; + int bw = 20; + int startX = xSize / 2 - bw / 2 - spacing - bw; - x = startX; - y = 20; - p = new IconButton(this, 800, x, y, IconEIO.SINGLE_PLUS); - p.setSize(bw, bw); - p.setIconMargin(2, 2); - p.setToolTip(EnderIO.lang.localize("gui.machine.button.storelevel"), EnderIO.lang.localize("gui.machine.tooltip.storelevel")); + int x; + int y; - x += spacing + bw; - pp = new IconButton(this, 801, x, y, IconEIO.DOUBLE_PLUS); - pp.setSize(bw, bw); - pp.setIconMargin(2, 2); - pp.setToolTip(EnderIO.lang.localize("gui.machine.button.storelevels"), EnderIO.lang.localize("gui.machine.tooltip.storelevels")); + x = startX; + y = 20; + p = new IconButton(this, 800, x, y, IconEIO.SINGLE_PLUS); + p.setSize(bw, bw); + p.setIconMargin(2, 2); + p.setToolTip( + EnderIO.lang.localize("gui.machine.button.storelevel"), + EnderIO.lang.localize("gui.machine.tooltip.storelevel")); - x += spacing + bw; - ppp = new IconButton(this, 802, x, y, IconEIO.TRIPLE_PLUS); - ppp.setSize(bw, bw); - ppp.setIconMargin(2, 2); - ppp.setToolTip(EnderIO.lang.localize("gui.machine.button.storeall"), EnderIO.lang.localize("gui.machine.tooltip.storeall")); + x += spacing + bw; + pp = new IconButton(this, 801, x, y, IconEIO.DOUBLE_PLUS); + pp.setSize(bw, bw); + pp.setIconMargin(2, 2); + pp.setToolTip( + EnderIO.lang.localize("gui.machine.button.storelevels"), + EnderIO.lang.localize("gui.machine.tooltip.storelevels")); - x = startX; - y = 75; - m = new IconButton(this, 803, x, y, IconEIO.SINGLE_MINUS); - m.setSize(bw, bw); - m.setIconMargin(2, 2); - m.setToolTip(EnderIO.lang.localize("gui.machine.button.retrievelevel"), EnderIO.lang.localize("gui.machine.tooltip.retrievelevel")); + x += spacing + bw; + ppp = new IconButton(this, 802, x, y, IconEIO.TRIPLE_PLUS); + ppp.setSize(bw, bw); + ppp.setIconMargin(2, 2); + ppp.setToolTip( + EnderIO.lang.localize("gui.machine.button.storeall"), + EnderIO.lang.localize("gui.machine.tooltip.storeall")); - x += spacing + bw; - mm = new IconButton(this, 804, x, y, IconEIO.DOUBLE_MINUS); - mm.setSize(bw, bw); - mm.setIconMargin(2, 2); - mm.setToolTip(EnderIO.lang.localize("gui.machine.button.retrievelevels"), EnderIO.lang.localize("gui.machine.tooltip.retrievelevels")); + x = startX; + y = 75; + m = new IconButton(this, 803, x, y, IconEIO.SINGLE_MINUS); + m.setSize(bw, bw); + m.setIconMargin(2, 2); + m.setToolTip( + EnderIO.lang.localize("gui.machine.button.retrievelevel"), + EnderIO.lang.localize("gui.machine.tooltip.retrievelevel")); - x += spacing + bw; - mmm = new IconButton(this, 805, x, y, IconEIO.TRIPLE_MINUS); - mmm.setSize(bw, bw); - mmm.setIconMargin(2, 2); - mmm.setToolTip(EnderIO.lang.localize("gui.machine.button.retrieveall"), EnderIO.lang.localize("gui.machine.tooltip.retrieveall")); - } + x += spacing + bw; + mm = new IconButton(this, 804, x, y, IconEIO.DOUBLE_MINUS); + mm.setSize(bw, bw); + mm.setIconMargin(2, 2); + mm.setToolTip( + EnderIO.lang.localize("gui.machine.button.retrievelevels"), + EnderIO.lang.localize("gui.machine.tooltip.retrievelevels")); - @Override - public void initGui() { - super.initGui(); - p.onGuiInit(); - pp.onGuiInit(); - ppp.onGuiInit(); - - m.onGuiInit(); - mm.onGuiInit(); - mmm.onGuiInit(); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - int levels = 0; - if(b == p) { - levels = -1; - } else if(b == pp) { - levels = -10; - } else if(b == ppp) { - levels = -5000; - } else if(b == m) { - levels = 1; - } else if(b == mm) { - levels = 10; - } else if(b == mmm) { - levels = 5000; - } else { - return; + x += spacing + bw; + mmm = new IconButton(this, 805, x, y, IconEIO.TRIPLE_MINUS); + mmm.setSize(bw, bw); + mmm.setIconMargin(2, 2); + mmm.setToolTip( + EnderIO.lang.localize("gui.machine.button.retrieveall"), + EnderIO.lang.localize("gui.machine.tooltip.retrieveall")); } - if(levels < 0) { + @Override + public void initGui() { + super.initGui(); + p.onGuiInit(); + pp.onGuiInit(); + ppp.onGuiInit(); - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - int currLevel = player.experienceLevel; - int targetLevel = Math.max(0, currLevel + levels); - - PacketDrainPlayerXP packet = new PacketDrainPlayerXP(getTileEntity(), targetLevel, false); - PacketHandler.INSTANCE.sendToServer(packet); - } else { - - PacketGivePlayerXP packet = new PacketGivePlayerXP(getTileEntity(), levels); - PacketHandler.INSTANCE.sendToServer(packet); + m.onGuiInit(); + mm.onGuiInit(); + mmm.onGuiInit(); } - } + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + int levels = 0; + if (b == p) { + levels = -1; + } else if (b == pp) { + levels = -10; + } else if (b == ppp) { + levels = -5000; + } else if (b == m) { + levels = 1; + } else if (b == mm) { + levels = 10; + } else if (b == mmm) { + levels = 5000; + } else { + return; + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + if (levels < 0) { - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + int currLevel = player.experienceLevel; + int targetLevel = Math.max(0, currLevel + levels); - int width = 110; - ExperienceBarRenderer.render(this, getGuiLeft() + xSize / 2 - width / 2, getGuiTop() + 55, width, getTileEntity().getContainer()); + PacketDrainPlayerXP packet = new PacketDrainPlayerXP(getTileEntity(), targetLevel, false); + PacketHandler.INSTANCE.sendToServer(packet); + } else { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + PacketGivePlayerXP packet = new PacketGivePlayerXP(getTileEntity(), levels); + PacketHandler.INSTANCE.sendToServer(packet); + } + } - @Override - protected boolean showRecipeButton() { - return false; - } + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + int width = 110; + ExperienceBarRenderer.render( + this, + getGuiLeft() + xSize / 2 - width / 2, + getGuiTop() + 55, + width, + getTileEntity().getContainer()); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + @Override + protected boolean showRecipeButton() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java index ed949297..d36626d1 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/ItemXpTransfer.java @@ -1,5 +1,17 @@ package crazypants.enderio.machine.obelisk.xp; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.xp.XpUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -11,149 +23,151 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.xp.XpUtil; - public class ItemXpTransfer extends Item implements IResourceTooltipProvider { - public static ItemXpTransfer create() { - PacketHandler.INSTANCE.registerMessage(PacketXpTransferEffects.class, PacketXpTransferEffects.class, PacketHandler.nextID(), Side.CLIENT); + public static ItemXpTransfer create() { + PacketHandler.INSTANCE.registerMessage( + PacketXpTransferEffects.class, PacketXpTransferEffects.class, PacketHandler.nextID(), Side.CLIENT); - ItemXpTransfer result = new ItemXpTransfer(); - result.init(); - return result; - } - - protected ItemXpTransfer() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemXpTransfer.unlocalisedName); - setMaxStackSize(1); - setHasSubtypes(true); - } - - @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - return onActivated(player, world, x, y, z, side); - } - - public static boolean onActivated(EntityPlayer player, World world, int x, int y, int z, int side) { - if(world.isRemote) { - return false; - } - boolean res; - boolean swing = false; - if(player.isSneaking()) { - res = tranferFromPlayerToBlock(player, world, x, y, z, side); - swing = res; - } else { - res = tranferFromBlockToPlayer(player, world, x, y, z, side); + ItemXpTransfer result = new ItemXpTransfer(); + result.init(); + return result; } - if(res) { - sendXPUpdate(player, world, x, y, z, swing); - } - - return res; - } - - public static void sendXPUpdate(EntityPlayer player, World world, int x, int y, int z, boolean swing) { - Vector3d look = Util.getLookVecEio(player); - double xP = player.posX + look.x; - double yP = player.posY + 1.5; - double zP = player.posZ + look.z; - TargetPoint tp = new TargetPoint(player.dimension, x, y, z, 32); - EnderIO.packetPipeline.INSTANCE.sendTo(new PacketXpTransferEffects(swing, xP, yP, zP), (EntityPlayerMP)player); - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.orb", 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); - } - - public static boolean tranferFromBlockToPlayer(EntityPlayer player, World world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IFluidHandler)) { - return false; - } - IFluidHandler fh = (IFluidHandler) te; - ForgeDirection dir = ForgeDirection.getOrientation(side); - if(!fh.canDrain(dir, EnderIO.fluidXpJuice)) { - return false; - } - int currentXP = XpUtil.getPlayerXP(player); - int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1; - int requiredXP = nextLevelXP - currentXP; - - int fluidVolume = XpUtil.experienceToLiquid(requiredXP); - FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume); - FluidStack res = fh.drain(dir, fs, true); - if(res == null || res.amount <= 0) { - return false; + protected ItemXpTransfer() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemXpTransfer.unlocalisedName); + setMaxStackSize(1); + setHasSubtypes(true); } - int xpToGive = XpUtil.liquidToExperience(res.amount); - player.addExperience(xpToGive); - - return true; - } - - public static boolean tranferFromPlayerToBlock(EntityPlayer player, World world, int x, int y, int z, int side) { - - if(player.experienceTotal <= 0) { - return false; - } - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IFluidHandler)) { - return false; - } - IFluidHandler fh = (IFluidHandler) te; - ForgeDirection dir = ForgeDirection.getOrientation(side); - if(!fh.canFill(dir, EnderIO.fluidXpJuice)) { - return false; + @Override + public boolean onItemUseFirst( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + return onActivated(player, world, x, y, z, side); } - int fluidVolume = XpUtil.experienceToLiquid(XpUtil.getPlayerXP(player)); - FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume); - int takenVolume = fh.fill(dir, fs, true); - if(takenVolume <= 0) { - return false; + public static boolean onActivated(EntityPlayer player, World world, int x, int y, int z, int side) { + if (world.isRemote) { + return false; + } + boolean res; + boolean swing = false; + if (player.isSneaking()) { + res = tranferFromPlayerToBlock(player, world, x, y, z, side); + swing = res; + } else { + res = tranferFromBlockToPlayer(player, world, x, y, z, side); + } + + if (res) { + sendXPUpdate(player, world, x, y, z, swing); + } + + return res; } - int xpToTake = XpUtil.liquidToExperience(takenVolume); - XpUtil.addPlayerXP(player, -xpToTake); - return true; - } - protected void init() { - GameRegistry.registerItem(this, ModObject.itemXpTransfer.unlocalisedName); - } + public static void sendXPUpdate(EntityPlayer player, World world, int x, int y, int z, boolean swing) { + Vector3d look = Util.getLookVecEio(player); + double xP = player.posX + look.x; + double yP = player.posY + 1.5; + double zP = player.posZ + look.z; + TargetPoint tp = new TargetPoint(player.dimension, x, y, z, 32); + EnderIO.packetPipeline.INSTANCE.sendTo(new PacketXpTransferEffects(swing, xP, yP, zP), (EntityPlayerMP) player); + world.playSoundEffect( + x + 0.5, + y + 0.5, + z + 0.5, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:xpTransfer"); - } + public static boolean tranferFromBlockToPlayer(EntityPlayer player, World world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IFluidHandler)) { + return false; + } + IFluidHandler fh = (IFluidHandler) te; + ForgeDirection dir = ForgeDirection.getOrientation(side); + if (!fh.canDrain(dir, EnderIO.fluidXpJuice)) { + return false; + } + int currentXP = XpUtil.getPlayerXP(player); + int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1; + int requiredXP = nextLevelXP - currentXP; - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + int fluidVolume = XpUtil.experienceToLiquid(requiredXP); + FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume); + FluidStack res = fh.drain(dir, fs, true); + if (res == null || res.amount <= 0) { + return false; + } - @Override - public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { - return false; - } + int xpToGive = XpUtil.liquidToExperience(res.amount); + player.addExperience(xpToGive); - @Override - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } + return true; + } + public static boolean tranferFromPlayerToBlock(EntityPlayer player, World world, int x, int y, int z, int side) { + + if (player.experienceTotal <= 0) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IFluidHandler)) { + return false; + } + IFluidHandler fh = (IFluidHandler) te; + ForgeDirection dir = ForgeDirection.getOrientation(side); + if (!fh.canFill(dir, EnderIO.fluidXpJuice)) { + return false; + } + + int fluidVolume = XpUtil.experienceToLiquid(XpUtil.getPlayerXP(player)); + FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume); + int takenVolume = fh.fill(dir, fs, true); + if (takenVolume <= 0) { + return false; + } + int xpToTake = XpUtil.liquidToExperience(takenVolume); + XpUtil.addPlayerXP(player, -xpToTake); + return true; + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemXpTransfer.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:xpTransfer"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java index 6882d7c9..04a18ec8 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/PacketXpTransferEffects.java @@ -1,73 +1,78 @@ package crazypants.enderio.machine.obelisk.xp; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.entity.player.EntityPlayer; public class PacketXpTransferEffects implements IMessage, IMessageHandler { - boolean swing; - double x; - double y; - double z; - - public PacketXpTransferEffects(boolean swing, double x, double y, double z) { - this.swing = swing; - this.x = x; - this.y = y; - this.z = z; - } - - public PacketXpTransferEffects() { - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(swing); - buf.writeDouble(x); - buf.writeDouble(y); - buf.writeDouble(z); - } - - @Override - public void fromBytes(ByteBuf buf) { - swing = buf.readBoolean(); - x = buf.readDouble(); - y = buf.readDouble(); - z = buf.readDouble(); - } - - @Override - public IMessage onMessage(PacketXpTransferEffects message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - if(player != null) { - int particleCount = 1; - if(message.swing) { - player.swingItem(); - particleCount = 5; - } - - for (int i = 0; i < particleCount; i++) { - - float xOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; - float yOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; - float zOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; - - EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("spell", - message.x + xOffset, message.y + yOffset, message.z + zOffset, 0.0D, 0.0D, 0.0D); - if(fx != null) { - fx.setRBGColorF(0.2f, 0.8f, 0.2f); - fx.motionY *= 0.5f; - } - } + boolean swing; + double x; + double y; + double z; + public PacketXpTransferEffects(boolean swing, double x, double y, double z) { + this.swing = swing; + this.x = x; + this.y = y; + this.z = z; } - return null; - } + public PacketXpTransferEffects() {} + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(swing); + buf.writeDouble(x); + buf.writeDouble(y); + buf.writeDouble(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + swing = buf.readBoolean(); + x = buf.readDouble(); + y = buf.readDouble(); + z = buf.readDouble(); + } + + @Override + public IMessage onMessage(PacketXpTransferEffects message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + if (player != null) { + int particleCount = 1; + if (message.swing) { + player.swingItem(); + particleCount = 5; + } + + for (int i = 0; i < particleCount; i++) { + + float xOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; + float yOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; + float zOffset = 0.1F - player.worldObj.rand.nextFloat() * 0.2F; + + EntityFX fx = Minecraft.getMinecraft() + .renderGlobal + .doSpawnParticle( + "spell", + message.x + xOffset, + message.y + yOffset, + message.z + zOffset, + 0.0D, + 0.0D, + 0.0D); + if (fx != null) { + fx.setRBGColorF(0.2f, 0.8f, 0.2f); + fx.motionY *= 0.5f; + } + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java index 62f1f336..5a342d47 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/TileExperienceObelisk.java @@ -1,17 +1,7 @@ package crazypants.enderio.machine.obelisk.xp; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.FluidUtil; - import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; @@ -21,113 +11,122 @@ import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -public class TileExperienceObelisk extends AbstractMachineEntity implements IFluidHandler, IHaveExperience, ITankAccess { +public class TileExperienceObelisk extends AbstractMachineEntity + implements IFluidHandler, IHaveExperience, ITankAccess { - private ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.xpObeliskMaxXpLevel)); + private ExperienceContainer xpCont = + new ExperienceContainer(XpUtil.getExperienceForLevel(Config.xpObeliskMaxXpLevel)); - public TileExperienceObelisk() { - super(new SlotDefinition(0, 0, 0)); - } - - @Override - public String getMachineName() { - return ModObject.blockExperienceObelisk.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public boolean isActive() { - return true; - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - if(xpCont.isDirty()) { - PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); - xpCont.setDirty(false); + public TileExperienceObelisk() { + super(new SlotDefinition(0, 0, 0)); } - return false; - } - - @Override - protected boolean doPull(ForgeDirection dir) { - boolean res = super.doPull(dir); - FluidUtil.doPull(this, dir, Config.fluidConduitMaxIoRate); - return res; - } - - @Override - protected boolean doPush(ForgeDirection dir) { - boolean res = super.doPush(dir); - FluidUtil.doPush(this, dir, Config.fluidConduitMaxIoRate); - return res; - } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return xpCont.canFill(from, fluid); - } + @Override + public String getMachineName() { + return ModObject.blockExperienceObelisk.unlocalisedName; + } - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return xpCont.fill(from, resource, doFill); - } + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return false; + } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return xpCont.drain(from, resource, doDrain); - } + @Override + public boolean isActive() { + return true; + } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return xpCont.drain(from, maxDrain, doDrain); - } + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + if (xpCont.isDirty()) { + PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); + xpCont.setDirty(false); + } + return false; + } - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return xpCont.canDrain(from, fluid); - } + @Override + protected boolean doPull(ForgeDirection dir) { + boolean res = super.doPull(dir); + FluidUtil.doPull(this, dir, Config.fluidConduitMaxIoRate); + return res; + } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return xpCont.getTankInfo(from); - } + @Override + protected boolean doPush(ForgeDirection dir) { + boolean res = super.doPush(dir); + FluidUtil.doPush(this, dir, Config.fluidConduitMaxIoRate); + return res; + } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - xpCont.readFromNBT(nbtRoot); - } + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return xpCont.canFill(from, fluid); + } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - xpCont.writeToNBT(nbtRoot); - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return xpCont.fill(from, resource, doFill); + } - @Override - public ExperienceContainer getContainer() { - return xpCont; - } + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return xpCont.drain(from, resource, doDrain); + } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - return xpCont; - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return xpCont.drain(from, maxDrain, doDrain); + } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { xpCont }; - } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return xpCont.canDrain(from, fluid); + } - @Override - public void setTanksDirty() { - xpCont.setDirty(true); - } + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return xpCont.getTankInfo(from); + } + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + xpCont.readFromNBT(nbtRoot); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + xpCont.writeToNBT(nbtRoot); + } + + @Override + public ExperienceContainer getContainer() { + return xpCont; + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + return xpCont; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {xpCont}; + } + + @Override + public void setTanksDirty() { + xpCont.setDirty(true); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java index a482b492..2fc321a3 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BasicPainterTemplate.java @@ -1,142 +1,138 @@ package crazypants.enderio.machine.painter; -import java.util.Collections; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import static crazypants.enderio.machine.MachineRecipeInput.getInputForSlot; import com.enderio.core.common.util.Util; - import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.RecipeBonusType; - -import static crazypants.enderio.machine.MachineRecipeInput.getInputForSlot; +import java.util.Collections; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public abstract class BasicPainterTemplate implements IMachineRecipe { - public static int DEFAULT_ENERGY_PER_TASK = Config.painterEnergyPerTaskRF; + public static int DEFAULT_ENERGY_PER_TASK = Config.painterEnergyPerTaskRF; - protected final Block[] validTargets; + protected final Block[] validTargets; - protected BasicPainterTemplate(Block... validTargetBlocks) { - validTargets = validTargetBlocks; - } - - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - return DEFAULT_ENERGY_PER_TASK; - } - - @Override - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - return RecipeBonusType.NONE; - } - - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - return isValidTarget(getTarget(inputs)) && isValidPaintSource(getPaintSource(inputs)); - } - - @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack target = getTarget(inputs); - ItemStack paintSource = getPaintSource(inputs); - if(target == null || paintSource == null) { - return null; - } - ItemStack result = new ItemStack(getResultId(target), 1, target.getItemDamage()); - PainterUtil.setSourceBlock(result, Util.getBlockFromItemId(paintSource), paintSource.getItemDamage()); - return new ResultStack[] { new ResultStack(result) }; - } - - public ItemStack getTarget(MachineRecipeInput... inputs) { - return getInputForSlot(0, inputs); - } - - public ItemStack getPaintSource(MachineRecipeInput... inputs) { - return getInputForSlot(1, inputs); - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null) { - return false; - } - if(input.slotNumber == 0) { - return isValidTarget(input.item); - } - if(input.slotNumber == 1) { - return isValidPaintSource(input.item); - } - return false; - } - - @Override - public String getMachineName() { - return ModObject.blockPainter.unlocalisedName; - } - - public boolean isValidPaintSource(ItemStack paintSource) { - return PaintSourceValidator.instance.isValidSourceDefault(paintSource); - } - - public boolean isValidTarget(ItemStack target) { - // first check for exact matches, then check for item blocks - if(target == null) { - return false; - } - - Block blk = Block.getBlockFromItem(target.getItem()); - if(blk == null) { - return false; + protected BasicPainterTemplate(Block... validTargetBlocks) { + validTargets = validTargetBlocks; } - for (int i = 0; i < validTargets.length; i++) { - if(validTargets[i] == blk) { - return true; - } + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + return DEFAULT_ENERGY_PER_TASK; } - - return false; - } - @Override - public String getUid() { - return getClass().getCanonicalName(); - } - - protected Item getResultId(ItemStack target) { - return target.getItem(); - } - - public int getQuantityConsumed(MachineRecipeInput input) { - return input.slotNumber == 0 ? 1 : 0; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - MachineRecipeInput consume = null; - for (MachineRecipeInput input : inputs) { - if(input != null && input.slotNumber == 0 && input.item != null) { - ItemStack consumed = input.item.copy(); - consumed.stackSize = 1; - consume = new MachineRecipeInput(input.slotNumber, consumed); - } + @Override + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + return RecipeBonusType.NONE; } - if(consume != null) { - return Collections.singletonList(consume); + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + return isValidTarget(getTarget(inputs)) && isValidPaintSource(getPaintSource(inputs)); } - return null; - } - @Override - public float getExperienceForOutput(ItemStack output) { - return 0; - } + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack target = getTarget(inputs); + ItemStack paintSource = getPaintSource(inputs); + if (target == null || paintSource == null) { + return null; + } + ItemStack result = new ItemStack(getResultId(target), 1, target.getItemDamage()); + PainterUtil.setSourceBlock(result, Util.getBlockFromItemId(paintSource), paintSource.getItemDamage()); + return new ResultStack[] {new ResultStack(result)}; + } + public ItemStack getTarget(MachineRecipeInput... inputs) { + return getInputForSlot(0, inputs); + } + + public ItemStack getPaintSource(MachineRecipeInput... inputs) { + return getInputForSlot(1, inputs); + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null) { + return false; + } + if (input.slotNumber == 0) { + return isValidTarget(input.item); + } + if (input.slotNumber == 1) { + return isValidPaintSource(input.item); + } + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockPainter.unlocalisedName; + } + + public boolean isValidPaintSource(ItemStack paintSource) { + return PaintSourceValidator.instance.isValidSourceDefault(paintSource); + } + + public boolean isValidTarget(ItemStack target) { + // first check for exact matches, then check for item blocks + if (target == null) { + return false; + } + + Block blk = Block.getBlockFromItem(target.getItem()); + if (blk == null) { + return false; + } + + for (int i = 0; i < validTargets.length; i++) { + if (validTargets[i] == blk) { + return true; + } + } + + return false; + } + + @Override + public String getUid() { + return getClass().getCanonicalName(); + } + + protected Item getResultId(ItemStack target) { + return target.getItem(); + } + + public int getQuantityConsumed(MachineRecipeInput input) { + return input.slotNumber == 0 ? 1 : 0; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + MachineRecipeInput consume = null; + for (MachineRecipeInput input : inputs) { + if (input != null && input.slotNumber == 0 && input.item != null) { + ItemStack consumed = input.item.copy(); + consumed.stackSize = 1; + consume = new MachineRecipeInput(input.slotNumber, consumed); + } + } + if (consume != null) { + return Collections.singletonList(consume); + } + return null; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java index ea9123e0..2cc5ceae 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedCarpet.java @@ -1,38 +1,35 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; public class BlockItemPaintedCarpet extends ItemBlock { - public BlockItemPaintedCarpet(Block p_i45328_1_) { - super(p_i45328_1_); - setHasSubtypes(true); - } + public BlockItemPaintedCarpet(Block p_i45328_1_) { + super(p_i45328_1_); + setHasSubtypes(true); + } - public BlockItemPaintedCarpet() { - super(EnderIO.blockPaintedCarpet); - setHasSubtypes(true); - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + public BlockItemPaintedCarpet() { + super(EnderIO.blockPaintedCarpet); + setHasSubtypes(true); + } + @Override + public int getMetadata(int par1) { + return par1; + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFence.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFence.java index 8b709370..a8667e46 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFence.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFence.java @@ -1,37 +1,35 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; public class BlockItemPaintedFence extends ItemBlock { - public BlockItemPaintedFence(Block p_i45328_1_) { - super(p_i45328_1_); - setHasSubtypes(true); - } + public BlockItemPaintedFence(Block p_i45328_1_) { + super(p_i45328_1_); + setHasSubtypes(true); + } - public BlockItemPaintedFence() { - super(EnderIO.blockPaintedFence); - setHasSubtypes(true); - } + public BlockItemPaintedFence() { + super(EnderIO.blockPaintedFence); + setHasSubtypes(true); + } - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + public int getMetadata(int par1) { + return par1; + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFenceGate.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFenceGate.java index cf24f672..9f0e4479 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFenceGate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedFenceGate.java @@ -1,31 +1,29 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockItemPaintedFenceGate extends ItemBlock { - public BlockItemPaintedFenceGate(Block block) { - super(block); - setHasSubtypes(true); - } + public BlockItemPaintedFenceGate(Block block) { + super(block); + setHasSubtypes(true); + } - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + public int getMetadata(int par1) { + return par1; + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java index 5e223b0c..8ec0fb80 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedGlowstone.java @@ -1,58 +1,66 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; public class BlockItemPaintedGlowstone extends ItemBlock { - public BlockItemPaintedGlowstone(Block p_i45328_1_) { - super(p_i45328_1_); - setHasSubtypes(true); - } - - public BlockItemPaintedGlowstone() { - super(EnderIO.blockPaintedGlowstone); - setHasSubtypes(true); - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @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(!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - return false; + public BlockItemPaintedGlowstone(Block p_i45328_1_) { + super(p_i45328_1_); + setHasSubtypes(true); } - Block b = PainterUtil.getSourceBlock(stack); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - int meta = PainterUtil.getSourceBlockMetadata(stack); - meta = PainterUtil.adjustFacadeMetadata(b, meta, side); - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(meta); - world.markBlockForUpdate(x, y, z); + + public BlockItemPaintedGlowstone() { + super(EnderIO.blockPaintedGlowstone); + setHasSubtypes(true); } - return true; - } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + public int getMetadata(int par1) { + return par1; + } + @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 (!super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { + return false; + } + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + int meta = PainterUtil.getSourceBlockMetadata(stack); + meta = PainterUtil.adjustFacadeMetadata(b, meta, side); + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(meta); + world.markBlockForUpdate(x, y, z); + } + return true; + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java index 095a6246..b2c70dc1 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedSlab.java @@ -1,155 +1,173 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; public class BlockItemPaintedSlab extends ItemSlab { - private boolean isFullBlock; + private boolean isFullBlock; - public BlockItemPaintedSlab(Block blk) { - super(blk, EnderIO.blockPaintedSlab, EnderIO.blockPaintedDoubleSlab, blk == EnderIO.blockPaintedDoubleSlab); - setHasSubtypes(true); - isFullBlock = blk == EnderIO.blockPaintedDoubleSlab; - setUnlocalizedName(ModObject.blockPaintedSlab.unlocalisedName); - } + public BlockItemPaintedSlab(Block blk) { + super(blk, EnderIO.blockPaintedSlab, EnderIO.blockPaintedDoubleSlab, blk == EnderIO.blockPaintedDoubleSlab); + setHasSubtypes(true); + isFullBlock = blk == EnderIO.blockPaintedDoubleSlab; + setUnlocalizedName(ModObject.blockPaintedSlab.unlocalisedName); + } - @Override - public int getMetadata(int par1) { - return par1; - } + @Override + public int getMetadata(int par1) { + return par1; + } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, - float par9, float par10) { + @Override + public boolean onItemUse( + ItemStack par1ItemStack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { - if(this.isFullBlock) { - return super.onItemUse(par1ItemStack, player, world, x, y, z, side, par8, par9, par10); - } else if(par1ItemStack.stackSize == 0) { - return false; - } else if(!player.canPlayerEdit(x, y, z, side, par1ItemStack)) { - return false; - } else { - Block i1 = world.getBlock(x, y, z); - int j1 = world.getBlockMetadata(x, y, z); - int k1 = j1 & 7; - boolean flag = (j1 & 8) != 0; + if (this.isFullBlock) { + return super.onItemUse(par1ItemStack, player, world, x, y, z, side, par8, par9, par10); + } else if (par1ItemStack.stackSize == 0) { + return false; + } else if (!player.canPlayerEdit(x, y, z, side, par1ItemStack)) { + return false; + } else { + Block i1 = world.getBlock(x, y, z); + int j1 = world.getBlockMetadata(x, y, z); + int k1 = j1 & 7; + boolean flag = (j1 & 8) != 0; - if((side == 1 && !flag || side == 0 && flag) && i1 == EnderIO.blockPaintedSlab && k1 == par1ItemStack.getItemDamage()) { + if ((side == 1 && !flag || side == 0 && flag) + && i1 == EnderIO.blockPaintedSlab + && k1 == par1ItemStack.getItemDamage()) { - if(world.checkNoEntityCollision(EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) { + if (world.checkNoEntityCollision( + EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z))) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedSlab) { - ((TileEntityPaintedSlab) te).isConvertingToFullBlock = true; - } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedSlab) { + ((TileEntityPaintedSlab) te).isConvertingToFullBlock = true; + } - if(world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) { + if (world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) { - te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { + te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { - Block b = PainterUtil.getSourceBlock(par1ItemStack); - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack)); - world.markBlockForUpdate(x, y, z); + Block b = PainterUtil.getSourceBlock(par1ItemStack); + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack)); + world.markBlockForUpdate(x, y, z); + } + + world.playSoundEffect( + x + 0.5F, + y + 0.5F, + z + 0.5F, + EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), + (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, + EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F); + --par1ItemStack.stackSize; + } else { + if (te instanceof TileEntityPaintedSlab) { + ((TileEntityPaintedSlab) te).isConvertingToFullBlock = false; + } + } + } + + return true; + } else { + if (mergeWithTopSlab(par1ItemStack, player, world, x, y, z, side)) { + return true; + } + return super.onItemUse(par1ItemStack, player, world, x, y, z, side, par8, par9, par10); + } + } + } + + private boolean mergeWithTopSlab( + ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World world, int x, int y, int z, int side) { + if (side == 0) { + --y; + } else if (side == 1) { + ++y; + } else if (side == 2) { + --z; + } else if (side == 3) { + ++z; + } else if (side == 4) { + --x; + } else if (side == 5) { + ++x; + } + + Block i1 = world.getBlock(x, y, z); + int j1 = world.getBlockMetadata(x, y, z); + int k1 = j1 & 7; + + if (i1 == EnderIO.blockPaintedSlab && k1 == par1ItemStack.getItemDamage()) { + + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedSlab) { + ((TileEntityPaintedSlab) te).isConvertingToFullBlock = true; } - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, - EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, - EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F); - --par1ItemStack.stackSize; - } else { - if(te instanceof TileEntityPaintedSlab) { - ((TileEntityPaintedSlab) te).isConvertingToFullBlock = false; + if (world.checkNoEntityCollision( + EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z)) + && world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) { + + te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + + Block b = PainterUtil.getSourceBlock(par1ItemStack); + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack)); + world.markBlockForUpdate(x, y, z); + } + + world.playSoundEffect( + x + 0.5F, + y + 0.5F, + z + 0.5F, + EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), + (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, + EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F); + --par1ItemStack.stackSize; + + } else { + if (te instanceof TileEntityPaintedSlab) { + ((TileEntityPaintedSlab) te).isConvertingToFullBlock = false; + } } + return true; - } + } else { + return false; } - - return true; - } else { - if(mergeWithTopSlab(par1ItemStack, player, world, x, y, z, side)) { - return true; - } - return super.onItemUse(par1ItemStack, player, world, x, y, z, side, par8, par9, par10); - } } - } - - private boolean mergeWithTopSlab(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World world, int x, int y, int z, int side) { - if(side == 0) { - --y; - } else if(side == 1) { - ++y; - } else if(side == 2) { - --z; - } else if(side == 3) { - ++z; - } else if(side == 4) { - --x; - } else if(side == 5) { - ++x; - } - - Block i1 = world.getBlock(x, y, z); - int j1 = world.getBlockMetadata(x, y, z); - int k1 = j1 & 7; - - if(i1 == EnderIO.blockPaintedSlab && k1 == par1ItemStack.getItemDamage()) { - - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedSlab) { - ((TileEntityPaintedSlab) te).isConvertingToFullBlock = true; - } - - if(world.checkNoEntityCollision(EnderIO.blockPaintedDoubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z)) - && world.setBlock(x, y, z, EnderIO.blockPaintedDoubleSlab, k1, 3)) { - - te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - - Block b = PainterUtil.getSourceBlock(par1ItemStack); - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par1ItemStack)); - world.markBlockForUpdate(x, y, z); - } - - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, - EnderIO.blockPaintedDoubleSlab.stepSound.getStepResourcePath(), (EnderIO.blockPaintedDoubleSlab.stepSound.getVolume() + 1.0F) / 2.0F, - EnderIO.blockPaintedDoubleSlab.stepSound.getPitch() * 0.8F); - --par1ItemStack.stackSize; - - } else { - if(te instanceof TileEntityPaintedSlab) { - ((TileEntityPaintedSlab) te).isConvertingToFullBlock = false; - } - - } - return true; - - } else { - return false; - } - } - } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedStair.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedStair.java index 14187dd0..7ac459a0 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedStair.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedStair.java @@ -1,30 +1,29 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockItemPaintedStair extends ItemBlock { - public BlockItemPaintedStair(Block block) { - super(block); - setHasSubtypes(true); - } + public BlockItemPaintedStair(Block block) { + super(block); + setHasSubtypes(true); + } - @Override - public int getMetadata(int par1) { - return 0; - } + @Override + public int getMetadata(int par1) { + return 0; + } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedWall.java b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedWall.java index 3887de78..5cd68331 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedWall.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockItemPaintedWall.java @@ -1,31 +1,29 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockItemPaintedWall extends ItemBlock { - public BlockItemPaintedWall(Block block) { - super(block); - setHasSubtypes(true); - } + public BlockItemPaintedWall(Block block) { + super(block); + setHasSubtypes(true); + } - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + @Override + public int getMetadata(int par1) { + return par1; + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java index 243122b0..30074c28 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedCarpet.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.ITileEntityProvider; @@ -21,231 +27,224 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedCarpet extends BlockCarpet implements ITileEntityProvider, IPaintedBlock { - public static BlockPaintedCarpet create() { - BlockPaintedCarpet result = new BlockPaintedCarpet(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private Random rand = new Random(); - - protected BlockPaintedCarpet() { - super(); - setCreativeTab(null); - setBlockName(ModObject.blockPaintedCarpet.unlocalisedName); - setHardness(0.1F); - setStepSound(soundTypeCloth); - setLightOpacity(0); - } - - private void init() { - GameRegistry.registerBlock(this, BlockItemPaintedCarpet.class, ModObject.blockPaintedCarpet.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedCarpet.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - public static ItemStack createItemStackForSourceBlock(Block block, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedCarpet, 1, damage); - PainterUtil.setSourceBlock(result, block, damage); - return result; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - ItemStack stack = new ItemStack(item); - PainterUtil.setSourceBlock(stack, Blocks.stone, 0); - list.add(stack); - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().colorMultiplier(world, x, y, z); - } - } - return super.colorMultiplier(world, x, y, z); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); - } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); - } - } - } - return true; - - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedBlock(); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - Block b = PainterUtil.getSourceBlock(stack); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - world.markBlockForUpdate(x, y, z); - super.onBlockPlacedBy(world, x, y, z, player, stack); - } - - /** - * Remove the tile entity too. - */ - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - } - + public static BlockPaintedCarpet create() { + BlockPaintedCarpet result = new BlockPaintedCarpet(); + result.init(); + return result; } - world.removeTileEntity(x, y, z); - } + private IIcon lastRemovedComponetIcon = null; - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } + private Random rand = new Random(); - public final class PainterTemplate extends BasicPainterTemplate { + protected BlockPaintedCarpet() { + super(); + setCreativeTab(null); + setBlockName(ModObject.blockPaintedCarpet.unlocalisedName); + setHardness(0.1F); + setStepSound(soundTypeCloth); + setLightOpacity(0); + } - public PainterTemplate() { - super(Blocks.carpet, BlockPaintedCarpet.this); + private void init() { + GameRegistry.registerBlock(this, BlockItemPaintedCarpet.class, ModObject.blockPaintedCarpet.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedCarpet.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block block, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedCarpet, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + ItemStack stack = new ItemStack(item); + PainterUtil.setSourceBlock(stack, Blocks.stone, 0); + list.add(stack); } - } + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + } + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; + } + + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.carpet, BlockPaintedCarpet.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java index 6da5f306..c1d8d4b6 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFence.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.ITileEntityProvider; @@ -22,274 +28,270 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedFence extends BlockFence implements ITileEntityProvider, IPaintedBlock { - public static BlockPaintedFence create() { - BlockPaintedFence result = new BlockPaintedFence(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private Random rand = new Random(); - - public BlockPaintedFence() { - super(ModObject.blockPaintedFence.unlocalisedName, Material.wood); - setBlockName(ModObject.blockPaintedFence.unlocalisedName); - setHardness(2.0F); - setResistance(5.0F); - setStepSound(soundTypeWood); - setCreativeTab(null); - } - - private void init() { - GameRegistry.registerBlock(this, BlockItemPaintedFence.class, ModObject.blockPaintedFence.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedFence.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - public static ItemStack createItemStackForSourceBlock(Block source, int sourceMeta) { - ItemStack result = new ItemStack(EnderIO.blockPaintedFence, 1, sourceMeta); - PainterUtil.setSourceBlock(result, source, sourceMeta); - return result; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + public static BlockPaintedFence create() { + BlockPaintedFence result = new BlockPaintedFence(); + result.init(); + return result; } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + private IIcon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + public BlockPaintedFence() { + super(ModObject.blockPaintedFence.unlocalisedName, Material.wood); + setBlockName(ModObject.blockPaintedFence.unlocalisedName); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundTypeWood); + setCreativeTab(null); + } + + private void init() { + GameRegistry.registerBlock(this, BlockItemPaintedFence.class, ModObject.blockPaintedFence.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedFence.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block source, int sourceMeta) { + ItemStack result = new ItemStack(EnderIO.blockPaintedFence, 1, sourceMeta); + PainterUtil.setSourceBlock(result, source, sourceMeta); + return result; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); } - } - } - return true; - - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity()); - } - } - return super.getLightOpacity(world, x, y, z); - } - - @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { - Block id = world.getBlock(x, y, z); - if(id == this) { - return true; - } - return super.canPlaceTorchOnTop(world, x, y, z); - } - - @Override - public boolean canConnectFenceTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - Block l = par1IBlockAccess.getBlock(par2, par3, par4); - if(l == EnderIO.blockPaintedFenceGate) { - return true; - } - return super.canConnectFenceTo(par1IBlockAccess, par2, par3, par4); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } else { - System.out.println("BlockCustFence: No tile entity."); - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IIconRegister) { - blockIcon = par1IIconRegister.registerIcon("enderio:conduitConnector"); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileEntityPaintedBlock(); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - - Block b = PainterUtil.getSourceBlock(stack); - - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - world.markBlockForUpdate(x, y, z); - } - - /** - * Remove the tile entity too. - */ - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - } else { - System.out.println("dropBlockAsItem_do: No tile entity."); - } - - } - - world.removeTileEntity(x, y, z); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } - - /** - * Called when the block receives a BlockEvent - see World.addBlockEvent. By - * default, passes it on to the tile entity at this location. Args: world, x, - * y, z, blockID, EventID, event parameter - */ - @Override - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().colorMultiplier(world, x, y, z); - } - } - return super.colorMultiplier(world, x, y, z); - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(Blocks.fence, Blocks.nether_brick_fence, BlockPaintedFence.this); + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; } - } + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return Math.min( + super.getLightOpacity(world, x, y, z), + tef.getSourceBlock().getLightOpacity()); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + Block id = world.getBlock(x, y, z); + if (id == this) { + return true; + } + return super.canPlaceTorchOnTop(world, x, y, z); + } + + @Override + public boolean canConnectFenceTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + Block l = par1IBlockAccess.getBlock(par2, par3, par4); + if (l == EnderIO.blockPaintedFenceGate) { + return true; + } + return super.canConnectFenceTo(par1IBlockAccess, par2, par3, par4); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } else { + System.out.println("BlockCustFence: No tile entity."); + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1IIconRegister) { + blockIcon = par1IIconRegister.registerIcon("enderio:conduitConnector"); + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return new TileEntityPaintedBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + + Block b = PainterUtil.getSourceBlock(stack); + + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + /** + * Called when the block receives a BlockEvent - see World.addBlockEvent. By + * default, passes it on to the tile entity at this location. Args: world, x, + * y, z, blockID, EventID, event parameter + */ + @Override + public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { + super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); + TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); + return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.fence, Blocks.nether_brick_fence, BlockPaintedFence.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java index c13fc8a7..f9009ee8 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGate.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.ITileEntityProvider; @@ -21,229 +27,228 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedFenceGate extends BlockFenceGate implements ITileEntityProvider, IPaintedBlock { - public static int renderId; + public static int renderId; - public static BlockPaintedFenceGate create() { - BlockPaintedFenceGate result = new BlockPaintedFenceGate(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private Random rand = new Random(); - - public BlockPaintedFenceGate() { - setCreativeTab(null); - setBlockName(ModObject.blockPaintedFenceGate.unlocalisedName); - setHardness(2.0F); - setResistance(5.0F); - setStepSound(soundTypeWood); - } - - private void init() { - GameRegistry.registerBlock(this, BlockItemPaintedFenceGate.class, ModObject.blockPaintedFenceGate.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedFenceGate.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + public static BlockPaintedFenceGate create() { + BlockPaintedFenceGate result = new BlockPaintedFenceGate(); + result.init(); + return result; } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + private IIcon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + public BlockPaintedFenceGate() { + setCreativeTab(null); + setBlockName(ModObject.blockPaintedFenceGate.unlocalisedName); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(soundTypeWood); + } + + private void init() { + GameRegistry.registerBlock( + this, BlockItemPaintedFenceGate.class, ModObject.blockPaintedFenceGate.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedFenceGate.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); } - } - } - return true; - - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z)); - } - } - return super.getLightOpacity(world, x, y, z); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedBlock(); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - return tef.getSourceBlock() == null ? null : tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - - } else { - System.out.println("BlockCustFence: No tile entity."); - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - - Block b = PainterUtil.getSourceBlock(stack); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - // world.markBlockForUpdate(x, y, z); - - int l = (MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3) % 4; - world.setBlockMetadataWithNotify(x, y, z, l, 2); - } - - public static ItemStack createItemStackForSourceBlock(Block source, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedFenceGate, 1, damage); - PainterUtil.setSourceBlock(result, source, damage); - return result; - } - - /** - * Remove the tile entity too. - */ - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - } - - } - - world.removeTileEntity(x, y, z); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(Blocks.fence_gate, BlockPaintedFenceGate.this); + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; } - } + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + @Override + public int getRenderType() { + return renderId; + } + + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return Math.min( + super.getLightOpacity(world, x, y, z), + tef.getSourceBlock().getLightOpacity(world, x, y, z)); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + return tef.getSourceBlock() == null + ? null + : tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + + } else { + System.out.println("BlockCustFence: No tile entity."); + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + // world.markBlockForUpdate(x, y, z); + + int l = (MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3) % 4; + world.setBlockMetadataWithNotify(x, y, z, l, 2); + } + + public static ItemStack createItemStackForSourceBlock(Block source, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedFenceGate, 1, damage); + PainterUtil.setSourceBlock(result, source, damage); + return result; + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.fence_gate, BlockPaintedFenceGate.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGateRenderer.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGateRenderer.java index 24c18a5e..6376ee81 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGateRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedFenceGateRenderer.java @@ -1,223 +1,210 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockFenceGate; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; public class BlockPaintedFenceGateRenderer implements ISimpleBlockRenderingHandler { - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - renderer.renderBlockAsItem(Blocks.fence_gate, metadata, 1); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockPaintedFenceGate.renderId; - } - - @Override - public boolean renderWorldBlock(IBlockAccess blockAccess, int par2, int par3, int par4, Block block, int modelId, RenderBlocks rb) { - - BlockFenceGate par1BlockFenceGate = (BlockFenceGate) block; - - boolean flag = true; - int l = rb.blockAccess.getBlockMetadata(par2, par3, par4); - boolean flag1 = BlockFenceGate.isFenceGateOpen(l); - int i1 = BlockDirectional.getDirection(l); - float f = 0.375F; - float f1 = 0.5625F; - float f2 = 0.75F; - float f3 = 0.9375F; - float f4 = 0.3125F; - float f5 = 1.0F; - - if((i1 == 2 || i1 == 0) && rb.blockAccess.getBlock(par2 - 1, par3, par4) == Blocks.cobblestone_wall - && rb.blockAccess.getBlock(par2 + 1, par3, par4) == Blocks.cobblestone_wall || - (i1 == 3 || i1 == 1) && rb.blockAccess.getBlock(par2, par3, par4 - 1) == Blocks.cobblestone_wall - && rb.blockAccess.getBlock(par2, par3, par4 + 1) == Blocks.cobblestone_wall || - (i1 == 2 || i1 == 0) && rb.blockAccess.getBlock(par2 - 1, par3, par4) == EnderIO.blockPaintedWall - && rb.blockAccess.getBlock(par2 + 1, par3, par4) == EnderIO.blockPaintedWall || - (i1 == 3 || i1 == 1) && rb.blockAccess.getBlock(par2, par3, par4 - 1) == EnderIO.blockPaintedWall - && rb.blockAccess.getBlock(par2, par3, par4 + 1) == EnderIO.blockPaintedWall) - { - f -= 0.1875F; - f1 -= 0.1875F; - f2 -= 0.1875F; - f3 -= 0.1875F; - f4 -= 0.1875F; - f5 -= 0.1875F; + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + renderer.renderBlockAsItem(Blocks.fence_gate, metadata, 1); } - rb.renderAllFaces = true; - float f6; - float f7; - float f8; - float f9; - - if(i1 != 3 && i1 != 1) - { - f6 = 0.0F; - f8 = 0.125F; - f7 = 0.4375F; - f9 = 0.5625F; - rb.setRenderBounds(f6, f4, f7, f8, f5, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f6 = 0.875F; - f8 = 1.0F; - rb.setRenderBounds(f6, f4, f7, f8, f5, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - else - { - rb.uvRotateTop = 1; - f6 = 0.4375F; - f8 = 0.5625F; - f7 = 0.0F; - f9 = 0.125F; - rb.setRenderBounds(f6, f4, f7, f8, f5, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f7 = 0.875F; - f9 = 1.0F; - rb.setRenderBounds(f6, f4, f7, f8, f5, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.uvRotateTop = 0; + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; } - if(flag1) - { - if(i1 == 2 || i1 == 0) - { - rb.uvRotateTop = 1; - } - - if(i1 == 3) - { - rb.setRenderBounds(0.8125D, f, 0.0D, 0.9375D, f3, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.8125D, f, 0.875D, 0.9375D, f3, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.5625D, f, 0.0D, 0.8125D, f1, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.5625D, f, 0.875D, 0.8125D, f1, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.5625D, f2, 0.0D, 0.8125D, f3, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.5625D, f2, 0.875D, 0.8125D, f3, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - else if(i1 == 1) - { - rb.setRenderBounds(0.0625D, f, 0.0D, 0.1875D, f3, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.0625D, f, 0.875D, 0.1875D, f3, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.1875D, f, 0.0D, 0.4375D, f1, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.1875D, f, 0.875D, 0.4375D, f1, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.1875D, f2, 0.0D, 0.4375D, f3, 0.125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.1875D, f2, 0.875D, 0.4375D, f3, 1.0D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - else if(i1 == 0) - { - rb.setRenderBounds(0.0D, f, 0.8125D, 0.125D, f3, 0.9375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f, 0.8125D, 1.0D, f3, 0.9375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.0D, f, 0.5625D, 0.125D, f1, 0.8125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f, 0.5625D, 1.0D, f1, 0.8125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.0D, f2, 0.5625D, 0.125D, f3, 0.8125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f2, 0.5625D, 1.0D, f3, 0.8125D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - else if(i1 == 2) - { - rb.setRenderBounds(0.0D, f, 0.0625D, 0.125D, f3, 0.1875D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f, 0.0625D, 1.0D, f3, 0.1875D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.0D, f, 0.1875D, 0.125D, f1, 0.4375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f, 0.1875D, 1.0D, f1, 0.4375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.0D, f2, 0.1875D, 0.125D, f3, 0.4375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(0.875D, f2, 0.1875D, 1.0D, f3, 0.4375D); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - } - else if(i1 != 3 && i1 != 1) - { - f6 = 0.375F; - f8 = 0.5F; - f7 = 0.4375F; - f9 = 0.5625F; - rb.setRenderBounds(f6, f, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f6 = 0.5F; - f8 = 0.625F; - rb.setRenderBounds(f6, f, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f6 = 0.625F; - f8 = 0.875F; - rb.setRenderBounds(f6, f, f7, f8, f1, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(f6, f2, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f6 = 0.125F; - f8 = 0.375F; - rb.setRenderBounds(f6, f, f7, f8, f1, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(f6, f2, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - } - else - { - rb.uvRotateTop = 1; - f6 = 0.4375F; - f8 = 0.5625F; - f7 = 0.375F; - f9 = 0.5F; - rb.setRenderBounds(f6, f, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f7 = 0.5F; - f9 = 0.625F; - rb.setRenderBounds(f6, f, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f7 = 0.625F; - f9 = 0.875F; - rb.setRenderBounds(f6, f, f7, f8, f1, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(f6, f2, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - f7 = 0.125F; - f9 = 0.375F; - rb.setRenderBounds(f6, f, f7, f8, f1, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); - rb.setRenderBounds(f6, f2, f7, f8, f3, f9); - rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + @Override + public int getRenderId() { + return BlockPaintedFenceGate.renderId; } - rb.renderAllFaces = false; - rb.uvRotateTop = 0; - rb.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); - return flag; - } + @Override + public boolean renderWorldBlock( + IBlockAccess blockAccess, int par2, int par3, int par4, Block block, int modelId, RenderBlocks rb) { + BlockFenceGate par1BlockFenceGate = (BlockFenceGate) block; + + boolean flag = true; + int l = rb.blockAccess.getBlockMetadata(par2, par3, par4); + boolean flag1 = BlockFenceGate.isFenceGateOpen(l); + int i1 = BlockDirectional.getDirection(l); + float f = 0.375F; + float f1 = 0.5625F; + float f2 = 0.75F; + float f3 = 0.9375F; + float f4 = 0.3125F; + float f5 = 1.0F; + + if ((i1 == 2 || i1 == 0) + && rb.blockAccess.getBlock(par2 - 1, par3, par4) == Blocks.cobblestone_wall + && rb.blockAccess.getBlock(par2 + 1, par3, par4) == Blocks.cobblestone_wall + || (i1 == 3 || i1 == 1) + && rb.blockAccess.getBlock(par2, par3, par4 - 1) == Blocks.cobblestone_wall + && rb.blockAccess.getBlock(par2, par3, par4 + 1) == Blocks.cobblestone_wall + || (i1 == 2 || i1 == 0) + && rb.blockAccess.getBlock(par2 - 1, par3, par4) == EnderIO.blockPaintedWall + && rb.blockAccess.getBlock(par2 + 1, par3, par4) == EnderIO.blockPaintedWall + || (i1 == 3 || i1 == 1) + && rb.blockAccess.getBlock(par2, par3, par4 - 1) == EnderIO.blockPaintedWall + && rb.blockAccess.getBlock(par2, par3, par4 + 1) == EnderIO.blockPaintedWall) { + f -= 0.1875F; + f1 -= 0.1875F; + f2 -= 0.1875F; + f3 -= 0.1875F; + f4 -= 0.1875F; + f5 -= 0.1875F; + } + + rb.renderAllFaces = true; + float f6; + float f7; + float f8; + float f9; + + if (i1 != 3 && i1 != 1) { + f6 = 0.0F; + f8 = 0.125F; + f7 = 0.4375F; + f9 = 0.5625F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.875F; + f8 = 1.0F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } else { + rb.uvRotateTop = 1; + f6 = 0.4375F; + f8 = 0.5625F; + f7 = 0.0F; + f9 = 0.125F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.875F; + f9 = 1.0F; + rb.setRenderBounds(f6, f4, f7, f8, f5, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.uvRotateTop = 0; + } + + if (flag1) { + if (i1 == 2 || i1 == 0) { + rb.uvRotateTop = 1; + } + + if (i1 == 3) { + rb.setRenderBounds(0.8125D, f, 0.0D, 0.9375D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.8125D, f, 0.875D, 0.9375D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f, 0.0D, 0.8125D, f1, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f, 0.875D, 0.8125D, f1, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f2, 0.0D, 0.8125D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.5625D, f2, 0.875D, 0.8125D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } else if (i1 == 1) { + rb.setRenderBounds(0.0625D, f, 0.0D, 0.1875D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0625D, f, 0.875D, 0.1875D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f, 0.0D, 0.4375D, f1, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f, 0.875D, 0.4375D, f1, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f2, 0.0D, 0.4375D, f3, 0.125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.1875D, f2, 0.875D, 0.4375D, f3, 1.0D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } else if (i1 == 0) { + rb.setRenderBounds(0.0D, f, 0.8125D, 0.125D, f3, 0.9375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.8125D, 1.0D, f3, 0.9375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f, 0.5625D, 0.125D, f1, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.5625D, 1.0D, f1, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f2, 0.5625D, 0.125D, f3, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f2, 0.5625D, 1.0D, f3, 0.8125D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } else if (i1 == 2) { + rb.setRenderBounds(0.0D, f, 0.0625D, 0.125D, f3, 0.1875D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.0625D, 1.0D, f3, 0.1875D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f, 0.1875D, 0.125D, f1, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f, 0.1875D, 1.0D, f1, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.0D, f2, 0.1875D, 0.125D, f3, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(0.875D, f2, 0.1875D, 1.0D, f3, 0.4375D); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + } else if (i1 != 3 && i1 != 1) { + f6 = 0.375F; + f8 = 0.5F; + f7 = 0.4375F; + f9 = 0.5625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.5F; + f8 = 0.625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.625F; + f8 = 0.875F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f6 = 0.125F; + f8 = 0.375F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } else { + rb.uvRotateTop = 1; + f6 = 0.4375F; + f8 = 0.5625F; + f7 = 0.375F; + f9 = 0.5F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.5F; + f9 = 0.625F; + rb.setRenderBounds(f6, f, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.625F; + f9 = 0.875F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + f7 = 0.125F; + f9 = 0.375F; + rb.setRenderBounds(f6, f, f7, f8, f1, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + rb.setRenderBounds(f6, f2, f7, f8, f3, f9); + rb.renderStandardBlock(par1BlockFenceGate, par2, par3, par4); + } + + rb.renderAllFaces = false; + rb.uvRotateTop = 0; + rb.setRenderBounds(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D); + return flag; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index e92d9625..c3350dfd 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -1,8 +1,20 @@ package crazypants.enderio.machine.painter; +import com.enderio.core.common.TileEntityEnder; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.item.IRotatableFacade; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.util.IFacade; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -23,297 +35,291 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.Util; +public class BlockPaintedGlowstone extends BlockEio + implements ITileEntityProvider, IPaintedBlock, IFacade, IRotatableFacade { -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.item.IRotatableFacade; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.util.IFacade; + public static int renderId = -1; -public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade, IRotatableFacade { - - public static int renderId = -1; - - public static BlockPaintedGlowstone create() { - BlockPaintedGlowstone result = new BlockPaintedGlowstone(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private final Random rand = new Random(); - - protected BlockPaintedGlowstone() { - super(ModObject.blockPaintedGlowstone.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); - setCreativeTab(null); - setStepSound(soundTypeGlass); - setHardness(0.7F); - setLightLevel(1.0f); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemPaintedGlowstone.class, ModObject.blockPaintedGlowstone.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedGlowstone.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - public static ItemStack createItemStackForSourceBlock(Block block, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedGlowstone, 1, damage); - PainterUtil.setSourceBlock(result, block, damage); - return result; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().colorMultiplier(world, x, y, z); - } + public static BlockPaintedGlowstone create() { + BlockPaintedGlowstone result = new BlockPaintedGlowstone(); + result.init(); + return result; } - return super.colorMultiplier(world, x, y, z); - } - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; + private IIcon lastRemovedComponetIcon = null; - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + private final Random rand = new Random(); + + protected BlockPaintedGlowstone() { + super(ModObject.blockPaintedGlowstone.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); + setCreativeTab(null); + setStepSound(soundTypeGlass); + setHardness(0.7F); + setLightLevel(1.0f); } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + @Override + protected void init() { + GameRegistry.registerBlock( + this, BlockItemPaintedGlowstone.class, ModObject.blockPaintedGlowstone.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedGlowstone.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block block, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedGlowstone, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } } - } + return super.colorMultiplier(world, x, y, z); } - return true; - } + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedBlock(); - } - - @Override - public boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - int oldMeta = tef.getSourceBlockMetadata(); - int newMeta = PainterUtil.rotateFacadeMetadata(tef.getSourceBlock(), oldMeta, axis); - if(oldMeta != newMeta) { - tef.setSourceBlockMetadata(newMeta); - world.markBlockForUpdate(x, y, z); - tef.markDirty(); + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + } + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); return true; - } - } - return false; - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef != null) { - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); - } - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - public int getRenderType() { - return renderId; - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(Blocks.glowstone, BlockPaintedGlowstone.this); - MinecraftForge.EVENT_BUS.register(this); - } - - @Override - public boolean isValidPaintSource(ItemStack paintSource) { - return super.isValidPaintSource(paintSource) && Util.getBlockFromItemId(paintSource).isOpaqueCube(); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - - if (paintSource.getItem() == Item.getItemFromBlock(Blocks.glowstone)) { - ItemStack stack = new ItemStack(Blocks.glowstone); - stack.stackTagCompound = new NBTTagCompound(); - String tagName = "wasPainted"; - stack.stackTagCompound.setBoolean(tagName, true); - return new ResultStack[] { new ResultStack(stack) }; - } - - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; - } - - @SubscribeEvent - public void onTooltip(ItemTooltipEvent event) { - if (event.itemStack != null && Block.getBlockFromItem(event.itemStack.getItem()) == Blocks.glowstone && event.itemStack.stackTagCompound != null) { - if (event.itemStack.stackTagCompound.getBoolean("wasPainted")) { - event.toolTip.add(EnderIO.lang.localize("painter.tooltip.wasPainted")); + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } } - } + return true; } - } - @Override - public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - return tef.getBlockMetadata(); + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); } - return 0; - } - @Override - public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IPaintableTileEntity) { - Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); - if (sourceBlock != null) { - return sourceBlock; - } + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; } - return this; - } - @Override - public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacade(world, x, y, z, side.ordinal()); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } - @Override - public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacadeMetadata(world, x, y, z, side.ordinal()); - } + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); + } - @Override - public boolean supportsVisualConnections() { - return true; - } + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + public boolean tryRotateFacade(World world, int x, int y, int z, ForgeDirection axis) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + int oldMeta = tef.getSourceBlockMetadata(); + int newMeta = PainterUtil.rotateFacadeMetadata(tef.getSourceBlock(), oldMeta, axis); + if (oldMeta != newMeta) { + tef.setSourceBlockMetadata(newMeta); + world.markBlockForUpdate(x, y, z); + tef.markDirty(); + return true; + } + } + return false; + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef != null) { + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); + } + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + public int getRenderType() { + return renderId; + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.glowstone, BlockPaintedGlowstone.this); + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public boolean isValidPaintSource(ItemStack paintSource) { + return super.isValidPaintSource(paintSource) + && Util.getBlockFromItemId(paintSource).isOpaqueCube(); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + + if (paintSource.getItem() == Item.getItemFromBlock(Blocks.glowstone)) { + ItemStack stack = new ItemStack(Blocks.glowstone); + stack.stackTagCompound = new NBTTagCompound(); + String tagName = "wasPainted"; + stack.stackTagCompound.setBoolean(tagName, true); + return new ResultStack[] {new ResultStack(stack)}; + } + + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + + @SubscribeEvent + public void onTooltip(ItemTooltipEvent event) { + if (event.itemStack != null + && Block.getBlockFromItem(event.itemStack.getItem()) == Blocks.glowstone + && event.itemStack.stackTagCompound != null) { + if (event.itemStack.stackTagCompound.getBoolean("wasPainted")) { + event.toolTip.add(EnderIO.lang.localize("painter.tooltip.wasPainted")); + } + } + } + } + + @Override + public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + return tef.getBlockMetadata(); + } + return 0; + } + + @Override + public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); + if (sourceBlock != null) { + return sourceBlock; + } + } + return this; + } + + @Override + public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacade(world, x, y, z, side.ordinal()); + } + + @Override + public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacadeMetadata(world, x, y, z, side.ordinal()); + } + + @Override + public boolean supportsVisualConnections() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 3810a1ad..00612c04 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.ITileEntityProvider; @@ -22,256 +28,257 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, IPaintedBlock { - private IIcon lastRemovedComponetIcon = null; + private IIcon lastRemovedComponetIcon = null; - private Random rand = new Random(); + private Random rand = new Random(); - private final boolean isDouble; + private final boolean isDouble; - public BlockPaintedSlab(boolean isDouble) { - super(isDouble, Material.rock); - this.isDouble = isDouble; - setCreativeTab(null); - setBlockName(ModObject.blockPaintedSlab.unlocalisedName + (isDouble ? "Double" : "")); - setHardness(0.5F); - setResistance(5.0F); - if(!isDouble) { - useNeighborBrightness = true; - } - } - - public void init() { - // This is required so it is assigned prior to the BlockItem being - // registered. - if(isDouble) { - GameRegistry.registerBlock(this, BlockItemPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName + "TileEntity"); - } else { - GameRegistry.registerBlock(this, BlockItemPaintedSlab.class, ModObject.blockPaintedSlab.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedSlab.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - } - - public static ItemStack createItemStackForSourceBlock(Block source, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedSlab, 1, 0); - PainterUtil.setSourceBlock(result, source, damage); - return result; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); - } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + public BlockPaintedSlab(boolean isDouble) { + super(isDouble, Material.rock); + this.isDouble = isDouble; + setCreativeTab(null); + setBlockName(ModObject.blockPaintedSlab.unlocalisedName + (isDouble ? "Double" : "")); + setHardness(0.5F); + setResistance(5.0F); + if (!isDouble) { + useNeighborBrightness = true; } - } } - return true; - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedSlab(); - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z)); - } - - } - return super.getLightOpacity(world, x, y, z); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - Block b = PainterUtil.getSourceBlock(stack); - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - world.markBlockForUpdate(x, y, z); - super.onBlockPlacedBy(world, x, y, z, player, stack); - } - - /** - * Remove the tile entity too. - */ - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && !player.capabilities.isCreativeMode) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedSlab && !((TileEntityPaintedSlab) te).isConvertingToFullBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - for (int i = 0; i < super.quantityDropped(null); i++) { - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - dropBlockAsItem(world, x, y, z, itemStack); + public void init() { + // This is required so it is assigned prior to the BlockItem being + // registered. + if (isDouble) { + GameRegistry.registerBlock( + this, BlockItemPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedSlab.class, ModObject.blockPaintedDoubleSlab.unlocalisedName + "TileEntity"); + } else { + GameRegistry.registerBlock(this, BlockItemPaintedSlab.class, ModObject.blockPaintedSlab.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedSlab.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockPainter.unlocalisedName, new PainterTemplate()); } - } } - return super.removedByPlayer(world, player, x, y, z, false); - } - @Override - public String func_150002_b(int var1) { - return getUnlocalizedName(); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - PaintedBlockAccessWrapper ba = new PaintedBlockAccessWrapper(world); - return tef.getSourceBlock().colorMultiplier(ba, x, y, z); - } + public static ItemStack createItemStackForSourceBlock(Block source, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedSlab, 1, 0); + PainterUtil.setSourceBlock(result, source, damage); + return result; } - return super.colorMultiplier(world, x, y, z); - } - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(Blocks.wooden_slab, Blocks.stone_slab, EnderIO.blockPaintedDoubleSlab, BlockPaintedSlab.this); + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + } + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; } @Override - public boolean isValidTarget(ItemStack target) { - if(target == null) { - return false; - } - Block blk = Block.getBlockFromItem(target.getItem()); - return blk instanceof BlockSlab; + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; } - } + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedSlab(); + } + + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return Math.min( + super.getLightOpacity(world, x, y, z), + tef.getSourceBlock().getLightOpacity(world, x, y, z)); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + Block b = PainterUtil.getSourceBlock(stack); + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + /** + * Remove the tile entity too. + */ + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + if (!world.isRemote && !player.capabilities.isCreativeMode) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedSlab && !((TileEntityPaintedSlab) te).isConvertingToFullBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + for (int i = 0; i < super.quantityDropped(null); i++) { + ItemStack itemStack = + createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + dropBlockAsItem(world, x, y, z, itemStack); + } + } + } + return super.removedByPlayer(world, player, x, y, z, false); + } + + @Override + public String func_150002_b(int var1) { + return getUnlocalizedName(); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + PaintedBlockAccessWrapper ba = new PaintedBlockAccessWrapper(world); + return tef.getSourceBlock().colorMultiplier(ba, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.wooden_slab, Blocks.stone_slab, EnderIO.blockPaintedDoubleSlab, BlockPaintedSlab.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + + @Override + public boolean isValidTarget(ItemStack target) { + if (target == null) { + return false; + } + Block blk = Block.getBlockFromItem(target.getItem()); + return blk instanceof BlockSlab; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java index cb9e28a7..25709622 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedStair.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.block.ITileEntityProvider; @@ -21,243 +27,238 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedStair extends BlockStairs implements ITileEntityProvider, IPaintedBlock { - public static BlockPaintedStair create() { - BlockPaintedStair result = new BlockPaintedStair(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private Random rand = new Random(); - - protected BlockPaintedStair() { - super(Blocks.stone, 0); - setCreativeTab(null); - setBlockName(ModObject.blockPaintedStair.unlocalisedName); - setLightOpacity(0); - } - - private void init() { - GameRegistry.registerBlock(this, BlockItemPaintedStair.class, ModObject.blockPaintedStair.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedStair.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - public static ItemStack createItemStackForSourceBlock(Block block, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedStair, 1, damage); - PainterUtil.setSourceBlock(result, block, damage); - return result; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + public static BlockPaintedStair create() { + BlockPaintedStair result = new BlockPaintedStair(); + result.init(); + return result; } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + private IIcon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + protected BlockPaintedStair() { + super(Blocks.stone, 0); + setCreativeTab(null); + setBlockName(ModObject.blockPaintedStair.unlocalisedName); + setLightOpacity(0); + } + + private void init() { + GameRegistry.registerBlock(this, BlockItemPaintedStair.class, ModObject.blockPaintedStair.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedStair.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block block, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedStair, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); } - } - } - return true; - - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - int meta = world.getBlockMetadata(x, y, z); - boolean flipped = ((meta & 4) != 0); - return ((meta & 3) + side.ordinal() == 5) || (side == ForgeDirection.UP && flipped); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedBlock(); - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity()); - } - - } - return super.getLightOpacity(world, x, y, z); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - - Block b = PainterUtil.getSourceBlock(stack); - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - world.markBlockForUpdate(x, y, z); - super.onBlockPlacedBy(world, x, y, z, player, stack); - } - - /** - * Remove the tile entity too. - */ - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - } else { - System.out.println("dropBlockAsItem_do: No tile entity."); - } - - } - - world.removeTileEntity(x, y, z); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } - - public final class PainterTemplate extends BasicPainterTemplate { - - @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if(paintSource == null) { - return new ResultStack[0]; - } - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; } @Override - public boolean isValidTarget(ItemStack target) { - if(target == null) { - return false; - } - Block blk = Block.getBlockFromItem(target.getItem()); - return blk instanceof BlockStairs; + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; } - } + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + int meta = world.getBlockMetadata(x, y, z); + boolean flipped = ((meta & 4) != 0); + return ((meta & 3) + side.ordinal() == 5) || (side == ForgeDirection.UP && flipped); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:conduitConnector"); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return Math.min( + super.getLightOpacity(world, x, y, z), + tef.getSourceBlock().getLightOpacity()); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + + Block b = PainterUtil.getSourceBlock(stack); + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + super.onBlockPlacedBy(world, x, y, z, player, stack); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + public final class PainterTemplate extends BasicPainterTemplate { + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + + @Override + public boolean isValidTarget(ItemStack target) { + if (target == null) { + return false; + } + Block blk = Block.getBlockFromItem(target.getItem()); + return blk instanceof BlockStairs; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java index d439496f..05d1939e 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedWall.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.painter; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.MachineRecipeRegistry; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.ITileEntityProvider; @@ -20,250 +26,247 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.MachineRecipeRegistry; public class BlockPaintedWall extends BlockWall implements ITileEntityProvider, IPaintedBlock { - public static BlockPaintedWall create() { - BlockPaintedWall result = new BlockPaintedWall(); - result.init(); - return result; - } - - private IIcon lastRemovedComponetIcon = null; - - private Random rand = new Random(); - - public BlockPaintedWall() { - super(Blocks.cobblestone); - setCreativeTab(null); - setBlockName(ModObject.blockPaintedWall.unlocalisedName); - } - - private void init() { - GameRegistry.registerBlock(this, BlockItemPaintedWall.class, ModObject.blockPaintedWall.unlocalisedName); - GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedWall.unlocalisedName + "TileEntity"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); - } - - public static ItemStack createItemStackForSourceBlock(Block id, int damage) { - ItemStack result = new ItemStack(EnderIO.blockPaintedWall, 1, damage); - PainterUtil.setSourceBlock(result, id, damage); - return result; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World world, MovingObjectPosition target, - EffectRenderer effectRenderer) { - IIcon tex = null; - - TileEntityPaintedBlock cb = (TileEntityPaintedBlock) - world.getTileEntity(target.blockX, target.blockY, target.blockZ); - Block b = cb.getSourceBlock(); - if(b != null) { - tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); + public static BlockPaintedWall create() { + BlockPaintedWall result = new BlockPaintedWall(); + result.init(); + return result; } - if(tex == null) { - tex = blockIcon; - } - lastRemovedComponetIcon = tex; - addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, - target.blockZ, target.sideHit, tex); - return true; - } - @Override - @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, int x, int y, int z, int - meta, EffectRenderer effectRenderer) { - IIcon tex = lastRemovedComponetIcon; - byte b0 = 4; - for (int j1 = 0; j1 < b0; ++j1) { - for (int k1 = 0; k1 < b0; ++k1) { - for (int l1 = 0; l1 < b0; ++l1) { - double d0 = x + (j1 + 0.5D) / b0; - double d1 = y + (k1 + 0.5D) / b0; - double d2 = z + (l1 + 0.5D) / b0; - int i2 = rand.nextInt(6); - EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D, - d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z); - fx.setParticleIcon(tex); - effectRenderer.addEffect(fx); + private IIcon lastRemovedComponetIcon = null; + + private Random rand = new Random(); + + public BlockPaintedWall() { + super(Blocks.cobblestone); + setCreativeTab(null); + setBlockName(ModObject.blockPaintedWall.unlocalisedName); + } + + private void init() { + GameRegistry.registerBlock(this, BlockItemPaintedWall.class, ModObject.blockPaintedWall.unlocalisedName); + GameRegistry.registerTileEntity( + TileEntityPaintedBlock.class, ModObject.blockPaintedWall.unlocalisedName + "TileEntity"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); + } + + public static ItemStack createItemStackForSourceBlock(Block id, int damage) { + ItemStack result = new ItemStack(EnderIO.blockPaintedWall, 1, damage); + PainterUtil.setSourceBlock(result, id, damage); + return result; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); + } + + @SideOnly(Side.CLIENT) + @Override + public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { + IIcon tex = null; + + TileEntityPaintedBlock cb = + (TileEntityPaintedBlock) world.getTileEntity(target.blockX, target.blockY, target.blockZ); + Block b = cb.getSourceBlock(); + if (b != null) { + tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata()); } - } - } - return true; - - } - - @SideOnly(Side.CLIENT) - private void addBlockHitEffects(World world, EffectRenderer effectRenderer, - int x, int y, int z, int side, IIcon tex) { - float f = 0.1F; - double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() - - getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX(); - double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() - - getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY(); - double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() - - getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ(); - if(side == 0) { - d1 = y + getBlockBoundsMinY() - f; - } else if(side == 1) { - d1 = y + getBlockBoundsMaxY() + f; - } else if(side == 2) { - d2 = z + getBlockBoundsMinZ() - f; - } else if(side == 3) { - d2 = z + getBlockBoundsMaxZ() + f; - } else if(side == 4) { - d0 = x + getBlockBoundsMinX() - f; - } else if(side == 5) { - d0 = x + getBlockBoundsMaxX() + f; - } - EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, - 0.0D, this, side, 0); - digFX.applyColourMultiplier(x, y, - z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); - digFX.setParticleIcon(tex); - effectRenderer.addEffect(digFX); - } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return Math.min(super.getLightOpacity(world, x, y, z), tef.getSourceBlock().getLightOpacity(world, x, y, z)); - } - } - return super.getLightOpacity(world, x, y, z); - } - - @Override - public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { - Block id = world.getBlock(x, y, z); - if(id == this) { - return true; - } - return super.canPlaceTorchOnTop(world, x, y, z); - } - - @Override - public boolean canConnectWallTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - Block l = par1IBlockAccess.getBlock(par2, par3, par4); - if(l == EnderIO.blockPaintedFenceGate) { - return true; - } - return super.canConnectWallTo(par1IBlockAccess, par2, par3, par4); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } - } - return Blocks.anvil.getIcon(world, x, y, z, blockSide); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityPaintedBlock(); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - int id = -1; - Block b = PainterUtil.getSourceBlock(stack); - - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - tef.setSourceBlock(b); - tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - } - world.markBlockForUpdate(x, y, z); - } - - /** - * Remove the tile entity too. - */ - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - } else { - System.out.println("dropBlockAsItem_do: No tile entity."); - } - - } - - world.removeTileEntity(x, y, z); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - if(tef.getSourceBlock() != null) { - return tef.getSourceBlock().colorMultiplier(world, x, y, z); - } - } - return super.colorMultiplier(world, x, y, z); - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(Blocks.cobblestone_wall, BlockPaintedWall.this); + if (tex == null) { + tex = blockIcon; + } + lastRemovedComponetIcon = tex; + addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY, target.blockZ, target.sideHit, tex); + return true; } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + IIcon tex = lastRemovedComponetIcon; + byte b0 = 4; + for (int j1 = 0; j1 < b0; ++j1) { + for (int k1 = 0; k1 < b0; ++k1) { + for (int l1 = 0; l1 < b0; ++l1) { + double d0 = x + (j1 + 0.5D) / b0; + double d1 = y + (k1 + 0.5D) / b0; + double d2 = z + (l1 + 0.5D) / b0; + int i2 = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX( + world, d0, d1, d2, d0 - x - 0.5D, d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0) + .applyColourMultiplier(x, y, z); + fx.setParticleIcon(tex); + effectRenderer.addEffect(fx); + } + } + } + return true; } - } + @SideOnly(Side.CLIENT) + private void addBlockHitEffects( + World world, EffectRenderer effectRenderer, int x, int y, int z, int side, IIcon tex) { + float f = 0.1F; + double d0 = x + + rand.nextDouble() * (getBlockBoundsMaxX() - getBlockBoundsMinX() - f * 2.0F) + + f + + getBlockBoundsMinX(); + double d1 = y + + rand.nextDouble() * (getBlockBoundsMaxY() - getBlockBoundsMinY() - f * 2.0F) + + f + + getBlockBoundsMinY(); + double d2 = z + + rand.nextDouble() * (getBlockBoundsMaxZ() - getBlockBoundsMinZ() - f * 2.0F) + + f + + getBlockBoundsMinZ(); + if (side == 0) { + d1 = y + getBlockBoundsMinY() - f; + } else if (side == 1) { + d1 = y + getBlockBoundsMaxY() + f; + } else if (side == 2) { + d2 = z + getBlockBoundsMinZ() - f; + } else if (side == 3) { + d2 = z + getBlockBoundsMaxZ() + f; + } else if (side == 4) { + d0 = x + getBlockBoundsMinX() - f; + } else if (side == 5) { + d0 = x + getBlockBoundsMaxX() + f; + } + EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, this, side, 0); + digFX.applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F); + digFX.setParticleIcon(tex); + effectRenderer.addEffect(digFX); + } + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return Math.min( + super.getLightOpacity(world, x, y, z), + tef.getSourceBlock().getLightOpacity(world, x, y, z)); + } + } + return super.getLightOpacity(world, x, y, z); + } + + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + Block id = world.getBlock(x, y, z); + if (id == this) { + return true; + } + return super.canPlaceTorchOnTop(world, x, y, z); + } + + @Override + public boolean canConnectWallTo(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + Block l = par1IBlockAccess.getBlock(par2, par3, par4); + if (l == EnderIO.blockPaintedFenceGate) { + return true; + } + return super.canConnectWallTo(par1IBlockAccess, par2, par3, par4); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } + } + return Blocks.anvil.getIcon(world, x, y, z, blockSide); + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityPaintedBlock(); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + int id = -1; + Block b = PainterUtil.getSourceBlock(stack); + + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + tef.setSourceBlock(b); + tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + } + world.markBlockForUpdate(x, y, z); + } + + /** + * Remove the tile entity too. + */ + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + + } else { + System.out.println("dropBlockAsItem_do: No tile entity."); + } + } + + world.removeTileEntity(x, y, z); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; // need to do custom dropping to maintain source metadata + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if (tef.getSourceBlock() != null) { + return tef.getSourceBlock().colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(Blocks.cobblestone_wall, BlockPaintedWall.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java b/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java index e74073ac..72a991d7 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java @@ -1,77 +1,76 @@ package crazypants.enderio.machine.painter; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class BlockPainter extends AbstractMachineBlock { - public static final String KEY_SOURCE_BLOCK_ID = "sourceBlockId"; - public static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; + public static final String KEY_SOURCE_BLOCK_ID = "sourceBlockId"; + public static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; - public static BlockPainter create() { - BlockPainter ppainter = new BlockPainter(); - ppainter.init(); - return ppainter; - } - - private IIcon invisibleIcon; - - private BlockPainter() { - super(ModObject.blockPainter, TileEntityPainter.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityPainter) { - return new PainterContainer(player.inventory, (TileEntityPainter) te); + public static BlockPainter create() { + BlockPainter ppainter = new BlockPainter(); + ppainter.init(); + return ppainter; } - return null; - } - @Override - @SideOnly(Side.CLIENT) - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - return new GuiPainter(player.inventory, (TileEntityPainter) te); - } + private IIcon invisibleIcon; - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_PAINTER; - } - - public IIcon getInvisibleIcon() { - return invisibleIcon; - } - - public void setInvisibleIcon(IIcon invisibleIcon) { - this.invisibleIcon = invisibleIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - invisibleIcon = iIconRegister.registerIcon("enderio:invisblePaint"); - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:painterFrontOn"; + private BlockPainter() { + super(ModObject.blockPainter, TileEntityPainter.class); } - return "enderio:painterFrontOff"; - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityPainter) { + return new PainterContainer(player.inventory, (TileEntityPainter) te); + } + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + return new GuiPainter(player.inventory, (TileEntityPainter) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_PAINTER; + } + + public IIcon getInvisibleIcon() { + return invisibleIcon; + } + + public void setInvisibleIcon(IIcon invisibleIcon) { + this.invisibleIcon = invisibleIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + invisibleIcon = iIconRegister.registerIcon("enderio:invisblePaint"); + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:painterFrontOn"; + } + return "enderio:painterFrontOff"; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index 2ce89b81..48847c17 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -1,58 +1,53 @@ package crazypants.enderio.machine.painter; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiPainter extends GuiPoweredMachineBase { - public GuiPainter(InventoryPlayer par1InventoryPlayer, TileEntityPainter te) { - super(te, new PainterContainer(par1InventoryPlayer, te), "painter"); + public GuiPainter(InventoryPlayer par1InventoryPlayer, TileEntityPainter te) { + super(te, new PainterContainer(par1InventoryPlayer, te), "painter"); - addProgressTooltip(88, 34, 24, 16); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int k = guiLeft; - int l = guiTop; - - drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - - if(shouldRenderProgress()) { - int scaled = getProgressScaled(24); - drawTexturedModalRect(k + 88, l + 34, 176, 14, scaled + 1, 16); + addProgressTooltip(88, 34, 24, 16); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int k = guiLeft; + int l = guiTop; - @Override - protected boolean showRecipeButton() { - return false; - } + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - @Override - protected void renderSlotHighlight(int slot, Vector4f col) { - if(getTileEntity().getSlotDefinition().isOutputSlot(slot)) { - renderSlotHighlight(col, 117,31,24,24); - } else if(slot != 1) { - super.renderSlotHighlight(slot, col); + if (shouldRenderProgress()) { + int scaled = getProgressScaled(24); + drawTexturedModalRect(k + 88, l + 34, 176, 14, scaled + 1, 16); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - } + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + protected void renderSlotHighlight(int slot, Vector4f col) { + if (getTileEntity().getSlotDefinition().isOutputSlot(slot)) { + renderSlotHighlight(col, 117, 31, 24, 24); + } else if (slot != 1) { + super.renderSlotHighlight(slot, col); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/IPaintableTileEntity.java b/src/main/java/crazypants/enderio/machine/painter/IPaintableTileEntity.java index da7a4855..1b5b7eff 100644 --- a/src/main/java/crazypants/enderio/machine/painter/IPaintableTileEntity.java +++ b/src/main/java/crazypants/enderio/machine/painter/IPaintableTileEntity.java @@ -4,12 +4,11 @@ import net.minecraft.block.Block; public interface IPaintableTileEntity { - void setSourceBlockMetadata(int sourceBlockMetadata); + void setSourceBlockMetadata(int sourceBlockMetadata); - int getSourceBlockMetadata(); + int getSourceBlockMetadata(); - void setSourceBlock(Block sourceBlock); - - Block getSourceBlock(); + void setSourceBlock(Block sourceBlock); + Block getSourceBlock(); } diff --git a/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java index f34f374f..9feec2b8 100644 --- a/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/IPaintedBlock.java @@ -1,6 +1,4 @@ package crazypants.enderio.machine.painter; -//Marker interface to prevent a painted block being used as a paint source -public interface IPaintedBlock { - -} +// Marker interface to prevent a painted block being used as a paint source +public interface IPaintedBlock {} diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintSourceParser.java b/src/main/java/crazypants/enderio/machine/painter/PaintSourceParser.java index bfa160e9..cbb1c431 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintSourceParser.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintSourceParser.java @@ -1,144 +1,141 @@ package crazypants.enderio.machine.painter; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.DefaultHandler; - import crazypants.enderio.Log; import crazypants.enderio.config.Config; import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; public class PaintSourceParser extends DefaultHandler { - private static final String CORE_FILE_NAME = "PainterPaintSources_Core.xml"; - private static final String CUSTOM_FILE_NAME = "PainterPaintSources_User.xml"; + private static final String CORE_FILE_NAME = "PainterPaintSources_Core.xml"; + private static final String CUSTOM_FILE_NAME = "PainterPaintSources_User.xml"; - public static void loadConfig() { - File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); + public static void loadConfig() { + File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); - String defaultVals = null; - try { - defaultVals = RecipeConfig.readRecipes(coreFile, CORE_FILE_NAME, true); - } catch (IOException e) { - Log.error("Could not load painter lists " + coreFile + " from EnderIO jar: " + e.getMessage()); - e.printStackTrace(); - return; - } - if(!coreFile.exists()) { - Log.error("Could not load default lists from " + coreFile + " as the file does not exist."); - return; - } - - try { - parse(defaultVals); - } catch (Exception e) { - Log.error("Could not parse default lists from " + coreFile + ": " + e); - } - - File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); - String userConfigStr = null; - try { - userConfigStr = RecipeConfig.readRecipes(userFile, CUSTOM_FILE_NAME, false); - if(userConfigStr == null || userConfigStr.trim().length() == 0) { - Log.error("Empty user config file: " + userFile.getAbsolutePath()); - } else { - parse(userConfigStr); - } - } catch (Exception e) { - Log.error("Could not load user defined painter lists from file: " + CUSTOM_FILE_NAME); - e.printStackTrace(); - } - } - - public static void parse(String str) throws Exception { - StringReader reader = new StringReader(str); - InputSource is = new InputSource(reader); - try { - parse(is); - } finally { - reader.close(); - } - - } - - private static void parse(InputSource is) throws Exception { - PaintSourceParser parser = new PaintSourceParser(); - - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setNamespaceAware(true); - SAXParser saxParser = spf.newSAXParser(); - XMLReader xmlReader = saxParser.getXMLReader(); - xmlReader.setContentHandler(parser); - xmlReader.parse(is); - } - - public static final String ELEMENT_WHITELIST = "whitelist"; - public static final String ELEMENT_BLACKLIST = "blacklist"; - public static final String ELEMENT_ITEM_STACK = "itemStack"; - - private static final String AT_REMOVE = "remove"; - - private boolean isWhitelist = false; - private boolean isBlacklist = false; - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - if(ELEMENT_WHITELIST.equals(localName)) { - isWhitelist = true; - isBlacklist = false; - return; - } - if(ELEMENT_BLACKLIST.equals(localName)) { - isWhitelist = false; - isBlacklist = true; - return; - } - if(ELEMENT_ITEM_STACK.equals(localName)) { - if(!isWhitelist && !isBlacklist) { - Log.warn("PaintSourceParser: Item stack found outside of whitlist/blacklist elements. It will be ignored"); - return; - } - RecipeInput stack = RecipeConfigParser.getItemStack(attributes); - if(stack == null) { - return; - } - boolean isRemove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); - if(isBlacklist) { - if(isRemove) { - PaintSourceValidator.instance.removeFromBlackList(stack); - } else { - PaintSourceValidator.instance.addToBlacklist(stack); + String defaultVals = null; + try { + defaultVals = RecipeConfig.readRecipes(coreFile, CORE_FILE_NAME, true); + } catch (IOException e) { + Log.error("Could not load painter lists " + coreFile + " from EnderIO jar: " + e.getMessage()); + e.printStackTrace(); + return; } - } else { - if(isRemove) { - PaintSourceValidator.instance.removeFromWhitelist(stack); - } else { - PaintSourceValidator.instance.addToWhitelist(stack); + if (!coreFile.exists()) { + Log.error("Could not load default lists from " + coreFile + " as the file does not exist."); + return; } - } - } - } - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if(ELEMENT_WHITELIST.equals(localName)) { - isWhitelist = false; - return; + try { + parse(defaultVals); + } catch (Exception e) { + Log.error("Could not parse default lists from " + coreFile + ": " + e); + } + + File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); + String userConfigStr = null; + try { + userConfigStr = RecipeConfig.readRecipes(userFile, CUSTOM_FILE_NAME, false); + if (userConfigStr == null || userConfigStr.trim().length() == 0) { + Log.error("Empty user config file: " + userFile.getAbsolutePath()); + } else { + parse(userConfigStr); + } + } catch (Exception e) { + Log.error("Could not load user defined painter lists from file: " + CUSTOM_FILE_NAME); + e.printStackTrace(); + } } - if(ELEMENT_BLACKLIST.equals(localName)) { - isBlacklist = false; - return; + + public static void parse(String str) throws Exception { + StringReader reader = new StringReader(str); + InputSource is = new InputSource(reader); + try { + parse(is); + } finally { + reader.close(); + } + } + + private static void parse(InputSource is) throws Exception { + PaintSourceParser parser = new PaintSourceParser(); + + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setNamespaceAware(true); + SAXParser saxParser = spf.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setContentHandler(parser); + xmlReader.parse(is); + } + + public static final String ELEMENT_WHITELIST = "whitelist"; + public static final String ELEMENT_BLACKLIST = "blacklist"; + public static final String ELEMENT_ITEM_STACK = "itemStack"; + + private static final String AT_REMOVE = "remove"; + + private boolean isWhitelist = false; + private boolean isBlacklist = false; + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (ELEMENT_WHITELIST.equals(localName)) { + isWhitelist = true; + isBlacklist = false; + return; + } + if (ELEMENT_BLACKLIST.equals(localName)) { + isWhitelist = false; + isBlacklist = true; + return; + } + if (ELEMENT_ITEM_STACK.equals(localName)) { + if (!isWhitelist && !isBlacklist) { + Log.warn( + "PaintSourceParser: Item stack found outside of whitlist/blacklist elements. It will be ignored"); + return; + } + RecipeInput stack = RecipeConfigParser.getItemStack(attributes); + if (stack == null) { + return; + } + boolean isRemove = RecipeConfigParser.getBooleanValue(AT_REMOVE, attributes, false); + if (isBlacklist) { + if (isRemove) { + PaintSourceValidator.instance.removeFromBlackList(stack); + } else { + PaintSourceValidator.instance.addToBlacklist(stack); + } + } else { + if (isRemove) { + PaintSourceValidator.instance.removeFromWhitelist(stack); + } else { + PaintSourceValidator.instance.addToWhitelist(stack); + } + } + } + } + + @Override + public void endElement(String uri, String localName, String qName) throws SAXException { + if (ELEMENT_WHITELIST.equals(localName)) { + isWhitelist = false; + return; + } + if (ELEMENT_BLACKLIST.equals(localName)) { + isBlacklist = false; + return; + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java index eae0fcaa..ff9b7626 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintSourceValidator.java @@ -1,111 +1,109 @@ package crazypants.enderio.machine.painter; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.Util; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.recipe.RecipeInput; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Util; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.recipe.RecipeInput; - public class PaintSourceValidator { - public static PaintSourceValidator instance = new PaintSourceValidator(); + public static PaintSourceValidator instance = new PaintSourceValidator(); - private boolean listsPopulated = false; - private final List whitelist = new ArrayList(); - private final List blacklist = new ArrayList(); + private boolean listsPopulated = false; + private final List whitelist = new ArrayList(); + private final List blacklist = new ArrayList(); - public boolean isValidSourceDefault(ItemStack paintSource) { - if(paintSource == null) { - return false; - } - Block block = Util.getBlockFromItemId(paintSource); - if(block == null || block instanceof IPaintedBlock) { - return false; - } - if(isBlacklisted(paintSource)) { - return false; - } - if(isWhitelisted(paintSource)) { - return true; - } - if(!Config.allowTileEntitiesAsPaintSource && block instanceof ITileEntityProvider) { - return false; + public boolean isValidSourceDefault(ItemStack paintSource) { + if (paintSource == null) { + return false; + } + Block block = Util.getBlockFromItemId(paintSource); + if (block == null || block instanceof IPaintedBlock) { + return false; + } + if (isBlacklisted(paintSource)) { + return false; + } + if (isWhitelisted(paintSource)) { + return true; + } + if (!Config.allowTileEntitiesAsPaintSource && block instanceof ITileEntityProvider) { + return false; + } + + return block.isOpaqueCube() + || (block.getMaterial().isOpaque() && block.renderAsNormalBlock()) + || block == Blocks.glass; } - return block.isOpaqueCube() || (block.getMaterial().isOpaque() && block.renderAsNormalBlock()) || block == Blocks.glass; - } - - public boolean isWhitelisted(ItemStack paintSource) { - return isInList(paintSource, whitelist); - } - - public boolean isBlacklisted(ItemStack paintSource) { - return isInList(paintSource, blacklist); - } - - public void addToWhitelist(ItemStack input) { - addToWhitelist(new RecipeInput(input, true)); - } - - public void addToWhitelist(RecipeInput input) { - whitelist.add(input); - } - - public void addToBlacklist(ItemStack input) { - addToBlacklist(new RecipeInput(input, true)); - } - - public void addToBlacklist(RecipeInput input) { - blacklist.add(input); - } - - public void removeFromWhitelist(RecipeInput input) { - removeFromList(input, whitelist); - } - - public void removeFromBlackList(RecipeInput input) { - removeFromList(input, blacklist); - } - - protected boolean isInList(ItemStack paintSource, List list) { - if(paintSource == null) { - return false; + public boolean isWhitelisted(ItemStack paintSource) { + return isInList(paintSource, whitelist); } - for (RecipeInput ri : list) { - if(ri != null && ri.isInput(paintSource)) { - return true; - } - } - return false; - } - protected void removeFromList(RecipeInput input, List list) { - ItemStack inStack = input.getInput(); - if(inStack == null) { - return; + public boolean isBlacklisted(ItemStack paintSource) { + return isInList(paintSource, blacklist); } - RecipeInput toRemove = null; - for (RecipeInput in : list) { - if(ItemUtil.areStacksEqual(inStack, in.getInput())) { - toRemove = in; - break; - } - } - if(toRemove != null) { - list.remove(toRemove); - } - } - public void loadConfig() { - PaintSourceParser.loadConfig(); - } + public void addToWhitelist(ItemStack input) { + addToWhitelist(new RecipeInput(input, true)); + } + public void addToWhitelist(RecipeInput input) { + whitelist.add(input); + } + + public void addToBlacklist(ItemStack input) { + addToBlacklist(new RecipeInput(input, true)); + } + + public void addToBlacklist(RecipeInput input) { + blacklist.add(input); + } + + public void removeFromWhitelist(RecipeInput input) { + removeFromList(input, whitelist); + } + + public void removeFromBlackList(RecipeInput input) { + removeFromList(input, blacklist); + } + + protected boolean isInList(ItemStack paintSource, List list) { + if (paintSource == null) { + return false; + } + for (RecipeInput ri : list) { + if (ri != null && ri.isInput(paintSource)) { + return true; + } + } + return false; + } + + protected void removeFromList(RecipeInput input, List list) { + ItemStack inStack = input.getInput(); + if (inStack == null) { + return; + } + RecipeInput toRemove = null; + for (RecipeInput in : list) { + if (ItemUtil.areStacksEqual(inStack, in.getInput())) { + toRemove = in; + break; + } + } + if (toRemove != null) { + list.remove(toRemove); + } + } + + public void loadConfig() { + PaintSourceParser.loadConfig(); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java index 58ff1c3e..77131b5d 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockAccessWrapper.java @@ -1,52 +1,49 @@ package crazypants.enderio.machine.painter; +import com.enderio.core.common.util.IBlockAccessWrapper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import com.enderio.core.common.util.IBlockAccessWrapper; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class PaintedBlockAccessWrapper extends IBlockAccessWrapper { - public PaintedBlockAccessWrapper(IBlockAccess ba) { - super(ba); - } - - @Override - public Block getBlock(int x, int y, int z) { - Block res = super.getBlock(x, y, z); - TileEntity te = getTileEntity(x, y, z); - if(te instanceof IPaintableTileEntity) { - IPaintableTileEntity tcb = (IPaintableTileEntity) te; - Block fac = tcb.getSourceBlock(); - if(fac != null) { - res = fac; - } + public PaintedBlockAccessWrapper(IBlockAccess ba) { + super(ba); } - return res; - } - @Override - @SideOnly(Side.CLIENT) - public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { - return wrapped.getLightBrightnessForSkyBlocks(var1, var2, var3, var4); - } - - @Override - public int getBlockMetadata(int x, int y, int z) { - Block block = super.getBlock(x, y, z); - TileEntity te = getTileEntity(x, y, z); - if(te instanceof IPaintableTileEntity) { - IPaintableTileEntity tcb = (IPaintableTileEntity) te; - Block fac = tcb.getSourceBlock(); - if(fac != null) { - return tcb.getSourceBlockMetadata(); - } + @Override + public Block getBlock(int x, int y, int z) { + Block res = super.getBlock(x, y, z); + TileEntity te = getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + IPaintableTileEntity tcb = (IPaintableTileEntity) te; + Block fac = tcb.getSourceBlock(); + if (fac != null) { + res = fac; + } + } + return res; } - return super.getBlockMetadata(x, y, z); - } -} \ No newline at end of file + @Override + @SideOnly(Side.CLIENT) + public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) { + return wrapped.getLightBrightnessForSkyBlocks(var1, var2, var3, var4); + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + Block block = super.getBlock(x, y, z); + TileEntity te = getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + IPaintableTileEntity tcb = (IPaintableTileEntity) te; + Block fac = tcb.getSourceBlock(); + if (fac != null) { + return tcb.getSourceBlockMetadata(); + } + } + return super.getBlockMetadata(x, y, z); + } +} diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java index fdfb1afd..f0f21e23 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedBlockRenderer.java @@ -1,5 +1,9 @@ package crazypants.enderio.machine.painter; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -8,98 +12,94 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; - public class PaintedBlockRenderer implements ISimpleBlockRenderingHandler { - private int renderId; - private Block defaultBlock; + private int renderId; + private Block defaultBlock; - public PaintedBlockRenderer(int renderId, Block defaultBlock) { - this.renderId = renderId; - this.defaultBlock = defaultBlock; - } - - @Override - public int getRenderId() { - return renderId; - } - - @Override - public void renderInventoryBlock(Block blk, int meta, int modelId, RenderBlocks arg3) { - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(blk, meta); - Tessellator.instance.draw(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess ba, int x, int y, int z, Block block, int arg5, RenderBlocks rb) { - - TileEntity tile = ba.getTileEntity(x, y, z); - if(!(tile instanceof IPaintableTileEntity)) { - return false; - } - IPaintableTileEntity te = (IPaintableTileEntity) tile; - Block srcBlk = te.getSourceBlock(); - if(srcBlk == null) { - srcBlk = defaultBlock; + public PaintedBlockRenderer(int renderId, Block defaultBlock) { + this.renderId = renderId; + this.defaultBlock = defaultBlock; } - IBlockAccess origBa = rb.blockAccess; - try { - rb.blockAccess = new PaintedBlockAccessWrapper(origBa); - if (block.isOpaqueCube() && nonSolidPaintedBlockAround(new BlockCoord(x, y, z), origBa, rb.blockAccess)) { - if (srcBlk == block) { - rb.setRenderAllFaces(true); - rb.renderStandardBlock(srcBlk, x, y, z); - rb.setRenderAllFaces(false); - } else { - rb.renderBlockAllFaces(srcBlk, x, y, z); + @Override + public int getRenderId() { + return renderId; + } + + @Override + public void renderInventoryBlock(Block blk, int meta, int modelId, RenderBlocks arg3) { + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(blk, meta); + Tessellator.instance.draw(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess ba, int x, int y, int z, Block block, int arg5, RenderBlocks rb) { + + TileEntity tile = ba.getTileEntity(x, y, z); + if (!(tile instanceof IPaintableTileEntity)) { + return false; } - } else { - if (srcBlk == block) { - rb.renderStandardBlock(srcBlk, x, y, z); - } else { - rb.renderBlockByRenderType(srcBlk, x, y, z); + IPaintableTileEntity te = (IPaintableTileEntity) tile; + Block srcBlk = te.getSourceBlock(); + if (srcBlk == null) { + srcBlk = defaultBlock; } - } - } catch (Exception e) { - //just in case the paint source wont render safely in this way - rb.setOverrideBlockTexture(IconUtil.errorTexture); - rb.renderStandardBlock(Blocks.stone, x, y, z); - rb.setOverrideBlockTexture(null); - } finally { - rb.blockAccess = origBa; - } - return true; - } + IBlockAccess origBa = rb.blockAccess; + try { + rb.blockAccess = new PaintedBlockAccessWrapper(origBa); + if (block.isOpaqueCube() && nonSolidPaintedBlockAround(new BlockCoord(x, y, z), origBa, rb.blockAccess)) { + if (srcBlk == block) { + rb.setRenderAllFaces(true); + rb.renderStandardBlock(srcBlk, x, y, z); + rb.setRenderAllFaces(false); + } else { + rb.renderBlockAllFaces(srcBlk, x, y, z); + } + } else { + if (srcBlk == block) { + rb.renderStandardBlock(srcBlk, x, y, z); + } else { + rb.renderBlockByRenderType(srcBlk, x, y, z); + } + } + } catch (Exception e) { + // just in case the paint source wont render safely in this way + rb.setOverrideBlockTexture(IconUtil.errorTexture); + rb.renderStandardBlock(Blocks.stone, x, y, z); + rb.setOverrideBlockTexture(null); + } finally { + rb.blockAccess = origBa; + } - /* - * If a non-solid block is painted with a solid block, the renderer would - * think it didn't need to render faces of adjacent blocks that touch it - * because it only sees the paint. - * - * This detects this case, so the renderer can be told to just render all - * faces, even if it thinks it could save some quads. - */ - private boolean nonSolidPaintedBlockAround(BlockCoord bc, IBlockAccess reality, IBlockAccess fake) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord toTest = bc.getLocation(dir); - if (toTest.y >= 0 && toTest.y <= 255 && toTest.getBlock(reality).isOpaqueCube() != toTest.getBlock(fake).isOpaqueCube()) { return true; - } } - return false; - } - @Override - public boolean shouldRender3DInInventory(int arg0) { - return false; - } + /* + * If a non-solid block is painted with a solid block, the renderer would + * think it didn't need to render faces of adjacent blocks that touch it + * because it only sees the paint. + * + * This detects this case, so the renderer can be told to just render all + * faces, even if it thinks it could save some quads. + */ + private boolean nonSolidPaintedBlockAround(BlockCoord bc, IBlockAccess reality, IBlockAccess fake) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord toTest = bc.getLocation(dir); + if (toTest.y >= 0 + && toTest.y <= 255 + && toTest.getBlock(reality).isOpaqueCube() + != toTest.getBlock(fake).isOpaqueCube()) { + return true; + } + } + return false; + } + @Override + public boolean shouldRender3DInInventory(int arg0) { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java index a2a981b1..2059e427 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java @@ -1,111 +1,103 @@ package crazypants.enderio.machine.painter; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.EnderIO; - public class PaintedItemRenderer implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - if(data != null && data.length > 0) { - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.EQUIPPED) { - renderEquipped(item, (RenderBlocks) data[0]); - } else { - renderToInventory(item, (RenderBlocks) data[0]); - } + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - } - - public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { - - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - renderToInventory(item, renderBlocks); - GL11.glPopMatrix(); - - } - - public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - if(item.getItem() == Item.getItemFromBlock(EnderIO.blockPaintedGlowstone) || item.getItem() == Item.getItemFromBlock(EnderIO.blockTravelPlatform)) { - Block block = PainterUtil.getSourceBlock(item); - int meta; - RenderUtil.bindBlockTexture(); - boolean renderOverlay = true; - if(block != null) { - meta = PainterUtil.getSourceBlockMetadata(item); - } else { - block = Block.getBlockFromItem(item.getItem()); - meta = item.getItemDamage(); - renderOverlay = false; - } - renderBlocks.renderBlockAsItem(block, meta, 1.0F); - if(renderOverlay) { - renderOverlay(block, meta, renderBlocks); - } - renderBlocks.clearOverrideBlockTexture(); - return; + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - Block block = PainterUtil.getSourceBlock(item); - if(block != null) { - int meta = PainterUtil.getSourceBlockMetadata(item); - if(block == EnderIO.blockFusedQuartz && meta == 1) { - renderBlocks.setOverrideBlockTexture(EnderIO.blockPainter.getInvisibleIcon()); - } else { - renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, meta)); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + if (data != null && data.length > 0) { + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.EQUIPPED) { + renderEquipped(item, (RenderBlocks) data[0]); + } else { + renderToInventory(item, (RenderBlocks) data[0]); + } + } } - Item i = item.getItem(); - if(i instanceof ItemBlock) { - Block blk = ((ItemBlock) i).field_150939_a; - int meta = item.getItemDamage(); - renderBlocks.renderBlockAsItem(blk, meta, 1.0f); - renderOverlay(blk, meta, renderBlocks); + public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); } - renderBlocks.clearOverrideBlockTexture(); - } + public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + if (item.getItem() == Item.getItemFromBlock(EnderIO.blockPaintedGlowstone) + || item.getItem() == Item.getItemFromBlock(EnderIO.blockTravelPlatform)) { + Block block = PainterUtil.getSourceBlock(item); + int meta; + RenderUtil.bindBlockTexture(); + boolean renderOverlay = true; + if (block != null) { + meta = PainterUtil.getSourceBlockMetadata(item); + } else { + block = Block.getBlockFromItem(item.getItem()); + meta = item.getItemDamage(); + renderOverlay = false; + } + renderBlocks.renderBlockAsItem(block, meta, 1.0F); + if (renderOverlay) { + renderOverlay(block, meta, renderBlocks); + } + renderBlocks.clearOverrideBlockTexture(); + return; + } - protected void renderOverlay(Block block, int meta, RenderBlocks renderBlocks) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + Block block = PainterUtil.getSourceBlock(item); + if (block != null) { + int meta = PainterUtil.getSourceBlockMetadata(item); + if (block == EnderIO.blockFusedQuartz && meta == 1) { + renderBlocks.setOverrideBlockTexture(EnderIO.blockPainter.getInvisibleIcon()); + } else { + renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, meta)); + } + } + Item i = item.getItem(); + if (i instanceof ItemBlock) { - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + Block blk = ((ItemBlock) i).field_150939_a; + int meta = item.getItemDamage(); + renderBlocks.renderBlockAsItem(blk, meta, 1.0f); + renderOverlay(blk, meta, renderBlocks); + } + renderBlocks.clearOverrideBlockTexture(); + } - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); + protected void renderOverlay(Block block, int meta, RenderBlocks renderBlocks) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - RenderUtil.bindItemTexture(); - renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getOverlayIcon()); - renderBlocks.renderBlockAsItem(block, meta, 1.0f); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glPopAttrib(); + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); - } + RenderUtil.bindItemTexture(); + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getOverlayIcon()); + renderBlocks.renderBlockAsItem(block, meta, 1.0f); + GL11.glPopAttrib(); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java b/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java index 1e56a8ee..9c725d03 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java @@ -1,36 +1,35 @@ package crazypants.enderio.machine.painter; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class PainterContainer extends AbstractMachineContainer { - public PainterContainer(InventoryPlayer playerInv, TileEntityPainter te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 67, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 38, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 2, 121, 34) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - } + public PainterContainer(InventoryPlayer playerInv, TileEntityPainter te) { + super(playerInv, te); + } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 67, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 38, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 2, 121, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java index 742aeb81..fa4bf29b 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.painter; +import com.google.common.base.Strings; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.init.Blocks; @@ -8,139 +10,154 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.base.Strings; - -import crazypants.enderio.EnderIO; - public final class PainterUtil { - private PainterUtil() { - } + private PainterUtil() {} - public static boolean isMetadataEquivelent(ItemStack one, ItemStack two) { - if(one == null || two == null) { - return false; + public static boolean isMetadataEquivelent(ItemStack one, ItemStack two) { + if (one == null || two == null) { + return false; + } + return PainterUtil.getSourceBlock(one) == PainterUtil.getSourceBlock(two) + && PainterUtil.getSourceBlockMetadata(one) == PainterUtil.getSourceBlockMetadata(two); } - return PainterUtil.getSourceBlock(one) == PainterUtil.getSourceBlock(two) - && PainterUtil.getSourceBlockMetadata(one) == PainterUtil.getSourceBlockMetadata(two); - } - public static Block getSourceBlock(ItemStack item) { - NBTTagCompound tag = item.getTagCompound(); - return getSourceBlock(tag); - } + public static Block getSourceBlock(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + return getSourceBlock(tag); + } - public static Block getSourceBlock(NBTTagCompound tag) { - if(tag != null) { - String blockId = tag.getString(BlockPainter.KEY_SOURCE_BLOCK_ID); - if(!Strings.isNullOrEmpty(blockId)) { - Block res = (Block) Block.blockRegistry.getObject(blockId); - return res; - } + public static Block getSourceBlock(NBTTagCompound tag) { + if (tag != null) { + String blockId = tag.getString(BlockPainter.KEY_SOURCE_BLOCK_ID); + if (!Strings.isNullOrEmpty(blockId)) { + Block res = (Block) Block.blockRegistry.getObject(blockId); + return res; + } + } + return null; } - return null; - } - public static int getSourceBlockMetadata(ItemStack item) { - NBTTagCompound tag = item.getTagCompound(); - return getSourceBlockMetadata(tag); - } + public static int getSourceBlockMetadata(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + return getSourceBlockMetadata(tag); + } - public static int getSourceBlockMetadata(NBTTagCompound tag) { - if(tag != null) { - return tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_META); + public static int getSourceBlockMetadata(NBTTagCompound tag) { + if (tag != null) { + return tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_META); + } + return 0; } - return 0; - } - public static String getTooltTipText(ItemStack item) { - String sourceName = ""; - Block sourceId = PainterUtil.getSourceBlock(item); - int meta = PainterUtil.getSourceBlockMetadata(item); - if(sourceId != null) { - Item itemFromBlock = Item.getItemFromBlock(sourceId); - if (itemFromBlock != null) { - ItemStack is = new ItemStack(itemFromBlock, 1, meta); - sourceName = is.getDisplayName(); - } + public static String getTooltTipText(ItemStack item) { + String sourceName = ""; + Block sourceId = PainterUtil.getSourceBlock(item); + int meta = PainterUtil.getSourceBlockMetadata(item); + if (sourceId != null) { + Item itemFromBlock = Item.getItemFromBlock(sourceId); + if (itemFromBlock != null) { + ItemStack is = new ItemStack(itemFromBlock, 1, meta); + sourceName = is.getDisplayName(); + } + } + return EnderIO.lang.localize("blockPainter.paintedWith") + " " + sourceName; } - return EnderIO.lang.localize("blockPainter.paintedWith") + " " + sourceName; - } - public static void setSourceBlock(ItemStack item, Block source, int meta) { - NBTTagCompound tag = item.getTagCompound(); - if (tag == null) { - tag = new NBTTagCompound(); - item.setTagCompound(tag); + public static void setSourceBlock(ItemStack item, Block source, int meta) { + NBTTagCompound tag = item.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + item.setTagCompound(tag); + } + setSourceBlock(item.getTagCompound(), source, meta); + if (item.getTagCompound().hasNoTags()) { + item.setTagCompound(null); + } } - setSourceBlock(item.getTagCompound(), source, meta); - if (item.getTagCompound().hasNoTags()) { - item.setTagCompound(null); - } - } - - public static void setSourceBlock(NBTTagCompound tag, Block source, int meta) { - if (tag == null) { - return; - } - String name = Block.blockRegistry.getNameForObject(source); - if(name != null && !name.trim().isEmpty()) { - meta = normalizeFacadeMetadata(source, meta); - tag.setString(BlockPainter.KEY_SOURCE_BLOCK_ID, name); - tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_META, meta); - } - } - - public static ItemStack applyDefaultPaintedState(ItemStack stack) { - setSourceBlock(stack, Blocks.stone, 0); - return stack; - } - public static int normalizeFacadeMetadata(Block facadeID, int facadeMeta) { - if(facadeID instanceof BlockRotatedPillar) { - return facadeMeta & 3; + public static void setSourceBlock(NBTTagCompound tag, Block source, int meta) { + if (tag == null) { + return; + } + String name = Block.blockRegistry.getNameForObject(source); + if (name != null && !name.trim().isEmpty()) { + meta = normalizeFacadeMetadata(source, meta); + tag.setString(BlockPainter.KEY_SOURCE_BLOCK_ID, name); + tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_META, meta); + } } - return facadeMeta; - } - public static int adjustFacadeMetadata(Block facadeID, int facadeMeta, int side) { - if(facadeID instanceof BlockRotatedPillar) { - int dir = facadeMeta & 0xC; - switch (side) { - case 0: - case 1: dir = 0; break; - case 4: - case 5: dir = 4; break; - case 2: - case 3: dir = 8; break; - } - facadeMeta = (facadeMeta & 3) | dir; + public static ItemStack applyDefaultPaintedState(ItemStack stack) { + setSourceBlock(stack, Blocks.stone, 0); + return stack; } - return facadeMeta; - } - public static int rotateFacadeMetadata(Block facadeID, int facadeMeta, ForgeDirection axis) { - if(facadeID instanceof BlockRotatedPillar) { - int dir = facadeMeta & 0xC; - ForgeDirection orientation; - switch (dir) { - case 0: orientation = ForgeDirection.UP; break; - case 4: orientation = ForgeDirection.EAST; break; - case 8: orientation = ForgeDirection.SOUTH; break; - default: return facadeMeta; - } - orientation = orientation.getRotation(axis); - switch (orientation) { - case UP: - case DOWN: dir = 0; break; - case WEST: - case EAST: dir = 4; break; - case NORTH: - case SOUTH: dir = 8; break; - default: return facadeMeta; - } - return (facadeMeta & 3) | dir; + public static int normalizeFacadeMetadata(Block facadeID, int facadeMeta) { + if (facadeID instanceof BlockRotatedPillar) { + return facadeMeta & 3; + } + return facadeMeta; + } + + public static int adjustFacadeMetadata(Block facadeID, int facadeMeta, int side) { + if (facadeID instanceof BlockRotatedPillar) { + int dir = facadeMeta & 0xC; + switch (side) { + case 0: + case 1: + dir = 0; + break; + case 4: + case 5: + dir = 4; + break; + case 2: + case 3: + dir = 8; + break; + } + facadeMeta = (facadeMeta & 3) | dir; + } + return facadeMeta; + } + + public static int rotateFacadeMetadata(Block facadeID, int facadeMeta, ForgeDirection axis) { + if (facadeID instanceof BlockRotatedPillar) { + int dir = facadeMeta & 0xC; + ForgeDirection orientation; + switch (dir) { + case 0: + orientation = ForgeDirection.UP; + break; + case 4: + orientation = ForgeDirection.EAST; + break; + case 8: + orientation = ForgeDirection.SOUTH; + break; + default: + return facadeMeta; + } + orientation = orientation.getRotation(axis); + switch (orientation) { + case UP: + case DOWN: + dir = 0; + break; + case WEST: + case EAST: + dir = 4; + break; + case NORTH: + case SOUTH: + dir = 8; + break; + default: + return facadeMeta; + } + return (facadeMeta & 3) | dir; + } + return facadeMeta; } - return facadeMeta; - } } diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java index c9103b86..aefb5ec6 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java @@ -1,65 +1,65 @@ package crazypants.enderio.machine.painter; +import crazypants.enderio.TileEntityEio; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import crazypants.enderio.TileEntityEio; public class TileEntityPaintedBlock extends TileEntityEio implements IPaintableTileEntity { - private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock"; - private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; - private Block sourceBlock; - private int sourceBlockMetadata; + private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock"; + private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; + private Block sourceBlock; + private int sourceBlockMetadata; - public TileEntityPaintedBlock() { - this.sourceBlock = null; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - String sourceBlockStr = nbtRoot.getString(KEY_SOURCE_BLOCK_ID); - sourceBlock = Block.getBlockFromName(sourceBlockStr); - sourceBlockMetadata = nbtRoot.getInteger(KEY_SOURCE_BLOCK_META); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - if(sourceBlock != null) { - nbtRoot.setString(KEY_SOURCE_BLOCK_ID, Block.blockRegistry.getNameForObject(sourceBlock)); + public TileEntityPaintedBlock() { + this.sourceBlock = null; } - nbtRoot.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); - } - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - updateBlock(); - } + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + String sourceBlockStr = nbtRoot.getString(KEY_SOURCE_BLOCK_ID); + sourceBlock = Block.getBlockFromName(sourceBlockStr); + sourceBlockMetadata = nbtRoot.getInteger(KEY_SOURCE_BLOCK_META); + } - @Override - public Block getSourceBlock() { - return sourceBlock; - } + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + if (sourceBlock != null) { + nbtRoot.setString(KEY_SOURCE_BLOCK_ID, Block.blockRegistry.getNameForObject(sourceBlock)); + } + nbtRoot.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); + } - @Override - public void setSourceBlock(Block sourceBlock) { - this.sourceBlock = sourceBlock; - } + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + updateBlock(); + } - @Override - public int getSourceBlockMetadata() { - return sourceBlockMetadata; - } + @Override + public Block getSourceBlock() { + return sourceBlock; + } - @Override - public void setSourceBlockMetadata(int sourceBlockMetadata) { - this.sourceBlockMetadata = sourceBlockMetadata; - } + @Override + public void setSourceBlock(Block sourceBlock) { + this.sourceBlock = sourceBlock; + } - @Override - public boolean shouldUpdate() { - return false; - } + @Override + public int getSourceBlockMetadata() { + return sourceBlockMetadata; + } + + @Override + public void setSourceBlockMetadata(int sourceBlockMetadata) { + this.sourceBlockMetadata = sourceBlockMetadata; + } + + @Override + public boolean shouldUpdate() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedSlab.java index e28dc00f..f62090d9 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedSlab.java @@ -2,6 +2,5 @@ package crazypants.enderio.machine.painter; public class TileEntityPaintedSlab extends TileEntityPaintedBlock { - boolean isConvertingToFullBlock = false; - + boolean isConvertingToFullBlock = false; } diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java index 17259491..2e772b00 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java @@ -1,105 +1,107 @@ package crazypants.enderio.machine.painter; -import java.util.List; -import java.util.Map; - -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; +import java.util.List; +import java.util.Map; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISidedInventory { -// private static final short MAX_POWER_USE_PER_TICK = 6; + // private static final short MAX_POWER_USE_PER_TICK = 6; - public TileEntityPainter() { - // 0 = input slot, 1 = paint source, 2 = output slot - super(new SlotDefinition(2, 1)); - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - return super.canExtractItem(i, itemstack, j) && PainterUtil.isMetadataEquivelent(itemstack, inventory[2]); - } - - @Override - public String getInventoryName() { - return "Auto Painter"; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public boolean isMachineItemValidForSlot(int i, ItemStack itemStack) { - if(i > 1) { - return false; + public TileEntityPainter() { + // 0 = input slot, 1 = paint source, 2 = output slot + super(new SlotDefinition(2, 1)); } - if(i == 0) { - List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), MachineRecipeInput.create(i, itemStack)); - if(inventory[1] == null) { - return !recipes.isEmpty(); - } else { - for(IMachineRecipe rec : recipes) { - if(rec instanceof BasicPainterTemplate) { - BasicPainterTemplate temp = (BasicPainterTemplate)rec; - if(temp.isValidPaintSource(inventory[1])) { - return true; + + @Override + public boolean canExtractItem(int i, ItemStack itemstack, int j) { + return super.canExtractItem(i, itemstack, j) && PainterUtil.isMetadataEquivelent(itemstack, inventory[2]); + } + + @Override + public String getInventoryName() { + return "Auto Painter"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public boolean isMachineItemValidForSlot(int i, ItemStack itemStack) { + if (i > 1) { + return false; + } + if (i == 0) { + List recipes = MachineRecipeRegistry.instance.getRecipesForInput( + getMachineName(), MachineRecipeInput.create(i, itemStack)); + if (inventory[1] == null) { + return !recipes.isEmpty(); + } else { + for (IMachineRecipe rec : recipes) { + if (rec instanceof BasicPainterTemplate) { + BasicPainterTemplate temp = (BasicPainterTemplate) rec; + if (temp.isValidPaintSource(inventory[1])) { + return true; + } + } + } } - } + return false; } - } - return false; - } - if(inventory[0] == null) { - Map recipes = MachineRecipeRegistry.instance.getRecipesForMachine(getMachineName()); - for(IMachineRecipe rec : recipes.values()) { - if(rec instanceof BasicPainterTemplate) { - BasicPainterTemplate temp = (BasicPainterTemplate)rec; - if(temp.isValidPaintSource(itemStack)) { - return true; - } + if (inventory[0] == null) { + Map recipes = MachineRecipeRegistry.instance.getRecipesForMachine(getMachineName()); + for (IMachineRecipe rec : recipes.values()) { + if (rec instanceof BasicPainterTemplate) { + BasicPainterTemplate temp = (BasicPainterTemplate) rec; + if (temp.isValidPaintSource(itemStack)) { + return true; + } + } + } + return PaintSourceValidator.instance.isValidSourceDefault(itemStack); } - } - return PaintSourceValidator.instance.isValidSourceDefault(itemStack); + return MachineRecipeRegistry.instance.getRecipeForInputs( + getMachineName(), + i == 0 ? MachineRecipeInput.create(0, itemStack) : targetInput(), + i == 1 ? MachineRecipeInput.create(1, itemStack) : paintSource()) + != null; } - return MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), - i == 0 ? MachineRecipeInput.create(0, itemStack) : targetInput(), i == 1 ? MachineRecipeInput.create(1, itemStack) : paintSource()) != null; - } - @Override - public String getMachineName() { - return ModObject.blockPainter.unlocalisedName; - } - - private MachineRecipeInput targetInput() { - return MachineRecipeInput.create(0, inventory[0]); - } - - private MachineRecipeInput paintSource() { - return MachineRecipeInput.create(1, inventory[1]); - } - - @Override - protected int getNumCanMerge(ItemStack itemStack, ItemStack result) { - if (result == null || !result.isItemEqual(inventory[2])) { - // next result is a different item type - return 0; - } else if (result.hasTagCompound() && inventory[2].hasTagCompound()) { - int cookedId = result.getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); - int invId = inventory[2].getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); - if (cookedId != invId) { - // next result has a different source item than the current one - return 0; - } + @Override + public String getMachineName() { + return ModObject.blockPainter.unlocalisedName; } - return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize); - } + private MachineRecipeInput targetInput() { + return MachineRecipeInput.create(0, inventory[0]); + } + + private MachineRecipeInput paintSource() { + return MachineRecipeInput.create(1, inventory[1]); + } + + @Override + protected int getNumCanMerge(ItemStack itemStack, ItemStack result) { + if (result == null || !result.isItemEqual(inventory[2])) { + // next result is a different item type + return 0; + } else if (result.hasTagCompound() && inventory[2].hasTagCompound()) { + int cookedId = result.getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + int invId = inventory[2].getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); + if (cookedId != invId) { + // next result has a different source item than the current one + return 0; + } + } + return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize); + } } diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 5036ab15..02b45872 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -1,8 +1,27 @@ package crazypants.enderio.machine.power; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import com.enderio.core.common.TileEntityEnder; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.ChatUtil; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.enderio.tool.ToolUtil; +import crazypants.enderio.waila.IWailaInfoProvider; import java.util.List; import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,340 +38,335 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ChatUtil; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.enderio.tool.ToolUtil; -import crazypants.enderio.waila.IWailaInfoProvider; - public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider { - public static int renderId = -1; + public static int renderId = -1; - public static BlockCapacitorBank create() { - PacketHandler.INSTANCE.registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketPowerStorage.class, PacketPowerStorage.class, PacketHandler.nextID(), Side.CLIENT); + public static BlockCapacitorBank create() { + PacketHandler.INSTANCE.registerMessage( + PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketPowerStorage.class, PacketPowerStorage.class, PacketHandler.nextID(), Side.CLIENT); - BlockCapacitorBank res = new BlockCapacitorBank(); - res.init(); - return res; - } - - IIcon overlayIcon; - IIcon fillBarIcon; - - private IIcon blockIconInput; - private IIcon blockIconOutput; - private IIcon blockIconLocked; - - protected BlockCapacitorBank() { - super(ModObject.blockCapacitorBank.unlocalisedName, TileCapacitorBank.class); - setHardness(2.0F); - setCreativeTab(null); - } - - @Override - protected void init() { - - GameRegistry.registerBlock(this, BlockItemCapacitorBank.class, name); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + BlockCapacitorBank res = new BlockCapacitorBank(); + res.init(); + return res; } - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAPACITOR_BANK, this); - setLightOpacity(255); - } + IIcon overlayIcon; + IIcon fillBarIcon; - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) { - } + private IIcon blockIconInput; + private IIcon blockIconOutput; + private IIcon blockIconLocked; - @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(PowerDisplayUtil.formatStoredPower(PowerHandlerUtil.getStoredEnergyForItem(itemstack), TileCapacitorBank.BASE_CAP.getMaxEnergyStored())); - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapacitorBank)) { - return false; + protected BlockCapacitorBank() { + super(ModObject.blockCapacitorBank.unlocalisedName, TileCapacitorBank.class); + setHardness(2.0F); + setCreativeTab(null); } - if(ToolUtil.isToolEquipped(entityPlayer)) { + @Override + protected void init() { - ForgeDirection faceHit = ForgeDirection.getOrientation(side); - TileCapacitorBank tcb = (TileCapacitorBank) te; - tcb.toggleIoModeForFace(faceHit); - if(world.isRemote) { - world.markBlockForUpdate(x, y, z); - } else { - world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapacitorBank); - world.markBlockForUpdate(x, y, z); - } - - return true; - } - - return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); - } - - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAPACITOR_BANK, world, x, y, z); - } - return true; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - return new ContainerCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - return new GuiCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); - } - return null; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); - blockIconInput = IIconRegister.registerIcon("enderio:capacitorBankInput"); - blockIconOutput = IIconRegister.registerIcon("enderio:capacitorBankOutput"); - blockIconLocked = IIconRegister.registerIcon("enderio:capacitorBankLocked"); - overlayIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); - fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); - return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { - TileEntity te = ba.getTileEntity(x, y, z); - if(!(te instanceof TileCapacitorBank)) { - return blockIcon; - } - TileCapacitorBank cb = (TileCapacitorBank) te; - IoMode mode = cb.getIoMode(ForgeDirection.values()[side]); - if(mode == null || mode == IoMode.NONE) { - return blockIcon; - } - if(mode == IoMode.PULL) { - return blockIconInput; - } - if(mode == IoMode.PUSH) { - return blockIconOutput; - } - return blockIconLocked; - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - if(world.isRemote) { - return; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank tr = (TileCapacitorBank) te; - int meta = world.getBlockMetadata(x, y, z); - if(meta == 1) { - tr.setCreativeMode(); - } - tr.onBlockAdded(); - } - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - if(world.isRemote) { - return; - } - TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof TileCapacitorBank) { - TileCapacitorBank te = (TileCapacitorBank) tile; - te.onNeighborBlockChange(blockId); - } - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - PowerHandlerUtil.setStoredEnergyForItem(drop, ((TileCapacitorBank)te).doGetEnergyStored()); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - if(world.isRemote) { - return; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank cb = (TileCapacitorBank) te; - cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - if(player instanceof EntityPlayerMP) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord bc = new BlockCoord(x, y, z); - bc = bc.getLocation(dir); - te = world.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapacitorBank) { - if (((TileCapacitorBank) te).isMaxSize()) { - ChatUtil.sendNoSpam((EntityPlayerMP) player, "Capacitor bank is at maximum size"); - } - } + GameRegistry.registerBlock(this, BlockItemCapacitorBank.class, name); + if (teClass != null) { + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); } - } - } - world.markBlockForUpdate(x, y, z); - } - @Override - public int quantityDropped(Random r) { - return 0; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapacitorBank)) { - super.breakBlock(world, x, y, z, par5, par6); - return; - } - TileCapacitorBank cb = (TileCapacitorBank) te; - Util.dropItems(world, cb, x, y, z, true); - } - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapacitorBank)) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - TileCapacitorBank tr = (TileCapacitorBank) te; - if(!tr.isMultiblock()) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAPACITOR_BANK, this); + setLightOpacity(255); } - Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - for (BlockCoord bc : tr.multiblock) { - min.x = Math.min(min.x, bc.x); - max.x = Math.max(max.x, bc.x + 1); - min.y = Math.min(min.y, bc.y); - max.y = Math.max(max.y, bc.y + 1); - min.z = Math.min(min.z, bc.z); - max.z = Math.max(max.z, bc.z + 1); + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) {} + + @Override + public int damageDropped(int par1) { + return par1; } - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - } - @Override - public boolean hasComparatorInputOverride() { - return true; - } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @Override - public int getComparatorInputOverride(World w, int x, int y, int z, int side) { - TileEntity te = w.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - return ((TileCapacitorBank) te).getComparatorOutput(); + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(PowerDisplayUtil.formatStoredPower( + PowerHandlerUtil.getStoredEnergyForItem(itemstack), TileCapacitorBank.BASE_CAP.getMaxEnergyStored())); } - return 0; - } - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cap = (TileCapacitorBank) te; - String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; - - tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); - tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); - tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); - tooltip.add("Deprecated. Convert by placing in crafting grid"); + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); } - } - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.BIT_DETAILED; - } + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapacitorBank)) { + return false; + } + + if (ToolUtil.isToolEquipped(entityPlayer)) { + + ForgeDirection faceHit = ForgeDirection.getOrientation(side); + TileCapacitorBank tcb = (TileCapacitorBank) te; + tcb.toggleIoModeForFace(faceHit); + if (world.isRemote) { + world.markBlockForUpdate(x, y, z); + } else { + world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapacitorBank); + world.markBlockForUpdate(x, y, z); + } + + return true; + } + + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); + } + + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAPACITOR_BANK, world, x, y, z); + } + return true; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + return new ContainerCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + return new GuiCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); + } + return null; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); + blockIconInput = IIconRegister.registerIcon("enderio:capacitorBankInput"); + blockIconOutput = IIconRegister.registerIcon("enderio:capacitorBankOutput"); + blockIconLocked = IIconRegister.registerIcon("enderio:capacitorBankLocked"); + overlayIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); + fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); + return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { + TileEntity te = ba.getTileEntity(x, y, z); + if (!(te instanceof TileCapacitorBank)) { + return blockIcon; + } + TileCapacitorBank cb = (TileCapacitorBank) te; + IoMode mode = cb.getIoMode(ForgeDirection.values()[side]); + if (mode == null || mode == IoMode.NONE) { + return blockIcon; + } + if (mode == IoMode.PULL) { + return blockIconInput; + } + if (mode == IoMode.PUSH) { + return blockIconOutput; + } + return blockIconLocked; + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + if (world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank tr = (TileCapacitorBank) te; + int meta = world.getBlockMetadata(x, y, z); + if (meta == 1) { + tr.setCreativeMode(); + } + tr.onBlockAdded(); + } + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + if (world.isRemote) { + return; + } + TileEntity tile = world.getTileEntity(x, y, z); + if (tile instanceof TileCapacitorBank) { + TileCapacitorBank te = (TileCapacitorBank) tile; + te.onNeighborBlockChange(blockId); + } + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + PowerHandlerUtil.setStoredEnergyForItem(drop, ((TileCapacitorBank) te).doGetEnergyStored()); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + if (world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cb = (TileCapacitorBank) te; + cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); + if (player instanceof EntityPlayerMP) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord bc = new BlockCoord(x, y, z); + bc = bc.getLocation(dir); + te = world.getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof TileCapacitorBank) { + if (((TileCapacitorBank) te).isMaxSize()) { + ChatUtil.sendNoSpam((EntityPlayerMP) player, "Capacitor bank is at maximum size"); + } + } + } + } + } + world.markBlockForUpdate(x, y, z); + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapacitorBank)) { + super.breakBlock(world, x, y, z, par5, par6); + return; + } + TileCapacitorBank cb = (TileCapacitorBank) te; + Util.dropItems(world, cb, x, y, z, true); + } + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileCapacitorBank)) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + TileCapacitorBank tr = (TileCapacitorBank) te; + if (!tr.isMultiblock()) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (BlockCoord bc : tr.multiblock) { + min.x = Math.min(min.x, bc.x); + max.x = Math.max(max.x, bc.x + 1); + min.y = Math.min(min.y, bc.y); + max.y = Math.max(max.y, bc.y + 1); + min.z = Math.min(min.z, bc.z); + max.z = Math.max(max.z, bc.z + 1); + } + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World w, int x, int y, int z, int side) { + TileEntity te = w.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + return ((TileCapacitorBank) te).getComparatorOutput(); + } + return 0; + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cap = (TileCapacitorBank) te; + String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + + tooltip.add(String.format( + "%s : %s%s%sRF/t ", + EnderIO.lang.localize("capbank.maxIO"), + format, + PowerDisplayUtil.formatPower(cap.getMaxIO()), + Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format( + "%s : %s%s%sRF/t ", + EnderIO.lang.localize("capbank.maxIn"), + format, + PowerDisplayUtil.formatPower(cap.getMaxInput()), + Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format( + "%s : %s%s%sRF/t ", + EnderIO.lang.localize("capbank.maxOut"), + format, + PowerDisplayUtil.formatPower(cap.getMaxOutput()), + Util.TAB + Util.ALIGNRIGHT)); + tooltip.add("Deprecated. Convert by placing in crafting grid"); + } + } + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.BIT_DETAILED; + } } diff --git a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java index 1d3b7f95..c07a6b67 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java @@ -1,111 +1,108 @@ package crazypants.enderio.machine.power; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; public class BlockItemCapacitorBank extends ItemBlock implements IEnergyContainerItem { - public static ItemStack createItemStackWithPower(int storedEnergy) { - ItemStack res = new ItemStack(EnderIO.blockCapacitorBank); - PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); - return res; - } - - public BlockItemCapacitorBank() { - super(EnderIO.blockCapacitorBank); - setHasSubtypes(true); - } - - public BlockItemCapacitorBank(Block block) { - super(block); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - String result = super.getUnlocalizedName(par1ItemStack); - if(meta == 1) { - result += ".creative"; + public static ItemStack createItemStackWithPower(int storedEnergy) { + ItemStack res = new ItemStack(EnderIO.blockCapacitorBank); + PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); + return res; } - return result; - } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - } - - @Override - public boolean showDurabilityBar(ItemStack itemStack) { - return itemStack.getItemDamage() != 1; - } - - @Override - public double getDurabilityForDisplay(ItemStack itemStack) { - double stored = getMaxEnergyStored(itemStack) - getEnergyStored(itemStack) + 1; - double max = getMaxEnergyStored(itemStack) + 1; - return stored / max; - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if(container.stackSize > 1) { - return 0; + public BlockItemCapacitorBank() { + super(EnderIO.blockCapacitorBank); + setHasSubtypes(true); } - int energy = getEnergyStored(container); - int maxInput = TileCapacitorBank.BASE_CAP.getMaxEnergyReceived(); - int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(maxReceive, maxInput)); - if(!simulate && container.getItemDamage() != 1) { - energy += energyReceived; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); + public BlockItemCapacitorBank(Block block) { + super(block); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); } - return energyReceived; - } - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if(container.stackSize > 1) { - return 0; + @Override + public int getMetadata(int par1) { + return par1; } - int energy = getEnergyStored(container); - int maxOutput = TileCapacitorBank.BASE_CAP.getMaxEnergyExtracted(); - int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); - if(!simulate && container.getItemDamage() != 1) { - energy -= energyExtracted; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + String result = super.getUnlocalizedName(par1ItemStack); + if (meta == 1) { + result += ".creative"; + } + return result; } - return energyExtracted; - } - @Override - public int getEnergyStored(ItemStack container) { - return PowerHandlerUtil.getStoredEnergyForItem(container); - } + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {} - @Override - public int getMaxEnergyStored(ItemStack container) { - return TileCapacitorBank.BASE_CAP.getMaxEnergyStored(); - } + @Override + public boolean showDurabilityBar(ItemStack itemStack) { + return itemStack.getItemDamage() != 1; + } + @Override + public double getDurabilityForDisplay(ItemStack itemStack) { + double stored = getMaxEnergyStored(itemStack) - getEnergyStored(itemStack) + 1; + double max = getMaxEnergyStored(itemStack) + 1; + return stored / max; + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + if (container.stackSize > 1) { + return 0; + } + int energy = getEnergyStored(container); + int maxInput = TileCapacitorBank.BASE_CAP.getMaxEnergyReceived(); + int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(maxReceive, maxInput)); + + if (!simulate && container.getItemDamage() != 1) { + energy += energyReceived; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + if (container.stackSize > 1) { + return 0; + } + int energy = getEnergyStored(container); + int maxOutput = TileCapacitorBank.BASE_CAP.getMaxEnergyExtracted(); + int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); + + if (!simulate && container.getItemDamage() != 1) { + energy -= energyExtracted; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + return PowerHandlerUtil.getStoredEnergyForItem(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return TileCapacitorBank.BASE_CAP.getMaxEnergyStored(); + } } diff --git a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java index e4800591..195ad009 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java +++ b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java @@ -1,16 +1,5 @@ package crazypants.enderio.machine.power; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.render.IRenderFace; import com.enderio.core.client.render.ConnectedTextureRenderer; import com.enderio.core.client.render.CustomCubeRenderer; @@ -24,245 +13,272 @@ import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4d; import com.enderio.core.common.vecmath.Vector4f; import com.enderio.core.common.vecmath.Vertex; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.power.GaugeBounds.VPos; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; public class CapBankRenderer2 implements ISimpleBlockRenderingHandler { - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; - private static final double PIXEL_SIZE = 1 / 16d; + private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); + private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] {DEFAULT_BC}; + private static final double PIXEL_SIZE = 1 / 16d; - private final List renderers = new ArrayList(2); + private final List renderers = new ArrayList(2); - private ConnectedTextureRenderer connectedTexRenderer; + private ConnectedTextureRenderer connectedTexRenderer; - public CapBankRenderer2() { - connectedTexRenderer = new ConnectedTextureRenderer(); - connectedTexRenderer.setMatchMeta(true); + public CapBankRenderer2() { + connectedTexRenderer = new ConnectedTextureRenderer(); + connectedTexRenderer.setMatchMeta(true); - GaugueRenderer gaugeRenderer = new GaugueRenderer(); - renderers.add(connectedTexRenderer); - renderers.add(gaugeRenderer); - } - - @Override - 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) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank cb = ((TileCapacitorBank) te); - cb.energyAtLastRender = cb.getEnergyStored(); + GaugueRenderer gaugeRenderer = new GaugueRenderer(); + renderers.add(connectedTexRenderer); + renderers.add(gaugeRenderer); } - int meta = world.getBlockMetadata(x, y, z); - if(meta == 1) { - connectedTexRenderer.setEdgeTexture(IconUtil.whiteTexture); - connectedTexRenderer.setForceAllEdges(true); - } else { - connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3)); - connectedTexRenderer.setForceAllEdges(false); - } - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, renderers); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCapacitorBank.renderId; - } - - private class GaugueRenderer implements IRenderFace { @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - //Gauge - TileEntity te = rb.blockAccess.getTileEntity((int) x, (int) y, (int) z); - if(!(te instanceof TileCapacitorBank)) { - return; - } - TileCapacitorBank capBank = ((TileCapacitorBank) te); - List gaugeBounds = null; - gaugeBounds = capBank.getGaugeBounds(); + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} - if(gaugeBounds == null || gaugeBounds.isEmpty()) { - return; - } + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cb = ((TileCapacitorBank) te); + cb.energyAtLastRender = cb.getEnergyStored(); + } + int meta = world.getBlockMetadata(x, y, z); + if (meta == 1) { + connectedTexRenderer.setEdgeTexture(IconUtil.whiteTexture); + connectedTexRenderer.setForceAllEdges(true); + } else { + connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3)); + connectedTexRenderer.setForceAllEdges(false); + } + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, renderers); + return true; + } - for (GaugeBounds gb : gaugeBounds) { - if(gb.face == face) { - Tessellator tes = Tessellator.instance; - tes.addTranslation((float) x, (float) y, (float) z); - int b = 0; - Vector4f col = new Vector4f(); - int colCount = 0; - for (Vertex v : refVertices) { - b += v.brightness; - if(v.color != null) { - colCount++; - col.add(v.color); + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockCapacitorBank.renderId; + } + + private class GaugueRenderer implements IRenderFace { + + @Override + public void renderFace( + CustomRenderBlocks rb, + ForgeDirection face, + Block par1Block, + double x, + double y, + double z, + IIcon texture, + List refVertices, + boolean translateToXyz) { + // Gauge + TileEntity te = rb.blockAccess.getTileEntity((int) x, (int) y, (int) z); + if (!(te instanceof TileCapacitorBank)) { + return; + } + TileCapacitorBank capBank = ((TileCapacitorBank) te); + List gaugeBounds = null; + gaugeBounds = capBank.getGaugeBounds(); + + if (gaugeBounds == null || gaugeBounds.isEmpty()) { + return; + } + + for (GaugeBounds gb : gaugeBounds) { + if (gb.face == face) { + Tessellator tes = Tessellator.instance; + tes.addTranslation((float) x, (float) y, (float) z); + int b = 0; + Vector4f col = new Vector4f(); + int colCount = 0; + for (Vertex v : refVertices) { + b += v.brightness; + if (v.color != null) { + colCount++; + col.add(v.color); + } + } + if (b > 0) { + b /= 4; + tes.setBrightness(b); + } else { + tes.setBrightness(15 << 20 | 0 << 4); + } + if (colCount > 0) { + col.scale(0.25); + tes.setColorRGBA_F(col.x, col.y, col.z, col.w); + } + renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon, refVertices, x, y, z); + renderFillBarOnFace( + gb, + EnderIO.blockCapacitorBank.fillBarIcon, + capBank.getEnergyStoredRatio(), + refVertices, + x, + y, + z); + capBank.lastRenderStoredRatio = capBank.getEnergyStoredRatio(); + tes.addTranslation((float) -x, (float) -y, (float) -z); + return; + } } - } - if(b > 0) { - b /= 4; - tes.setBrightness(b); - } else { - tes.setBrightness(15 << 20 | 0 << 4); - } - if(colCount > 0) { - col.scale(0.25); - tes.setColorRGBA_F(col.x, col.y, col.z, col.w); - } - renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon, refVertices, x, y, z); - renderFillBarOnFace(gb, EnderIO.blockCapacitorBank.fillBarIcon,capBank.getEnergyStoredRatio(), refVertices, x, y, z); - capBank.lastRenderStoredRatio = capBank.getEnergyStoredRatio(); - tes.addTranslation((float) -x, (float) -y, (float) -z); - return; } - } + + private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { + List res = new ArrayList(); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { + boolean isRight = isRightFace(me, mb, face); + if (isRight) { + res.add(new GaugeBounds(me, mb, face)); + } + } + } + return res; + } + + private void renderGaugeOnFace( + GaugeBounds gb, IIcon icon, List vertices, double x, double y, double z) { + Tessellator tes = Tessellator.instance; + Vector2f u = gb.getMinMaxU(icon); + List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); + for (Vertex coord : corners) { + coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.001f)); + Vector3d xyz = new Vector3d(coord.xyz); + xyz.x += x; + xyz.y += y; + xyz.z += z; + Vertex v = getClosestVertex(vertices, xyz); + if (v != null) { + if (v.color != null) { + tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); + } else { + tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); + } + if (v.brightness > 0) { + tes.setBrightness(v.brightness); + } + } + if (coord.uv != null) { + tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); + } else { + tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); + } + } + } + + private void renderFillBarOnFace( + GaugeBounds gb, IIcon icon, double filledRatio, List vertices, double x, double y, double z) { + + int totalPixels; + if (gb.vInfo.verticalHeight == 1) { + totalPixels = VPos.SINGLE_BLOCK.numFillPixels; + } else { + totalPixels = VPos.BOTTOM.numFillPixels + + VPos.TOP.numFillPixels + + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); + } + + int targetPixelCount = (int) Math.max(0, Math.round(totalPixels * filledRatio)); + int pixelsBellowFace; + if (gb.vInfo.index < 2) { + // either none or a bottom section + pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; + } else { // has middle section + pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); + } + + if (pixelsBellowFace >= targetPixelCount) { + return; + } + + VPos yPos = gb.vInfo.pos; + int numPixelsLeft = targetPixelCount - pixelsBellowFace; + int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); + + double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); + float vWidth = icon.getMaxV() - icon.getMinV(); + float maxV = icon.getMinV() + ((float) maxY * vWidth); + + Tessellator tes = Tessellator.instance; + Vector2f u = gb.getMinMaxU(icon); + List corners = + gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); + for (Vertex coord : corners) { + coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.002f)); + + Vector3d xyz = new Vector3d(coord.xyz); + xyz.x += x; + xyz.y += y; + xyz.z += z; + Vertex v = getClosestVertex(vertices, xyz); + if (v != null) { + if (v.color != null) { + tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); + } else { + tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); + } + if (v.brightness > 0) { + tes.setBrightness(v.brightness); + } + } + + if (coord.uv != null) { + tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); + } else { + tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); + } + } + } + + private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { + Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); + + int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; + int max = myRightVal; + for (BlockCoord bc : mb) { + int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; + if (val > max) { + max = val; + } + } + return myRightVal == max; + } + + private Vertex getClosestVertex(List vertices, Vector3d corner) { + Vertex result = null; + double d2 = Double.MAX_VALUE; + for (Vertex v : vertices) { + double tmp = corner.distanceSquared(v.xyz); + if (tmp <= d2) { + result = v; + d2 = tmp; + } + } + return result; + } } - private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if(isRight) { - res.add(new GaugeBounds(me, mb, face)); - } - } - } - return res; - } - - private void renderGaugeOnFace(GaugeBounds gb, IIcon icon, List vertices, double x, double y, double z) { - Tessellator tes = Tessellator.instance; - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); - for (Vertex coord : corners) { - coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.001f)); - Vector3d xyz = new Vector3d(coord.xyz); - xyz.x += x; - xyz.y += y; - xyz.z += z; - Vertex v = getClosestVertex(vertices, xyz); - if(v != null) { - if(v.color != null) { - tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); - } else { - tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); - } - if(v.brightness > 0) { - tes.setBrightness(v.brightness); - } - } - if(coord.uv != null) { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); - } - } - } - - private void renderFillBarOnFace(GaugeBounds gb, IIcon icon, double filledRatio, List vertices, double x, double y, double z) { - - int totalPixels; - if(gb.vInfo.verticalHeight == 1) { - totalPixels = VPos.SINGLE_BLOCK.numFillPixels; - } else { - totalPixels = VPos.BOTTOM.numFillPixels + VPos.TOP.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); - } - - int targetPixelCount = (int)Math.max(0, Math.round(totalPixels * filledRatio)); - int pixelsBellowFace; - if(gb.vInfo.index < 2) { - // either none or a bottom section - pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; - } else { // has middle section - pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); - } - - if(pixelsBellowFace >= targetPixelCount) { - return; - } - - VPos yPos = gb.vInfo.pos; - int numPixelsLeft = targetPixelCount - pixelsBellowFace; - int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); - - double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); - float vWidth = icon.getMaxV() - icon.getMinV(); - float maxV = icon.getMinV() + ((float) maxY * vWidth); - - Tessellator tes = Tessellator.instance; - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); - for (Vertex coord : corners) { - coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.002f)); - - Vector3d xyz = new Vector3d(coord.xyz); - xyz.x += x; - xyz.y += y; - xyz.z += z; - Vertex v = getClosestVertex(vertices, xyz); - if(v != null) { - if(v.color != null) { - tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); - } else { - tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); - } - if(v.brightness > 0) { - tes.setBrightness(v.brightness); - } - } - - if(coord.uv != null) { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); - } - } - } - - private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if(val > max) { - max = val; - } - } - return myRightVal == max; - } - - private Vertex getClosestVertex(List vertices, Vector3d corner) { - Vertex result = null; - double d2 = Double.MAX_VALUE; - for (Vertex v : vertices) { - double tmp = corner.distanceSquared(v.xyz); - if(tmp <= d2) { - result = v; - d2 = tmp; - } - } - return result; - } - - } - - //------------ Inner Classes + // ------------ Inner Classes } diff --git a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java index 7ba16f3c..36e12f92 100644 --- a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java @@ -1,20 +1,5 @@ package crazypants.enderio.machine.power; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.IconUtil; @@ -23,304 +8,315 @@ import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector4d; import com.enderio.core.common.vecmath.Vertex; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; - private static final double PIXEL_SIZE = 1 / 16d; + private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); + private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] {DEFAULT_BC}; + private static final double PIXEL_SIZE = 1 / 16d; - //------------------------- Item renderer + // ------------------------- Item renderer - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderBlock(null, PowerHandlerUtil.getStoredEnergyForItem(item) / TileCapacitorBank.BASE_CAP.getMaxEnergyStored(), item.getItemDamage()); - } - - //------------------------- Entity renderer - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { - if(!(te instanceof TileCapacitorBank)) { - return; + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - Minecraft.getMinecraft().entityRenderer.disableLightmap(0); - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - - TileCapacitorBank cb = (TileCapacitorBank) te; - renderBlock(cb, cb.getEnergyStoredRatio(), 0); - - GL11.glPopMatrix(); - Minecraft.getMinecraft().entityRenderer.enableLightmap(0); - - } - - private void renderBlock(TileCapacitorBank te, double filledRatio, int meta) { - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - - BlockCoord myBC; - BlockCoord[] mb; - if(te != null && te.isMultiblock()) { - myBC = new BlockCoord(te); - mb = te.multiblock; - } else { - myBC = DEFAULT_BC; - mb = DEFAULT_MB; + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - List gaugeBounds = calculateGaugeBounds(myBC, mb); - - float[] brightness; - float maxBrightness = 0; - if(te != null) { - brightness = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightness[dir.ordinal()] = RenderUtil.claculateTotalBrightnessForLocation(te.getWorldObj(), te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord - + dir.offsetZ); - maxBrightness = Math.max(brightness[dir.ordinal()], maxBrightness); - } - } else { - brightness = new float[] { 1, 1, 1, 1, 1, 1 }; - maxBrightness = 1; + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderBlock( + null, + PowerHandlerUtil.getStoredEnergyForItem(item) / TileCapacitorBank.BASE_CAP.getMaxEnergyStored(), + item.getItemDamage()); } - tes.startDrawingQuads(); - CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockCapacitorBank.getIcon(0, 0), null, brightness, true); - tes.draw(); + // ------------------------- Entity renderer - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - tes.startDrawingQuads(); - tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); - if(te != null) { - renderBorder(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, meta); - } else { - renderBorder(null, 0, 0, 0, meta); - } - for (GaugeBounds gb : gaugeBounds) { - renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon); - } - tes.draw(); - - GL11.glPolygonOffset(-3.0F, -3.0F); - tes.startDrawingQuads(); - tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); - - for (GaugeBounds gb : gaugeBounds) { - renderFillBarOnFace(gb, EnderIO.blockCapacitorBank.fillBarIcon, filledRatio); - } - tes.draw(); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - } - - private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { - IIcon texture; - if(meta == 0) { - texture = EnderIO.blockAlloySmelter.getBlockTextureFromSide(3); - } else { - texture = IconUtil.whiteTexture; - } - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - RenderUtil.renderConnectedTextureFace(blockAccess, EnderIO.blockCapacitorBank, x, y, z, face, texture, - blockAccess == null, false, false); - } - } - - private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if(isRight) { - res.add(new GaugeBounds(me, mb, face)); + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { + if (!(te instanceof TileCapacitorBank)) { + return; } - } - } - return res; - } - private void renderGaugeOnFace(GaugeBounds gb, IIcon icon) { - Tessellator tes = Tessellator.instance; - tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); - for (Vertex coord : corners) { - tes.setNormal(coord.nx(), coord.ny(), coord.nz()); - if(coord.uv != null) { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); - } - } - } + Minecraft.getMinecraft().entityRenderer.disableLightmap(0); + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); - private void renderFillBarOnFace(GaugeBounds gb, IIcon icon, double filledRatio) { + TileCapacitorBank cb = (TileCapacitorBank) te; + renderBlock(cb, cb.getEnergyStoredRatio(), 0); - int totalPixels; - if(gb.vInfo.verticalHeight == 1) { - totalPixels = VPos.SINGLE_BLOCK.numFillPixels; - } else { - totalPixels = VPos.BOTTOM.numFillPixels + VPos.TOP.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); + GL11.glPopMatrix(); + Minecraft.getMinecraft().entityRenderer.enableLightmap(0); } - int targetPixelCount = (int)Math.max(0, Math.round(totalPixels * filledRatio)); - int pixelsBellowFace; - if(gb.vInfo.index < 2) { - // either none or a bottom section - pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; - } else { // has middle section - pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); - } + private void renderBlock(TileCapacitorBank te, double filledRatio, int meta) { + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; - if(pixelsBellowFace >= targetPixelCount) { - return; - } - - VPos yPos = gb.vInfo.pos; - int numPixelsLeft = targetPixelCount - pixelsBellowFace; - int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); - - double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); - float vWidth = icon.getMaxV() - icon.getMinV(); - float maxV = icon.getMinV() + ((float) maxY * vWidth); - - Tessellator tes = Tessellator.instance; - tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); - for (Vertex coord : corners) { - if(coord.uv != null) { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); - } - } - } - - private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if(val > max) { - max = val; - } - } - return myRightVal == max; - } - - //------------ Inner Classes - - enum VPos { - - SINGLE_BLOCK(0, 10, 3), - BOTTOM(0.5f, 13, 3), - MIDDLE(0.75f, 16, 0), - TOP(0.25f, 13, 0); - - final float uOffset; - final int numFillPixels; - final int fillOffset; - - private VPos(float uOffset, int numFillPixels, int fillOffset) { - this.uOffset = uOffset; - this.numFillPixels = numFillPixels; - this.fillOffset = fillOffset; - } - - } - - static class VInfo { - VPos pos; - int verticalHeight; - int index; - - VInfo(VPos pos, int verticalHeight, int index) { - this.pos = pos; - this.verticalHeight = verticalHeight; - this.index = index; - } - - } - - static class GaugeBounds { - - final BoundingBox bb; - final VInfo vInfo; - final ForgeDirection face; - - GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - this.face = face; - vInfo = getVPosForFace(me, mb, face); - - Vector4d uPlane = RenderUtil.getUPlaneForFace(face); - float scaleX = uPlane.x != 0 ? 0.25f : 1; - float scaleY = uPlane.y != 0 ? 0.25f : 1; - float scaleZ = uPlane.z != 0 ? 0.25f : 1; - bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); - } - - Vector2f getMinMaxU(IIcon icon) { - VPos yPos = vInfo.pos; - float uWidth = icon.getMaxU() - icon.getMinU(); - float uOffset = yPos.uOffset * uWidth; - float minU = icon.getMinU() + uOffset; - float maxU = minU + (uWidth * 0.25f); - return new Vector2f(minU, maxU); - } - - private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - int maxY = me.y; - int minY = me.y; - int vHeight = 1; - for (BlockCoord bc : mb) { - if(bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { - maxY = Math.max(maxY, bc.y); - minY = Math.min(minY, bc.y); + BlockCoord myBC; + BlockCoord[] mb; + if (te != null && te.isMultiblock()) { + myBC = new BlockCoord(te); + mb = te.multiblock; + } else { + myBC = DEFAULT_BC; + mb = DEFAULT_MB; } - } - if(maxY == me.y && minY == me.y) { - return new VInfo(VPos.SINGLE_BLOCK, 1, 0); - } - int height = maxY - minY + 1; - if(maxY > me.y) { - return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); - } - return new VInfo(VPos.TOP, height, height - 1); - } - private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { - for (BlockCoord bc : mb) { - if(location.equals(bc)) { - return true; + List gaugeBounds = calculateGaugeBounds(myBC, mb); + + float[] brightness; + float maxBrightness = 0; + if (te != null) { + brightness = new float[6]; + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + brightness[dir.ordinal()] = RenderUtil.claculateTotalBrightnessForLocation( + te.getWorldObj(), te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ); + maxBrightness = Math.max(brightness[dir.ordinal()], maxBrightness); + } + } else { + brightness = new float[] {1, 1, 1, 1, 1, 1}; + maxBrightness = 1; } - } - return false; + + tes.startDrawingQuads(); + CubeRenderer.render(BoundingBox.UNIT_CUBE, EnderIO.blockCapacitorBank.getIcon(0, 0), null, brightness, true); + tes.draw(); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + tes.startDrawingQuads(); + tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); + if (te != null) { + renderBorder(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, meta); + } else { + renderBorder(null, 0, 0, 0, meta); + } + for (GaugeBounds gb : gaugeBounds) { + renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon); + } + tes.draw(); + + GL11.glPolygonOffset(-3.0F, -3.0F); + tes.startDrawingQuads(); + tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); + + for (GaugeBounds gb : gaugeBounds) { + renderFillBarOnFace(gb, EnderIO.blockCapacitorBank.fillBarIcon, filledRatio); + } + tes.draw(); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); } - } + private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { + IIcon texture; + if (meta == 0) { + texture = EnderIO.blockAlloySmelter.getBlockTextureFromSide(3); + } else { + texture = IconUtil.whiteTexture; + } + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + RenderUtil.renderConnectedTextureFace( + blockAccess, EnderIO.blockCapacitorBank, x, y, z, face, texture, blockAccess == null, false, false); + } + } + private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { + List res = new ArrayList(); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { + boolean isRight = isRightFace(me, mb, face); + if (isRight) { + res.add(new GaugeBounds(me, mb, face)); + } + } + } + return res; + } + + private void renderGaugeOnFace(GaugeBounds gb, IIcon icon) { + Tessellator tes = Tessellator.instance; + tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); + Vector2f u = gb.getMinMaxU(icon); + List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); + for (Vertex coord : corners) { + tes.setNormal(coord.nx(), coord.ny(), coord.nz()); + if (coord.uv != null) { + tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); + } else { + tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); + } + } + } + + private void renderFillBarOnFace(GaugeBounds gb, IIcon icon, double filledRatio) { + + int totalPixels; + if (gb.vInfo.verticalHeight == 1) { + totalPixels = VPos.SINGLE_BLOCK.numFillPixels; + } else { + totalPixels = VPos.BOTTOM.numFillPixels + + VPos.TOP.numFillPixels + + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); + } + + int targetPixelCount = (int) Math.max(0, Math.round(totalPixels * filledRatio)); + int pixelsBellowFace; + if (gb.vInfo.index < 2) { + // either none or a bottom section + pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; + } else { // has middle section + pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); + } + + if (pixelsBellowFace >= targetPixelCount) { + return; + } + + VPos yPos = gb.vInfo.pos; + int numPixelsLeft = targetPixelCount - pixelsBellowFace; + int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); + + double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); + float vWidth = icon.getMaxV() - icon.getMinV(); + float maxV = icon.getMinV() + ((float) maxY * vWidth); + + Tessellator tes = Tessellator.instance; + tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); + Vector2f u = gb.getMinMaxU(icon); + List corners = + gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); + for (Vertex coord : corners) { + if (coord.uv != null) { + tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); + } else { + tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); + } + } + } + + private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { + Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); + + int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; + int max = myRightVal; + for (BlockCoord bc : mb) { + int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; + if (val > max) { + max = val; + } + } + return myRightVal == max; + } + + // ------------ Inner Classes + + enum VPos { + SINGLE_BLOCK(0, 10, 3), + BOTTOM(0.5f, 13, 3), + MIDDLE(0.75f, 16, 0), + TOP(0.25f, 13, 0); + + final float uOffset; + final int numFillPixels; + final int fillOffset; + + private VPos(float uOffset, int numFillPixels, int fillOffset) { + this.uOffset = uOffset; + this.numFillPixels = numFillPixels; + this.fillOffset = fillOffset; + } + } + + static class VInfo { + VPos pos; + int verticalHeight; + int index; + + VInfo(VPos pos, int verticalHeight, int index) { + this.pos = pos; + this.verticalHeight = verticalHeight; + this.index = index; + } + } + + static class GaugeBounds { + + final BoundingBox bb; + final VInfo vInfo; + final ForgeDirection face; + + GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { + this.face = face; + vInfo = getVPosForFace(me, mb, face); + + Vector4d uPlane = RenderUtil.getUPlaneForFace(face); + float scaleX = uPlane.x != 0 ? 0.25f : 1; + float scaleY = uPlane.y != 0 ? 0.25f : 1; + float scaleZ = uPlane.z != 0 ? 0.25f : 1; + bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); + } + + Vector2f getMinMaxU(IIcon icon) { + VPos yPos = vInfo.pos; + float uWidth = icon.getMaxU() - icon.getMinU(); + float uOffset = yPos.uOffset * uWidth; + float minU = icon.getMinU() + uOffset; + float maxU = minU + (uWidth * 0.25f); + return new Vector2f(minU, maxU); + } + + private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { + int maxY = me.y; + int minY = me.y; + int vHeight = 1; + for (BlockCoord bc : mb) { + if (bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { + maxY = Math.max(maxY, bc.y); + minY = Math.min(minY, bc.y); + } + } + if (maxY == me.y && minY == me.y) { + return new VInfo(VPos.SINGLE_BLOCK, 1, 0); + } + int height = maxY - minY + 1; + if (maxY > me.y) { + return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); + } + return new VInfo(VPos.TOP, height, height - 1); + } + + private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { + for (BlockCoord bc : mb) { + if (location.equals(bc)) { + return true; + } + } + return false; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java index ed809c42..caa5369f 100644 --- a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.power; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -8,162 +10,158 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ContainerCapacitorBank extends Container { - private final TileCapacitorBank tileEntity; + private final TileCapacitorBank tileEntity; - public ContainerCapacitorBank(final Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { + public ContainerCapacitorBank(final Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { - tileEntity = te; - int armorOffset = 21; - addSlotToContainer(new Slot(tileEntity, 0, 59 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(0, itemStack); - } - }); + tileEntity = te; + int armorOffset = 21; + addSlotToContainer(new Slot(tileEntity, 0, 59 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(0, itemStack); + } + }); - addSlotToContainer(new Slot(tileEntity, 1, 79 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(1, itemStack); - } - }); + addSlotToContainer(new Slot(tileEntity, 1, 79 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(1, itemStack); + } + }); - addSlotToContainer(new Slot(tileEntity, 2, 99 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(2, itemStack); - } - }); + addSlotToContainer(new Slot(tileEntity, 2, 99 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(2, itemStack); + } + }); - addSlotToContainer(new Slot(tileEntity, 3, 119 + armorOffset, 59) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(3, itemStack); - } - }); + addSlotToContainer(new Slot(tileEntity, 3, 119 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(3, itemStack); + } + }); - // add players inventory - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, +armorOffset + 8 + j * 18, 84 + i * 18)); - } + // add players inventory + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, +armorOffset + 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(playerInv, i, +armorOffset + 8 + i * 18, 142)); + } + + // armor slots + for (int i = 0; i < 4; ++i) { + final int k = i; + addSlotToContainer( + new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 30 + i * 18) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + if (par1ItemStack == null) { + return false; + } + return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, player); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + return ItemArmor.func_94602_b(k); + } + }); + } } - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(playerInv, i, +armorOffset + 8 + i * 18, 142)); + @Override + public boolean canInteractWith(EntityPlayer entityplayer) { + return true; } - //armor slots - for (int i = 0; i < 4; ++i) { - final int k = i; - addSlotToContainer(new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 30 + i * 18) { + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - @Override - public int getSlotStackLimit() { - return 1; - } + int startPlayerSlot = 4; + int endPlayerSlot = startPlayerSlot + 26; + int startHotBarSlot = endPlayerSlot + 1; + int endHotBarSlot = startHotBarSlot + 9; - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - if(par1ItemStack == null) { - return false; - } - return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, player); - } + ItemStack copystack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if (slot != null && slot.getHasStack()) { - @Override - @SideOnly(Side.CLIENT) - public IIcon getBackgroundIconIndex() { - return ItemArmor.func_94602_b(k); - } - }); - } + ItemStack origStack = slot.getStack(); + copystack = origStack.copy(); - } + if (slotIndex < 4) { + // merge from machine input slots to inventory + if (!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex)) { + if (!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { + return null; + } + } - @Override - public boolean canInteractWith(EntityPlayer entityplayer) { - return true; - } + } else { + // Check from inv-> charge then inv->hotbar or hotbar->inv + if (slotIndex >= startPlayerSlot) { + if (!tileEntity.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - - int startPlayerSlot = 4; - int endPlayerSlot = startPlayerSlot + 26; - int startHotBarSlot = endPlayerSlot + 1; - int endHotBarSlot = startHotBarSlot + 9; - - ItemStack copystack = null; - Slot slot = (Slot) inventorySlots.get(slotIndex); - if(slot != null && slot.getHasStack()) { - - ItemStack origStack = slot.getStack(); - copystack = origStack.copy(); - - if(slotIndex < 4) { - // merge from machine input slots to inventory - if(!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex)) { - if(!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { - return null; - } - } - - } else { - //Check from inv-> charge then inv->hotbar or hotbar->inv - if(slotIndex >= startPlayerSlot) { - if(!tileEntity.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { - - if(slotIndex <= endPlayerSlot) { - if(!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { - return null; - } - } else if(slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { - if(!mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { - return null; - } + if (slotIndex <= endPlayerSlot) { + if (!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { + return null; + } + } else if (slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { + if (!mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { + return null; + } + } + } + } } - } + if (origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + slot.onSlotChanged(); + + if (origStack.stackSize == copystack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); } - } - if(origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - slot.onSlotChanged(); - - if(origStack.stackSize == copystack.stackSize) { - return null; - } - - slot.onPickupFromSlot(entityPlayer, origStack); + return copystack; } - return copystack; - } - - private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { - if(origStack == null || !(origStack.getItem() instanceof ItemArmor)) { - return false; + private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { + if (origStack == null || !(origStack.getItem() instanceof ItemArmor)) { + return false; + } + ItemArmor armor = (ItemArmor) origStack.getItem(); + int index = 3 - armor.armorType; + ItemStack[] ai = entityPlayer.inventory.armorInventory; + if (ai[index] == null) { + ai[index] = origStack.copy(); + origStack.stackSize = 0; + return true; + } + return false; } - ItemArmor armor = (ItemArmor) origStack.getItem(); - int index = 3 - armor.armorType; - ItemStack[] ai = entityPlayer.inventory.armorInventory; - if(ai[index] == null) { - ai[index] = origStack.copy(); - origStack.stackSize = 0; - return true; - } - return false; - } - } diff --git a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java index 6eae95ff..02a3a6e4 100644 --- a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java +++ b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java @@ -1,163 +1,157 @@ package crazypants.enderio.machine.power; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.vecmath.Vector2f; import com.enderio.core.common.vecmath.Vector4d; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; class GaugeBounds { - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; + private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); + private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] {DEFAULT_BC}; - static List calculateGaugeBounds(BlockCoord me, BlockCoord[] mbIn) { + static List calculateGaugeBounds(BlockCoord me, BlockCoord[] mbIn) { - BlockCoord myBC; - BlockCoord[] mb; - if(mbIn != null) { - myBC = me; - mb = mbIn; - } else { - myBC = me; - DEFAULT_MB[0] = me; - mb = DEFAULT_MB; - } - - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if(isRight) { - res.add(new GaugeBounds(me, mb, face)); + BlockCoord myBC; + BlockCoord[] mb; + if (mbIn != null) { + myBC = me; + mb = mbIn; + } else { + myBC = me; + DEFAULT_MB[0] = me; + mb = DEFAULT_MB; } - } - } - return res; - } - static boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - - if(me == null || contains(mb, me.getLocation(dir))) { - return false; - } - if(mb == null) { - return true; - } - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if(val > max) { - max = val; - } - } - return myRightVal == max; - } - - private static boolean contains(BlockCoord[] mb, BlockCoord location) { - if(mb == null) { - return false; - } - for (BlockCoord bc : mb) { - if(location.equals(bc)) { - return true; - } - } - return false; - } - - final BoundingBox bb; - final VInfo vInfo; - final ForgeDirection face; - - GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - this.face = face; - vInfo = getVPosForFace(me, mb, face); - - Vector4d uPlane = RenderUtil.getUPlaneForFace(face); - float scaleX = uPlane.x != 0 ? 0.25f : 1; - float scaleY = uPlane.y != 0 ? 0.25f : 1; - float scaleZ = uPlane.z != 0 ? 0.25f : 1; - bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); - } - - Vector2f getMinMaxU(IIcon icon) { - VPos yPos = vInfo.pos; - float uWidth = icon.getMaxU() - icon.getMinU(); - float uOffset = yPos.uOffset * uWidth; - float minU = icon.getMinU() + uOffset; - float maxU = minU + (uWidth * 0.25f); - return new Vector2f(minU, maxU); - } - - private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - int maxY = me.y; - int minY = me.y; - int vHeight = 1; - for (BlockCoord bc : mb) { - if(bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { - maxY = Math.max(maxY, bc.y); - minY = Math.min(minY, bc.y); - } - } - if(maxY == me.y && minY == me.y) { - return new VInfo(VPos.SINGLE_BLOCK, 1, 0); - } - int height = maxY - minY + 1; - if(maxY > me.y) { - return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); - } - return new VInfo(VPos.TOP, height, height - 1); - } - - private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { - for (BlockCoord bc : mb) { - if(location.equals(bc)) { - return true; - } - } - return false; - } - - enum VPos { - - SINGLE_BLOCK(0, 10, 3), - BOTTOM(0.5f, 13, 3), - MIDDLE(0.75f, 16, 0), - TOP(0.25f, 13, 0); - - final float uOffset; - final int numFillPixels; - final int fillOffset; - - private VPos(float uOffset, int numFillPixels, int fillOffset) { - this.uOffset = uOffset; - this.numFillPixels = numFillPixels; - this.fillOffset = fillOffset; + List res = new ArrayList(); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { + boolean isRight = isRightFace(me, mb, face); + if (isRight) { + res.add(new GaugeBounds(me, mb, face)); + } + } + } + return res; } - } + static boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - static class VInfo { - VPos pos; - int verticalHeight; - int index; + if (me == null || contains(mb, me.getLocation(dir))) { + return false; + } + if (mb == null) { + return true; + } + Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - VInfo(VPos pos, int verticalHeight, int index) { - this.pos = pos; - this.verticalHeight = verticalHeight; - this.index = index; + int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; + int max = myRightVal; + for (BlockCoord bc : mb) { + int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; + if (val > max) { + max = val; + } + } + return myRightVal == max; } - } + private static boolean contains(BlockCoord[] mb, BlockCoord location) { + if (mb == null) { + return false; + } + for (BlockCoord bc : mb) { + if (location.equals(bc)) { + return true; + } + } + return false; + } -} \ No newline at end of file + final BoundingBox bb; + final VInfo vInfo; + final ForgeDirection face; + + GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { + this.face = face; + vInfo = getVPosForFace(me, mb, face); + + Vector4d uPlane = RenderUtil.getUPlaneForFace(face); + float scaleX = uPlane.x != 0 ? 0.25f : 1; + float scaleY = uPlane.y != 0 ? 0.25f : 1; + float scaleZ = uPlane.z != 0 ? 0.25f : 1; + bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); + } + + Vector2f getMinMaxU(IIcon icon) { + VPos yPos = vInfo.pos; + float uWidth = icon.getMaxU() - icon.getMinU(); + float uOffset = yPos.uOffset * uWidth; + float minU = icon.getMinU() + uOffset; + float maxU = minU + (uWidth * 0.25f); + return new Vector2f(minU, maxU); + } + + private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { + int maxY = me.y; + int minY = me.y; + int vHeight = 1; + for (BlockCoord bc : mb) { + if (bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { + maxY = Math.max(maxY, bc.y); + minY = Math.min(minY, bc.y); + } + } + if (maxY == me.y && minY == me.y) { + return new VInfo(VPos.SINGLE_BLOCK, 1, 0); + } + int height = maxY - minY + 1; + if (maxY > me.y) { + return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); + } + return new VInfo(VPos.TOP, height, height - 1); + } + + private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { + for (BlockCoord bc : mb) { + if (location.equals(bc)) { + return true; + } + } + return false; + } + + enum VPos { + SINGLE_BLOCK(0, 10, 3), + BOTTOM(0.5f, 13, 3), + MIDDLE(0.75f, 16, 0), + TOP(0.25f, 13, 0); + + final float uOffset; + final int numFillPixels; + final int fillOffset; + + private VPos(float uOffset, int numFillPixels, int fillOffset) { + this.uOffset = uOffset; + this.numFillPixels = numFillPixels; + this.fillOffset = fillOffset; + } + } + + static class VInfo { + VPos pos; + int verticalHeight; + int index; + + VInfo(VPos pos, int verticalHeight, int index) { + this.pos = pos; + this.verticalHeight = verticalHeight; + this.index = index; + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 21f2f87a..9e47a31f 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -1,25 +1,8 @@ package crazypants.enderio.machine.power; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; @@ -30,310 +13,317 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiCapacitorBank extends GuiContainerBaseEIO { - protected static final int INPUT_BUTTON_ID = 18; - protected static final int OUTPUT_BUTTON_ID = 37; + protected static final int INPUT_BUTTON_ID = 18; + protected static final int OUTPUT_BUTTON_ID = 37; - protected static final int CONFIG_ID = 377996104; + protected static final int CONFIG_ID = 377996104; - private static final int POWER_X = 11 + 18; - private static final int POWER_Y = 9; - private static final int POWER_WIDTH = 10; - private static final int POWER_HEIGHT = 68; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + private static final int POWER_X = 11 + 18; + private static final int POWER_Y = 9; + private static final int POWER_WIDTH = 10; + private static final int POWER_HEIGHT = 68; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - private int inputX = 78 + 24; - private int inputY = 18; + private int inputX = 78 + 24; + private int inputY = 18; - private int outputX = 78 + 24; - private int outputY = 36; + private int outputX = 78 + 24; + private int outputY = 36; - private int rightMargin = 8 + 24; + private int rightMargin = 8 + 24; - private final TileCapacitorBank capBank; + private final TileCapacitorBank capBank; - private RedstoneModeButton inputRsButton; - private RedstoneModeButton outputRsButton; + private RedstoneModeButton inputRsButton; + private RedstoneModeButton outputRsButton; - private GuiTextField maxInputTF; - private GuiTextField maxOutputTF; + private GuiTextField maxInputTF; + private GuiTextField maxOutputTF; - private GuiOverlayIoConfig configOverlay; - private IconButton configB; + private GuiOverlayIoConfig configOverlay; + private IconButton configB; - public GuiCapacitorBank(Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { - super(new ContainerCapacitorBank(player, playerInv, te), "capacitorBank"); - this.capBank = te; + public GuiCapacitorBank(Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { + super(new ContainerCapacitorBank(player, playerInv, te), "capacitorBank"); + this.capBank = te; - xSize = 176 + 42; + xSize = 176 + 42; - addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { - @Override - protected void updateText() { - text.clear(); - text.add(PowerDisplayUtil.formatPower(capBank.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add(PowerDisplayUtil.formatPower(capBank.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); - } + @Override + protected void updateText() { + text.clear(); + text.add(PowerDisplayUtil.formatPower(capBank.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); + text.add(PowerDisplayUtil.formatPower(capBank.getMaxEnergyStored()) + " " + + PowerDisplayUtil.abrevation()); + } + }); - }); + int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; + int y = inputY; + inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; - int y = inputY; - inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + capBank.setInputControlMode(mode); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - capBank.setInputControlMode(mode); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } + @Override + public RedstoneControlMode getRedstoneControlMode() { + return capBank.getInputControlMode(); + } + }); + inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); - @Override - public RedstoneControlMode getRedstoneControlMode() { - return capBank.getInputControlMode(); - } - }); - inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); + y += 18; + outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - y += 18; - outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + capBank.setOutputControlMode(mode); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - capBank.setOutputControlMode(mode); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } + @Override + public RedstoneControlMode getRedstoneControlMode() { + return capBank.getOutputControlMode(); + } + }); + outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); - @Override - public RedstoneControlMode getRedstoneControlMode() { - return capBank.getOutputControlMode(); - } - }); - outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); + y += 20; + configB = new IconButton(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); + configB.setToolTip(EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip")); - y += 20; - configB = new IconButton(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); - configB.setToolTip(EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip")); - - List coords = new ArrayList(); - if(te.isMultiblock()) { - BlockCoord[] mb = te.getController().multiblock; - if(mb != null) { - coords.addAll(Arrays.asList(mb)); - } - } - - if(coords.isEmpty()) { - coords.add(te.getLocation()); - } - - configOverlay = new GuiOverlayIoConfig(coords) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); - } - - @Override - protected String getLabelForMode(IoMode mode) { - if(mode == IoMode.PUSH) { - return EnderIO.lang.localize("gui.capBank.outputMode"); - } else if(mode == IoMode.PULL) { - return EnderIO.lang.localize("gui.capBank.inputMode"); + List coords = new ArrayList(); + if (te.isMultiblock()) { + BlockCoord[] mb = te.getController().multiblock; + if (mb != null) { + coords.addAll(Arrays.asList(mb)); + } } - return super.getLabelForMode(mode); - } - }; - addOverlay(configOverlay); + if (coords.isEmpty()) { + coords.add(te.getLocation()); + } - } + configOverlay = new GuiOverlayIoConfig(coords) { - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } - } + @Override + public void setVisible(boolean visible) { + super.setVisible(visible); + configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); + } - @Override - public void initGui() { - super.initGui(); - - configB.onGuiInit(); - - int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; - int y = guiTop + inputY; - - FontRenderer fontRenderer = getFontRenderer(); - - inputRsButton.onGuiInit(); - outputRsButton.onGuiInit(); - - x = guiLeft + inputX; - y = guiTop + inputY; - maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); - maxInputTF.setCanLoseFocus(true); - maxInputTF.setMaxStringLength(10); - maxInputTF.setFocused(false); - maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - - x = guiLeft + outputX; - y = guiTop + outputY; - maxOutputTF = new GuiTextField(fontRenderer, x, y, 68, 16); - maxOutputTF.setCanLoseFocus(true); - maxOutputTF.setMaxStringLength(10); - maxOutputTF.setFocused(true); - maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - } - - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - if(par1 == 'e') { - super.keyTyped(par1, 1); - } - maxInputTF.textboxKeyTyped(par1, par2); - maxOutputTF.textboxKeyTyped(par1, par2); - updateInputOutput(); - } - - private void updateInputOutput() { - int input = parsePower(maxInputTF); - if(input >= 0 && capBank.getMaxInput() != input) { - setMaxInput(input); - } - int output = parsePower(maxOutputTF); - if(output >= 0 && capBank.getMaxOutput() != output) { - setMaxOutput(output); - } - } - - private void setMaxOutput(int output) { - if(output != capBank.getMaxOutput()) { - capBank.setMaxOutput(output); - maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - } - - private void setMaxInput(int input) { - if(input != capBank.getMaxInput()) { - capBank.setMaxInput(input); - maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - } - - private int parsePower(GuiTextField tf) { - String txt = tf.getText(); - try { - Integer power = PowerDisplayUtil.parsePower(txt); - if(power == null) { - return -1; - } - return power.intValue(); - } catch (Exception e) { - return -1; - } - } - - @Override - protected void mouseClicked(int par1, int par2, int par3) { - super.mouseClicked(par1, par2, par3); - maxInputTF.mouseClicked(par1, par2, par3); - maxOutputTF.mouseClicked(par1, par2, par3); - } - - @Override - public void updateScreen() { - maxInputTF.updateCursorCounter(); - maxOutputTF.updateCursorCounter(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize - 21, this.ySize); - - int i1 = capBank.getEnergyStoredScaled(POWER_HEIGHT); - drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) this.buttonList.get(i); - guibutton.drawButton(this.mc, 0, 0); + @Override + protected String getLabelForMode(IoMode mode) { + if (mode == IoMode.PUSH) { + return EnderIO.lang.localize("gui.capBank.outputMode"); + } else if (mode == IoMode.PULL) { + return EnderIO.lang.localize("gui.capBank.inputMode"); + } + return super.getLabelForMode(mode); + } + }; + addOverlay(configOverlay); } - maxInputTF.drawTextBox(); - maxOutputTF.drawTextBox(); + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == CONFIG_ID) { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + } - int midX = sx + xSize / 2; + @Override + public void initGui() { + super.initGui(); - String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(capBank.getMaxIO()) + - " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - FontRenderer fontRenderer = getFontRenderer(); - int swid = fontRenderer.getStringWidth(str); - int x = midX - swid / 2; - int y = guiTop + 5; + configB.onGuiInit(); - drawString(fontRenderer, str, x, y, -1); + int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; + int y = guiTop + inputY; - str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + inputX - swid - 3; - y = guiTop + inputY + 2; - drawString(fontRenderer, str, x, y, -1); + FontRenderer fontRenderer = getFontRenderer(); - str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + outputX - swid - 3; - y = guiTop + outputY + 2; - drawString(fontRenderer, str, x, y, -1); + inputRsButton.onGuiInit(); + outputRsButton.onGuiInit(); - } + x = guiLeft + inputX; + y = guiTop + inputY; + maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); + maxInputTF.setCanLoseFocus(true); + maxInputTF.setMaxStringLength(10); + maxInputTF.setFocused(false); + maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - super.drawHoveringText(par1List, par2 + 24, par3, font); - GL11.glPopAttrib(); - GL11.glPopAttrib(); - } + x = guiLeft + outputX; + y = guiTop + outputY; + maxOutputTF = new GuiTextField(fontRenderer, x, y, 68, 16); + maxOutputTF.setCanLoseFocus(true); + maxOutputTF.setMaxStringLength(10); + maxOutputTF.setFocused(true); + maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); + } - @Override - public int getGuiLeft() { - return guiLeft + 24; - } + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + if (par1 == 'e') { + super.keyTyped(par1, 1); + } + maxInputTF.textboxKeyTyped(par1, par2); + maxOutputTF.textboxKeyTyped(par1, par2); + updateInputOutput(); + } - @Override - public int getGuiTop() { - return guiTop; - } + private void updateInputOutput() { + int input = parsePower(maxInputTF); + if (input >= 0 && capBank.getMaxInput() != input) { + setMaxInput(input); + } + int output = parsePower(maxOutputTF); + if (output >= 0 && capBank.getMaxOutput() != output) { + setMaxOutput(output); + } + } - @Override - public int getXSize() { - return xSize - 42; - } + private void setMaxOutput(int output) { + if (output != capBank.getMaxOutput()) { + capBank.setMaxOutput(output); + maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + } - @Override - public int getOverlayOffsetX() { - return 21; - } + private void setMaxInput(int input) { + if (input != capBank.getMaxInput()) { + capBank.setMaxInput(input); + maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); + PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + } - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } + private int parsePower(GuiTextField tf) { + String txt = tf.getText(); + try { + Integer power = PowerDisplayUtil.parsePower(txt); + if (power == null) { + return -1; + } + return power.intValue(); + } catch (Exception e) { + return -1; + } + } + @Override + protected void mouseClicked(int par1, int par2, int par3) { + super.mouseClicked(par1, par2, par3); + maxInputTF.mouseClicked(par1, par2, par3); + maxOutputTF.mouseClicked(par1, par2, par3); + } + + @Override + public void updateScreen() { + maxInputTF.updateCursorCounter(); + maxOutputTF.updateCursorCounter(); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize - 21, this.ySize); + + int i1 = capBank.getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) this.buttonList.get(i); + guibutton.drawButton(this.mc, 0, 0); + } + + maxInputTF.drawTextBox(); + maxOutputTF.drawTextBox(); + + int midX = sx + xSize / 2; + + String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(capBank.getMaxIO()) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + FontRenderer fontRenderer = getFontRenderer(); + int swid = fontRenderer.getStringWidth(str); + int x = midX - swid / 2; + int y = guiTop + 5; + + drawString(fontRenderer, str, x, y, -1); + + str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + inputX - swid - 3; + y = guiTop + inputY + 2; + drawString(fontRenderer, str, x, y, -1); + + str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + outputX - swid - 3; + y = guiTop + outputY + 2; + drawString(fontRenderer, str, x, y, -1); + } + + @Override + public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + super.drawHoveringText(par1List, par2 + 24, par3, font); + GL11.glPopAttrib(); + GL11.glPopAttrib(); + } + + @Override + public int getGuiLeft() { + return guiLeft + 24; + } + + @Override + public int getGuiTop() { + return guiTop; + } + + @Override + public int getXSize() { + return xSize - 42; + } + + @Override + public int getOverlayOffsetX() { + return 21; + } + + @Override + public FontRenderer getFontRenderer() { + return Minecraft.getMinecraft().fontRenderer; + } } diff --git a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java index cd6bd5e0..7b67941e 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java @@ -1,76 +1,73 @@ package crazypants.enderio.machine.power; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.RedstoneControlMode; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketClientState implements IMessage, IMessageHandler { +public class PacketClientState implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private RedstoneControlMode inputMode; - private RedstoneControlMode outputMode; - private int maxInput; - private int maxOutput; + private int x; + private int y; + private int z; + private RedstoneControlMode inputMode; + private RedstoneControlMode outputMode; + private int maxInput; + private int maxOutput; - public PacketClientState() { - } + public PacketClientState() {} - public PacketClientState(TileCapacitorBank capBank) { - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; + public PacketClientState(TileCapacitorBank capBank) { + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; - inputMode = capBank.getInputControlMode(); - outputMode = capBank.getOutputControlMode(); + inputMode = capBank.getInputControlMode(); + outputMode = capBank.getOutputControlMode(); - maxInput = capBank.getMaxInput(); - maxOutput = capBank.getMaxOutput(); - } - - @Override - public void toBytes(ByteBuf dos) { - dos.writeInt(x); - dos.writeInt(y); - dos.writeInt(z); - dos.writeShort((short) inputMode.ordinal()); - dos.writeShort((short) outputMode.ordinal()); - dos.writeInt(maxInput); - dos.writeInt(maxOutput); - } - - @Override - public void fromBytes(ByteBuf data) { - x = data.readInt(); - y = data.readInt(); - z = data.readInt(); - short inputOrdinal = data.readShort(); - short outputOrdinal = data.readShort(); - outputMode = RedstoneControlMode.values()[outputOrdinal]; - inputMode = RedstoneControlMode.values()[inputOrdinal]; - - maxInput = data.readInt(); - maxOutput = data.readInt(); - - } - - @Override - public IMessage onMessage(PacketClientState message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank cb = (TileCapacitorBank) te; - cb.setInputControlMode(message.inputMode); - cb.setOutputControlMode(message.outputMode); - cb.setMaxInput(message.maxInput); - cb.setMaxOutput(message.maxOutput); + maxInput = capBank.getMaxInput(); + maxOutput = capBank.getMaxOutput(); } - return null; - } + @Override + public void toBytes(ByteBuf dos) { + dos.writeInt(x); + dos.writeInt(y); + dos.writeInt(z); + dos.writeShort((short) inputMode.ordinal()); + dos.writeShort((short) outputMode.ordinal()); + dos.writeInt(maxInput); + dos.writeInt(maxOutput); + } + + @Override + public void fromBytes(ByteBuf data) { + x = data.readInt(); + y = data.readInt(); + z = data.readInt(); + short inputOrdinal = data.readShort(); + short outputOrdinal = data.readShort(); + outputMode = RedstoneControlMode.values()[outputOrdinal]; + inputMode = RedstoneControlMode.values()[inputOrdinal]; + + maxInput = data.readInt(); + maxOutput = data.readInt(); + } + + @Override + public IMessage onMessage(PacketClientState message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cb = (TileCapacitorBank) te; + cb.setInputControlMode(message.inputMode); + cb.setOutputControlMode(message.outputMode); + cb.setMaxInput(message.maxInput); + cb.setMaxOutput(message.maxOutput); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java index eb9abb29..8c6104f0 100644 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java @@ -1,88 +1,79 @@ package crazypants.enderio.machine.power; -import io.netty.buffer.ByteBuf; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class PacketPowerStorage implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private int storedEnergy; + private int x; + private int y; + private int z; + private int storedEnergy; - public PacketPowerStorage() { - } + public PacketPowerStorage() {} - public PacketPowerStorage(TileCapacitorBank ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - storedEnergy = ent.storedEnergyRF; - } + public PacketPowerStorage(TileCapacitorBank ent) { + x = ent.xCoord; + y = ent.yCoord; + z = ent.zCoord; + storedEnergy = ent.storedEnergyRF; + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(storedEnergy); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(storedEnergy); + } - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + storedEnergy = buf.readInt(); + } - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - storedEnergy = buf.readInt(); - } + @Override + public IMessage onMessage(PacketPowerStorage message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank me = (TileCapacitorBank) te; + me.storedEnergyRF = message.storedEnergy; - @Override - public IMessage onMessage(PacketPowerStorage message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank me = (TileCapacitorBank) te; - me.storedEnergyRF = message.storedEnergy; - - double dif = Math.abs(me.lastRenderStoredRatio - me.getEnergyStoredRatio()); - if(dif > 0.025) { //update rendering at a 2.5% diff - if(!me.isMultiblock()) { - player.worldObj.markBlockForUpdate(message.x, message.y, message.z); - } else { - BlockCoord[] mb = me.multiblock; - for (BlockCoord bc : mb) { - updateGaugeRender(player.worldObj, bc); - } + double dif = Math.abs(me.lastRenderStoredRatio - me.getEnergyStoredRatio()); + if (dif > 0.025) { // update rendering at a 2.5% diff + if (!me.isMultiblock()) { + player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + } else { + BlockCoord[] mb = me.multiblock; + for (BlockCoord bc : mb) { + updateGaugeRender(player.worldObj, bc); + } + } + } } - - } - } - return null; - } - - private void updateGaugeRender(World worldObj, BlockCoord bc) { - TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank me = (TileCapacitorBank) te; - List gb = me.getGaugeBounds(); - if(gb != null && !gb.isEmpty()) { - worldObj.markBlockForUpdate(bc.x, bc.y, bc.z); - } + return null; } - } - + private void updateGaugeRender(World worldObj, BlockCoord bc) { + TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank me = (TileCapacitorBank) te; + List gb = me.getGaugeBounds(); + if (gb != null && !gb.isEmpty()) { + worldObj.markBlockForUpdate(bc.x, bc.y, bc.z); + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 30f084a0..3ac52195 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -1,126 +1,124 @@ package crazypants.enderio.machine.power; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.NumberFormat; - -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.item.ItemStack; public class PowerDisplayUtil { - public static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); - public static final NumberFormat FLOAT_NF = NumberFormat.getInstance(); - - //Handle french local 'non breaking space' character used to separate thousands. - //This is not rendered correctly and cannot be parsed by minecraft so replace it with a regular space - private static final boolean REPLACE_NBSP; - private static final char NBSP = (char)160; - static { - boolean res = false; - if(INT_NF instanceof DecimalFormat) { - DecimalFormatSymbols syms = ((DecimalFormat)INT_NF).getDecimalFormatSymbols(); - if(syms.getGroupingSeparator() == NBSP) { - res = true; - } - - } - REPLACE_NBSP = res; - } + public static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); + public static final NumberFormat FLOAT_NF = NumberFormat.getInstance(); - public static String perTickStr() { - return EnderIO.lang.localize("power.tick"); - } + // Handle french local 'non breaking space' character used to separate thousands. + // This is not rendered correctly and cannot be parsed by minecraft so replace it with a regular space + private static final boolean REPLACE_NBSP; + private static final char NBSP = (char) 160; - public static String ofStr() { - return EnderIO.lang.localize("gui.powerMonitor.of"); - } - - static { - FLOAT_NF.setMinimumFractionDigits(1); - FLOAT_NF.setMaximumFractionDigits(1); - } - - public static String getStoredEnergyString(ItemStack item) { - if(item == null) { - return null; - } - if(! (item.getItem() instanceof IEnergyContainerItem) ) { - return null; + static { + boolean res = false; + if (INT_NF instanceof DecimalFormat) { + DecimalFormatSymbols syms = ((DecimalFormat) INT_NF).getDecimalFormatSymbols(); + if (syms.getGroupingSeparator() == NBSP) { + res = true; + } + } + REPLACE_NBSP = res; } - IEnergyContainerItem ci = (IEnergyContainerItem)item.getItem(); - return EnderIO.lang.localize("item.tooltip.power")+ " "+ PowerDisplayUtil.formatPower(ci.getEnergyStored(item)) + "/" - + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item)) + " " + PowerDisplayUtil.abrevation(); - } - - public static String formatPowerPerTick(int powerPerTick) { - return formatPower(powerPerTick) + " " + abrevation() + perTickStr(); - } - - public static String formatStoredPower(int amount, int capacity) { - return formatPower(amount) + "/" + formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); - } - - public static String formatPower(long amount) { - String str = INT_NF.format(amount); - if(REPLACE_NBSP) { - str = str.replace(NBSP, ' '); + public static String perTickStr() { + return EnderIO.lang.localize("power.tick"); } - return str; - } - - public static String formatPower(int powerRF) { - String str = INT_NF.format(powerRF); - if(REPLACE_NBSP) { - str = str.replace(NBSP, ' '); + public static String ofStr() { + return EnderIO.lang.localize("gui.powerMonitor.of"); } - return str; - } - - public static String formatPowerFloat(float averageRfTickSent) { - return FLOAT_NF.format(averageRfTickSent); - } - public static Integer parsePower(String power) { - if(power == null) { - return null; + static { + FLOAT_NF.setMinimumFractionDigits(1); + FLOAT_NF.setMaximumFractionDigits(1); } - try { - if(REPLACE_NBSP) { - power = power.replace(' ', NBSP); - } - Number d = INT_NF.parse(power); - if(d == null) { - return null; - } - return d.intValue(); - } catch (Exception e) { - return null; - } - } - public static String abrevation() { - return EnderIO.lang.localize("power.rf"); - } - - @SideOnly(Side.CLIENT) - public static int parsePower(GuiTextField tf) { - String txt = tf.getText(); - try { - Integer power = PowerDisplayUtil.parsePower(txt); - if(power == null) { - return -1; - } - return power.intValue(); - } catch (Exception e) { - return -1; - } - } + public static String getStoredEnergyString(ItemStack item) { + if (item == null) { + return null; + } + if (!(item.getItem() instanceof IEnergyContainerItem)) { + return null; + } + IEnergyContainerItem ci = (IEnergyContainerItem) item.getItem(); + return EnderIO.lang.localize("item.tooltip.power") + " " + + PowerDisplayUtil.formatPower(ci.getEnergyStored(item)) + "/" + + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item)) + " " + PowerDisplayUtil.abrevation(); + } + + public static String formatPowerPerTick(int powerPerTick) { + return formatPower(powerPerTick) + " " + abrevation() + perTickStr(); + } + + public static String formatStoredPower(int amount, int capacity) { + return formatPower(amount) + "/" + formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); + } + + public static String formatPower(long amount) { + String str = INT_NF.format(amount); + if (REPLACE_NBSP) { + str = str.replace(NBSP, ' '); + } + return str; + } + + public static String formatPower(int powerRF) { + String str = INT_NF.format(powerRF); + if (REPLACE_NBSP) { + str = str.replace(NBSP, ' '); + } + return str; + } + + public static String formatPowerFloat(float averageRfTickSent) { + return FLOAT_NF.format(averageRfTickSent); + } + + public static Integer parsePower(String power) { + if (power == null) { + return null; + } + try { + if (REPLACE_NBSP) { + power = power.replace(' ', NBSP); + } + Number d = INT_NF.parse(power); + if (d == null) { + return null; + } + return d.intValue(); + } catch (Exception e) { + return null; + } + } + + public static String abrevation() { + return EnderIO.lang.localize("power.rf"); + } + + @SideOnly(Side.CLIENT) + public static int parsePower(GuiTextField tf) { + String txt = tf.getText(); + try { + Integer power = PowerDisplayUtil.parsePower(txt); + if (power == null) { + return -1; + } + return power.intValue(); + } catch (Exception e) { + return -1; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 11d0bee0..a3a92c97 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -1,27 +1,9 @@ package crazypants.enderio.machine.power; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.VecmathUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.conduit.ConnectionMode; @@ -38,1146 +20,1162 @@ import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraftforge.common.util.ForgeDirection; -public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHandler, IInventory, IIoConfigurable, IPowerStorage { +public class TileCapacitorBank extends TileEntityEio + implements IInternalPowerHandler, IInventory, IIoConfigurable, IPowerStorage { - static final BasicCapacitor BASE_CAP = new BasicCapacitor(Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF); + static final BasicCapacitor BASE_CAP = + new BasicCapacitor(Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF); - private static final int MAX_SIZE = Integer.MAX_VALUE / Config.capacitorBankMaxStorageRF; + private static final int MAX_SIZE = Integer.MAX_VALUE / Config.capacitorBankMaxStorageRF; - BlockCoord[] multiblock = null; + BlockCoord[] multiblock = null; - private int lastSyncPowerStored; + private int lastSyncPowerStored; - int storedEnergyRF; + int storedEnergyRF; - private int maxStoredEnergy; + private int maxStoredEnergy; - private int maxIO; + private int maxIO; - private int maxInput; + private int maxInput; - private int maxOutput; + private int maxOutput; - private boolean multiblockDirty = false; + private boolean multiblockDirty = false; - private RedstoneControlMode inputControlMode; + private RedstoneControlMode inputControlMode; - private RedstoneControlMode outputControlMode; + private RedstoneControlMode outputControlMode; - private boolean outputEnabled; + private boolean outputEnabled; - private boolean inputEnabled; + private boolean inputEnabled; - private boolean isRecievingRedstoneSignal; + private boolean isRecievingRedstoneSignal; - private boolean redstoneStateDirty = true; - private int lastComparatorState = 0; + private boolean redstoneStateDirty = true; + private int lastComparatorState = 0; - private List masterReceptors; - private ListIterator receptorIterator; + private List masterReceptors; + private ListIterator receptorIterator; - private List localReceptors; - private boolean receptorsDirty = true; + private List localReceptors; + private boolean receptorsDirty = true; - private final ItemStack[] inventory; + private final ItemStack[] inventory; - private List gaugeBounds; + private List gaugeBounds; - private Map faceModes; + private Map faceModes; - private boolean render = false; + private boolean render = false; - private boolean masterReceptorsDirty; + private boolean masterReceptorsDirty; - private boolean notifyNeighbours = false; + private boolean notifyNeighbours = false; - int energyAtLastRender = -1; + int energyAtLastRender = -1; - private boolean isCreative = false; + private boolean isCreative = false; - double lastRenderStoredRatio; + double lastRenderStoredRatio; - public TileCapacitorBank() { - inventory = new ItemStack[4]; - storedEnergyRF = 0; - inputControlMode = RedstoneControlMode.IGNORE; - outputControlMode = RedstoneControlMode.IGNORE; - maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); - maxIO = BASE_CAP.getMaxEnergyExtracted(); - maxInput = maxIO; - maxOutput = maxIO; - } - - @Override - public IoMode toggleIoModeForFace(ForgeDirection faceHit) { - IPowerInterface rec = getReceptorForFace(faceHit); - IoMode curMode = getIoMode(faceHit); - if(curMode == IoMode.PULL) { - setIoMode(faceHit, IoMode.PUSH, true); - return IoMode.PUSH; - } - if(curMode == IoMode.PUSH) { - setIoMode(faceHit, IoMode.DISABLED, true); - return IoMode.DISABLED; - } - if(curMode == IoMode.DISABLED) { - if(rec == null || rec.getDelegate() instanceof IConduitBundle) { - setIoMode(faceHit, IoMode.NONE, true); - return IoMode.NONE; - } - } - setIoMode(faceHit, IoMode.PULL, true); - return IoMode.PULL; - } - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - IPowerInterface rec = getReceptorForFace(faceHit); - if(mode == IoMode.NONE) { - return rec == null || rec.getDelegate() instanceof IConduitBundle; - } - return true; - } - - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - setIoMode(faceHit, mode, true); - } - - @Override - public void clearAllIoModes() { - if(faceModes != null) { - faceModes = null; - receptorsDirty = true; - getController().masterReceptorsDirty = true; - notifyNeighbours = true; - render = true; - updateBlock(); - } - } - - public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { - if(mode == IoMode.NONE && faceModes == null) { - return; - } - if(faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); - } - faceModes.put(faceHit, mode); - if(updateReceptors) { - receptorsDirty = true; - getController().masterReceptorsDirty = true; - notifyNeighbours = true; - } - render = true; - - updateBlock(); - } - - @Override - public IoMode getIoMode(ForgeDirection face) { - if(faceModes == null) { - return IoMode.NONE; - } - IoMode res = faceModes.get(face); - if(res == null) { - return IoMode.NONE; - } - return res; - } - - private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { - BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(!(te instanceof TileCapacitorBank)) { - return PowerHandlerUtil.create(te); - } - return null; - } - - @Override - public void doUpdate() { - if(blockMetadata == -1) { - isCreative = getBlockMetadata() == 1; - } - - if(worldObj.isRemote) { - if(render) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - render = false; - } - return; - } // else is server, do all logic only on the server - - if(multiblockDirty) { - formMultiblock(); - multiblockDirty = false; - } - - // update any comparators, since they don't check themselves - int comparatorState = getComparatorOutput(); - if (lastComparatorState != comparatorState) { - worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); - lastComparatorState = comparatorState; - } - - if(!isContoller()) { - if(notifyNeighbours) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - notifyNeighbours = false; - } - return; - } - - chargeItems(); - - boolean hasSignal = isRecievingRedstoneSignal(); - if(inputControlMode == RedstoneControlMode.IGNORE) { - inputEnabled = true; - } else if(inputControlMode == RedstoneControlMode.NEVER) { - inputEnabled = false; - } else { - inputEnabled = (inputControlMode == RedstoneControlMode.ON && hasSignal) || (inputControlMode == RedstoneControlMode.OFF && !hasSignal); - } - if(outputControlMode == RedstoneControlMode.IGNORE) { - outputEnabled = true; - } else if(outputControlMode == RedstoneControlMode.NEVER) { - outputEnabled = false; - } else { - outputEnabled = (outputControlMode == RedstoneControlMode.ON && hasSignal) || (outputControlMode == RedstoneControlMode.OFF && !hasSignal); - } - - updateMasterReceptors(); - if(outputEnabled) { - transmitEnergy(); - } - - if(isCreative) { - setEnergyStored(getMaxEnergyStored() / 2); - } - - if(lastSyncPowerStored != getEnergyStored() && shouldDoWorkThisTick(10)) { - lastSyncPowerStored = getEnergyStored(); - PacketHandler.sendToAllAround(new PacketPowerStorage(this), this, 64); - } - - if(notifyNeighbours) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - notifyNeighbours = false; - } - } - - public int getComparatorOutput() { - double stored = getEnergyStored(); - return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14); - } - - public List getGaugeBounds() { - if(gaugeBounds == null) { - gaugeBounds = GaugeBounds.calculateGaugeBounds(new BlockCoord(this), multiblock); - } - return gaugeBounds; - } - - public boolean chargeItems(ItemStack[] items) { - boolean chargedItem = false; - int available = Math.min(maxIO, getEnergyStored()); - for (ItemStack item : items) { - if(item != null && available > 0) { - int used = 0; - if(item.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - - int max = chargable.getMaxEnergyStored(item); - int cur = chargable.getEnergyStored(item); - int canUse = Math.min(available, max - cur); - if(cur < max) { - used = chargable.receiveEnergy(item, canUse, false); - } - - } - if(used > 0) { - setEnergyStored(getEnergyStored() - used); - chargedItem = true; - available -= used; - } - } - } - return chargedItem; - } - - private void chargeItems() { - boolean chargedItem = chargeItems(inventory); - if(chargedItem) { - markDirty(); - } - } - - public boolean isOutputEnabled() { - return getController().outputEnabled; - } - - @Override - public boolean isOutputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); - } - - public boolean isInputEnabled() { - return getController().inputEnabled; - } - - @Override - public boolean isInputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); - } - - @Override - public boolean isNetworkControlledIo(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.NONE || mode == IoMode.PULL; - } - - private boolean transmitEnergy() { - - if(getEnergyStored() <= 0) { - return false; - } - int canTransmit = Math.min(getEnergyStored(), maxOutput); - int transmitted = 0; - - if(!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = masterReceptors.listIterator(); - } - - int appliedCount = 0; - int numReceptors = masterReceptors.size(); - while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { - - Receptor receptor = receptorIterator.next(); - IPowerInterface powerInterface = receptor.receptor; - IoMode mode = receptor.mode; - if(powerInterface != null - && mode != IoMode.PULL && mode != IoMode.DISABLED - && powerInterface.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - double used; - if(receptor.receptor.getDelegate() instanceof IConduitBundle && !isCreative) { - //All other power transfer is handled by the conduit network - IConduitBundle bundle = (IConduitBundle) receptor.receptor.getDelegate(); - IPowerConduit conduit = bundle.getConduit(IPowerConduit.class); - if(conduit != null && conduit.getConnectionMode(receptor.fromDir.getOpposite()) == ConnectionMode.INPUT) { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - } else { - used = 0; - } - } else { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - } - - transmitted += used; - canTransmit -= used; - } - - if(canTransmit <= 0) { - break; - } - - if(!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = masterReceptors.listIterator(); - } - appliedCount++; - } - setEnergyStored(getEnergyStored() - transmitted); - - return transmitted > 0; - - } - - private void updateMasterReceptors() { - if(!masterReceptorsDirty && masterReceptors != null) { - return; - } - - if(masterReceptors == null) { - masterReceptors = new ArrayList(); - } - masterReceptors.clear(); - - if(multiblock == null) { - updateReceptors(); - if(localReceptors != null) { - masterReceptors.addAll(localReceptors); - } - } else { - //TODO: Performance warning?? - for (BlockCoord bc : multiblock) { - TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if(te instanceof TileCapacitorBank) { - TileCapacitorBank cb = ((TileCapacitorBank) te); - cb.updateReceptors(); - if(cb.localReceptors != null) { - masterReceptors.addAll(cb.localReceptors); - } - } - } - } - - receptorIterator = masterReceptors.listIterator(); - masterReceptorsDirty = false; - } - - private void updateReceptors() { - - if(!receptorsDirty) { - return; - } - if(localReceptors != null) { - localReceptors.clear(); - } - - BlockCoord bc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IoMode mode = getIoMode(dir); - if(mode != IoMode.DISABLED) { - BlockCoord checkLoc = bc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(!(te instanceof TileCapacitorBank)) { - IPowerInterface ph = PowerHandlerUtil.create(te); - if(ph != null && ph.canConduitConnect(dir)) { - if(localReceptors == null) { - localReceptors = new ArrayList(); - } - Receptor r = new Receptor(ph, dir, mode); - localReceptors.add(r); - if(mode == IoMode.NONE && !(ph.getDelegate() instanceof IInternalPoweredTile)) { - setIoMode(dir, IoMode.PULL, false); - r.mode = IoMode.PULL; - render = true; - } - } - } - } - } - - receptorsDirty = false; - } - - // ------------ Multiblock overrides - - public int getEnergyStoredScaled(int scale) { - return getController().doGetEnergyStoredScaled(scale); - } - - @Override - public int getMaxInput() { - return maxInput; - } - - public void setMaxInput(int maxInput) { - getController().doSetMaxInput(maxInput); - updateBlock(); - } - - @Override - public int getMaxOutput() { - return maxOutput; - } - - public void setMaxOutput(int maxOutput) { - getController().doSetMaxOutput(maxOutput); - updateBlock(); - } - - @Override - public int getEnergyStored() { - return getController().doGetEnergyStored(); - } - - @Override - public long getEnergyStoredL() { - return getEnergyStored(); - } - - public double getEnergyStoredRatio() { - return getController().doGetEnergyStoredRatio(); - } - - @Override - public int getMaxEnergyStored() { - return getController().doGetMaxEnergyStored(); - } - - @Override - public long getMaxEnergyStoredL() { - return getMaxEnergyStored(); - } - - public int getMaxIO() { - return getController().doGetMaxIO(); - } - - // RF Power - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - getController().doSetEnergyStored(stored); - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return getIoMode(from) != IoMode.DISABLED; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - IoMode mode = getIoMode(from); - if(mode == IoMode.DISABLED || mode == IoMode.PUSH) { - return 0; - } - return getController().doReceiveEnergy(from, maxReceive, simulate); - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getController().doGetEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getController().doGetMaxEnergyStored(); - } - - public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - - public int doGetEnergyStored(ForgeDirection from) { - return doGetEnergyStored(); - } - - public int doGetMaxEnergyStored(ForgeDirection from) { - return doGetMaxEnergyStored(); - } - - // end rf power - - @Override - public void addEnergy(int add) { - getController().doAddEnergy(add); - } - - private boolean isRecievingRedstoneSignal() { - if(!redstoneStateDirty) { - return isRecievingRedstoneSignal; - } - - isRecievingRedstoneSignal = false; - redstoneStateDirty = false; - - if(!isMultiblock()) { - isRecievingRedstoneSignal = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; - } else { - for (BlockCoord bc : multiblock) { - if(worldObj.getStrongestIndirectPower(bc.x, bc.y, bc.z) > 0) { - isRecievingRedstoneSignal = true; - break; - } - } - } - return isRecievingRedstoneSignal; - } - - public RedstoneControlMode getInputControlMode() { - return inputControlMode; - } - - public void setInputControlMode(RedstoneControlMode inputControlMode) { - if(!isMultiblock()) { - this.inputControlMode = inputControlMode; - } else { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if(cp != null) { - cp.inputControlMode = inputControlMode; - } - } - } - } - - public RedstoneControlMode getOutputControlMode() { - return outputControlMode; - } - - public void setOutputControlMode(RedstoneControlMode outputControlMode) { - if(!isMultiblock()) { - this.outputControlMode = outputControlMode; - } else { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if(cp != null) { - cp.outputControlMode = outputControlMode; - } - } - } - } - - // ------------ Multiblock implementations - - int doGetMaxIO() { - return maxIO; - } - - int doGetMaxEnergyStored() { - return maxStoredEnergy; - } - - int doGetEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * doGetEnergyStoredRatio()), 0, scale); - } - - int doGetEnergyStored() { - return storedEnergyRF; - } - - void doSetEnergyStored(int stored) { - storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - double doGetEnergyStoredRatio() { - return (double) doGetEnergyStored() / maxStoredEnergy; - } - - void doAddEnergy(int add) { - doSetEnergyStored(doGetEnergyStored() + add); - } - - void doSetMaxInput(int in) { - maxInput = Math.min(in, maxIO); - maxInput = Math.max(0, maxInput); - if(isMultiblock()) { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if(cp != null) { - cp.maxInput = maxInput; - } - } - } - } - - void doSetMaxOutput(int out) { - maxOutput = Math.min(out, maxIO); - maxOutput = Math.max(0, maxOutput); - if(isMultiblock()) { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if(cp != null) { - cp.maxOutput = maxOutput; - } - } - } - } - - // ------------ Multiblock management - - public void onBlockAdded() { - multiblockDirty = true; - } - - public void onNeighborBlockChange(Block block) { - if(block != EnderIO.blockCapacitorBank) { - receptorsDirty = true; - getController().masterReceptorsDirty = true; - getController().redstoneStateDirty = true; - } - redstoneStateDirty = true; - } - - public void onBreakBlock() { - TileCapacitorBank controller = getController(); - controller.clearCurrentMultiblock(); - } - - private void clearCurrentMultiblock() { - if(multiblock == null) { - return; - } - for (BlockCoord bc : multiblock) { - TileCapacitorBank res = getCapBank(bc); - if(res != null) { - res.setMultiblock(null); - - } - } - multiblock = null; - redstoneStateDirty = true; - } - - private void formMultiblock() { - - if(isCreative || isMaxSize()) { - return; - } - List blocks = new ArrayList(); - blocks.add(this); - findNighbouringBanks(this, blocks); - - if(blocks.size() < 2) { - return; - } - for (TileCapacitorBank cb : blocks) { - cb.clearCurrentMultiblock(); - } - - BlockCoord[] mb = new BlockCoord[blocks.size()]; - for (int i = 0; i < blocks.size(); i++) { - mb[i] = new BlockCoord(blocks.get(i)); - } - - TileCapacitorBank secondary = blocks.get(1); - maxInput = maxOutput = -1; - - if(secondary.maxInput != secondary.maxIO) { - maxInput = secondary.maxInput; - } - - if(secondary.maxOutput != secondary.maxIO) { - maxOutput = secondary.maxOutput; - } - - for (TileCapacitorBank cb : blocks) { - cb.setMultiblock(mb); - } - } - - private void findNighbouringBanks(TileCapacitorBank tileCapacitorBank, List blocks) { - if(isCreative || blocks.size() >= MAX_SIZE) { - return; - } - BlockCoord bc = new BlockCoord(tileCapacitorBank); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileCapacitorBank cb = getCapBank(bc.getLocation(dir)); - if(cb != null && !blocks.contains(cb) && !cb.isCreative && !cb.isMaxSize()) { - if(blocks.size() >= MAX_SIZE) { - return; - } - blocks.add(cb); - findNighbouringBanks(cb, blocks); - } - } - } - - private void setMultiblock(BlockCoord[] mb) { - - if(multiblock != null && isMaster()) { - - // split up current multiblock and reconfigure all the internal capacitors - int powerPerBlock = storedEnergyRF / multiblock.length; - int remaining = storedEnergyRF % multiblock.length; - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if(cb != null) { - cb.maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); - cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); - cb.maxInput = Math.min(cb.maxInput, cb.maxIO); - cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); - cb.doSetEnergyStored(powerPerBlock); - cb.multiblockDirty = true; - } - } - doAddEnergy(remaining); - - } - multiblock = mb; - if(isMaster()) { - - List invItems = new ArrayList(); - - int totalStored = 0; - int totalCap = multiblock.length * BASE_CAP.getMaxEnergyStored(); - int totalIO = multiblock.length * BASE_CAP.getMaxEnergyExtracted(); - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if(cb != null) { - totalStored += cb.doGetEnergyStored(); - } - ItemStack[] inv = cb.inventory; - for (int i = 0; i < inv.length; i++) { - if(inv[i] != null) { - invItems.add(inv[i]); - inv[i] = null; - } - } - cb.multiblockDirty = false; - } - maxStoredEnergy = totalCap; - doSetEnergyStored(totalStored); - maxIO = totalIO; - maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); - maxOutput = maxOutput < 0 ? maxIO : Math.min(maxOutput, maxIO); - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if(cb != null && cb != this) { - cb.maxIO = totalIO; - cb.maxInput = maxInput; - cb.maxOutput = maxOutput; - } - } - - if(invItems.size() > inventory.length) { - for (int i = inventory.length; i < invItems.size(); i++) { - Util.dropItems(worldObj, invItems.get(i), xCoord, yCoord, zCoord, true); - } - } - for (int i = 0; i < inventory.length && i < invItems.size(); i++) { - inventory[i] = invItems.get(i); - } - } - receptorsDirty = true; - getController().masterReceptorsDirty = true; - redstoneStateDirty = true; - - // Forces an update - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - render = true; - } - - @Override - public TileCapacitorBank getController() { - if(isMaster() || !isMultiblock()) { - return this; - } - TileCapacitorBank res = getCapBank(multiblock[0]); - return res != null ? res : this; - } - - boolean isContoller() { - return multiblock == null ? true : isMaster(); - } - - boolean isMaster() { - if(multiblock != null) { - return multiblock[0].equals(xCoord, yCoord, zCoord); - } - return false; - } - - public boolean isMultiblock() { - return multiblock != null; - } - - private boolean isCurrentMultiblockValid() { - if(multiblock == null) { - return false; - } - for (BlockCoord bc : multiblock) { - TileCapacitorBank res = getCapBank(bc); - if(res == null || !res.isMultiblock()) { - return false; - } - } - return true; - } - - private TileCapacitorBank getCapBank(BlockCoord bc) { - return getCapBank(bc.x, bc.y, bc.z); - } - - private TileCapacitorBank getCapBank(int x, int y, int z) { - if(worldObj == null) { - return null; - } - TileEntity te = worldObj.getTileEntity(x, y, z); - if(te instanceof TileCapacitorBank) { - return (TileCapacitorBank) te; - } - return null; - } - - // ------------- Inventory - - @Override - public int getSizeInventory() { - return getController().doGetSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getController().doGetStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getController().doDecrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getController().doSetInventorySlotContents(i, itemstack); - } - - public ItemStack doGetStackInSlot(int i) { - if(i < 0 || i >= inventory.length) { - return null; - } - return inventory[i]; - } - - public int doGetSizeInventory() { - return inventory.length; - } - - public ItemStack doDecrStackSize(int fromSlot, int amount) { - if(fromSlot < 0 || fromSlot >= inventory.length) { - return null; - } - ItemStack item = inventory[fromSlot]; - if(item == null) { - return null; - } - if(item.stackSize <= amount) { - ItemStack result = item.copy(); - inventory[fromSlot] = null; - return result; - } - item.stackSize -= amount; - return item.copy(); - } - - public void doSetInventorySlotContents(int i, ItemStack itemstack) { - if(i < 0 || i >= inventory.length) { - return; - } - inventory[i] = itemstack; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public String getInventoryName() { - return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null) { - return false; - } - return itemstack.getItem() instanceof IEnergyContainerItem; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - - if(nbtRoot.hasKey("maxStoredEnergy")) { - nbtRoot.setInteger("maxStoredEnergyRF", nbtRoot.getInteger("maxStoredEnergy") * 10); - } - maxStoredEnergy = nbtRoot.getInteger("maxStoredEnergyRF"); - - double oldEnergy = storedEnergyRF; - if(nbtRoot.hasKey("storedEnergyD")) { - nbtRoot.setInteger("storedEnergyRF", (int) (nbtRoot.getDouble("storedEnergyD") * 10)); - } - doSetEnergyStored(nbtRoot.getInteger("storedEnergyRF")); - - double newEnergy = storedEnergyRF; - if(maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / maxStoredEnergy > 0.05 || nbtRoot.hasKey("render")) { - render = true; - } - if(energyAtLastRender != -1 && maxStoredEnergy != 0) { - double change = Math.abs(energyAtLastRender - storedEnergyRF) / (double) maxStoredEnergy; - if(change > 0.05) { - render = true; - } - } - - if(nbtRoot.hasKey("maxIO")) { - nbtRoot.setInteger("maxIoRF", nbtRoot.getInteger("maxIO") * 10); - } - maxIO = nbtRoot.getInteger("maxIoRF"); - - if(nbtRoot.hasKey("maxInput")) { - nbtRoot.setInteger("maxInputRF", nbtRoot.getInteger("maxInput") * 10); - } - if(nbtRoot.hasKey("maxInputRF")) { - maxInput = nbtRoot.getInteger("maxInputRF"); - } else { - maxOutput = maxIO; - } - - if(nbtRoot.hasKey("maxOutput")) { - nbtRoot.setInteger("maxOuputRF", nbtRoot.getInteger("maxOuput") * 10); - } - if(nbtRoot.hasKey("maxOutputRF")) { - maxOutput = nbtRoot.getInteger("maxOutputRF"); - } else { - maxInput = maxIO; - } - - inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; - outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; - - boolean wasMulti = isMultiblock(); - if(nbtRoot.getBoolean("isMultiblock")) { - int[] coords = nbtRoot.getIntArray("multiblock"); - multiblock = new BlockCoord[coords.length / 3]; - int c = 0; - for (int i = 0; i < multiblock.length; i++) { - multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); - } - - } else { - multiblock = null; - } - - for (int i = 0; i < inventory.length; i++) { - inventory[i] = null; - } - - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inventory.length) { - inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); - } - } - } - - if(nbtRoot.hasKey("hasFaces")) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(nbtRoot.hasKey("face" + dir.ordinal())) { - setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())], false); - } - } - } - gaugeBounds = null; - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - - nbtRoot.setDouble("storedEnergyRF", storedEnergyRF); - nbtRoot.setInteger("maxStoredEnergyRF", maxStoredEnergy); - nbtRoot.setInteger("maxIoRF", maxIO); - nbtRoot.setInteger("maxInputRF", maxInput); - nbtRoot.setInteger("maxOutputRF", maxOutput); - nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); - nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); - - nbtRoot.setBoolean("isMultiblock", isMultiblock()); - if(isMultiblock()) { - int[] vals = new int[multiblock.length * 3]; - int i = 0; - for (BlockCoord bc : multiblock) { - vals[i++] = bc.x; - vals[i++] = bc.y; - vals[i++] = bc.z; - } - nbtRoot.setIntArray("multiblock", vals); - } - - // write inventory list - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inventory.length; i++) { - if(inventory[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inventory[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - } - nbtRoot.setTag("Items", itemList); - - //face modes - if(faceModes != null) { - nbtRoot.setByte("hasFaces", (byte) 1); - for (Entry e : faceModes.entrySet()) { - nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); - } - } - - if(render) { - nbtRoot.setBoolean("render", true); - render = false; - } - } - - static class Receptor { - IPowerInterface receptor; - ForgeDirection fromDir; - IoMode mode; - - private Receptor(IPowerInterface rec, ForgeDirection fromDir, IoMode mode) { - receptor = rec; - this.fromDir = fromDir; - this.mode = mode; + public TileCapacitorBank() { + inventory = new ItemStack[4]; + storedEnergyRF = 0; + inputControlMode = RedstoneControlMode.IGNORE; + outputControlMode = RedstoneControlMode.IGNORE; + maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); + maxIO = BASE_CAP.getMaxEnergyExtracted(); + maxInput = maxIO; + maxOutput = maxIO; } @Override - public String toString() { - return "Receptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + "]"; + public IoMode toggleIoModeForFace(ForgeDirection faceHit) { + IPowerInterface rec = getReceptorForFace(faceHit); + IoMode curMode = getIoMode(faceHit); + if (curMode == IoMode.PULL) { + setIoMode(faceHit, IoMode.PUSH, true); + return IoMode.PUSH; + } + if (curMode == IoMode.PUSH) { + setIoMode(faceHit, IoMode.DISABLED, true); + return IoMode.DISABLED; + } + if (curMode == IoMode.DISABLED) { + if (rec == null || rec.getDelegate() instanceof IConduitBundle) { + setIoMode(faceHit, IoMode.NONE, true); + return IoMode.NONE; + } + } + setIoMode(faceHit, IoMode.PULL, true); + return IoMode.PULL; } - } + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + IPowerInterface rec = getReceptorForFace(faceHit); + if (mode == IoMode.NONE) { + return rec == null || rec.getDelegate() instanceof IConduitBundle; + } + return true; + } - @Override - public boolean hasCustomInventoryName() { + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) { + setIoMode(faceHit, mode, true); + } - return false; - } + @Override + public void clearAllIoModes() { + if (faceModes != null) { + faceModes = null; + receptorsDirty = true; + getController().masterReceptorsDirty = true; + notifyNeighbours = true; + render = true; + updateBlock(); + } + } - public void setCreativeMode() { - isCreative = true; - maxIO = maxIO * 1000; - maxInput = maxIO; - maxOutput = maxIO; - } + public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { + if (mode == IoMode.NONE && faceModes == null) { + return; + } + if (faceModes == null) { + faceModes = new EnumMap(ForgeDirection.class); + } + faceModes.put(faceHit, mode); + if (updateReceptors) { + receptorsDirty = true; + getController().masterReceptorsDirty = true; + notifyNeighbours = true; + } + render = true; - @Override - public boolean isCreative() { - return isCreative; - } + updateBlock(); + } - public boolean isMaxSize() { - return isMultiblock() && multiblock.length >= MAX_SIZE; - } + @Override + public IoMode getIoMode(ForgeDirection face) { + if (faceModes == null) { + return IoMode.NONE; + } + IoMode res = faceModes.get(face); + if (res == null) { + return IoMode.NONE; + } + return res; + } - @Override - public boolean displayPower() { - return true; - } + private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { + BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (!(te instanceof TileCapacitorBank)) { + return PowerHandlerUtil.create(te); + } + return null; + } + + @Override + public void doUpdate() { + if (blockMetadata == -1) { + isCreative = getBlockMetadata() == 1; + } + + if (worldObj.isRemote) { + if (render) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + render = false; + } + return; + } // else is server, do all logic only on the server + + if (multiblockDirty) { + formMultiblock(); + multiblockDirty = false; + } + + // update any comparators, since they don't check themselves + int comparatorState = getComparatorOutput(); + if (lastComparatorState != comparatorState) { + worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); + lastComparatorState = comparatorState; + } + + if (!isContoller()) { + if (notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + notifyNeighbours = false; + } + return; + } + + chargeItems(); + + boolean hasSignal = isRecievingRedstoneSignal(); + if (inputControlMode == RedstoneControlMode.IGNORE) { + inputEnabled = true; + } else if (inputControlMode == RedstoneControlMode.NEVER) { + inputEnabled = false; + } else { + inputEnabled = (inputControlMode == RedstoneControlMode.ON && hasSignal) + || (inputControlMode == RedstoneControlMode.OFF && !hasSignal); + } + if (outputControlMode == RedstoneControlMode.IGNORE) { + outputEnabled = true; + } else if (outputControlMode == RedstoneControlMode.NEVER) { + outputEnabled = false; + } else { + outputEnabled = (outputControlMode == RedstoneControlMode.ON && hasSignal) + || (outputControlMode == RedstoneControlMode.OFF && !hasSignal); + } + + updateMasterReceptors(); + if (outputEnabled) { + transmitEnergy(); + } + + if (isCreative) { + setEnergyStored(getMaxEnergyStored() / 2); + } + + if (lastSyncPowerStored != getEnergyStored() && shouldDoWorkThisTick(10)) { + lastSyncPowerStored = getEnergyStored(); + PacketHandler.sendToAllAround(new PacketPowerStorage(this), this, 64); + } + + if (notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + notifyNeighbours = false; + } + } + + public int getComparatorOutput() { + double stored = getEnergyStored(); + return stored == 0 ? 0 : (int) (1 + stored / getMaxEnergyStored() * 14); + } + + public List getGaugeBounds() { + if (gaugeBounds == null) { + gaugeBounds = GaugeBounds.calculateGaugeBounds(new BlockCoord(this), multiblock); + } + return gaugeBounds; + } + + public boolean chargeItems(ItemStack[] items) { + boolean chargedItem = false; + int available = Math.min(maxIO, getEnergyStored()); + for (ItemStack item : items) { + if (item != null && available > 0) { + int used = 0; + if (item.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int canUse = Math.min(available, max - cur); + if (cur < max) { + used = chargable.receiveEnergy(item, canUse, false); + } + } + if (used > 0) { + setEnergyStored(getEnergyStored() - used); + chargedItem = true; + available -= used; + } + } + } + return chargedItem; + } + + private void chargeItems() { + boolean chargedItem = chargeItems(inventory); + if (chargedItem) { + markDirty(); + } + } + + public boolean isOutputEnabled() { + return getController().outputEnabled; + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); + } + + public boolean isInputEnabled() { + return getController().inputEnabled; + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); + } + + @Override + public boolean isNetworkControlledIo(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.NONE || mode == IoMode.PULL; + } + + private boolean transmitEnergy() { + + if (getEnergyStored() <= 0) { + return false; + } + int canTransmit = Math.min(getEnergyStored(), maxOutput); + int transmitted = 0; + + if (!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = masterReceptors.listIterator(); + } + + int appliedCount = 0; + int numReceptors = masterReceptors.size(); + while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + + Receptor receptor = receptorIterator.next(); + IPowerInterface powerInterface = receptor.receptor; + IoMode mode = receptor.mode; + if (powerInterface != null + && mode != IoMode.PULL + && mode != IoMode.DISABLED + && powerInterface.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { + double used; + if (receptor.receptor.getDelegate() instanceof IConduitBundle && !isCreative) { + // All other power transfer is handled by the conduit network + IConduitBundle bundle = (IConduitBundle) receptor.receptor.getDelegate(); + IPowerConduit conduit = bundle.getConduit(IPowerConduit.class); + if (conduit != null + && conduit.getConnectionMode(receptor.fromDir.getOpposite()) == ConnectionMode.INPUT) { + used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); + } else { + used = 0; + } + } else { + used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); + } + + transmitted += used; + canTransmit -= used; + } + + if (canTransmit <= 0) { + break; + } + + if (!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = masterReceptors.listIterator(); + } + appliedCount++; + } + setEnergyStored(getEnergyStored() - transmitted); + + return transmitted > 0; + } + + private void updateMasterReceptors() { + if (!masterReceptorsDirty && masterReceptors != null) { + return; + } + + if (masterReceptors == null) { + masterReceptors = new ArrayList(); + } + masterReceptors.clear(); + + if (multiblock == null) { + updateReceptors(); + if (localReceptors != null) { + masterReceptors.addAll(localReceptors); + } + } else { + // TODO: Performance warning?? + for (BlockCoord bc : multiblock) { + TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); + if (te instanceof TileCapacitorBank) { + TileCapacitorBank cb = ((TileCapacitorBank) te); + cb.updateReceptors(); + if (cb.localReceptors != null) { + masterReceptors.addAll(cb.localReceptors); + } + } + } + } + + receptorIterator = masterReceptors.listIterator(); + masterReceptorsDirty = false; + } + + private void updateReceptors() { + + if (!receptorsDirty) { + return; + } + if (localReceptors != null) { + localReceptors.clear(); + } + + BlockCoord bc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IoMode mode = getIoMode(dir); + if (mode != IoMode.DISABLED) { + BlockCoord checkLoc = bc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if (!(te instanceof TileCapacitorBank)) { + IPowerInterface ph = PowerHandlerUtil.create(te); + if (ph != null && ph.canConduitConnect(dir)) { + if (localReceptors == null) { + localReceptors = new ArrayList(); + } + Receptor r = new Receptor(ph, dir, mode); + localReceptors.add(r); + if (mode == IoMode.NONE && !(ph.getDelegate() instanceof IInternalPoweredTile)) { + setIoMode(dir, IoMode.PULL, false); + r.mode = IoMode.PULL; + render = true; + } + } + } + } + } + + receptorsDirty = false; + } + + // ------------ Multiblock overrides + + public int getEnergyStoredScaled(int scale) { + return getController().doGetEnergyStoredScaled(scale); + } + + @Override + public int getMaxInput() { + return maxInput; + } + + public void setMaxInput(int maxInput) { + getController().doSetMaxInput(maxInput); + updateBlock(); + } + + @Override + public int getMaxOutput() { + return maxOutput; + } + + public void setMaxOutput(int maxOutput) { + getController().doSetMaxOutput(maxOutput); + updateBlock(); + } + + @Override + public int getEnergyStored() { + return getController().doGetEnergyStored(); + } + + @Override + public long getEnergyStoredL() { + return getEnergyStored(); + } + + public double getEnergyStoredRatio() { + return getController().doGetEnergyStoredRatio(); + } + + @Override + public int getMaxEnergyStored() { + return getController().doGetMaxEnergyStored(); + } + + @Override + public long getMaxEnergyStoredL() { + return getMaxEnergyStored(); + } + + public int getMaxIO() { + return getController().doGetMaxIO(); + } + + // RF Power + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + getController().doSetEnergyStored(stored); + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return getIoMode(from) != IoMode.DISABLED; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + IoMode mode = getIoMode(from); + if (mode == IoMode.DISABLED || mode == IoMode.PUSH) { + return 0; + } + return getController().doReceiveEnergy(from, maxReceive, simulate); + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getController().doGetEnergyStored(from); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getController().doGetMaxEnergyStored(); + } + + public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } + + public int doGetEnergyStored(ForgeDirection from) { + return doGetEnergyStored(); + } + + public int doGetMaxEnergyStored(ForgeDirection from) { + return doGetMaxEnergyStored(); + } + + // end rf power + + @Override + public void addEnergy(int add) { + getController().doAddEnergy(add); + } + + private boolean isRecievingRedstoneSignal() { + if (!redstoneStateDirty) { + return isRecievingRedstoneSignal; + } + + isRecievingRedstoneSignal = false; + redstoneStateDirty = false; + + if (!isMultiblock()) { + isRecievingRedstoneSignal = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; + } else { + for (BlockCoord bc : multiblock) { + if (worldObj.getStrongestIndirectPower(bc.x, bc.y, bc.z) > 0) { + isRecievingRedstoneSignal = true; + break; + } + } + } + return isRecievingRedstoneSignal; + } + + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + public void setInputControlMode(RedstoneControlMode inputControlMode) { + if (!isMultiblock()) { + this.inputControlMode = inputControlMode; + } else { + for (BlockCoord bc : multiblock) { + TileCapacitorBank cp = getCapBank(bc); + if (cp != null) { + cp.inputControlMode = inputControlMode; + } + } + } + } + + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + if (!isMultiblock()) { + this.outputControlMode = outputControlMode; + } else { + for (BlockCoord bc : multiblock) { + TileCapacitorBank cp = getCapBank(bc); + if (cp != null) { + cp.outputControlMode = outputControlMode; + } + } + } + } + + // ------------ Multiblock implementations + + int doGetMaxIO() { + return maxIO; + } + + int doGetMaxEnergyStored() { + return maxStoredEnergy; + } + + int doGetEnergyStoredScaled(int scale) { + return (int) VecmathUtil.clamp(Math.round(scale * doGetEnergyStoredRatio()), 0, scale); + } + + int doGetEnergyStored() { + return storedEnergyRF; + } + + void doSetEnergyStored(int stored) { + storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); + } + + double doGetEnergyStoredRatio() { + return (double) doGetEnergyStored() / maxStoredEnergy; + } + + void doAddEnergy(int add) { + doSetEnergyStored(doGetEnergyStored() + add); + } + + void doSetMaxInput(int in) { + maxInput = Math.min(in, maxIO); + maxInput = Math.max(0, maxInput); + if (isMultiblock()) { + for (BlockCoord bc : multiblock) { + TileCapacitorBank cp = getCapBank(bc); + if (cp != null) { + cp.maxInput = maxInput; + } + } + } + } + + void doSetMaxOutput(int out) { + maxOutput = Math.min(out, maxIO); + maxOutput = Math.max(0, maxOutput); + if (isMultiblock()) { + for (BlockCoord bc : multiblock) { + TileCapacitorBank cp = getCapBank(bc); + if (cp != null) { + cp.maxOutput = maxOutput; + } + } + } + } + + // ------------ Multiblock management + + public void onBlockAdded() { + multiblockDirty = true; + } + + public void onNeighborBlockChange(Block block) { + if (block != EnderIO.blockCapacitorBank) { + receptorsDirty = true; + getController().masterReceptorsDirty = true; + getController().redstoneStateDirty = true; + } + redstoneStateDirty = true; + } + + public void onBreakBlock() { + TileCapacitorBank controller = getController(); + controller.clearCurrentMultiblock(); + } + + private void clearCurrentMultiblock() { + if (multiblock == null) { + return; + } + for (BlockCoord bc : multiblock) { + TileCapacitorBank res = getCapBank(bc); + if (res != null) { + res.setMultiblock(null); + } + } + multiblock = null; + redstoneStateDirty = true; + } + + private void formMultiblock() { + + if (isCreative || isMaxSize()) { + return; + } + List blocks = new ArrayList(); + blocks.add(this); + findNighbouringBanks(this, blocks); + + if (blocks.size() < 2) { + return; + } + for (TileCapacitorBank cb : blocks) { + cb.clearCurrentMultiblock(); + } + + BlockCoord[] mb = new BlockCoord[blocks.size()]; + for (int i = 0; i < blocks.size(); i++) { + mb[i] = new BlockCoord(blocks.get(i)); + } + + TileCapacitorBank secondary = blocks.get(1); + maxInput = maxOutput = -1; + + if (secondary.maxInput != secondary.maxIO) { + maxInput = secondary.maxInput; + } + + if (secondary.maxOutput != secondary.maxIO) { + maxOutput = secondary.maxOutput; + } + + for (TileCapacitorBank cb : blocks) { + cb.setMultiblock(mb); + } + } + + private void findNighbouringBanks(TileCapacitorBank tileCapacitorBank, List blocks) { + if (isCreative || blocks.size() >= MAX_SIZE) { + return; + } + BlockCoord bc = new BlockCoord(tileCapacitorBank); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + TileCapacitorBank cb = getCapBank(bc.getLocation(dir)); + if (cb != null && !blocks.contains(cb) && !cb.isCreative && !cb.isMaxSize()) { + if (blocks.size() >= MAX_SIZE) { + return; + } + blocks.add(cb); + findNighbouringBanks(cb, blocks); + } + } + } + + private void setMultiblock(BlockCoord[] mb) { + + if (multiblock != null && isMaster()) { + + // split up current multiblock and reconfigure all the internal capacitors + int powerPerBlock = storedEnergyRF / multiblock.length; + int remaining = storedEnergyRF % multiblock.length; + for (BlockCoord bc : multiblock) { + TileCapacitorBank cb = getCapBank(bc); + if (cb != null) { + cb.maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); + cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); + cb.maxInput = Math.min(cb.maxInput, cb.maxIO); + cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); + cb.doSetEnergyStored(powerPerBlock); + cb.multiblockDirty = true; + } + } + doAddEnergy(remaining); + } + multiblock = mb; + if (isMaster()) { + + List invItems = new ArrayList(); + + int totalStored = 0; + int totalCap = multiblock.length * BASE_CAP.getMaxEnergyStored(); + int totalIO = multiblock.length * BASE_CAP.getMaxEnergyExtracted(); + for (BlockCoord bc : multiblock) { + TileCapacitorBank cb = getCapBank(bc); + if (cb != null) { + totalStored += cb.doGetEnergyStored(); + } + ItemStack[] inv = cb.inventory; + for (int i = 0; i < inv.length; i++) { + if (inv[i] != null) { + invItems.add(inv[i]); + inv[i] = null; + } + } + cb.multiblockDirty = false; + } + maxStoredEnergy = totalCap; + doSetEnergyStored(totalStored); + maxIO = totalIO; + maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); + maxOutput = maxOutput < 0 ? maxIO : Math.min(maxOutput, maxIO); + for (BlockCoord bc : multiblock) { + TileCapacitorBank cb = getCapBank(bc); + if (cb != null && cb != this) { + cb.maxIO = totalIO; + cb.maxInput = maxInput; + cb.maxOutput = maxOutput; + } + } + + if (invItems.size() > inventory.length) { + for (int i = inventory.length; i < invItems.size(); i++) { + Util.dropItems(worldObj, invItems.get(i), xCoord, yCoord, zCoord, true); + } + } + for (int i = 0; i < inventory.length && i < invItems.size(); i++) { + inventory[i] = invItems.get(i); + } + } + receptorsDirty = true; + getController().masterReceptorsDirty = true; + redstoneStateDirty = true; + + // Forces an update + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + render = true; + } + + @Override + public TileCapacitorBank getController() { + if (isMaster() || !isMultiblock()) { + return this; + } + TileCapacitorBank res = getCapBank(multiblock[0]); + return res != null ? res : this; + } + + boolean isContoller() { + return multiblock == null ? true : isMaster(); + } + + boolean isMaster() { + if (multiblock != null) { + return multiblock[0].equals(xCoord, yCoord, zCoord); + } + return false; + } + + public boolean isMultiblock() { + return multiblock != null; + } + + private boolean isCurrentMultiblockValid() { + if (multiblock == null) { + return false; + } + for (BlockCoord bc : multiblock) { + TileCapacitorBank res = getCapBank(bc); + if (res == null || !res.isMultiblock()) { + return false; + } + } + return true; + } + + private TileCapacitorBank getCapBank(BlockCoord bc) { + return getCapBank(bc.x, bc.y, bc.z); + } + + private TileCapacitorBank getCapBank(int x, int y, int z) { + if (worldObj == null) { + return null; + } + TileEntity te = worldObj.getTileEntity(x, y, z); + if (te instanceof TileCapacitorBank) { + return (TileCapacitorBank) te; + } + return null; + } + + // ------------- Inventory + + @Override + public int getSizeInventory() { + return getController().doGetSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int i) { + return getController().doGetStackInSlot(i); + } + + @Override + public ItemStack decrStackSize(int i, int j) { + return getController().doDecrStackSize(i, j); + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + getController().doSetInventorySlotContents(i, itemstack); + } + + public ItemStack doGetStackInSlot(int i) { + if (i < 0 || i >= inventory.length) { + return null; + } + return inventory[i]; + } + + public int doGetSizeInventory() { + return inventory.length; + } + + public ItemStack doDecrStackSize(int fromSlot, int amount) { + if (fromSlot < 0 || fromSlot >= inventory.length) { + return null; + } + ItemStack item = inventory[fromSlot]; + if (item == null) { + return null; + } + if (item.stackSize <= amount) { + ItemStack result = item.copy(); + inventory[fromSlot] = null; + return result; + } + item.stackSize -= amount; + return item.copy(); + } + + public void doSetInventorySlotContents(int i, ItemStack itemstack) { + if (i < 0 || i >= inventory.length) { + return; + } + inventory[i] = itemstack; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public String getInventoryName() { + return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + if (itemstack == null) { + return false; + } + return itemstack.getItem() instanceof IEnergyContainerItem; + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + + if (nbtRoot.hasKey("maxStoredEnergy")) { + nbtRoot.setInteger("maxStoredEnergyRF", nbtRoot.getInteger("maxStoredEnergy") * 10); + } + maxStoredEnergy = nbtRoot.getInteger("maxStoredEnergyRF"); + + double oldEnergy = storedEnergyRF; + if (nbtRoot.hasKey("storedEnergyD")) { + nbtRoot.setInteger("storedEnergyRF", (int) (nbtRoot.getDouble("storedEnergyD") * 10)); + } + doSetEnergyStored(nbtRoot.getInteger("storedEnergyRF")); + + double newEnergy = storedEnergyRF; + if (maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / maxStoredEnergy > 0.05 + || nbtRoot.hasKey("render")) { + render = true; + } + if (energyAtLastRender != -1 && maxStoredEnergy != 0) { + double change = Math.abs(energyAtLastRender - storedEnergyRF) / (double) maxStoredEnergy; + if (change > 0.05) { + render = true; + } + } + + if (nbtRoot.hasKey("maxIO")) { + nbtRoot.setInteger("maxIoRF", nbtRoot.getInteger("maxIO") * 10); + } + maxIO = nbtRoot.getInteger("maxIoRF"); + + if (nbtRoot.hasKey("maxInput")) { + nbtRoot.setInteger("maxInputRF", nbtRoot.getInteger("maxInput") * 10); + } + if (nbtRoot.hasKey("maxInputRF")) { + maxInput = nbtRoot.getInteger("maxInputRF"); + } else { + maxOutput = maxIO; + } + + if (nbtRoot.hasKey("maxOutput")) { + nbtRoot.setInteger("maxOuputRF", nbtRoot.getInteger("maxOuput") * 10); + } + if (nbtRoot.hasKey("maxOutputRF")) { + maxOutput = nbtRoot.getInteger("maxOutputRF"); + } else { + maxInput = maxIO; + } + + inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; + outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; + + boolean wasMulti = isMultiblock(); + if (nbtRoot.getBoolean("isMultiblock")) { + int[] coords = nbtRoot.getIntArray("multiblock"); + multiblock = new BlockCoord[coords.length / 3]; + int c = 0; + for (int i = 0; i < multiblock.length; i++) { + multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); + } + + } else { + multiblock = null; + } + + for (int i = 0; i < inventory.length; i++) { + inventory[i] = null; + } + + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + if (itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + + if (nbtRoot.hasKey("hasFaces")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (nbtRoot.hasKey("face" + dir.ordinal())) { + setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())], false); + } + } + } + gaugeBounds = null; + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + + nbtRoot.setDouble("storedEnergyRF", storedEnergyRF); + nbtRoot.setInteger("maxStoredEnergyRF", maxStoredEnergy); + nbtRoot.setInteger("maxIoRF", maxIO); + nbtRoot.setInteger("maxInputRF", maxInput); + nbtRoot.setInteger("maxOutputRF", maxOutput); + nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); + nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); + + nbtRoot.setBoolean("isMultiblock", isMultiblock()); + if (isMultiblock()) { + int[] vals = new int[multiblock.length * 3]; + int i = 0; + for (BlockCoord bc : multiblock) { + vals[i++] = bc.x; + vals[i++] = bc.y; + vals[i++] = bc.z; + } + nbtRoot.setIntArray("multiblock", vals); + } + + // write inventory list + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inventory.length; i++) { + if (inventory[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inventory[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); + + // face modes + if (faceModes != null) { + nbtRoot.setByte("hasFaces", (byte) 1); + for (Entry e : faceModes.entrySet()) { + nbtRoot.setShort( + "face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + } + } + + if (render) { + nbtRoot.setBoolean("render", true); + render = false; + } + } + + static class Receptor { + IPowerInterface receptor; + ForgeDirection fromDir; + IoMode mode; + + private Receptor(IPowerInterface rec, ForgeDirection fromDir, IoMode mode) { + receptor = rec; + this.fromDir = fromDir; + this.mode = mode; + } + + @Override + public String toString() { + return "Receptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + "]"; + } + } + + @Override + public boolean hasCustomInventoryName() { + + return false; + } + + public void setCreativeMode() { + isCreative = true; + maxIO = maxIO * 1000; + maxInput = maxIO; + maxOutput = maxIO; + } + + @Override + public boolean isCreative() { + return isCreative; + } + + public boolean isMaxSize() { + return isMultiblock() && multiblock.length >= MAX_SIZE; + } + + @Override + public boolean displayPower() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/ranged/IRanged.java b/src/main/java/crazypants/enderio/machine/ranged/IRanged.java index 23b98764..59b4db0f 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/IRanged.java +++ b/src/main/java/crazypants/enderio/machine/ranged/IRanged.java @@ -1,17 +1,15 @@ package crazypants.enderio.machine.ranged; -import net.minecraft.world.World; - import com.enderio.core.common.util.BlockCoord; +import net.minecraft.world.World; public interface IRanged { - World getWorld(); + World getWorld(); - BlockCoord getLocation(); + BlockCoord getLocation(); - float getRange(); - - boolean isShowingRange(); + float getRange(); + boolean isShowingRange(); } diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java index a34b11a0..c89d8e56 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeEntity.java @@ -1,68 +1,63 @@ package crazypants.enderio.machine.ranged; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class RangeEntity extends Entity { - int totalLife = 20; - int lifeSpan = totalLife; - float range; - private IRanged spawnGuard; + int totalLife = 20; + int lifeSpan = totalLife; + float range; + private IRanged spawnGuard; - public RangeEntity(IRanged sg) { - super(sg.getWorld()); - spawnGuard = sg; - BlockCoord bc = spawnGuard.getLocation(); - setPosition(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); - ignoreFrustumCheck = true; - range = sg.getRange() + 0.5f; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean isInRangeToRender3d(double p_145770_1_, double p_145770_3_, double p_145770_5_) { - return true; - } - - @Override - protected void entityInit() { - } - - @Override - protected boolean canTriggerWalking() { - return false; - } - - @Override - public AxisAlignedBB getBoundingBox() { - return null; - } - - @Override - public void onUpdate() { - super.onUpdate(); - lifeSpan--; - BlockCoord bc = spawnGuard.getLocation(); - if(!(worldObj.getTileEntity(bc.x, bc.y, bc.z) instanceof IRanged)) { - setDead(); + public RangeEntity(IRanged sg) { + super(sg.getWorld()); + spawnGuard = sg; + BlockCoord bc = spawnGuard.getLocation(); + setPosition(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); + ignoreFrustumCheck = true; + range = sg.getRange() + 0.5f; } - if(!spawnGuard.isShowingRange()) { - setDead(); + + @Override + @SideOnly(Side.CLIENT) + public boolean isInRangeToRender3d(double p_145770_1_, double p_145770_3_, double p_145770_5_) { + return true; } - } - @Override - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { - } + @Override + protected void entityInit() {} - @Override - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { - } + @Override + protected boolean canTriggerWalking() { + return false; + } + + @Override + public AxisAlignedBB getBoundingBox() { + return null; + } + + @Override + public void onUpdate() { + super.onUpdate(); + lifeSpan--; + BlockCoord bc = spawnGuard.getLocation(); + if (!(worldObj.getTileEntity(bc.x, bc.y, bc.z) instanceof IRanged)) { + setDead(); + } + if (!spawnGuard.isShowingRange()) { + setDead(); + } + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {} + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {} } diff --git a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java b/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java index d93f74c5..f3906e24 100644 --- a/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java +++ b/src/main/java/crazypants/enderio/machine/ranged/RangeRenerer.java @@ -1,59 +1,54 @@ package crazypants.enderio.machine.ranged; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderEntity; -import net.minecraft.entity.Entity; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.IconUtil; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderEntity; +import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RangeRenerer extends RenderEntity { - @Override - public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { + @Override + public void doRender(Entity entity, double x, double y, double z, float p_76986_8_, float p_76986_9_) { - RangeEntity se = ((RangeEntity) entity); + RangeEntity se = ((RangeEntity) entity); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDepthMask(false); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthMask(false); - float scale = 1 - ( se.lifeSpan / (float)se.totalLife); - scale = Math.min(scale, 1); - scale *= se.range; + float scale = 1 - (se.lifeSpan / (float) se.totalLife); + scale = Math.min(scale, 1); + scale *= se.range; - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); - GL11.glTranslatef(0.5f,0.5f,0.5f); - GL11.glScalef(scale, scale, scale); - GL11.glTranslatef(-0.5f,-0.5f,-0.5f); + GL11.glTranslatef(0.5f, 0.5f, 0.5f); + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(-0.5f, -0.5f, -0.5f); - GL11.glColor4f(1, 1, 1, 0.4f); + GL11.glColor4f(1, 1, 1, 0.4f); - RenderUtil.bindBlockTexture(); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - CubeRenderer.render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture); - Tessellator.instance.draw(); + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setBrightness(15 << 20 | 15 << 4); + CubeRenderer.render(BoundingBox.UNIT_CUBE, IconUtil.whiteTexture); + Tessellator.instance.draw(); - RenderUtil.bindItemTexture(); - - GL11.glDepthMask(true); - GL11.glPopAttrib(); - GL11.glPopMatrix(); - - } + RenderUtil.bindItemTexture(); + GL11.glDepthMask(true); + GL11.glPopAttrib(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java index 8f1d62db..506d4e0c 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java @@ -1,144 +1,142 @@ package crazypants.enderio.machine.recipe; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; public abstract class AbstractMachineRecipe implements IMachineRecipe { - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - if(inputs == null || inputs.length <= 0) { - return 0; - } - IRecipe recipe = getRecipeForInputs(inputs); - return recipe == null ? 0 : recipe.getEnergyRequired(); - } - - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - if(inputs == null || inputs.length <= 0) { - return RecipeBonusType.NONE; - } - IRecipe recipe = getRecipeForInputs(inputs); - return recipe == null ? RecipeBonusType.NONE : recipe.getBonusType(); - } - - public abstract IRecipe getRecipeForInputs(MachineRecipeInput[] inputs); - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - IRecipe recipe = getRecipeForInputs(inputs); - List result = new ArrayList(); - - //Need to make copies so we can reduce their values as we go - MachineRecipeInput[] availableInputs = new MachineRecipeInput[inputs.length]; - int i = 0; - for (MachineRecipeInput available : inputs) { - availableInputs[i] = available.copy(); - ++i; - } - RecipeInput[] requiredIngredients = new RecipeInput[recipe.getInputs().length]; - i = 0; - for (RecipeInput ri : recipe.getInputs()) { - requiredIngredients[i] = ri.copy(); - ++i; - } - - //For each input required by the recipe got through the available machine inputs and consume them - for (RecipeInput required : requiredIngredients) { - for (MachineRecipeInput available : availableInputs) { - if(isValid(available)) { - if(consume(required, available, result)) { - break; - } + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + if (inputs == null || inputs.length <= 0) { + return 0; } - } - } - return result; - } - - protected boolean consume(RecipeInput required, MachineRecipeInput available, List consumedInputs) { - - if(required.isInput(available.fluid)) { - consumedInputs.add(new MachineRecipeInput(available.slotNumber, required.getFluidInput().copy())); - return true; + IRecipe recipe = getRecipeForInputs(inputs); + return recipe == null ? 0 : recipe.getEnergyRequired(); } - - if(required.isInput(available.item) && (required.getSlotNumber() == -1 || required.getSlotNumber() == available.slotNumber)) { - - ItemStack availableStack = available.item; - ItemStack requiredStack = required.getInput(); - - ItemStack consumedStack = requiredStack.copy(); - consumedStack.stackSize = Math.min(requiredStack.stackSize, availableStack.stackSize); - - requiredStack.stackSize -= consumedStack.stackSize; - availableStack.stackSize -= consumedStack.stackSize; - - consumedInputs.add(new MachineRecipeInput(available.slotNumber, consumedStack)); - - if(requiredStack.stackSize <= 0) { - //Fully met the requirement - return true; - } - - } - return false; - } - - protected boolean isValid(MachineRecipeInput input) { - if(input == null) { - return false; - } - if(input.item != null && input.item.stackSize > 0) { - return true; - } - return input.fluid != null && input.fluid.amount > 0; - } - - @Override - public float getExperienceForOutput(ItemStack output) { - return 0; - } - - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - if(inputs == null || inputs.length <= 0) { - return false; - } - IRecipe recipe = getRecipeForInputs(inputs); - return recipe != null; - } - - @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - if(inputs == null || inputs.length <= 0) { - return new ResultStack[0]; - } - IRecipe recipe = getRecipeForInputs(inputs); - if(recipe == null) { - return new ResultStack[0]; - } - RecipeOutput[] outputs = recipe.getOutputs(); - if(outputs == null) { - return new ResultStack[0]; - } - List result = new ArrayList(); - for (RecipeOutput output : outputs) { - if(output.getChance() >= chance) { - if(output.isFluid()) { - result.add(new ResultStack(output.getFluidOutput().copy())); - } else { - result.add(new ResultStack(output.getOutput().copy())); + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + if (inputs == null || inputs.length <= 0) { + return RecipeBonusType.NONE; } - } + IRecipe recipe = getRecipeForInputs(inputs); + return recipe == null ? RecipeBonusType.NONE : recipe.getBonusType(); } - return result.toArray(new ResultStack[result.size()]); - } + public abstract IRecipe getRecipeForInputs(MachineRecipeInput[] inputs); + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + IRecipe recipe = getRecipeForInputs(inputs); + List result = new ArrayList(); + + // Need to make copies so we can reduce their values as we go + MachineRecipeInput[] availableInputs = new MachineRecipeInput[inputs.length]; + int i = 0; + for (MachineRecipeInput available : inputs) { + availableInputs[i] = available.copy(); + ++i; + } + RecipeInput[] requiredIngredients = new RecipeInput[recipe.getInputs().length]; + i = 0; + for (RecipeInput ri : recipe.getInputs()) { + requiredIngredients[i] = ri.copy(); + ++i; + } + + // For each input required by the recipe got through the available machine inputs and consume them + for (RecipeInput required : requiredIngredients) { + for (MachineRecipeInput available : availableInputs) { + if (isValid(available)) { + if (consume(required, available, result)) { + break; + } + } + } + } + return result; + } + + protected boolean consume( + RecipeInput required, MachineRecipeInput available, List consumedInputs) { + + if (required.isInput(available.fluid)) { + consumedInputs.add(new MachineRecipeInput( + available.slotNumber, required.getFluidInput().copy())); + return true; + } + + if (required.isInput(available.item) + && (required.getSlotNumber() == -1 || required.getSlotNumber() == available.slotNumber)) { + + ItemStack availableStack = available.item; + ItemStack requiredStack = required.getInput(); + + ItemStack consumedStack = requiredStack.copy(); + consumedStack.stackSize = Math.min(requiredStack.stackSize, availableStack.stackSize); + + requiredStack.stackSize -= consumedStack.stackSize; + availableStack.stackSize -= consumedStack.stackSize; + + consumedInputs.add(new MachineRecipeInput(available.slotNumber, consumedStack)); + + if (requiredStack.stackSize <= 0) { + // Fully met the requirement + return true; + } + } + return false; + } + + protected boolean isValid(MachineRecipeInput input) { + if (input == null) { + return false; + } + if (input.item != null && input.item.stackSize > 0) { + return true; + } + return input.fluid != null && input.fluid.amount > 0; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + if (inputs == null || inputs.length <= 0) { + return false; + } + IRecipe recipe = getRecipeForInputs(inputs); + return recipe != null; + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + if (inputs == null || inputs.length <= 0) { + return new ResultStack[0]; + } + IRecipe recipe = getRecipeForInputs(inputs); + if (recipe == null) { + return new ResultStack[0]; + } + RecipeOutput[] outputs = recipe.getOutputs(); + if (outputs == null) { + return new ResultStack[0]; + } + List result = new ArrayList(); + for (RecipeOutput output : outputs) { + if (output.getChance() >= chance) { + if (output.isFluid()) { + result.add(new ResultStack(output.getFluidOutput().copy())); + } else { + result.add(new ResultStack(output.getOutput().copy())); + } + } + } + return result.toArray(new ResultStack[result.size()]); + } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java index eb148499..ba1d44b2 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java @@ -1,126 +1,124 @@ package crazypants.enderio.machine.recipe; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.util.EE3Util; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.util.EE3Util; public class BasicManyToOneRecipe implements IManyToOneRecipe { - private final int energyRequired; - private final ItemStack output; + private final int energyRequired; + private final ItemStack output; - private final RecipeBonusType bonusType; + private final RecipeBonusType bonusType; - private final Recipe recipe; + private final Recipe recipe; - public BasicManyToOneRecipe(Recipe recipe) { - this.recipe = recipe; - this.output = recipe.getOutputs()[0].getOutput().copy(); - energyRequired = recipe.getEnergyRequired(); - bonusType = recipe.getBonusType(); - EE3Util.registerBasicToManyRecipe(recipe); - } + public BasicManyToOneRecipe(Recipe recipe) { + this.recipe = recipe; + this.output = recipe.getOutputs()[0].getOutput().copy(); + energyRequired = recipe.getEnergyRequired(); + bonusType = recipe.getBonusType(); + EE3Util.registerBasicToManyRecipe(recipe); + } - @Override - public boolean isValidRecipeComponents(ItemStack... items) { + @Override + public boolean isValidRecipeComponents(ItemStack... items) { - List inputs = new ArrayList(Arrays.asList(recipe.getInputs())); - for (ItemStack is : items) { - if(is != null) { - RecipeInput remove = null; - for (RecipeInput ri : inputs) { - if(ri.isInput(is)) { - remove = ri; - break; - } + List inputs = new ArrayList(Arrays.asList(recipe.getInputs())); + for (ItemStack is : items) { + if (is != null) { + RecipeInput remove = null; + for (RecipeInput ri : inputs) { + if (ri.isInput(is)) { + remove = ri; + break; + } + } + if (remove != null) { + inputs.remove(remove); + } else { + return false; + } + } } - if(remove != null) { - inputs.remove(remove); - } else { - return false; + return true; + } + + @Override + public ItemStack getOutput() { + return output; + } + + @Override + public boolean isValidInput(int slot, ItemStack input) { + if (input == null) { + return false; } - } + return getRecipeComponentFromInput(input) != null; } - return true; - } - @Override - public ItemStack getOutput() { - return output; - } - - @Override - public boolean isValidInput(int slot, ItemStack input) { - if(input == null) { - return false; + @Override + public boolean isValidInput(FluidStack fluid) { + return false; } - return getRecipeComponentFromInput(input) != null; - } - @Override - public boolean isValidInput(FluidStack fluid) { - return false; - } - - @Override - public boolean isValid() { - return recipe != null && recipe.isValid(); - } - - @Override - public int getEnergyRequired() { - return energyRequired; - } - - @Override - public RecipeBonusType getBonusType() { - return bonusType; - } - - @Override - public RecipeOutput[] getOutputs() { - return recipe.getOutputs(); - } - - @Override - public List getInputStacks() { - return recipe.getInputStacks(); - } - - @Override - public boolean isInputForRecipe(MachineRecipeInput... inputs) { - if(inputs == null) { - return false; + @Override + public boolean isValid() { + return recipe != null && recipe.isValid(); } - return recipe.isInputForRecipe(inputs); - } - @Override - public RecipeInput[] getInputs() { - return recipe.getInputs(); - } + @Override + public int getEnergyRequired() { + return energyRequired; + } - @Override - public List getInputFluidStacks() { - return Collections.emptyList(); - } - - private ItemStack getRecipeComponentFromInput(ItemStack input) { - if(input == null) { - return null; + @Override + public RecipeBonusType getBonusType() { + return bonusType; } - for (RecipeInput ri : recipe.getInputs()) { - if(ri.isInput(input)) { - return ri.getInput(); - } + + @Override + public RecipeOutput[] getOutputs() { + return recipe.getOutputs(); + } + + @Override + public List getInputStacks() { + return recipe.getInputStacks(); + } + + @Override + public boolean isInputForRecipe(MachineRecipeInput... inputs) { + if (inputs == null) { + return false; + } + return recipe.isInputForRecipe(inputs); + } + + @Override + public RecipeInput[] getInputs() { + return recipe.getInputs(); + } + + @Override + public List getInputFluidStacks() { + return Collections.emptyList(); + } + + private ItemStack getRecipeComponentFromInput(ItemStack input) { + if (input == null) { + return null; + } + for (RecipeInput ri : recipe.getInputs()) { + if (ri.isInput(input)) { + return ri.getInput(); + } + } + return null; } - return null; - } - } diff --git a/src/main/java/crazypants/enderio/machine/recipe/CustomTagHandler.java b/src/main/java/crazypants/enderio/machine/recipe/CustomTagHandler.java index a0647b8f..6b9d80f7 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/CustomTagHandler.java +++ b/src/main/java/crazypants/enderio/machine/recipe/CustomTagHandler.java @@ -5,10 +5,9 @@ import org.xml.sax.SAXException; public interface CustomTagHandler { - boolean endElement(String uri, String localName, String qName) throws SAXException; + boolean endElement(String uri, String localName, String qName) throws SAXException; - boolean startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException; - - void configProcessed(); + boolean startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException; + void configProcessed(); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/IManyToOneRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/IManyToOneRecipe.java index d86a922f..7d75e4f6 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/IManyToOneRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/IManyToOneRecipe.java @@ -4,8 +4,7 @@ import net.minecraft.item.ItemStack; public interface IManyToOneRecipe extends IRecipe { - boolean isValidRecipeComponents(ItemStack... items); - - ItemStack getOutput(); + boolean isValidRecipeComponents(ItemStack... items); + ItemStack getOutput(); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java index 5311afd1..4a341db5 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java @@ -1,35 +1,33 @@ package crazypants.enderio.machine.recipe; +import crazypants.enderio.machine.MachineRecipeInput; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.machine.MachineRecipeInput; public interface IRecipe { - boolean isValid(); + boolean isValid(); - int getEnergyRequired(); + int getEnergyRequired(); - RecipeOutput[] getOutputs(); + RecipeOutput[] getOutputs(); - RecipeInput[] getInputs(); + RecipeInput[] getInputs(); - List getInputStacks(); + List getInputStacks(); - List getInputFluidStacks(); + List getInputFluidStacks(); - RecipeBonusType getBonusType(); + RecipeBonusType getBonusType(); - // boolean isInputForRecipe(List test); - // - // boolean isInputForRecipe(List test, List testFluids); + // boolean isInputForRecipe(List test); + // + // boolean isInputForRecipe(List test, List testFluids); - boolean isInputForRecipe(MachineRecipeInput... inputs); + boolean isInputForRecipe(MachineRecipeInput... inputs); - boolean isValidInput(int slotNumber, ItemStack item); - - boolean isValidInput(FluidStack fluid); + boolean isValidInput(int slotNumber, ItemStack item); + boolean isValidInput(FluidStack fluid); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java index 7df50f75..ddbd521c 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneMachineRecipe.java @@ -1,50 +1,49 @@ package crazypants.enderio.machine.recipe; -import net.minecraft.item.ItemStack; import crazypants.enderio.machine.MachineRecipeInput; +import net.minecraft.item.ItemStack; public class ManyToOneMachineRecipe extends AbstractMachineRecipe { - private final String uid; - private final String machineName; - private final ManyToOneRecipeManager recipeManager; - - public ManyToOneMachineRecipe(String uid, String machineName, ManyToOneRecipeManager recipeManager) { - this.uid = uid; - this.machineName = machineName; - this.recipeManager = recipeManager; - } + private final String uid; + private final String machineName; + private final ManyToOneRecipeManager recipeManager; - @Override - public String getUid() { - return uid; - } - - @Override - public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { - return recipeManager.getRecipeForInputs(inputs); - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null) { - return false; + public ManyToOneMachineRecipe(String uid, String machineName, ManyToOneRecipeManager recipeManager) { + this.uid = uid; + this.machineName = machineName; + this.recipeManager = recipeManager; } - return recipeManager.isValidInput(input); - } - @Override - public String getMachineName() { - return machineName; - } + @Override + public String getUid() { + return uid; + } - @Override - public float getExperienceForOutput(ItemStack output) { - return recipeManager.getExperianceForOutput(output); - } + @Override + public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { + return recipeManager.getRecipeForInputs(inputs); + } - public boolean isValidRecipeComponents(ItemStack[] resultInv) { - return recipeManager.isValidRecipeComponents(resultInv); - } + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null) { + return false; + } + return recipeManager.isValidInput(input); + } + @Override + public String getMachineName() { + return machineName; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + return recipeManager.getExperianceForOutput(output); + } + + public boolean isValidRecipeComponents(ItemStack[] resultInv) { + return recipeManager.isValidRecipeComponents(resultInv); + } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java index f41e2e96..f98e930e 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/recipe/ManyToOneRecipeManager.java @@ -1,189 +1,192 @@ package crazypants.enderio.machine.recipe; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; - import com.enderio.core.common.util.Util; - import crazypants.enderio.Log; import crazypants.enderio.config.Config; import crazypants.enderio.machine.MachineRecipeInput; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; public class ManyToOneRecipeManager { - - private final List recipes = new ArrayList(); - private final String coreFileName; - private final String customFileName; - private final String managerName; + private final List recipes = new ArrayList(); - public ManyToOneRecipeManager(String coreFileName, String custonFileName, String managerName) { - this.coreFileName = coreFileName; - this.customFileName = custonFileName; - this.managerName = managerName; - } + private final String coreFileName; + private final String customFileName; + private final String managerName; - public void loadRecipesFromConfig() { - CustomTagHandler tagHandler = createCustomTagHandler(); - RecipeConfig config = RecipeConfig.loadRecipeConfig(coreFileName, customFileName, tagHandler); - if(config != null) { - processConfig(config); - if(tagHandler != null) { - tagHandler.configProcessed(); - } - } else { - Log.error("Could not load recipes for " + managerName + "."); - } - } - - protected CustomTagHandler createCustomTagHandler() { - return null; - } - - public void addCustomRecipes(String xmlDef) { - RecipeConfig config; - CustomTagHandler tagHandler = createCustomTagHandler(); - try { - config = RecipeConfigParser.parse(xmlDef, tagHandler); - } catch (Exception e) { - Log.error("Error parsing custom xml for " + managerName ); - return; + public ManyToOneRecipeManager(String coreFileName, String custonFileName, String managerName) { + this.coreFileName = coreFileName; + this.customFileName = custonFileName; + this.managerName = managerName; } - if(config == null) { - Log.error("Could not process custom XML " + managerName); - return; + public void loadRecipesFromConfig() { + CustomTagHandler tagHandler = createCustomTagHandler(); + RecipeConfig config = RecipeConfig.loadRecipeConfig(coreFileName, customFileName, tagHandler); + if (config != null) { + processConfig(config); + if (tagHandler != null) { + tagHandler.configProcessed(); + } + } else { + Log.error("Could not load recipes for " + managerName + "."); + } } - processConfig(config); - if(tagHandler != null) { - tagHandler.configProcessed(); - } - } - public List getRecipes() { - return recipes; - } - - private void processConfig(RecipeConfig config) { - if(config.isDumpItemRegistery()) { - Util.dumpModObjects(new File(Config.configDirectory, "modObjectsRegistery.txt")); + protected CustomTagHandler createCustomTagHandler() { + return null; } - if(config.isDumpOreDictionary()) { - Util.dumpOreNames(new File(Config.configDirectory, "oreDictionaryRegistery.txt")); - } - List newRecipes = config.getRecipes(false); - Log.info("Found " + newRecipes.size() + " valid " + managerName + " recipes in config."); - for (Recipe rec : newRecipes) { - if (Config.crateSyntheticRecipes // - && rec.getInputs().length == 1 && !rec.getInputs()[0].isFluid() - && rec.getInputs()[0].getInput().stackSize <= 21 - && rec.getOutputs().length == 1 && !rec.getOutputs()[0].isFluid() // - && rec.getOutputs()[0].getOutput().stackSize <= 21) { - IRecipe dupe = getRecipeForInputs(rec.getInputStacks()); - if (dupe != null) { - // do it here because we will add "dupes" and the check need to be - // done on the supplied recipe---which is added last - Log.warn("The supplied recipe " + rec + " for " + managerName + " may be a duplicate to: " + dupe); + public void addCustomRecipes(String xmlDef) { + RecipeConfig config; + CustomTagHandler tagHandler = createCustomTagHandler(); + try { + config = RecipeConfigParser.parse(xmlDef, tagHandler); + } catch (Exception e) { + Log.error("Error parsing custom xml for " + managerName); + return; } - int er = rec.getEnergyRequired(); - RecipeBonusType bns = rec.getBonusType(); - RecipeOutput out = rec.getOutputs()[0]; - RecipeInput in = rec.getInputs()[0]; - - RecipeInput in2 = in.copy(); - in2.getInput().stackSize *= 2; - RecipeOutput out2 = new RecipeOutput(out.getOutput(), out.getChance(), out.getExperiance()); - out2.getOutput().stackSize *= 2; - - RecipeInput in3 = in.copy(); - in3.getInput().stackSize *= 3; - RecipeOutput out3 = new RecipeOutput(out.getOutput(), out.getChance(), out.getExperiance()); - out3.getOutput().stackSize *= 3; - - recipes.add(new BasicManyToOneRecipe(new Recipe(out3, er * 3, bns, new RecipeInput[] { in.copy(), in.copy(), in.copy() }))); - recipes.add(new BasicManyToOneRecipe(new Recipe(out3, er * 3, bns, new RecipeInput[] { in.copy(), in2.copy() }))); - recipes.add(new BasicManyToOneRecipe(new Recipe(out3, er * 3, bns, new RecipeInput[] { in2.copy(), in.copy() }))); - recipes.add(new BasicManyToOneRecipe(new Recipe(out2, er * 2, bns, new RecipeInput[] { in.copy(), in.copy() }))); - recipes.add(new BasicManyToOneRecipe(new Recipe(out3, er * 3, bns, new RecipeInput[] { in3.copy() }))); - recipes.add(new BasicManyToOneRecipe(new Recipe(out2, er * 2, bns, new RecipeInput[] { in2.copy() }))); - recipes.add(new BasicManyToOneRecipe(rec)); - Log.info("Created 6 synthetic recipes for " + in.getInput() + " => " + out.getOutput()); - } else { - addRecipe(new BasicManyToOneRecipe(rec)); - } - } - Log.info("Finished processing " + managerName + " recipes. " + recipes.size() + " recipes avaliable."); - } - - public void addRecipe(IManyToOneRecipe recipe) { - if(recipe == null) { - Log.debug("Could not add invalid recipe: " + recipe + " for " + managerName ); - return; - } - IRecipe rec = getRecipeForInputs(recipe.getInputStacks()); - if(rec != null) { - Log.warn("The supplied recipe " + recipe + " for " + managerName + " may be a duplicate to: " + rec); - } - recipes.add(recipe); - } - - private IRecipe getRecipeForInputs(List inputs) { - MachineRecipeInput[] ins = new MachineRecipeInput[inputs.size()]; - - for (int i = 0; i < inputs.size(); i++) { - ins[i] = new MachineRecipeInput(-1, inputs.get(i)); - } - return getRecipeForInputs(ins); - } - - public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { - - for (IManyToOneRecipe rec : recipes) { - if(rec.isInputForRecipe(inputs)) { - return rec; - } - } - return null; - } - - public boolean isValidInput(MachineRecipeInput input) { - if(input == null || input.item == null) { - return false; - } - for (IManyToOneRecipe recipe : recipes) { - for (RecipeInput ri : recipe.getInputs()) { - if(ri.isInput(input.item) && (ri.getSlotNumber() == -1 || input.slotNumber == ri.getSlotNumber())) { - return true; + if (config == null) { + Log.error("Could not process custom XML " + managerName); + return; + } + processConfig(config); + if (tagHandler != null) { + tagHandler.configProcessed(); } - } } - return false; - } - public boolean isValidRecipeComponents(ItemStack[] inputs) { - if(inputs == null || inputs.length == 0) { - return false; + public List getRecipes() { + return recipes; } - for (IManyToOneRecipe recipe : recipes) { - if(recipe.isValidRecipeComponents(inputs)) { - return true; - } - } - return false; - } - public float getExperianceForOutput(ItemStack output) { - for (IManyToOneRecipe recipe : recipes) { - if(recipe.getOutput().getItem() == output.getItem() && recipe.getOutput().getItemDamage() == output.getItemDamage()) { - return recipe.getOutputs()[0].getExperiance(); - } + private void processConfig(RecipeConfig config) { + if (config.isDumpItemRegistery()) { + Util.dumpModObjects(new File(Config.configDirectory, "modObjectsRegistery.txt")); + } + if (config.isDumpOreDictionary()) { + Util.dumpOreNames(new File(Config.configDirectory, "oreDictionaryRegistery.txt")); + } + List newRecipes = config.getRecipes(false); + Log.info("Found " + newRecipes.size() + " valid " + managerName + " recipes in config."); + for (Recipe rec : newRecipes) { + if (Config.crateSyntheticRecipes // + && rec.getInputs().length == 1 + && !rec.getInputs()[0].isFluid() + && rec.getInputs()[0].getInput().stackSize <= 21 + && rec.getOutputs().length == 1 + && !rec.getOutputs()[0].isFluid() // + && rec.getOutputs()[0].getOutput().stackSize <= 21) { + + IRecipe dupe = getRecipeForInputs(rec.getInputStacks()); + if (dupe != null) { + // do it here because we will add "dupes" and the check need to be + // done on the supplied recipe---which is added last + Log.warn("The supplied recipe " + rec + " for " + managerName + " may be a duplicate to: " + dupe); + } + + int er = rec.getEnergyRequired(); + RecipeBonusType bns = rec.getBonusType(); + RecipeOutput out = rec.getOutputs()[0]; + RecipeInput in = rec.getInputs()[0]; + + RecipeInput in2 = in.copy(); + in2.getInput().stackSize *= 2; + RecipeOutput out2 = new RecipeOutput(out.getOutput(), out.getChance(), out.getExperiance()); + out2.getOutput().stackSize *= 2; + + RecipeInput in3 = in.copy(); + in3.getInput().stackSize *= 3; + RecipeOutput out3 = new RecipeOutput(out.getOutput(), out.getChance(), out.getExperiance()); + out3.getOutput().stackSize *= 3; + + recipes.add(new BasicManyToOneRecipe( + new Recipe(out3, er * 3, bns, new RecipeInput[] {in.copy(), in.copy(), in.copy()}))); + recipes.add(new BasicManyToOneRecipe( + new Recipe(out3, er * 3, bns, new RecipeInput[] {in.copy(), in2.copy()}))); + recipes.add(new BasicManyToOneRecipe( + new Recipe(out3, er * 3, bns, new RecipeInput[] {in2.copy(), in.copy()}))); + recipes.add(new BasicManyToOneRecipe( + new Recipe(out2, er * 2, bns, new RecipeInput[] {in.copy(), in.copy()}))); + recipes.add(new BasicManyToOneRecipe(new Recipe(out3, er * 3, bns, new RecipeInput[] {in3.copy()}))); + recipes.add(new BasicManyToOneRecipe(new Recipe(out2, er * 2, bns, new RecipeInput[] {in2.copy()}))); + recipes.add(new BasicManyToOneRecipe(rec)); + Log.info("Created 6 synthetic recipes for " + in.getInput() + " => " + out.getOutput()); + } else { + addRecipe(new BasicManyToOneRecipe(rec)); + } + } + Log.info("Finished processing " + managerName + " recipes. " + recipes.size() + " recipes avaliable."); + } + + public void addRecipe(IManyToOneRecipe recipe) { + if (recipe == null) { + Log.debug("Could not add invalid recipe: " + recipe + " for " + managerName); + return; + } + IRecipe rec = getRecipeForInputs(recipe.getInputStacks()); + if (rec != null) { + Log.warn("The supplied recipe " + recipe + " for " + managerName + " may be a duplicate to: " + rec); + } + recipes.add(recipe); + } + + private IRecipe getRecipeForInputs(List inputs) { + MachineRecipeInput[] ins = new MachineRecipeInput[inputs.size()]; + + for (int i = 0; i < inputs.size(); i++) { + ins[i] = new MachineRecipeInput(-1, inputs.get(i)); + } + return getRecipeForInputs(ins); + } + + public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { + + for (IManyToOneRecipe rec : recipes) { + if (rec.isInputForRecipe(inputs)) { + return rec; + } + } + return null; + } + + public boolean isValidInput(MachineRecipeInput input) { + if (input == null || input.item == null) { + return false; + } + for (IManyToOneRecipe recipe : recipes) { + for (RecipeInput ri : recipe.getInputs()) { + if (ri.isInput(input.item) && (ri.getSlotNumber() == -1 || input.slotNumber == ri.getSlotNumber())) { + return true; + } + } + } + return false; + } + + public boolean isValidRecipeComponents(ItemStack[] inputs) { + if (inputs == null || inputs.length == 0) { + return false; + } + for (IManyToOneRecipe recipe : recipes) { + if (recipe.isValidRecipeComponents(inputs)) { + return true; + } + } + return false; + } + + public float getExperianceForOutput(ItemStack output) { + for (IManyToOneRecipe recipe : recipes) { + if (recipe.getOutput().getItem() == output.getItem() + && recipe.getOutput().getItemDamage() == output.getItemDamage()) { + return recipe.getOutputs()[0].getExperiance(); + } + } + return 0; } - return 0; - } - } diff --git a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java index 9f7b04b6..614a9c14 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/OreDictionaryRecipeInput.java @@ -1,71 +1,69 @@ package crazypants.enderio.machine.recipe; import java.util.ArrayList; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class OreDictionaryRecipeInput extends RecipeInput { - private int oreId; + private int oreId; - public OreDictionaryRecipeInput(ItemStack itemStack, int oreId, int slot) { - this(itemStack, oreId, 1, slot); - } - - public OreDictionaryRecipeInput(ItemStack stack, int oreId, float multiplier, int slot) { - super(stack, true, multiplier, slot); - this.oreId = oreId; - } - - public OreDictionaryRecipeInput(OreDictionaryRecipeInput copy) { - super(copy.getInput(), true, copy.getMulitplier(), copy.getSlotNumber()); - oreId = copy.oreId; - } - - public RecipeInput copy() { - return new OreDictionaryRecipeInput(this); - } - - @Override - public boolean isInput(ItemStack test) { - if(test == null || oreId < 0) { - return false; + public OreDictionaryRecipeInput(ItemStack itemStack, int oreId, int slot) { + this(itemStack, oreId, 1, slot); } - try { - int[] ids = OreDictionary.getOreIDs(test); - if(ids == null) { - return false; - } - for(int id : ids) { - if(id == oreId) { - return true; + + public OreDictionaryRecipeInput(ItemStack stack, int oreId, float multiplier, int slot) { + super(stack, true, multiplier, slot); + this.oreId = oreId; + } + + public OreDictionaryRecipeInput(OreDictionaryRecipeInput copy) { + super(copy.getInput(), true, copy.getMulitplier(), copy.getSlotNumber()); + oreId = copy.oreId; + } + + public RecipeInput copy() { + return new OreDictionaryRecipeInput(this); + } + + @Override + public boolean isInput(ItemStack test) { + if (test == null || oreId < 0) { + return false; + } + try { + int[] ids = OreDictionary.getOreIDs(test); + if (ids == null) { + return false; + } + for (int id : ids) { + if (id == oreId) { + return true; + } + } + return false; + } catch (Exception e) { + return false; } - } - return false; - } catch (Exception e) { - return false; } - } - @Override - public ItemStack[] getEquivelentInputs() { - ArrayList res = OreDictionary.getOres(oreId); - if(res == null || res.isEmpty()) { - return null; + @Override + public ItemStack[] getEquivelentInputs() { + ArrayList res = OreDictionary.getOres(oreId); + if (res == null || res.isEmpty()) { + return null; + } + ItemStack[] res2 = res.toArray(new ItemStack[res.size()]); + for (int i = 0; i < res.size(); ++i) { + res2[i] = res2[i].copy(); + res2[i].stackSize = getInput().stackSize; + } + return res2; } - ItemStack[] res2 = res.toArray(new ItemStack[res.size()]); - for(int i = 0; i < res.size(); ++i) { - res2[i] = res2[i].copy(); - res2[i].stackSize = getInput().stackSize; + + @Override + public String toString() { + return "OreDictionaryRecipeInput [oreId=" + oreId + " name=" + OreDictionary.getOreName(oreId) + " amount=" + + getInput().stackSize + "]"; } - return res2; - } - - @Override - public String toString() { - return "OreDictionaryRecipeInput [oreId=" + oreId + " name=" + OreDictionary.getOreName(oreId) + " amount=" - + getInput().stackSize + "]"; - } - } diff --git a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java index 46d775ca..83c472a4 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java @@ -1,185 +1,182 @@ package crazypants.enderio.machine.recipe; +import crazypants.enderio.machine.MachineRecipeInput; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import crazypants.enderio.machine.MachineRecipeInput; public class Recipe implements IRecipe { - private final RecipeInput[] inputs; - private final RecipeOutput[] outputs; - private final int energyRequired; - private final RecipeBonusType bonusType; + private final RecipeInput[] inputs; + private final RecipeOutput[] outputs; + private final int energyRequired; + private final RecipeBonusType bonusType; - public Recipe(RecipeOutput output, int energyRequired, RecipeBonusType bonusType, RecipeInput... input) { - this(input, new RecipeOutput[] { output }, energyRequired, bonusType); - } - - public Recipe(RecipeInput input, int energyRequired, RecipeBonusType bonusType, RecipeOutput... output) { - this(new RecipeInput[] { input }, output, energyRequired, bonusType); - } - - public Recipe(RecipeInput[] input, RecipeOutput[] output, int energyRequired, RecipeBonusType bonusType) { - this.inputs = input; - this.outputs = output; - this.energyRequired = energyRequired; - this.bonusType = bonusType; - } - - @Override - public boolean isInputForRecipe(MachineRecipeInput... machineInputs) { - if(machineInputs == null || machineInputs.length == 0) { - return false; + public Recipe(RecipeOutput output, int energyRequired, RecipeBonusType bonusType, RecipeInput... input) { + this(input, new RecipeOutput[] {output}, energyRequired, bonusType); } - List requiredInputs = new ArrayList(); - for(RecipeInput input : inputs) { - if(input.getFluidInput() != null || input.getInput() != null) { - requiredInputs.add(input.copy()); - } + public Recipe(RecipeInput input, int energyRequired, RecipeBonusType bonusType, RecipeOutput... output) { + this(new RecipeInput[] {input}, output, energyRequired, bonusType); } - - for (MachineRecipeInput input : machineInputs) { - if(input != null && (input.fluid != null || input.item != null)) { - RecipeInput required = null; - for(int i=0;i 0) || tst.isInput(input.fluid)) { - required = tst; - } - } - if(required == null) { - return false; + + public Recipe(RecipeInput[] input, RecipeOutput[] output, int energyRequired, RecipeBonusType bonusType) { + this.inputs = input; + this.outputs = output; + this.energyRequired = energyRequired; + this.bonusType = bonusType; + } + + @Override + public boolean isInputForRecipe(MachineRecipeInput... machineInputs) { + if (machineInputs == null || machineInputs.length == 0) { + return false; } - //reduce the required input quantity by the available amount - if(input.isFluid()) { - required.getFluidInput().amount -= input.fluid.amount; - } else { - required.getInput().stackSize -= input.item.stackSize; - } - } - } - - for(RecipeInput required : requiredInputs) { - if(required.isFluid() && required.getFluidInput().amount > 0) { - return false; - } else if(!required.isFluid() && required.getInput().stackSize > 0) { - return false; - } - } - return true; - } - protected int getMinNumInputs() { - return inputs.length; - } + List requiredInputs = new ArrayList(); + for (RecipeInput input : inputs) { + if (input.getFluidInput() != null || input.getInput() != null) { + requiredInputs.add(input.copy()); + } + } - @Override - public boolean isValidInput(int slot, ItemStack item) { - return getInputForStack(item) != null; - } + for (MachineRecipeInput input : machineInputs) { + if (input != null && (input.fluid != null || input.item != null)) { + RecipeInput required = null; + for (int i = 0; i < requiredInputs.size() && required == null; i++) { + RecipeInput tst = requiredInputs.get(i); + if ((tst.isInput(input.item) && tst.getInput().stackSize > 0) || tst.isInput(input.fluid)) { + required = tst; + } + } + if (required == null) { + return false; + } + // reduce the required input quantity by the available amount + if (input.isFluid()) { + required.getFluidInput().amount -= input.fluid.amount; + } else { + required.getInput().stackSize -= input.item.stackSize; + } + } + } - @Override - public boolean isValidInput(FluidStack fluid) { - return getInputForStack(fluid) != null; - } - - private RecipeInput getInputForStack(FluidStack input) { - for (RecipeInput ri : inputs) { - if(ri.isInput(input)) { - return ri; - } - } - return null; - } - - private RecipeInput getInputForStack(ItemStack input) { - for (RecipeInput ri : inputs) { - if(ri.isInput(input)) { - return ri; - } - } - return null; - } - - @Override - public List getInputStacks() { - if(inputs == null) { - return Collections.emptyList(); - } - List res = new ArrayList(inputs.length); - for (int i = 0; i < inputs.length; i++) { - RecipeInput in = inputs[i]; - if(in != null && in.getInput() != null) { - res.add(in.getInput()); - } - } - return res; - } - - @Override - public List getInputFluidStacks() { - if(inputs == null) { - return Collections.emptyList(); - } - List res = new ArrayList(inputs.length); - for (int i = 0; i < inputs.length; i++) { - RecipeInput in = inputs[i]; - if(in != null && in.getFluidInput() != null) { - res.add(in.getFluidInput()); - } - } - return res; - } - - @Override - public RecipeInput[] getInputs() { - return inputs; - } - - @Override - public RecipeOutput[] getOutputs() { - return outputs; - } - - @Override - public RecipeBonusType getBonusType() { - return bonusType; - } - - public boolean hasOuput(ItemStack result) { - if(result == null) { - return false; - } - for(RecipeOutput output : outputs) { - ItemStack os = output.getOutput(); - if(os != null && os.isItemEqual(result)) { + for (RecipeInput required : requiredInputs) { + if (required.isFluid() && required.getFluidInput().amount > 0) { + return false; + } else if (!required.isFluid() && required.getInput().stackSize > 0) { + return false; + } + } return true; - } } - return false; - } - - @Override - public int getEnergyRequired() { - return energyRequired; - } - @Override - public boolean isValid() { - return inputs != null && outputs != null && energyRequired > 0; - } + protected int getMinNumInputs() { + return inputs.length; + } - @Override - public String toString() { - return "Recipe [input=" + Arrays.toString(inputs) + ", output=" + Arrays.toString(outputs) + ", energyRequired=" + energyRequired + "]"; - } + @Override + public boolean isValidInput(int slot, ItemStack item) { + return getInputForStack(item) != null; + } - + @Override + public boolean isValidInput(FluidStack fluid) { + return getInputForStack(fluid) != null; + } + private RecipeInput getInputForStack(FluidStack input) { + for (RecipeInput ri : inputs) { + if (ri.isInput(input)) { + return ri; + } + } + return null; + } + + private RecipeInput getInputForStack(ItemStack input) { + for (RecipeInput ri : inputs) { + if (ri.isInput(input)) { + return ri; + } + } + return null; + } + + @Override + public List getInputStacks() { + if (inputs == null) { + return Collections.emptyList(); + } + List res = new ArrayList(inputs.length); + for (int i = 0; i < inputs.length; i++) { + RecipeInput in = inputs[i]; + if (in != null && in.getInput() != null) { + res.add(in.getInput()); + } + } + return res; + } + + @Override + public List getInputFluidStacks() { + if (inputs == null) { + return Collections.emptyList(); + } + List res = new ArrayList(inputs.length); + for (int i = 0; i < inputs.length; i++) { + RecipeInput in = inputs[i]; + if (in != null && in.getFluidInput() != null) { + res.add(in.getFluidInput()); + } + } + return res; + } + + @Override + public RecipeInput[] getInputs() { + return inputs; + } + + @Override + public RecipeOutput[] getOutputs() { + return outputs; + } + + @Override + public RecipeBonusType getBonusType() { + return bonusType; + } + + public boolean hasOuput(ItemStack result) { + if (result == null) { + return false; + } + for (RecipeOutput output : outputs) { + ItemStack os = output.getOutput(); + if (os != null && os.isItemEqual(result)) { + return true; + } + } + return false; + } + + @Override + public int getEnergyRequired() { + return energyRequired; + } + + @Override + public boolean isValid() { + return inputs != null && outputs != null && energyRequired > 0; + } + + @Override + public String toString() { + return "Recipe [input=" + Arrays.toString(inputs) + ", output=" + Arrays.toString(outputs) + ", energyRequired=" + + energyRequired + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeBonusType.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeBonusType.java index 30c2a3cc..43a449c1 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeBonusType.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeBonusType.java @@ -1,7 +1,7 @@ package crazypants.enderio.machine.recipe; public enum RecipeBonusType { - NONE, - MULTIPLY_OUTPUT, - CHANCE_ONLY + NONE, + MULTIPLY_OUTPUT, + CHANCE_ONLY } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java index 51a5ce51..9fabeffe 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfig.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.recipe; +import crazypants.enderio.Log; +import crazypants.enderio.config.Config; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -14,355 +16,347 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import net.minecraft.item.ItemStack; - import org.apache.commons.io.IOUtils; -import crazypants.enderio.Log; -import crazypants.enderio.config.Config; - public class RecipeConfig { - //---------------------------------------------- Loading ------------ + // ---------------------------------------------- Loading ------------ - public static RecipeConfig loadRecipeConfig(String coreFileName, String customFileName, CustomTagHandler customHandler) { - File coreFile = new File(Config.configDirectory, coreFileName); + public static RecipeConfig loadRecipeConfig( + String coreFileName, String customFileName, CustomTagHandler customHandler) { + File coreFile = new File(Config.configDirectory, coreFileName); - String defaultVals = null; - try { - defaultVals = readRecipes(coreFile, coreFileName, true); - } catch (IOException e) { - Log.error("Could not load default recipes file " + coreFile + " from EnderIO jar: " + e.getMessage()); - e.printStackTrace(); - return null; - } - - if(!coreFile.exists()) { - Log.error("Could not load default recipes from " + coreFile + " as the file does not exist."); - return null; - } - - RecipeConfig config; - try { - config = RecipeConfigParser.parse(defaultVals, customHandler); - } catch (Exception e) { - Log.error("Error parsing " + coreFileName); - return null; - } - - File userFile = new File(Config.configDirectory, customFileName); - String userConfigStr = null; - try { - userConfigStr = readRecipes(userFile, customFileName, false); - if(userConfigStr == null || userConfigStr.trim().length() == 0) { - Log.error("Empty user config file: " + userFile.getAbsolutePath()); - } else { - RecipeConfig userConfig = RecipeConfigParser.parse(userConfigStr, customHandler); - config.merge(userConfig); - } - } catch (Exception e) { - Log.error("Could not load user defined recipes from file: " + customFileName); - e.printStackTrace(); - } - return config; - } - - public static String readRecipes(File copyTo, String fileName, boolean replaceIfExists) throws IOException { - if(!replaceIfExists && copyTo.exists()) { - return readStream(new FileInputStream(copyTo)); - } - - InputStream in = RecipeConfig.class.getResourceAsStream("/assets/enderio/config/" + fileName); - if(in == null) { - Log.error("Could load default AlloySmelter recipes."); - throw new IOException("Could not resource /assets/enderio/config/" + fileName + " form classpath. "); - } - String output = readStream(in); - BufferedWriter writer = null; - try { - writer = new BufferedWriter(new FileWriter(copyTo, false)); - writer.write(output.toString()); - } finally { - IOUtils.closeQuietly(writer); - } - return output.toString(); - } - - private static String readStream(InputStream in) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - StringBuilder output = new StringBuilder(); - try { - String line = reader.readLine(); - while (line != null) { - output.append(line); - output.append("\n"); - line = reader.readLine(); - } - } finally { - IOUtils.closeQuietly(reader); - } - return output.toString(); - } - - //---------------------------------------------- Class ------------ - - private boolean dumpItemRegistery = false; - private boolean dumpOreDictionary = false; - private boolean enabled = true; - - private Map recipeGroups = new HashMap(); - - public RecipeConfig() { - } - - public void merge(RecipeConfig userConfig) { - - if(userConfig.dumpItemRegistery) { - dumpItemRegistery = true; - } - if(userConfig.dumpOreDictionary) { - dumpOreDictionary = true; - } - - for (RecipeGroup group : userConfig.getRecipeGroups().values()) { - if(!group.enabled) { - if(recipeGroups.remove(group.name) != null) { - Log.debug("Disabled core recipe group " + group.name + " due to user config."); + String defaultVals = null; + try { + defaultVals = readRecipes(coreFile, coreFileName, true); + } catch (IOException e) { + Log.error("Could not load default recipes file " + coreFile + " from EnderIO jar: " + e.getMessage()); + e.printStackTrace(); + return null; } - } else { - RecipeGroup modifyGroup = recipeGroups.get(group.name); - if(modifyGroup == null) { - Log.debug("Added user defined recipe group " + group.name); - modifyGroup = new RecipeGroup(group.name); - recipeGroups.put(group.name, modifyGroup); + + if (!coreFile.exists()) { + Log.error("Could not load default recipes from " + coreFile + " as the file does not exist."); + return null; } - for (RecipeElement recipe : group.recipes.values()) { - if(recipe.isValid()) { - if(modifyGroup.recipes.containsKey(recipe.name)) { - Log.debug("Replacing core recipe " + recipe.name + " with user defined recipe."); + + RecipeConfig config; + try { + config = RecipeConfigParser.parse(defaultVals, customHandler); + } catch (Exception e) { + Log.error("Error parsing " + coreFileName); + return null; + } + + File userFile = new File(Config.configDirectory, customFileName); + String userConfigStr = null; + try { + userConfigStr = readRecipes(userFile, customFileName, false); + if (userConfigStr == null || userConfigStr.trim().length() == 0) { + Log.error("Empty user config file: " + userFile.getAbsolutePath()); } else { - Log.debug("Added user defined recipe " + recipe.name); + RecipeConfig userConfig = RecipeConfigParser.parse(userConfigStr, customHandler); + config.merge(userConfig); } - modifyGroup.addRecipe(recipe); - } else { - Log.debug("Removed recipe " + recipe.name + " due to user config."); - modifyGroup.recipes.remove(recipe.name); - } + } catch (Exception e) { + Log.error("Could not load user defined recipes from file: " + customFileName); + e.printStackTrace(); } - } + return config; } - } - public RecipeGroup createRecipeGroup(String name) { - return new RecipeGroup(name); - } + public static String readRecipes(File copyTo, String fileName, boolean replaceIfExists) throws IOException { + if (!replaceIfExists && copyTo.exists()) { + return readStream(new FileInputStream(copyTo)); + } - public void addRecipeGroup(RecipeGroup group) { - if(group.isNameValid()) { - recipeGroups.put(group.getName(), group); + InputStream in = RecipeConfig.class.getResourceAsStream("/assets/enderio/config/" + fileName); + if (in == null) { + Log.error("Could load default AlloySmelter recipes."); + throw new IOException("Could not resource /assets/enderio/config/" + fileName + " form classpath. "); + } + String output = readStream(in); + BufferedWriter writer = null; + try { + writer = new BufferedWriter(new FileWriter(copyTo, false)); + writer.write(output.toString()); + } finally { + IOUtils.closeQuietly(writer); + } + return output.toString(); } - } - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public void setRecipeGroups(Map recipeGroups) { - this.recipeGroups = recipeGroups; - } - - public boolean isDumpItemRegistery() { - return dumpItemRegistery; - } - - public void setDumpItemRegistery(boolean dumpItemRegistery) { - this.dumpItemRegistery = dumpItemRegistery; - } - - public boolean isDumpOreDictionary() { - return dumpOreDictionary; - } - - public void setDumpOreDictionary(boolean dumpOreDictionary) { - this.dumpOreDictionary = dumpOreDictionary; - } - - public List getRecipes(boolean isRecipePerInput) { - List result = new ArrayList(32); - for (RecipeGroup rg : recipeGroups.values()) { - if(rg.isEnabled() && rg.isValid()) { - result.addAll(rg.createRecipes(isRecipePerInput)); - } + private static String readStream(InputStream in) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + StringBuilder output = new StringBuilder(); + try { + String line = reader.readLine(); + while (line != null) { + output.append(line); + output.append("\n"); + line = reader.readLine(); + } + } finally { + IOUtils.closeQuietly(reader); + } + return output.toString(); } - return result; - } - public List getRecipesForGroup(String group, boolean isRecipePerInput) { - RecipeGroup grp = recipeGroups.get(group); - if(grp == null) { - return Collections.emptyList(); - } - return grp.createRecipes(isRecipePerInput); - } - - public Map getRecipeGroups() { - return recipeGroups; - } - - public static class RecipeGroup { - - private final String name; - - private Map recipes = new LinkedHashMap(); + // ---------------------------------------------- Class ------------ + private boolean dumpItemRegistery = false; + private boolean dumpOreDictionary = false; private boolean enabled = true; - public RecipeGroup(String name) { - if(name != null) { - name = name.trim(); - if (name.length() <= 0) { - name = null; + private Map recipeGroups = new HashMap(); + + public RecipeConfig() {} + + public void merge(RecipeConfig userConfig) { + + if (userConfig.dumpItemRegistery) { + dumpItemRegistery = true; + } + if (userConfig.dumpOreDictionary) { + dumpOreDictionary = true; + } + + for (RecipeGroup group : userConfig.getRecipeGroups().values()) { + if (!group.enabled) { + if (recipeGroups.remove(group.name) != null) { + Log.debug("Disabled core recipe group " + group.name + " due to user config."); + } + } else { + RecipeGroup modifyGroup = recipeGroups.get(group.name); + if (modifyGroup == null) { + Log.debug("Added user defined recipe group " + group.name); + modifyGroup = new RecipeGroup(group.name); + recipeGroups.put(group.name, modifyGroup); + } + for (RecipeElement recipe : group.recipes.values()) { + if (recipe.isValid()) { + if (modifyGroup.recipes.containsKey(recipe.name)) { + Log.debug("Replacing core recipe " + recipe.name + " with user defined recipe."); + } else { + Log.debug("Added user defined recipe " + recipe.name); + } + modifyGroup.addRecipe(recipe); + } else { + Log.debug("Removed recipe " + recipe.name + " due to user config."); + modifyGroup.recipes.remove(recipe.name); + } + } + } + } + } + + public RecipeGroup createRecipeGroup(String name) { + return new RecipeGroup(name); + } + + public void addRecipeGroup(RecipeGroup group) { + if (group.isNameValid()) { + recipeGroups.put(group.getName(), group); } - } - this.name = name; } public boolean isEnabled() { - return enabled; + return enabled; } public void setEnabled(boolean enabled) { - this.enabled = enabled; + this.enabled = enabled; } - public RecipeElement createRecipe(String name) { - return new RecipeElement(name); + public void setRecipeGroups(Map recipeGroups) { + this.recipeGroups = recipeGroups; } - public void addRecipe(RecipeElement recipe) { - recipes.put(recipe.name, recipe); + public boolean isDumpItemRegistery() { + return dumpItemRegistery; } - public String getName() { - return name; + public void setDumpItemRegistery(boolean dumpItemRegistery) { + this.dumpItemRegistery = dumpItemRegistery; } - public List createRecipes(boolean isRecipePerInput) { - List result = new ArrayList(recipes.size()); - for (RecipeElement recipe : recipes.values()) { - if(recipe.isValid()) { - result.addAll(recipe.createRecipes(isRecipePerInput)); + public boolean isDumpOreDictionary() { + return dumpOreDictionary; + } + + public void setDumpOreDictionary(boolean dumpOreDictionary) { + this.dumpOreDictionary = dumpOreDictionary; + } + + public List getRecipes(boolean isRecipePerInput) { + List result = new ArrayList(32); + for (RecipeGroup rg : recipeGroups.values()) { + if (rg.isEnabled() && rg.isValid()) { + result.addAll(rg.createRecipes(isRecipePerInput)); + } } - } - return result; + return result; } - public boolean isValid() { - return isNameValid() && !recipes.isEmpty(); - } - - public boolean isNameValid() { - return name != null; - } - - @Override - public String toString() { - return "RecipeGroup [name=" + name + ", recipes=" + recipes + ", enabled=" + enabled + "]"; - } - - } - - public static class RecipeElement { - - private List inputs = new ArrayList(); - - private List outputs = new ArrayList(); - - private int energyRequired; - - private RecipeBonusType bonusType = RecipeBonusType.MULTIPLY_OUTPUT; - - private String name; - - private boolean allowMissing = false; - private boolean invalidated = false; - - private RecipeElement(String name) { - this.name = name; - } - - public void addInput(RecipeInput input) { - inputs.add(input); - } - - public void addInput(ItemStack stack, boolean useMetadata) { - inputs.add(new RecipeInput(stack, useMetadata)); - } - - public void addOutput(RecipeOutput output) { - outputs.add(output); - } - - public List createRecipes(boolean isRecipePerInput) { - - RecipeOutput[] outputArr = outputs.toArray(new RecipeOutput[outputs.size()]); - RecipeInput[] inputArr = inputs.toArray(new RecipeInput[inputs.size()]); - List result = new ArrayList(); - if(isRecipePerInput) { - for (RecipeInput input : inputs) { - result.add(new Recipe(input, energyRequired, bonusType, outputArr)); + public List getRecipesForGroup(String group, boolean isRecipePerInput) { + RecipeGroup grp = recipeGroups.get(group); + if (grp == null) { + return Collections.emptyList(); } - } else { - for (RecipeOutput output : outputs) { - result.add(new Recipe(output, energyRequired, bonusType, inputArr)); + return grp.createRecipes(isRecipePerInput); + } + + public Map getRecipeGroups() { + return recipeGroups; + } + + public static class RecipeGroup { + + private final String name; + + private Map recipes = new LinkedHashMap(); + + private boolean enabled = true; + + public RecipeGroup(String name) { + if (name != null) { + name = name.trim(); + if (name.length() <= 0) { + name = null; + } + } + this.name = name; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public RecipeElement createRecipe(String name) { + return new RecipeElement(name); + } + + public void addRecipe(RecipeElement recipe) { + recipes.put(recipe.name, recipe); + } + + public String getName() { + return name; + } + + public List createRecipes(boolean isRecipePerInput) { + List result = new ArrayList(recipes.size()); + for (RecipeElement recipe : recipes.values()) { + if (recipe.isValid()) { + result.addAll(recipe.createRecipes(isRecipePerInput)); + } + } + return result; + } + + public boolean isValid() { + return isNameValid() && !recipes.isEmpty(); + } + + public boolean isNameValid() { + return name != null; + } + + @Override + public String toString() { + return "RecipeGroup [name=" + name + ", recipes=" + recipes + ", enabled=" + enabled + "]"; } - } - return result; } - public boolean isValid() { - return !invalidated && !inputs.isEmpty() && !outputs.isEmpty(); + public static class RecipeElement { + + private List inputs = new ArrayList(); + + private List outputs = new ArrayList(); + + private int energyRequired; + + private RecipeBonusType bonusType = RecipeBonusType.MULTIPLY_OUTPUT; + + private String name; + + private boolean allowMissing = false; + private boolean invalidated = false; + + private RecipeElement(String name) { + this.name = name; + } + + public void addInput(RecipeInput input) { + inputs.add(input); + } + + public void addInput(ItemStack stack, boolean useMetadata) { + inputs.add(new RecipeInput(stack, useMetadata)); + } + + public void addOutput(RecipeOutput output) { + outputs.add(output); + } + + public List createRecipes(boolean isRecipePerInput) { + + RecipeOutput[] outputArr = outputs.toArray(new RecipeOutput[outputs.size()]); + RecipeInput[] inputArr = inputs.toArray(new RecipeInput[inputs.size()]); + List result = new ArrayList(); + if (isRecipePerInput) { + for (RecipeInput input : inputs) { + result.add(new Recipe(input, energyRequired, bonusType, outputArr)); + } + } else { + for (RecipeOutput output : outputs) { + result.add(new Recipe(output, energyRequired, bonusType, inputArr)); + } + } + return result; + } + + public boolean isValid() { + return !invalidated && !inputs.isEmpty() && !outputs.isEmpty(); + } + + public float getEnergyRequired() { + return energyRequired; + } + + public void setEnergyRequired(int energyRequired) { + this.energyRequired = energyRequired; + } + + public RecipeBonusType getBonusType() { + return bonusType; + } + + public void setBonusType(RecipeBonusType bonusType) { + this.bonusType = bonusType; + } + + public void setAllowMissing(boolean allowMissing) { + this.allowMissing = allowMissing; + } + + public boolean allowMissing() { + return allowMissing; + } + + public void invalidate() { + invalidated = true; + } + + @Override + public String toString() { + return "Recipe [" + (invalidated ? "INVALID " : "") + "input=" + inputs + ", outputs=" + outputs + + ", energyRequired=" + energyRequired + ", bonusType=" + bonusType + "]"; + } } - - public float getEnergyRequired() { - return energyRequired; - } - - public void setEnergyRequired(int energyRequired) { - this.energyRequired = energyRequired; - } - - public RecipeBonusType getBonusType() { - return bonusType; - } - - public void setBonusType(RecipeBonusType bonusType) { - this.bonusType = bonusType; - } - - public void setAllowMissing(boolean allowMissing) { - this.allowMissing = allowMissing; - } - - public boolean allowMissing() { - return allowMissing; - } - - public void invalidate() { - invalidated = true; - } - - @Override - public String toString() { - return "Recipe [" + (invalidated ? "INVALID " : "") + "input=" + inputs + ", outputs=" + outputs + ", energyRequired=" - + energyRequired + ", bonusType=" + bonusType + "]"; - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java index 956054fc..50ea7fbb 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java @@ -1,14 +1,19 @@ package crazypants.enderio.machine.recipe; +import com.enderio.core.common.util.OreDictionaryHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.Log; +import crazypants.enderio.machine.crusher.CrusherRecipeManager; +import crazypants.enderio.machine.recipe.RecipeConfig.RecipeElement; +import crazypants.enderio.machine.recipe.RecipeConfig.RecipeGroup; +import crazypants.enderio.material.OreDictionaryPreferences; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.StringReader; import java.util.Locale; - import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,7 +22,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; - import org.apache.commons.io.IOUtils; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -26,481 +30,481 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import com.enderio.core.common.util.OreDictionaryHelper; - -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.Log; -import crazypants.enderio.machine.crusher.CrusherRecipeManager; -import crazypants.enderio.machine.recipe.RecipeConfig.RecipeElement; -import crazypants.enderio.machine.recipe.RecipeConfig.RecipeGroup; -import crazypants.enderio.material.OreDictionaryPreferences; - public class RecipeConfigParser extends DefaultHandler { - public static final String ELEMENT_RECIPE_GROUP = "recipeGroup"; - public static final String ELEMENT_RECIPE = "recipe"; - public static final String ELEMENT_INPUT = "input"; - public static final String ELEMENT_OUTPUT = "output"; - public static final String ELEMENT_ITEM_STACK = "itemStack"; - public static final String ELEMENT_FLUID_STACK = "fluidStack"; - public static final String ELEMENT_DUMP_REGISTERY = "dumpRegistery"; // compat - public static final String ELEMENT_DUMP_REGISTRY = "dumpRegistry"; + public static final String ELEMENT_RECIPE_GROUP = "recipeGroup"; + public static final String ELEMENT_RECIPE = "recipe"; + public static final String ELEMENT_INPUT = "input"; + public static final String ELEMENT_OUTPUT = "output"; + public static final String ELEMENT_ITEM_STACK = "itemStack"; + public static final String ELEMENT_FLUID_STACK = "fluidStack"; + public static final String ELEMENT_DUMP_REGISTERY = "dumpRegistery"; // compat + public static final String ELEMENT_DUMP_REGISTRY = "dumpRegistry"; - public static final String AT_NAME = "name"; - public static final String AT_ENABLED = "enabled"; - public static final String AT_DUMP_ITEMS = "modObjects"; - public static final String AT_ORE_DICT = "oreDictionary"; - public static final String AT_ENERGY_COST = "energyCost"; - public static final String AT_BONUS_TYPE = "bonusType"; - public static final String AT_ITEM_META = "itemMeta"; - public static final String AT_ITEM_NAME = "itemName"; - public static final String AT_MOD_ID = "modID"; - public static final String AT_NUMBER = "number"; - public static final String AT_AMOUNT = "amount"; - public static final String AT_MULTIPLIER = "multiplier"; - public static final String AT_SLOT = "slot"; - public static final String AT_CHANCE = "chance"; - public static final String AT_EXP = "exp"; - public static final String AT_ALLOW_MISSING = "allowMissing"; + public static final String AT_NAME = "name"; + public static final String AT_ENABLED = "enabled"; + public static final String AT_DUMP_ITEMS = "modObjects"; + public static final String AT_ORE_DICT = "oreDictionary"; + public static final String AT_ENERGY_COST = "energyCost"; + public static final String AT_BONUS_TYPE = "bonusType"; + public static final String AT_ITEM_META = "itemMeta"; + public static final String AT_ITEM_NAME = "itemName"; + public static final String AT_MOD_ID = "modID"; + public static final String AT_NUMBER = "number"; + public static final String AT_AMOUNT = "amount"; + public static final String AT_MULTIPLIER = "multiplier"; + public static final String AT_SLOT = "slot"; + public static final String AT_CHANCE = "chance"; + public static final String AT_EXP = "exp"; + public static final String AT_ALLOW_MISSING = "allowMissing"; - // Log prefix - private static final String LP = "RecipeParser: "; + // Log prefix + private static final String LP = "RecipeParser: "; - public static RecipeConfig parse(String str, CustomTagHandler customHandler) throws Exception { - StringReader reader = new StringReader(str); - InputSource is = new InputSource(reader); - try { - return parse(is, customHandler); - } finally { - reader.close(); - } - } - - public static RecipeConfig parse(File file, CustomTagHandler customHandler) throws Exception { - BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); - InputSource is = new InputSource(bis); - try { - return parse(is, customHandler); - } finally { - IOUtils.closeQuietly(bis); - } - } - - public static RecipeConfig parse(InputSource is, CustomTagHandler customHandler) throws Exception { - - RecipeConfigParser parser = new RecipeConfigParser(customHandler); - - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setNamespaceAware(true); - SAXParser saxParser = spf.newSAXParser(); - XMLReader xmlReader = saxParser.getXMLReader(); - xmlReader.setContentHandler(parser); - xmlReader.parse(is); - - return parser.getResult(); - } - - private RecipeConfig result = null; - private RecipeConfig root = null; - private RecipeGroup recipeGroup = null; - private RecipeElement recipe = null; - - private boolean outputTagOpen = false; - private boolean inputTagOpen = false; - - private boolean debug = false; - - private boolean inCustomHandler = false; - - private CustomTagHandler customHandler = null; - - RecipeConfigParser(CustomTagHandler customHandler) { - this.customHandler = customHandler; - } - - RecipeConfig getResult() { - return result != null ? result : root; - } - - @Override - public void warning(SAXParseException e) throws SAXException { - Log.warn("Warning parsing SAG Mill config file: " + e.getMessage()); - } - - @Override - public void error(SAXParseException e) throws SAXException { - Log.error("Error parsing SAG Mill config file: " + e.getMessage()); - e.printStackTrace(); - } - - @Override - public void fatalError(SAXParseException e) throws SAXException { - Log.error("Error parsing SAG Mill config file: " + e.getMessage()); - e.printStackTrace(); - } - - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if(isElementRoot(localName)) { - result = root; - root = null; - if(debug) { - Log.debug(LP + "Closing root"); - } - return; - } - if(ELEMENT_RECIPE_GROUP.equals(localName)) { - - if(debug) { - Log.debug(LP + "Closing recipe group"); - } - if(recipeGroup != null && root != null) { - root.addRecipeGroup(recipeGroup); - } - recipeGroup = null; - return; - } - if(ELEMENT_RECIPE.equals(localName)) { - if(debug) { - Log.debug(LP + "Closing recipe"); - } - if(recipe != null && recipeGroup != null) { - recipeGroup.addRecipe(recipe); - } else { - Log.warn(LP + "Could not add recipe " + recipe + " to group " + recipeGroup); - } - - recipe = null; - return; - } - if(ELEMENT_OUTPUT.equals(localName)) { - outputTagOpen = false; - if(debug) { - Log.debug(LP + "Closing output"); - } - return; - } - if(ELEMENT_INPUT.equals(localName)) { - inputTagOpen = false; - if(debug) { - Log.debug(LP + "Closing input"); - } - return; - } - // Custom tag handling - if(customHandler != null) { - if(customHandler.endElement(uri, localName, qName)) { - inCustomHandler = false; - return; - } - } - } - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - - if(debug) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < attributes.getLength(); i++) { - sb.append("[" + attributes.getQName(i) + "=" + attributes.getValue(i) + "]"); - } - Log.debug(LP + "RecipeConfigParser.startElement: localName:" + localName + " attrs:" + sb); + public static RecipeConfig parse(String str, CustomTagHandler customHandler) throws Exception { + StringReader reader = new StringReader(str); + InputSource is = new InputSource(reader); + try { + return parse(is, customHandler); + } finally { + reader.close(); + } } - if(isElementRoot(localName)) { - if(root != null) { - Log.warn(LP + "Multiple root elements found."); - } else { - root = new RecipeConfig(); - } - return; + public static RecipeConfig parse(File file, CustomTagHandler customHandler) throws Exception { + BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); + InputSource is = new InputSource(bis); + try { + return parse(is, customHandler); + } finally { + IOUtils.closeQuietly(bis); + } } - if(root == null) { - Log.warn(LP + " Root element not specified before element " + localName + "."); - root = new RecipeConfig(); + public static RecipeConfig parse(InputSource is, CustomTagHandler customHandler) throws Exception { + + RecipeConfigParser parser = new RecipeConfigParser(customHandler); + + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setNamespaceAware(true); + SAXParser saxParser = spf.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setContentHandler(parser); + xmlReader.parse(is); + + return parser.getResult(); } - if (ELEMENT_DUMP_REGISTERY.equals(localName) || ELEMENT_DUMP_REGISTRY.equals(localName)) { - root.setDumpOreDictionary(getBooleanValue(AT_ORE_DICT, attributes, false)); - root.setDumpItemRegistery(getBooleanValue(AT_DUMP_ITEMS, attributes, false)); - return; + private RecipeConfig result = null; + private RecipeConfig root = null; + private RecipeGroup recipeGroup = null; + private RecipeElement recipe = null; + + private boolean outputTagOpen = false; + private boolean inputTagOpen = false; + + private boolean debug = false; + + private boolean inCustomHandler = false; + + private CustomTagHandler customHandler = null; + + RecipeConfigParser(CustomTagHandler customHandler) { + this.customHandler = customHandler; } - if(ELEMENT_RECIPE_GROUP.equals(localName)) { - if(recipeGroup != null) { - Log.warn(LP + "Recipe group " + recipeGroup.getName() + " not closed before encountering a new recipe group."); - } - recipeGroup = root.createRecipeGroup(attributes.getValue(AT_NAME)); - recipeGroup.setEnabled(getBooleanValue(AT_ENABLED, attributes, true)); - if(!recipeGroup.isNameValid()) { - Log.warn(LP + "A recipe group was found with an invalid name: " + attributes.getValue(AT_NAME)); - recipeGroup = null; - } - return; + RecipeConfig getResult() { + return result != null ? result : root; } - if(ELEMENT_RECIPE.equals(localName)) { - if(recipeGroup == null) { - Log.warn(LP + "A recipe was found outside of a recipe groups tags."); - return; - } - if(recipe != null) { - Log.warn(LP + "A new recipe was started before the recipe was closed."); - } - String name = getStringValue(AT_NAME, attributes, null); - if(name == null) { - Log.warn(LP + "An unnamed recipe was found."); - return; - } - recipe = recipeGroup.createRecipe(name); - recipe.setEnergyRequired(getIntValue(AT_ENERGY_COST, attributes, CrusherRecipeManager.ORE_ENERGY_COST)); - recipe.setBonusType(getEnumValue(AT_BONUS_TYPE, attributes, RecipeBonusType.class, RecipeBonusType.MULTIPLY_OUTPUT)); - recipe.setAllowMissing(getBooleanValue(AT_ALLOW_MISSING, attributes, false)); - return; + @Override + public void warning(SAXParseException e) throws SAXException { + Log.warn("Warning parsing SAG Mill config file: " + e.getMessage()); } - // Custom tag handling - if(customHandler != null) { - if(customHandler.startElement(uri, localName, qName, attributes)) { - inCustomHandler = true; - return; - } + @Override + public void error(SAXParseException e) throws SAXException { + Log.error("Error parsing SAG Mill config file: " + e.getMessage()); + e.printStackTrace(); } - if(recipe == null) { - if(!inCustomHandler) { - Log.warn(LP + "Found element <" + localName + "> with no recipe decleration."); - } - return; + @Override + public void fatalError(SAXParseException e) throws SAXException { + Log.error("Error parsing SAG Mill config file: " + e.getMessage()); + e.printStackTrace(); } - if(ELEMENT_OUTPUT.equals(localName)) { - if(inputTagOpen) { - Log.warn(LP + " encounterd before closed."); - inputTagOpen = false; - } - if(outputTagOpen) { - Log.warn(LP + " encounterd before previous closed."); - } - outputTagOpen = true; - return; + @Override + public void endElement(String uri, String localName, String qName) throws SAXException { + if (isElementRoot(localName)) { + result = root; + root = null; + if (debug) { + Log.debug(LP + "Closing root"); + } + return; + } + if (ELEMENT_RECIPE_GROUP.equals(localName)) { + + if (debug) { + Log.debug(LP + "Closing recipe group"); + } + if (recipeGroup != null && root != null) { + root.addRecipeGroup(recipeGroup); + } + recipeGroup = null; + return; + } + if (ELEMENT_RECIPE.equals(localName)) { + if (debug) { + Log.debug(LP + "Closing recipe"); + } + if (recipe != null && recipeGroup != null) { + recipeGroup.addRecipe(recipe); + } else { + Log.warn(LP + "Could not add recipe " + recipe + " to group " + recipeGroup); + } + + recipe = null; + return; + } + if (ELEMENT_OUTPUT.equals(localName)) { + outputTagOpen = false; + if (debug) { + Log.debug(LP + "Closing output"); + } + return; + } + if (ELEMENT_INPUT.equals(localName)) { + inputTagOpen = false; + if (debug) { + Log.debug(LP + "Closing input"); + } + return; + } + // Custom tag handling + if (customHandler != null) { + if (customHandler.endElement(uri, localName, qName)) { + inCustomHandler = false; + return; + } + } } - if(ELEMENT_INPUT.equals(localName)) { - if(outputTagOpen) { - Log.warn(LP + " encounterd before closed."); - outputTagOpen = false; - } - if(inputTagOpen) { - Log.warn(LP + " encounterd before previous closed."); - } - inputTagOpen = true; - return; + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + + if (debug) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < attributes.getLength(); i++) { + sb.append("[" + attributes.getQName(i) + "=" + attributes.getValue(i) + "]"); + } + Log.debug(LP + "RecipeConfigParser.startElement: localName:" + localName + " attrs:" + sb); + } + + if (isElementRoot(localName)) { + if (root != null) { + Log.warn(LP + "Multiple root elements found."); + } else { + root = new RecipeConfig(); + } + return; + } + + if (root == null) { + Log.warn(LP + " Root element not specified before element " + localName + "."); + root = new RecipeConfig(); + } + + if (ELEMENT_DUMP_REGISTERY.equals(localName) || ELEMENT_DUMP_REGISTRY.equals(localName)) { + root.setDumpOreDictionary(getBooleanValue(AT_ORE_DICT, attributes, false)); + root.setDumpItemRegistery(getBooleanValue(AT_DUMP_ITEMS, attributes, false)); + return; + } + + if (ELEMENT_RECIPE_GROUP.equals(localName)) { + if (recipeGroup != null) { + Log.warn(LP + "Recipe group " + recipeGroup.getName() + + " not closed before encountering a new recipe group."); + } + recipeGroup = root.createRecipeGroup(attributes.getValue(AT_NAME)); + recipeGroup.setEnabled(getBooleanValue(AT_ENABLED, attributes, true)); + if (!recipeGroup.isNameValid()) { + Log.warn(LP + "A recipe group was found with an invalid name: " + attributes.getValue(AT_NAME)); + recipeGroup = null; + } + return; + } + + if (ELEMENT_RECIPE.equals(localName)) { + if (recipeGroup == null) { + Log.warn(LP + "A recipe was found outside of a recipe groups tags."); + return; + } + if (recipe != null) { + Log.warn(LP + "A new recipe was started before the recipe was closed."); + } + String name = getStringValue(AT_NAME, attributes, null); + if (name == null) { + Log.warn(LP + "An unnamed recipe was found."); + return; + } + recipe = recipeGroup.createRecipe(name); + recipe.setEnergyRequired(getIntValue(AT_ENERGY_COST, attributes, CrusherRecipeManager.ORE_ENERGY_COST)); + recipe.setBonusType( + getEnumValue(AT_BONUS_TYPE, attributes, RecipeBonusType.class, RecipeBonusType.MULTIPLY_OUTPUT)); + recipe.setAllowMissing(getBooleanValue(AT_ALLOW_MISSING, attributes, false)); + return; + } + + // Custom tag handling + if (customHandler != null) { + if (customHandler.startElement(uri, localName, qName, attributes)) { + inCustomHandler = true; + return; + } + } + + if (recipe == null) { + if (!inCustomHandler) { + Log.warn(LP + "Found element <" + localName + "> with no recipe decleration."); + } + return; + } + + if (ELEMENT_OUTPUT.equals(localName)) { + if (inputTagOpen) { + Log.warn(LP + " encounterd before closed."); + inputTagOpen = false; + } + if (outputTagOpen) { + Log.warn(LP + " encounterd before previous closed."); + } + outputTagOpen = true; + return; + } + + if (ELEMENT_INPUT.equals(localName)) { + if (outputTagOpen) { + Log.warn(LP + " encounterd before closed."); + outputTagOpen = false; + } + if (inputTagOpen) { + Log.warn(LP + " encounterd before previous closed."); + } + inputTagOpen = true; + return; + } + + boolean isFluidStack = ELEMENT_FLUID_STACK.equals(localName); + if (ELEMENT_ITEM_STACK.equals(localName) || isFluidStack) { + if (!inputTagOpen && !outputTagOpen) { + Log.warn(LP + "Encounterd an item stack outside of either an or tag."); + return; + } + if (inputTagOpen && outputTagOpen) { + Log.warn(LP + "Encounterd an item stack within both an and tag."); + return; + } + + if (inputTagOpen) { + if (isFluidStack) { + addInputFluidStack(attributes); + } else { + addInputStack(attributes); + } + } else { + if (isFluidStack) { + addOutputFluidStack(attributes); + } else { + addOutputStack(attributes); + } + } + } } - boolean isFluidStack = ELEMENT_FLUID_STACK.equals(localName); - if(ELEMENT_ITEM_STACK.equals(localName) || isFluidStack) { - if(!inputTagOpen && !outputTagOpen) { - Log.warn(LP + "Encounterd an item stack outside of either an or tag."); - return; - } - if(inputTagOpen && outputTagOpen) { - Log.warn(LP + "Encounterd an item stack within both an and tag."); - return; - } + // TODO: What a hack! + private boolean isElementRoot(String str) { + return "AlloySmelterRecipes".equals(str) + || "SAGMillRecipes".equals(str) + || "VatRecipes".equals(str) + || "SliceAndSpliceRecipes".equals(str); + } - if(inputTagOpen) { - if(isFluidStack) { - addInputFluidStack(attributes); + private void addOutputStack(Attributes attributes) { + RecipeInput stack = getItemStack(attributes); + if (stack == null) { + return; + } + float exp = getFloatValue(AT_EXP, attributes, 0f); + recipe.addOutput(new RecipeOutput(stack.getInput(), getFloatValue(AT_CHANCE, attributes, 1f), exp)); + } + + private void addInputStack(Attributes attributes) { + RecipeInput stack = getItemStack(attributes); + if (stack == null) { + if (!recipe.allowMissing()) { + recipe.invalidate(); + } + return; + } + recipe.addInput(stack); + } + + private void addOutputFluidStack(Attributes attributes) { + RecipeInput stack = getFluidStack(attributes); + if (stack == null) { + return; + } + recipe.addOutput(new RecipeOutput(stack.getFluidInput())); + } + + private void addInputFluidStack(Attributes attributes) { + RecipeInput stack = getFluidStack(attributes); + if (stack == null) { + return; + } + recipe.addInput(stack); + } + + private RecipeInput getFluidStack(Attributes attributes) { + int amount = getIntValue(AT_AMOUNT, attributes, FluidContainerRegistry.BUCKET_VOLUME); + String name = getStringValue(AT_NAME, attributes, null); + if (name == null) { + return null; + } + Fluid fluid = FluidRegistry.getFluid(name); + if (fluid == null) { + Log.warn("When parsing recipes could not find fluid with name: " + name); + return null; + } + return new RecipeInput(new FluidStack(fluid, amount), getFloatValue(AT_MULTIPLIER, attributes, 1)); + } + + public static RecipeInput getItemStack(Attributes attributes) { + + int stackSize = getIntValue(AT_NUMBER, attributes, 1); + String oreDict = getStringValue(AT_ORE_DICT, attributes, null); + if (oreDict != null) { + if (!OreDictionaryHelper.isRegistered(oreDict)) { + Log.debug(LP + "Could not find an entry in the ore dictionary for " + oreDict); + return null; + } + ItemStack stack = OreDictionaryPreferences.instance.getPreferred(oreDict); + if (stack == null) { + Log.debug(LP + "Could not find a prefered item in the ore dictionary for " + oreDict); + return null; + } + stack = stack.copy(); + stack.stackSize = stackSize; + return new OreDictionaryRecipeInput( + stack, + OreDictionary.getOreID(oreDict), + getFloatValue(AT_MULTIPLIER, attributes, 1), + getIntValue(AT_SLOT, attributes, -1)); + } + + boolean useMeta = true; + int itemMeta = 0; + String metaString = getStringValue(AT_ITEM_META, attributes, "0"); + if ("*".equals(metaString)) { + useMeta = false; } else { - addInputStack(attributes); + itemMeta = getIntValue(AT_ITEM_META, attributes, 0); } - } else { - if(isFluidStack) { - addOutputFluidStack(attributes); - } else { - addOutputStack(attributes); + ItemStack res = null; + + String modId = getStringValue(AT_MOD_ID, attributes, null); + String name = getStringValue(AT_ITEM_NAME, attributes, null); + + if (modId != null && name != null) { + + Item i = GameRegistry.findItem(modId, name); + if (i != null) { + res = new ItemStack(i, stackSize, useMeta ? itemMeta : 0); + } else { + Block b = GameRegistry.findBlock(modId, name); + if (b != null) { + res = new ItemStack(b, stackSize, useMeta ? itemMeta : 0); + } + } } - } - } - } - - //TODO: What a hack! - private boolean isElementRoot(String str) { - return "AlloySmelterRecipes".equals(str) || "SAGMillRecipes".equals(str) || "VatRecipes".equals(str) || "SliceAndSpliceRecipes".equals(str); - } - - private void addOutputStack(Attributes attributes) { - RecipeInput stack = getItemStack(attributes); - if(stack == null) { - return; - } - float exp = getFloatValue(AT_EXP, attributes, 0f); - recipe.addOutput(new RecipeOutput(stack.getInput(), getFloatValue(AT_CHANCE, attributes, 1f), exp)); - } - - private void addInputStack(Attributes attributes) { - RecipeInput stack = getItemStack(attributes); - if (stack == null) { - if (!recipe.allowMissing()) { - recipe.invalidate(); - } - return; - } - recipe.addInput(stack); - } - - private void addOutputFluidStack(Attributes attributes) { - RecipeInput stack = getFluidStack(attributes); - if(stack == null) { - return; - } - recipe.addOutput(new RecipeOutput(stack.getFluidInput())); - } - - private void addInputFluidStack(Attributes attributes) { - RecipeInput stack = getFluidStack(attributes); - if(stack == null) { - return; - } - recipe.addInput(stack); - } - - private RecipeInput getFluidStack(Attributes attributes) { - int amount = getIntValue(AT_AMOUNT, attributes, FluidContainerRegistry.BUCKET_VOLUME); - String name = getStringValue(AT_NAME, attributes, null); - if(name == null) { - return null; - } - Fluid fluid = FluidRegistry.getFluid(name); - if(fluid == null) { - Log.warn("When parsing recipes could not find fluid with name: " + name); - return null; - } - return new RecipeInput(new FluidStack(fluid, amount), getFloatValue(AT_MULTIPLIER, attributes, 1)); - } - - public static RecipeInput getItemStack(Attributes attributes) { - - int stackSize = getIntValue(AT_NUMBER, attributes, 1); - String oreDict = getStringValue(AT_ORE_DICT, attributes, null); - if(oreDict != null) { - if(!OreDictionaryHelper.isRegistered(oreDict)) { - Log.debug(LP + "Could not find an entry in the ore dictionary for " + oreDict); - return null; - } - ItemStack stack = OreDictionaryPreferences.instance.getPreferred(oreDict); - if(stack == null) { - Log.debug(LP + "Could not find a prefered item in the ore dictionary for " + oreDict); - return null; - } - stack = stack.copy(); - stack.stackSize = stackSize; - return new OreDictionaryRecipeInput(stack, OreDictionary.getOreID(oreDict), getFloatValue(AT_MULTIPLIER, attributes, 1), getIntValue(AT_SLOT, attributes, - -1)); - } - - boolean useMeta = true; - int itemMeta = 0; - String metaString = getStringValue(AT_ITEM_META, attributes, "0"); - if("*".equals(metaString)) { - useMeta = false; - } else { - itemMeta = getIntValue(AT_ITEM_META, attributes, 0); - } - ItemStack res = null; - - String modId = getStringValue(AT_MOD_ID, attributes, null); - String name = getStringValue(AT_ITEM_NAME, attributes, null); - - if(modId != null && name != null) { - - Item i = GameRegistry.findItem(modId, name); - if(i != null) { - res = new ItemStack(i, stackSize, useMeta ? itemMeta : 0); - } else { - Block b = GameRegistry.findBlock(modId, name); - if(b != null) { - res = new ItemStack(b, stackSize, useMeta ? itemMeta : 0); + if (res == null) { + Log.debug("Could not create an item stack from the attributes " + toString(attributes)); + return null; } - } + return new RecipeInput( + res, useMeta, getFloatValue(AT_MULTIPLIER, attributes, 1), getIntValue(AT_SLOT, attributes, -1)); } - if(res == null) { - Log.debug("Could not create an item stack from the attributes " + toString(attributes)); - return null; + public static boolean getBooleanValue(String qName, Attributes attributes, boolean def) { + String val = attributes.getValue(qName); + if (val == null) { + return def; + } + val = val.toLowerCase(Locale.US).trim(); + return val.equals("false") ? false : val.equals("true") ? true : def; } - return new RecipeInput(res, useMeta, getFloatValue(AT_MULTIPLIER, attributes, 1), getIntValue(AT_SLOT, attributes, -1)); - } - public static boolean getBooleanValue(String qName, Attributes attributes, boolean def) { - String val = attributes.getValue(qName); - if(val == null) { - return def; + public static int getIntValue(String qName, Attributes attributes, int def) { + try { + return Integer.parseInt(getStringValue(qName, attributes, def + "")); + } catch (Exception e) { + Log.warn(LP + "Could not parse a valid int for attribute " + qName + " with value " + + getStringValue(qName, attributes, null)); + return def; + } } - val = val.toLowerCase(Locale.US).trim(); - return val.equals("false") ? false : val.equals("true") ? true : def; - } - public static int getIntValue(String qName, Attributes attributes, int def) { - try { - return Integer.parseInt(getStringValue(qName, attributes, def + "")); - } catch (Exception e) { - Log.warn(LP + "Could not parse a valid int for attribute " + qName + " with value " + getStringValue(qName, attributes, null)); - return def; + public static float getFloatValue(String qName, Attributes attributes, float def) { + try { + return Float.parseFloat(getStringValue(qName, attributes, def + "")); + } catch (Exception e) { + Log.warn(LP + "Could not parse a valid float for attribute " + qName + " with value " + + getStringValue(qName, attributes, null)); + return def; + } } - } - public static float getFloatValue(String qName, Attributes attributes, float def) { - try { - return Float.parseFloat(getStringValue(qName, attributes, def + "")); - } catch (Exception e) { - Log.warn(LP + "Could not parse a valid float for attribute " + qName + " with value " + getStringValue(qName, attributes, null)); - return def; + public static String getStringValue(String qName, Attributes attributes, String def) { + String val = attributes.getValue(qName); + if (val == null) { + return def; + } + val = val.trim(); + if (val.length() <= 0) { + return null; + } + return val; } - } - public static String getStringValue(String qName, Attributes attributes, String def) { - String val = attributes.getValue(qName); - if(val == null) { - return def; + public static > E getEnumValue(String qName, Attributes attributes, Class clazz, E def) { + String val = attributes.getValue(qName); + if (val == null) { + return def; + } + val = val.trim(); + if (val.length() <= 0) { + return def; + } + val = val.toUpperCase(Locale.US); + try { + return Enum.valueOf(clazz, val); + } catch (IllegalArgumentException ex) { + return def; + } } - val = val.trim(); - if(val.length() <= 0) { - return null; - } - return val; - } - public static > E getEnumValue(String qName, Attributes attributes, Class clazz, E def) { - String val = attributes.getValue(qName); - if(val == null) { - return def; + public static boolean hasAttribute(String att, Attributes attributes) { + return attributes.getValue(att) != null; } - val = val.trim(); - if(val.length() <= 0) { - return def; - } - val = val.toUpperCase(Locale.US); - try { - return Enum.valueOf(clazz, val); - } catch(IllegalArgumentException ex) { - return def; - } - } - public static boolean hasAttribute(String att, Attributes attributes) { - return attributes.getValue(att) != null; - } - - public static String toString(Attributes attributes) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < attributes.getLength(); i++) { - sb.append("[" + attributes.getQName(i) + "=" + attributes.getValue(i) + "]"); + public static String toString(Attributes attributes) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < attributes.getLength(); i++) { + sb.append("[" + attributes.getQName(i) + "=" + attributes.getValue(i) + "]"); + } + return sb.toString(); } - return sb.toString(); - } - } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java index bf642b74..31c8be2a 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java @@ -5,99 +5,98 @@ import net.minecraftforge.fluids.FluidStack; public class RecipeInput { - private final int slot; - private final ItemStack input; - private final boolean useMeta; + private final int slot; + private final ItemStack input; + private final boolean useMeta; - private final FluidStack fluid; + private final FluidStack fluid; - private final float multiplier; + private final float multiplier; - public RecipeInput(ItemStack input) { - this(input, true); - } - - public RecipeInput(ItemStack input, boolean useMeta) { - this(input, useMeta, null, 1, -1); - } - - public RecipeInput(FluidStack fluid) { - this(null, false, fluid, 1f, -1); - } - - public RecipeInput(FluidStack fluidStack, float mulitplier) { - this(null, true, fluidStack, mulitplier, -1); - } - - public RecipeInput(ItemStack item, boolean useMeta, float multiplier, int slot) { - this(item, useMeta, null, multiplier, slot); - } - - protected RecipeInput(ItemStack input, boolean useMeta, FluidStack fluid, float mulitplier, int slot) { - this.input = input == null ? null : input.copy(); - this.useMeta = useMeta; - this.fluid = fluid == null ? null : fluid.copy(); - this.multiplier = mulitplier; - this.slot = slot; - } - - public RecipeInput(RecipeInput copyFrom) { - input = copyFrom.input == null ? null : copyFrom.input.copy(); - fluid = copyFrom.fluid == null ? null : copyFrom.fluid.copy(); - useMeta = copyFrom.useMeta; - multiplier = copyFrom.multiplier; - slot = copyFrom.slot; - } - - public RecipeInput copy() { - return new RecipeInput(this); - } - - public boolean isFluid() { - return fluid != null; - } - - public ItemStack getInput() { - return input; - } - - public FluidStack getFluidInput() { - return fluid; - } - - public float getMulitplier() { - return multiplier; - } - - public int getSlotNumber() { - return slot; - } - - public boolean isInput(ItemStack test) { - if(test == null || input == null) { - return false; + public RecipeInput(ItemStack input) { + this(input, true); } - if(useMeta) { - return test.getItem() == input.getItem() && test.getItemDamage() == input.getItemDamage(); + public RecipeInput(ItemStack input, boolean useMeta) { + this(input, useMeta, null, 1, -1); } - return test.getItem() == input.getItem(); - } - public boolean isInput(FluidStack test) { - if(test == null || fluid == null) { - return false; + public RecipeInput(FluidStack fluid) { + this(null, false, fluid, 1f, -1); } - return test.isFluidEqual(fluid); - } - public ItemStack[] getEquivelentInputs() { - return null; - } + public RecipeInput(FluidStack fluidStack, float mulitplier) { + this(null, true, fluidStack, mulitplier, -1); + } - @Override - public String toString() { - return "RecipeInput [input=" + input + ", useMeta=" + useMeta + "]"; - } + public RecipeInput(ItemStack item, boolean useMeta, float multiplier, int slot) { + this(item, useMeta, null, multiplier, slot); + } + protected RecipeInput(ItemStack input, boolean useMeta, FluidStack fluid, float mulitplier, int slot) { + this.input = input == null ? null : input.copy(); + this.useMeta = useMeta; + this.fluid = fluid == null ? null : fluid.copy(); + this.multiplier = mulitplier; + this.slot = slot; + } + + public RecipeInput(RecipeInput copyFrom) { + input = copyFrom.input == null ? null : copyFrom.input.copy(); + fluid = copyFrom.fluid == null ? null : copyFrom.fluid.copy(); + useMeta = copyFrom.useMeta; + multiplier = copyFrom.multiplier; + slot = copyFrom.slot; + } + + public RecipeInput copy() { + return new RecipeInput(this); + } + + public boolean isFluid() { + return fluid != null; + } + + public ItemStack getInput() { + return input; + } + + public FluidStack getFluidInput() { + return fluid; + } + + public float getMulitplier() { + return multiplier; + } + + public int getSlotNumber() { + return slot; + } + + public boolean isInput(ItemStack test) { + if (test == null || input == null) { + return false; + } + + if (useMeta) { + return test.getItem() == input.getItem() && test.getItemDamage() == input.getItemDamage(); + } + return test.getItem() == input.getItem(); + } + + public boolean isInput(FluidStack test) { + if (test == null || fluid == null) { + return false; + } + return test.isFluidEqual(fluid); + } + + public ItemStack[] getEquivelentInputs() { + return null; + } + + @Override + public String toString() { + return "RecipeInput [input=" + input + ", useMeta=" + useMeta + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java index c1ce492f..923271b9 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeOutput.java @@ -7,67 +7,66 @@ import net.minecraftforge.fluids.FluidStack; public class RecipeOutput { - private final FluidStack outputFluid; - private final ItemStack output; - private final float chance; - private float exp; + private final FluidStack outputFluid; + private final ItemStack output; + private final float chance; + private float exp; - public RecipeOutput(Block output) { - this(new ItemStack(output), 1); - } + public RecipeOutput(Block output) { + this(new ItemStack(output), 1); + } - public RecipeOutput(Block output, float chance) { - this(new ItemStack(output), chance); - } + public RecipeOutput(Block output, float chance) { + this(new ItemStack(output), chance); + } - public RecipeOutput(Item output, float chance) { - this(new ItemStack(output), chance); - } + public RecipeOutput(Item output, float chance) { + this(new ItemStack(output), chance); + } - public RecipeOutput(Item output) { - this(new ItemStack(output), 1); - } + public RecipeOutput(Item output) { + this(new ItemStack(output), 1); + } - public RecipeOutput(ItemStack output) { - this(output, 1); - } + public RecipeOutput(ItemStack output) { + this(output, 1); + } - public RecipeOutput(ItemStack output, float chance) { - this(output, chance, 0); - } + public RecipeOutput(ItemStack output, float chance) { + this(output, chance, 0); + } - public RecipeOutput(ItemStack output, float chance, float exp) { - this.output = output.copy(); - this.chance = chance; - this.exp = exp; - outputFluid = null; - } + public RecipeOutput(ItemStack output, float chance, float exp) { + this.output = output.copy(); + this.chance = chance; + this.exp = exp; + outputFluid = null; + } - public RecipeOutput(FluidStack output) { - this.outputFluid = output; - this.output = null; - chance = 1; - exp = 0; - } + public RecipeOutput(FluidStack output) { + this.outputFluid = output; + this.output = null; + chance = 1; + exp = 0; + } - public float getChance() { - return chance; - } + public float getChance() { + return chance; + } - public float getExperiance() { - return exp; - } + public float getExperiance() { + return exp; + } - public ItemStack getOutput() { - return output; - } + public ItemStack getOutput() { + return output; + } - public FluidStack getFluidOutput() { - return outputFluid; - } - - public boolean isFluid() { - return outputFluid != null; - } + public FluidStack getFluidOutput() { + return outputFluid; + } + public boolean isFluid() { + return outputFluid != null; + } } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 3d5267d5..081c31e1 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -1,5 +1,15 @@ package crazypants.enderio.machine.reservoir; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.reservoir.TileReservoir.Pos; +import crazypants.enderio.tool.ToolUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,229 +22,212 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.reservoir.TileReservoir.Pos; -import crazypants.enderio.tool.ToolUtil; - public class BlockReservoir extends BlockEio implements IResourceTooltipProvider { - public static BlockReservoir create() { - BlockReservoir result = new BlockReservoir(); - result.init(); - return result; - } - - private static enum MbFace { - TL("reservoirMbTl"), - TR("reservoirMbTr"), - BL("reservoirMbBl"), - BR("reservoirMbBr"), - T("reservoirMbT"), - B("reservoirMbB"), - L("reservoirMbL"), - R("reservoirMbR"); - - String iconName; - - private MbFace(String iconName) { - this.iconName = iconName; + public static BlockReservoir create() { + BlockReservoir result = new BlockReservoir(); + result.init(); + return result; } - } + private static enum MbFace { + TL("reservoirMbTl"), + TR("reservoirMbTr"), + BL("reservoirMbBl"), + BR("reservoirMbBr"), + T("reservoirMbT"), + B("reservoirMbB"), + L("reservoirMbL"), + R("reservoirMbR"); - private IIcon[] mbIcons = new IIcon[8]; - IIcon switchIcon; + String iconName; - private BlockReservoir() { - super(ModObject.blockReservoir.unlocalisedName, TileReservoir.class, Material.rock); - setStepSound(Block.soundTypeStone); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - TileEntity te; - - if (!entityPlayer.isSneaking() && entityPlayer.inventory.getCurrentItem() != null - && (te = world.getTileEntity(x, y, z)) instanceof TileReservoir) { - TileReservoir tank = ((TileReservoir) te).getController(); - if (ToolUtil.isToolEquipped(entityPlayer) && tank.isMultiblock()) { - tank.setAutoEject(!tank.isAutoEject()); - for (BlockCoord bc : tank.multiblock) { - world.markBlockForUpdate(bc.x, bc.y, bc.z); + private MbFace(String iconName) { + this.iconName = iconName; } - return true; - } - if (FluidUtil.fillInternalTankFromPlayerHandItem(world, x, y, z, entityPlayer, tank)) { - return true; - } - if (FluidUtil.fillPlayerHandItemFromInternalTank(world, x, y, z, entityPlayer, tank)) { - return true; - } } - return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); - } + private IIcon[] mbIcons = new IIcon[8]; + IIcon switchIcon; - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileReservoir)) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - TileReservoir tr = (TileReservoir) te; - if(!tr.isMultiblock()) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); + private BlockReservoir() { + super(ModObject.blockReservoir.unlocalisedName, TileReservoir.class, Material.rock); + setStepSound(Block.soundTypeStone); } - Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - for (BlockCoord bc : tr.multiblock) { - min.x = Math.min(min.x, bc.x); - max.x = Math.max(max.x, bc.x + 1); - min.y = Math.min(min.y, bc.y); - max.y = Math.max(max.y, bc.y + 1); - min.z = Math.min(min.z, bc.z); - max.z = Math.max(max.z, bc.z + 1); - } - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { + TileEntity te; - } + if (!entityPlayer.isSneaking() + && entityPlayer.inventory.getCurrentItem() != null + && (te = world.getTileEntity(x, y, z)) instanceof TileReservoir) { + TileReservoir tank = ((TileReservoir) te).getController(); + if (ToolUtil.isToolEquipped(entityPlayer) && tank.isMultiblock()) { + tank.setAutoEject(!tank.isAutoEject()); + for (BlockCoord bc : tank.multiblock) { + world.markBlockForUpdate(bc.x, bc.y, bc.z); + } + return true; + } + if (FluidUtil.fillInternalTankFromPlayerHandItem(world, x, y, z, entityPlayer, tank)) { + return true; + } + if (FluidUtil.fillPlayerHandItemFromInternalTank(world, x, y, z, entityPlayer, tank)) { + return true; + } + } - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TileReservoir(); - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - if(world.isRemote) { - return; - } - TileReservoir tr = (TileReservoir) world.getTileEntity(x, y, z); - boolean res = tr.onBlockAdded(); - - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - if(world.isRemote) { - return; - } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileReservoir) { - ((TileReservoir) te).onNeighborBlockChange(block); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:reservoir"); - for (MbFace face : MbFace.values()) { - mbIcons[face.ordinal()] = IIconRegister.registerIcon("enderio:" + face.iconName); - } - switchIcon = IIconRegister.registerIcon("enderio:reservoirSwitch"); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int blockSide) { - if (y < 0 || y >= 256) { // getTileEntity is not safe for out of bounds coords - return false; + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileReservoir)) { - return true; - } - TileReservoir tr = (TileReservoir) te; - if(!tr.isMultiblock()) { - return true; - } - return false; - } + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileReservoir)) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - // used to render the block in the world - TileEntity te = world.getTileEntity(x, y, z); - - if(!(te instanceof TileReservoir)) { - return blockIcon; - } - TileReservoir tr = (TileReservoir) te; - if(!tr.isMultiblock()) { - return blockIcon; + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (BlockCoord bc : tr.multiblock) { + min.x = Math.min(min.x, bc.x); + max.x = Math.max(max.x, bc.x + 1); + min.y = Math.min(min.y, bc.y); + max.y = Math.max(max.y, bc.y + 1); + min.z = Math.min(min.z, bc.z); + max.z = Math.max(max.z, bc.z + 1); + } + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); } - ForgeDirection side = ForgeDirection.getOrientation(blockSide); - Pos pos = tr.pos; - - if(tr.front == side || tr.front == side.getOpposite()) { // 2x2 area - - boolean isRight; - if(tr.isVertical()) { // to to flip right and left for back faces of - // vertical multiblocks - isRight = !pos.isRight(side); - } else { - isRight = pos.isRight(side); - } - if(pos.isTop) { - return isRight ? mbIcons[MbFace.TR.ordinal()] : mbIcons[MbFace.TL.ordinal()]; - } else { - return isRight ? mbIcons[MbFace.BR.ordinal()] : mbIcons[MbFace.BL.ordinal()]; - } - + @Override + public boolean renderAsNormalBlock() { + return false; } - if(tr.up == side || tr.up == side.getOpposite()) { // up or down face - if(tr.isVertical()) { - if(tr.right.offsetX != 0) { - return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileReservoir(); + } + + @Override + public void onBlockAdded(World world, int x, int y, int z) { + if (world.isRemote) { + return; + } + TileReservoir tr = (TileReservoir) world.getTileEntity(x, y, z); + boolean res = tr.onBlockAdded(); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + if (world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileReservoir) { + ((TileReservoir) te).onNeighborBlockChange(block); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:reservoir"); + for (MbFace face : MbFace.values()) { + mbIcons[face.ordinal()] = IIconRegister.registerIcon("enderio:" + face.iconName); + } + switchIcon = IIconRegister.registerIcon("enderio:reservoirSwitch"); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int blockSide) { + if (y < 0 || y >= 256) { // getTileEntity is not safe for out of bounds coords + return false; + } + + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileReservoir)) { + return true; + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return true; + } + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + // used to render the block in the world + TileEntity te = world.getTileEntity(x, y, z); + + if (!(te instanceof TileReservoir)) { + return blockIcon; + } + TileReservoir tr = (TileReservoir) te; + if (!tr.isMultiblock()) { + return blockIcon; + } + + ForgeDirection side = ForgeDirection.getOrientation(blockSide); + Pos pos = tr.pos; + + if (tr.front == side || tr.front == side.getOpposite()) { // 2x2 area + + boolean isRight; + if (tr.isVertical()) { // to to flip right and left for back faces of + // vertical multiblocks + isRight = !pos.isRight(side); + } else { + isRight = pos.isRight(side); + } + if (pos.isTop) { + return isRight ? mbIcons[MbFace.TR.ordinal()] : mbIcons[MbFace.TL.ordinal()]; + } else { + return isRight ? mbIcons[MbFace.BR.ordinal()] : mbIcons[MbFace.BL.ordinal()]; + } + } + if (tr.up == side || tr.up == side.getOpposite()) { // up or down face + if (tr.isVertical()) { + if (tr.right.offsetX != 0) { + return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } else { + return pos.isRight ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; + } + } else { + if (tr.up == side) { + return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } else { + return pos.isRight ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; + } + } + } else { - return pos.isRight ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; + if (tr.isVertical()) { + return pos.isTop ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; + } else { + return pos.isTop(side) ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; + } } - } else { - if(tr.up == side) { - return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; - } else { - return pos.isRight ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; - } - } - - } else { - if(tr.isVertical()) { - return pos.isTop ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; - } else { - return pos.isTop(side) ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; - } } - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } - + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index 30b36f43..d73b6d7d 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -1,5 +1,12 @@ package crazypants.enderio.machine.reservoir; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.vecmath.Vector3d; +import com.enderio.core.common.vecmath.Vector3f; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -11,170 +18,183 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector3f; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class ReservoirRenderer extends TileEntitySpecialRenderer implements IResourceManagerReloadListener { - private ResourceLocation texName = null; - private IIcon tex = null; + private ResourceLocation texName = null; + private IIcon tex = null; - private final BlockReservoir block; + private final BlockReservoir block; - public ReservoirRenderer(BlockReservoir res) { - block = res; - RenderUtil.registerReloadListener(this); - } - - @Override - public void onResourceManagerReload(IResourceManager p_110549_1_) { - tex = null; - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - - TileReservoir res = (TileReservoir) tileentity; - if(res.haveRendered(tileentity.getWorldObj().getTotalWorldTime(), f)) { - return; + public ReservoirRenderer(BlockReservoir res) { + block = res; + RenderUtil.registerReloadListener(this); } - float fullness = res.getFilledRatio(); - if(fullness <= 0 && !res.isAutoEject()) { - return; + @Override + public void onResourceManagerReload(IResourceManager p_110549_1_) { + tex = null; } - float val = RenderUtil.claculateTotalBrightnessForLocation(tileentity.getWorldObj(), tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); - Minecraft.getMinecraft().entityRenderer.disableLightmap(0); + @Override + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_LIGHTING); + TileReservoir res = (TileReservoir) tileentity; + if (res.haveRendered(tileentity.getWorldObj().getTotalWorldTime(), f)) { + return; + } - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + float fullness = res.getFilledRatio(); + if (fullness <= 0 && !res.isAutoEject()) { + return; + } - Vector3f offset = res.getOffsetFromController(); + float val = RenderUtil.claculateTotalBrightnessForLocation( + tileentity.getWorldObj(), tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); + Minecraft.getMinecraft().entityRenderer.disableLightmap(0); - GL11.glTranslatef((float) x + offset.x, (float) y + offset.y, (float) z + offset.z); + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); - BoundingBox bb = res.getLiquidRenderBounds(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(res.isAutoEject()) { + Vector3f offset = res.getOffsetFromController(); - // switch - RenderUtil.bindBlockTexture(); + GL11.glTranslatef((float) x + offset.x, (float) y + offset.y, (float) z + offset.z); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setColorRGBA_F(val, val, val, 1); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - drawSwitch(dir, bb); - } - Tessellator.instance.draw(); + BoundingBox bb = res.getLiquidRenderBounds(); + + if (res.isAutoEject()) { + + // switch + RenderUtil.bindBlockTexture(); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorRGBA_F(val, val, val, 1); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + drawSwitch(dir, bb); + } + Tessellator.instance.draw(); + } + + if (fullness > 0) { + RenderUtil.bindTexture(getLiquidSheet()); + + float margin = 0.01f; + + IIcon tex = getLiquidTexture(); + float maxV = tex.getMinV() + ((tex.getMaxV() - tex.getMinV()) * fullness); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorRGBA_F(val, val, val, 1); + CubeRenderer.render( + new BoundingBox( + bb.minX + margin, + bb.minY + margin, + bb.minZ + margin, + bb.maxX - margin, + bb.minY + (fullness * (Math.abs(bb.maxY - bb.minY))) - margin, + bb.maxZ - margin), + tex.getMinU(), + tex.getMaxU(), + tex.getMinV(), + maxV); + Tessellator.instance.draw(); + } + + GL11.glPopAttrib(); + GL11.glPopMatrix(); + + Minecraft.getMinecraft().entityRenderer.enableLightmap(0); } - if(fullness > 0) { - RenderUtil.bindTexture(getLiquidSheet()); + private Vector3d forward = new Vector3d(); + private Vector3d left = new Vector3d(); + private Vector3d up = new Vector3d(); + private Vector3d offset = new Vector3d(); - float margin = 0.01f; + private void drawSwitch(ForgeDirection dir, BoundingBox bb) { + Tessellator tes = Tessellator.instance; - IIcon tex = getLiquidTexture(); - float maxV = tex.getMinV() + ((tex.getMaxV() - tex.getMinV()) * fullness); + Vector3d cent = bb.getCenter(); + offset.set(cent); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setColorRGBA_F(val, val, val, 1); - CubeRenderer.render( - new BoundingBox(bb.minX + margin, bb.minY + margin, bb.minZ + margin, bb.maxX - margin, - bb.minY + (fullness * (Math.abs(bb.maxY - bb.minY))) - margin, bb.maxZ - margin), tex.getMinU(), tex.getMaxU(), tex.getMinV(), maxV); - Tessellator.instance.draw(); + boolean isUp = dir.offsetY != 0; + + forward.set(dir.offsetX, dir.offsetY, dir.offsetZ); + forward.scale(0.5); + forward.x *= bb.sizeX(); + forward.y *= bb.sizeY(); + forward.z *= bb.sizeZ(); + + offset.add(forward); + + if (dir.offsetY == 0) { + offset.y += bb.sizeY() * 0.25; + } + if (dir.offsetX == 0) { + offset.x -= (isUp ? dir.offsetY : dir.offsetZ) * bb.sizeX() * 0.25; + } + if (dir.offsetZ == 0) { + offset.z += (isUp ? -dir.offsetY : dir.offsetX) * bb.sizeZ() * 0.25; + } + + left.set(isUp ? -dir.offsetY : -dir.offsetZ, 0, dir.offsetX); + + if (isUp) { + up.set(0, 0, -1); + } else { + up.set(0, 1, 0); + } + + forward.scale(0.5); + left.scale(0.125); + up.scale(0.125); + + IIcon icon = block.switchIcon; + + tes.addVertexWithUV( + offset.x + left.x - up.x, + offset.y + left.y - up.y, + offset.z + left.z - up.z, + icon.getMinU(), + icon.getMaxV()); + tes.addVertexWithUV( + offset.x - left.x - up.x, + offset.y - left.y - up.y, + offset.z - left.z - up.z, + icon.getMaxU(), + icon.getMaxV()); + tes.addVertexWithUV( + offset.x - left.x + up.x, + offset.y - left.y + up.y, + offset.z - left.z + up.z, + icon.getMaxU(), + icon.getMinV()); + tes.addVertexWithUV( + offset.x + left.x + up.x, + offset.y + left.y + up.y, + offset.z + left.z + up.z, + icon.getMinU(), + icon.getMinV()); } - GL11.glPopAttrib(); - GL11.glPopMatrix(); - - Minecraft.getMinecraft().entityRenderer.enableLightmap(0); - - } - - private Vector3d forward = new Vector3d(); - private Vector3d left = new Vector3d(); - private Vector3d up = new Vector3d(); - private Vector3d offset = new Vector3d(); - - private void drawSwitch(ForgeDirection dir, BoundingBox bb) { - Tessellator tes = Tessellator.instance; - - Vector3d cent = bb.getCenter(); - offset.set(cent); - - boolean isUp = dir.offsetY != 0; - - forward.set(dir.offsetX, dir.offsetY, dir.offsetZ); - forward.scale(0.5); - forward.x *= bb.sizeX(); - forward.y *= bb.sizeY(); - forward.z *= bb.sizeZ(); - - offset.add(forward); - - if(dir.offsetY == 0) { - offset.y += bb.sizeY() * 0.25; - } - if(dir.offsetX == 0) { - offset.x -= (isUp ? dir.offsetY : dir.offsetZ) * bb.sizeX() * 0.25; - } - if(dir.offsetZ == 0) { - offset.z += (isUp ? -dir.offsetY : dir.offsetX) * bb.sizeZ() * 0.25; + private ResourceLocation getLiquidSheet() { + if (texName == null) { + texName = TextureMap.locationBlocksTexture; + } + return texName; } - left.set(isUp ? -dir.offsetY : -dir.offsetZ, 0, dir.offsetX); - - if(isUp) { - up.set(0, 0, -1); - } else { - up.set(0, 1, 0); + private IIcon getLiquidTexture() { + if (tex == null) { + tex = FluidRegistry.WATER.getStillIcon(); + } + return tex; } - - forward.scale(0.5); - left.scale(0.125); - up.scale(0.125); - - IIcon icon = block.switchIcon; - - tes.addVertexWithUV(offset.x + left.x - up.x, offset.y + left.y - up.y, - offset.z + left.z - up.z, icon.getMinU(), icon.getMaxV()); - tes.addVertexWithUV(offset.x - left.x - up.x, offset.y - left.y - up.y, - offset.z - left.z - up.z, icon.getMaxU(), icon.getMaxV()); - tes.addVertexWithUV(offset.x - left.x + up.x, offset.y - left.y + up.y, - offset.z - left.z + up.z, icon.getMaxU(), icon.getMinV()); - tes.addVertexWithUV(offset.x + left.x + up.x, offset.y + left.y + up.y, - offset.z + left.z + up.z, icon.getMinU(), icon.getMinV()); - - } - - private ResourceLocation getLiquidSheet() { - if(texName == null) { - texName = TextureMap.locationBlocksTexture; - } - return texName; - } - - private IIcon getLiquidTexture() { - if(tex == null) { - tex = FluidRegistry.WATER.getStillIcon(); - } - return tex; - } - } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TankNeighbour.java b/src/main/java/crazypants/enderio/machine/reservoir/TankNeighbour.java index ddd7daff..83870cb2 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TankNeighbour.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TankNeighbour.java @@ -5,12 +5,11 @@ import net.minecraftforge.fluids.IFluidHandler; class TankNeighbour { - final IFluidHandler container; - final ForgeDirection fillFromDir; - - TankNeighbour(IFluidHandler container, ForgeDirection fillFromDir) { - this.container = container; - this.fillFromDir = fillFromDir; - } + final IFluidHandler container; + final ForgeDirection fillFromDir; + TankNeighbour(IFluidHandler container, ForgeDirection fillFromDir) { + this.container = container; + this.fillFromDir = fillFromDir; + } } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 98ca313f..1cda6960 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -1,7 +1,15 @@ package crazypants.enderio.machine.reservoir; -import java.util.ArrayList; +import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.vecmath.Vector3f; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.tool.SmartTank; +import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -13,685 +21,677 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector3f; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.tool.SmartTank; - -import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; - public class TileReservoir extends TileEntityEio implements IFluidHandler, ITankAccess { - enum Pos { - TL(true, false), - TR(true, true), - BL(false, false), - BR(false, true), - UNKNOWN(false, false); + enum Pos { + TL(true, false), + TR(true, true), + BL(false, false), + BR(false, true), + UNKNOWN(false, false); - boolean isTop; - boolean isRight; + boolean isTop; + boolean isRight; - private Pos(boolean isTop, boolean isRight) { - this.isTop = isTop; - this.isRight = isRight; - } - - // These are necessary to get around texture mirroring, don't ask me - public boolean isRight(ForgeDirection side) { - if (side == ForgeDirection.EAST || side == ForgeDirection.NORTH) { - return !isRight; - } - return isRight; - } - - public boolean isTop(ForgeDirection side) { - if (side == ForgeDirection.EAST) { - return !isTop; - } - return isTop; - } - } - - static final FluidStack WATER_BUCKET = FluidRegistry.getFluidStack("water", BUCKET_VOLUME); - - BlockCoord[] multiblock = null; - - // Orientation of multibock - ForgeDirection front = ForgeDirection.UNKNOWN; - ForgeDirection up = ForgeDirection.UNKNOWN; - ForgeDirection right = ForgeDirection.UNKNOWN; - - // Position within multiblock - Pos pos = Pos.UNKNOWN; - - SmartTank tank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME); - - SmartTank regenTank = null; - - boolean autoEject; - - private boolean tankDirty = false; - - private boolean neighboursDirty = false; - - private long ticksSinceFill = 0; - - private BoundingBox liquidRenderBounds = null; - - private ArrayList tankNeighbours; - - @Override - public void doUpdate() { - if (worldObj.isRemote) { - return; - } - - if(isMaster()) { - //sanity check to prevent crash when moved using redstone in motion - if(regenTank == null || tank == null) { - return; - } - - if(regenTank.isFull() && !tank.isFull()) { - ++ticksSinceFill; - if(ticksSinceFill >= 20) { - ticksSinceFill = 0; - tank.fill(WATER_BUCKET, true); - tankDirty = true; + private Pos(boolean isTop, boolean isRight) { + this.isTop = isTop; + this.isRight = isRight; } - } - if(autoEject && neighboursDirty) { - doUpdateTankNeighbours(); - } - if(autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getFluidAmount() > 0) { - int ejectable = tank.getFluidAmount(); - int amountPerNeighbour = ejectable / tankNeighbours.size(); - FluidStack source = WATER_BUCKET.copy(); - int used = 0; - for (TankNeighbour tc : tankNeighbours) { - source.amount = amountPerNeighbour; - used += tc.container.fill(tc.fillFromDir, source, true); - } - if(used > 0) { - tank.drain(used, true); - tankDirty = true; - } - } - } - if(tankDirty && shouldDoWorkThisTick(2)) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - tankDirty = false; - } - } - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(isMultiblock()) { - return 0; - } - return getController().doFill(from, resource, doFill); - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return getController().doDrain(from, maxDrain, doDrain); - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if (resource == null || !resource.isFluidEqual(tank.getFluid())) { - return null; - } - return drain(from, resource.amount, doDrain); - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(tank.getFluid() == null) { - return true; - } - if (fluid != null && fluid.getID() == tank.getFluid().getFluidID()) { - return true; - } - return false; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(tank.getFluid() == null || fluid == null) { - return false; - } - return tank.getFluid().getFluid().getID() == fluid.getID(); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return getController().doGetTankInfo(from); - } - - private FluidTankInfo[] doGetTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { tank.getInfo() }; - } - - public void setAutoEject(boolean autoEject) { - TileReservoir c = getController(); - if(c != null) { - c.doSetAutoEject(autoEject); - } else { - doSetAutoEject(autoEject); - } - } - - private void doSetAutoEject(boolean newVal) { - if(newVal && !autoEject) { - updateTankNeighbours(); - } - this.autoEject = newVal; - } - - public boolean isAutoEject() { - TileReservoir c = getController(); - if(c != null) { - return c.doIsAutoEject(); - } else { - return doIsAutoEject(); - } - } - - private boolean doIsAutoEject() { - return autoEject; - } - - private void updateTankNeighbours() { - TileReservoir c = getController(); - if(c != null) { - c.neighboursDirty = true; - } - } - - private void doUpdateTankNeighbours() { - if(tankNeighbours == null) { - tankNeighbours = new ArrayList(); - } - tankNeighbours.clear(); - for (BlockCoord bc : multiblock) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord check = bc.getLocation(dir); - if(!inMultiblock(check)) { - IFluidHandler tc = getTankContainer(check); - if(tc != null) { - tankNeighbours.add(new TankNeighbour(tc, dir.getOpposite())); - } - } - } - } - neighboursDirty = false; - } - - private boolean inMultiblock(BlockCoord check) { - for (BlockCoord bc : multiblock) { - if(check.equals(bc)) { - return true; - } - } - return false; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - - front = ForgeDirection.getOrientation(nbtRoot.getShort("front")); - up = ForgeDirection.getOrientation(nbtRoot.getShort("up")); - right = ForgeDirection.getOrientation(nbtRoot.getShort("right")); - pos = Pos.values()[nbtRoot.getShort("pos")]; - - autoEject = nbtRoot.getBoolean("autoEject"); - - FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); - FluidStack regenLiquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("regenTank")); - - tank.setCapacity(regenLiquid == null ? BUCKET_VOLUME : BUCKET_VOLUME * 2); - if(liquid != null) { - tank.setFluid(liquid); - } else { - tank.setFluidAmount(0); - } - - if(regenLiquid == null) { - regenTank = null; - } else { - regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); - regenTank.setFluidAmount(regenLiquid.amount); - } - - boolean wasMulti = isMultiblock(); - - if(nbtRoot.getBoolean("isMultiblock")) { - int[] coords = nbtRoot.getIntArray("multiblock"); - multiblock = new BlockCoord[4]; - int c = 0; - for (int i = 0; i < 4; i++) { - multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); - } - - if(isMaster() && autoEject) { - updateTankNeighbours(); - } - - } else { - multiblock = null; - } - - if(wasMulti != isMultiblock()) { - liquidRenderBounds = null; - } - - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - - nbtRoot.setShort("front", (short) front.ordinal()); - nbtRoot.setShort("up", (short) up.ordinal()); - nbtRoot.setShort("right", (short) right.ordinal()); - nbtRoot.setShort("pos", (short) pos.ordinal()); - - nbtRoot.setBoolean("autoEject", autoEject); - - if(tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid()) != null) { - nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); - } - if(regenTank != null) { - nbtRoot.setTag("regenTank", regenTank.getFluid().writeToNBT(new NBTTagCompound())); - } - - nbtRoot.setBoolean("isMultiblock", isMultiblock()); - if(isMultiblock()) { - int[] vals = new int[12]; - int i = 0; - for (BlockCoord bc : multiblock) { - vals[i++] = bc.x; - vals[i++] = bc.y; - vals[i++] = bc.z; - } - nbtRoot.setIntArray("multiblock", vals); - } - } - - public boolean onBlockAdded() { - boolean res = formMultiblock(); - return res; - } - - public boolean onNeighborBlockChange(Block blockId) { - if(blockId == EnderIO.blockReservoir) { - - if(!isCurrentMultiblockValid()) { - // if its not, try and form a new one - TileReservoir controller = getController(); - if(controller != null) { - controller.clearCurrentMultiblock(); - controller.formMultiblock(); - } else { - clearCurrentMultiblock(); - formMultiblock(); - } - return true; - } - } else if(isMultiblock() && isAutoEject()) { - updateTankNeighbours(); - } - return false; - } - - boolean isVertical() { - return up == ForgeDirection.UP; - } - - boolean isMaster() { - if(multiblock != null) { - return multiblock[0].equals(xCoord, yCoord, zCoord); - } - return false; - } - - float getFilledRatio() { - return getController().doGetFilledRatio(); - } - - public boolean isMultiblock() { - return multiblock != null; - } - - BoundingBox getLiquidRenderBounds() { - if(liquidRenderBounds == null) { - if(!isMultiblock()) { - return BoundingBox.UNIT_CUBE; - } - BoundingBox bounds = new BoundingBox(multiblock[0]); - for (int i = 1; i < multiblock.length; i++) { - bounds = bounds.expandBy(new BoundingBox(multiblock[i])); - } - liquidRenderBounds = bounds.translate(-multiblock[0].x, -multiblock[0].y, -multiblock[0].z); - } - return liquidRenderBounds; - } - - protected float doGetFilledRatio() { - float result = tank.getFilledRatio(); - if(isMaster() && regenTank != null) { - result = regenTank.getFilledRatio() * 0.5f + result * 0.5f; - } - return result; - } - - int doFill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(!WATER_BUCKET.isFluidEqual(resource)) { - return 0; - } - - int ret = 0; - // fill buffer first - if(resource != null && isMaster()) { - resource = resource.copy(); - int filled = regenTank.fill(resource, doFill); - resource.amount -= filled; - ret += filled; - } - ret += tank.fill(resource, doFill); - tankDirty = doFill; - return ret; - } - - protected FluidStack doDrain(ForgeDirection from, int maxDrain, boolean doDrain) { - FluidStack ret = tank.drain(maxDrain, doDrain); - tankDirty = doDrain; - return ret; - } - - private void setMultiblock(BlockCoord[] mb) { - multiblock = mb; - updatePosition(); - - if(isMaster()) { - - regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); - tank.setCapacity(BUCKET_VOLUME * 2); - for (BlockCoord bc : multiblock) { - TileReservoir res = getReservoir(bc); - if(res != null) { - FluidStack drained = res.doDrain(ForgeDirection.UNKNOWN, regenTank.getAvailableSpace(), true); - if(drained != null) { - regenTank.addFluidAmount(drained.amount); - } - // incase regen tank is full, add to normal tank - drained = res.doDrain(ForgeDirection.UNKNOWN, tank.getAvailableSpace(), true); - if(drained != null) { - tank.addFluidAmount(drained.amount); - } - } - } - - if(doIsAutoEject()) { - updateTankNeighbours(); - } - - } else { - regenTank = null; - tank.setCapacity(BUCKET_VOLUME); - } - tankDirty = true; - - liquidRenderBounds = null; - - // Forces an update - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isMultiblock() ? 1 : 0, 2); - } - - TileReservoir getController() { - if(isMaster() || !isMultiblock()) { - return this; - } - TileReservoir res = getReservoir(multiblock[0]); - return res != null ? res : this; - } - - private void updatePosition() { - if(multiblock == null) { - front = ForgeDirection.UNKNOWN; - up = ForgeDirection.UNKNOWN; - right = ForgeDirection.UNKNOWN; - return; - } - - boolean isVertical = false; - for (BlockCoord bc : multiblock) { - if(bc.y != yCoord) { - isVertical = true; - break; - } - } - if(isVertical) { - up = ForgeDirection.UP; - boolean isWestEast = false; - for (BlockCoord bc : multiblock) { - if(bc.x != xCoord) { - isWestEast = true; - break; - } - } - front = isWestEast ? ForgeDirection.NORTH : ForgeDirection.EAST; - right = isWestEast ? ForgeDirection.WEST : ForgeDirection.NORTH; - } else { - front = ForgeDirection.UP; - right = ForgeDirection.EAST; - up = ForgeDirection.NORTH; - } - - boolean isRight = false; - BlockCoord myCoord = new BlockCoord(this); - for (BlockCoord bc : multiblock) { - if(isInDir(myCoord, right, bc)) { - isRight = true; - } - } - boolean isTop = false; - for (BlockCoord bc : multiblock) { - if(isInDir(myCoord, up, bc)) { - isTop = true; - } - } - if(isTop) { - pos = isRight ? Pos.TR : Pos.TL; - } else { - pos = isRight ? Pos.BR : Pos.BL; - } - - } - - private boolean isInDir(BlockCoord from, ForgeDirection inDir, BlockCoord to) { - if(inDir.offsetX != 0) { - return from.x - inDir.offsetX == to.x; - } else if(inDir.offsetY != 0) { - return from.y - inDir.offsetY == to.y; - } else if(inDir.offsetZ != 0) { - return from.z - inDir.offsetZ == to.z; - } - return false; - } - - private void clearCurrentMultiblock() { - if(multiblock == null) { - return; - } - boolean fillTanks = false; - if(isMaster()) { - fillTanks = regenTank.isFull(); - regenTank = null; - } - - for (BlockCoord bc : multiblock) { - TileReservoir res = getReservoir(bc); - if(res != null) { - res.setMultiblock(null); - if(fillTanks) { - res.tank.fill(WATER_BUCKET, true); - } else { - res.tank.drain(BUCKET_VOLUME, true); - } - } - } - multiblock = null; - tankDirty = true; - } - - private boolean isCurrentMultiblockValid() { - if(multiblock == null) { - return false; - } - for (BlockCoord bc : multiblock) { - TileReservoir res = getReservoir(bc); - if(res == null || !res.isMultiblock()) { - return false; - } - } - return true; - } - - private boolean formMultiblock() { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(isNonMultiReservoir(dir)) { - ForgeDirection[] cans = candidates(dir); - for (ForgeDirection neighbor : cans) { - if(isNonMultiReservoir(neighbor)) { - if(isNonMultiReservoir(dir.offsetX + neighbor.offsetX, dir.offsetY + neighbor.offsetY, dir.offsetZ + neighbor.offsetZ)) { - BlockCoord[] mb = new BlockCoord[4]; - mb[0] = inDirection(dir); - mb[1] = inDirection(neighbor); - mb[2] = inDirection(dir.offsetX + neighbor.offsetX, dir.offsetY + neighbor.offsetY, dir.offsetZ + neighbor.offsetZ); - mb[3] = new BlockCoord(xCoord, yCoord, zCoord); - for (BlockCoord bc : mb) { - TileReservoir res = getReservoir(bc); - res.setMultiblock(mb); - } - return true; + // These are necessary to get around texture mirroring, don't ask me + public boolean isRight(ForgeDirection side) { + if (side == ForgeDirection.EAST || side == ForgeDirection.NORTH) { + return !isRight; } - } + return isRight; } - } - } - return false; - } - private BlockCoord inDirection(int offsetX, int offsetY, int offsetZ) { - return new BlockCoord(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); - } - - private BlockCoord inDirection(ForgeDirection dir) { - return inDirection(dir.offsetX, dir.offsetY, dir.offsetZ); - } - - private IFluidHandler getTankContainer(BlockCoord bc) { - return getTankContainer(bc.x, bc.y, bc.z); - } - - private IFluidHandler getTankContainer(int x, int y, int z) { - if(worldObj == null) { - return null; - } - TileEntity te = worldObj.getTileEntity(x, y, z); - if(te instanceof IFluidHandler) { - return (IFluidHandler) te; - } - return null; - } - - private TileReservoir getReservoir(BlockCoord bc) { - return getReservoir(bc.x, bc.y, bc.z); - } - - private TileReservoir getReservoir(int x, int y, int z) { - TileEntity te = worldObj.getTileEntity(x, y, z); - if(te instanceof TileReservoir) { - return (TileReservoir) te; - } - return null; - } - - private boolean isNonMultiReservoir(int offsetX, int offsetY, int offsetZ) { - TileReservoir res = getReservoir(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); - if(res == null) { - return false; - } - return !res.isMultiblock(); - } - - private boolean isNonMultiReservoir(ForgeDirection dir) { - return isNonMultiReservoir(dir.offsetX, dir.offsetY, dir.offsetZ); - } - - private ForgeDirection[] candidates(ForgeDirection matchDir) { - ForgeDirection[] res = new ForgeDirection[4]; - res[0] = matchDir.getRotation(matchDir.offsetY == 0 ? ForgeDirection.UP : ForgeDirection.NORTH); - res[1] = res[0].getOpposite(); - res[2] = matchDir.getRotation(matchDir.offsetX == 0 ? ForgeDirection.EAST : ForgeDirection.NORTH); - res[3] = res[2].getOpposite(); - return res; - } - - public Vector3f getOffsetFromController() { - if(!isMultiblock()) { - return new Vector3f(); - } - BlockCoord masterBC = multiblock[0]; - BlockCoord myBC = new BlockCoord(xCoord, yCoord, zCoord); - return new Vector3f(masterBC.x - myBC.x, masterBC.y - myBC.y, masterBC.z - myBC.z); - } - - long lastRenderTick; - float lastRenderPartialTick; - - public boolean haveRendered(long renderTick, float renderPartialTick) { - TileReservoir c = getController(); - if(c.lastRenderTick == renderTick && renderPartialTick == c.lastRenderPartialTick) { - return true; + public boolean isTop(ForgeDirection side) { + if (side == ForgeDirection.EAST) { + return !isTop; + } + return isTop; + } } - c.lastRenderTick = renderTick; - c.lastRenderPartialTick = renderPartialTick; + static final FluidStack WATER_BUCKET = FluidRegistry.getFluidStack("water", BUCKET_VOLUME); - return false; - } + BlockCoord[] multiblock = null; - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - if (forFluidType != null && forFluidType.getFluid() == FluidRegistry.WATER) { - TileReservoir res = getController(); - return !res.isMaster() || res.regenTank.isFull() ? res.tank : res.regenTank; + // Orientation of multibock + ForgeDirection front = ForgeDirection.UNKNOWN; + ForgeDirection up = ForgeDirection.UNKNOWN; + ForgeDirection right = ForgeDirection.UNKNOWN; + + // Position within multiblock + Pos pos = Pos.UNKNOWN; + + SmartTank tank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME); + + SmartTank regenTank = null; + + boolean autoEject; + + private boolean tankDirty = false; + + private boolean neighboursDirty = false; + + private long ticksSinceFill = 0; + + private BoundingBox liquidRenderBounds = null; + + private ArrayList tankNeighbours; + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + return; + } + + if (isMaster()) { + // sanity check to prevent crash when moved using redstone in motion + if (regenTank == null || tank == null) { + return; + } + + if (regenTank.isFull() && !tank.isFull()) { + ++ticksSinceFill; + if (ticksSinceFill >= 20) { + ticksSinceFill = 0; + tank.fill(WATER_BUCKET, true); + tankDirty = true; + } + } + if (autoEject && neighboursDirty) { + doUpdateTankNeighbours(); + } + if (autoEject && tankNeighbours != null && !tankNeighbours.isEmpty() && tank.getFluidAmount() > 0) { + int ejectable = tank.getFluidAmount(); + int amountPerNeighbour = ejectable / tankNeighbours.size(); + FluidStack source = WATER_BUCKET.copy(); + int used = 0; + for (TankNeighbour tc : tankNeighbours) { + source.amount = amountPerNeighbour; + used += tc.container.fill(tc.fillFromDir, source, true); + } + if (used > 0) { + tank.drain(used, true); + tankDirty = true; + } + } + } + if (tankDirty && shouldDoWorkThisTick(2)) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + tankDirty = false; + } } - return null; - } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { getController().tank }; - } - - @Override - public void setTanksDirty() { - if (isMaster() && regenTank != null && tank != null) { - if (!regenTank.isFull() && tank.getFluidAmount() > 0) { - int toMove = Math.min(tank.getFluidAmount(), regenTank.getCapacity() - regenTank.getFluidAmount()); - regenTank.setFluidAmount(regenTank.getFluidAmount() + toMove); - tank.setFluidAmount(tank.getFluidAmount() - toMove); - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (isMultiblock()) { + return 0; + } + return getController().doFill(from, resource, doFill); } - tankDirty = true; - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return getController().doDrain(from, maxDrain, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource == null || !resource.isFluidEqual(tank.getFluid())) { + return null; + } + return drain(from, resource.amount, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (tank.getFluid() == null) { + return true; + } + if (fluid != null && fluid.getID() == tank.getFluid().getFluidID()) { + return true; + } + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (tank.getFluid() == null || fluid == null) { + return false; + } + return tank.getFluid().getFluid().getID() == fluid.getID(); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return getController().doGetTankInfo(from); + } + + private FluidTankInfo[] doGetTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {tank.getInfo()}; + } + + public void setAutoEject(boolean autoEject) { + TileReservoir c = getController(); + if (c != null) { + c.doSetAutoEject(autoEject); + } else { + doSetAutoEject(autoEject); + } + } + + private void doSetAutoEject(boolean newVal) { + if (newVal && !autoEject) { + updateTankNeighbours(); + } + this.autoEject = newVal; + } + + public boolean isAutoEject() { + TileReservoir c = getController(); + if (c != null) { + return c.doIsAutoEject(); + } else { + return doIsAutoEject(); + } + } + + private boolean doIsAutoEject() { + return autoEject; + } + + private void updateTankNeighbours() { + TileReservoir c = getController(); + if (c != null) { + c.neighboursDirty = true; + } + } + + private void doUpdateTankNeighbours() { + if (tankNeighbours == null) { + tankNeighbours = new ArrayList(); + } + tankNeighbours.clear(); + for (BlockCoord bc : multiblock) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord check = bc.getLocation(dir); + if (!inMultiblock(check)) { + IFluidHandler tc = getTankContainer(check); + if (tc != null) { + tankNeighbours.add(new TankNeighbour(tc, dir.getOpposite())); + } + } + } + } + neighboursDirty = false; + } + + private boolean inMultiblock(BlockCoord check) { + for (BlockCoord bc : multiblock) { + if (check.equals(bc)) { + return true; + } + } + return false; + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + + front = ForgeDirection.getOrientation(nbtRoot.getShort("front")); + up = ForgeDirection.getOrientation(nbtRoot.getShort("up")); + right = ForgeDirection.getOrientation(nbtRoot.getShort("right")); + pos = Pos.values()[nbtRoot.getShort("pos")]; + + autoEject = nbtRoot.getBoolean("autoEject"); + + FluidStack liquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("tank")); + FluidStack regenLiquid = FluidStack.loadFluidStackFromNBT(nbtRoot.getCompoundTag("regenTank")); + + tank.setCapacity(regenLiquid == null ? BUCKET_VOLUME : BUCKET_VOLUME * 2); + if (liquid != null) { + tank.setFluid(liquid); + } else { + tank.setFluidAmount(0); + } + + if (regenLiquid == null) { + regenTank = null; + } else { + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); + regenTank.setFluidAmount(regenLiquid.amount); + } + + boolean wasMulti = isMultiblock(); + + if (nbtRoot.getBoolean("isMultiblock")) { + int[] coords = nbtRoot.getIntArray("multiblock"); + multiblock = new BlockCoord[4]; + int c = 0; + for (int i = 0; i < 4; i++) { + multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); + } + + if (isMaster() && autoEject) { + updateTankNeighbours(); + } + + } else { + multiblock = null; + } + + if (wasMulti != isMultiblock()) { + liquidRenderBounds = null; + } + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + + nbtRoot.setShort("front", (short) front.ordinal()); + nbtRoot.setShort("up", (short) up.ordinal()); + nbtRoot.setShort("right", (short) right.ordinal()); + nbtRoot.setShort("pos", (short) pos.ordinal()); + + nbtRoot.setBoolean("autoEject", autoEject); + + if (tank.getFluid() != null && FluidRegistry.getFluidName(tank.getFluid()) != null) { + nbtRoot.setTag("tank", tank.getFluid().writeToNBT(new NBTTagCompound())); + } + if (regenTank != null) { + nbtRoot.setTag("regenTank", regenTank.getFluid().writeToNBT(new NBTTagCompound())); + } + + nbtRoot.setBoolean("isMultiblock", isMultiblock()); + if (isMultiblock()) { + int[] vals = new int[12]; + int i = 0; + for (BlockCoord bc : multiblock) { + vals[i++] = bc.x; + vals[i++] = bc.y; + vals[i++] = bc.z; + } + nbtRoot.setIntArray("multiblock", vals); + } + } + + public boolean onBlockAdded() { + boolean res = formMultiblock(); + return res; + } + + public boolean onNeighborBlockChange(Block blockId) { + if (blockId == EnderIO.blockReservoir) { + + if (!isCurrentMultiblockValid()) { + // if its not, try and form a new one + TileReservoir controller = getController(); + if (controller != null) { + controller.clearCurrentMultiblock(); + controller.formMultiblock(); + } else { + clearCurrentMultiblock(); + formMultiblock(); + } + return true; + } + } else if (isMultiblock() && isAutoEject()) { + updateTankNeighbours(); + } + return false; + } + + boolean isVertical() { + return up == ForgeDirection.UP; + } + + boolean isMaster() { + if (multiblock != null) { + return multiblock[0].equals(xCoord, yCoord, zCoord); + } + return false; + } + + float getFilledRatio() { + return getController().doGetFilledRatio(); + } + + public boolean isMultiblock() { + return multiblock != null; + } + + BoundingBox getLiquidRenderBounds() { + if (liquidRenderBounds == null) { + if (!isMultiblock()) { + return BoundingBox.UNIT_CUBE; + } + BoundingBox bounds = new BoundingBox(multiblock[0]); + for (int i = 1; i < multiblock.length; i++) { + bounds = bounds.expandBy(new BoundingBox(multiblock[i])); + } + liquidRenderBounds = bounds.translate(-multiblock[0].x, -multiblock[0].y, -multiblock[0].z); + } + return liquidRenderBounds; + } + + protected float doGetFilledRatio() { + float result = tank.getFilledRatio(); + if (isMaster() && regenTank != null) { + result = regenTank.getFilledRatio() * 0.5f + result * 0.5f; + } + return result; + } + + int doFill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (!WATER_BUCKET.isFluidEqual(resource)) { + return 0; + } + + int ret = 0; + // fill buffer first + if (resource != null && isMaster()) { + resource = resource.copy(); + int filled = regenTank.fill(resource, doFill); + resource.amount -= filled; + ret += filled; + } + ret += tank.fill(resource, doFill); + tankDirty = doFill; + return ret; + } + + protected FluidStack doDrain(ForgeDirection from, int maxDrain, boolean doDrain) { + FluidStack ret = tank.drain(maxDrain, doDrain); + tankDirty = doDrain; + return ret; + } + + private void setMultiblock(BlockCoord[] mb) { + multiblock = mb; + updatePosition(); + + if (isMaster()) { + + regenTank = new SmartTank(FluidRegistry.WATER, BUCKET_VOLUME * 2); + tank.setCapacity(BUCKET_VOLUME * 2); + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res != null) { + FluidStack drained = res.doDrain(ForgeDirection.UNKNOWN, regenTank.getAvailableSpace(), true); + if (drained != null) { + regenTank.addFluidAmount(drained.amount); + } + // incase regen tank is full, add to normal tank + drained = res.doDrain(ForgeDirection.UNKNOWN, tank.getAvailableSpace(), true); + if (drained != null) { + tank.addFluidAmount(drained.amount); + } + } + } + + if (doIsAutoEject()) { + updateTankNeighbours(); + } + + } else { + regenTank = null; + tank.setCapacity(BUCKET_VOLUME); + } + tankDirty = true; + + liquidRenderBounds = null; + + // Forces an update + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isMultiblock() ? 1 : 0, 2); + } + + TileReservoir getController() { + if (isMaster() || !isMultiblock()) { + return this; + } + TileReservoir res = getReservoir(multiblock[0]); + return res != null ? res : this; + } + + private void updatePosition() { + if (multiblock == null) { + front = ForgeDirection.UNKNOWN; + up = ForgeDirection.UNKNOWN; + right = ForgeDirection.UNKNOWN; + return; + } + + boolean isVertical = false; + for (BlockCoord bc : multiblock) { + if (bc.y != yCoord) { + isVertical = true; + break; + } + } + if (isVertical) { + up = ForgeDirection.UP; + boolean isWestEast = false; + for (BlockCoord bc : multiblock) { + if (bc.x != xCoord) { + isWestEast = true; + break; + } + } + front = isWestEast ? ForgeDirection.NORTH : ForgeDirection.EAST; + right = isWestEast ? ForgeDirection.WEST : ForgeDirection.NORTH; + } else { + front = ForgeDirection.UP; + right = ForgeDirection.EAST; + up = ForgeDirection.NORTH; + } + + boolean isRight = false; + BlockCoord myCoord = new BlockCoord(this); + for (BlockCoord bc : multiblock) { + if (isInDir(myCoord, right, bc)) { + isRight = true; + } + } + boolean isTop = false; + for (BlockCoord bc : multiblock) { + if (isInDir(myCoord, up, bc)) { + isTop = true; + } + } + if (isTop) { + pos = isRight ? Pos.TR : Pos.TL; + } else { + pos = isRight ? Pos.BR : Pos.BL; + } + } + + private boolean isInDir(BlockCoord from, ForgeDirection inDir, BlockCoord to) { + if (inDir.offsetX != 0) { + return from.x - inDir.offsetX == to.x; + } else if (inDir.offsetY != 0) { + return from.y - inDir.offsetY == to.y; + } else if (inDir.offsetZ != 0) { + return from.z - inDir.offsetZ == to.z; + } + return false; + } + + private void clearCurrentMultiblock() { + if (multiblock == null) { + return; + } + boolean fillTanks = false; + if (isMaster()) { + fillTanks = regenTank.isFull(); + regenTank = null; + } + + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res != null) { + res.setMultiblock(null); + if (fillTanks) { + res.tank.fill(WATER_BUCKET, true); + } else { + res.tank.drain(BUCKET_VOLUME, true); + } + } + } + multiblock = null; + tankDirty = true; + } + + private boolean isCurrentMultiblockValid() { + if (multiblock == null) { + return false; + } + for (BlockCoord bc : multiblock) { + TileReservoir res = getReservoir(bc); + if (res == null || !res.isMultiblock()) { + return false; + } + } + return true; + } + + private boolean formMultiblock() { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (isNonMultiReservoir(dir)) { + ForgeDirection[] cans = candidates(dir); + for (ForgeDirection neighbor : cans) { + if (isNonMultiReservoir(neighbor)) { + if (isNonMultiReservoir( + dir.offsetX + neighbor.offsetX, + dir.offsetY + neighbor.offsetY, + dir.offsetZ + neighbor.offsetZ)) { + BlockCoord[] mb = new BlockCoord[4]; + mb[0] = inDirection(dir); + mb[1] = inDirection(neighbor); + mb[2] = inDirection( + dir.offsetX + neighbor.offsetX, + dir.offsetY + neighbor.offsetY, + dir.offsetZ + neighbor.offsetZ); + mb[3] = new BlockCoord(xCoord, yCoord, zCoord); + for (BlockCoord bc : mb) { + TileReservoir res = getReservoir(bc); + res.setMultiblock(mb); + } + return true; + } + } + } + } + } + return false; + } + + private BlockCoord inDirection(int offsetX, int offsetY, int offsetZ) { + return new BlockCoord(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); + } + + private BlockCoord inDirection(ForgeDirection dir) { + return inDirection(dir.offsetX, dir.offsetY, dir.offsetZ); + } + + private IFluidHandler getTankContainer(BlockCoord bc) { + return getTankContainer(bc.x, bc.y, bc.z); + } + + private IFluidHandler getTankContainer(int x, int y, int z) { + if (worldObj == null) { + return null; + } + TileEntity te = worldObj.getTileEntity(x, y, z); + if (te instanceof IFluidHandler) { + return (IFluidHandler) te; + } + return null; + } + + private TileReservoir getReservoir(BlockCoord bc) { + return getReservoir(bc.x, bc.y, bc.z); + } + + private TileReservoir getReservoir(int x, int y, int z) { + TileEntity te = worldObj.getTileEntity(x, y, z); + if (te instanceof TileReservoir) { + return (TileReservoir) te; + } + return null; + } + + private boolean isNonMultiReservoir(int offsetX, int offsetY, int offsetZ) { + TileReservoir res = getReservoir(xCoord + offsetX, yCoord + offsetY, zCoord + offsetZ); + if (res == null) { + return false; + } + return !res.isMultiblock(); + } + + private boolean isNonMultiReservoir(ForgeDirection dir) { + return isNonMultiReservoir(dir.offsetX, dir.offsetY, dir.offsetZ); + } + + private ForgeDirection[] candidates(ForgeDirection matchDir) { + ForgeDirection[] res = new ForgeDirection[4]; + res[0] = matchDir.getRotation(matchDir.offsetY == 0 ? ForgeDirection.UP : ForgeDirection.NORTH); + res[1] = res[0].getOpposite(); + res[2] = matchDir.getRotation(matchDir.offsetX == 0 ? ForgeDirection.EAST : ForgeDirection.NORTH); + res[3] = res[2].getOpposite(); + return res; + } + + public Vector3f getOffsetFromController() { + if (!isMultiblock()) { + return new Vector3f(); + } + BlockCoord masterBC = multiblock[0]; + BlockCoord myBC = new BlockCoord(xCoord, yCoord, zCoord); + return new Vector3f(masterBC.x - myBC.x, masterBC.y - myBC.y, masterBC.z - myBC.z); + } + + long lastRenderTick; + float lastRenderPartialTick; + + public boolean haveRendered(long renderTick, float renderPartialTick) { + TileReservoir c = getController(); + if (c.lastRenderTick == renderTick && renderPartialTick == c.lastRenderPartialTick) { + return true; + } + + c.lastRenderTick = renderTick; + c.lastRenderPartialTick = renderPartialTick; + + return false; + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + if (forFluidType != null && forFluidType.getFluid() == FluidRegistry.WATER) { + TileReservoir res = getController(); + return !res.isMaster() || res.regenTank.isFull() ? res.tank : res.regenTank; + } + return null; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {getController().tank}; + } + + @Override + public void setTanksDirty() { + if (isMaster() && regenTank != null && tank != null) { + if (!regenTank.isFull() && tank.getFluidAmount() > 0) { + int toMove = Math.min(tank.getFluidAmount(), regenTank.getCapacity() - regenTank.getFluidAmount()); + regenTank.setFluidAmount(regenTank.getFluidAmount() + toMove); + tank.setFluidAmount(tank.getFluidAmount() - toMove); + } + } + tankDirty = true; + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java index 531e2c8c..b893f13f 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java @@ -1,116 +1,116 @@ package crazypants.enderio.machine.slicensplice; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.AbstractMachineEntity; public class BlockSliceAndSplice extends AbstractMachineBlock { - public static BlockSliceAndSplice create() { - BlockSliceAndSplice result = new BlockSliceAndSplice(); - result.init(); - return result; - } - - protected BlockSliceAndSplice() { - super(ModObject.blockSliceAndSplice, TileSliceAndSplice.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSliceAndSplice) { - return new ContainerSliceAndSplice(player.inventory, (TileSliceAndSplice) te); + public static BlockSliceAndSplice create() { + BlockSliceAndSplice result = new BlockSliceAndSplice(); + result.init(); + return result; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSliceAndSplice) { - return new GuiSliceAndSplice(player.inventory, (TileSliceAndSplice) te); + protected BlockSliceAndSplice() { + super(ModObject.blockSliceAndSplice, TileSliceAndSplice.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_SLICE_N_SPLICE; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:sliceAndSpliceFrontOn"; - } - return "enderio:sliceAndSpliceFront"; - } - - @Override - protected String getSideIconKey(boolean active) { - return "enderio:blockSoulMachineSide"; - } - - @Override - protected String getTopIconKey(boolean active) { - return "enderio:blockSoulMachineTop"; - } - - @Override - protected String getBottomIconKey(boolean active) { - return "enderio:blockSoulMachineBottom"; - } - - @Override - protected String getBackIconKey(boolean active) { - return "enderio:blockSoulMachineBack"; - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - TileSliceAndSplice te = (TileSliceAndSplice) world.getTileEntity(x, y, z); - if(isActive(world, x, y, z) && te != null) { - - ForgeDirection front = ForgeDirection.values()[te.facing]; - - for (int i = 0; i < 2; i++) { - double px = x + 0.5 + front.offsetX * 0.6; - double pz = z + 0.5 + front.offsetZ * 0.6; - double v = 0.05; - double vx = 0; - double vz = 0; - - if(front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { - px += world.rand.nextFloat() * 0.9 - 0.45; - vz += front == ForgeDirection.NORTH ? -v : v; - } else { - pz += world.rand.nextFloat() * 0.9 - 0.45; - vx += front == ForgeDirection.WEST ? -v : v; + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileSliceAndSplice) { + return new ContainerSliceAndSplice(player.inventory, (TileSliceAndSplice) te); } - - EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("smoke", px, y + 0.5, pz, vx, 0, vz); - if(fx != null) { - fx.setRBGColorF(0.3f + (rand.nextFloat() * 0.1f), 0.1f + (rand.nextFloat() * 0.1f), 0.1f + (rand.nextFloat() * 0.1f)); - fx.motionX *= 0.25f; - fx.motionY *= 0.25f; - fx.motionZ *= 0.25f; - } - - } + return null; } - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileSliceAndSplice) { + return new GuiSliceAndSplice(player.inventory, (TileSliceAndSplice) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_SLICE_N_SPLICE; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:sliceAndSpliceFrontOn"; + } + return "enderio:sliceAndSpliceFront"; + } + + @Override + protected String getSideIconKey(boolean active) { + return "enderio:blockSoulMachineSide"; + } + + @Override + protected String getTopIconKey(boolean active) { + return "enderio:blockSoulMachineTop"; + } + + @Override + protected String getBottomIconKey(boolean active) { + return "enderio:blockSoulMachineBottom"; + } + + @Override + protected String getBackIconKey(boolean active) { + return "enderio:blockSoulMachineBack"; + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + TileSliceAndSplice te = (TileSliceAndSplice) world.getTileEntity(x, y, z); + if (isActive(world, x, y, z) && te != null) { + + ForgeDirection front = ForgeDirection.values()[te.facing]; + + for (int i = 0; i < 2; i++) { + double px = x + 0.5 + front.offsetX * 0.6; + double pz = z + 0.5 + front.offsetZ * 0.6; + double v = 0.05; + double vx = 0; + double vz = 0; + + if (front == ForgeDirection.NORTH || front == ForgeDirection.SOUTH) { + px += world.rand.nextFloat() * 0.9 - 0.45; + vz += front == ForgeDirection.NORTH ? -v : v; + } else { + pz += world.rand.nextFloat() * 0.9 - 0.45; + vx += front == ForgeDirection.WEST ? -v : v; + } + + EntityFX fx = + Minecraft.getMinecraft().renderGlobal.doSpawnParticle("smoke", px, y + 0.5, pz, vx, 0, vz); + if (fx != null) { + fx.setRBGColorF( + 0.3f + (rand.nextFloat() * 0.1f), + 0.1f + (rand.nextFloat() * 0.1f), + 0.1f + (rand.nextFloat() * 0.1f)); + fx.motionX *= 0.25f; + fx.motionY *= 0.25f; + fx.motionZ *= 0.25f; + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java index d282cae1..3ebfda27 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java @@ -1,72 +1,74 @@ package crazypants.enderio.machine.slicensplice; -import java.awt.Point; -import java.util.List; -import java.util.Random; - import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; import com.enderio.core.client.gui.widget.GhostSlot; - +import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import java.awt.Point; +import java.util.List; +import java.util.Random; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import crazypants.enderio.item.darksteel.DarkSteelItems; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerSliceAndSplice extends AbstractMachineContainer { - static private final Item[] slotItems1 = { Items.wooden_axe, Items.stone_axe, Items.iron_axe, Items.golden_axe, - Items.diamond_axe, DarkSteelItems.itemDarkSteelAxe }; - static private final Item[] slotItems2 = { Items.shears, Items.shears, Items.shears, Items.shears, - DarkSteelItems.itemDarkSteelShears }; - static private final Random rand = new Random(); + private static final Item[] slotItems1 = { + Items.wooden_axe, + Items.stone_axe, + Items.iron_axe, + Items.golden_axe, + Items.diamond_axe, + DarkSteelItems.itemDarkSteelAxe + }; + private static final Item[] slotItems2 = { + Items.shears, Items.shears, Items.shears, Items.shears, DarkSteelItems.itemDarkSteelShears + }; + private static final Random rand = new Random(); - public static final Point[] INPUT_SLOTS = new Point[] { - new Point(44,40), - new Point(62,40), - new Point(80,40), - new Point(44,58), - new Point(62,58), - new Point(80,58), - new Point(54,16), - new Point(72,16) - }; - - public static final Point OUTPUT_SLOT = new Point(134, 49); - - public ContainerSliceAndSplice(InventoryPlayer playerInv, TileSliceAndSplice te) { - super(playerInv, te); - } + public static final Point[] INPUT_SLOTS = new Point[] { + new Point(44, 40), + new Point(62, 40), + new Point(80, 40), + new Point(44, 58), + new Point(62, 58), + new Point(80, 58), + new Point(54, 16), + new Point(72, 16) + }; - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - - for(int i=0;i slots) { - slots.add(new GhostBackgroundItemSlot(slotItems1[rand.nextInt(slotItems1.length)], 54, 16)); - slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], 72, 16)); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + for (int i = 0; i < INPUT_SLOTS.length; i++) { + Point p = INPUT_SLOTS[i]; + final int slot = i; + addSlotToContainer(new Slot(getInv(), i, p.x, p.y) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(slot, itemStack); + } + }); + } + + addSlotToContainer(new Slot(getInv(), 8, OUTPUT_SLOT.x, OUTPUT_SLOT.y) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + } + + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(slotItems1[rand.nextInt(slotItems1.length)], 54, 16)); + slots.add(new GhostBackgroundItemSlot(slotItems2[rand.nextInt(slotItems2.length)], 72, 16)); + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index 18fe95e6..f0d810c7 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -1,47 +1,41 @@ package crazypants.enderio.machine.slicensplice; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.killera.ContainerKillerJoe; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiSliceAndSplice extends GuiPoweredMachineBase { - public GuiSliceAndSplice(InventoryPlayer par1InventoryPlayer, TileSliceAndSplice te) { - super(te, new ContainerSliceAndSplice(par1InventoryPlayer, te), "sliceAndSplice"); + public GuiSliceAndSplice(InventoryPlayer par1InventoryPlayer, TileSliceAndSplice te) { + super(te, new ContainerSliceAndSplice(par1InventoryPlayer, te), "sliceAndSplice"); - addProgressTooltip(103, 49, 24, 16); - } - - @Override - public void initGui() { - super.initGui(); - ((ContainerSliceAndSplice) inventorySlots).createGhostSlots(getGhostSlots()); - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int k = guiLeft; - int l = guiTop; - - drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - - if(shouldRenderProgress()) { - int scaled = getProgressScaled(24); - drawTexturedModalRect(k + 103, l + 49, 176, 14, scaled + 1, 16); + addProgressTooltip(103, 49, 24, 16); } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + @Override + public void initGui() { + super.initGui(); + ((ContainerSliceAndSplice) inventorySlots).createGhostSlots(getGhostSlots()); + } + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int k = guiLeft; + int l = guiTop; + + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + + if (shouldRenderProgress()) { + int scaled = getProgressScaled(24); + drawTexturedModalRect(k + 103, l + 49, 176, 14, scaled + 1, 16); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/SliceAndSpliceRecipeManager.java b/src/main/java/crazypants/enderio/machine/slicensplice/SliceAndSpliceRecipeManager.java index 27247bf7..246d2056 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/SliceAndSpliceRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/SliceAndSpliceRecipeManager.java @@ -7,23 +7,21 @@ import crazypants.enderio.machine.recipe.ManyToOneRecipeManager; public class SliceAndSpliceRecipeManager extends ManyToOneRecipeManager { - static final SliceAndSpliceRecipeManager instance = new SliceAndSpliceRecipeManager(); + static final SliceAndSpliceRecipeManager instance = new SliceAndSpliceRecipeManager(); - public static SliceAndSpliceRecipeManager getInstance() { - return instance; - } - - public SliceAndSpliceRecipeManager() { - super("SliceAndSpliceRecipes_Core.xml", "SliceAndSpliceRecipes_User.xml", "Slice'N'Splice"); - } + public static SliceAndSpliceRecipeManager getInstance() { + return instance; + } - @Override - public void loadRecipesFromConfig() { - super.loadRecipesFromConfig(); - MachineRecipeRegistry.instance.registerRecipe( - ModObject.blockSliceAndSplice.unlocalisedName, - new ManyToOneMachineRecipe("SpliceAndSpliceRecipe", - ModObject.blockAlloySmelter.unlocalisedName, this)); - } + public SliceAndSpliceRecipeManager() { + super("SliceAndSpliceRecipes_Core.xml", "SliceAndSpliceRecipes_User.xml", "Slice'N'Splice"); + } + @Override + public void loadRecipesFromConfig() { + super.loadRecipesFromConfig(); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSliceAndSplice.unlocalisedName, + new ManyToOneMachineRecipe("SpliceAndSpliceRecipe", ModObject.blockAlloySmelter.unlocalisedName, this)); + } } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index 11e9939b..a949548d 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -1,13 +1,5 @@ package crazypants.enderio.machine.slicensplice; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemShears; -import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.common.util.FakePlayerFactory; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -18,241 +10,253 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; +import java.util.List; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemShears; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.util.FakePlayerFactory; public class TileSliceAndSplice extends AbstractPoweredTaskEntity { - public static final int POWER_PER_TICK_ONE = Config.sliceAndSpliceLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0, - POWER_PER_TICK_ONE * 2, - Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_ONE); + public static final int POWER_PER_TICK_ONE = Config.sliceAndSpliceLevelOnePowerPerTickRF; + private static final BasicCapacitor CAP_ONE = new BasicCapacitor( + 0, POWER_PER_TICK_ONE * 2, Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); - public static final int POWER_PER_TICK_TWO = Config.sliceAndSpliceLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0, - POWER_PER_TICK_TWO * 2, - Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_TWO); + public static final int POWER_PER_TICK_TWO = Config.sliceAndSpliceLevelTwoPowerPerTickRF; + private static final BasicCapacitor CAP_TWO = new BasicCapacitor( + 0, + POWER_PER_TICK_TWO * 2, + Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_TWO); - public static final int POWER_PER_TICK_THREE = Config.sliceAndSpliceLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0, - POWER_PER_TICK_THREE * 2, - Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_THREE); + public static final int POWER_PER_TICK_THREE = Config.sliceAndSpliceLevelThreePowerPerTickRF; + private static final BasicCapacitor CAP_THREE = new BasicCapacitor( + 0, + POWER_PER_TICK_THREE * 2, + Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_THREE); - public static final int POWER_PER_TICK_FOUR = Config.sliceAndSpliceLevelFourPowerPerTickRF; - private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0, - POWER_PER_TICK_FOUR * 2, - Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_FOUR); + public static final int POWER_PER_TICK_FOUR = Config.sliceAndSpliceLevelFourPowerPerTickRF; + private static final BasicCapacitor CAP_FOUR = new BasicCapacitor( + 0, + POWER_PER_TICK_FOUR * 2, + Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_FOUR); - public static final int POWER_PER_TICK_FIVE = Config.sliceAndSpliceLevelFivePowerPerTickRF; - private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0, - POWER_PER_TICK_FIVE * 2, - Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_FIVE); + public static final int POWER_PER_TICK_FIVE = Config.sliceAndSpliceLevelFivePowerPerTickRF; + private static final BasicCapacitor CAP_FIVE = new BasicCapacitor( + 0, POWER_PER_TICK_FIVE * 2, Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FIVE); - public static final int POWER_PER_TICK_SIX = Config.sliceAndSpliceLevelSixPowerPerTickRF; - private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0, - POWER_PER_TICK_SIX * 2, - Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_SIX); + public static final int POWER_PER_TICK_SIX = Config.sliceAndSpliceLevelSixPowerPerTickRF; + private static final BasicCapacitor CAP_SIX = new BasicCapacitor( + 0, POWER_PER_TICK_SIX * 2, Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SIX); - public static final int POWER_PER_TICK_SEVEN = Config.sliceAndSpliceLevelSevenPowerPerTickRF; - private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0, - POWER_PER_TICK_SEVEN * 2, - Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_SEVEN); + public static final int POWER_PER_TICK_SEVEN = Config.sliceAndSpliceLevelSevenPowerPerTickRF; + private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor( + 0, + POWER_PER_TICK_SEVEN * 2, + Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_SEVEN); - public static final int POWER_PER_TICK_EIGHT = Config.sliceAndSpliceLevelEightPowerPerTickRF; - private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0, - POWER_PER_TICK_EIGHT * 2, - Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_EIGHT); + public static final int POWER_PER_TICK_EIGHT = Config.sliceAndSpliceLevelEightPowerPerTickRF; + private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor( + 0, + POWER_PER_TICK_EIGHT * 2, + Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_EIGHT); - public static final int POWER_PER_TICK_NINE = Config.sliceAndSpliceLevelNinePowerPerTickRF; - private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0, - POWER_PER_TICK_NINE * 2, - Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_NINE); + public static final int POWER_PER_TICK_NINE = Config.sliceAndSpliceLevelNinePowerPerTickRF; + private static final BasicCapacitor CAP_NINE = new BasicCapacitor( + 0, + POWER_PER_TICK_NINE * 2, + Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_NINE); - public static final int POWER_PER_TICK_TEN = Config.sliceAndSpliceLevelTenPowerPerTickRF; - private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0, - POWER_PER_TICK_TEN * 2, - Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), - POWER_PER_TICK_TEN); + public static final int POWER_PER_TICK_TEN = Config.sliceAndSpliceLevelTenPowerPerTickRF; + private static final BasicCapacitor CAP_TEN = new BasicCapacitor( + 0, + POWER_PER_TICK_TEN * 2, + Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_TEN); - private final int axeIndex = 6; - private final int shearsIndex = 7; - private EntityLivingBase fakePlayer; + private final int axeIndex = 6; + private final int shearsIndex = 7; + private EntityLivingBase fakePlayer; - public TileSliceAndSplice() { - super(new SlotDefinition(8, 1)); - } - - @Override - public String getMachineName() { - return ModObject.blockSliceAndSplice.unlocalisedName; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public void onCapacitorTypeChange() { - switch (getCapacitorType()) { - case BASIC_CAPACITOR: - setCapacitor(CAP_ONE); - break; - case ACTIVATED_CAPACITOR: - setCapacitor(CAP_TWO); - break; - case ENDER_CAPACITOR: - setCapacitor(CAP_THREE); - break; - case CRYSTALLINE_CAPACITOR: - setCapacitor(CAP_FOUR); - break; - case MELODIC_CAPACITOR: - setCapacitor(CAP_FIVE); - break; - case STELLAR_CAPACITOR: - setCapacitor(CAP_SIX); - break; - case TOTEMIC_CAPACITOR: - setCapacitor(CAP_SEVEN); - break; - case SILVER_CAPACITOR: - setCapacitor(CAP_ONE); - break; - case ENDERGETIC_CAPACITOR: - setCapacitor(CAP_TWO); - break; - case ENDERGISED_CAPACITOR: - setCapacitor(CAP_THREE); - break; - default: - break; - } - } - - @Override - protected IMachineRecipe canStartNextTask(float chance) { - if(getAxe() == null || getShears() == null) { - return null; - } - return super.canStartNextTask(chance); - } - - private ItemStack getAxe() { - return inventory[axeIndex]; - } - - private ItemStack getShears() { - return inventory[shearsIndex]; - } - - @Override - protected void taskComplete() { - super.taskComplete(); - damageTool(getAxe(), axeIndex); - damageTool(getShears(), shearsIndex); - } - - private void damageTool(ItemStack tool, int toolIndex) { - if(tool != null && tool.isItemStackDamageable()) { - tool.damageItem(1, getFakePlayer()); - if(tool.getItemDamage() >= tool.getMaxDamage()) { - inventory[toolIndex] = null; - } - } - } - - private EntityLivingBase getFakePlayer() { - if(fakePlayer == null) { - fakePlayer = FakePlayerFactory.getMinecraft(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId)); - } - return fakePlayer; - } - - protected MachineRecipeInput[] getRecipeInputs() { - MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots() - 2]; - int fromSlot = slotDefinition.minInputSlot; - for (int i = 0; i < res.length; i++) { - res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); - fromSlot++; - } - return res; - } - - @Override - protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { - if(itemstack == null || itemstack.getItem() == null) { - return false; - } - if(!slotDefinition.isInputSlot(slot)) { - return false; - } - if(slot == axeIndex) { - return itemstack.getItem() instanceof ItemAxe; - } - if(slot == shearsIndex) { - return itemstack.getItem() instanceof ItemShears; + public TileSliceAndSplice() { + super(new SlotDefinition(8, 1)); } - ItemStack currentStackInSlot = inventory[slot]; - if(currentStackInSlot != null) { - return currentStackInSlot.isItemEqual(itemstack); + @Override + public String getMachineName() { + return ModObject.blockSliceAndSplice.unlocalisedName; } - int numSlotsFilled = 0; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(i >= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { - if(inventory[i] != null && inventory[i].stackSize > 0) { - numSlotsFilled++; + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public void onCapacitorTypeChange() { + switch (getCapacitorType()) { + case BASIC_CAPACITOR: + setCapacitor(CAP_ONE); + break; + case ACTIVATED_CAPACITOR: + setCapacitor(CAP_TWO); + break; + case ENDER_CAPACITOR: + setCapacitor(CAP_THREE); + break; + case CRYSTALLINE_CAPACITOR: + setCapacitor(CAP_FOUR); + break; + case MELODIC_CAPACITOR: + setCapacitor(CAP_FIVE); + break; + case STELLAR_CAPACITOR: + setCapacitor(CAP_SIX); + break; + case TOTEMIC_CAPACITOR: + setCapacitor(CAP_SEVEN); + break; + case SILVER_CAPACITOR: + setCapacitor(CAP_ONE); + break; + case ENDERGETIC_CAPACITOR: + setCapacitor(CAP_TWO); + break; + case ENDERGISED_CAPACITOR: + setCapacitor(CAP_THREE); + break; + default: + break; } - } } - List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), MachineRecipeInput.create(slot, itemstack)); - if(numSlotsFilled == 0 && !recipes.isEmpty()) { - return true; - } - return isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); - } - private boolean isValidInputForAlloyRecipe(int slot, ItemStack itemstack, int numSlotsFilled, List recipes) { - - ItemStack[] resultInv = new ItemStack[slotDefinition.getNumInputSlots()]; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(i >= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { - if(i == slot) { - resultInv[i] = itemstack; - } else { - resultInv[i] = inventory[i]; + @Override + protected IMachineRecipe canStartNextTask(float chance) { + if (getAxe() == null || getShears() == null) { + return null; } - } + return super.canStartNextTask(chance); } - for (IMachineRecipe recipe : recipes) { - if(recipe instanceof ManyToOneMachineRecipe) { - if(((ManyToOneMachineRecipe) recipe).isValidRecipeComponents(resultInv)) { - return true; + private ItemStack getAxe() { + return inventory[axeIndex]; + } + + private ItemStack getShears() { + return inventory[shearsIndex]; + } + + @Override + protected void taskComplete() { + super.taskComplete(); + damageTool(getAxe(), axeIndex); + damageTool(getShears(), shearsIndex); + } + + private void damageTool(ItemStack tool, int toolIndex) { + if (tool != null && tool.isItemStackDamageable()) { + tool.damageItem(1, getFakePlayer()); + if (tool.getItemDamage() >= tool.getMaxDamage()) { + inventory[toolIndex] = null; + } } - } } - return false; - } - private boolean isItemAlreadyInASlot(ItemStack itemstack) { - ItemStack currentStackType = null; - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot() && currentStackType == null; i++) { - currentStackType = inventory[i]; - if(currentStackType != null && currentStackType.isItemEqual(itemstack)) { - return true; - } + private EntityLivingBase getFakePlayer() { + if (fakePlayer == null) { + fakePlayer = FakePlayerFactory.getMinecraft( + MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId)); + } + return fakePlayer; } - return false; - } + protected MachineRecipeInput[] getRecipeInputs() { + MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots() - 2]; + int fromSlot = slotDefinition.minInputSlot; + for (int i = 0; i < res.length; i++) { + res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); + fromSlot++; + } + return res; + } + + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { + if (itemstack == null || itemstack.getItem() == null) { + return false; + } + if (!slotDefinition.isInputSlot(slot)) { + return false; + } + if (slot == axeIndex) { + return itemstack.getItem() instanceof ItemAxe; + } + if (slot == shearsIndex) { + return itemstack.getItem() instanceof ItemShears; + } + + ItemStack currentStackInSlot = inventory[slot]; + if (currentStackInSlot != null) { + return currentStackInSlot.isItemEqual(itemstack); + } + + int numSlotsFilled = 0; + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (i >= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { + if (inventory[i] != null && inventory[i].stackSize > 0) { + numSlotsFilled++; + } + } + } + List recipes = MachineRecipeRegistry.instance.getRecipesForInput( + getMachineName(), MachineRecipeInput.create(slot, itemstack)); + if (numSlotsFilled == 0 && !recipes.isEmpty()) { + return true; + } + return isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); + } + + private boolean isValidInputForAlloyRecipe( + int slot, ItemStack itemstack, int numSlotsFilled, List recipes) { + + ItemStack[] resultInv = new ItemStack[slotDefinition.getNumInputSlots()]; + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (i >= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { + if (i == slot) { + resultInv[i] = itemstack; + } else { + resultInv[i] = inventory[i]; + } + } + } + + for (IMachineRecipe recipe : recipes) { + if (recipe instanceof ManyToOneMachineRecipe) { + if (((ManyToOneMachineRecipe) recipe).isValidRecipeComponents(resultInv)) { + return true; + } + } + } + return false; + } + + private boolean isItemAlreadyInASlot(ItemStack itemstack) { + ItemStack currentStackType = null; + for (int i = slotDefinition.getMinInputSlot(); + i <= slotDefinition.getMaxInputSlot() && currentStackType == null; + i++) { + currentStackType = inventory[i]; + if (currentStackType != null && currentStackType.isItemEqual(itemstack)) { + return true; + } + } + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 4d6323eb..061ac5fa 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -1,7 +1,15 @@ package crazypants.enderio.machine.solar; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.power.PowerDisplayUtil; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -9,80 +17,66 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; +public class BlockItemSolarPanel extends ItemBlockWithMetadata + implements IAdvancedTooltipProvider, IResourceTooltipProvider { -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.power.PowerDisplayUtil; + public BlockItemSolarPanel() { + super(EnderIO.blockSolarPanel, EnderIO.blockSolarPanel); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); + } -public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider, IResourceTooltipProvider { + public BlockItemSolarPanel(Block block) { + super(block, block); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); + } - public BlockItemSolarPanel() { - super(EnderIO.blockSolarPanel, EnderIO.blockSolarPanel); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + String result = super.getUnlocalizedName(par1ItemStack); + if (meta == 1) result += ".advanced"; + if (meta == 2) result += ".vibrant"; - public BlockItemSolarPanel(Block block) { - super(block, block); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } + return result; + } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - String result = super.getUnlocalizedName(par1ItemStack); - if(meta == 1) result += ".advanced"; - if(meta == 2) result += ".vibrant"; + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack stack = new ItemStack(this, 1, 0); + par3List.add(stack); + stack = new ItemStack(this, 1, 1); + par3List.add(stack); + stack = new ItemStack(this, 1, 2); + par3List.add(stack); + } - return result; - } + @SuppressWarnings("rawtypes") + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addCommonTooltipFromResources(list, itemstack); + } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack stack = new ItemStack(this, 1,0); - par3List.add(stack); - stack = new ItemStack(this, 1,1); - par3List.add(stack); - stack = new ItemStack(this, 1,2); - par3List.add(stack); - } + @SuppressWarnings("rawtypes") + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - @SuppressWarnings("rawtypes") - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addCommonTooltipFromResources(list, itemstack); - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); + int prod = Config.maxPhotovoltaicOutputRF; + if (itemstack.getItemDamage() == 1) prod = Config.maxPhotovoltaicAdvancedOutputRF; + if (itemstack.getItemDamage() == 2) prod = Config.maxPhotovoltaicVibrantOutputRF; - @SuppressWarnings("rawtypes") - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - int prod = Config.maxPhotovoltaicOutputRF; - if(itemstack.getItemDamage() == 1) - prod = Config.maxPhotovoltaicAdvancedOutputRF; - if(itemstack.getItemDamage() == 2) - prod = Config.maxPhotovoltaicVibrantOutputRF; - - list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return super.getUnlocalizedName(itemStack); - } + list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); + } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return super.getUnlocalizedName(itemStack); + } } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 601396ac..1efa2b13 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -1,7 +1,15 @@ package crazypants.enderio.machine.solar; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.waila.IWailaInfoProvider; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -15,166 +23,178 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.waila.IWailaInfoProvider; - public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider { - public static int renderId; + public static int renderId; - public static BlockSolarPanel create() { - BlockSolarPanel result = new BlockSolarPanel(); - result.init(); - return result; - } - - private static final float BLOCK_HEIGHT = 0.15f; - - IIcon sideIcon; - IIcon advancedSideIcon; - IIcon advancedIcon; - - IIcon borderIcon; - IIcon advancedBorderIcon; - - IIcon vibrantIcon; - IIcon vibrantSideIcon; - IIcon vibrantBorderIcon; - - private BlockSolarPanel() { - super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class); - if(!Config.photovoltaicCellEnabled) { - setCreativeTab(null); + public static BlockSolarPanel create() { + BlockSolarPanel result = new BlockSolarPanel(); + result.init(); + return result; } - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); - } - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemSolarPanel.class, name); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + private static final float BLOCK_HEIGHT = 0.15f; + + IIcon sideIcon; + IIcon advancedSideIcon; + IIcon advancedIcon; + + IIcon borderIcon; + IIcon advancedBorderIcon; + + IIcon vibrantIcon; + IIcon vibrantSideIcon; + IIcon vibrantBorderIcon; + + private BlockSolarPanel() { + super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class); + if (!Config.photovoltaicCellEnabled) { + setCreativeTab(null); + } + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); } - } - @Override - public int damageDropped(int damage) { - return damage; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - if(side == ForgeDirection.UP.ordinal()) { - switch(meta){ - case 0:return blockIcon; - case 1:return advancedIcon; - case 2:return vibrantIcon; - default: return blockIcon; - } + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemSolarPanel.class, name); + if (teClass != null) { + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + } } - switch(meta){ - case 0:return sideIcon; - case 1:return advancedSideIcon; - case 2:return vibrantSideIcon; - default: return sideIcon; - } - } - public IIcon getBorderIcon(int i, int meta) { - switch(meta){ - case 0:return borderIcon; - case 1:return advancedBorderIcon; - case 2:return vibrantBorderIcon; - default: return borderIcon; - } - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntitySolarPanel) { - ((TileEntitySolarPanel) te).onNeighborBlockChange(); + @Override + public int damageDropped(int damage) { + return damage; } - } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - blockIcon = register.registerIcon("enderio:solarPanelTop"); - advancedIcon = register.registerIcon("enderio:solarPanelAdvancedTop"); - vibrantIcon = register.registerIcon("enderio:solarPanelVibrantTop"); - sideIcon = register.registerIcon("enderio:solarPanelSide"); - advancedSideIcon = register.registerIcon("enderio:solarPanelAdvancedSide"); - vibrantSideIcon = register.registerIcon("enderio:solarPanelVibrantSide"); - borderIcon = register.registerIcon("enderio:solarPanelBorder"); - advancedBorderIcon = register.registerIcon("enderio:solarPanelAdvancedBorder"); - vibrantBorderIcon = register.registerIcon("enderio:solarPanelVibrantBorder"); - - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); - } - - @Override - public void setBlockBoundsForItemRender() { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); - } - - @SuppressWarnings("rawtypes") - @Override - public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - setBlockBoundsBasedOnState(par1World, par2, par3, par4); - super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntitySolarPanel) { - TileEntitySolarPanel solar = (TileEntitySolarPanel) te; - float efficiency = solar.calculateLightRatio(); - if(!solar.canSeeSun()) { - tooltip.add(EnumChatFormatting.RED + EnderIO.lang.localize("tooltip.sunlightBlocked")); - } else { - tooltip.add(String.format("%s : %s%.0f%%", EnumChatFormatting.WHITE + EnderIO.lang.localize("tooltip.efficiency") + EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, efficiency * 100)); - } + @Override + public boolean renderAsNormalBlock() { + return false; } - } - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return 0; - } + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + if (side == ForgeDirection.UP.ordinal()) { + switch (meta) { + case 0: + return blockIcon; + case 1: + return advancedIcon; + case 2: + return vibrantIcon; + default: + return blockIcon; + } + } + switch (meta) { + case 0: + return sideIcon; + case 1: + return advancedSideIcon; + case 2: + return vibrantSideIcon; + default: + return sideIcon; + } + } + + public IIcon getBorderIcon(int i, int meta) { + switch (meta) { + case 0: + return borderIcon; + case 1: + return advancedBorderIcon; + case 2: + return vibrantBorderIcon; + default: + return borderIcon; + } + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntitySolarPanel) { + ((TileEntitySolarPanel) te).onNeighborBlockChange(); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + blockIcon = register.registerIcon("enderio:solarPanelTop"); + advancedIcon = register.registerIcon("enderio:solarPanelAdvancedTop"); + vibrantIcon = register.registerIcon("enderio:solarPanelVibrantTop"); + sideIcon = register.registerIcon("enderio:solarPanelSide"); + advancedSideIcon = register.registerIcon("enderio:solarPanelAdvancedSide"); + vibrantSideIcon = register.registerIcon("enderio:solarPanelVibrantSide"); + borderIcon = register.registerIcon("enderio:solarPanelBorder"); + advancedBorderIcon = register.registerIcon("enderio:solarPanelAdvancedBorder"); + vibrantBorderIcon = register.registerIcon("enderio:solarPanelVibrantBorder"); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); + } + + @Override + public void setBlockBoundsForItemRender() { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); + } + + @SuppressWarnings("rawtypes") + @Override + public void addCollisionBoxesToList( + World par1World, + int par2, + int par3, + int par4, + AxisAlignedBB par5AxisAlignedBB, + List par6List, + Entity par7Entity) { + setBlockBoundsBasedOnState(par1World, par2, par3, par4); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntitySolarPanel) { + TileEntitySolarPanel solar = (TileEntitySolarPanel) te; + float efficiency = solar.calculateLightRatio(); + if (!solar.canSeeSun()) { + tooltip.add(EnumChatFormatting.RED + EnderIO.lang.localize("tooltip.sunlightBlocked")); + } else { + tooltip.add(String.format( + "%s : %s%.0f%%", + EnumChatFormatting.WHITE + + EnderIO.lang.localize("tooltip.efficiency") + + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, + efficiency * 100)); + } + } + } + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java b/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java index b5d3a660..5aaa276f 100644 --- a/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java +++ b/src/main/java/crazypants/enderio/machine/solar/SolarPanelNetwork.java @@ -1,164 +1,162 @@ package crazypants.enderio.machine.solar; +import cofh.api.energy.EnergyStorage; +import com.google.common.collect.Lists; import java.util.EnumSet; import java.util.List; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.EnergyStorage; - -import com.google.common.collect.Lists; public class SolarPanelNetwork { - private List panels; - private boolean empty = true; + private List panels; + private boolean empty = true; - private EnergyStorage energy; + private EnergyStorage energy; - public static final int ENERGY_PER = 10000; + public static final int ENERGY_PER = 10000; - public static final EnumSet VALID_CONS = EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); + public static final EnumSet VALID_CONS = + EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); - public SolarPanelNetwork() { - panels = Lists.newArrayList(); - energy = new EnergyStorage(ENERGY_PER); - } - - SolarPanelNetwork(TileEntitySolarPanel initial) { - this(); - panels.add(initial); - empty = false; - } - - void onUpdate(TileEntitySolarPanel panel) { - } - - boolean addToNetwork(TileEntitySolarPanel panel) { - if(panel.network == this && panel.network.isValid() && panels.contains(panel)) { - return false; + public SolarPanelNetwork() { + panels = Lists.newArrayList(); + energy = new EnergyStorage(ENERGY_PER); } - if(panel.network == null || !panel.network.isValid() || panel.network == this) { - if (!panels.contains(panel)) { - panels.add(panel); - } - panel.setNetwork(this); - updateEnergy(); - } else { - SolarPanelNetwork other = panel.network; - for (TileEntitySolarPanel otherPanel : other.panels) { - panels.add(otherPanel); - otherPanel.setNetwork(this); - } - updateEnergy(); - this.energy.setEnergyStored(energy.getEnergyStored() + other.energy.getEnergyStored()); - other.invalidate(); + SolarPanelNetwork(TileEntitySolarPanel initial) { + this(); + panels.add(initial); + empty = false; } - empty = false; - return true; - } + void onUpdate(TileEntitySolarPanel panel) {} - void removeFromNetwork(TileEntitySolarPanel panel) { - // build list of formerly connected neighbors - List neighbors = Lists.newArrayList(); - for (ForgeDirection dir : VALID_CONS) { - TileEntity te = panel.getLocation().getLocation(dir).getTileEntity(panel.getWorldObj()); - if(te != null && te instanceof TileEntitySolarPanel) { - neighbors.add((TileEntitySolarPanel) te); - } + boolean addToNetwork(TileEntitySolarPanel panel) { + if (panel.network == this && panel.network.isValid() && panels.contains(panel)) { + return false; + } + + if (panel.network == null || !panel.network.isValid() || panel.network == this) { + if (!panels.contains(panel)) { + panels.add(panel); + } + panel.setNetwork(this); + updateEnergy(); + } else { + SolarPanelNetwork other = panel.network; + for (TileEntitySolarPanel otherPanel : other.panels) { + panels.add(otherPanel); + otherPanel.setNetwork(this); + } + updateEnergy(); + this.energy.setEnergyStored(energy.getEnergyStored() + other.energy.getEnergyStored()); + other.invalidate(); + } + + empty = false; + return true; } - // distribute power from split networks evenly to neighbors - for (TileEntitySolarPanel te : neighbors) { - int dist = energy.getEnergyStored() / neighbors.size(); - te.destroyedNetworkBuffer = new EnergyStorage(dist); - te.destroyedNetworkBuffer.setEnergyStored(dist); + void removeFromNetwork(TileEntitySolarPanel panel) { + // build list of formerly connected neighbors + List neighbors = Lists.newArrayList(); + for (ForgeDirection dir : VALID_CONS) { + TileEntity te = panel.getLocation().getLocation(dir).getTileEntity(panel.getWorldObj()); + if (te != null && te instanceof TileEntitySolarPanel) { + neighbors.add((TileEntitySolarPanel) te); + } + } + + // distribute power from split networks evenly to neighbors + for (TileEntitySolarPanel te : neighbors) { + int dist = energy.getEnergyStored() / neighbors.size(); + te.destroyedNetworkBuffer = new EnergyStorage(dist); + te.destroyedNetworkBuffer.setEnergyStored(dist); + } + + // allow solars to reform networks + destroyNetwork(); } - // allow solars to reform networks - destroyNetwork(); - } - - private void updateEnergy() { - energy.setCapacity(ENERGY_PER * panels.size()); - energy.setMaxExtract(energy.getMaxEnergyStored()); - } - - /** - * Actually destroys all references to this network, creating an invalid - * network for each panel on this current one. - */ - void destroyNetwork() { - for (TileEntitySolarPanel te : panels) { - te.setNetwork(new SolarPanelNetwork()); + private void updateEnergy() { + energy.setCapacity(ENERGY_PER * panels.size()); + energy.setMaxExtract(energy.getMaxEnergyStored()); } - invalidate(); - } - /** - * Does nothing but clear this network, other panels may still hold a - * reference to this network. - */ - private void invalidate() { - panels.clear(); - empty = true; - } - - public boolean isValid() { - return !empty; - } - - public int extractEnergy(int maxExtract, boolean simulate) { - return isValid() ? energy.extractEnergy(maxExtract, simulate) : 0; - } - - public int getEnergyStored() { - return energy.getEnergyStored(); - } - - public int setEnergyStored(int energy) { - if(isValid()) { - this.energy.setEnergyStored(energy); + /** + * Actually destroys all references to this network, creating an invalid + * network for each panel on this current one. + */ + void destroyNetwork() { + for (TileEntitySolarPanel te : panels) { + te.setNetwork(new SolarPanelNetwork()); + } + invalidate(); } - return this.energy.getEnergyStored(); - } - public int getMaxEnergyStored() { - return energy.getMaxEnergyStored(); - } - - public int getMaxEnergyExtracted() { - return energy.getMaxExtract(); - } - - public void addBuffer(EnergyStorage destroyedNetworkBuffer) { - energy.receiveEnergy(destroyedNetworkBuffer.getEnergyStored(), false); - } - - TileEntitySolarPanel getMaster() { - return panels.get(0); - } - - boolean shouldSave(TileEntitySolarPanel panel) { - return getMaster() == panel; - } - - public int size() { - return panels.size(); - } - - void writeToNBT(NBTTagCompound tag) { - tag.setBoolean("validSolar", true); - energy.writeToNBT(tag); - } - - void readFromNBT(TileEntitySolarPanel panel, NBTTagCompound tag) { - if(tag.getBoolean("validSolar")) { - energy.readFromNBT(tag); - addToNetwork(panel); + /** + * Does nothing but clear this network, other panels may still hold a + * reference to this network. + */ + private void invalidate() { + panels.clear(); + empty = true; + } + + public boolean isValid() { + return !empty; + } + + public int extractEnergy(int maxExtract, boolean simulate) { + return isValid() ? energy.extractEnergy(maxExtract, simulate) : 0; + } + + public int getEnergyStored() { + return energy.getEnergyStored(); + } + + public int setEnergyStored(int energy) { + if (isValid()) { + this.energy.setEnergyStored(energy); + } + return this.energy.getEnergyStored(); + } + + public int getMaxEnergyStored() { + return energy.getMaxEnergyStored(); + } + + public int getMaxEnergyExtracted() { + return energy.getMaxExtract(); + } + + public void addBuffer(EnergyStorage destroyedNetworkBuffer) { + energy.receiveEnergy(destroyedNetworkBuffer.getEnergyStored(), false); + } + + TileEntitySolarPanel getMaster() { + return panels.get(0); + } + + boolean shouldSave(TileEntitySolarPanel panel) { + return getMaster() == panel; + } + + public int size() { + return panels.size(); + } + + void writeToNBT(NBTTagCompound tag) { + tag.setBoolean("validSolar", true); + energy.writeToNBT(tag); + } + + void readFromNBT(TileEntitySolarPanel panel, NBTTagCompound tag) { + if (tag.getBoolean("validSolar")) { + energy.readFromNBT(tag); + addToNetwork(panel); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java b/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java index 2042e77a..b0fef2e3 100644 --- a/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java +++ b/src/main/java/crazypants/enderio/machine/solar/SolarPanelRenderer.java @@ -1,92 +1,101 @@ package crazypants.enderio.machine.solar; -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.ConnectedTextureRenderer; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.CustomCubeRenderer; import com.enderio.core.client.render.IconUtil; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; +import java.util.EnumSet; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class SolarPanelRenderer implements ISimpleBlockRenderingHandler { - private ConnectedTextureRenderer ctr; - - public SolarPanelRenderer() { - ctr = new ConnectedTextureRenderer(); - ctr.setMatchMeta(true); - ctr.setSidesToRender(EnumSet.of(ForgeDirection.UP)); - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; + private ConnectedTextureRenderer ctr; - float offset = -0.5f; - tes.addTranslation(offset, 0, offset); - tes.startDrawingQuads(); - CubeRenderer.render(new BoundingBox(EnderIO.blockSolarPanel), RenderUtil.getBlockTextures(EnderIO.blockSolarPanel, metadata), false); - tes.draw(); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - tes.startDrawingQuads(); - tes.setColorRGBA_F(1, 1, 1, 1); - renderBorder(null, 0, 0, 0, metadata); - tes.draw(); - - tes.addTranslation(-offset, 0, -offset); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - renderer.renderStandardBlock(block, x, y, z); - Tessellator.instance.addTranslation(0, 0.0001f, 0); - int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, 1); - ctr.setEdgeTexture(EnderIO.blockSolarPanel.getBorderIcon(0, meta)); - CustomCubeRenderer.instance.setOverrideTexture(IconUtil.blankTexture); - if(!renderer.hasOverrideBlockTexture()) { - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, ctr); - } else { - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z); + public SolarPanelRenderer() { + ctr = new ConnectedTextureRenderer(); + ctr.setMatchMeta(true); + ctr.setSidesToRender(EnumSet.of(ForgeDirection.UP)); } - CustomCubeRenderer.instance.setOverrideTexture(null); - Tessellator.instance.addTranslation(0, -0.0001f, 0); - return true; - } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; - private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { - IIcon texture = EnderIO.blockSolarPanel.getBorderIcon(0, meta); - RenderUtil.renderConnectedTextureFace(blockAccess, EnderIO.blockSolarPanel, x, y, z, ForgeDirection.UP, texture, blockAccess == null, false, false); - } - - @Override - public int getRenderId() { - return BlockSolarPanel.renderId; - } + float offset = -0.5f; + tes.addTranslation(offset, 0, offset); + tes.startDrawingQuads(); + CubeRenderer.render( + new BoundingBox(EnderIO.blockSolarPanel), + RenderUtil.getBlockTextures(EnderIO.blockSolarPanel, metadata), + false); + tes.draw(); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + tes.startDrawingQuads(); + tes.setColorRGBA_F(1, 1, 1, 1); + renderBorder(null, 0, 0, 0, metadata); + tes.draw(); + + tes.addTranslation(-offset, 0, -offset); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + } + + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + renderer.renderStandardBlock(block, x, y, z); + Tessellator.instance.addTranslation(0, 0.0001f, 0); + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, 1); + ctr.setEdgeTexture(EnderIO.blockSolarPanel.getBorderIcon(0, meta)); + CustomCubeRenderer.instance.setOverrideTexture(IconUtil.blankTexture); + if (!renderer.hasOverrideBlockTexture()) { + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, ctr); + } else { + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z); + } + CustomCubeRenderer.instance.setOverrideTexture(null); + Tessellator.instance.addTranslation(0, -0.0001f, 0); + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { + IIcon texture = EnderIO.blockSolarPanel.getBorderIcon(0, meta); + RenderUtil.renderConnectedTextureFace( + blockAccess, + EnderIO.blockSolarPanel, + x, + y, + z, + ForgeDirection.UP, + texture, + blockAccess == null, + false, + false); + } + + @Override + public int getRenderId() { + return BlockSolarPanel.renderId; + } } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 842cc7e2..0995a8ce 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -1,9 +1,16 @@ package crazypants.enderio.machine.solar; +import cofh.api.energy.EnergyStorage; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.config.Config; +import crazypants.enderio.power.IInternalPowerProvider; +import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.enderio.waila.IWailaNBTProvider; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; @@ -13,281 +20,265 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.EnergyStorage; - -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.config.Config; -import crazypants.enderio.power.IInternalPowerProvider; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.enderio.waila.IWailaNBTProvider; public class TileEntitySolarPanel extends TileEntityEio implements IInternalPowerProvider, IWailaNBTProvider { - private final List receptors = new ArrayList(); - private ListIterator receptorIterator = receptors.listIterator(); - private boolean receptorsDirty = true; + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + private boolean receptorsDirty = true; - private int lastCollectionValue = -1; + private int lastCollectionValue = -1; - private static final int CHECK_INTERVAL = 100; + private static final int CHECK_INTERVAL = 100; - EnergyStorage destroyedNetworkBuffer = null; + EnergyStorage destroyedNetworkBuffer = null; - protected SolarPanelNetwork network = new SolarPanelNetwork(); + protected SolarPanelNetwork network = new SolarPanelNetwork(); - public void onNeighborBlockChange() { - receptorsDirty = true; - } - - - - // RF Power - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return from == ForgeDirection.DOWN; - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return 0; - } - - @Override - public int getEnergyStored() { - return network.getEnergyStored(); - } - - @Override - public int getMaxEnergyStored() { - return network.getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - network.setEnergyStored(stored); - } - - @Override - public void doUpdate() { - if (worldObj.isRemote) { - return; - } - collectEnergy(); - transmitEnergy(); - - if (network.isValid()) { - if (destroyedNetworkBuffer != null) { - network.addBuffer(destroyedNetworkBuffer); - destroyedNetworkBuffer = null; - } - network.onUpdate(this); + public void onNeighborBlockChange() { + receptorsDirty = true; } - if (!network.isValid() || (shouldDoWorkThisTick(20, 1) && network.addToNetwork(this))) { - findNetwork(); + // RF Power + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; } - } - @Override - public void invalidate() { - network.removeFromNetwork(this); - super.invalidate(); - } + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return from == ForgeDirection.DOWN; + } - private void findNetwork() { - for (ForgeDirection dir : SolarPanelNetwork.VALID_CONS) { - TileEntity te = new BlockCoord(this).getLocation(dir).getTileEntity(worldObj); - if(te != null && te instanceof TileEntitySolarPanel && ((TileEntitySolarPanel) te).canConnect(this)) { - SolarPanelNetwork network = ((TileEntitySolarPanel) te).network; - if(network != null) { - network.addToNetwork(this); + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return 0; + } + + @Override + public int getEnergyStored() { + return network.getEnergyStored(); + } + + @Override + public int getMaxEnergyStored() { + return network.getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + network.setEnergyStored(stored); + } + + @Override + public void doUpdate() { + if (worldObj.isRemote) { + return; + } + collectEnergy(); + transmitEnergy(); + + if (network.isValid()) { + if (destroyedNetworkBuffer != null) { + network.addBuffer(destroyedNetworkBuffer); + destroyedNetworkBuffer = null; + } + network.onUpdate(this); + } + + if (!network.isValid() || (shouldDoWorkThisTick(20, 1) && network.addToNetwork(this))) { + findNetwork(); } - } } - if(!network.isValid()) { - network = new SolarPanelNetwork(this); - } - } - - private boolean canConnect(TileEntitySolarPanel other) { - return getBlockMetadata() == other.getBlockMetadata(); - } - - private void collectEnergy() { - if(canSeeSun()) { - if(lastCollectionValue == -1 || shouldDoWorkThisTick(CHECK_INTERVAL)) { - float fromSun = calculateLightRatio(); - lastCollectionValue = Math.round(getEnergyPerTick() * fromSun); - } - if(lastCollectionValue > 0) { - network.setEnergyStored(Math.min(lastCollectionValue + network.getEnergyStored(), network.getMaxEnergyStored())); - } - } - } - - private int getEnergyPerTick() { - int meta = getBlockMetadata(); - if(meta == 0) - return Config.maxPhotovoltaicOutputRF; - if(meta == 1) - return Config.maxPhotovoltaicAdvancedOutputRF; - return Config.maxPhotovoltaicVibrantOutputRF; - } - - float calculateLightRatio() { - return calculateLightRatio(worldObj, xCoord, yCoord, zCoord); - } - - boolean canSeeSun() { - return worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord); - } - - public static float calculateLightRatio(World world, int x, int y, int z) { - int lightValue = world.getSavedLightValue(EnumSkyBlock.Sky, x, y, z) - world.skylightSubtracted; - float sunAngle = world.getCelestialAngleRadians(1.0F); - - if(sunAngle < (float) Math.PI) { - sunAngle += (0.0F - sunAngle) * 0.2F; - } else { - sunAngle += (((float) Math.PI * 2F) - sunAngle) * 0.2F; + @Override + public void invalidate() { + network.removeFromNetwork(this); + super.invalidate(); } - lightValue = Math.round(lightValue * MathHelper.cos(sunAngle)); + private void findNetwork() { + for (ForgeDirection dir : SolarPanelNetwork.VALID_CONS) { + TileEntity te = new BlockCoord(this).getLocation(dir).getTileEntity(worldObj); + if (te != null && te instanceof TileEntitySolarPanel && ((TileEntitySolarPanel) te).canConnect(this)) { + SolarPanelNetwork network = ((TileEntitySolarPanel) te).network; + if (network != null) { + network.addToNetwork(this); + } + } + } - lightValue = MathHelper.clamp_int(lightValue, 0, 15); - return lightValue / 15f; - } - - private boolean transmitEnergy() { - - - int canTransmit = Math.min(getEnergyStored(), network.getMaxEnergyExtracted()); - int transmitted = 0; - - checkReceptors(); - - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = receptors.listIterator(); + if (!network.isValid()) { + network = new SolarPanelNetwork(this); + } } - int appliedCount = 0; - int numReceptors = receptors.size(); - while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + private boolean canConnect(TileEntitySolarPanel other) { + return getBlockMetadata() == other.getBlockMetadata(); + } - Receptor receptor = receptorIterator.next(); - IPowerInterface pp = receptor.receptor; - if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - transmitted += used; - canTransmit -= used; - } + private void collectEnergy() { + if (canSeeSun()) { + if (lastCollectionValue == -1 || shouldDoWorkThisTick(CHECK_INTERVAL)) { + float fromSun = calculateLightRatio(); + lastCollectionValue = Math.round(getEnergyPerTick() * fromSun); + } + if (lastCollectionValue > 0) { + network.setEnergyStored( + Math.min(lastCollectionValue + network.getEnergyStored(), network.getMaxEnergyStored())); + } + } + } - if(canTransmit <= 0) { - break; - } + private int getEnergyPerTick() { + int meta = getBlockMetadata(); + if (meta == 0) return Config.maxPhotovoltaicOutputRF; + if (meta == 1) return Config.maxPhotovoltaicAdvancedOutputRF; + return Config.maxPhotovoltaicVibrantOutputRF; + } - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { + float calculateLightRatio() { + return calculateLightRatio(worldObj, xCoord, yCoord, zCoord); + } + + boolean canSeeSun() { + return worldObj.canBlockSeeTheSky(xCoord, yCoord, zCoord); + } + + public static float calculateLightRatio(World world, int x, int y, int z) { + int lightValue = world.getSavedLightValue(EnumSkyBlock.Sky, x, y, z) - world.skylightSubtracted; + float sunAngle = world.getCelestialAngleRadians(1.0F); + + if (sunAngle < (float) Math.PI) { + sunAngle += (0.0F - sunAngle) * 0.2F; + } else { + sunAngle += (((float) Math.PI * 2F) - sunAngle) * 0.2F; + } + + lightValue = Math.round(lightValue * MathHelper.cos(sunAngle)); + + lightValue = MathHelper.clamp_int(lightValue, 0, 15); + return lightValue / 15f; + } + + private boolean transmitEnergy() { + + int canTransmit = Math.min(getEnergyStored(), network.getMaxEnergyExtracted()); + int transmitted = 0; + + checkReceptors(); + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + + int appliedCount = 0; + int numReceptors = receptors.size(); + while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { + + Receptor receptor = receptorIterator.next(); + IPowerInterface pp = receptor.receptor; + if (pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { + int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); + transmitted += used; + canTransmit -= used; + } + + if (canTransmit <= 0) { + break; + } + + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + appliedCount++; + } + + setEnergyStored(getEnergyStored() - transmitted); + + return transmitted > 0; + } + + private void checkReceptors() { + if (!receptorsDirty) { + return; + } + receptors.clear(); + BlockCoord bc = new BlockCoord(xCoord, yCoord, zCoord); + ForgeDirection dir = ForgeDirection.DOWN; + BlockCoord checkLoc = bc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + IPowerInterface pi = PowerHandlerUtil.create(te); + if (pi != null) { + receptors.add(new Receptor(pi, dir)); + } receptorIterator = receptors.listIterator(); - } - appliedCount++; + receptorsDirty = false; } - setEnergyStored(getEnergyStored() - transmitted); + static class Receptor { + IPowerInterface receptor; + ForgeDirection fromDir; - return transmitted > 0; - - } - - private void checkReceptors() { - if(!receptorsDirty) { - return; + private Receptor(IPowerInterface rec, ForgeDirection fromDir) { + receptor = rec; + this.fromDir = fromDir; + } } - receptors.clear(); - BlockCoord bc = new BlockCoord(xCoord, yCoord, zCoord); - ForgeDirection dir = ForgeDirection.DOWN; - BlockCoord checkLoc = bc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - IPowerInterface pi = PowerHandlerUtil.create(te); - if(pi != null) { - receptors.add(new Receptor(pi, dir)); + + @Override + public void readCustomNBT(NBTTagCompound tag) { + network.readFromNBT(this, tag); } - receptorIterator = receptors.listIterator(); - receptorsDirty = false; - } - - static class Receptor { - IPowerInterface receptor; - ForgeDirection fromDir; - - private Receptor(IPowerInterface rec, ForgeDirection fromDir) { - receptor = rec; - this.fromDir = fromDir; + @Override + public void writeCustomNBT(NBTTagCompound tag) { + if (network.isValid() && network.shouldSave(this)) { + network.writeToNBT(tag); + tag.setInteger("rfCap", network.getMaxEnergyStored()); // for WAILA + } } - } - @Override - public void readCustomNBT(NBTTagCompound tag) { - network.readFromNBT(this, tag); - } - - @Override - public void writeCustomNBT(NBTTagCompound tag) { - if (network.isValid() && network.shouldSave(this)) { - network.writeToNBT(tag); - tag.setInteger("rfCap", network.getMaxEnergyStored()); // for WAILA + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); + writeToNBT(nbt); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbt); } - } - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbt = new NBTTagCompound(); - writeToNBT(nbt); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbt); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readFromNBT(pkt.func_148857_g()); - } - - @Override - public boolean displayPower() { - return true; - } - - public void setNetwork(SolarPanelNetwork network) { - this.network = network; - } - - public boolean isMaster() { - return network.getMaster() == this; - } - - @Override - public void getData(NBTTagCompound tag) { - if (network.isValid()) { - network.getMaster().writeToNBT(tag); + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + readFromNBT(pkt.func_148857_g()); + } + + @Override + public boolean displayPower() { + return true; + } + + public void setNetwork(SolarPanelNetwork network) { + this.network = network; + } + + public boolean isMaster() { + return network.getMaster() == this; + } + + @Override + public void getData(NBTTagCompound tag) { + if (network.isValid()) { + network.getMaster().writeToNBT(tag); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java index 8c0cf980..3d1fdde8 100644 --- a/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java @@ -1,146 +1,144 @@ package crazypants.enderio.machine.soul; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.EntityList; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.xp.XpUtil; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; +import net.minecraft.entity.EntityList; +import net.minecraft.item.ItemStack; public abstract class AbstractSoulBinderRecipe implements IMachineRecipe, ISoulBinderRecipe { - private final int energyRequired; - private final String uid; - private final int xpLevelsRequired; - private final int xpRequired; - - private final List supportedEntities; - - protected AbstractSoulBinderRecipe(int energyRequired, int xpLevelsRequired, String uid, Class entityClass) { - this(energyRequired, xpLevelsRequired, uid, (String)EntityList.classToStringMapping.get(entityClass)); - } - - protected AbstractSoulBinderRecipe(int energyRequired, int xpLevelsRequired, String uid, String... entityNames) { - this.energyRequired = energyRequired; - this.xpLevelsRequired = xpLevelsRequired; - this.xpRequired = XpUtil.getExperienceForLevel(xpLevelsRequired); - this.uid = uid; - this.supportedEntities = Arrays.asList(entityNames); - } + private final int energyRequired; + private final String uid; + private final int xpLevelsRequired; + private final int xpRequired; - @Override - public String getUid() { - return uid; - } - - @Override - public int getExperienceLevelsRequired() { - return xpLevelsRequired; - } + private final List supportedEntities; - @Override - public int getExperienceRequired() { - return xpRequired; - } + protected AbstractSoulBinderRecipe(int energyRequired, int xpLevelsRequired, String uid, Class entityClass) { + this(energyRequired, xpLevelsRequired, uid, (String) EntityList.classToStringMapping.get(entityClass)); + } - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - return getEnergyRequired(); - } + protected AbstractSoulBinderRecipe(int energyRequired, int xpLevelsRequired, String uid, String... entityNames) { + this.energyRequired = energyRequired; + this.xpLevelsRequired = xpLevelsRequired; + this.xpRequired = XpUtil.getExperienceForLevel(xpLevelsRequired); + this.uid = uid; + this.supportedEntities = Arrays.asList(entityNames); + } - @Override - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - return RecipeBonusType.NONE; - } + @Override + public String getUid() { + return uid; + } - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - int validCount = 0; - for(MachineRecipeInput input : inputs) { - if(isValidInput(input)) { - validCount++; - } else { + @Override + public int getExperienceLevelsRequired() { + return xpLevelsRequired; + } + + @Override + public int getExperienceRequired() { + return xpRequired; + } + + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + return getEnergyRequired(); + } + + @Override + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + return RecipeBonusType.NONE; + } + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + int validCount = 0; + for (MachineRecipeInput input : inputs) { + if (isValidInput(input)) { + validCount++; + } else { + return false; + } + } + return validCount == 2; + } + + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + String mobType = null; + for (MachineRecipeInput input : inputs) { + if (input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { + mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); + } + } + if (!getSupportedSouls().contains(mobType)) { + return new ResultStack[0]; + } + ItemStack resultStack = getOutputStack(mobType); + ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); + return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(resultStack)}; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null || input.item == null) { + return false; + } + int slot = input.slotNumber; + ItemStack item = input.item; + if (slot == 0) { + String type = EnderIO.itemSoulVessel.getMobTypeFromStack(item); + return getSupportedSouls().contains(type); + } + if (slot == 1) { + return item.isItemEqual(getInputStack()); + } return false; - } } - return validCount == 2; - } - @Override - public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { - String mobType = null; - for(MachineRecipeInput input : inputs) { - if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { - mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); - } + @Override + public String getMachineName() { + return ModObject.blockSoulBinder.unlocalisedName; } - if(!getSupportedSouls().contains(mobType)) { - return new ResultStack[0]; + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + List result = new ArrayList(inputs.length); + for (MachineRecipeInput input : inputs) { + if (input != null && input.item != null) { + ItemStack resStack = input.item.copy(); + resStack.stackSize = 1; + MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); + result.add(mri); + } + } + return result; } - ItemStack resultStack = getOutputStack(mobType); - ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); - return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(resultStack)}; - } - - @Override - public float getExperienceForOutput(ItemStack output) { - return 0; - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null || input.item == null) { - return false; + protected ItemStack getOutputStack(String mobType) { + return getOutputStack(); } - int slot = input.slotNumber; - ItemStack item = input.item; - if(slot == 0) { - String type = EnderIO.itemSoulVessel.getMobTypeFromStack(item); - return getSupportedSouls().contains(type); - } - if(slot == 1) { - return item.isItemEqual(getInputStack()); + + @Override + public List getSupportedSouls() { + return supportedEntities; } - return false; - } - @Override - public String getMachineName() { - return ModObject.blockSoulBinder.unlocalisedName; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(inputs.length); - for(MachineRecipeInput input : inputs) { - if(input != null && input.item != null) { - ItemStack resStack = input.item.copy(); - resStack.stackSize = 1; - MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); - result.add(mri); - } - } - return result; - } - - protected ItemStack getOutputStack(String mobType) { - return getOutputStack(); - } - - @Override - public List getSupportedSouls() { - return supportedEntities; - } - - @Override - public int getEnergyRequired() { - return energyRequired; - } + @Override + public int getEnergyRequired() { + return energyRequired; + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java index e2803ee6..f9fb9eff 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/BasicSoulBinderRecipe.java @@ -4,23 +4,28 @@ import net.minecraft.item.ItemStack; public class BasicSoulBinderRecipe extends AbstractSoulBinderRecipe { - private ItemStack inputStack; - private ItemStack outputStack; + private ItemStack inputStack; + private ItemStack outputStack; - public BasicSoulBinderRecipe(ItemStack inputStack, ItemStack outputStack, int energyRequired, int xpRequired, String uid, String... entityNames) { - super(energyRequired, xpRequired, uid, entityNames); - this.inputStack = inputStack.copy(); - this.outputStack = outputStack.copy(); - } + public BasicSoulBinderRecipe( + ItemStack inputStack, + ItemStack outputStack, + int energyRequired, + int xpRequired, + String uid, + String... entityNames) { + super(energyRequired, xpRequired, uid, entityNames); + this.inputStack = inputStack.copy(); + this.outputStack = outputStack.copy(); + } - @Override - public ItemStack getInputStack() { - return inputStack.copy(); - } - - @Override - public ItemStack getOutputStack() { - return outputStack.copy(); - } + @Override + public ItemStack getInputStack() { + return inputStack.copy(); + } + @Override + public ItemStack getOutputStack() { + return outputStack.copy(); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java index 4d7adc71..265fb8e1 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java @@ -1,14 +1,5 @@ package crazypants.enderio.machine.soul; -import java.util.Random; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; @@ -16,126 +7,136 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketExperianceContainer; +import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; public class BlockSoulBinder extends AbstractMachineBlock { - - public static int renderId; - - public static BlockSoulBinder create() { - PacketDrainPlayerXP.register(); - PacketExperianceContainer.register(); - BlockSoulBinder result = new BlockSoulBinder(); - result.init(); - return result; - } - IIcon zombieSkullIcon; - IIcon skeletonSkullIcon; - IIcon creeperSkullIcon; - IIcon endermanSkullIcon; - IIcon endermanSkullIconOn; - - protected BlockSoulBinder() { - super(ModObject.blockSoulBinder, TileSoulBinder.class); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSoulBinder) { - return new ContainerSoulBinder(player.inventory, (TileSoulBinder) te); + public static int renderId; + + public static BlockSoulBinder create() { + PacketDrainPlayerXP.register(); + PacketExperianceContainer.register(); + BlockSoulBinder result = new BlockSoulBinder(); + result.init(); + return result; } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSoulBinder) { - return new GuiSoulBinder(player.inventory, (TileSoulBinder) te); + IIcon zombieSkullIcon; + IIcon skeletonSkullIcon; + IIcon creeperSkullIcon; + IIcon endermanSkullIcon; + IIcon endermanSkullIconOn; + + protected BlockSoulBinder() { + super(ModObject.blockSoulBinder, TileSoulBinder.class); } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_SOUL_BINDER; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getLightOpacity() { - return 0; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - zombieSkullIcon = iIconRegister.registerIcon("enderio:skullZombie"); - creeperSkullIcon = iIconRegister.registerIcon("enderio:skullCreeper"); - skeletonSkullIcon = iIconRegister.registerIcon("enderio:skullSkeleton"); - endermanSkullIcon = iIconRegister.registerIcon("enderio:endermanSkullFront"); - endermanSkullIconOn= iIconRegister.registerIcon("enderio:endermanSkullFrontEyes"); - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - return "enderio:blockSoulMachineBlank"; - } - - @Override - protected String getSideIconKey(boolean active) { - return "enderio:blockSoulMachineBlank"; - } - - @Override - protected String getTopIconKey(boolean active) { - return "enderio:blockSoulMachineTop"; - } - - @Override - protected String getBottomIconKey(boolean active) { - return "enderio:blockSoulMachineBottom"; - } - - @Override - public int getRenderType() { - return renderId; - } - - @SideOnly(Side.CLIENT) - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - // If active, randomly throw some smoke around - if(isActive(world, x, y, z)) { - float startX = x + 1.0F; - float startY = y + 1.0F; - float startZ = z + 1.0F; - for (int i = 0; i < 2; i++) { - float xOffset = -0.2F - rand.nextFloat() * 0.6F; - float yOffset = -0.1F + rand.nextFloat() * 0.2F; - float zOffset = -0.2F - rand.nextFloat() * 0.6F; - - EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("spell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); - //EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("instantSpell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); - if(fx != null) { - fx.setRBGColorF(0.2f, 0.2f, 0.8f); - //fx.setRBGColorF(0.1f, 0.4f, 0.1f); - fx.motionY *= 0.5f; + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileSoulBinder) { + return new ContainerSoulBinder(player.inventory, (TileSoulBinder) te); } - - } + return null; } - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileSoulBinder) { + return new GuiSoulBinder(player.inventory, (TileSoulBinder) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_SOUL_BINDER; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getLightOpacity() { + return 0; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + zombieSkullIcon = iIconRegister.registerIcon("enderio:skullZombie"); + creeperSkullIcon = iIconRegister.registerIcon("enderio:skullCreeper"); + skeletonSkullIcon = iIconRegister.registerIcon("enderio:skullSkeleton"); + endermanSkullIcon = iIconRegister.registerIcon("enderio:endermanSkullFront"); + endermanSkullIconOn = iIconRegister.registerIcon("enderio:endermanSkullFrontEyes"); + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return "enderio:blockSoulMachineBlank"; + } + + @Override + protected String getSideIconKey(boolean active) { + return "enderio:blockSoulMachineBlank"; + } + + @Override + protected String getTopIconKey(boolean active) { + return "enderio:blockSoulMachineTop"; + } + + @Override + protected String getBottomIconKey(boolean active) { + return "enderio:blockSoulMachineBottom"; + } + + @Override + public int getRenderType() { + return renderId; + } + + @SideOnly(Side.CLIENT) + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // If active, randomly throw some smoke around + if (isActive(world, x, y, z)) { + float startX = x + 1.0F; + float startY = y + 1.0F; + float startZ = z + 1.0F; + for (int i = 0; i < 2; i++) { + float xOffset = -0.2F - rand.nextFloat() * 0.6F; + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = -0.2F - rand.nextFloat() * 0.6F; + + EntityFX fx = Minecraft.getMinecraft() + .renderGlobal + .doSpawnParticle( + "spell", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + // EntityFX fx = Minecraft.getMinecraft().renderGlobal.doSpawnParticle("instantSpell", startX + xOffset, + // startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + if (fx != null) { + fx.setRBGColorF(0.2f, 0.2f, 0.8f); + // fx.setRBGColorF(0.1f, 0.4f, 0.1f); + fx.motionY *= 0.5f; + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java index b4402e5e..337c5747 100644 --- a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java @@ -1,54 +1,50 @@ package crazypants.enderio.machine.soul; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import java.util.List; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; +public class ContainerSoulBinder extends AbstractMachineContainer { -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.gui.AbstractMachineContainer; + public ContainerSoulBinder(InventoryPlayer playerInv, TileSoulBinder te) { + super(playerInv, te); + } -public class ContainerSoulBinder extends AbstractMachineContainer { - - public ContainerSoulBinder(InventoryPlayer playerInv, TileSoulBinder te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 38, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 59, 34) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 2, 112, 34) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - addSlotToContainer(new Slot(getInv(), 3, 134, 34) { - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - return false; - } - }); - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, 38, 34)); - slots.add(new GhostBackgroundItemSlot(EnderIO.itemBrokenSpawner, 59, 34)); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 38, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 59, 34) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 2, 112, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + addSlotToContainer(new Slot(getInv(), 3, 134, 34) { + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + return false; + } + }); + } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, 38, 34)); + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBrokenSpawner, 59, 34)); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index 12f70bd4..589910da 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -1,85 +1,85 @@ package crazypants.enderio.machine.soul; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.SoundUtil; - import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.enchanter.ContainerEnchanter; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.XpUtil; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiSoulBinder extends GuiPoweredMachineBase { - private static final int PLAYER_XP_ID = 985162394; - - private final IconButton usePlayerXP; + private static final int PLAYER_XP_ID = 985162394; - public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, TileSoulBinder te) { - super(te, new ContainerSoulBinder(par1InventoryPlayer, te), "soulFuser"); - usePlayerXP = new IconButton(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); - usePlayerXP.visible = false; - usePlayerXP.setToolTip("Use Player XP"); + private final IconButton usePlayerXP; - addProgressTooltip(80, 34, 24, 16); - } + public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, TileSoulBinder te) { + super(te, new ContainerSoulBinder(par1InventoryPlayer, te), "soulFuser"); + usePlayerXP = new IconButton(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); + usePlayerXP.visible = false; + usePlayerXP.setToolTip("Use Player XP"); - @Override - public void initGui() { - super.initGui(); - usePlayerXP.onGuiInit(); - ((ContainerSoulBinder) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == PLAYER_XP_ID) { - int xp = XpUtil.getPlayerXP(Minecraft.getMinecraft().thePlayer); - if(xp > 0 || Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) { - PacketHandler.INSTANCE.sendToServer(new PacketDrainPlayerXP(getTileEntity(), getTileEntity().getCurrentlyRequiredLevel(), true)); - SoundUtil.playClientSoundFX("random.orb", getTileEntity()); - } - } - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int k = guiLeft; - int l = guiTop; - - drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - int i1; - - TileSoulBinder binder = getTileEntity(); - - if(shouldRenderProgress()) { - i1 = getProgressScaled(24); - drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + addProgressTooltip(80, 34, 24, 16); } - usePlayerXP.visible = binder.needsXP(); + @Override + public void initGui() { + super.initGui(); + usePlayerXP.onGuiInit(); + ((ContainerSoulBinder) inventorySlots).createGhostSlots(getGhostSlots()); + } - ExperienceBarRenderer.render(this, getGuiLeft() + 56, getGuiTop() + 68, 65, binder.getContainer(), binder.getCurrentlyRequiredLevel()); - - bindGuiTexture(); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - } + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if (b.id == PLAYER_XP_ID) { + int xp = XpUtil.getPlayerXP(Minecraft.getMinecraft().thePlayer); + if (xp > 0 || Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) { + PacketHandler.INSTANCE.sendToServer( + new PacketDrainPlayerXP(getTileEntity(), getTileEntity().getCurrentlyRequiredLevel(), true)); + SoundUtil.playClientSoundFX("random.orb", getTileEntity()); + } + } + } + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int k = guiLeft; + int l = guiTop; + + drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + int i1; + + TileSoulBinder binder = getTileEntity(); + + if (shouldRenderProgress()) { + i1 = getProgressScaled(24); + drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + } + + usePlayerXP.visible = binder.needsXP(); + + ExperienceBarRenderer.render( + this, + getGuiLeft() + 56, + getGuiTop() + 68, + 65, + binder.getContainer(), + binder.getCurrentlyRequiredLevel()); + + bindGuiTexture(); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/ISoulBinderRecipe.java b/src/main/java/crazypants/enderio/machine/soul/ISoulBinderRecipe.java index 659e65db..f2e5ebb9 100644 --- a/src/main/java/crazypants/enderio/machine/soul/ISoulBinderRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/ISoulBinderRecipe.java @@ -1,20 +1,19 @@ package crazypants.enderio.machine.soul; import java.util.List; - import net.minecraft.item.ItemStack; public interface ISoulBinderRecipe { - ItemStack getInputStack(); - - ItemStack getOutputStack(); - - List getSupportedSouls(); - - int getEnergyRequired(); - - int getExperienceLevelsRequired(); + ItemStack getInputStack(); - int getExperienceRequired(); + ItemStack getOutputStack(); + + List getSupportedSouls(); + + int getEnergyRequired(); + + int getExperienceLevelsRequired(); + + int getExperienceRequired(); } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java index 4844e5b6..2873eae0 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderAttractorCystalRecipe.java @@ -1,28 +1,31 @@ package crazypants.enderio.machine.soul; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.Material; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class SoulBinderAttractorCystalRecipe extends AbstractSoulBinderRecipe { - public static SoulBinderAttractorCystalRecipe instance = new SoulBinderAttractorCystalRecipe(); + public static SoulBinderAttractorCystalRecipe instance = new SoulBinderAttractorCystalRecipe(); - private SoulBinderAttractorCystalRecipe() { - super(Config.soulBinderAttractorCystalRF, Config.soulBinderAttractorCystalLevels, "SoulBinderAttractorCystalRecipe", EntityVillager.class); - } + private SoulBinderAttractorCystalRecipe() { + super( + Config.soulBinderAttractorCystalRF, + Config.soulBinderAttractorCystalLevels, + "SoulBinderAttractorCystalRecipe", + EntityVillager.class); + } - @Override - public ItemStack getInputStack() { - return new ItemStack(Items.emerald); - } - - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); - } + @Override + public ItemStack getInputStack() { + return new ItemStack(Items.emerald); + } + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java index 9f73198c..0849059a 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java @@ -1,26 +1,30 @@ package crazypants.enderio.machine.soul; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.Material; +import net.minecraft.item.ItemStack; public class SoulBinderEnderCystalRecipe extends AbstractSoulBinderRecipe { - public static SoulBinderEnderCystalRecipe instance = new SoulBinderEnderCystalRecipe(); + public static SoulBinderEnderCystalRecipe instance = new SoulBinderEnderCystalRecipe(); - private SoulBinderEnderCystalRecipe() { - super(Config.soulBinderEnderCystalRF,Config.soulBinderEnderCystalLevels, "SoulBinderEnderCystalRecipe", "SpecialMobs.SpecialEnderman", "Enderman"); - } + private SoulBinderEnderCystalRecipe() { + super( + Config.soulBinderEnderCystalRF, + Config.soulBinderEnderCystalLevels, + "SoulBinderEnderCystalRecipe", + "SpecialMobs.SpecialEnderman", + "Enderman"); + } - @Override - public ItemStack getInputStack() { - return new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); - } - - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); - } + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + } + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java index 4a0f6d88..8fb165b9 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderPrecientCystalRecipe.java @@ -1,26 +1,30 @@ package crazypants.enderio.machine.soul; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.Material; +import net.minecraft.item.ItemStack; public class SoulBinderPrecientCystalRecipe extends AbstractSoulBinderRecipe { - public static SoulBinderPrecientCystalRecipe instance = new SoulBinderPrecientCystalRecipe(); + public static SoulBinderPrecientCystalRecipe instance = new SoulBinderPrecientCystalRecipe(); - private SoulBinderPrecientCystalRecipe() { - super(Config.soulBinderPrecientCystalRF, Config.soulBinderPrecientCystalLevels, "SoulBinderPrecientCystalRecipe", "SpecialMobs.SpecialEnderman", "Enderman"); - } + private SoulBinderPrecientCystalRecipe() { + super( + Config.soulBinderPrecientCystalRF, + Config.soulBinderPrecientCystalLevels, + "SoulBinderPrecientCystalRecipe", + "SpecialMobs.SpecialEnderman", + "Enderman"); + } - @Override - public ItemStack getInputStack() { - return new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); - } - - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemMaterial, 1, Material.PRECIENT_CRYSTAL.ordinal()); - } + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + } + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.PRECIENT_CRYSTAL.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java index 349cb1b9..0d9d066f 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java @@ -1,26 +1,30 @@ package crazypants.enderio.machine.soul; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.FrankenSkull; +import net.minecraft.item.ItemStack; public class SoulBinderReanimationRecipe extends AbstractSoulBinderRecipe { - public static SoulBinderReanimationRecipe instance = new SoulBinderReanimationRecipe(); + public static SoulBinderReanimationRecipe instance = new SoulBinderReanimationRecipe(); - private SoulBinderReanimationRecipe() { - super(Config.soulBinderReanimationRF, Config.soulBinderReanimationLevels, "SoulBinderReanimationRecipe", "Zombie", "SpecialMobs.SpecialZombie"); - } + private SoulBinderReanimationRecipe() { + super( + Config.soulBinderReanimationRF, + Config.soulBinderReanimationLevels, + "SoulBinderReanimationRecipe", + "Zombie", + "SpecialMobs.SpecialZombie"); + } - @Override - public ItemStack getInputStack() { - return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); - } + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); + } - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); - } - + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java index 08238927..9aaba579 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRecipeManager.java @@ -1,142 +1,168 @@ package crazypants.enderio.machine.soul; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.MachineRecipeRegistry; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class SoulBinderRecipeManager { - private static final SoulBinderRecipeManager instance = new SoulBinderRecipeManager(); + private static final SoulBinderRecipeManager instance = new SoulBinderRecipeManager(); - public static final String KEY_RECIPE_UID = "recipeUID"; - public static final String KEY_INPUT_STACK = "inputStack"; - public static final String KEY_OUTPUT_STACK = "outputStack"; - public static final String KEY_REQUIRED_ENERGY = "requiredEnergyRF"; - public static final String KEY_REQUIRED_XP = "requiredXP"; - public static final String KEY_SOUL_TYPES = "entityTypes"; + public static final String KEY_RECIPE_UID = "recipeUID"; + public static final String KEY_INPUT_STACK = "inputStack"; + public static final String KEY_OUTPUT_STACK = "outputStack"; + public static final String KEY_REQUIRED_ENERGY = "requiredEnergyRF"; + public static final String KEY_REQUIRED_XP = "requiredXP"; + public static final String KEY_SOUL_TYPES = "entityTypes"; - public static SoulBinderRecipeManager getInstance() { - return instance; - } - - public void addDefaultRecipes() { - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderPrecientCystalRecipe.instance); - - //Ender Rail - if(Config.transceiverEnabled && Config.enderRailEnabled) { - BasicSoulBinderRecipe err = new BasicSoulBinderRecipe(new ItemStack(Blocks.detector_rail), new ItemStack(EnderIO.blockEnderRail), - Config.soulBinderEnderRailRF, Config.soulBinderEnderRailLevels, "EnderRail", "SpecialMobs.SpecialEnderman", "Enderman"); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, err); + public static SoulBinderRecipeManager getInstance() { + return instance; } - } - // Example of how to add a recipe: - // - // NBTTagCompound root = new NBTTagCompound(); - // root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); - // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); - // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_XP, 7); - // root.setString(SoulBinderRecipeManager.KEY_SOUL_TYPES, "Zombie|SpecialMobs.SpecialZombie|Villager"); - // ItemStack is = new ItemStack(Items.diamond); - // NBTTagCompound stackRoot = new NBTTagCompound(); - // is.writeToNBT(stackRoot); - // root.setTag(SoulBinderRecipeManager.KEY_INPUT_STACK, stackRoot); - // is = new ItemStack(Blocks.planks); - // stackRoot = new NBTTagCompound(); - // is.writeToNBT(stackRoot); - // root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - // - // SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); - // FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); + public void addDefaultRecipes() { + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderSentientRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderAttractorCystalRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockSoulBinder.unlocalisedName, SoulBinderPrecientCystalRecipe.instance); - //@formatter:off - /** - * Example of how to add a recipe: - * - * NBTTagCompound root = new NBTTagCompound(); - * root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); - * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); - * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_XP, 7); - * root.setString(SoulBinderRecipeManager.KEY_SOUL_TYPES, "Zombie|SpecialMobs.SpecialZombie|Villager"); - * ItemStack is = new ItemStack(Items.diamond); - * NBTTagCompound stackRoot = new NBTTagCompound(); - * is.writeToNBT(stackRoot); - * root.setTag(SoulBinderRecipeManager.KEY_INPUT_STACK, stackRoot); - * is = new ItemStack(Blocks.planks); - * stackRoot = new NBTTagCompound(); - * is.writeToNBT(stackRoot); - * root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); - * - * SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); - * FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); - * - * @param root - * @return - */ - //@formatter:on - public boolean addRecipeFromNBT(NBTTagCompound root) { - try { - String recipeUid = root.getString(KEY_RECIPE_UID); - if(recipeUid == null || recipeUid.trim().length() == 0) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as recipe UID not set: " + root); - return false; - } - ItemStack inputStack = getStackFromRoot(root, KEY_INPUT_STACK); - if(inputStack == null) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no input stack defined: " + root); - return false; - } - ItemStack outputStack = getStackFromRoot(root, KEY_OUTPUT_STACK); - if(outputStack == null) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no output stack defined: " + root); - return false; - } - - int energyRequired = root.getInteger(KEY_REQUIRED_ENERGY); - if(energyRequired <= 0) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as energy required was <= 0: " + root); - return false; - } - int xpLevelsRequired = root.getInteger(KEY_REQUIRED_XP); - if(xpLevelsRequired <= 0) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as energy required was <= 0: " + root); - return false; - } - - String str = root.getString(KEY_SOUL_TYPES); - if(str == null || str.trim().length() == 0) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no soul types defined: " + root); - return false; - } - String[] entityNames = str.split("\\|"); - - BasicSoulBinderRecipe recipe = new BasicSoulBinderRecipe(inputStack, outputStack, energyRequired, xpLevelsRequired, recipeUid, entityNames); - - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, recipe); - - return true; - } catch (Exception e) { - Log.error("SoulBinderRecipeManager: Could not add custom soul binder exception thrown when parsing message: " + e); - return false; + // Ender Rail + if (Config.transceiverEnabled && Config.enderRailEnabled) { + BasicSoulBinderRecipe err = new BasicSoulBinderRecipe( + new ItemStack(Blocks.detector_rail), + new ItemStack(EnderIO.blockEnderRail), + Config.soulBinderEnderRailRF, + Config.soulBinderEnderRailLevels, + "EnderRail", + "SpecialMobs.SpecialEnderman", + "Enderman"); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, err); + } } - } - private ItemStack getStackFromRoot(NBTTagCompound root, String string) { - NBTTagCompound stackRoot = root.getCompoundTag(string); - if(stackRoot == null) { - return null; + // Example of how to add a recipe: + // + // NBTTagCompound root = new NBTTagCompound(); + // root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); + // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); + // root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_XP, 7); + // root.setString(SoulBinderRecipeManager.KEY_SOUL_TYPES, "Zombie|SpecialMobs.SpecialZombie|Villager"); + // ItemStack is = new ItemStack(Items.diamond); + // NBTTagCompound stackRoot = new NBTTagCompound(); + // is.writeToNBT(stackRoot); + // root.setTag(SoulBinderRecipeManager.KEY_INPUT_STACK, stackRoot); + // is = new ItemStack(Blocks.planks); + // stackRoot = new NBTTagCompound(); + // is.writeToNBT(stackRoot); + // root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); + // + // SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); + // FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); + + // @formatter:off + /** + * Example of how to add a recipe: + * + * NBTTagCompound root = new NBTTagCompound(); + * root.setString(SoulBinderRecipeManager.KEY_RECIPE_UID, "diamondToWood"); + * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_ENERGY, 50000); + * root.setInteger(SoulBinderRecipeManager.KEY_REQUIRED_XP, 7); + * root.setString(SoulBinderRecipeManager.KEY_SOUL_TYPES, "Zombie|SpecialMobs.SpecialZombie|Villager"); + * ItemStack is = new ItemStack(Items.diamond); + * NBTTagCompound stackRoot = new NBTTagCompound(); + * is.writeToNBT(stackRoot); + * root.setTag(SoulBinderRecipeManager.KEY_INPUT_STACK, stackRoot); + * is = new ItemStack(Blocks.planks); + * stackRoot = new NBTTagCompound(); + * is.writeToNBT(stackRoot); + * root.setTag(SoulBinderRecipeManager.KEY_OUTPUT_STACK, stackRoot); + * + * SoulBinderRecipeManager.getInstance().addRecipeFromNBT(root); + * FMLInterModComms.sendMessage("EnderIO", "recipe:soulbinder", root); + * + * @param root + * @return + */ + // @formatter:on + public boolean addRecipeFromNBT(NBTTagCompound root) { + try { + String recipeUid = root.getString(KEY_RECIPE_UID); + if (recipeUid == null || recipeUid.trim().length() == 0) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as recipe UID not set: " + + root); + return false; + } + ItemStack inputStack = getStackFromRoot(root, KEY_INPUT_STACK); + if (inputStack == null) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no input stack defined: " + + root); + return false; + } + ItemStack outputStack = getStackFromRoot(root, KEY_OUTPUT_STACK); + if (outputStack == null) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no output stack defined: " + + root); + return false; + } + + int energyRequired = root.getInteger(KEY_REQUIRED_ENERGY); + if (energyRequired <= 0) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as energy required was <= 0: " + + root); + return false; + } + int xpLevelsRequired = root.getInteger(KEY_REQUIRED_XP); + if (xpLevelsRequired <= 0) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as energy required was <= 0: " + + root); + return false; + } + + String str = root.getString(KEY_SOUL_TYPES); + if (str == null || str.trim().length() == 0) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder recipe from IMC as no soul types defined: " + + root); + return false; + } + String[] entityNames = str.split("\\|"); + + BasicSoulBinderRecipe recipe = new BasicSoulBinderRecipe( + inputStack, outputStack, energyRequired, xpLevelsRequired, recipeUid, entityNames); + + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, recipe); + + return true; + } catch (Exception e) { + Log.error( + "SoulBinderRecipeManager: Could not add custom soul binder exception thrown when parsing message: " + + e); + return false; + } } - return ItemStack.loadItemStackFromNBT(stackRoot); - } + private ItemStack getStackFromRoot(NBTTagCompound root, String string) { + NBTTagCompound stackRoot = root.getCompoundTag(string); + if (stackRoot == null) { + return null; + } + return ItemStack.loadItemStackFromNBT(stackRoot); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index 36e4c88e..1644b9b3 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java @@ -1,5 +1,12 @@ package crazypants.enderio.machine.soul; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -7,113 +14,105 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.ForgeDirectionOffsets; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.ClientProxy; -import crazypants.enderio.EnderIO; - public class SoulBinderRenderer implements ISimpleBlockRenderingHandler { - private float skullScale = 0.5f; - private BoundingBox scaledBB = BoundingBox.UNIT_CUBE.scale(skullScale, skullScale, skullScale); - private IIcon[] icons = new IIcon[6]; - private IIcon override = null; - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + private float skullScale = 0.5f; + private BoundingBox scaledBB = BoundingBox.UNIT_CUBE.scale(skullScale, skullScale, skullScale); + private IIcon[] icons = new IIcon[6]; + private IIcon override = null; - GL11.glDisable(GL11.GL_LIGHTING); - Tessellator.instance.startDrawingQuads(); - renderWorldBlock(null, 0, 0, 0, block, 0, renderer); - Tessellator.instance.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - } + @Override + 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) { - - IIcon soulariumIcon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0); - override = renderer.overrideBlockTexture; - - //Horrible hack to get the MC lighting engine to set the correct values for me - if(renderer != null && world != null) { - renderer.setOverrideBlockTexture(IconUtil.blankTexture); - renderer.renderStandardBlock(Blocks.stone, x, y, z); - renderer.setOverrideBlockTexture(null); - } - BoundingBox bb; - - Tessellator.instance.addTranslation(x, y, z); - - bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.85, 0.85); - setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH); - CubeRenderer.render(bb, icons, true); - - float slabWidth = 0.15f; - bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); - bb = bb.translate(0, 0.5f - (slabWidth / 2), 0); - setIcons(soulariumIcon, EnderIO.blockSoulFuser.getIcon(ForgeDirection.UP.ordinal(), 0), ForgeDirection.UP); - CubeRenderer.render(bb, icons, true); - - bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); - bb = bb.translate(0, -0.5f + (slabWidth / 2), 0); - setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH); - - CubeRenderer.render(bb, icons, true); - - IIcon endermanIcon; - int facing = ForgeDirection.SOUTH.ordinal(); - - if(world == null || !(world.getTileEntity(x, y, z) instanceof TileSoulBinder)) { - endermanIcon = EnderIO.blockSoulFuser.endermanSkullIcon; - } else { - TileSoulBinder sb = (TileSoulBinder) world.getTileEntity(x, y, z); - facing = sb.facing; - endermanIcon = sb.isActive() ? EnderIO.blockSoulFuser.endermanSkullIconOn : EnderIO.blockSoulFuser.endermanSkullIcon; + GL11.glDisable(GL11.GL_LIGHTING); + Tessellator.instance.startDrawingQuads(); + renderWorldBlock(null, 0, 0, 0, block, 0, renderer); + Tessellator.instance.draw(); + GL11.glEnable(GL11.GL_LIGHTING); } - renderSkull(forFacing(ForgeDirection.SOUTH, facing), soulariumIcon, endermanIcon); - renderSkull(forFacing(ForgeDirection.WEST, facing), soulariumIcon, EnderIO.blockSoulFuser.skeletonSkullIcon); - renderSkull(forFacing(ForgeDirection.NORTH, facing), soulariumIcon, EnderIO.blockSoulFuser.zombieSkullIcon); - renderSkull(forFacing(ForgeDirection.EAST, facing), soulariumIcon, EnderIO.blockSoulFuser.creeperSkullIcon); + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - Tessellator.instance.addTranslation(-x, -y, -z); + IIcon soulariumIcon = EnderIO.blockSoulFuser.getIcon(ForgeDirection.EAST.ordinal(), 0); + override = renderer.overrideBlockTexture; - return true; - } + // Horrible hack to get the MC lighting engine to set the correct values for me + if (renderer != null && world != null) { + renderer.setOverrideBlockTexture(IconUtil.blankTexture); + renderer.renderStandardBlock(Blocks.stone, x, y, z); + renderer.setOverrideBlockTexture(null); + } + BoundingBox bb; - private ForgeDirection forFacing(ForgeDirection side, int facing) { - return ForgeDirection.values()[ClientProxy.sideAndFacingToSpriteOffset[side.ordinal()][facing]]; - } + Tessellator.instance.addTranslation(x, y, z); - private void renderSkull(ForgeDirection face, IIcon soulariumIcon, IIcon faceIcon) { - BoundingBox bb; - bb = scaledBB.translate(ForgeDirectionOffsets.offsetScaled(face, 0.5 - skullScale / 2)); - setIcons(soulariumIcon, faceIcon, face); - CubeRenderer.render(bb, icons, true); - } + bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.85, 0.85); + setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH); + CubeRenderer.render(bb, icons, true); - private void setIcons(IIcon defaultIcon, IIcon faceIcon, ForgeDirection faceSide) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - icons[dir.ordinal()] = override != null ? override : dir == faceSide ? faceIcon : defaultIcon; + float slabWidth = 0.15f; + bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); + bb = bb.translate(0, 0.5f - (slabWidth / 2), 0); + setIcons(soulariumIcon, EnderIO.blockSoulFuser.getIcon(ForgeDirection.UP.ordinal(), 0), ForgeDirection.UP); + CubeRenderer.render(bb, icons, true); + + bb = BoundingBox.UNIT_CUBE.scale(1, slabWidth, 1); + bb = bb.translate(0, -0.5f + (slabWidth / 2), 0); + setIcons(soulariumIcon, soulariumIcon, ForgeDirection.NORTH); + + CubeRenderer.render(bb, icons, true); + + IIcon endermanIcon; + int facing = ForgeDirection.SOUTH.ordinal(); + + if (world == null || !(world.getTileEntity(x, y, z) instanceof TileSoulBinder)) { + endermanIcon = EnderIO.blockSoulFuser.endermanSkullIcon; + } else { + TileSoulBinder sb = (TileSoulBinder) world.getTileEntity(x, y, z); + facing = sb.facing; + endermanIcon = sb.isActive() + ? EnderIO.blockSoulFuser.endermanSkullIconOn + : EnderIO.blockSoulFuser.endermanSkullIcon; + } + + renderSkull(forFacing(ForgeDirection.SOUTH, facing), soulariumIcon, endermanIcon); + renderSkull(forFacing(ForgeDirection.WEST, facing), soulariumIcon, EnderIO.blockSoulFuser.skeletonSkullIcon); + renderSkull(forFacing(ForgeDirection.NORTH, facing), soulariumIcon, EnderIO.blockSoulFuser.zombieSkullIcon); + renderSkull(forFacing(ForgeDirection.EAST, facing), soulariumIcon, EnderIO.blockSoulFuser.creeperSkullIcon); + + Tessellator.instance.addTranslation(-x, -y, -z); + + return true; } - } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + private ForgeDirection forFacing(ForgeDirection side, int facing) { + return ForgeDirection.values()[ClientProxy.sideAndFacingToSpriteOffset[side.ordinal()][facing]]; + } - @Override - public int getRenderId() { - return BlockSoulBinder.renderId; - } + private void renderSkull(ForgeDirection face, IIcon soulariumIcon, IIcon faceIcon) { + BoundingBox bb; + bb = scaledBB.translate(ForgeDirectionOffsets.offsetScaled(face, 0.5 - skullScale / 2)); + setIcons(soulariumIcon, faceIcon, face); + CubeRenderer.render(bb, icons, true); + } + private void setIcons(IIcon defaultIcon, IIcon faceIcon, ForgeDirection faceSide) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + icons[dir.ordinal()] = override != null ? override : dir == faceSide ? faceIcon : defaultIcon; + } + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockSoulBinder.renderId; + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java index 5a850ca8..041705e3 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSentientRecipe.java @@ -1,26 +1,30 @@ package crazypants.enderio.machine.soul; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.FrankenSkull; +import net.minecraft.item.ItemStack; public class SoulBinderSentientRecipe extends AbstractSoulBinderRecipe { - public static SoulBinderSentientRecipe instance = new SoulBinderSentientRecipe(); + public static SoulBinderSentientRecipe instance = new SoulBinderSentientRecipe(); - private SoulBinderSentientRecipe() { - super(Config.soulBinderReanimationRF, Config.soulBinderReanimationLevels, "SoulBinderSentientRecipe", "Witch", "enderzoo.WitherWitch"); - } + private SoulBinderSentientRecipe() { + super( + Config.soulBinderReanimationRF, + Config.soulBinderReanimationLevels, + "SoulBinderSentientRecipe", + "Witch", + "enderzoo.WitherWitch"); + } - @Override - public ItemStack getInputStack() { - return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); - } + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); + } - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); - } - + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SENTIENT_ENDER.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index 13d6b21c..a5c2d35e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -1,12 +1,6 @@ package crazypants.enderio.machine.soul; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; - import com.enderio.core.common.util.EntityUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -15,141 +9,142 @@ import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.spawner.PoweredSpawnerConfig; import crazypants.enderio.xp.XpUtil; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; public class SoulBinderSpawnerRecipe implements IMachineRecipe, ISoulBinderRecipe { - public static SoulBinderSpawnerRecipe instance = new SoulBinderSpawnerRecipe(); + public static SoulBinderSpawnerRecipe instance = new SoulBinderSpawnerRecipe(); - private final int xpLevelsRequired; - private final int xpRequired; + private final int xpLevelsRequired; + private final int xpRequired; - public SoulBinderSpawnerRecipe() { - xpLevelsRequired = Config.soulBinderBrokenSpawnerLevels; - xpRequired = XpUtil.getExperienceForLevel(xpLevelsRequired); - } + public SoulBinderSpawnerRecipe() { + xpLevelsRequired = Config.soulBinderBrokenSpawnerLevels; + xpRequired = XpUtil.getExperienceForLevel(xpLevelsRequired); + } - @Override - public String getUid() { - return "SoulFuserSpawnerRecipe"; - } + @Override + public String getUid() { + return "SoulFuserSpawnerRecipe"; + } - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - return Config.soulBinderBrokenSpawnerRF; - } + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + return Config.soulBinderBrokenSpawnerRF; + } - @Override - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - return RecipeBonusType.NONE; - } + @Override + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + return RecipeBonusType.NONE; + } - @Override - public int getExperienceLevelsRequired() { - return xpLevelsRequired; - } + @Override + public int getExperienceLevelsRequired() { + return xpLevelsRequired; + } - @Override - public int getExperienceRequired() { - return xpRequired; - } + @Override + public int getExperienceRequired() { + return xpRequired; + } - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - int validCount = 0; - for(MachineRecipeInput input : inputs) { - if(isValidInput(input)) { - validCount++; - } else { + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + int validCount = 0; + for (MachineRecipeInput input : inputs) { + if (isValidInput(input)) { + validCount++; + } else { + return false; + } + } + return validCount == 2; + } + + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + String mobType = null; + for (MachineRecipeInput input : inputs) { + if (input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { + mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); + } + } + if (mobType == null) { + return new ResultStack[0]; + } + ItemStack spawner = EnderIO.itemBrokenSpawner.createStackForMobType(mobType); + if (spawner == null) { + return new ResultStack[0]; + } + ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); + return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(spawner)}; + } + + @Override + public float getExperienceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null || input.item == null) { + return false; + } + int slot = input.slotNumber; + ItemStack item = input.item; + if (slot == 0) { + String mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(item); + return mobType != null && !EnderIO.blockPoweredSpawner.isBlackListed(mobType); + } + if (slot == 1) { + return item.getItem() == EnderIO.itemBrokenSpawner; + } return false; - } } - return validCount == 2; - } - @Override - public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { - String mobType = null; - for(MachineRecipeInput input : inputs) { - if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { - mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); - } + private boolean isBlackListed(String entityId) { + return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); } - if(mobType == null) { - return new ResultStack[0]; + + @Override + public String getMachineName() { + return ModObject.blockSoulBinder.unlocalisedName; } - ItemStack spawner = EnderIO.itemBrokenSpawner.createStackForMobType(mobType); - if(spawner == null) { - return new ResultStack[0]; + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + List result = new ArrayList(inputs.length); + for (MachineRecipeInput input : inputs) { + if (input != null && input.item != null) { + ItemStack resStack = input.item.copy(); + resStack.stackSize = 1; + MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); + result.add(mri); + } + } + return result; } - ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); - return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(spawner)}; - } - @Override - public float getExperienceForOutput(ItemStack output) { - return 0; - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null || input.item == null) { - return false; + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemBrokenSpawner); } - int slot = input.slotNumber; - ItemStack item = input.item; - if(slot == 0) { - String mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(item); - return mobType != null && !EnderIO.blockPoweredSpawner.isBlackListed(mobType); - } - if(slot == 1) { - return item.getItem() == EnderIO.itemBrokenSpawner; + + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemBrokenSpawner); } - return false; - } - private boolean isBlackListed(String entityId) { - return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); - } - - @Override - public String getMachineName() { - return ModObject.blockSoulBinder.unlocalisedName; - } + @Override + public List getSupportedSouls() { + List res = EntityUtil.getAllRegisteredMobNames(!Config.soulVesselCapturesBosses); + return res; + } - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(inputs.length); - for(MachineRecipeInput input : inputs) { - if(input != null && input.item != null) { - ItemStack resStack = input.item.copy(); - resStack.stackSize = 1; - MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); - result.add(mri); - } - } - return result; - } - - @Override - public ItemStack getInputStack() { - return new ItemStack(EnderIO.itemBrokenSpawner); - } - - @Override - public ItemStack getOutputStack() { - return new ItemStack(EnderIO.itemBrokenSpawner); - } - - @Override - public List getSupportedSouls() { - List res = EntityUtil.getAllRegisteredMobNames(!Config.soulVesselCapturesBosses); - return res; - } - - @Override - public int getEnergyRequired() { - return Config.soulBinderBrokenSpawnerRF; - } - - + @Override + public int getEnergyRequired() { + return Config.soulBinderBrokenSpawnerRF; + } } diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index cc14957b..2d591db5 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -1,19 +1,7 @@ package crazypants.enderio.machine.soul; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - import com.enderio.core.api.common.util.ITankAccess; import com.enderio.core.common.util.FluidUtil; - import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -28,309 +16,342 @@ import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; import crazypants.enderio.xp.XpUtil; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess { - public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0,POWER_PER_TICK_ONE * 2, - Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); + public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF; + private static final BasicCapacitor CAP_ONE = new BasicCapacitor( + 0, POWER_PER_TICK_ONE * 2, Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); - public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,POWER_PER_TICK_TWO * 2, - Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO); + public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; + private static final BasicCapacitor CAP_TWO = new BasicCapacitor( + 0, + POWER_PER_TICK_TWO * 2, + Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_TWO); - public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2, - Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); + public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF; + private static final BasicCapacitor CAP_THREE = new BasicCapacitor( + 0, + POWER_PER_TICK_THREE * 2, + Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_THREE); - public static final int POWER_PER_TICK_FOUR = Config.soulBinderLevelFourPowerPerTickRF; - private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(0,POWER_PER_TICK_FOUR * 2, - Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FOUR); + public static final int POWER_PER_TICK_FOUR = Config.soulBinderLevelFourPowerPerTickRF; + private static final BasicCapacitor CAP_FOUR = new BasicCapacitor( + 0, + POWER_PER_TICK_FOUR * 2, + Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_FOUR); - public static final int POWER_PER_TICK_FIVE = Config.soulBinderLevelFivePowerPerTickRF; - private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(0,POWER_PER_TICK_FIVE * 2, - Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_FIVE); + public static final int POWER_PER_TICK_FIVE = Config.soulBinderLevelFivePowerPerTickRF; + private static final BasicCapacitor CAP_FIVE = new BasicCapacitor( + 0, + POWER_PER_TICK_FIVE * 2, + Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_FIVE); - public static final int POWER_PER_TICK_SIX = Config.soulBinderLevelSixPowerPerTickRF; - private static final BasicCapacitor CAP_SIX = new BasicCapacitor(0,POWER_PER_TICK_SIX * 2, - Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SIX); + public static final int POWER_PER_TICK_SIX = Config.soulBinderLevelSixPowerPerTickRF; + private static final BasicCapacitor CAP_SIX = new BasicCapacitor( + 0, POWER_PER_TICK_SIX * 2, Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SIX); - public static final int POWER_PER_TICK_SEVEN = Config.soulBinderLevelSevenPowerPerTickRF; - private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(0,POWER_PER_TICK_SEVEN * 2, - Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_SEVEN); + public static final int POWER_PER_TICK_SEVEN = Config.soulBinderLevelSevenPowerPerTickRF; + private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor( + 0, + POWER_PER_TICK_SEVEN * 2, + Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_SEVEN); - public static final int POWER_PER_TICK_EIGHT = Config.soulBinderLevelEightPowerPerTickRF; - private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(0,POWER_PER_TICK_EIGHT * 2, - Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_EIGHT); + public static final int POWER_PER_TICK_EIGHT = Config.soulBinderLevelEightPowerPerTickRF; + private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor( + 0, + POWER_PER_TICK_EIGHT * 2, + Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_EIGHT); - public static final int POWER_PER_TICK_NINE = Config.soulBinderLevelNinePowerPerTickRF; - private static final BasicCapacitor CAP_NINE = new BasicCapacitor(0,POWER_PER_TICK_NINE * 2, - Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_NINE); + public static final int POWER_PER_TICK_NINE = Config.soulBinderLevelNinePowerPerTickRF; + private static final BasicCapacitor CAP_NINE = new BasicCapacitor( + 0, + POWER_PER_TICK_NINE * 2, + Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_NINE); - public static final int POWER_PER_TICK_TEN = Config.soulBinderLevelTenPowerPerTickRF; - private static final BasicCapacitor CAP_TEN = new BasicCapacitor(0,POWER_PER_TICK_TEN * 2, - Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TEN); + public static final int POWER_PER_TICK_TEN = Config.soulBinderLevelTenPowerPerTickRF; + private static final BasicCapacitor CAP_TEN = new BasicCapacitor( + 0, + POWER_PER_TICK_TEN * 2, + Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored(), + POWER_PER_TICK_TEN); + private final ExperienceContainer xpCont = + new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); - private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); - - public TileSoulBinder() { - super(new SlotDefinition(2, 2, 1)); - } - - @Override - public ExperienceContainer getContainer() { - return xpCont; - } - - @Override - public String getMachineName() { - return ModObject.blockSoulBinder.unlocalisedName; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - if(xpCont.isDirty()) { - PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); - xpCont.setDirty(false); + public TileSoulBinder() { + super(new SlotDefinition(2, 2, 1)); } - return super.processTasks(redstoneChecksPassed); - } - @Override - protected IMachineRecipe canStartNextTask(float chance) { - IMachineRecipe recipe = super.canStartNextTask(chance); - if(recipe == null) { - return null; + @Override + public ExperienceContainer getContainer() { + return xpCont; } - int xpRequired = ((ISoulBinderRecipe)recipe).getExperienceRequired(); - if(xpCont.getExperienceTotal() >= xpRequired) { - return recipe; - } - return null; - } - public boolean needsXP() { - return getXPRequired() > 0; - } + @Override + public String getMachineName() { + return ModObject.blockSoulBinder.unlocalisedName; + } - /** - * Computes the required amount of XP to start the current recipe. - * @return 0 if no XP is required, negative when more than required XP is stored. - */ - private int getXPRequired() { - if(currentTask != null) { - return 0; + @Override + public int getInventoryStackLimit() { + return 1; } - IMachineRecipe nextRecipe = getNextRecipe(); - if(! (nextRecipe instanceof ISoulBinderRecipe)) { - return 0; - } - return ((ISoulBinderRecipe)nextRecipe).getExperienceRequired() - getContainer().getExperienceTotal(); - } - public int getCurrentlyRequiredLevel() { - if(currentTask != null) { - return -1; - } - IMachineRecipe nextRecipe = getNextRecipe(); - if(! (nextRecipe instanceof ISoulBinderRecipe)) { - return -1; - } - return ((ISoulBinderRecipe)nextRecipe).getExperienceLevelsRequired(); - } - - - @Override - protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { - int xpRequired = ((ISoulBinderRecipe)nextRecipe).getExperienceRequired(); - if(xpCont.getExperienceTotal() < xpRequired) { - return false; - } - if(super.startNextTask(nextRecipe, chance)) { - xpCont.drain(ForgeDirection.UNKNOWN, XpUtil.experienceToLiquid(xpRequired), true); - return true; - } - return false; - } - - @Override - protected boolean isMachineItemValidForSlot(int slot, ItemStack item) { - if(!slotDefinition.isInputSlot(slot)) { - return false; - } - MachineRecipeInput newInput = new MachineRecipeInput(slot, item); - int otherSlot = slot == 0 ? 1 : 0; - if(inventory[otherSlot] == null) { - List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), newInput); - if(recipes.isEmpty()) { - return false; - } - for(IMachineRecipe rec : recipes) { - if(rec != null && rec.isValidInput(newInput)) { - return true; + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { + if (xpCont.isDirty()) { + PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this); + xpCont.setDirty(false); } - } - } else { - MachineRecipeInput[] inputs = new MachineRecipeInput[] { - newInput, - new MachineRecipeInput(otherSlot, inventory[otherSlot]) - }; - return MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), inputs) != null; + return super.processTasks(redstoneChecksPassed); } - return false; - } - @Override - public void onCapacitorTypeChange() { - switch (getCapacitorType()) { - case BASIC_CAPACITOR: - setCapacitor(CAP_ONE); - break; - case ACTIVATED_CAPACITOR: - setCapacitor(CAP_TWO); - break; - case ENDER_CAPACITOR: - setCapacitor(CAP_THREE); - break; - case CRYSTALLINE_CAPACITOR: - setCapacitor(CAP_FOUR); - break; - case MELODIC_CAPACITOR: - setCapacitor(CAP_FIVE); - break; - case STELLAR_CAPACITOR: - setCapacitor(CAP_SIX); - break; - case TOTEMIC_CAPACITOR: - setCapacitor(CAP_SEVEN); - break; - case SILVER_CAPACITOR: - setCapacitor(CAP_EIGHT); - break; - case ENDERGETIC_CAPACITOR: - setCapacitor(CAP_NINE); - break; - case ENDERGISED_CAPACITOR: - setCapacitor(CAP_TEN); - break; - default: - break; + @Override + protected IMachineRecipe canStartNextTask(float chance) { + IMachineRecipe recipe = super.canStartNextTask(chance); + if (recipe == null) { + return null; + } + int xpRequired = ((ISoulBinderRecipe) recipe).getExperienceRequired(); + if (xpCont.getExperienceTotal() >= xpRequired) { + return recipe; + } + return null; } - } - @Override - protected boolean doPull(ForgeDirection dir) { - boolean res = super.doPull(dir); - int req = getXPRequired(); - if(req > 0) { - FluidUtil.doPull(this, dir, Math.min(XpUtil.experienceToLiquid(req), Config.fluidConduitExtractRate)); + public boolean needsXP() { + return getXPRequired() > 0; } - return res; - } - @Override - protected boolean doPush(ForgeDirection dir) { - boolean res = super.doPush(dir); - int maxAmount = Math.min(XpUtil.experienceToLiquid(getExcessXP()), Config.fluidConduitExtractRate); - if (maxAmount > 0) { - FluidUtil.doPush(this, dir, maxAmount); + /** + * Computes the required amount of XP to start the current recipe. + * @return 0 if no XP is required, negative when more than required XP is stored. + */ + private int getXPRequired() { + if (currentTask != null) { + return 0; + } + IMachineRecipe nextRecipe = getNextRecipe(); + if (!(nextRecipe instanceof ISoulBinderRecipe)) { + return 0; + } + return ((ISoulBinderRecipe) nextRecipe).getExperienceRequired() + - getContainer().getExperienceTotal(); } - return res; - } - /** - * Determines how much stored XP can/should be removed because it is not - * needed for the next recipe. - * - * @return A number between 0 and the amount of stored XP - */ - private int getExcessXP() { - if (currentTask == null) { - IMachineRecipe nextRecipe = getNextRecipe(); - if (nextRecipe instanceof ISoulBinderRecipe) { - return Math.max(0, getContainer().getExperienceTotal() - ((ISoulBinderRecipe) nextRecipe).getExperienceRequired()); - } + public int getCurrentlyRequiredLevel() { + if (currentTask != null) { + return -1; + } + IMachineRecipe nextRecipe = getNextRecipe(); + if (!(nextRecipe instanceof ISoulBinderRecipe)) { + return -1; + } + return ((ISoulBinderRecipe) nextRecipe).getExperienceLevelsRequired(); } - return getContainer().getExperienceTotal(); - } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return xpCont.canFill(from, fluid); - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - int max = XpUtil.experienceToLiquid(getXPRequired()); - if (resource == null || max <= 0) { - return 0; - } else if (max < resource.amount) { - FluidStack copy = resource.copy(); - copy.amount = max; - return xpCont.fill(from, copy, doFill); - } else { - return xpCont.fill(from, resource, doFill); + @Override + protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { + int xpRequired = ((ISoulBinderRecipe) nextRecipe).getExperienceRequired(); + if (xpCont.getExperienceTotal() < xpRequired) { + return false; + } + if (super.startNextTask(nextRecipe, chance)) { + xpCont.drain(ForgeDirection.UNKNOWN, XpUtil.experienceToLiquid(xpRequired), true); + return true; + } + return false; } - } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - int max = XpUtil.experienceToLiquid(getExcessXP()); - if (resource != null && max < resource.amount) { - FluidStack copy = resource.copy(); - copy.amount = max; - return xpCont.drain(from, copy, doDrain); - } else { - return xpCont.drain(from, resource, doDrain); + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack item) { + if (!slotDefinition.isInputSlot(slot)) { + return false; + } + MachineRecipeInput newInput = new MachineRecipeInput(slot, item); + int otherSlot = slot == 0 ? 1 : 0; + if (inventory[otherSlot] == null) { + List recipes = + MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), newInput); + if (recipes.isEmpty()) { + return false; + } + for (IMachineRecipe rec : recipes) { + if (rec != null && rec.isValidInput(newInput)) { + return true; + } + } + } else { + MachineRecipeInput[] inputs = + new MachineRecipeInput[] {newInput, new MachineRecipeInput(otherSlot, inventory[otherSlot])}; + return MachineRecipeRegistry.instance.getRecipeForInputs(getMachineName(), inputs) != null; + } + return false; } - } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return xpCont.drain(from, Math.min(XpUtil.experienceToLiquid(getExcessXP()), maxDrain), doDrain); - } + @Override + public void onCapacitorTypeChange() { + switch (getCapacitorType()) { + case BASIC_CAPACITOR: + setCapacitor(CAP_ONE); + break; + case ACTIVATED_CAPACITOR: + setCapacitor(CAP_TWO); + break; + case ENDER_CAPACITOR: + setCapacitor(CAP_THREE); + break; + case CRYSTALLINE_CAPACITOR: + setCapacitor(CAP_FOUR); + break; + case MELODIC_CAPACITOR: + setCapacitor(CAP_FIVE); + break; + case STELLAR_CAPACITOR: + setCapacitor(CAP_SIX); + break; + case TOTEMIC_CAPACITOR: + setCapacitor(CAP_SEVEN); + break; + case SILVER_CAPACITOR: + setCapacitor(CAP_EIGHT); + break; + case ENDERGETIC_CAPACITOR: + setCapacitor(CAP_NINE); + break; + case ENDERGISED_CAPACITOR: + setCapacitor(CAP_TEN); + break; + default: + break; + } + } - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return xpCont.canDrain(from, fluid); - } + @Override + protected boolean doPull(ForgeDirection dir) { + boolean res = super.doPull(dir); + int req = getXPRequired(); + if (req > 0) { + FluidUtil.doPull(this, dir, Math.min(XpUtil.experienceToLiquid(req), Config.fluidConduitExtractRate)); + } + return res; + } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return xpCont.getTankInfo(from); - } + @Override + protected boolean doPush(ForgeDirection dir) { + boolean res = super.doPush(dir); + int maxAmount = Math.min(XpUtil.experienceToLiquid(getExcessXP()), Config.fluidConduitExtractRate); + if (maxAmount > 0) { + FluidUtil.doPush(this, dir, maxAmount); + } + return res; + } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - xpCont.readFromNBT(nbtRoot); - } + /** + * Determines how much stored XP can/should be removed because it is not + * needed for the next recipe. + * + * @return A number between 0 and the amount of stored XP + */ + private int getExcessXP() { + if (currentTask == null) { + IMachineRecipe nextRecipe = getNextRecipe(); + if (nextRecipe instanceof ISoulBinderRecipe) { + return Math.max( + 0, + getContainer().getExperienceTotal() - ((ISoulBinderRecipe) nextRecipe).getExperienceRequired()); + } + } + return getContainer().getExperienceTotal(); + } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - xpCont.writeToNBT(nbtRoot); - } + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return xpCont.canFill(from, fluid); + } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - return xpCont; - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + int max = XpUtil.experienceToLiquid(getXPRequired()); + if (resource == null || max <= 0) { + return 0; + } else if (max < resource.amount) { + FluidStack copy = resource.copy(); + copy.amount = max; + return xpCont.fill(from, copy, doFill); + } else { + return xpCont.fill(from, resource, doFill); + } + } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { xpCont }; - } + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + int max = XpUtil.experienceToLiquid(getExcessXP()); + if (resource != null && max < resource.amount) { + FluidStack copy = resource.copy(); + copy.amount = max; + return xpCont.drain(from, copy, doDrain); + } else { + return xpCont.drain(from, resource, doDrain); + } + } - @Override - public void setTanksDirty() { - xpCont.setDirty(true); - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return xpCont.drain(from, Math.min(XpUtil.experienceToLiquid(getExcessXP()), maxDrain), doDrain); + } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return xpCont.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return xpCont.getTankInfo(from); + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + xpCont.readFromNBT(nbtRoot); + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + xpCont.writeToNBT(nbtRoot); + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + return xpCont; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {xpCont}; + } + + @Override + public void setTanksDirty() { + xpCont.setDirty(true); + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 40176f4b..0eb22f6b 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -1,11 +1,31 @@ package crazypants.enderio.machine.spawner; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.Log; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.waila.IWailaInfoProvider; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.block.BlockMobSpawner; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -25,339 +45,321 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Util; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.Log; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.waila.IWailaInfoProvider; - public class BlockPoweredSpawner extends AbstractMachineBlock implements IAdvancedTooltipProvider { - public static void writeMobTypeToNBT(NBTTagCompound nbt, String type) { - if(nbt == null) { - return; - } - if(type == null) { - nbt.removeTag("mobType"); - } else { - nbt.setString("mobType", type); - } - } - - public static String readMobTypeFromNBT(NBTTagCompound nbt) { - if(nbt == null) { - return null; - } - if(!nbt.hasKey("mobType")) { - return null; - } - return nbt.getString("mobType"); - } - - public static String getSpawnerTypeFromItemStack(ItemStack stack) { - if(stack == null || stack.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner)) { - return null; - } - return readMobTypeFromNBT(stack.stackTagCompound); - } - - public static final String KEY_SPAWNED_BY_POWERED_SPAWNER = "spawnedByPoweredSpawner"; - - public static BlockPoweredSpawner create() { - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPoweredSpawner.unlocalisedName, new DummyRecipe()); - - PacketHandler.INSTANCE.registerMessage(PacketMode.class, PacketMode.class, PacketHandler.nextID(), Side.SERVER); - - //Ensure costs are loaded at startup - PoweredSpawnerConfig.getInstance(); - - BlockPoweredSpawner res = new BlockPoweredSpawner(); - MinecraftForge.EVENT_BUS.register(res); - FMLCommonHandler.instance().bus().register(res); - res.init(); - return res; - } - - private final List toolBlackList = new ArrayList(); - - private Field fieldpersistenceRequired; - - protected BlockPoweredSpawner() { - super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); - - String[] blackListNames = Config.brokenSpawnerToolBlacklist; - for (String name : blackListNames) { - toolBlackList.add(new UniqueIdentifier(name)); - } - - try { - fieldpersistenceRequired = ReflectionHelper.findField(EntityLiving.class, "field_82179_bU", "persistenceRequired"); - } catch (Exception e) { - Log.error("BlockPoweredSpawner: Could not find field: persistenceRequired"); - } - } - - private final Map dropCache = new HashMap(); - - @SubscribeEvent - public void onBreakEvent(BlockEvent.BreakEvent evt) { - if(evt.block instanceof BlockMobSpawner) { - if(evt.getPlayer() != null && !evt.getPlayer().capabilities.isCreativeMode && !evt.getPlayer().worldObj.isRemote && !evt.isCanceled()) { - TileEntity tile = evt.getPlayer().worldObj.getTileEntity(evt.x, evt.y, evt.z); - if(tile instanceof TileEntityMobSpawner) { - - if(Math.random() > Config.brokenSpawnerDropChance) { + public static void writeMobTypeToNBT(NBTTagCompound nbt, String type) { + if (nbt == null) { return; - } - - ItemStack equipped = evt.getPlayer().getCurrentEquippedItem(); - if(equipped != null) { - for (UniqueIdentifier uid : toolBlackList) { - Item blackListItem = GameRegistry.findItem(uid.modId, uid.name); - if(blackListItem == equipped.getItem()) { - return; - } - } - } - - TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; - MobSpawnerBaseLogic logic = spawner.func_145881_a(); - if(logic != null) { - String name = logic.getEntityNameToSpawn(); - if(name != null && !isBlackListed(name)) { - ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); - dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), drop); - - for (int i = (int) (Math.random() * 7); i > 0; i--) { - logic.spawnDelay = 0; - logic.updateSpawner(); - } - - } - } } - } else { - dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), null); - } + if (type == null) { + nbt.removeTag("mobType"); + } else { + nbt.setString("mobType", type); + } } - } - @SubscribeEvent - public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent evt) { - if (!evt.isCanceled() && evt.block instanceof BlockMobSpawner) { - BlockCoord bc = new BlockCoord(evt.x, evt.y, evt.z); - if (dropCache.containsKey(bc)) { - ItemStack stack = dropCache.get(bc); - if (stack != null) { - evt.drops.add(stack); + public static String readMobTypeFromNBT(NBTTagCompound nbt) { + if (nbt == null) { + return null; } - } else { - // A spawner was broken---but not by a player. The TE has been - // invalidated already, but we might be able to recover it. + if (!nbt.hasKey("mobType")) { + return null; + } + return nbt.getString("mobType"); + } + + public static String getSpawnerTypeFromItemStack(ItemStack stack) { + if (stack == null || stack.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner)) { + return null; + } + return readMobTypeFromNBT(stack.stackTagCompound); + } + + public static final String KEY_SPAWNED_BY_POWERED_SPAWNER = "spawnedByPoweredSpawner"; + + public static BlockPoweredSpawner create() { + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPoweredSpawner.unlocalisedName, new DummyRecipe()); + + PacketHandler.INSTANCE.registerMessage(PacketMode.class, PacketMode.class, PacketHandler.nextID(), Side.SERVER); + + // Ensure costs are loaded at startup + PoweredSpawnerConfig.getInstance(); + + BlockPoweredSpawner res = new BlockPoweredSpawner(); + MinecraftForge.EVENT_BUS.register(res); + FMLCommonHandler.instance().bus().register(res); + res.init(); + return res; + } + + private final List toolBlackList = new ArrayList(); + + private Field fieldpersistenceRequired; + + protected BlockPoweredSpawner() { + super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); + + String[] blackListNames = Config.brokenSpawnerToolBlacklist; + for (String name : blackListNames) { + toolBlackList.add(new UniqueIdentifier(name)); + } + try { - for (Object object : evt.world.loadedTileEntityList) { - if (object instanceof TileEntityMobSpawner) { - TileEntityMobSpawner spawner = (TileEntityMobSpawner) object; - if (spawner.getWorldObj() == evt.world && spawner.xCoord == evt.x && spawner.yCoord == evt.y - && spawner.zCoord == evt.z) { - // Bingo! - MobSpawnerBaseLogic logic = spawner.func_145881_a(); - if (logic != null) { - String name = logic.getEntityNameToSpawn(); - if (name != null && !isBlackListed(name)) { - evt.drops.add(ItemBrokenSpawner.createStackForMobType(name)); - } - } - } - } - } + fieldpersistenceRequired = + ReflectionHelper.findField(EntityLiving.class, "field_82179_bU", "persistenceRequired"); } catch (Exception e) { - // Risky recovery failed. Happens. + Log.error("BlockPoweredSpawner: Could not find field: persistenceRequired"); } - } - } - } - - @SubscribeEvent - public void onServerTick(TickEvent.ServerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - dropCache.clear(); - } - } - - @SubscribeEvent - public void handleAnvilEvent(AnvilUpdateEvent evt) { - if(evt.left == null || evt.left.stackSize != 1 || evt.left.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner) || - evt.right == null || ItemBrokenSpawner.getMobTypeFromStack(evt.right) == null) { - return; } - String spawnerType = ItemBrokenSpawner.getMobTypeFromStack(evt.right); - if(isBlackListed(spawnerType)) { - return; + private final Map dropCache = new HashMap(); + + @SubscribeEvent + public void onBreakEvent(BlockEvent.BreakEvent evt) { + if (evt.block instanceof BlockMobSpawner) { + if (evt.getPlayer() != null + && !evt.getPlayer().capabilities.isCreativeMode + && !evt.getPlayer().worldObj.isRemote + && !evt.isCanceled()) { + TileEntity tile = evt.getPlayer().worldObj.getTileEntity(evt.x, evt.y, evt.z); + if (tile instanceof TileEntityMobSpawner) { + + if (Math.random() > Config.brokenSpawnerDropChance) { + return; + } + + ItemStack equipped = evt.getPlayer().getCurrentEquippedItem(); + if (equipped != null) { + for (UniqueIdentifier uid : toolBlackList) { + Item blackListItem = GameRegistry.findItem(uid.modId, uid.name); + if (blackListItem == equipped.getItem()) { + return; + } + } + } + + TileEntityMobSpawner spawner = (TileEntityMobSpawner) tile; + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if (logic != null) { + String name = logic.getEntityNameToSpawn(); + if (name != null && !isBlackListed(name)) { + ItemStack drop = ItemBrokenSpawner.createStackForMobType(name); + dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), drop); + + for (int i = (int) (Math.random() * 7); i > 0; i--) { + logic.spawnDelay = 0; + logic.updateSpawner(); + } + } + } + } + } else { + dropCache.put(new BlockCoord(evt.x, evt.y, evt.z), null); + } + } } - evt.cost = Config.powerSpawnerAddSpawnerCost; - evt.output = evt.left.copy(); - if(evt.output.stackTagCompound == null) { - evt.output.stackTagCompound = new NBTTagCompound(); - } - evt.output.stackTagCompound.setBoolean("eio.abstractMachine", true); - writeMobTypeToNBT(evt.output.stackTagCompound, spawnerType); - - } - - @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent livingUpdate) { - - Entity ent = livingUpdate.entityLiving; - if(!ent.getEntityData().hasKey(KEY_SPAWNED_BY_POWERED_SPAWNER)) { - return; - } - if(fieldpersistenceRequired == null) { - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - return; + @SubscribeEvent + public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent evt) { + if (!evt.isCanceled() && evt.block instanceof BlockMobSpawner) { + BlockCoord bc = new BlockCoord(evt.x, evt.y, evt.z); + if (dropCache.containsKey(bc)) { + ItemStack stack = dropCache.get(bc); + if (stack != null) { + evt.drops.add(stack); + } + } else { + // A spawner was broken---but not by a player. The TE has been + // invalidated already, but we might be able to recover it. + try { + for (Object object : evt.world.loadedTileEntityList) { + if (object instanceof TileEntityMobSpawner) { + TileEntityMobSpawner spawner = (TileEntityMobSpawner) object; + if (spawner.getWorldObj() == evt.world + && spawner.xCoord == evt.x + && spawner.yCoord == evt.y + && spawner.zCoord == evt.z) { + // Bingo! + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if (logic != null) { + String name = logic.getEntityNameToSpawn(); + if (name != null && !isBlackListed(name)) { + evt.drops.add(ItemBrokenSpawner.createStackForMobType(name)); + } + } + } + } + } + } catch (Exception e) { + // Risky recovery failed. Happens. + } + } + } } - long spawnTime = ent.getEntityData().getLong(KEY_SPAWNED_BY_POWERED_SPAWNER); - long livedFor = livingUpdate.entity.worldObj.getTotalWorldTime() - spawnTime; - if(livedFor > Config.poweredSpawnerDespawnTimeSeconds*20) { - try { - fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - } catch (Exception e) { - Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); - ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); - } - } - } - - public boolean isBlackListed(String entityId) { - return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TilePoweredSpawner) { - return new ContainerPoweredSpawner(player.inventory, (TilePoweredSpawner) te); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TilePoweredSpawner) { - return new GuiPoweredSpawner(player.inventory, (TilePoweredSpawner) te); - } - return null; - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_POWERED_SPAWNER; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:poweredSpawnerFrontActive"; - } - return "enderio:poweredSpawnerFront"; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - String type = getSpawnerTypeFromItemStack(itemstack); - if(type != null) { - list.add(StatCollector.translateToLocal("entity." + type + ".name")); - } else { - list.add(EnderIO.lang.localizeExact("tile.blockPoweredSpawner.tooltip.empty")); - } - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - String type = getSpawnerTypeFromItemStack(itemstack); - if(type == null) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, "tile.blockPoweredSpawner.empty"); - } else { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, "tile.blockPoweredSpawner"); - } - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TilePoweredSpawner te = (TilePoweredSpawner) world.getTileEntity(x, y, z); - tooltip.add(te.getEntityName()); - } - - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.BIT_DETAILED; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - super.getSubBlocks(item, tab, list); - list.add(createItemStackForMob("Enderman")); - list.add(createItemStackForMob("Chicken")); - } - - protected ItemStack createItemStackForMob(String mob) { - ItemStack stack = new ItemStack(this); - stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setBoolean("eio.abstractMachine", true); - writeMobTypeToNBT(stack.stackTagCompound, mob); - return stack; - } - - private static class DropInfo { - - BlockEvent.BreakEvent evt; - ItemStack drop; - - DropInfo(BreakEvent evt, ItemStack stack) { - super(); - this.evt = evt; - drop = stack; + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + dropCache.clear(); + } } - void doDrop() { - if(evt.isCanceled()) { - return; - } + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if (evt.left == null + || evt.left.stackSize != 1 + || evt.left.getItem() != Item.getItemFromBlock(EnderIO.blockPoweredSpawner) + || evt.right == null + || ItemBrokenSpawner.getMobTypeFromStack(evt.right) == null) { + return; + } - Util.dropItems(evt.getPlayer().worldObj, drop, evt.x, evt.y, evt.z, true); + String spawnerType = ItemBrokenSpawner.getMobTypeFromStack(evt.right); + if (isBlackListed(spawnerType)) { + return; + } + + evt.cost = Config.powerSpawnerAddSpawnerCost; + evt.output = evt.left.copy(); + if (evt.output.stackTagCompound == null) { + evt.output.stackTagCompound = new NBTTagCompound(); + } + evt.output.stackTagCompound.setBoolean("eio.abstractMachine", true); + writeMobTypeToNBT(evt.output.stackTagCompound, spawnerType); } - } + @SubscribeEvent + public void onLivingUpdate(LivingUpdateEvent livingUpdate) { + + Entity ent = livingUpdate.entityLiving; + if (!ent.getEntityData().hasKey(KEY_SPAWNED_BY_POWERED_SPAWNER)) { + return; + } + if (fieldpersistenceRequired == null) { + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + return; + } + + long spawnTime = ent.getEntityData().getLong(KEY_SPAWNED_BY_POWERED_SPAWNER); + long livedFor = livingUpdate.entity.worldObj.getTotalWorldTime() - spawnTime; + if (livedFor > Config.poweredSpawnerDespawnTimeSeconds * 20) { + try { + fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } catch (Exception e) { + Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } + } + } + + public boolean isBlackListed(String entityId) { + return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TilePoweredSpawner) { + return new ContainerPoweredSpawner(player.inventory, (TilePoweredSpawner) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TilePoweredSpawner) { + return new GuiPoweredSpawner(player.inventory, (TilePoweredSpawner) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_POWERED_SPAWNER; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:poweredSpawnerFrontActive"; + } + return "enderio:poweredSpawnerFront"; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + String type = getSpawnerTypeFromItemStack(itemstack); + if (type != null) { + list.add(StatCollector.translateToLocal("entity." + type + ".name")); + } else { + list.add(EnderIO.lang.localizeExact("tile.blockPoweredSpawner.tooltip.empty")); + } + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + String type = getSpawnerTypeFromItemStack(itemstack); + if (type == null) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, "tile.blockPoweredSpawner.empty"); + } else { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, "tile.blockPoweredSpawner"); + } + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TilePoweredSpawner te = (TilePoweredSpawner) world.getTileEntity(x, y, z); + tooltip.add(te.getEntityName()); + } + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.BIT_DETAILED; + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + super.getSubBlocks(item, tab, list); + list.add(createItemStackForMob("Enderman")); + list.add(createItemStackForMob("Chicken")); + } + + protected ItemStack createItemStackForMob(String mob) { + ItemStack stack = new ItemStack(this); + stack.stackTagCompound = new NBTTagCompound(); + stack.stackTagCompound.setBoolean("eio.abstractMachine", true); + writeMobTypeToNBT(stack.stackTagCompound, mob); + return stack; + } + + private static class DropInfo { + + BlockEvent.BreakEvent evt; + ItemStack drop; + + DropInfo(BreakEvent evt, ItemStack stack) { + super(); + this.evt = evt; + drop = stack; + } + + void doDrop() { + if (evt.isCanceled()) { + return; + } + + Util.dropItems(evt.getPlayer().worldObj, drop, evt.x, evt.y, evt.z, true); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index a1c8b8b8..d92d998c 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java @@ -1,47 +1,44 @@ package crazypants.enderio.machine.spawner; +import crazypants.enderio.EnderIO; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; - public class BrokenSpawnerRenderer implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_ALPHA_TEST); - - if(type == ItemRenderType.ENTITY) { - GL11.glPushMatrix(); - GL11.glScalef(0.5f, 0.5f, 0.5f); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - RenderBlocks rb = (RenderBlocks) data[0]; - rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0)); - rb.renderBlockAsItem(Blocks.stone, 0, 1); - rb.setOverrideBlockTexture(null); - - if(type == ItemRenderType.ENTITY) { - GL11.glPopMatrix(); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glPopAttrib(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_ALPHA_TEST); + if (type == ItemRenderType.ENTITY) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + } + + RenderBlocks rb = (RenderBlocks) data[0]; + rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0)); + rb.renderBlockAsItem(Blocks.stone, 0, 1); + rb.setOverrideBlockTexture(null); + + if (type == ItemRenderType.ENTITY) { + GL11.glPopMatrix(); + } + + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glPopAttrib(); + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java index 96fa4783..8c3c9e66 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ContainerPoweredSpawner.java @@ -1,51 +1,48 @@ package crazypants.enderio.machine.spawner; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import java.util.List; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.gui.AbstractMachineContainer; - public class ContainerPoweredSpawner extends AbstractMachineContainer { - private Slot slotInput; - private Slot slotOutput; + private Slot slotInput; + private Slot slotOutput; - public ContainerPoweredSpawner(InventoryPlayer playerInv, TilePoweredSpawner te) { - super(playerInv, te); - } + public ContainerPoweredSpawner(InventoryPlayer playerInv, TilePoweredSpawner te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - slotInput = addSlotToContainer(new Slot(getInv(), 0, 54, 42) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - slotOutput = addSlotToContainer(new Slot(getInv(), 1, 105, 42) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return false; - } - }); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + slotInput = addSlotToContainer(new Slot(getInv(), 0, 54, 42) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + slotOutput = addSlotToContainer(new Slot(getInv(), 1, 105, 42) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return false; + } + }); + } - public void createGhostSlots(List slots) { - final GhostBackgroundItemSlot ghostBackgroundItemSlot = new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, slotInput); - ghostBackgroundItemSlot.y = 42; - slots.add(ghostBackgroundItemSlot); - } - - public void setSlotVisibility(boolean visible) { - slotInput.yDisplayPosition = visible ? 42 : -3000; - slotOutput.yDisplayPosition = visible ? 42 : -3000; - } + public void createGhostSlots(List slots) { + final GhostBackgroundItemSlot ghostBackgroundItemSlot = + new GhostBackgroundItemSlot(EnderIO.itemSoulVessel, slotInput); + ghostBackgroundItemSlot.y = 42; + slots.add(ghostBackgroundItemSlot); + } + public void setSlotVisibility(boolean visible) { + slotInput.yDisplayPosition = visible ? 42 : -3000; + slotOutput.yDisplayPosition = visible ? 42 : -3000; + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java index 790313a2..d85fbc7f 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java @@ -1,60 +1,58 @@ package crazypants.enderio.machine.spawner; -import java.util.Collections; -import java.util.List; - -import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.RecipeBonusType; +import java.util.Collections; +import java.util.List; +import net.minecraft.item.ItemStack; public class DummyRecipe implements IMachineRecipe { - @Override - public String getUid() { - return "PoweredTaskRecipe"; - } + @Override + public String getUid() { + return "PoweredTaskRecipe"; + } - @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - //NB: This value is not actually used, see createTask in the tile - return TilePoweredSpawner.POWER_PER_TICK_ONE * 800; - } + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + // NB: This value is not actually used, see createTask in the tile + return TilePoweredSpawner.POWER_PER_TICK_ONE * 800; + } - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - return true; - } + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + return true; + } - @Override - public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { - return new ResultStack[0]; - } + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + return new ResultStack[0]; + } - @Override - public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { - return RecipeBonusType.NONE; - } + @Override + public RecipeBonusType getBonusType(MachineRecipeInput... inputs) { + return RecipeBonusType.NONE; + } - @Override - public float getExperienceForOutput(ItemStack output) { - return 0; - } + @Override + public float getExperienceForOutput(ItemStack output) { + return 0; + } - @Override - public boolean isValidInput(MachineRecipeInput input) { - return false; - } + @Override + public boolean isValidInput(MachineRecipeInput input) { + return false; + } - @Override - public String getMachineName() { - return ModObject.blockPoweredSpawner.unlocalisedName; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - return Collections.emptyList(); - } + @Override + public String getMachineName() { + return ModObject.blockPoweredSpawner.unlocalisedName; + } + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + return Collections.emptyList(); + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 8c570c4b..7ebe34d5 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -1,122 +1,114 @@ package crazypants.enderio.machine.spawner; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.Lang; - import crazypants.enderio.EnderIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.killera.ContainerKillerJoe; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiPoweredSpawner extends GuiPoweredMachineBase { - private final MultiIconButton modeB; - private final Rectangle progressTooltipRect; - private boolean wasSpawnMode; - private String header; + private final MultiIconButton modeB; + private final Rectangle progressTooltipRect; + private boolean wasSpawnMode; + private String header; - public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { - super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te), "poweredSpawner"); + public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { + super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te), "poweredSpawner"); - modeB = MultiIconButton.createRightArrowButton(this, 8888, 115, 10); - modeB.setSize(10, 16); + modeB = MultiIconButton.createRightArrowButton(this, 8888, 115, 10); + modeB.setSize(10, 16); - addProgressTooltip(80, 34, 14, 14); - progressTooltipRect = progressTooltips.get(0).getBounds(); + addProgressTooltip(80, 34, 14, 14); + progressTooltipRect = progressTooltips.get(0).getBounds(); - updateSpawnMode(te.isSpawnMode()); - } - - @Override - public void initGui() { - super.initGui(); - modeB.onGuiInit(); - ((ContainerPoweredSpawner) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - protected void actionPerformed(GuiButton par1GuiButton) { - if(par1GuiButton == modeB) { - getTileEntity().setSpawnMode(!getTileEntity().isSpawnMode()); - PacketHandler.INSTANCE.sendToServer(new PacketMode(getTileEntity())); - } else { - super.actionPerformed(par1GuiButton); - } - } - - private void updateSpawnMode(boolean spawnMode) { - wasSpawnMode = spawnMode; - ((ContainerPoweredSpawner) inventorySlots).setSlotVisibility(!spawnMode); - - if(spawnMode) { - header = EnderIO.lang.localize("gui.machine.poweredspawner.spawn"); - progressTooltipRect.x = 80; - progressTooltipRect.y = 34; - progressTooltipRect.width = 14; - progressTooltipRect.height = 14; - } else { - header = EnderIO.lang.localize("gui.machine.poweredspawner.capture"); - progressTooltipRect.x = 52; - progressTooltipRect.y = 40; - progressTooltipRect.width = 72; - progressTooltipRect.height = 21; - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - TilePoweredSpawner spawner = getTileEntity(); - boolean spawnMode = spawner.isSpawnMode(); - - if(spawnMode != wasSpawnMode) { - updateSpawnMode(spawnMode); + updateSpawnMode(te.isSpawnMode()); } - FontRenderer fr = getFontRenderer(); - int x = sx + xSize / 2 - fr.getStringWidth(header) / 2; - int y = sy + fr.FONT_HEIGHT + 6; - fr.drawStringWithShadow(header, x, y, ColorUtil.getRGB(Color.WHITE)); - - bindGuiTexture(); - - if(spawnMode) { - drawTexturedModalRect(sx + 80, sy + 34, 207, 0, 17, 15); - if(shouldRenderProgress()) { - int scaled = getProgressScaled(14) + 1; - drawTexturedModalRect(sx + 81, sy + 34 + 14 - scaled, 176, 14 - scaled, 14, scaled); - } - } else { - drawTexturedModalRect(sx + 52, sy + 40, 52, 170, 72, 21); - if(shouldRenderProgress()) { - int scaled = getProgressScaled(24); - drawTexturedModalRect(sx + 76, sy + 43, 176, 14, scaled + 1, 16); - } + @Override + public void initGui() { + super.initGui(); + modeB.onGuiInit(); + ((ContainerPoweredSpawner) inventorySlots).createGhostSlots(getGhostSlots()); } - } - @Override - protected boolean showRecipeButton() { - return false; - } + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + if (par1GuiButton == modeB) { + getTileEntity().setSpawnMode(!getTileEntity().isSpawnMode()); + PacketHandler.INSTANCE.sendToServer(new PacketMode(getTileEntity())); + } else { + super.actionPerformed(par1GuiButton); + } + } + private void updateSpawnMode(boolean spawnMode) { + wasSpawnMode = spawnMode; + ((ContainerPoweredSpawner) inventorySlots).setSlotVisibility(!spawnMode); + + if (spawnMode) { + header = EnderIO.lang.localize("gui.machine.poweredspawner.spawn"); + progressTooltipRect.x = 80; + progressTooltipRect.y = 34; + progressTooltipRect.width = 14; + progressTooltipRect.height = 14; + } else { + header = EnderIO.lang.localize("gui.machine.poweredspawner.capture"); + progressTooltipRect.x = 52; + progressTooltipRect.y = 40; + progressTooltipRect.width = 72; + progressTooltipRect.height = 21; + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + TilePoweredSpawner spawner = getTileEntity(); + boolean spawnMode = spawner.isSpawnMode(); + + if (spawnMode != wasSpawnMode) { + updateSpawnMode(spawnMode); + } + + FontRenderer fr = getFontRenderer(); + int x = sx + xSize / 2 - fr.getStringWidth(header) / 2; + int y = sy + fr.FONT_HEIGHT + 6; + fr.drawStringWithShadow(header, x, y, ColorUtil.getRGB(Color.WHITE)); + + bindGuiTexture(); + + if (spawnMode) { + drawTexturedModalRect(sx + 80, sy + 34, 207, 0, 17, 15); + if (shouldRenderProgress()) { + int scaled = getProgressScaled(14) + 1; + drawTexturedModalRect(sx + 81, sy + 34 + 14 - scaled, 176, 14 - scaled, 14, scaled); + } + } else { + drawTexturedModalRect(sx + 52, sy + 40, 52, 170, 72, 21); + if (shouldRenderProgress()) { + int scaled = getProgressScaled(24); + drawTexturedModalRect(sx + 76, sy + 43, 176, 14, scaled + 1, 16); + } + } + } + + @Override + protected boolean showRecipeButton() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java index 5f16f16c..dabd635f 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java @@ -1,7 +1,13 @@ package crazypants.enderio.machine.spawner; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,101 +16,80 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import com.enderio.core.client.handlers.SpecialTooltipHandler; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; - public class ItemBrokenSpawner extends Item { - private static final String[] CREATIVE_TYPES = new String[] { - "Skeleton", - "Zombie", - "Spider", - "CaveSpider", - "Blaze", - "Enderman", - "Chicken" - }; + private static final String[] CREATIVE_TYPES = + new String[] {"Skeleton", "Zombie", "Spider", "CaveSpider", "Blaze", "Enderman", "Chicken"}; - public static String getMobTypeFromStack(ItemStack stack) { - if(stack == null || stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("mobType")) { - return null; - } - return stack.stackTagCompound.getString("mobType"); - } - - public static ItemStack createStackForMobType(String mobType) { - if(mobType == null) { - return null; - } - ItemStack res = new ItemStack(EnderIO.itemBrokenSpawner); - res.stackTagCompound = new NBTTagCompound(); - res.stackTagCompound.setString("mobType", mobType); - return res; - } - - - public static ItemBrokenSpawner create() { - ItemBrokenSpawner result = new ItemBrokenSpawner(); - result.init(); - return result; - } - - - protected ItemBrokenSpawner() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemBrokenSpawner.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - } - - @Override - public boolean isDamageable() { - return false; - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemBrokenSpawner.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iIconRegister) { - itemIcon = iIconRegister.registerIcon("enderio:itemBrokenSpawner"); - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(String mobType : CREATIVE_TYPES) { - par3List.add(createStackForMobType(mobType)); - } - } - - - @SuppressWarnings("unchecked") - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(par1ItemStack != null && par1ItemStack.stackTagCompound != null) { - String mobName = getMobTypeFromStack(par1ItemStack); - if(mobName != null) { - par3List.add(StatCollector.translateToLocal("entity." + mobName + ".name")); - } - if(!SpecialTooltipHandler.showAdvancedTooltips()) { - SpecialTooltipHandler.addShowDetailsTooltip(par3List); - } else { - SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, par1ItemStack); - } + public static String getMobTypeFromStack(ItemStack stack) { + if (stack == null || stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("mobType")) { + return null; + } + return stack.stackTagCompound.getString("mobType"); } - } + public static ItemStack createStackForMobType(String mobType) { + if (mobType == null) { + return null; + } + ItemStack res = new ItemStack(EnderIO.itemBrokenSpawner); + res.stackTagCompound = new NBTTagCompound(); + res.stackTagCompound.setString("mobType", mobType); + return res; + } + public static ItemBrokenSpawner create() { + ItemBrokenSpawner result = new ItemBrokenSpawner(); + result.init(); + return result; + } + + protected ItemBrokenSpawner() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBrokenSpawner.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); + } + + @Override + public boolean isDamageable() { + return false; + } + + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBrokenSpawner.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iIconRegister) { + itemIcon = iIconRegister.registerIcon("enderio:itemBrokenSpawner"); + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (String mobType : CREATIVE_TYPES) { + par3List.add(createStackForMobType(mobType)); + } + } + + @SuppressWarnings("unchecked") + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (par1ItemStack != null && par1ItemStack.stackTagCompound != null) { + String mobName = getMobTypeFromStack(par1ItemStack); + if (mobName != null) { + par3List.add(StatCollector.translateToLocal("entity." + mobName + ".name")); + } + if (!SpecialTooltipHandler.showAdvancedTooltips()) { + SpecialTooltipHandler.addShowDetailsTooltip(par3List); + } else { + SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, par1ItemStack); + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/PacketMode.java b/src/main/java/crazypants/enderio/machine/spawner/PacketMode.java index a9dc18da..dc3c6c4e 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/PacketMode.java +++ b/src/main/java/crazypants/enderio/machine/spawner/PacketMode.java @@ -1,54 +1,51 @@ package crazypants.enderio.machine.spawner; -import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; public class PacketMode implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; + private int x; + private int y; + private int z; - private boolean isSpawnMode; + private boolean isSpawnMode; - public PacketMode() { + public PacketMode() {} - } - - public PacketMode(TilePoweredSpawner tile) { - x = tile.xCoord; - y = tile.yCoord; - z = tile.zCoord; - isSpawnMode = tile.isSpawnMode(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeBoolean(isSpawnMode); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - isSpawnMode = buf.readBoolean(); - - } - - @Override - public IMessage onMessage(PacketMode message, MessageContext ctx) { - TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TilePoweredSpawner) { - TilePoweredSpawner me = (TilePoweredSpawner) te; - me.setSpawnMode(message.isSpawnMode); + public PacketMode(TilePoweredSpawner tile) { + x = tile.xCoord; + y = tile.yCoord; + z = tile.zCoord; + isSpawnMode = tile.isSpawnMode(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeBoolean(isSpawnMode); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + isSpawnMode = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketMode message, MessageContext ctx) { + TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TilePoweredSpawner) { + TilePoweredSpawner me = (TilePoweredSpawner) te; + me.setSpawnMode(message.isSpawnMode); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java b/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java index 216e7a15..af4735c5 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java +++ b/src/main/java/crazypants/enderio/machine/spawner/PoweredSpawnerConfig.java @@ -1,136 +1,134 @@ package crazypants.enderio.machine.spawner; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.nbt.NBTTagCompound; - import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - import crazypants.enderio.Log; import crazypants.util.IoUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import net.minecraft.nbt.NBTTagCompound; public class PoweredSpawnerConfig { - static final PoweredSpawnerConfig instance = new PoweredSpawnerConfig(); - private static final String CORE_FILE_NAME = "PoweredSpawnerConfig_Core.json"; - private static final String USER_FILE_NAME = "PoweredSpawnerConfig_User.json"; + static final PoweredSpawnerConfig instance = new PoweredSpawnerConfig(); + private static final String CORE_FILE_NAME = "PoweredSpawnerConfig_Core.json"; + private static final String USER_FILE_NAME = "PoweredSpawnerConfig_User.json"; - private static final String KEY_ENTITY_NAME = "entityName"; - private static final String KEY_COST_MULTIPLIER = "costMultiplier"; + private static final String KEY_ENTITY_NAME = "entityName"; + private static final String KEY_COST_MULTIPLIER = "costMultiplier"; - public static PoweredSpawnerConfig getInstance() { - return instance; - } - - private final Map costs = new HashMap(); - - private final List blackList = new ArrayList(); - - public double getCostMultiplierFor(String entity) { - Double val = costs.get(entity); - if(val == null) { - return 1; + public static PoweredSpawnerConfig getInstance() { + return instance; } - return val.doubleValue(); - } - public boolean isBlackListed(String entity) { - if(entity == null) { - return true; - } - return blackList.contains(entity); - } + private final Map costs = new HashMap(); - private PoweredSpawnerConfig() { + private final List blackList = new ArrayList(); - String configText; - JsonElement root; - JsonObject rootObj; - JsonObject costsObj; - JsonArray blkList; - try { - //Core - configText = IoUtil.copyConfigFromJar(CORE_FILE_NAME, true); - root = new JsonParser().parse(configText); - rootObj = root.getAsJsonObject(); - costsObj = rootObj.getAsJsonObject("costMultiplier"); - for (Entry entry : costsObj.entrySet()) { - costs.put(entry.getKey(), Double.valueOf(entry.getValue().getAsDouble())); - } - - blkList = rootObj.getAsJsonArray("blackList"); - if(blkList != null) { - for (int i = 0; i < blkList.size(); i++) { - String s = blkList.get(i).getAsString(); - blackList.add(s); + public double getCostMultiplierFor(String entity) { + Double val = costs.get(entity); + if (val == null) { + return 1; } - } else { - Log.warn("No black list for powered spawner found in " + IoUtil.getConfigFile(CORE_FILE_NAME).getAbsolutePath()); - } - - } catch (Exception e) { - Log.error("Could not load Powered Spawner costs from " + IoUtil.getConfigFile(CORE_FILE_NAME).getAbsolutePath()); - e.printStackTrace(); + return val.doubleValue(); } - - try { - //User - configText = IoUtil.copyConfigFromJar(USER_FILE_NAME, false); - root = new JsonParser().parse(configText); - rootObj = root.getAsJsonObject(); - costsObj = rootObj.getAsJsonObject("costMultiplier"); - for (Entry entry : costsObj.entrySet()) { - double val = Double.valueOf(entry.getValue().getAsDouble()); - costs.put(entry.getKey(), val); - } - blkList = rootObj.getAsJsonArray("blackList"); - if(blkList != null) { - blackList.clear(); - Log.info("Replacing default Powered Spawner blacklist with user supplied values."); - for (int i = 0; i < blkList.size(); i++) { - String s = blkList.get(i).getAsString(); - blackList.add(s); + public boolean isBlackListed(String entity) { + if (entity == null) { + return true; } - } + return blackList.contains(entity); + } - } catch (Exception e) { - Log.error("Could not load user defined Powered Spawner costs from " + IoUtil.getConfigFile(USER_FILE_NAME).getAbsolutePath()); - e.printStackTrace(); - } - - } + private PoweredSpawnerConfig() { - public void addToBlacklist(String entityName) { - if(entityName != null) { - blackList.add(entityName); - } - } + String configText; + JsonElement root; + JsonObject rootObj; + JsonObject costsObj; + JsonArray blkList; + try { + // Core + configText = IoUtil.copyConfigFromJar(CORE_FILE_NAME, true); + root = new JsonParser().parse(configText); + rootObj = root.getAsJsonObject(); + costsObj = rootObj.getAsJsonObject("costMultiplier"); + for (Entry entry : costsObj.entrySet()) { + costs.put(entry.getKey(), Double.valueOf(entry.getValue().getAsDouble())); + } - public void addEntityCost(String entityName, double costMultiplier) { - if(entityName != null && costMultiplier > 0) { - costs.put(entityName, costMultiplier); - } - } + blkList = rootObj.getAsJsonArray("blackList"); + if (blkList != null) { + for (int i = 0; i < blkList.size(); i++) { + String s = blkList.get(i).getAsString(); + blackList.add(s); + } + } else { + Log.warn("No black list for powered spawner found in " + + IoUtil.getConfigFile(CORE_FILE_NAME).getAbsolutePath()); + } - public void addEntityCostFromNBT(NBTTagCompound tag) { - if(tag == null) { - return; - } - if(!tag.hasKey(KEY_ENTITY_NAME)) { - return; - } - if(!tag.hasKey(KEY_COST_MULTIPLIER)) { - return; - } - addEntityCost(tag.getString(KEY_ENTITY_NAME), tag.getDouble(KEY_COST_MULTIPLIER)); - } + } catch (Exception e) { + Log.error("Could not load Powered Spawner costs from " + + IoUtil.getConfigFile(CORE_FILE_NAME).getAbsolutePath()); + e.printStackTrace(); + } + try { + // User + configText = IoUtil.copyConfigFromJar(USER_FILE_NAME, false); + root = new JsonParser().parse(configText); + rootObj = root.getAsJsonObject(); + costsObj = rootObj.getAsJsonObject("costMultiplier"); + for (Entry entry : costsObj.entrySet()) { + double val = Double.valueOf(entry.getValue().getAsDouble()); + costs.put(entry.getKey(), val); + } + + blkList = rootObj.getAsJsonArray("blackList"); + if (blkList != null) { + blackList.clear(); + Log.info("Replacing default Powered Spawner blacklist with user supplied values."); + for (int i = 0; i < blkList.size(); i++) { + String s = blkList.get(i).getAsString(); + blackList.add(s); + } + } + + } catch (Exception e) { + Log.error("Could not load user defined Powered Spawner costs from " + + IoUtil.getConfigFile(USER_FILE_NAME).getAbsolutePath()); + e.printStackTrace(); + } + } + + public void addToBlacklist(String entityName) { + if (entityName != null) { + blackList.add(entityName); + } + } + + public void addEntityCost(String entityName, double costMultiplier) { + if (entityName != null && costMultiplier > 0) { + costs.put(entityName, costMultiplier); + } + } + + public void addEntityCostFromNBT(NBTTagCompound tag) { + if (tag == null) { + return; + } + if (!tag.hasKey(KEY_ENTITY_NAME)) { + return; + } + if (!tag.hasKey(KEY_COST_MULTIPLIER)) { + return; + } + addEntityCost(tag.getString(KEY_ENTITY_NAME), tag.getDouble(KEY_COST_MULTIPLIER)); + } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 87aa5f96..ca5c8920 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -1,12 +1,5 @@ package crazypants.enderio.machine.spawner; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -18,315 +11,367 @@ import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; public class TilePoweredSpawner extends AbstractPoweredTaskEntity { - public static final int MIN_SPAWN_DELAY_BASE = Config.poweredSpawnerMinDelayTicks; - public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks; + public static final int MIN_SPAWN_DELAY_BASE = Config.poweredSpawnerMinDelayTicks; + public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks; - public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor(Capacitors.BASIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF; + private static final BasicCapacitor CAP_ONE = new BasicCapacitor( + Capacitors.BASIC_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_ONE * 1.25), + Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor(Capacitors.ACTIVATED_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_TWO * 1.25), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF; + private static final BasicCapacitor CAP_TWO = new BasicCapacitor( + Capacitors.ACTIVATED_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_TWO * 1.25), + Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor(Capacitors.ENDER_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_THREE * 1.25), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTickRF; + private static final BasicCapacitor CAP_THREE = new BasicCapacitor( + Capacitors.ENDER_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_THREE * 1.25), + Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_FOUR = Config.poweredSpawnerLevelFourPowerPerTickRF; - private static final BasicCapacitor CAP_FOUR = new BasicCapacitor(Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_FOUR * 1.25), Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_FOUR = Config.poweredSpawnerLevelFourPowerPerTickRF; + private static final BasicCapacitor CAP_FOUR = new BasicCapacitor( + Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_FOUR * 1.25), + Capacitors.CRYSTALLINE_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_FIVE = Config.poweredSpawnerLevelFivePowerPerTickRF; - private static final BasicCapacitor CAP_FIVE = new BasicCapacitor(Capacitors.MELODIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_FIVE * 1.25), Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_FIVE = Config.poweredSpawnerLevelFivePowerPerTickRF; + private static final BasicCapacitor CAP_FIVE = new BasicCapacitor( + Capacitors.MELODIC_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_FIVE * 1.25), + Capacitors.MELODIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_SIX = Config.poweredSpawnerLevelSixPowerPerTickRF; - private static final BasicCapacitor CAP_SIX = new BasicCapacitor(Capacitors.STELLAR_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_SIX * 1.25), Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_SIX = Config.poweredSpawnerLevelSixPowerPerTickRF; + private static final BasicCapacitor CAP_SIX = new BasicCapacitor( + Capacitors.STELLAR_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_SIX * 1.25), + Capacitors.STELLAR_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_SEVEN = Config.poweredSpawnerLevelSevenPowerPerTickRF; - private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor(Capacitors.TOTEMIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_SEVEN * 1.25), Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_SEVEN = Config.poweredSpawnerLevelSevenPowerPerTickRF; + private static final BasicCapacitor CAP_SEVEN = new BasicCapacitor( + Capacitors.TOTEMIC_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_SEVEN * 1.25), + Capacitors.TOTEMIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_EIGHT = Config.poweredSpawnerLevelEightPowerPerTickRF; - private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor(Capacitors.SILVER_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_EIGHT * 1.25), Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_EIGHT = Config.poweredSpawnerLevelEightPowerPerTickRF; + private static final BasicCapacitor CAP_EIGHT = new BasicCapacitor( + Capacitors.SILVER_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_EIGHT * 1.25), + Capacitors.SILVER_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_NINE = Config.poweredSpawnerLevelNinePowerPerTickRF; - private static final BasicCapacitor CAP_NINE = new BasicCapacitor(Capacitors.ENDERGETIC_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_NINE * 1.25), Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_NINE = Config.poweredSpawnerLevelNinePowerPerTickRF; + private static final BasicCapacitor CAP_NINE = new BasicCapacitor( + Capacitors.ENDERGETIC_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_NINE * 1.25), + Capacitors.ENDERGETIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int POWER_PER_TICK_TEN = Config.poweredSpawnerLevelTenPowerPerTickRF; - private static final BasicCapacitor CAP_TEN = new BasicCapacitor(Capacitors.ENDERGISED_CAPACITOR.capacitor.getTier(), (int) (POWER_PER_TICK_TEN * 1.25), Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored()); + public static final int POWER_PER_TICK_TEN = Config.poweredSpawnerLevelTenPowerPerTickRF; + private static final BasicCapacitor CAP_TEN = new BasicCapacitor( + Capacitors.ENDERGISED_CAPACITOR.capacitor.getTier(), + (int) (POWER_PER_TICK_TEN * 1.25), + Capacitors.ENDERGISED_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance; - public static final boolean USE_VANILLA_SPAWN_CHECKS = Config.poweredSpawnerUseVanillaSpawChecks; + public static final int MIN_PLAYER_DISTANCE = Config.poweredSpawnerMaxPlayerDistance; + public static final boolean USE_VANILLA_SPAWN_CHECKS = Config.poweredSpawnerUseVanillaSpawChecks; - private static final String NULL_ENTITY_NAME = "None"; + private static final String NULL_ENTITY_NAME = "None"; - private String entityTypeName; - private boolean isSpawnMode = true; - private int powerUsePerTick; - private int remainingSpawnTries; + private String entityTypeName; + private boolean isSpawnMode = true; + private int powerUsePerTick; + private int remainingSpawnTries; - public TilePoweredSpawner() { - super(new SlotDefinition(1, 1, 1)); - entityTypeName = NULL_ENTITY_NAME; - } - - public boolean isSpawnMode() { - return isSpawnMode; - } - - public void setSpawnMode(boolean isSpawnMode) { - if(isSpawnMode != this.isSpawnMode) { - currentTask = null; + public TilePoweredSpawner() { + super(new SlotDefinition(1, 1, 1)); + entityTypeName = NULL_ENTITY_NAME; } - this.isSpawnMode = isSpawnMode; - } - @Override - protected void taskComplete() { - super.taskComplete(); - if(isSpawnMode) { - remainingSpawnTries = Config.poweredSpawnerSpawnCount + Config.poweredSpawnerMaxSpawnTries; - for (int i = 0; i < Config.poweredSpawnerSpawnCount && remainingSpawnTries > 0; ++i) { - if(!trySpawnEntity()) { - break; + public boolean isSpawnMode() { + return isSpawnMode; + } + + public void setSpawnMode(boolean isSpawnMode) { + if (isSpawnMode != this.isSpawnMode) { + currentTask = null; } - } - } else { - if(getStackInSlot(0) == null || getStackInSlot(1) != null || !hasEntityName()) { - return; - } - ItemStack res = EnderIO.itemSoulVessel.createVesselWithEntityStub(getEntityName()); - decrStackSize(0, 1); - setInventorySlotContents(1, res); + this.isSpawnMode = isSpawnMode; } - } - @Override - public void onCapacitorTypeChange() { - ICapacitor refCap; - int basePowerUse; - switch (getCapacitorType()) { - default: - case BASIC_CAPACITOR: - refCap = CAP_ONE; - basePowerUse = POWER_PER_TICK_ONE; - break; - case ACTIVATED_CAPACITOR: - refCap = CAP_TWO; - basePowerUse = POWER_PER_TICK_TWO; - break; - case ENDER_CAPACITOR: - refCap = CAP_THREE; - basePowerUse = POWER_PER_TICK_THREE; - break; - case CRYSTALLINE_CAPACITOR: - refCap = CAP_FOUR; - basePowerUse = POWER_PER_TICK_FOUR; - break; - case MELODIC_CAPACITOR: - refCap = CAP_FIVE; - basePowerUse = POWER_PER_TICK_FIVE; - break; - case STELLAR_CAPACITOR: - refCap = CAP_SIX; - basePowerUse = POWER_PER_TICK_SIX; - break; - case TOTEMIC_CAPACITOR: - refCap = CAP_SEVEN; - basePowerUse = POWER_PER_TICK_SEVEN; - break; - case SILVER_CAPACITOR: - refCap = CAP_EIGHT; - basePowerUse = POWER_PER_TICK_EIGHT; - break; - case ENDERGETIC_CAPACITOR: - refCap = CAP_NINE; - basePowerUse = POWER_PER_TICK_NINE; - break; - case ENDERGISED_CAPACITOR: - refCap = CAP_TEN; - basePowerUse = POWER_PER_TICK_TEN; - break; - } - double multiplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(getEntityName()); - setCapacitor(new BasicCapacitor(refCap.getTier(), (int) (refCap.getMaxEnergyExtracted() * multiplier), refCap.getMaxEnergyStored())); - powerUsePerTick = (int) Math.ceil(basePowerUse * multiplier); - forceClientUpdate = true; - } - - @Override - public String getMachineName() { - return ModObject.blockPoweredSpawner.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null || isSpawnMode) { - return false; - } - if(slotDefinition.isInputSlot(i)) { - return itemstack.getItem() == EnderIO.itemSoulVessel && !EnderIO.itemSoulVessel.containsSoul(itemstack); - } - return false; - } - - @Override - protected IMachineRecipe canStartNextTask(float chance) { - if(!hasEntityName()) { - return null; - } - if(isSpawnMode) { - if(MIN_PLAYER_DISTANCE > 0) { - if(worldObj.getClosestPlayer(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, MIN_PLAYER_DISTANCE) == null) { - return null; + @Override + protected void taskComplete() { + super.taskComplete(); + if (isSpawnMode) { + remainingSpawnTries = Config.poweredSpawnerSpawnCount + Config.poweredSpawnerMaxSpawnTries; + for (int i = 0; i < Config.poweredSpawnerSpawnCount && remainingSpawnTries > 0; ++i) { + if (!trySpawnEntity()) { + break; + } + } + } else { + if (getStackInSlot(0) == null || getStackInSlot(1) != null || !hasEntityName()) { + return; + } + ItemStack res = EnderIO.itemSoulVessel.createVesselWithEntityStub(getEntityName()); + decrStackSize(0, 1); + setInventorySlotContents(1, res); } - } - } else { - if(getStackInSlot(0) == null || getStackInSlot(1) != null) { - return null; - } } - return new DummyRecipe(); - } - @Override - protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { - return super.startNextTask(nextRecipe, chance); - } - - @Override - public int getPowerUsePerTick() { - return powerUsePerTick; - } - - @Override - protected boolean hasInputStacks() { - return true; - } - - @Override - protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { - return true; - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - //Must read the mob type first so we know the multiplier to be used when calculating input/output power - String mobType = BlockPoweredSpawner.readMobTypeFromNBT(nbtRoot); - if(mobType == null) { - mobType = NULL_ENTITY_NAME; + @Override + public void onCapacitorTypeChange() { + ICapacitor refCap; + int basePowerUse; + switch (getCapacitorType()) { + default: + case BASIC_CAPACITOR: + refCap = CAP_ONE; + basePowerUse = POWER_PER_TICK_ONE; + break; + case ACTIVATED_CAPACITOR: + refCap = CAP_TWO; + basePowerUse = POWER_PER_TICK_TWO; + break; + case ENDER_CAPACITOR: + refCap = CAP_THREE; + basePowerUse = POWER_PER_TICK_THREE; + break; + case CRYSTALLINE_CAPACITOR: + refCap = CAP_FOUR; + basePowerUse = POWER_PER_TICK_FOUR; + break; + case MELODIC_CAPACITOR: + refCap = CAP_FIVE; + basePowerUse = POWER_PER_TICK_FIVE; + break; + case STELLAR_CAPACITOR: + refCap = CAP_SIX; + basePowerUse = POWER_PER_TICK_SIX; + break; + case TOTEMIC_CAPACITOR: + refCap = CAP_SEVEN; + basePowerUse = POWER_PER_TICK_SEVEN; + break; + case SILVER_CAPACITOR: + refCap = CAP_EIGHT; + basePowerUse = POWER_PER_TICK_EIGHT; + break; + case ENDERGETIC_CAPACITOR: + refCap = CAP_NINE; + basePowerUse = POWER_PER_TICK_NINE; + break; + case ENDERGISED_CAPACITOR: + refCap = CAP_TEN; + basePowerUse = POWER_PER_TICK_TEN; + break; + } + double multiplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(getEntityName()); + setCapacitor(new BasicCapacitor( + refCap.getTier(), (int) (refCap.getMaxEnergyExtracted() * multiplier), refCap.getMaxEnergyStored())); + powerUsePerTick = (int) Math.ceil(basePowerUse * multiplier); + forceClientUpdate = true; } - entityTypeName = mobType; - if(!nbtRoot.hasKey("isSpawnMode")) { - isSpawnMode = true; - } else { - isSpawnMode = nbtRoot.getBoolean("isSpawnMode"); + + @Override + public String getMachineName() { + return ModObject.blockPoweredSpawner.unlocalisedName; } - super.readCommon(nbtRoot); - } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - if(hasEntityName()) { - BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, getEntityName()); - } else { - BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, null); - } - nbtRoot.setBoolean("isSpawnMode", isSpawnMode); - super.writeCommon(nbtRoot); - } - - @Override - protected void updateEntityClient() { - if(isActive()) { - double x = xCoord + worldObj.rand.nextFloat(); - double y = yCoord + worldObj.rand.nextFloat(); - double z = zCoord + worldObj.rand.nextFloat(); - worldObj.spawnParticle("smoke", x, y, z, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle("flame", x, y, z, 0.0D, 0.0D, 0.0D); - } - super.updateEntityClient(); - } - - @Override - protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { - PoweredTask res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); - - int ticksDelay; - if(isSpawnMode) { - ticksDelay = TilePoweredSpawner.MIN_SPAWN_DELAY_BASE - + (int) Math.round((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) * Math.random()); - } else { - ticksDelay = TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - ((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) / 2); - } - ticksDelay >>= Math.min(3, getCapacitor().getTier() - 1); - int powerPerTick = getPowerUsePerTick(); - res.setRequiredEnergy(powerPerTick * ticksDelay); - return res; - } - - protected boolean canSpawnEntity(EntityLiving entityliving) { - boolean spaceClear = worldObj.checkNoEntityCollision(entityliving.boundingBox) - && worldObj.getCollidingBoundingBoxes(entityliving, entityliving.boundingBox).isEmpty() - && (!worldObj.isAnyLiquid(entityliving.boundingBox) || entityliving.isCreatureType(EnumCreatureType.waterCreature, false)); - if(spaceClear && USE_VANILLA_SPAWN_CHECKS) { - //Full checks for lighting, dimension etc - spaceClear = entityliving.getCanSpawnHere(); - } - return spaceClear; - } - - Entity createEntity(boolean forceAlive) { - Entity ent = EntityList.createEntityByName(getEntityName(), worldObj); - if(forceAlive && MIN_PLAYER_DISTANCE <= 0 && Config.poweredSpawnerDespawnTimeSeconds > 0 && ent instanceof EntityLiving) { - ent.getEntityData().setLong(BlockPoweredSpawner.KEY_SPAWNED_BY_POWERED_SPAWNER, worldObj.getTotalWorldTime()); - ((EntityLiving) ent).func_110163_bv(); - } - return ent; - } - - protected boolean trySpawnEntity() { - Entity entity = createEntity(true); - if(!(entity instanceof EntityLiving)) { - return false; - } - EntityLiving entityliving = (EntityLiving) entity; - int spawnRange = Config.poweredSpawnerSpawnRange; - - if(Config.poweredSpawnerMaxNearbyEntities > 0) { - int nearbyEntities = worldObj.getEntitiesWithinAABB( - entity.getClass(), - AxisAlignedBB.getBoundingBox( - xCoord - spawnRange*2, yCoord - 4, zCoord - spawnRange*2, - xCoord + spawnRange*2, yCoord + 4, zCoord + spawnRange*2)).size(); - - if(nearbyEntities >= Config.poweredSpawnerMaxNearbyEntities) { + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + if (itemstack == null || isSpawnMode) { + return false; + } + if (slotDefinition.isInputSlot(i)) { + return itemstack.getItem() == EnderIO.itemSoulVessel && !EnderIO.itemSoulVessel.containsSoul(itemstack); + } return false; - } } - while(remainingSpawnTries-- > 0) { - double x = xCoord + (worldObj.rand.nextDouble() - worldObj.rand.nextDouble()) * spawnRange; - double y = yCoord + worldObj.rand.nextInt(3) - 1; - double z = zCoord + (worldObj.rand.nextDouble() - worldObj.rand.nextDouble()) * spawnRange; - entity.setLocationAndAngles(x, y, z, worldObj.rand.nextFloat() * 360.0F, 0.0F); + @Override + protected IMachineRecipe canStartNextTask(float chance) { + if (!hasEntityName()) { + return null; + } + if (isSpawnMode) { + if (MIN_PLAYER_DISTANCE > 0) { + if (worldObj.getClosestPlayer(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, MIN_PLAYER_DISTANCE) == null) { + return null; + } + } + } else { + if (getStackInSlot(0) == null || getStackInSlot(1) != null) { + return null; + } + } + return new DummyRecipe(); + } - if(canSpawnEntity(entityliving)) { - entityliving.onSpawnWithEgg(null); - worldObj.spawnEntityInWorld(entityliving); - worldObj.playAuxSFX(2004, xCoord, yCoord, zCoord, 0); - entityliving.spawnExplosionParticle(); + @Override + protected boolean startNextTask(IMachineRecipe nextRecipe, float chance) { + return super.startNextTask(nextRecipe, chance); + } + + @Override + public int getPowerUsePerTick() { + return powerUsePerTick; + } + + @Override + protected boolean hasInputStacks() { return true; - } } - return false; - } + @Override + protected boolean canInsertResult(float chance, IMachineRecipe nextRecipe) { + return true; + } - public String getEntityName() { - return entityTypeName; - } + @Override + public void readCommon(NBTTagCompound nbtRoot) { + // Must read the mob type first so we know the multiplier to be used when calculating input/output power + String mobType = BlockPoweredSpawner.readMobTypeFromNBT(nbtRoot); + if (mobType == null) { + mobType = NULL_ENTITY_NAME; + } + entityTypeName = mobType; + if (!nbtRoot.hasKey("isSpawnMode")) { + isSpawnMode = true; + } else { + isSpawnMode = nbtRoot.getBoolean("isSpawnMode"); + } + super.readCommon(nbtRoot); + } - public boolean hasEntityName() { - return !NULL_ENTITY_NAME.equals(entityTypeName); - } + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + if (hasEntityName()) { + BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, getEntityName()); + } else { + BlockPoweredSpawner.writeMobTypeToNBT(nbtRoot, null); + } + nbtRoot.setBoolean("isSpawnMode", isSpawnMode); + super.writeCommon(nbtRoot); + } + + @Override + protected void updateEntityClient() { + if (isActive()) { + double x = xCoord + worldObj.rand.nextFloat(); + double y = yCoord + worldObj.rand.nextFloat(); + double z = zCoord + worldObj.rand.nextFloat(); + worldObj.spawnParticle("smoke", x, y, z, 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle("flame", x, y, z, 0.0D, 0.0D, 0.0D); + } + super.updateEntityClient(); + } + + @Override + protected IPoweredTask createTask(IMachineRecipe nextRecipe, float chance) { + PoweredTask res = new PoweredTask(nextRecipe, chance, getRecipeInputs()); + + int ticksDelay; + if (isSpawnMode) { + ticksDelay = TilePoweredSpawner.MIN_SPAWN_DELAY_BASE + + (int) Math.round( + (TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) + * Math.random()); + } else { + ticksDelay = TilePoweredSpawner.MAX_SPAWN_DELAY_BASE + - ((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) / 2); + } + ticksDelay >>= Math.min(3, getCapacitor().getTier() - 1); + int powerPerTick = getPowerUsePerTick(); + res.setRequiredEnergy(powerPerTick * ticksDelay); + return res; + } + + protected boolean canSpawnEntity(EntityLiving entityliving) { + boolean spaceClear = worldObj.checkNoEntityCollision(entityliving.boundingBox) + && worldObj.getCollidingBoundingBoxes(entityliving, entityliving.boundingBox) + .isEmpty() + && (!worldObj.isAnyLiquid(entityliving.boundingBox) + || entityliving.isCreatureType(EnumCreatureType.waterCreature, false)); + if (spaceClear && USE_VANILLA_SPAWN_CHECKS) { + // Full checks for lighting, dimension etc + spaceClear = entityliving.getCanSpawnHere(); + } + return spaceClear; + } + + Entity createEntity(boolean forceAlive) { + Entity ent = EntityList.createEntityByName(getEntityName(), worldObj); + if (forceAlive + && MIN_PLAYER_DISTANCE <= 0 + && Config.poweredSpawnerDespawnTimeSeconds > 0 + && ent instanceof EntityLiving) { + ent.getEntityData() + .setLong(BlockPoweredSpawner.KEY_SPAWNED_BY_POWERED_SPAWNER, worldObj.getTotalWorldTime()); + ((EntityLiving) ent).func_110163_bv(); + } + return ent; + } + + protected boolean trySpawnEntity() { + Entity entity = createEntity(true); + if (!(entity instanceof EntityLiving)) { + return false; + } + EntityLiving entityliving = (EntityLiving) entity; + int spawnRange = Config.poweredSpawnerSpawnRange; + + if (Config.poweredSpawnerMaxNearbyEntities > 0) { + int nearbyEntities = worldObj.getEntitiesWithinAABB( + entity.getClass(), + AxisAlignedBB.getBoundingBox( + xCoord - spawnRange * 2, + yCoord - 4, + zCoord - spawnRange * 2, + xCoord + spawnRange * 2, + yCoord + 4, + zCoord + spawnRange * 2)) + .size(); + + if (nearbyEntities >= Config.poweredSpawnerMaxNearbyEntities) { + return false; + } + } + + while (remainingSpawnTries-- > 0) { + double x = xCoord + (worldObj.rand.nextDouble() - worldObj.rand.nextDouble()) * spawnRange; + double y = yCoord + worldObj.rand.nextInt(3) - 1; + double z = zCoord + (worldObj.rand.nextDouble() - worldObj.rand.nextDouble()) * spawnRange; + entity.setLocationAndAngles(x, y, z, worldObj.rand.nextFloat() * 360.0F, 0.0F); + + if (canSpawnEntity(entityliving)) { + entityliving.onSpawnWithEgg(null); + worldObj.spawnEntityInWorld(entityliving); + worldObj.playAuxSFX(2004, xCoord, yCoord, zCoord, 0); + entityliving.spawnExplosionParticle(); + return true; + } + } + + return false; + } + + public String getEntityName() { + return entityTypeName; + } + + public boolean hasEntityName() { + return !NULL_ENTITY_NAME.equals(entityTypeName); + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java index 820c3916..ee6c2e3e 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java @@ -1,9 +1,12 @@ package crazypants.enderio.machine.tank; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.tool.SmartTank; import java.util.List; - -import javax.annotation.Nullable; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,103 +19,95 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidContainerItem; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.tool.SmartTank; - public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedTooltipProvider, IFluidContainerItem { - public BlockItemTank() { - super(EnderIO.blockTank,EnderIO.blockTank); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - public BlockItemTank(Block block) { - super(block, block); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - String result = super.getUnlocalizedName(par1ItemStack); - if(meta == 1) { - result += ".advanced"; + public BlockItemTank() { + super(EnderIO.blockTank, EnderIO.blockTank); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); } - return result; - } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack stack = new ItemStack(this, 1,0); - par3List.add(stack); - stack = new ItemStack(this, 1,1); - par3List.add(stack); - } - - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - EnderIO.blockTank.addCommonEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - EnderIO.blockTank.addBasicEntries(itemstack, entityplayer, list, flag); - } - - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag); - } - - private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000); - - private FluidTank loadTank(ItemStack stack) { - if (stack.hasTagCompound()) { - FluidTank tank = TileTank.loadTank(stack.getTagCompound()); - return tank != null ? tank : dummy; + public BlockItemTank(Block block) { + super(block, block); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); } - return dummy; - } - - private void saveTank(ItemStack stack, FluidTank tank) { - if (!stack.hasTagCompound()) { - stack.setTagCompound(new NBTTagCompound()); + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + String result = super.getUnlocalizedName(par1ItemStack); + if (meta == 1) { + result += ".advanced"; + } + return result; } - TileTank.saveTank(stack.getTagCompound(), tank); - } - @Override - public FluidStack getFluid(ItemStack container) { - return loadTank(container).getFluid(); - } + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack stack = new ItemStack(this, 1, 0); + par3List.add(stack); + stack = new ItemStack(this, 1, 1); + par3List.add(stack); + } - @Override - public int getCapacity(ItemStack container) { - return loadTank(container).getCapacity(); - } + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + EnderIO.blockTank.addCommonEntries(itemstack, entityplayer, list, flag); + } - @Override - public int fill(ItemStack container, FluidStack resource, boolean doFill) { - FluidTank tank = loadTank(container); - int ret = tank.fill(resource, doFill); - saveTank(container, tank); - return ret; - } + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + EnderIO.blockTank.addBasicEntries(itemstack, entityplayer, list, flag); + } - @Override - public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - FluidTank tank = loadTank(container); - FluidStack ret = tank.drain(maxDrain, doDrain); - saveTank(container, tank); - return ret; - } + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag); + } + + private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000); + + private FluidTank loadTank(ItemStack stack) { + if (stack.hasTagCompound()) { + FluidTank tank = TileTank.loadTank(stack.getTagCompound()); + return tank != null ? tank : dummy; + } + return dummy; + } + + private void saveTank(ItemStack stack, FluidTank tank) { + if (!stack.hasTagCompound()) { + stack.setTagCompound(new NBTTagCompound()); + } + TileTank.saveTank(stack.getTagCompound(), tank); + } + + @Override + public FluidStack getFluid(ItemStack container) { + return loadTank(container).getFluid(); + } + + @Override + public int getCapacity(ItemStack container) { + return loadTank(container).getCapacity(); + } + + @Override + public int fill(ItemStack container, FluidStack resource, boolean doFill) { + FluidTank tank = loadTank(container); + int ret = tank.fill(resource, doFill); + saveTank(container, tank); + return ret; + } + + @Override + public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { + FluidTank tank = loadTank(container); + FluidStack ret = tank.drain(maxDrain, doDrain); + saveTank(container, tank); + return ret; + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index acb5cdcd..6d6ea8a2 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -1,7 +1,19 @@ package crazypants.enderio.machine.tank; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ClientProxy; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -17,220 +29,224 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.ClientProxy; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.network.PacketHandler; - public class BlockTank extends AbstractMachineBlock implements IAdvancedTooltipProvider { - public static BlockTank create() { - PacketHandler.INSTANCE.registerMessage(PacketTankFluid.class, PacketTankFluid.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketTankVoidMode.class, PacketTankVoidMode.class, PacketHandler.nextID(), Side.SERVER); - BlockTank res = new BlockTank(); - res.init(); - return res; - } - - protected BlockTank() { - super(ModObject.blockTank, TileTank.class); - setStepSound(Block.soundTypeGlass); - setLightOpacity(0); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemTank.class, modObject.unlocalisedName); - GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); - EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); - } - - @Override - public int damageDropped(int par1) { - return par1; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { - list.add(new ItemStack(this, 1, 0)); - list.add(new ItemStack(this, 1, 1)); - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TileTank(metadata); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileTank)) { - return null; + public static BlockTank create() { + PacketHandler.INSTANCE.registerMessage( + PacketTankFluid.class, PacketTankFluid.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketTankVoidMode.class, PacketTankVoidMode.class, PacketHandler.nextID(), Side.SERVER); + BlockTank res = new BlockTank(); + res.init(); + return res; } - return new ContainerTank(player.inventory, (TileTank) te); - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileTank)) { - return null; + protected BlockTank() { + super(ModObject.blockTank, TileTank.class); + setStepSound(Block.soundTypeGlass); + setLightOpacity(0); } - return new GuiTank(player.inventory, (TileTank) te); - } - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_TANK; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - - // used to render the block in the world - TileEntity te = world.getTileEntity(x, y, z); - int facing = 0; - if(te instanceof AbstractMachineEntity) { - AbstractMachineEntity me = (AbstractMachineEntity) te; - facing = me.facing; + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemTank.class, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } - int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, 1); - if(meta == 1) { - return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] + 6]; - } else { - return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing]]; + + @Override + public int damageDropped(int par1) { + return par1; } - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - int offset = MathHelper.clamp_int(blockMeta, 0, 1) == 0 ? 0 : 6; - return iconBuffer[0][blockSide + offset]; - } - - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - TileEntity tank = world.getTileEntity(x, y, z); - if(tank instanceof TileTank) { - FluidStack stack = ((TileTank) tank).tank.getFluid(); - return stack == null || stack.amount <= 0 ? 0 : stack.getFluid().getLuminosity(stack); + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); } - return super.getLightValue(world, x, y, z); - } - @Override - protected String getMachineFrontIconKey(boolean pressurized) { - if(pressurized) { - return "enderio:blockTankAdvanced"; + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileTank(metadata); } - return "enderio:blockTank"; - } - @Override - protected String getSideIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - - @Override - protected String getBackIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - - @Override - protected String getTopIconKey(boolean pressurized) { - if(pressurized) { - return "enderio:blockTankTopAdvanced"; + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileTank)) { + return null; + } + return new ContainerTank(player.inventory, (TileTank) te); } - return "enderio:machineTop"; - } - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, 1); - if(meta == 1) { - return 2000; - } else { - return super.getExplosionResistance(par1Entity); + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof TileTank)) { + return null; + } + return new GuiTank(player.inventory, (TileTank) te); } - } - @Override - public boolean hasComparatorInputOverride() { - return true; - } - - @Override - public int getComparatorInputOverride(World w, int x, int y, int z, int side) { - TileEntity te = w.getTileEntity(x, y, z); - if (te instanceof TileTank) { - return ((TileTank) te).getComparatorOutput(); + @Override + public boolean isOpaqueCube() { + return false; } - return 0; - } - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("tankContents")) { - FluidStack fl = FluidStack.loadFluidStackFromNBT((NBTTagCompound) itemstack.stackTagCompound.getTag("tankContents")); - if(fl != null && fl.getFluid() != null) { - String str = fl.amount + " " + EnderIO.lang.localize("fluid.millibucket.abr") + " " + PowerDisplayUtil.ofStr() + " " + fl.getFluid().getLocalizedName(); - list.add(str); - } + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_TANK; } - } - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - if(itemstack.getItemDamage() == 1) { - list.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("blastResistant")); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + + // used to render the block in the world + TileEntity te = world.getTileEntity(x, y, z); + int facing = 0; + if (te instanceof AbstractMachineEntity) { + AbstractMachineEntity me = (AbstractMachineEntity) te; + facing = me.facing; + } + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, 1); + if (meta == 1) { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing] + 6]; + } else { + return iconBuffer[0][ClientProxy.sideAndFacingToSpriteOffset[blockSide][facing]]; + } } - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - System.out.println("BlockTank.getUnlocalizedNameForTooltip: "); - return stack.getUnlocalizedName(); - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTank) { - TileTank tank = (TileTank) te; - FluidStack stored = tank.tank.getFluid(); - String fluid = stored == null ? EnderIO.lang.localize("tooltip.none") : stored.getFluid().getLocalizedName(stored); - int amount = stored == null ? 0 : stored.amount; - - tooltip.add(String.format("%s%s : %s (%d %s)", EnumChatFormatting.WHITE, EnderIO.lang.localize("tooltip.fluidStored"), fluid, amount, EnderIO.lang.localize("fluid.millibucket.abr"))); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int blockSide, int blockMeta) { + int offset = MathHelper.clamp_int(blockMeta, 0, 1) == 0 ? 0 : 6; + return iconBuffer[0][blockSide + offset]; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + TileEntity tank = world.getTileEntity(x, y, z); + if (tank instanceof TileTank) { + FluidStack stack = ((TileTank) tank).tank.getFluid(); + return stack == null || stack.amount <= 0 ? 0 : stack.getFluid().getLuminosity(stack); + } + return super.getLightValue(world, x, y, z); + } + + @Override + protected String getMachineFrontIconKey(boolean pressurized) { + if (pressurized) { + return "enderio:blockTankAdvanced"; + } + return "enderio:blockTank"; + } + + @Override + protected String getSideIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + + @Override + protected String getBackIconKey(boolean active) { + return getMachineFrontIconKey(active); + } + + @Override + protected String getTopIconKey(boolean pressurized) { + if (pressurized) { + return "enderio:blockTankTopAdvanced"; + } + return "enderio:machineTop"; + } + + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, 1); + if (meta == 1) { + return 2000; + } else { + return super.getExplosionResistance(par1Entity); + } + } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World w, int x, int y, int z, int side) { + TileEntity te = w.getTileEntity(x, y, z); + if (te instanceof TileTank) { + return ((TileTank) te).getComparatorOutput(); + } + return 0; + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if (itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("tankContents")) { + FluidStack fl = FluidStack.loadFluidStackFromNBT( + (NBTTagCompound) itemstack.stackTagCompound.getTag("tankContents")); + if (fl != null && fl.getFluid() != null) { + String str = fl.amount + " " + EnderIO.lang.localize("fluid.millibucket.abr") + " " + + PowerDisplayUtil.ofStr() + " " + fl.getFluid().getLocalizedName(); + list.add(str); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); + if (itemstack.getItemDamage() == 1) { + list.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("blastResistant")); + } + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + System.out.println("BlockTank.getUnlocalizedNameForTooltip: "); + return stack.getUnlocalizedName(); + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTank) { + TileTank tank = (TileTank) te; + FluidStack stored = tank.tank.getFluid(); + String fluid = stored == null + ? EnderIO.lang.localize("tooltip.none") + : stored.getFluid().getLocalizedName(stored); + int amount = stored == null ? 0 : stored.amount; + + tooltip.add(String.format( + "%s%s : %s (%d %s)", + EnumChatFormatting.WHITE, + EnderIO.lang.localize("tooltip.fluidStored"), + fluid, + amount, + EnderIO.lang.localize("fluid.millibucket.abr"))); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java index 17fa052d..3740fdc5 100644 --- a/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/ContainerTank.java @@ -1,68 +1,71 @@ package crazypants.enderio.machine.tank; -import java.util.List; -import java.util.Random; - import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; import com.enderio.core.client.gui.widget.GhostSlot; - +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.gui.AbstractMachineContainer; +import java.util.List; +import java.util.Random; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerTank extends AbstractMachineContainer { - static private final Item[] slotItems = { Items.water_bucket, Items.lava_bucket, EnderIO.itemBucketNutrientDistillation, - EnderIO.itemBucketHootch, EnderIO.itemBucketRocketFuel, EnderIO.itemBucketFireWater }; - static private final Random rand = new Random(); + private static final Item[] slotItems = { + Items.water_bucket, + Items.lava_bucket, + EnderIO.itemBucketNutrientDistillation, + EnderIO.itemBucketHootch, + EnderIO.itemBucketRocketFuel, + EnderIO.itemBucketFireWater + }; + private static final Random rand = new Random(); - public ContainerTank(InventoryPlayer playerInv, TileTank te) { - super(playerInv, te); - } + public ContainerTank(InventoryPlayer playerInv, TileTank te) { + super(playerInv, te); + } - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 44, 21) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 116, 21) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 2, 10000, 10000) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(2, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 3, 44, 52) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(3, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 4, 116, 52) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(4, itemStack); - } - }); - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 44, 21)); - slots.add(new GhostBackgroundItemSlot(Items.bucket, 116, 21)); - slots.add(new GhostBackgroundItemSlot(Items.bucket, 44, 52)); - slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 116, 52)); - } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 44, 21) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 116, 21) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 2, 10000, 10000) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(2, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 3, 44, 52) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(3, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 4, 116, 52) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(4, itemStack); + } + }); + } + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 44, 21)); + slots.add(new GhostBackgroundItemSlot(Items.bucket, 116, 21)); + slots.add(new GhostBackgroundItemSlot(Items.bucket, 44, 52)); + slots.add(new GhostBackgroundItemSlot(slotItems[rand.nextInt(slotItems.length)], 116, 52)); + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 347d364e..c257bf7e 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -1,140 +1,134 @@ package crazypants.enderio.machine.tank; -import java.awt.Rectangle; -import java.util.List; -import java.util.Locale; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.CycleButton; import com.enderio.core.client.gui.button.CycleButton.ICycleEnum; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiMachineBase; -import crazypants.enderio.machine.killera.ContainerKillerJoe; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import java.util.List; +import java.util.Locale; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import org.lwjgl.opengl.GL11; public class GuiTank extends GuiMachineBase { - public enum VoidMode implements ICycleEnum { - ALWAYS(IconEIO.TICK), - IF_NOT_CONTAINER(IconEIO.ITEM_SINGLE), - NEVER(IconEIO.CROSS); - - private final IWidgetIcon icon; - private final List unlocTooltips; - - private VoidMode(IWidgetIcon icon) { - this.icon = icon; - String prefix = "gui.void.mode"; - String mode = prefix + "." + name().toLowerCase(Locale.US); - this.unlocTooltips = Lists.newArrayList(prefix, mode, mode + ".desc"); - } + public enum VoidMode implements ICycleEnum { + ALWAYS(IconEIO.TICK), + IF_NOT_CONTAINER(IconEIO.ITEM_SINGLE), + NEVER(IconEIO.CROSS); - @Override - public IWidgetIcon getIcon() { - return icon; - } + private final IWidgetIcon icon; + private final List unlocTooltips; - @Override - public List getTooltipLines() { - return EnderIO.lang.localizeAll(unlocTooltips); - } - } - - private CycleButton voidBut; - - public GuiTank(InventoryPlayer par1InventoryPlayer, TileTank te) { - super(te, new ContainerTank(par1InventoryPlayer, te), "tank"); - - addToolTip(new GuiToolTip(new Rectangle(80, 21, 16, 47), "") { - - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("tank.tank"); - if(getTileEntity().tank.getFluid() != null) { - heading += ": " + getTileEntity().tank.getFluid().getLocalizedName(); + private VoidMode(IWidgetIcon icon) { + this.icon = icon; + String prefix = "gui.void.mode"; + String mode = prefix + "." + name().toLowerCase(Locale.US); + this.unlocTooltips = Lists.newArrayList(prefix, mode, mode + ".desc"); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().tank)); - } - }); - - addToolTip(new GuiToolTip(new Rectangle(14, 35, 18, 18), EnderIO.lang.localize("gui.tooltip.voidslot")) { - public boolean shouldDraw() { - return super.shouldDraw() && getTileEntity().canVoidItems(); - } - }); - - voidBut = new CycleButton(this, 123, 155, 43, VoidMode.class); - } + @Override + public IWidgetIcon getIcon() { + return icon; + } - @Override - public void initGui() { - super.initGui(); - voidBut.onGuiInit(); - voidBut.setMode(getTileEntity().getVoidMode()); - ((ContainerTank) inventorySlots).createGhostSlots(getGhostSlots()); - } - - @Override - public void updateScreen() { - Slot slot = (Slot) inventorySlots.inventorySlots.get(2); - if (getTileEntity().canVoidItems()) { - slot.xDisplayPosition = 15; - slot.yDisplayPosition = 36; - voidBut.onGuiInit(); - } else { - slot.xDisplayPosition = 10000; - slot.yDisplayPosition = 10000; - voidBut.detach(); - } - } - - @Override - protected void actionPerformed(GuiButton button) { - super.actionPerformed(button); - if (button.id == voidBut.id) { - getTileEntity().setVoidMode(voidBut.getMode()); - PacketHandler.INSTANCE.sendToServer(new PacketTankVoidMode(getTileEntity())); - } - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - - if (getTileEntity().canVoidItems()) { - Slot slot = (Slot) inventorySlots.inventorySlots.get(2); - drawTexturedModalRect(sx + slot.xDisplayPosition - 1, sy + slot.yDisplayPosition - 1, xSize, 0, 18, 18); - IconEIO.map.render(IconEIO.MINUS, sx + slot.xDisplayPosition, sy + slot.yDisplayPosition, true); + @Override + public List getTooltipLines() { + return EnderIO.lang.localizeAll(unlocTooltips); + } } - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - RenderUtil.bindBlockTexture(); - RenderUtil.renderGuiTank(getTileEntity().tank, guiLeft + 80, guiTop + 21, zLevel, 16,47); - } + private CycleButton voidBut; + + public GuiTank(InventoryPlayer par1InventoryPlayer, TileTank te) { + super(te, new ContainerTank(par1InventoryPlayer, te), "tank"); + + addToolTip(new GuiToolTip(new Rectangle(80, 21, 16, 47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("tank.tank"); + if (getTileEntity().tank.getFluid() != null) { + heading += ": " + getTileEntity().tank.getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().tank)); + } + }); + + addToolTip(new GuiToolTip(new Rectangle(14, 35, 18, 18), EnderIO.lang.localize("gui.tooltip.voidslot")) { + public boolean shouldDraw() { + return super.shouldDraw() && getTileEntity().canVoidItems(); + } + }); + + voidBut = new CycleButton(this, 123, 155, 43, VoidMode.class); + } + + @Override + public void initGui() { + super.initGui(); + voidBut.onGuiInit(); + voidBut.setMode(getTileEntity().getVoidMode()); + ((ContainerTank) inventorySlots).createGhostSlots(getGhostSlots()); + } + + @Override + public void updateScreen() { + Slot slot = (Slot) inventorySlots.inventorySlots.get(2); + if (getTileEntity().canVoidItems()) { + slot.xDisplayPosition = 15; + slot.yDisplayPosition = 36; + voidBut.onGuiInit(); + } else { + slot.xDisplayPosition = 10000; + slot.yDisplayPosition = 10000; + voidBut.detach(); + } + } + + @Override + protected void actionPerformed(GuiButton button) { + super.actionPerformed(button); + if (button.id == voidBut.id) { + getTileEntity().setVoidMode(voidBut.getMode()); + PacketHandler.INSTANCE.sendToServer(new PacketTankVoidMode(getTileEntity())); + } + } + + @Override + protected boolean showRecipeButton() { + return false; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + + if (getTileEntity().canVoidItems()) { + Slot slot = (Slot) inventorySlots.inventorySlots.get(2); + drawTexturedModalRect(sx + slot.xDisplayPosition - 1, sy + slot.yDisplayPosition - 1, xSize, 0, 18, 18); + IconEIO.map.render(IconEIO.MINUS, sx + slot.xDisplayPosition, sy + slot.yDisplayPosition, true); + } + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + RenderUtil.bindBlockTexture(); + RenderUtil.renderGuiTank(getTileEntity().tank, guiLeft + 80, guiTop + 21, zLevel, 16, 47); + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTankFluid.java b/src/main/java/crazypants/enderio/machine/tank/PacketTankFluid.java index bb7a2b38..367d1fd6 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTankFluid.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTankFluid.java @@ -1,59 +1,56 @@ package crazypants.enderio.machine.tank; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; public class PacketTankFluid extends MessageTileEntity implements IMessageHandler { - private NBTTagCompound nbtRoot; + private NBTTagCompound nbtRoot; - public PacketTankFluid() { - } + public PacketTankFluid() {} - public PacketTankFluid(TileTank tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.tank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.tank.writeToNBT(tankRoot); - nbtRoot.setTag("tank", tankRoot); + public PacketTankFluid(TileTank tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + if (tile.tank.getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.tank.writeToNBT(tankRoot); + nbtRoot.setTag("tank", tankRoot); + } } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - public IMessage onMessage(PacketTankFluid message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileTank tile = message.getTileEntity(player.worldObj); - if(tile == null) { - return null; + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } - if(message.nbtRoot.hasKey("tank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); - tile.tank.readFromNBT(tankRoot); - } else { - tile.tank.setFluid(null); + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + nbtRoot = NetworkUtil.readNBTTagCompound(buf); } - return null; - } -} \ No newline at end of file + + @Override + public IMessage onMessage(PacketTankFluid message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileTank tile = message.getTileEntity(player.worldObj); + if (tile == null) { + return null; + } + if (message.nbtRoot.hasKey("tank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); + tile.tank.readFromNBT(tankRoot); + } else { + tile.tank.setFluid(null); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTankVoidMode.java b/src/main/java/crazypants/enderio/machine/tank/PacketTankVoidMode.java index a6a4ba1d..3ae9b8ac 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTankVoidMode.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTankVoidMode.java @@ -1,44 +1,42 @@ package crazypants.enderio.machine.tank; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.tank.GuiTank.VoidMode; +import io.netty.buffer.ByteBuf; -public class PacketTankVoidMode extends MessageTileEntity implements IMessageHandler { +public class PacketTankVoidMode extends MessageTileEntity + implements IMessageHandler { - public PacketTankVoidMode() { - } + public PacketTankVoidMode() {} - private VoidMode mode; + private VoidMode mode; - public PacketTankVoidMode(TileTank tank) { - super(tank); - this.mode = tank.getVoidMode(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeByte(mode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - mode = VoidMode.values()[buf.readByte()]; - } - - @Override - public IMessage onMessage(PacketTankVoidMode message, MessageContext ctx) { - TileTank te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - te.setVoidMode(message.mode); + public PacketTankVoidMode(TileTank tank) { + super(tank); + this.mode = tank.getVoidMode(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeByte(mode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + mode = VoidMode.values()[buf.readByte()]; + } + + @Override + public IMessage onMessage(PacketTankVoidMode message, MessageContext ctx) { + TileTank te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + te.setVoidMode(message.mode); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java index d2b1d158..7fb3be70 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java @@ -1,62 +1,58 @@ package crazypants.enderio.machine.tank; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.tool.SmartTank; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class TankFluidRenderer extends TileEntitySpecialRenderer { - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { - TileTank tank = (TileTank)te; - if(tank.tank.getFluidAmount() <= 0) { - return; + TileTank tank = (TileTank) te; + if (tank.tank.getFluidAmount() <= 0) { + return; + } + renderTankFluid(tank.tank, (float) x, (float) y, (float) z); } - renderTankFluid(tank.tank, (float)x, (float)y, (float)z); - } - public static void renderTankFluid(SmartTank tank, float x, float y, float z) { - if(tank == null || tank.getFluid() == null) { - return; + public static void renderTankFluid(SmartTank tank, float x, float y, float z) { + if (tank == null || tank.getFluid() == null) { + return; + } + IIcon icon = tank.getFluid().getFluid().getStillIcon(); + if (icon != null) { + float fullness = tank.getFilledRatio(); + y += 0.01f; // prevent bottom side z-fighting + float scale = 0.98f; + float yScale = 0.98f * fullness; + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(scale, yScale, scale); + bb = bb.translate(0, -(1 - yScale) / 2, 0); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + RenderUtil.bindBlockTexture(); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.addTranslation(x, y, z); + CubeRenderer.render(bb, icon); + Tessellator.instance.addTranslation(-x, -y, -z); + Tessellator.instance.draw(); + + GL11.glPopAttrib(); + } } - IIcon icon = tank.getFluid().getFluid().getStillIcon(); - if(icon != null) { - float fullness = tank.getFilledRatio(); - y += 0.01f; // prevent bottom side z-fighting - float scale = 0.98f; - float yScale = 0.98f * fullness; - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(scale, yScale , scale); - bb = bb.translate(0, -(1 - yScale)/2, 0); - - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - RenderUtil.bindBlockTexture(); - - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.addTranslation(x, y, z); - CubeRenderer.render(bb, icon); - Tessellator.instance.addTranslation(-x, -y, -z); - Tessellator.instance.draw(); - - GL11.glPopAttrib(); - } - } - } diff --git a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java index 0c5bd476..ac533743 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java @@ -1,52 +1,49 @@ package crazypants.enderio.machine.tank; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.EnderIO; - public class TankItemRenderer implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if (data != null && data.length > 0) { - renderToInventory(item, (RenderBlocks) data[0]); - } - } - - public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - if (item.hasTagCompound()) { - TankFluidRenderer.renderTankFluid(TileTank.loadTank(item.stackTagCompound), 0, -0.1f, 0); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - GL11.glEnable(GL11.GL_ALPHA_TEST); - Block block = EnderIO.blockTank; - int meta = item.getItemDamage(); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } - IIcon[] icons = RenderUtil.getBlockTextures(block, meta); - BoundingBox bb = BoundingBox.UNIT_CUBE.translate(0, -0.1f, 0); - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(bb, icons, null, RenderUtil.getDefaultPerSideBrightness()); - Tessellator.instance.draw(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (data != null && data.length > 0) { + renderToInventory(item, (RenderBlocks) data[0]); + } + } + + public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + if (item.hasTagCompound()) { + TankFluidRenderer.renderTankFluid(TileTank.loadTank(item.stackTagCompound), 0, -0.1f, 0); + } + + GL11.glEnable(GL11.GL_ALPHA_TEST); + Block block = EnderIO.blockTank; + int meta = item.getItemDamage(); + + IIcon[] icons = RenderUtil.getBlockTextures(block, meta); + BoundingBox bb = BoundingBox.UNIT_CUBE.translate(0, -0.1f, 0); + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(bb, icons, null, RenderUtil.getDefaultPerSideBrightness()); + Tessellator.instance.draw(); + } } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 64cb4b94..9ba51893 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -1,5 +1,17 @@ package crazypants.enderio.machine.tank; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import com.enderio.core.common.util.FluidUtil.FluidAndStackResult; +import com.enderio.core.common.util.ItemUtil; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.tank.GuiTank.VoidMode; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.tool.ArrayMappingTool; +import crazypants.enderio.tool.SmartTank; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -14,427 +26,422 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; -import com.enderio.core.common.util.FluidUtil.FluidAndStackResult; -import com.enderio.core.common.util.ItemUtil; - -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.tank.GuiTank.VoidMode; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.tool.ArrayMappingTool; -import crazypants.enderio.tool.SmartTank; - public class TileTank extends AbstractMachineEntity implements IFluidHandler, ITankAccess { - private static int IO_MB_TICK = 100; + private static int IO_MB_TICK = 100; - protected SmartTank tank;// = new FluidTankEio(16000); - protected int lastUpdateLevel = -1; - - private boolean tankDirty = false; - private Fluid lastFluid = null; + protected SmartTank tank; // = new FluidTankEio(16000); + protected int lastUpdateLevel = -1; - private VoidMode voidMode = VoidMode.NEVER; + private boolean tankDirty = false; + private Fluid lastFluid = null; - public TileTank(int meta) { - super(new SlotDefinition(0, 2, 3, 4, -1, -1)); - if(meta == 1) { - tank = new SmartTank(32000); - } else { - tank = new SmartTank(16000); - } - } + private VoidMode voidMode = VoidMode.NEVER; - public TileTank() { - this(0); - } - - @Override - protected boolean doPush(ForgeDirection dir) { - - if(isSideDisabled(dir.ordinal())) { - return false; - } - - boolean res = super.doPush(dir); - if(tank.getFluidAmount() > 0) { - - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - if(target.canFill(dir.getOpposite(), tank.getFluid().getFluid())) { - FluidStack push = tank.getFluid().copy(); - push.amount = Math.min(push.amount, IO_MB_TICK); - int filled = target.fill(dir.getOpposite(), push, true); - if(filled > 0) { - tank.drain(filled, true); - tankDirty = true; - return res; - } - } - } - - } - return res; - } - - @Override - protected boolean doPull(ForgeDirection dir) { - - if(isSideDisabled(dir.ordinal())) { - return false; - } - - boolean res = super.doPull(dir); - if(tank.getFluidAmount() < tank.getCapacity()) { - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - - if(tank.getFluidAmount() > 0) { - FluidStack canPull = tank.getFluid().copy(); - canPull.amount = tank.getCapacity() - tank.getFluidAmount(); - canPull.amount = Math.min(canPull.amount, IO_MB_TICK); - FluidStack drained = target.drain(dir.getOpposite(), canPull, true); - if(drained != null && drained.amount > 0) { - tank.fill(drained, true); - tankDirty = true; - return res; - } + public TileTank(int meta) { + super(new SlotDefinition(0, 2, 3, 4, -1, -1)); + if (meta == 1) { + tank = new SmartTank(32000); } else { + tank = new SmartTank(16000); + } + } - FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0) { - if(canFill(dir, info.fluid.getFluid())) { - FluidStack canPull = info.fluid.copy(); - canPull.amount = Math.min(IO_MB_TICK, canPull.amount); - FluidStack drained = target.drain(dir.getOpposite(), canPull, true); - if(drained != null && drained.amount > 0) { - tank.fill(drained, true); - tankDirty = true; - return res; - } - } - } - } - } + public TileTank() { + this(0); + } + + @Override + protected boolean doPush(ForgeDirection dir) { + + if (isSideDisabled(dir.ordinal())) { + return false; } - } - } - return res; - } + boolean res = super.doPush(dir); + if (tank.getFluidAmount() > 0) { - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(!canFill(from)) { - return 0; - } - return fillInternal(resource, doFill); - } - - int fillInternal(FluidStack resource, boolean doFill) { - int res = tank.fill(resource, doFill); - if(res > 0 && doFill) { - tankDirty = true; - } - return res; - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(!canDrain(from)) { - return null; - } - return drainInternal(resource, doDrain); - } - - FluidStack drainInternal(FluidStack resource, boolean doDrain) { - FluidStack res = tank.drain(resource, doDrain); - if(res != null && res.amount > 0 && doDrain) { - tankDirty = true; - } - return res; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(!canDrain(from)) { - return null; - } - return drainInternal(maxDrain, doDrain); - } - - FluidStack drainInternal(int maxDrain, boolean doDrain) { - FluidStack res = tank.drain(maxDrain, doDrain); - if(res != null && res.amount > 0 && doDrain) { - tankDirty = true; - } - return res; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return canFill(from) && fluid != null - && (tank.getFluidAmount() > 0 && tank.getFluid().getFluidID() == fluid.getID() || tank.getFluidAmount() == 0); - } - - private boolean canFill(ForgeDirection from) { - IoMode mode = getIoMode(from); - return mode != IoMode.PUSH && mode != IoMode.DISABLED; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return canDrain(from) && tank.canDrainFluidType(fluid); - } - - private boolean canDrain(ForgeDirection from) { - IoMode mode = getIoMode(from); - return mode != IoMode.PULL && mode != IoMode.DISABLED; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return new FluidTankInfo[] { new FluidTankInfo(tank) }; - } - - private int getFilledLevel() { - int level = (int) Math.floor(16 * tank.getFilledRatio()); - if(level == 0 && tank.getFluidAmount() > 0) { - level = 1; - } - return level; - } - - public boolean canVoidItems() { - return tank.getFluid() != null && tank.getFluid().getFluid().getTemperature() > 973; - } - - public VoidMode getVoidMode() { - return voidMode; - } - - public void setVoidMode(VoidMode mode) { - this.voidMode = mode; - } - - @Override - public String getMachineName() { - return "tank"; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack item) { - if (canVoidItems() && voidMode == VoidMode.ALWAYS && i < getSlotDefinition().getMaxInputSlot()) { - return false; - } - if (i == 0) { - FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); - if (fluid != null) { - return true; - } - if (item.getItem() == Items.water_bucket) { - return true; - } - if (item.getItem() == Items.lava_bucket) { - return true; - } - if (item.getItem() instanceof IFluidContainerItem && ((IFluidContainerItem) item.getItem()).getFluid(item) != null) { - return true; - } - return false; - } else if (i == 1) { - if (item.getItem() instanceof IFluidContainerItem - && (((IFluidContainerItem) item.getItem()).getFluid(item) == null || ((IFluidContainerItem) item.getItem()).getFluid(item).amount < ((IFluidContainerItem) item - .getItem()).getCapacity(item))) { - return true; - } - return FluidContainerRegistry.isEmptyContainer(item) || item.getItem() == Items.bucket; - } else if (i == 2 && canVoidItems()) { - return voidMode == VoidMode.ALWAYS || (voidMode == VoidMode.NEVER ? false : !FluidContainerRegistry.isContainer(item)); - } - return false; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - super.setInventorySlotContents(slot, contents); - } - - @Override - public boolean isActive() { - return false; - } - - @Override - protected boolean processTasks(boolean redstoneCheckPassed) { - boolean res = processItems(redstoneCheckPassed); - int filledLevel = getFilledLevel(); - if(lastUpdateLevel != filledLevel) { - lastUpdateLevel = filledLevel; - tankDirty = false; - return true; - } - if(tankDirty && shouldDoWorkThisTick(10)) { - PacketHandler.sendToAllAround(new PacketTankFluid(this), this); - worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); - Fluid held = tank.getFluid() == null ? null : tank.getFluid().getFluid(); - if(lastFluid != held) { - lastFluid = held; - worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); - } - tankDirty = false; - } - return res; - } - - public int getComparatorOutput() { - FluidTankInfo info = getTankInfo(null)[0]; - if (info == null || info.fluid == null) { - return 0; + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { + if (target.canFill(dir.getOpposite(), tank.getFluid().getFluid())) { + FluidStack push = tank.getFluid().copy(); + push.amount = Math.min(push.amount, IO_MB_TICK); + int filled = target.fill(dir.getOpposite(), push, true); + if (filled > 0) { + tank.drain(filled, true); + tankDirty = true; + return res; + } + } + } + } + return res; } - return info.fluid.amount == 0 ? 0 : (int) (1 + ((double) info.fluid.amount / (double) info.capacity) * 14); - } + @Override + protected boolean doPull(ForgeDirection dir) { - private boolean processItems(boolean redstoneCheckPassed) { - if(!redstoneCheckPassed) { - return false; - } - if(!shouldDoWorkThisTick(20)) { - return false; - } - if (canVoidItems()) { - inventory[2] = null; - } - return drainFullContainer() || fillEmptyContainer(); - } + if (isSideDisabled(dir.ordinal())) { + return false; + } - private boolean fillEmptyContainer() { - FluidAndStackResult fill = FluidUtil.tryFillContainer(inventory[getSlotDefinition().getMinInputSlot() + 1], getOutputTanks()[0].getFluid()); - if (fill.result.fluidStack == null) { - return false; - } - - int slot = getSlotDefinition().getMaxOutputSlot(); + boolean res = super.doPull(dir); + if (tank.getFluidAmount() < tank.getCapacity()) { + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { - if (inventory[slot] != null) { - if (inventory[slot].isStackable() && ItemUtil.areStackMergable(inventory[slot], fill.result.itemStack) - && inventory[slot].stackSize < inventory[slot].getMaxStackSize()) { - fill.result.itemStack.stackSize += inventory[slot].stackSize; - } else { + if (tank.getFluidAmount() > 0) { + FluidStack canPull = tank.getFluid().copy(); + canPull.amount = tank.getCapacity() - tank.getFluidAmount(); + canPull.amount = Math.min(canPull.amount, IO_MB_TICK); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if (drained != null && drained.amount > 0) { + tank.fill(drained, true); + tankDirty = true; + return res; + } + } else { + + FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + if (infos != null) { + for (FluidTankInfo info : infos) { + if (info.fluid != null && info.fluid.amount > 0) { + if (canFill(dir, info.fluid.getFluid())) { + FluidStack canPull = info.fluid.copy(); + canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if (drained != null && drained.amount > 0) { + tank.fill(drained, true); + tankDirty = true; + return res; + } + } + } + } + } + } + } + } + return res; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (!canFill(from)) { + return 0; + } + return fillInternal(resource, doFill); + } + + int fillInternal(FluidStack resource, boolean doFill) { + int res = tank.fill(resource, doFill); + if (res > 0 && doFill) { + tankDirty = true; + } + return res; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (!canDrain(from)) { + return null; + } + return drainInternal(resource, doDrain); + } + + FluidStack drainInternal(FluidStack resource, boolean doDrain) { + FluidStack res = tank.drain(resource, doDrain); + if (res != null && res.amount > 0 && doDrain) { + tankDirty = true; + } + return res; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (!canDrain(from)) { + return null; + } + return drainInternal(maxDrain, doDrain); + } + + FluidStack drainInternal(int maxDrain, boolean doDrain) { + FluidStack res = tank.drain(maxDrain, doDrain); + if (res != null && res.amount > 0 && doDrain) { + tankDirty = true; + } + return res; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return canFill(from) + && fluid != null + && (tank.getFluidAmount() > 0 && tank.getFluid().getFluidID() == fluid.getID() + || tank.getFluidAmount() == 0); + } + + private boolean canFill(ForgeDirection from) { + IoMode mode = getIoMode(from); + return mode != IoMode.PUSH && mode != IoMode.DISABLED; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return canDrain(from) && tank.canDrainFluidType(fluid); + } + + private boolean canDrain(ForgeDirection from) { + IoMode mode = getIoMode(from); + return mode != IoMode.PULL && mode != IoMode.DISABLED; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return new FluidTankInfo[] {new FluidTankInfo(tank)}; + } + + private int getFilledLevel() { + int level = (int) Math.floor(16 * tank.getFilledRatio()); + if (level == 0 && tank.getFluidAmount() > 0) { + level = 1; + } + return level; + } + + public boolean canVoidItems() { + return tank.getFluid() != null && tank.getFluid().getFluid().getTemperature() > 973; + } + + public VoidMode getVoidMode() { + return voidMode; + } + + public void setVoidMode(VoidMode mode) { + this.voidMode = mode; + } + + @Override + public String getMachineName() { + return "tank"; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack item) { + if (canVoidItems() + && voidMode == VoidMode.ALWAYS + && i < getSlotDefinition().getMaxInputSlot()) { + return false; + } + if (i == 0) { + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(item); + if (fluid != null) { + return true; + } + if (item.getItem() == Items.water_bucket) { + return true; + } + if (item.getItem() == Items.lava_bucket) { + return true; + } + if (item.getItem() instanceof IFluidContainerItem + && ((IFluidContainerItem) item.getItem()).getFluid(item) != null) { + return true; + } + return false; + } else if (i == 1) { + if (item.getItem() instanceof IFluidContainerItem + && (((IFluidContainerItem) item.getItem()).getFluid(item) == null + || ((IFluidContainerItem) item.getItem()).getFluid(item).amount + < ((IFluidContainerItem) item.getItem()).getCapacity(item))) { + return true; + } + return FluidContainerRegistry.isEmptyContainer(item) || item.getItem() == Items.bucket; + } else if (i == 2 && canVoidItems()) { + return voidMode == VoidMode.ALWAYS + || (voidMode == VoidMode.NEVER ? false : !FluidContainerRegistry.isContainer(item)); + } return false; - } } - getOutputTanks()[0].setFluid(fill.remainder.fluidStack); - setInventorySlotContents(getSlotDefinition().getMinInputSlot() + 1, fill.remainder.itemStack); - setInventorySlotContents(slot, fill.result.itemStack); - - setTanksDirty(); - markDirty(); - return false; - } - - private boolean drainFullContainer() { - FluidAndStackResult fill = FluidUtil.tryDrainContainer(inventory[getSlotDefinition().getMinInputSlot()], this); - if (fill.result.fluidStack == null) { - return false; + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + super.setInventorySlotContents(slot, contents); } - - int slot = getSlotDefinition().getMinOutputSlot(); - if (inventory[slot] != null && fill.result.itemStack != null) { - if (inventory[slot].isStackable() && ItemUtil.areStackMergable(inventory[slot], fill.result.itemStack) - && inventory[slot].stackSize < inventory[slot].getMaxStackSize()) { - fill.result.itemStack.stackSize += inventory[slot].stackSize; - } else { + @Override + public boolean isActive() { return false; - } } - getInputTank(fill.result.fluidStack).setFluid(fill.remainder.fluidStack); - setInventorySlotContents(getSlotDefinition().getMinInputSlot(), fill.remainder.itemStack); - if (fill.result.itemStack != null) { - setInventorySlotContents(slot, fill.result.itemStack); + @Override + protected boolean processTasks(boolean redstoneCheckPassed) { + boolean res = processItems(redstoneCheckPassed); + int filledLevel = getFilledLevel(); + if (lastUpdateLevel != filledLevel) { + lastUpdateLevel = filledLevel; + tankDirty = false; + return true; + } + if (tankDirty && shouldDoWorkThisTick(10)) { + PacketHandler.sendToAllAround(new PacketTankFluid(this), this); + worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); + Fluid held = tank.getFluid() == null ? null : tank.getFluid().getFluid(); + if (lastFluid != held) { + lastFluid = held; + worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); + } + tankDirty = false; + } + return res; } - setTanksDirty(); - markDirty(); - return false; - } + public int getComparatorOutput() { + FluidTankInfo info = getTankInfo(null)[0]; + if (info == null || info.fluid == null) { + return 0; + } - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - nbtRoot.setInteger("slotLayoutVersion", 1); - nbtRoot.setInteger("tankType", getBlockMetadata()); - nbtRoot.setInteger("voidMode", voidMode.ordinal()); - saveTank(nbtRoot, tank); - } - - public static void saveTank(NBTTagCompound nbtRoot, FluidTank tank) { - if(tank.getFluidAmount() > 0) { - NBTTagCompound fluidRoot = new NBTTagCompound(); - tank.getFluid().writeToNBT(fluidRoot); - nbtRoot.setTag("tankContents", fluidRoot); - } else { - nbtRoot.removeTag("tankContents"); + return info.fluid.amount == 0 ? 0 : (int) (1 + ((double) info.fluid.amount / (double) info.capacity) * 14); } - } - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - tank = loadTank(nbtRoot); - if (nbtRoot.hasKey("voidMode")) { - voidMode = VoidMode.values()[nbtRoot.getInteger("voidMode")]; + private boolean processItems(boolean redstoneCheckPassed) { + if (!redstoneCheckPassed) { + return false; + } + if (!shouldDoWorkThisTick(20)) { + return false; + } + if (canVoidItems()) { + inventory[2] = null; + } + return drainFullContainer() || fillEmptyContainer(); } - - int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); - if (slotLayoutVersion == 0) { - inventory = new ArrayMappingTool("IIOO", "IIIOO").map(inventory); - } - } - - public static SmartTank loadTank(NBTTagCompound nbtRoot) { - int tankType = nbtRoot.getInteger("tankType"); - tankType = MathHelper.clamp_int(tankType, 0, 1); - SmartTank ret; - if(tankType == 1) { - ret = new SmartTank(32000); - } else { - ret = new SmartTank(16000); - } - - if(nbtRoot.hasKey("tankContents")) { - FluidStack fl = FluidStack.loadFluidStackFromNBT((NBTTagCompound) nbtRoot.getTag("tankContents")); - ret.setFluid(fl); - } else { - ret.setFluid(null); - } - return ret; - } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - return tank; - } + private boolean fillEmptyContainer() { + FluidAndStackResult fill = FluidUtil.tryFillContainer( + inventory[getSlotDefinition().getMinInputSlot() + 1], getOutputTanks()[0].getFluid()); + if (fill.result.fluidStack == null) { + return false; + } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { tank }; - } + int slot = getSlotDefinition().getMaxOutputSlot(); - @Override - public void setTanksDirty() { - tankDirty = true; - } + if (inventory[slot] != null) { + if (inventory[slot].isStackable() + && ItemUtil.areStackMergable(inventory[slot], fill.result.itemStack) + && inventory[slot].stackSize < inventory[slot].getMaxStackSize()) { + fill.result.itemStack.stackSize += inventory[slot].stackSize; + } else { + return false; + } + } + + getOutputTanks()[0].setFluid(fill.remainder.fluidStack); + setInventorySlotContents(getSlotDefinition().getMinInputSlot() + 1, fill.remainder.itemStack); + setInventorySlotContents(slot, fill.result.itemStack); + + setTanksDirty(); + markDirty(); + return false; + } + + private boolean drainFullContainer() { + FluidAndStackResult fill = + FluidUtil.tryDrainContainer(inventory[getSlotDefinition().getMinInputSlot()], this); + if (fill.result.fluidStack == null) { + return false; + } + + int slot = getSlotDefinition().getMinOutputSlot(); + + if (inventory[slot] != null && fill.result.itemStack != null) { + if (inventory[slot].isStackable() + && ItemUtil.areStackMergable(inventory[slot], fill.result.itemStack) + && inventory[slot].stackSize < inventory[slot].getMaxStackSize()) { + fill.result.itemStack.stackSize += inventory[slot].stackSize; + } else { + return false; + } + } + + getInputTank(fill.result.fluidStack).setFluid(fill.remainder.fluidStack); + setInventorySlotContents(getSlotDefinition().getMinInputSlot(), fill.remainder.itemStack); + if (fill.result.itemStack != null) { + setInventorySlotContents(slot, fill.result.itemStack); + } + + setTanksDirty(); + markDirty(); + return false; + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setInteger("slotLayoutVersion", 1); + nbtRoot.setInteger("tankType", getBlockMetadata()); + nbtRoot.setInteger("voidMode", voidMode.ordinal()); + saveTank(nbtRoot, tank); + } + + public static void saveTank(NBTTagCompound nbtRoot, FluidTank tank) { + if (tank.getFluidAmount() > 0) { + NBTTagCompound fluidRoot = new NBTTagCompound(); + tank.getFluid().writeToNBT(fluidRoot); + nbtRoot.setTag("tankContents", fluidRoot); + } else { + nbtRoot.removeTag("tankContents"); + } + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + tank = loadTank(nbtRoot); + if (nbtRoot.hasKey("voidMode")) { + voidMode = VoidMode.values()[nbtRoot.getInteger("voidMode")]; + } + + int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); + if (slotLayoutVersion == 0) { + inventory = new ArrayMappingTool("IIOO", "IIIOO").map(inventory); + } + } + + public static SmartTank loadTank(NBTTagCompound nbtRoot) { + int tankType = nbtRoot.getInteger("tankType"); + tankType = MathHelper.clamp_int(tankType, 0, 1); + SmartTank ret; + if (tankType == 1) { + ret = new SmartTank(32000); + } else { + ret = new SmartTank(16000); + } + + if (nbtRoot.hasKey("tankContents")) { + FluidStack fl = FluidStack.loadFluidStackFromNBT((NBTTagCompound) nbtRoot.getTag("tankContents")); + ret.setFluid(fl); + } else { + ret.setFluid(null); + } + return ret; + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + return tank; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {tank}; + } + + @Override + public void setTanksDirty() { + tankDirty = true; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 129e20b7..c6e9458c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -1,20 +1,6 @@ package crazypants.enderio.machine.transceiver; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Random; -import java.util.Set; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - import com.enderio.core.common.util.Util; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,149 +12,175 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.transceiver.gui.ContainerTransceiver; import crazypants.enderio.machine.transceiver.gui.GuiTransceiver; import crazypants.enderio.network.PacketHandler; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Random; +import java.util.Set; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; public class BlockTransceiver extends AbstractMachineBlock { - public static BlockTransceiver create() { + public static BlockTransceiver create() { - PacketHandler.INSTANCE.registerMessage(PacketSendRecieveChannel.class, PacketSendRecieveChannel.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketSendRecieveChannelList.class, PacketSendRecieveChannelList.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketItemFilter.class, PacketItemFilter.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketSendRecieveChannel.class, PacketSendRecieveChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketSendRecieveChannelList.class, + PacketSendRecieveChannelList.class, + PacketHandler.nextID(), + Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketItemFilter.class, PacketItemFilter.class, PacketHandler.nextID(), Side.SERVER); - ConnectionHandler ch = new ConnectionHandler(); - FMLCommonHandler.instance().bus().register(ch); - MinecraftForge.EVENT_BUS.register(ch); + ConnectionHandler ch = new ConnectionHandler(); + FMLCommonHandler.instance().bus().register(ch); + MinecraftForge.EVENT_BUS.register(ch); - BlockTransceiver res = new BlockTransceiver(); - res.init(); - return res; - } - - private BlockTransceiver() { - super(ModObject.blockTransceiver, TileTransceiver.class); - if(!Config.transceiverEnabled) { - setCreativeTab(null); + BlockTransceiver res = new BlockTransceiver(); + res.init(); + return res; } - } - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileTransceiver) { - ((TileTransceiver)te).getRailController().dropNonSpawnedCarts(); - } - } - return super.removedByPlayer(world, player, x, y, z, doHarvest); - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileTransceiver) { - return new ContainerTransceiver(player.inventory, (TileTransceiver) te); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - return new GuiTransceiver(player.inventory, (TileTransceiver) te); - } - - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_TRANSCEIVER; - } - - - @Override - @SideOnly(Side.CLIENT) - protected void registerOverlayIcons(IIconRegister iIconRegister) { - super.registerOverlayIcons(iIconRegister); - overlayIconPull = iIconRegister.registerIcon("enderio:overlays/transcieverPull"); - overlayIconPush = iIconRegister.registerIcon("enderio:overlays/transcieverPush"); - overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/transcieverPushPull"); - overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/transcieverDisabled"); - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - if(active) { - return "enderio:alloySmelterFrontOn"; - } - return "enderio:alloySmelterFront"; - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTransceiver && player.isSneaking()) { - TileTransceiver trans = (TileTransceiver) te; - for (ChannelType type : ChannelType.VALUES) { - - Set recieving = trans.getRecieveChannels(type); - Set sending = trans.getSendChannels(type); - String recieve = "[" + buildString(recieving) + "]"; - String send = "[" + buildString(sending) + "]"; - - if(isEmpty(recieve) && isEmpty(send)) { - continue; + private BlockTransceiver() { + super(ModObject.blockTransceiver, TileTransceiver.class); + if (!Config.transceiverEnabled) { + setCreativeTab(null); } - - tooltip.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("trans." + type.name().toLowerCase(Locale.US))); - - if(!isEmpty(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, EnderIO.lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT - + EnumChatFormatting.WHITE, recieve)); - } - if(!isEmpty(send)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, EnderIO.lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT - + EnumChatFormatting.WHITE, send)); - } - } } - } - private boolean isEmpty(String str) { - return "[]".equals(str); - } - - private String buildString(Set recieving) { - StringBuilder sb = new StringBuilder(); - Iterator iter = recieving.iterator(); - while (iter.hasNext()) { - Channel c = iter.next(); - sb.append(c.getName()); - if (iter.hasNext()) { - sb.append(", "); - } + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTransceiver) { + ((TileTransceiver) te).getRailController().dropNonSpawnedCarts(); + } + } + return super.removedByPlayer(world, player, x, y, z, doHarvest); } - return sb.toString(); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTransceiver) { + return new ContainerTransceiver(player.inventory, (TileTransceiver) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + return new GuiTransceiver(player.inventory, (TileTransceiver) te); + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_TRANSCEIVER; + } + + @Override + @SideOnly(Side.CLIENT) + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + overlayIconPull = iIconRegister.registerIcon("enderio:overlays/transcieverPull"); + overlayIconPush = iIconRegister.registerIcon("enderio:overlays/transcieverPush"); + overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/transcieverPushPull"); + overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/transcieverDisabled"); + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + if (active) { + return "enderio:alloySmelterFrontOn"; + } + return "enderio:alloySmelterFront"; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) {} + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTransceiver && player.isSneaking()) { + TileTransceiver trans = (TileTransceiver) te; + for (ChannelType type : ChannelType.VALUES) { + + Set recieving = trans.getRecieveChannels(type); + Set sending = trans.getSendChannels(type); + String recieve = "[" + buildString(recieving) + "]"; + String send = "[" + buildString(sending) + "]"; + + if (isEmpty(recieve) && isEmpty(send)) { + continue; + } + + tooltip.add(EnumChatFormatting.WHITE + + EnderIO.lang.localize("trans." + type.name().toLowerCase(Locale.US))); + + if (!isEmpty(recieve)) { + tooltip.add(String.format( + "%s%s " + Util.TAB + ": %s%s", + Util.TAB, + EnderIO.lang.localize("trans.receiving"), + Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, + recieve)); + } + if (!isEmpty(send)) { + tooltip.add(String.format( + "%s%s " + Util.TAB + ": %s%s", + Util.TAB, + EnderIO.lang.localize("trans.sending"), + Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, + send)); + } + } + } + } + + private boolean isEmpty(String str) { + return "[]".equals(str); + } + + private String buildString(Set recieving) { + StringBuilder sb = new StringBuilder(); + Iterator iter = recieving.iterator(); + while (iter.hasNext()) { + Channel c = iter.next(); + sb.append(c.getName()); + if (iter.hasNext()) { + sb.append(", "); + } + } + return sb.toString(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java index 3afa97f5..c91903aa 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java @@ -1,128 +1,113 @@ package crazypants.enderio.machine.transceiver; -import java.util.UUID; - +import com.mojang.authlib.GameProfile; +import crazypants.util.UserIdent; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.common.util.PlayerUtil; -import com.mojang.authlib.GameProfile; - -import crazypants.util.UserIdent; - - public class Channel { - - public static Channel readFromNBT(NBTTagCompound root) { - if(!root.hasKey("name")) { - return null; + + public static Channel readFromNBT(NBTTagCompound root) { + if (!root.hasKey("name")) { + return null; + } + String name = root.getString("name"); + UserIdent user; + if (root.hasKey("user")) { + String legacyUser = root.getString("user"); + user = UserIdent.create(legacyUser); + } else { + user = UserIdent.readfromNbt(root, "user"); + } + ChannelType type = ChannelType.values()[root.getShort("type")]; + return new Channel(name, user, type); } - String name = root.getString("name"); - UserIdent user; - if(root.hasKey("user")) { - String legacyUser = root.getString("user"); - user = UserIdent.create(legacyUser); - } else { - user = UserIdent.readfromNbt(root, "user"); + + private final String name; + private final UserIdent user; + final ChannelType type; + + public Channel(String name, GameProfile profile, ChannelType type) { + this.name = trim(name); + this.user = UserIdent.create(profile); + this.type = type; } - ChannelType type = ChannelType.values()[root.getShort("type")]; - return new Channel(name, user, type); - } - - private final String name; - private final UserIdent user; - final ChannelType type; - public Channel(String name, GameProfile profile, ChannelType type) { - this.name = trim(name); - this.user = UserIdent.create(profile); - this.type = type; - } - - public Channel(String name, UserIdent user, ChannelType type) { - this.name = trim(name); - this.user = user; - this.type = type; - } - - public Channel(String name, ChannelType type) { - this.name = trim(name); - this.user = UserIdent.nobody; - this.type = type; - } - - public boolean isPublic() { - return user == UserIdent.nobody; - } - - public void writeToNBT(NBTTagCompound root) { - if(name == null || name.isEmpty()) { - return; - } - root.setString("name", name); - user.saveToNbt(root, "user"); - root.setShort("type", (short)type.ordinal()); - } - - private String trim(String str) { - if(str == null) { - return null; + public Channel(String name, UserIdent user, ChannelType type) { + this.name = trim(name); + this.user = user; + this.type = type; } - str = str.trim(); - if(str.isEmpty()) { - return null; + + public Channel(String name, ChannelType type) { + this.name = trim(name); + this.user = UserIdent.nobody; + this.type = type; } - return str; - } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + ((user == null) ? 0 : user.hashCode()); - return result; - } + public boolean isPublic() { + return user == UserIdent.nobody; + } - @Override - public boolean equals(Object obj) { - if(this == obj) - return true; - if(obj == null) - return false; - if(getClass() != obj.getClass()) - return false; - Channel other = (Channel) obj; - if(getName() == null) { - if(other.getName() != null) - return false; - } else if(!getName().equals(other.getName())) - return false; - if(type != other.type) - return false; - if(user == null) { - if(other.user != null) - return false; - } else if(!user.equals(other.user)) - return false; - return true; - } + public void writeToNBT(NBTTagCompound root) { + if (name == null || name.isEmpty()) { + return; + } + root.setString("name", name); + user.saveToNbt(root, "user"); + root.setShort("type", (short) type.ordinal()); + } - public String getName() { - return name; - } + private String trim(String str) { + if (str == null) { + return null; + } + str = str.trim(); + if (str.isEmpty()) { + return null; + } + return str; + } - public ChannelType getType() { - return type; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((user == null) ? 0 : user.hashCode()); + return result; + } - public UserIdent getUser() { - return user; - } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + Channel other = (Channel) obj; + if (getName() == null) { + if (other.getName() != null) return false; + } else if (!getName().equals(other.getName())) return false; + if (type != other.type) return false; + if (user == null) { + if (other.user != null) return false; + } else if (!user.equals(other.user)) return false; + return true; + } - @Override - public String toString() { - return "Channel [name=" + name + ", user=" + user + ", type=" + type + "]"; - } + public String getName() { + return name; + } + public ChannelType getType() { + return type; + } + + public UserIdent getUser() { + return user; + } + + @Override + public String toString() { + return "Channel [name=" + name + ", user=" + user + ", type=" + type + "]"; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java index 35a4b663..9ff5ac79 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ChannelRegister.java @@ -1,34 +1,33 @@ package crazypants.enderio.machine.transceiver; -import java.util.Set; - import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; +import java.util.Set; public class ChannelRegister { - protected SetMultimap channels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - - public Set getChannelsForType(ChannelType type) { - return channels.get(type); - } + protected SetMultimap channels = + MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - public void addChannel(Channel channel) { - if(channel == null) { - return; + public Set getChannelsForType(ChannelType type) { + return channels.get(type); } - channels.put(channel.getType(), channel); - } - public void removeChannel(Channel channel) { - if(channel == null) { - return; + public void addChannel(Channel channel) { + if (channel == null) { + return; + } + channels.put(channel.getType(), channel); } - getChannelsForType(channel.getType()).remove(channel); - } - public void reset() { - channels.clear(); - } + public void removeChannel(Channel channel) { + if (channel == null) { + return; + } + getChannelsForType(channel.getType()).remove(channel); + } + public void reset() { + channels.clear(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java index 23530b79..75517771 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java @@ -1,11 +1,10 @@ package crazypants.enderio.machine.transceiver; public enum ChannelType { + POWER, + ITEM, + FLUID, + RAIL; - POWER, - ITEM, - FLUID, - RAIL; - - public static final ChannelType[] VALUES = values(); + public static final ChannelType[] VALUES = values(); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java index 6d55e9b1..a6606168 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java @@ -1,26 +1,24 @@ package crazypants.enderio.machine.transceiver; import crazypants.enderio.EnderIO; -import crazypants.util.UserIdent; - public class ClientChannelRegister extends ChannelRegister { - public static final ChannelRegister instance = new ClientChannelRegister(); + public static final ChannelRegister instance = new ClientChannelRegister(); - private ClientChannelRegister() { - reset(); - } + private ClientChannelRegister() { + reset(); + } - @Override - public void addChannel(Channel channel) { - if (channel == null) { - return; + @Override + public void addChannel(Channel channel) { + if (channel == null) { + return; + } + if (!channel.isPublic() + && !channel.getUser().equals(EnderIO.proxy.getClientPlayer().getGameProfile())) { + return; + } + super.addChannel(channel); } - if (!channel.isPublic() && !channel.getUser().equals(EnderIO.proxy.getClientPlayer().getGameProfile())) { - return; - } - super.addChannel(channel); - } - } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java index cdcae697..7b83e8a6 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ConnectionHandler.java @@ -1,21 +1,21 @@ package crazypants.enderio.machine.transceiver; -import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; import crazypants.enderio.network.PacketHandler; +import net.minecraft.entity.player.EntityPlayerMP; public class ConnectionHandler { - @SubscribeEvent - public void onPlayerLoggon(PlayerLoggedInEvent evt) { - PacketHandler.INSTANCE.sendTo(new PacketChannelList(ServerChannelRegister.instance), (EntityPlayerMP) evt.player); - } - - @SubscribeEvent - public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { - ClientChannelRegister.instance.reset(); - } - + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + PacketHandler.INSTANCE.sendTo( + new PacketChannelList(ServerChannelRegister.instance), (EntityPlayerMP) evt.player); + } + + @SubscribeEvent + public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { + ClientChannelRegister.instance.reset(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java index 16608f48..77b4ca85 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java @@ -1,58 +1,53 @@ package crazypants.enderio.machine.transceiver; -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.nbt.NBTTagCompound; -public class PacketAddRemoveChannel implements IMessage, IMessageHandler { +public class PacketAddRemoveChannel implements IMessage, IMessageHandler { - private boolean isAdd; - private Channel channel; - - public PacketAddRemoveChannel() { - } - - public PacketAddRemoveChannel(Channel channel, boolean isAdd) { - this.channel = channel; - this.isAdd = isAdd; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeBoolean(isAdd); - NBTTagCompound nbt = new NBTTagCompound(); - channel.writeToNBT(nbt); - NetworkUtil.writeNBTTagCompound(nbt, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - isAdd = buf.readBoolean(); - NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); - channel = Channel.readFromNBT(tag); - } + private boolean isAdd; + private Channel channel; - @Override - public IMessage onMessage(PacketAddRemoveChannel message, MessageContext ctx) { - ChannelRegister register = ctx.side == Side.CLIENT ? ClientChannelRegister.instance : ServerChannelRegister.instance; - if(message.isAdd) { - register.addChannel(message.channel); - } else { - register.removeChannel(message.channel); + public PacketAddRemoveChannel() {} + + public PacketAddRemoveChannel(Channel channel, boolean isAdd) { + this.channel = channel; + this.isAdd = isAdd; } - if(ctx.side == Side.SERVER) { - PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(message.channel, message.isAdd)); + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(isAdd); + NBTTagCompound nbt = new NBTTagCompound(); + channel.writeToNBT(nbt); + NetworkUtil.writeNBTTagCompound(nbt, buf); } - return null; - } - + @Override + public void fromBytes(ByteBuf buf) { + isAdd = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + channel = Channel.readFromNBT(tag); + } + @Override + public IMessage onMessage(PacketAddRemoveChannel message, MessageContext ctx) { + ChannelRegister register = + ctx.side == Side.CLIENT ? ClientChannelRegister.instance : ServerChannelRegister.instance; + if (message.isAdd) { + register.addChannel(message.channel); + } else { + register.removeChannel(message.channel); + } + if (ctx.side == Side.SERVER) { + PacketHandler.INSTANCE.sendToAll(new PacketAddRemoveChannel(message.channel, message.isAdd)); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java index d34b3d63..13194b8e 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -1,69 +1,62 @@ package crazypants.enderio.machine.transceiver; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; public class PacketChannelList implements IMessage, IMessageHandler { - private List channels; + private List channels; - public PacketChannelList() { - } + public PacketChannelList() {} - public PacketChannelList(ChannelRegister register) { - channels = new ArrayList(); - for (ChannelType type : ChannelType.values()) { - for (Channel channel : register.getChannelsForType(type)) { - channels.add(channel); - } - } - } - - @Override - public void toBytes(ByteBuf buf) { - NBTTagList tagList = new NBTTagList(); - for(Channel chan : channels) { - NBTTagCompound tag = new NBTTagCompound(); - chan.writeToNBT(tag); - tagList.appendTag(tag); - } - NBTTagCompound root = new NBTTagCompound(); - root.setTag("chanList", tagList); - NetworkUtil.writeNBTTagCompound(root, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - NBTTagCompound root = NetworkUtil.readNBTTagCompound(buf); - NBTTagList tagList = (NBTTagList)root.getTag("chanList"); - channels = new ArrayList(); - for(int i=0; i < tagList.tagCount();i++) { - NBTTagCompound tag = tagList.getCompoundTagAt(i); - Channel chan = Channel.readFromNBT(tag); - if(chan != null) { - channels.add(chan); - } + public PacketChannelList(ChannelRegister register) { + channels = new ArrayList(); + for (ChannelType type : ChannelType.values()) { + for (Channel channel : register.getChannelsForType(type)) { + channels.add(channel); + } + } } - } - - @Override - public IMessage onMessage(PacketChannelList message, MessageContext ctx) { - for(Channel channel : message.channels) { - ClientChannelRegister.instance.addChannel(channel); + @Override + public void toBytes(ByteBuf buf) { + NBTTagList tagList = new NBTTagList(); + for (Channel chan : channels) { + NBTTagCompound tag = new NBTTagCompound(); + chan.writeToNBT(tag); + tagList.appendTag(tag); + } + NBTTagCompound root = new NBTTagCompound(); + root.setTag("chanList", tagList); + NetworkUtil.writeNBTTagCompound(root, buf); } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + NBTTagCompound root = NetworkUtil.readNBTTagCompound(buf); + NBTTagList tagList = (NBTTagList) root.getTag("chanList"); + channels = new ArrayList(); + for (int i = 0; i < tagList.tagCount(); i++) { + NBTTagCompound tag = tagList.getCompoundTagAt(i); + Channel chan = Channel.readFromNBT(tag); + if (chan != null) { + channels.add(chan); + } + } + } + + @Override + public IMessage onMessage(PacketChannelList message, MessageContext ctx) { + for (Channel channel : message.channels) { + ClientChannelRegister.instance.addChannel(channel); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java index c821381d..2cf6f8a1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java @@ -1,66 +1,64 @@ package crazypants.enderio.machine.transceiver; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.filter.ItemFilter; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; -public class PacketItemFilter extends MessageTileEntity implements IMessageHandler { +public class PacketItemFilter extends MessageTileEntity + implements IMessageHandler { - private boolean isSend; - private ItemFilter filter; + private boolean isSend; + private ItemFilter filter; - public PacketItemFilter() { - } + public PacketItemFilter() {} - public PacketItemFilter(TileTransceiver te, boolean isSend) { - super(te); - this.isSend = isSend; - if(isSend) { - filter = te.getSendItemFilter(); - } else { - filter = te.getReceiveItemFilter(); + public PacketItemFilter(TileTransceiver te, boolean isSend) { + super(te); + this.isSend = isSend; + if (isSend) { + filter = te.getSendItemFilter(); + } else { + filter = te.getReceiveItemFilter(); + } } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeBoolean(isSend); - NBTTagCompound tag = new NBTTagCompound(); - filter.writeToNBT(tag); - NetworkUtil.writeNBTTagCompound(tag, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - isSend = buf.readBoolean(); - NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); - filter = new ItemFilter(); - filter.readFromNBT(tag); - } - - @Override - public IMessage onMessage(PacketItemFilter message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileTransceiver tile = message.getTileEntity(player.worldObj); - boolean isSend = message.isSend; - ItemFilter filter = message.filter; - if(tile != null && filter != null) { - if(isSend) { - tile.setSendItemFilter(filter); - } else { - tile.setRecieveItemFilter(filter); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(isSend); + NBTTagCompound tag = new NBTTagCompound(); + filter.writeToNBT(tag); + NetworkUtil.writeNBTTagCompound(tag, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + isSend = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + filter = new ItemFilter(); + filter.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketItemFilter message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileTransceiver tile = message.getTileEntity(player.worldObj); + boolean isSend = message.isSend; + ItemFilter filter = message.filter; + if (tile != null && filter != null) { + if (isSend) { + tile.setSendItemFilter(filter); + } else { + tile.setRecieveItemFilter(filter); + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java index d650eb2a..a6aaa44e 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java @@ -1,76 +1,71 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; +public class PacketSendRecieveChannel extends MessageTileEntity + implements IMessageHandler { -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; + private boolean isSend; + private boolean isAdd; + private Channel channel; -public class PacketSendRecieveChannel extends MessageTileEntity implements IMessageHandler { - - private boolean isSend; - private boolean isAdd; - private Channel channel; - - public PacketSendRecieveChannel() { - } - - public PacketSendRecieveChannel(TileTransceiver te, boolean isSend, boolean isAdd, Channel channel) { - super(te); - this.isSend = isSend; - this.isAdd = isAdd; - this.channel = channel; - } + public PacketSendRecieveChannel() {} - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeBoolean(isSend); - buf.writeBoolean(isAdd); - NBTTagCompound tag = new NBTTagCompound(); - channel.writeToNBT(tag); - NetworkUtil.writeNBTTagCompound(tag, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - isSend = buf.readBoolean(); - isAdd = buf.readBoolean(); - NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); - channel = Channel.readFromNBT(tag); - } - - @Override - public IMessage onMessage(PacketSendRecieveChannel message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileTransceiver tile = message.getTileEntity(player.worldObj); - Channel channel = message.channel; - boolean isSend = message.isSend; - boolean isAdd = message.isAdd; - if (tile != null && channel != null) { - if(isSend) { - if(isAdd) { - tile.addSendChanel(channel); - } else { - tile.removeSendChanel(channel); - } - } else { - if(isAdd) { - tile.addRecieveChanel(channel); - } else { - tile.removeRecieveChanel(channel); - } - } + public PacketSendRecieveChannel(TileTransceiver te, boolean isSend, boolean isAdd, Channel channel) { + super(te); + this.isSend = isSend; + this.isAdd = isAdd; + this.channel = channel; } - return null; - } - - + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(isSend); + buf.writeBoolean(isAdd); + NBTTagCompound tag = new NBTTagCompound(); + channel.writeToNBT(tag); + NetworkUtil.writeNBTTagCompound(tag, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + isSend = buf.readBoolean(); + isAdd = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + channel = Channel.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketSendRecieveChannel message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileTransceiver tile = message.getTileEntity(player.worldObj); + Channel channel = message.channel; + boolean isSend = message.isSend; + boolean isAdd = message.isAdd; + if (tile != null && channel != null) { + if (isSend) { + if (isAdd) { + tile.addSendChanel(channel); + } else { + tile.removeSendChanel(channel); + } + } else { + if (isAdd) { + tile.addRecieveChanel(channel); + } else { + tile.removeRecieveChanel(channel); + } + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java index 7de0983e..e268bc4f 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java @@ -1,70 +1,67 @@ package crazypants.enderio.machine.transceiver; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; -public class PacketSendRecieveChannelList extends MessageTileEntity implements IMessageHandler { +public class PacketSendRecieveChannelList extends MessageTileEntity + implements IMessageHandler { - private boolean isSend; - private SetMultimap channels; + private boolean isSend; + private SetMultimap channels; - public PacketSendRecieveChannelList() { - } + public PacketSendRecieveChannelList() {} - public PacketSendRecieveChannelList(TileTransceiver te, boolean isSend) { - super(te); - this.isSend = isSend; - if(isSend) { - this.channels = te.getSendChannels(); - } else { - this.channels = te.getReceiveChannels(); + public PacketSendRecieveChannelList(TileTransceiver te, boolean isSend) { + super(te); + this.isSend = isSend; + if (isSend) { + this.channels = te.getSendChannels(); + } else { + this.channels = te.getReceiveChannels(); + } } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeBoolean(isSend); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(isSend); - NBTTagList tagList = TileTransceiver.createTagList(channels); - NBTTagCompound root = new NBTTagCompound(); - root.setTag("chans", tagList); - NetworkUtil.writeNBTTagCompound(root, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - isSend = buf.readBoolean(); - NBTTagCompound root = NetworkUtil.readNBTTagCompound(buf); - channels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - TileTransceiver.readChannels(root, channels, "chans"); - } - - @Override - public IMessage onMessage(PacketSendRecieveChannelList message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileTransceiver tile = message.getTileEntity(player.worldObj); - if(tile != null) { - if(message.isSend) { - tile.setSendChannels(message.channels); - } else { - tile.setRecieveChannels(message.channels); - } + NBTTagList tagList = TileTransceiver.createTagList(channels); + NBTTagCompound root = new NBTTagCompound(); + root.setTag("chans", tagList); + NetworkUtil.writeNBTTagCompound(root, buf); } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + isSend = buf.readBoolean(); + NBTTagCompound root = NetworkUtil.readNBTTagCompound(buf); + channels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); + TileTransceiver.readChannels(root, channels, "chans"); + } + + @Override + public IMessage onMessage(PacketSendRecieveChannelList message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileTransceiver tile = message.getTileEntity(player.worldObj); + if (tile != null) { + if (message.isSend) { + tile.setSendChannels(message.channels); + } else { + tile.setRecieveChannels(message.channels); + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index 2d44aff3..360df826 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -1,5 +1,15 @@ package crazypants.enderio.machine.transceiver; +import com.enderio.core.common.util.ItemUtil; +import com.enderio.core.common.util.RoundRobinIterator; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.MultimapBuilder; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import crazypants.enderio.Log; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.util.UserIdent; import java.io.File; import java.io.FileReader; import java.io.FileWriter; @@ -14,389 +24,377 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; - import org.apache.commons.io.FileUtils; -import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.PlayerUtil; -import com.enderio.core.common.util.RoundRobinIterator; -import com.google.common.collect.ListMultimap; -import com.google.common.collect.MultimapBuilder; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; - -import crazypants.enderio.Log; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.util.UserIdent; - public class ServerChannelRegister extends ChannelRegister { - public static ServerChannelRegister instance = new ServerChannelRegister(); + public static ServerChannelRegister instance = new ServerChannelRegister(); - private static final ExecutorService saveExecutor = Executors.newSingleThreadExecutor(); + private static final ExecutorService saveExecutor = Executors.newSingleThreadExecutor(); - public static void load() { - instance.reset(); - File dataFile = getDataFile(); - if(!dataFile.exists()) { - dataFile = getFallbackDataFile(); - if(!dataFile.exists()) { - return; - } else { - Log.warn("ServerChannelRegister: Using fallback save location " + dataFile.getAbsolutePath()); - } + public static void load() { + instance.reset(); + File dataFile = getDataFile(); + if (!dataFile.exists()) { + dataFile = getFallbackDataFile(); + if (!dataFile.exists()) { + return; + } else { + Log.warn("ServerChannelRegister: Using fallback save location " + dataFile.getAbsolutePath()); + } + } + + try { + JsonReader reader = new JsonReader(new FileReader(getDataFile())); + reader.beginArray(); + while (reader.hasNext()) { + String name = null; + int ordinal = -1; + UserIdent ident = UserIdent.nobody; + String uuid = null; + String playername = null; + String legacyUser = null; + reader.beginObject(); + while (reader.hasNext()) { + String key = reader.nextName(); + if ("name".equals(key)) { + name = reader.nextString(); + } else if ("user".equals(key)) { + legacyUser = reader.nextString(); + } else if ("uuid".equals(key)) { + uuid = reader.nextString(); + } else if ("playername".equals(key)) { + playername = reader.nextString(); + } else if ("type".equals(key)) { + ordinal = reader.nextInt(); + } else { + Log.warn("ServerChannelRegister: Unknown key '" + key + "' in dimensionalTransceiver.json"); + } + } + reader.endObject(); + if (name == null || ordinal == -1) { + Log.warn("ServerChannelRegister: Incomplete channel in dimensionalTransceiver.json"); + } else { + if (uuid != null || playername != null) { + ident = UserIdent.create(uuid, playername); + } else if (legacyUser != null) { + ident = UserIdent.create(legacyUser); + } + Channel chan = new Channel(name, ident, ChannelType.values()[ordinal]); + instance.addChannel(chan); + } + } + reader.endArray(); + reader.close(); + } catch (Exception e) { + Log.error("Could not read Dimensional Transceiver channels from " + + getDataFile().getAbsolutePath() + " : " + e); + } } - try { - JsonReader reader = new JsonReader(new FileReader(getDataFile())); - reader.beginArray(); - while (reader.hasNext()) { - String name = null; - int ordinal = -1; - UserIdent ident = UserIdent.nobody; - String uuid = null; - String playername = null; - String legacyUser = null; - reader.beginObject(); - while (reader.hasNext()) { - String key = reader.nextName(); - if ("name".equals(key)) { - name = reader.nextString(); - } else if ("user".equals(key)) { - legacyUser = reader.nextString(); - } else if ("uuid".equals(key)) { - uuid = reader.nextString(); - } else if ("playername".equals(key)) { - playername = reader.nextString(); - } else if ("type".equals(key)) { - ordinal = reader.nextInt(); - } else { - Log.warn("ServerChannelRegister: Unknown key '" + key + "' in dimensionalTransceiver.json"); - } + public static void store() { + Future future = saveExecutor.submit(new SaveRunnable(copyChannels())); + try { + // wait up to 5 seconds for it to finish + future.get(5, TimeUnit.SECONDS); + } catch (Exception e) { + Log.warn("Failed to write Transciever Channels on exit: " + e); + future.cancel(false); } - reader.endObject(); - if (name == null || ordinal == -1) { - Log.warn("ServerChannelRegister: Incomplete channel in dimensionalTransceiver.json"); + } + + private static void queueStore() { + saveExecutor.execute(new SaveRunnable(copyChannels())); + } + + private static void doStore(ListMultimap channels) { + File dataFile = getDataFile(); + if (!createFolderAndWriteFile(channels, dataFile)) { + dataFile = getFallbackDataFile(); + Log.error("ServerChannelRegister: Attempting to write Dimensional Transceiver data to fallback location: " + + dataFile.getAbsolutePath()); + try { + writeFile(copyChannels(), dataFile); + } catch (Exception e) { + Log.error("ServerChannelRegister: Could not write Dimensional Transceiver data fallback location " + + dataFile.getAbsolutePath() + " channels not saved: " + e.getMessage()); + return; + } + } + } + + private static boolean createFolderAndWriteFile(ListMultimap channels, File dataFile) { + try { + File parentFolder = dataFile.getParentFile(); + FileUtils.forceMkdir(parentFolder); + writeFile(channels, dataFile); + return true; + } catch (Exception e) { + Log.error("ServerChannelRegister: Could not write Dimensional Transceiver channels to " + + dataFile.getAbsolutePath() + " : " + e); + return false; + } + } + + protected static void writeFile(ListMultimap channels, File dataFile) throws IOException { + if (dataFile.exists()) { + File tmpFile = new File(dataFile.getAbsolutePath() + ".tmp"); + doWriteFile(channels, tmpFile); + if (FileUtils.deleteQuietly(dataFile)) { + tmpFile.renameTo(dataFile); + } + } else { - if (uuid != null || playername != null) { - ident = UserIdent.create(uuid, playername); - } else if (legacyUser != null) { - ident = UserIdent.create(legacyUser); - } - Channel chan = new Channel(name, ident, ChannelType.values()[ordinal]); - instance.addChannel(chan); + doWriteFile(channels, dataFile); } - } - reader.endArray(); - reader.close(); - } catch (Exception e) { - Log.error("Could not read Dimensional Transceiver channels from " + getDataFile().getAbsolutePath() + " : " + e); - } - } - - public static void store() { - Future future = saveExecutor.submit(new SaveRunnable(copyChannels())); - try { - //wait up to 5 seconds for it to finish - future.get(5, TimeUnit.SECONDS); - } catch (Exception e) { - Log.warn("Failed to write Transciever Channels on exit: " + e); - future.cancel(false); - } - } - - private static void queueStore() { - saveExecutor.execute(new SaveRunnable(copyChannels())); - } - - private static void doStore(ListMultimap channels) { - File dataFile = getDataFile(); - if(!createFolderAndWriteFile(channels, dataFile)) { - dataFile = getFallbackDataFile(); - Log.error("ServerChannelRegister: Attempting to write Dimensional Transceiver data to fallback location: " + dataFile.getAbsolutePath()); - try { - writeFile(copyChannels(), dataFile); - } catch (Exception e) { - Log.error("ServerChannelRegister: Could not write Dimensional Transceiver data fallback location " + dataFile.getAbsolutePath() - + " channels not saved: " + e.getMessage()); - return; - } - } - } - - private static boolean createFolderAndWriteFile(ListMultimap channels, File dataFile) { - try { - File parentFolder = dataFile.getParentFile(); - FileUtils.forceMkdir(parentFolder); - writeFile(channels, dataFile); - return true; - } catch (Exception e) { - Log.error("ServerChannelRegister: Could not write Dimensional Transceiver channels to " + dataFile.getAbsolutePath() + " : " + e); - return false; - } - } - - protected static void writeFile(ListMultimap channels, File dataFile) throws IOException { - if(dataFile.exists()) { - File tmpFile = new File(dataFile.getAbsolutePath() + ".tmp"); - doWriteFile(channels, tmpFile); - if(FileUtils.deleteQuietly(dataFile)) { - tmpFile.renameTo(dataFile); - } - - } else { - doWriteFile(channels, dataFile); } - } - - protected static void doWriteFile(ListMultimap channels, File dataFile) throws IOException { - JsonWriter writer = new JsonWriter(new FileWriter(dataFile, false)); - writer.setIndent(" "); - writer.beginArray(); - for (Channel chan : channels.values()) { - writer.beginObject(); - writer.name("name").value(chan.getName()); - if (chan.getUser() != null && chan.getUser() != UserIdent.nobody) { - writer.name("uuid").value(chan.getUser().getUUIDString()); - writer.name("playername").value(chan.getUser().getPlayerName()); - } - writer.name("type").value(chan.getType().ordinal()); - writer.endObject(); - } - writer.endArray(); - writer.close(); - } - - private static File getDataFile() { - return new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.json"); - } - - private static File getFallbackDataFile() { - return new File(DimensionManager.getCurrentSaveRootDirectory(), "dimensionalTransceiver.json"); - } - - private static ListMultimap copyChannels() { - //NB: deep copy not needed as all types are immuatble - ListMultimap copy = MultimapBuilder.enumKeys(ChannelType.class).arrayListValues().build(); - for (Entry entry : instance.channels.entries()) { - copy.put(entry.getKey(), entry.getValue()); - } - return copy; - } - - //----------------------------------------------------------------------------------------------- - - private final List transceivers = new ArrayList(); - private Map> iterators = new HashMap>(); - - private ServerChannelRegister() { - } - - public void register(TileTransceiver transceiver) { - transceivers.add(transceiver); - } - - public void dergister(TileTransceiver transceiver) { - transceivers.remove(transceiver); - } - - @Override - public void reset() { - super.reset(); - transceivers.clear(); - iterators.clear(); - } - - @Override - public void removeChannel(Channel channel) { - super.removeChannel(channel); - for (TileTransceiver trans : transceivers) { - trans.removeRecieveChanel(channel); - trans.removeSendChanel(channel); - } - iterators.remove(channel); - queueStore(); - } - - @Override - public void addChannel(Channel channel) { - super.addChannel(channel); - queueStore(); - } - - public RoundRobinIterator getIterator(Channel channel) { - RoundRobinIterator res = iterators.get(channel); - if(res == null) { - res = new RoundRobinIterator(transceivers); - iterators.put(channel, res); - } - return res; - } - - //Power - - public void sendPower(TileTransceiver sender, int canSend, Channel channel) { - RoundRobinIterator iter = getIterator(channel); - for (TileTransceiver trans : iter) { - if(trans != sender && trans.getRecieveChannels(ChannelType.POWER).contains(channel)) { - double invLoss = 1 - Config.transceiverEnergyLoss; - int canSendWithLoss = (int) Math.round(canSend * invLoss); - int recieved = trans.receiveEnergy(ForgeDirection.UNKNOWN, canSendWithLoss, false); - if(recieved > 0) { - int recievedPlusLoss = (int) Math.round(recieved / invLoss); - sender.usePower(recievedPlusLoss); - } - } - } - } - - //Fluid - - public FluidTankInfo[] getTankInfoForChannels(TileTransceiver tileTransceiver, Set channels) { - List infos = new ArrayList(); - for (TileTransceiver tran : transceivers) { - if(tran != tileTransceiver) { - tran.getRecieveTankInfo(infos, channels); - } - } - return infos.toArray(new FluidTankInfo[infos.size()]); - } - - public boolean canFill(TileTransceiver tileTransceiver, Set set, Fluid fluid) { - for (TileTransceiver tran : transceivers) { - if(tran != tileTransceiver) { - if(tran.canReceive(set, fluid)) { - return true; - } - } - } - return false; - } - - public int fill(TileTransceiver from, Set list, FluidStack resource, boolean doFill) { - if(resource == null || !from.hasPower()) { - return 0; - } - for (Channel channel : list) { - RoundRobinIterator iter = getIterator(channel); - for (TileTransceiver trans : iter) { - if(trans != from) { - int val = trans.recieveFluid(list, resource, doFill); - if(val > 0) { - if(doFill && Config.transceiverBucketTransmissionCostRF > 0) { - int powerUsed = (int) Math.max(1, Config.transceiverBucketTransmissionCostRF * val / 1000d); - from.usePower(powerUsed); + protected static void doWriteFile(ListMultimap channels, File dataFile) throws IOException { + JsonWriter writer = new JsonWriter(new FileWriter(dataFile, false)); + writer.setIndent(" "); + writer.beginArray(); + for (Channel chan : channels.values()) { + writer.beginObject(); + writer.name("name").value(chan.getName()); + if (chan.getUser() != null && chan.getUser() != UserIdent.nobody) { + writer.name("uuid").value(chan.getUser().getUUIDString()); + writer.name("playername").value(chan.getUser().getPlayerName()); } - return val; - } + writer.name("type").value(chan.getType().ordinal()); + writer.endObject(); } - } + writer.endArray(); + writer.close(); } - return 0; - } - //Item + private static File getDataFile() { + return new File(DimensionManager.getCurrentSaveRootDirectory(), "enderio/dimensionalTransceiver.json"); + } - public void sendItem(TileTransceiver from, Set channels, int slot, ItemStack contents) { - if(!from.hasPower()) { - return; + private static File getFallbackDataFile() { + return new File(DimensionManager.getCurrentSaveRootDirectory(), "dimensionalTransceiver.json"); } - if(!from.getSendItemFilter().doesItemPassFilter(null, contents)) { - return; - } - for (Channel channel : channels) { - RoundRobinIterator iter = getIterator(channel); - for (TileTransceiver trans : iter) { - if(trans != from && trans.getRecieveChannels(ChannelType.ITEM).contains(channel) && trans.getRedstoneChecksPassed()) { - contents = sendItem(from, slot, contents, trans); - if(contents == null) { - return; - } + + private static ListMultimap copyChannels() { + // NB: deep copy not needed as all types are immuatble + ListMultimap copy = + MultimapBuilder.enumKeys(ChannelType.class).arrayListValues().build(); + for (Entry entry : instance.channels.entries()) { + copy.put(entry.getKey(), entry.getValue()); } - } + return copy; } - } - private ItemStack sendItem(TileTransceiver from, int slot, ItemStack contents, TileTransceiver to) { - SlotDefinition sd = to.getSlotDefinition(); - if(!to.getReceiveItemFilter().doesItemPassFilter(null, contents)) { - return contents; + // ----------------------------------------------------------------------------------------------- + + private final List transceivers = new ArrayList(); + private Map> iterators = + new HashMap>(); + + private ServerChannelRegister() {} + + public void register(TileTransceiver transceiver) { + transceivers.add(transceiver); } - //try merging into existing stacks - boolean sendComplete = false; // Only allow 1 stack per item type - for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot && !sendComplete; i++) { - ItemStack existing = to.getStackInSlot(i); - if(ItemUtil.areStacksEqual(existing, contents)) { - sendComplete = true; - if(existing.stackSize < to.getInventoryStackLimit()) { - int numCanMerge = existing.getMaxStackSize() - existing.stackSize; - numCanMerge = Math.min(numCanMerge, contents.stackSize); - ItemStack remaining; - if(numCanMerge >= contents.stackSize) { - remaining = null; - } else { - remaining = contents.copy(); - remaining.stackSize -= numCanMerge; - } - ItemStack destStack = existing.copy(); - destStack.stackSize += numCanMerge; - to.setInventorySlotContents(i, destStack); - from.setInventorySlotContents(slot, remaining); - if(remaining == null) { - return null; - } else { - contents = remaining.copy(); - } - } - } - } - if(!sendComplete) { - //then fill empty stack - for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot; i++) { - ItemStack existing = to.getStackInSlot(i); - if(existing == null) { - int numCanMerge = Math.min(contents.stackSize, to.getInventoryStackLimit()); - if(numCanMerge > 0) { - ItemStack destStack = contents.copy(); - destStack.stackSize = numCanMerge; - to.setInventorySlotContents(i, destStack); - ItemStack remaining = contents.copy(); - remaining.stackSize -= numCanMerge; - if(remaining.stackSize == 0) { - remaining = null; - } - from.setInventorySlotContents(slot, remaining); - return null; - } - } - } - } - return contents; - } - - private static class SaveRunnable implements Runnable { - - private ListMultimap chans; - - public SaveRunnable(ListMultimap chans) { - this.chans = chans; + public void dergister(TileTransceiver transceiver) { + transceivers.remove(transceiver); } @Override - public void run() { - doStore(chans); + public void reset() { + super.reset(); + transceivers.clear(); + iterators.clear(); } - } + @Override + public void removeChannel(Channel channel) { + super.removeChannel(channel); + for (TileTransceiver trans : transceivers) { + trans.removeRecieveChanel(channel); + trans.removeSendChanel(channel); + } + iterators.remove(channel); + queueStore(); + } + @Override + public void addChannel(Channel channel) { + super.addChannel(channel); + queueStore(); + } + + public RoundRobinIterator getIterator(Channel channel) { + RoundRobinIterator res = iterators.get(channel); + if (res == null) { + res = new RoundRobinIterator(transceivers); + iterators.put(channel, res); + } + return res; + } + + // Power + + public void sendPower(TileTransceiver sender, int canSend, Channel channel) { + RoundRobinIterator iter = getIterator(channel); + for (TileTransceiver trans : iter) { + if (trans != sender && trans.getRecieveChannels(ChannelType.POWER).contains(channel)) { + double invLoss = 1 - Config.transceiverEnergyLoss; + int canSendWithLoss = (int) Math.round(canSend * invLoss); + int recieved = trans.receiveEnergy(ForgeDirection.UNKNOWN, canSendWithLoss, false); + if (recieved > 0) { + int recievedPlusLoss = (int) Math.round(recieved / invLoss); + sender.usePower(recievedPlusLoss); + } + } + } + } + + // Fluid + + public FluidTankInfo[] getTankInfoForChannels(TileTransceiver tileTransceiver, Set channels) { + List infos = new ArrayList(); + for (TileTransceiver tran : transceivers) { + if (tran != tileTransceiver) { + tran.getRecieveTankInfo(infos, channels); + } + } + return infos.toArray(new FluidTankInfo[infos.size()]); + } + + public boolean canFill(TileTransceiver tileTransceiver, Set set, Fluid fluid) { + for (TileTransceiver tran : transceivers) { + if (tran != tileTransceiver) { + if (tran.canReceive(set, fluid)) { + return true; + } + } + } + return false; + } + + public int fill(TileTransceiver from, Set list, FluidStack resource, boolean doFill) { + if (resource == null || !from.hasPower()) { + return 0; + } + for (Channel channel : list) { + RoundRobinIterator iter = getIterator(channel); + for (TileTransceiver trans : iter) { + if (trans != from) { + int val = trans.recieveFluid(list, resource, doFill); + if (val > 0) { + if (doFill && Config.transceiverBucketTransmissionCostRF > 0) { + int powerUsed = (int) Math.max(1, Config.transceiverBucketTransmissionCostRF * val / 1000d); + from.usePower(powerUsed); + } + return val; + } + } + } + } + return 0; + } + + // Item + + public void sendItem(TileTransceiver from, Set channels, int slot, ItemStack contents) { + if (!from.hasPower()) { + return; + } + if (!from.getSendItemFilter().doesItemPassFilter(null, contents)) { + return; + } + for (Channel channel : channels) { + RoundRobinIterator iter = getIterator(channel); + for (TileTransceiver trans : iter) { + if (trans != from + && trans.getRecieveChannels(ChannelType.ITEM).contains(channel) + && trans.getRedstoneChecksPassed()) { + contents = sendItem(from, slot, contents, trans); + if (contents == null) { + return; + } + } + } + } + } + + private ItemStack sendItem(TileTransceiver from, int slot, ItemStack contents, TileTransceiver to) { + SlotDefinition sd = to.getSlotDefinition(); + if (!to.getReceiveItemFilter().doesItemPassFilter(null, contents)) { + return contents; + } + // try merging into existing stacks + + boolean sendComplete = false; // Only allow 1 stack per item type + for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot && !sendComplete; i++) { + ItemStack existing = to.getStackInSlot(i); + if (ItemUtil.areStacksEqual(existing, contents)) { + sendComplete = true; + if (existing.stackSize < to.getInventoryStackLimit()) { + int numCanMerge = existing.getMaxStackSize() - existing.stackSize; + numCanMerge = Math.min(numCanMerge, contents.stackSize); + ItemStack remaining; + if (numCanMerge >= contents.stackSize) { + remaining = null; + } else { + remaining = contents.copy(); + remaining.stackSize -= numCanMerge; + } + ItemStack destStack = existing.copy(); + destStack.stackSize += numCanMerge; + to.setInventorySlotContents(i, destStack); + from.setInventorySlotContents(slot, remaining); + if (remaining == null) { + return null; + } else { + contents = remaining.copy(); + } + } + } + } + if (!sendComplete) { + // then fill empty stack + for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot; i++) { + ItemStack existing = to.getStackInSlot(i); + if (existing == null) { + int numCanMerge = Math.min(contents.stackSize, to.getInventoryStackLimit()); + if (numCanMerge > 0) { + ItemStack destStack = contents.copy(); + destStack.stackSize = numCanMerge; + to.setInventorySlotContents(i, destStack); + ItemStack remaining = contents.copy(); + remaining.stackSize -= numCanMerge; + if (remaining.stackSize == 0) { + remaining = null; + } + from.setInventorySlotContents(slot, remaining); + return null; + } + } + } + } + return contents; + } + + private static class SaveRunnable implements Runnable { + + private ListMultimap chans; + + public SaveRunnable(ListMultimap chans) { + this.chans = chans; + } + + @Override + public void run() { + doStore(chans); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index d1875e0f..9398e488 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -1,29 +1,10 @@ package crazypants.enderio.machine.transceiver; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.ItemUtil; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; - import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.filter.ItemFilter; @@ -39,582 +20,605 @@ import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.PowerDistributor; import crazypants.enderio.rail.EnderRailController; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluidHandler, IItemBuffer, IInternalPowerHandler { +public class TileTransceiver extends AbstractPoweredTaskEntity + implements IFluidHandler, IItemBuffer, IInternalPowerHandler { - //Power will only be sent to other transceivers is the buffer is higher than this amount - private static final float MIN_POWER_TO_SEND = 0.5f; + // Power will only be sent to other transceivers is the buffer is higher than this amount + private static final float MIN_POWER_TO_SEND = 0.5f; - private final SetMultimap sendChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - private final SetMultimap recieveChannels = MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); + private final SetMultimap sendChannels = + MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); + private final SetMultimap recieveChannels = + MultimapBuilder.enumKeys(ChannelType.class).hashSetValues().build(); - private final ICapacitor capacitor = new BasicCapacitor(0, Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF); - private boolean sendChannelsDirty = false; - private boolean recieveChannelsDirty = false; - private boolean registered = false; + private final ICapacitor capacitor = + new BasicCapacitor(0, Config.transceiverMaxIoRF * 2, 500000, Config.transceiverMaxIoRF); + private boolean sendChannelsDirty = false; + private boolean recieveChannelsDirty = false; + private boolean registered = false; - private Map neighbourFluidHandlers = null; + private Map neighbourFluidHandlers = null; - private PowerDistributor powerDistributor; + private PowerDistributor powerDistributor; - private final EnderRailController railController; + private final EnderRailController railController; - private boolean inFluidFill = false; - private boolean inGetTankInfo = false; + private boolean inFluidFill = false; + private boolean inGetTankInfo = false; - private ItemFilter sendItemFilter; - private ItemFilter recieveItemFilter; + private ItemFilter sendItemFilter; + private ItemFilter recieveItemFilter; - private boolean bufferStacks = true; + private boolean bufferStacks = true; - public TileTransceiver() { - super(new SlotDefinition(8, 8, 0)); - currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); - railController = new EnderRailController(this); + public TileTransceiver() { + super(new SlotDefinition(8, 8, 0)); + currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); + railController = new EnderRailController(this); - sendItemFilter = new ItemFilter(true); - recieveItemFilter = new ItemFilter(true); - } - - public EnderRailController getRailController() { - return railController; - } - - public boolean isRedstoneChecksPassed() { - return redstoneCheckPassed; - } - - @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - boolean res = super.processTasks(redstoneChecksPassed); - if(!redstoneChecksPassed) { - return res; + sendItemFilter = new ItemFilter(true); + recieveItemFilter = new ItemFilter(true); } - //NB: Fluid done synchronously - processPower(); - processItems(); - return res; - } - - @Override - public void doUpdate() { - if (!registered && !worldObj.isRemote) { - ServerChannelRegister.instance.register(this); - registered = true; - removeUnregsiteredChannels(sendChannels); - removeUnregsiteredChannels(recieveChannels); - } - super.doUpdate(); - - if (!worldObj.isRemote) { - railController.doTick(); - if(sendChannelsDirty) { - PacketHandler.sendToAllAround(new PacketSendRecieveChannelList(this, true), this, 256); - sendChannelsDirty = false; - } - if(recieveChannelsDirty) { - PacketHandler.sendToAllAround(new PacketSendRecieveChannelList(this, false), this, 256); - recieveChannelsDirty = false; - } - } - } - - @Override - public void invalidate() { - super.invalidate(); - if(registered && worldObj != null && !worldObj.isRemote) { - ServerChannelRegister.instance.dergister(this); - registered = false; - } - } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - if(registered && worldObj != null && !worldObj.isRemote) { - ServerChannelRegister.instance.dergister(this); - registered = false; - } - } - - private void removeUnregsiteredChannels(SetMultimap chans) { - List toRemove = new ArrayList(); - for (Channel chan : chans.values()) { - if (!ServerChannelRegister.instance.getChannelsForType(chan.getType()).contains(chan)) { - toRemove.add(chan); - } - } - for (Channel chan : toRemove) { - removeChannel(chan, chans); - } - } - - @Override - public String getMachineName() { - return ModObject.blockTransceiver.unlocalisedName; - } - - @Override - public boolean isActive() { - return hasPower(); - } - - - @Override - public ICapacitor getCapacitor() { - return capacitor; - } - - @Override - public int getPowerUsePerTick() { - return Config.transceiverUpkeepCostRF; - } - - public Set getSendChannels(ChannelType type) { - return sendChannels.get(type); - } - - public Set getRecieveChannels(ChannelType type) { - return recieveChannels.get(type); - } - - public void addSendChanel(Channel channel) { - addChannel(channel, sendChannels); - } - - public void addRecieveChanel(Channel channel) { - addChannel(channel, recieveChannels); - } - - public void removeSendChanel(Channel channel) { - removeChannel(channel, sendChannels); - } - - public void removeRecieveChanel(Channel channel) { - removeChannel(channel, recieveChannels); - } - - private void addChannel(Channel channel, SetMultimap channels) { - if (channel == null) { - return; - } - Collection chans = channels.get(channel.getType()); - if (chans.add(channel)) { - if (channels == sendChannels) { - sendChannelsDirty = true; - } else { - recieveChannelsDirty = true; - } - } - } - - private void removeChannel(Channel channel, SetMultimap channnels) { - if(channel == null) { - return; - } - Set chans = channnels.get(channel.getType()); - if (chans.remove(channel)) { - if (channnels == sendChannels) { - sendChannelsDirty = true; - } else { - recieveChannelsDirty = true; - } - } - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readCustomNBT(nbtRoot); - railController.readFromNBT(nbtRoot); - currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeCustomNBT(nbtRoot); - railController.writeToNBT(nbtRoot); - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - readChannels(nbtRoot, sendChannels, "sendChannels"); - readChannels(nbtRoot, recieveChannels, "recieveChannels"); - - if(nbtRoot.hasKey("sendItemFilter")) { - NBTTagCompound itemRoot = nbtRoot.getCompoundTag("sendItemFilter"); - sendItemFilter.copyFrom((ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot)); - } - if(nbtRoot.hasKey("recieveItemFilter")) { - NBTTagCompound itemRoot = nbtRoot.getCompoundTag("recieveItemFilter"); - recieveItemFilter.copyFrom((ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot)); + public EnderRailController getRailController() { + return railController; } - if(nbtRoot.hasKey("bufferStacks")) { - bufferStacks = nbtRoot.getBoolean("bufferStacks"); - } else { - bufferStacks = true; - } - } - - static void readChannels(NBTTagCompound nbtRoot, SetMultimap channels, String key) { - channels.clear(); - - if(!nbtRoot.hasKey(key)) { - return; - } - NBTTagList tags = (NBTTagList) nbtRoot.getTag(key); - for (int i = 0; i < tags.tagCount(); i++) { - NBTTagCompound chanelTag = tags.getCompoundTagAt(i); - Channel channel = Channel.readFromNBT(chanelTag); - if(channel != null) { - channels.put(channel.getType(), channel); - } - } - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - - NBTTagList channelTags = createTagList(sendChannels); - nbtRoot.setTag("sendChannels", channelTags); - - channelTags = createTagList(recieveChannels); - nbtRoot.setTag("recieveChannels", channelTags); - - if(sendItemFilter != null) { - NBTTagCompound itemRoot = new NBTTagCompound(); - FilterRegister.writeFilterToNbt(sendItemFilter, itemRoot); - nbtRoot.setTag("sendItemFilter", itemRoot); - } - if(recieveItemFilter != null) { - NBTTagCompound itemRoot = new NBTTagCompound(); - FilterRegister.writeFilterToNbt(recieveItemFilter, itemRoot); - nbtRoot.setTag("recieveItemFilter", itemRoot); + public boolean isRedstoneChecksPassed() { + return redstoneCheckPassed; } - nbtRoot.setBoolean("bufferStacks", bufferStacks); - } + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { + boolean res = super.processTasks(redstoneChecksPassed); + if (!redstoneChecksPassed) { + return res; + } - static NBTTagList createTagList(SetMultimap channels) { - NBTTagList res = new NBTTagList(); - for (Channel channel : channels.values()) { - NBTTagCompound chanTag = new NBTTagCompound(); - channel.writeToNBT(chanTag); - res.appendTag(chanTag); - } - return res; - } - - void setSendChannels(Multimap channels) { - sendChannels.clear(); - sendChannels.putAll(channels); - } - - void setRecieveChannels(Multimap channels) { - recieveChannels.clear(); - recieveChannels.putAll(channels); - } - - SetMultimap getSendChannels() { - return sendChannels; - } - - SetMultimap getReceiveChannels() { - return recieveChannels; - } - - //---------------- Power Handling - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - private void processPower() { - Set sendTo = getSendChannels(ChannelType.POWER); - int canSend = getMaxSendableEnergy(); - if(canSend > 0 && !sendTo.isEmpty()) { - Iterator iter = sendTo.iterator(); - while (canSend > 0 && iter.hasNext()) { - ServerChannelRegister.instance.sendPower(this, canSend, iter.next()); - canSend = getMaxSendableEnergy(); - } - } - canSend = getMaxSendableEnergy(); - if(canSend > 0 && !getRecieveChannels(ChannelType.POWER).isEmpty()) { - if(powerDistributor == null) { - powerDistributor = new PowerDistributor(getLocation()); - } - int used = powerDistributor.transmitEnergy(worldObj, canSend); - usePower(used); - } - } - - private int getMaxSendableEnergy() { - return getEnergyStored() - (int) (MIN_POWER_TO_SEND * getMaxEnergyStored()); - } - - private float getEnergyStoredRatio() { - return (float) getEnergyStored() / getMaxEnergyStored(); - } - - @Override - public void onNeighborBlockChange(Block blockId) { - super.onNeighborBlockChange(blockId); - if(powerDistributor != null) { - powerDistributor.neighboursChanged(); - } - neighbourFluidHandlers = null; - } - - private boolean hasRecieveChannel(Set channels, ChannelType type) { - boolean hasChannel = false; - for (Channel chan : channels) { - if(getRecieveChannels(type).contains(chan)) { - hasChannel = true; - break; - } - } - return hasChannel; - } - - //---------------- Fluid Handling - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(inFluidFill) { - return false; - } - try { - inFluidFill = true; - if(getSendChannels(ChannelType.FLUID).isEmpty()) { - return false; - } - return ServerChannelRegister.instance.canFill(this, getSendChannels(ChannelType.FLUID), fluid); - } finally { - inFluidFill = false; - } - } - - public boolean canReceive(Set channels, Fluid fluid) { - if(inFluidFill) { - return false; + // NB: Fluid done synchronously + processPower(); + processItems(); + return res; } - if(!hasRecieveChannel(channels, ChannelType.FLUID)) { - return false; - } - Map handlers = getNeighbouringFluidHandlers(); - for (Entry entry : handlers.entrySet()) { - if(entry.getValue().canFill(entry.getKey().getOpposite(), fluid)) { - return true; - } - } - return false; - } + @Override + public void doUpdate() { + if (!registered && !worldObj.isRemote) { + ServerChannelRegister.instance.register(this); + registered = true; + removeUnregsiteredChannels(sendChannels); + removeUnregsiteredChannels(recieveChannels); + } + super.doUpdate(); - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(inFluidFill) { - return 0; + if (!worldObj.isRemote) { + railController.doTick(); + if (sendChannelsDirty) { + PacketHandler.sendToAllAround(new PacketSendRecieveChannelList(this, true), this, 256); + sendChannelsDirty = false; + } + if (recieveChannelsDirty) { + PacketHandler.sendToAllAround(new PacketSendRecieveChannelList(this, false), this, 256); + recieveChannelsDirty = false; + } + } } - try { - inFluidFill = true; - if(getSendChannels(ChannelType.FLUID).isEmpty() || !redstoneCheckPassed || !getIoMode(from).canRecieveInput()) { + + @Override + public void invalidate() { + super.invalidate(); + if (registered && worldObj != null && !worldObj.isRemote) { + ServerChannelRegister.instance.dergister(this); + registered = false; + } + } + + @Override + public void onChunkUnload() { + super.onChunkUnload(); + if (registered && worldObj != null && !worldObj.isRemote) { + ServerChannelRegister.instance.dergister(this); + registered = false; + } + } + + private void removeUnregsiteredChannels(SetMultimap chans) { + List toRemove = new ArrayList(); + for (Channel chan : chans.values()) { + if (!ServerChannelRegister.instance + .getChannelsForType(chan.getType()) + .contains(chan)) { + toRemove.add(chan); + } + } + for (Channel chan : toRemove) { + removeChannel(chan, chans); + } + } + + @Override + public String getMachineName() { + return ModObject.blockTransceiver.unlocalisedName; + } + + @Override + public boolean isActive() { + return hasPower(); + } + + @Override + public ICapacitor getCapacitor() { + return capacitor; + } + + @Override + public int getPowerUsePerTick() { + return Config.transceiverUpkeepCostRF; + } + + public Set getSendChannels(ChannelType type) { + return sendChannels.get(type); + } + + public Set getRecieveChannels(ChannelType type) { + return recieveChannels.get(type); + } + + public void addSendChanel(Channel channel) { + addChannel(channel, sendChannels); + } + + public void addRecieveChanel(Channel channel) { + addChannel(channel, recieveChannels); + } + + public void removeSendChanel(Channel channel) { + removeChannel(channel, sendChannels); + } + + public void removeRecieveChanel(Channel channel) { + removeChannel(channel, recieveChannels); + } + + private void addChannel(Channel channel, SetMultimap channels) { + if (channel == null) { + return; + } + Collection chans = channels.get(channel.getType()); + if (chans.add(channel)) { + if (channels == sendChannels) { + sendChannelsDirty = true; + } else { + recieveChannelsDirty = true; + } + } + } + + private void removeChannel(Channel channel, SetMultimap channnels) { + if (channel == null) { + return; + } + Set chans = channnels.get(channel.getType()); + if (chans.remove(channel)) { + if (channnels == sendChannels) { + sendChannelsDirty = true; + } else { + recieveChannelsDirty = true; + } + } + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readCustomNBT(nbtRoot); + railController.readFromNBT(nbtRoot); + currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + super.writeCustomNBT(nbtRoot); + railController.writeToNBT(nbtRoot); + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + readChannels(nbtRoot, sendChannels, "sendChannels"); + readChannels(nbtRoot, recieveChannels, "recieveChannels"); + + if (nbtRoot.hasKey("sendItemFilter")) { + NBTTagCompound itemRoot = nbtRoot.getCompoundTag("sendItemFilter"); + sendItemFilter.copyFrom((ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot)); + } + if (nbtRoot.hasKey("recieveItemFilter")) { + NBTTagCompound itemRoot = nbtRoot.getCompoundTag("recieveItemFilter"); + recieveItemFilter.copyFrom((ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot)); + } + + if (nbtRoot.hasKey("bufferStacks")) { + bufferStacks = nbtRoot.getBoolean("bufferStacks"); + } else { + bufferStacks = true; + } + } + + static void readChannels(NBTTagCompound nbtRoot, SetMultimap channels, String key) { + channels.clear(); + + if (!nbtRoot.hasKey(key)) { + return; + } + NBTTagList tags = (NBTTagList) nbtRoot.getTag(key); + for (int i = 0; i < tags.tagCount(); i++) { + NBTTagCompound chanelTag = tags.getCompoundTagAt(i); + Channel channel = Channel.readFromNBT(chanelTag); + if (channel != null) { + channels.put(channel.getType(), channel); + } + } + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + + NBTTagList channelTags = createTagList(sendChannels); + nbtRoot.setTag("sendChannels", channelTags); + + channelTags = createTagList(recieveChannels); + nbtRoot.setTag("recieveChannels", channelTags); + + if (sendItemFilter != null) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(sendItemFilter, itemRoot); + nbtRoot.setTag("sendItemFilter", itemRoot); + } + if (recieveItemFilter != null) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(recieveItemFilter, itemRoot); + nbtRoot.setTag("recieveItemFilter", itemRoot); + } + + nbtRoot.setBoolean("bufferStacks", bufferStacks); + } + + static NBTTagList createTagList(SetMultimap channels) { + NBTTagList res = new NBTTagList(); + for (Channel channel : channels.values()) { + NBTTagCompound chanTag = new NBTTagCompound(); + channel.writeToNBT(chanTag); + res.appendTag(chanTag); + } + return res; + } + + void setSendChannels(Multimap channels) { + sendChannels.clear(); + sendChannels.putAll(channels); + } + + void setRecieveChannels(Multimap channels) { + recieveChannels.clear(); + recieveChannels.putAll(channels); + } + + SetMultimap getSendChannels() { + return sendChannels; + } + + SetMultimap getReceiveChannels() { + return recieveChannels; + } + + // ---------------- Power Handling + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { return 0; - } - return ServerChannelRegister.instance.fill(this, getSendChannels(ChannelType.FLUID), resource, doFill); - } finally { - inFluidFill = false; } - } - public int recieveFluid(Set channels, FluidStack resource, boolean doFill) { - if(inFluidFill) { - return 0; - } - if(!hasRecieveChannel(channels, ChannelType.FLUID) || !redstoneCheckPassed) { - return 0; - } - Map handlers = getNeighbouringFluidHandlers(); - for (Entry entry : handlers.entrySet()) { - IoMode mode = getIoMode(entry.getKey()); - if(mode.canOutput()) { - int res = entry.getValue().fill(entry.getKey().getOpposite(), resource, doFill); - if(res > 0) { - return res; + private void processPower() { + Set sendTo = getSendChannels(ChannelType.POWER); + int canSend = getMaxSendableEnergy(); + if (canSend > 0 && !sendTo.isEmpty()) { + Iterator iter = sendTo.iterator(); + while (canSend > 0 && iter.hasNext()) { + ServerChannelRegister.instance.sendPower(this, canSend, iter.next()); + canSend = getMaxSendableEnergy(); + } } - } - } - return 0; - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(inGetTankInfo) { - return new FluidTankInfo[0]; - } - try { - inGetTankInfo = true; - return ServerChannelRegister.instance.getTankInfoForChannels(this, getSendChannels(ChannelType.FLUID)); - } finally { - inGetTankInfo = false; - } - } - - public void getRecieveTankInfo(List infos, Set channels) { - if(inGetTankInfo) { - return; - } - try { - inGetTankInfo = true; - if(!hasRecieveChannel(channels, ChannelType.FLUID)) { - return; - } - Map fluidHandlers = getNeighbouringFluidHandlers(); - for (Entry entry : fluidHandlers.entrySet()) { - FluidTankInfo[] tanks = entry.getValue().getTankInfo(entry.getKey().getOpposite()); - if(tanks != null) { - for (FluidTankInfo info : tanks) { - infos.add(info); - } + canSend = getMaxSendableEnergy(); + if (canSend > 0 && !getRecieveChannels(ChannelType.POWER).isEmpty()) { + if (powerDistributor == null) { + powerDistributor = new PowerDistributor(getLocation()); + } + int used = powerDistributor.transmitEnergy(worldObj, canSend); + usePower(used); } - } - } finally { - inGetTankInfo = false; } - } - Map getNeighbouringFluidHandlers() { - if(neighbourFluidHandlers == null) { - neighbourFluidHandlers = FluidUtil.getNeighbouringFluidHandlers(worldObj, getLocation()); + private int getMaxSendableEnergy() { + return getEnergyStored() - (int) (MIN_POWER_TO_SEND * getMaxEnergyStored()); } - return neighbourFluidHandlers; - } - //Pulling liquids not supported - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } + private float getEnergyStoredRatio() { + return (float) getEnergyStored() / getMaxEnergyStored(); + } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } - - //---------------- item handling - - @Override - public int getInventoryStackLimit() { - return bufferStacks ? 64 : 1; - } - - @Override - public boolean isBufferStacks() { - return bufferStacks; - } - - @Override - public void setBufferStacks(boolean bufferStacks) { - this.bufferStacks = bufferStacks; - } - - private void processItems() { - Set sendItemChannels = getSendChannels(ChannelType.ITEM); - if(!sendItemChannels.isEmpty()) { - for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { - ItemStack toSend = getStackInSlot(i); - if(toSend != null) { - ServerChannelRegister.instance.sendItem(this, sendItemChannels, i, toSend); + @Override + public void onNeighborBlockChange(Block blockId) { + super.onNeighborBlockChange(blockId); + if (powerDistributor != null) { + powerDistributor.neighboursChanged(); } - } - } - } - - public ItemFilter getSendItemFilter() { - return sendItemFilter; - } - - public ItemFilter getReceiveItemFilter() { - return recieveItemFilter; - } - - public ItemFilter getRecieveItemFilter() { - return recieveItemFilter; - } - - public void setRecieveItemFilter(ItemFilter recieveItemFilter) { - this.recieveItemFilter = recieveItemFilter; - } - - public void setSendItemFilter(ItemFilter sendItemFilter) { - this.sendItemFilter = sendItemFilter; - } - - @Override - protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { - if(itemstack == null) { - return false; - } - if(slotDefinition.isInputSlot(slot)) { - if(!getSendItemFilter().doesItemPassFilter(null, itemstack)) { - return false; - } - } else if(slotDefinition.isOutputSlot(slot)) { - if(!getReceiveItemFilter().doesItemPassFilter(null, itemstack)) { - return false; - } - } - return true; - } - - @Override - public boolean canInsertItem(int slot, ItemStack itemstack, int j) { - if(itemstack == null) { - return false; + neighbourFluidHandlers = null; } - //only allow 1 stack per type - if(slotDefinition.isInputSlot(slot)) { + private boolean hasRecieveChannel(Set channels, ChannelType type) { + boolean hasChannel = false; + for (Channel chan : channels) { + if (getRecieveChannels(type).contains(chan)) { + hasChannel = true; + break; + } + } + return hasChannel; + } - Set chans = getSendChannels().get(ChannelType.ITEM); - if(chans == null || chans.size() == 0) { - return false; - } - if(!getSendItemFilter().doesItemPassFilter(null, itemstack)) { - return false; - } + // ---------------- Fluid Handling - for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { - if(i != slot) { - if(ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (inFluidFill) { return false; - } } - } - } else if(slotDefinition.isOutputSlot(slot)) { - - if(!getRecieveItemFilter().doesItemPassFilter(null, itemstack)) { - return false; - } - for (int i = slotDefinition.getMinOutputSlot(); i <= slotDefinition.getMaxOutputSlot(); i++) { - if(i != slot) { - if(ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { - return false; - } + try { + inFluidFill = true; + if (getSendChannels(ChannelType.FLUID).isEmpty()) { + return false; + } + return ServerChannelRegister.instance.canFill(this, getSendChannels(ChannelType.FLUID), fluid); + } finally { + inFluidFill = false; } - } } - return super.canInsertItem(slot, itemstack, j); - } + public boolean canReceive(Set channels, Fluid fluid) { + if (inFluidFill) { + return false; + } + + if (!hasRecieveChannel(channels, ChannelType.FLUID)) { + return false; + } + Map handlers = getNeighbouringFluidHandlers(); + for (Entry entry : handlers.entrySet()) { + if (entry.getValue().canFill(entry.getKey().getOpposite(), fluid)) { + return true; + } + } + return false; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (inFluidFill) { + return 0; + } + try { + inFluidFill = true; + if (getSendChannels(ChannelType.FLUID).isEmpty() + || !redstoneCheckPassed + || !getIoMode(from).canRecieveInput()) { + return 0; + } + return ServerChannelRegister.instance.fill(this, getSendChannels(ChannelType.FLUID), resource, doFill); + } finally { + inFluidFill = false; + } + } + + public int recieveFluid(Set channels, FluidStack resource, boolean doFill) { + if (inFluidFill) { + return 0; + } + if (!hasRecieveChannel(channels, ChannelType.FLUID) || !redstoneCheckPassed) { + return 0; + } + Map handlers = getNeighbouringFluidHandlers(); + for (Entry entry : handlers.entrySet()) { + IoMode mode = getIoMode(entry.getKey()); + if (mode.canOutput()) { + int res = entry.getValue().fill(entry.getKey().getOpposite(), resource, doFill); + if (res > 0) { + return res; + } + } + } + return 0; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (inGetTankInfo) { + return new FluidTankInfo[0]; + } + try { + inGetTankInfo = true; + return ServerChannelRegister.instance.getTankInfoForChannels(this, getSendChannels(ChannelType.FLUID)); + } finally { + inGetTankInfo = false; + } + } + + public void getRecieveTankInfo(List infos, Set channels) { + if (inGetTankInfo) { + return; + } + try { + inGetTankInfo = true; + if (!hasRecieveChannel(channels, ChannelType.FLUID)) { + return; + } + Map fluidHandlers = getNeighbouringFluidHandlers(); + for (Entry entry : fluidHandlers.entrySet()) { + FluidTankInfo[] tanks = + entry.getValue().getTankInfo(entry.getKey().getOpposite()); + if (tanks != null) { + for (FluidTankInfo info : tanks) { + infos.add(info); + } + } + } + } finally { + inGetTankInfo = false; + } + } + + Map getNeighbouringFluidHandlers() { + if (neighbourFluidHandlers == null) { + neighbourFluidHandlers = FluidUtil.getNeighbouringFluidHandlers(worldObj, getLocation()); + } + return neighbourFluidHandlers; + } + + // Pulling liquids not supported + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return null; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; + } + + // ---------------- item handling + + @Override + public int getInventoryStackLimit() { + return bufferStacks ? 64 : 1; + } + + @Override + public boolean isBufferStacks() { + return bufferStacks; + } + + @Override + public void setBufferStacks(boolean bufferStacks) { + this.bufferStacks = bufferStacks; + } + + private void processItems() { + Set sendItemChannels = getSendChannels(ChannelType.ITEM); + if (!sendItemChannels.isEmpty()) { + for (int i = slotDefinition.minInputSlot; i <= slotDefinition.maxInputSlot; i++) { + ItemStack toSend = getStackInSlot(i); + if (toSend != null) { + ServerChannelRegister.instance.sendItem(this, sendItemChannels, i, toSend); + } + } + } + } + + public ItemFilter getSendItemFilter() { + return sendItemFilter; + } + + public ItemFilter getReceiveItemFilter() { + return recieveItemFilter; + } + + public ItemFilter getRecieveItemFilter() { + return recieveItemFilter; + } + + public void setRecieveItemFilter(ItemFilter recieveItemFilter) { + this.recieveItemFilter = recieveItemFilter; + } + + public void setSendItemFilter(ItemFilter sendItemFilter) { + this.sendItemFilter = sendItemFilter; + } + + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { + if (itemstack == null) { + return false; + } + if (slotDefinition.isInputSlot(slot)) { + if (!getSendItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + } else if (slotDefinition.isOutputSlot(slot)) { + if (!getReceiveItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + } + return true; + } + + @Override + public boolean canInsertItem(int slot, ItemStack itemstack, int j) { + if (itemstack == null) { + return false; + } + + // only allow 1 stack per type + if (slotDefinition.isInputSlot(slot)) { + + Set chans = getSendChannels().get(ChannelType.ITEM); + if (chans == null || chans.size() == 0) { + return false; + } + if (!getSendItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { + if (i != slot) { + if (ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { + return false; + } + } + } + } else if (slotDefinition.isOutputSlot(slot)) { + + if (!getRecieveItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + for (int i = slotDefinition.getMinOutputSlot(); i <= slotDefinition.getMaxOutputSlot(); i++) { + if (i != slot) { + if (ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { + return false; + } + } + } + } + return super.canInsertItem(slot, itemstack, j); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index dba4c8e9..ef1fb4b7 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -1,13 +1,5 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Color; - -import javax.annotation.Nullable; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; - import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.api.client.gui.ListSelectionListener; import com.enderio.core.client.gui.button.IconButton; @@ -16,7 +8,6 @@ import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.render.ColorUtil; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.transceiver.Channel; @@ -27,256 +18,267 @@ import crazypants.enderio.machine.transceiver.PacketSendRecieveChannel; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.util.UserIdent; +import java.awt.Color; +import javax.annotation.Nullable; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; public class ChannelTab implements ITabPanel { - protected static final int ADD_BUTTON_ID = 3; - protected static final int PRIVATE_BUTTON_ID = 4; - private static final int DELETE_CHANNEL_BUTTON_ID = 5; - - private static final int SEND_BUTTON_ID = 6; - private static final int RECIEVE_BUTTON_ID = 7; + protected static final int ADD_BUTTON_ID = 3; + protected static final int PRIVATE_BUTTON_ID = 4; + private static final int DELETE_CHANNEL_BUTTON_ID = 5; - ChannelType type; - GuiTransceiver parent; + private static final int SEND_BUTTON_ID = 6; + private static final int RECIEVE_BUTTON_ID = 7; - IconButton addButton; - ToggleButton privateButton; + ChannelType type; + GuiTransceiver parent; - GuiTextField newChannelTF; - GuiChannelList channelList; - - GuiChannelList sendChannels; - GuiChannelList recieveChannels; - - IconButton deleteChannelB; - IconButton sendB; - IconButton recieveB; - - ListSelectionListener selectionListener; - TileTransceiver transceiver; + IconButton addButton; + ToggleButton privateButton; - public ChannelTab(GuiTransceiver guiTransceiver, ChannelType type) { - parent = guiTransceiver; - this.type = type; - transceiver = guiTransceiver.getTransciever(); + GuiTextField newChannelTF; + GuiChannelList channelList; - newChannelTF = new GuiTextField(parent.getFontRenderer(), 7, 12, 103, 16); - addButton = new IconButton(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); - addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); - addButton.enabled = false; + GuiChannelList sendChannels; + GuiChannelList recieveChannels; - privateButton = new ToggleButton(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); - privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); - privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); + IconButton deleteChannelB; + IconButton sendB; + IconButton recieveB; - int w = 104; - int h = 90; - int x = 7; - int y = 48; - channelList = new GuiChannelList(parent, w, h, x, y); - channelList.setChannels(ClientChannelRegister.instance.getChannelsForType(type), Predicates.alwaysTrue()); - channelList.setShowSelectionBox(true); - channelList.setScrollButtonIds(100, 101); - - deleteChannelB = new IconButton(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); - deleteChannelB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); - - Predicate predicate = new Predicate() { - @Override - public boolean apply(@Nullable Channel input) { - return input != null - && (input.isPublic() || input.getUser().equals(EnderIO.proxy.getClientPlayer().getGameProfile()) || input.getUser() == UserIdent.nobody); - } - }; - - x += w + 32; - h = 35; - sendChannels = new GuiChannelList(parent, w, h, x, y); - sendChannels.setChannels(transceiver.getSendChannels(type), predicate); - sendChannels.setShowSelectionBox(true); - sendChannels.setScrollButtonIds(200, 201); - - sendB = new IconButton(parent,SEND_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); - - y += h + 20; - recieveChannels = new GuiChannelList(parent, w, h, x, y); - recieveChannels.setChannels(transceiver.getRecieveChannels(type), predicate); - recieveChannels.setShowSelectionBox(true); - recieveChannels.setScrollButtonIds(300, 301); - - recieveB = new IconButton(parent,RECIEVE_BUTTON_ID,x -24, y + h/2 - 9, IconEIO.ARROWS); - - - selectionListener = new ListSelectionListener() { - - @Override - public void selectionChanged(GuiScrollableList list, int selectedIndex) { - if(selectedIndex < 0) { - return; + ListSelectionListener selectionListener; + TileTransceiver transceiver; + + public ChannelTab(GuiTransceiver guiTransceiver, ChannelType type) { + parent = guiTransceiver; + this.type = type; + transceiver = guiTransceiver.getTransciever(); + + newChannelTF = new GuiTextField(parent.getFontRenderer(), 7, 12, 103, 16); + addButton = new IconButton(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); + addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); + addButton.enabled = false; + + privateButton = + new ToggleButton(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); + privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); + privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); + + int w = 104; + int h = 90; + int x = 7; + int y = 48; + channelList = new GuiChannelList(parent, w, h, x, y); + channelList.setChannels( + ClientChannelRegister.instance.getChannelsForType(type), Predicates.alwaysTrue()); + channelList.setShowSelectionBox(true); + channelList.setScrollButtonIds(100, 101); + + deleteChannelB = new IconButton(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); + deleteChannelB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); + + Predicate predicate = new Predicate() { + @Override + public boolean apply(@Nullable Channel input) { + return input != null + && (input.isPublic() + || input.getUser() + .equals(EnderIO.proxy.getClientPlayer().getGameProfile()) + || input.getUser() == UserIdent.nobody); + } + }; + + x += w + 32; + h = 35; + sendChannels = new GuiChannelList(parent, w, h, x, y); + sendChannels.setChannels(transceiver.getSendChannels(type), predicate); + sendChannels.setShowSelectionBox(true); + sendChannels.setScrollButtonIds(200, 201); + + sendB = new IconButton(parent, SEND_BUTTON_ID, x - 24, y + h / 2 - 9, IconEIO.ARROWS); + + y += h + 20; + recieveChannels = new GuiChannelList(parent, w, h, x, y); + recieveChannels.setChannels(transceiver.getRecieveChannels(type), predicate); + recieveChannels.setShowSelectionBox(true); + recieveChannels.setScrollButtonIds(300, 301); + + recieveB = new IconButton(parent, RECIEVE_BUTTON_ID, x - 24, y + h / 2 - 9, IconEIO.ARROWS); + + selectionListener = new ListSelectionListener() { + + @Override + public void selectionChanged(GuiScrollableList list, int selectedIndex) { + if (selectedIndex < 0) { + return; + } + if (list != channelList) { + channelList.setSelection(-1); + } + if (list != sendChannels) { + sendChannels.setSelection(-1); + } + if (list != recieveChannels) { + recieveChannels.setSelection(-1); + } + } + }; + channelList.addSelectionListener(selectionListener); + sendChannels.addSelectionListener(selectionListener); + recieveChannels.addSelectionListener(selectionListener); + } + + @Override + public void onGuiInit(int x, int y, int width, int height) { + addButton.onGuiInit(); + privateButton.onGuiInit(); + deleteChannelB.onGuiInit(); + sendB.onGuiInit(); + recieveB.onGuiInit(); + + y = parent.getGuiTop() + 12; + x = parent.getGuiLeft() + 8; + newChannelTF.xPosition = x; + newChannelTF.yPosition = y; + newChannelTF.setCanLoseFocus(false); + newChannelTF.setMaxStringLength(32); + newChannelTF.setFocused(true); + + channelList.onGuiInit(parent); + sendChannels.onGuiInit(parent); + recieveChannels.onGuiInit(parent); + } + + @Override + public void deactivate() { + addButton.detach(); + privateButton.detach(); + deleteChannelB.detach(); + sendB.detach(); + recieveB.detach(); + } + + @Override + public void keyTyped(char par1, int par2) { + newChannelTF.textboxKeyTyped(par1, par2); + addButton.enabled = newChannelTF.getText().trim().length() > 0; + } + + @Override + public IconEIO getIcon() { + switch (type) { + case FLUID: + return IconEIO.WRENCH_OVERLAY_FLUID; + case ITEM: + return IconEIO.WRENCH_OVERLAY_ITEM; + case POWER: + return IconEIO.WRENCH_OVERLAY_POWER; + case RAIL: + return IconEIO.ENDER_RAIL; + default: + return IconEIO.WRENCH_OVERLAY_POWER; } - if(list != channelList) { - channelList.setSelection(-1); + } + + @Override + public void updateScreen() { + newChannelTF.updateCursorCounter(); + } + + @Override + public void render(float partialTick, int mouseX, int mouseY) { + newChannelTF.drawTextBox(); + channelList.drawScreen(mouseX, mouseY, partialTick); + sendChannels.drawScreen(mouseX, mouseY, partialTick); + recieveChannels.drawScreen(mouseX, mouseY, partialTick); + + int left = parent.getGuiLeft(); + int top = parent.getGuiTop(); + int x = left + 59; + int y = top + 36; + parent.drawCenteredString( + parent.getFontRenderer(), EnderIO.lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); + + x = left + 199; + parent.drawCenteredString( + parent.getFontRenderer(), EnderIO.lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); + + y += 56; + parent.drawCenteredString( + parent.getFontRenderer(), EnderIO.lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if (guiButton.id == ADD_BUTTON_ID) { + addChannelPressed(); + } else if (guiButton.id == DELETE_CHANNEL_BUTTON_ID) { + deleteChannelPressed(); + } else if (guiButton.id == SEND_BUTTON_ID) { + sendTogglePressed(); + } else if (guiButton.id == RECIEVE_BUTTON_ID) { + receiveTogglePressed(); } - if(list != sendChannels) { - sendChannels.setSelection(-1); + } + + protected void receiveTogglePressed() { + Channel c = channelList.getSelectedElement(); + if (c != null && !transceiver.getRecieveChannels(type).contains(c)) { + transceiver.addRecieveChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, true, c)); + } else { + c = recieveChannels.getSelectedElement(); + if (c != null) { + transceiver.removeRecieveChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, false, c)); + } } - if(list != recieveChannels) { - recieveChannels.setSelection(-1); + } + + protected void sendTogglePressed() { + Channel c = channelList.getSelectedElement(); + if (c != null && !transceiver.getSendChannels(type).contains(c)) { + transceiver.addSendChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, true, c)); + } else { + c = sendChannels.getSelectedElement(); + if (c != null) { + transceiver.removeSendChanel(c); + PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, false, c)); + } } - } - }; - channelList.addSelectionListener(selectionListener); - sendChannels.addSelectionListener(selectionListener); - recieveChannels.addSelectionListener(selectionListener); - - } - - @Override - public void onGuiInit(int x, int y, int width, int height) { - addButton.onGuiInit(); - privateButton.onGuiInit(); - deleteChannelB.onGuiInit(); - sendB.onGuiInit(); - recieveB.onGuiInit(); - - y = parent.getGuiTop() + 12; - x = parent.getGuiLeft() + 8; - newChannelTF.xPosition = x; - newChannelTF.yPosition = y; - newChannelTF.setCanLoseFocus(false); - newChannelTF.setMaxStringLength(32); - newChannelTF.setFocused(true); - - channelList.onGuiInit(parent); - sendChannels.onGuiInit(parent); - recieveChannels.onGuiInit(parent); - } - - @Override - public void deactivate() { - addButton.detach(); - privateButton.detach(); - deleteChannelB.detach(); - sendB.detach(); - recieveB.detach(); - } - - @Override - public void keyTyped(char par1, int par2) { - newChannelTF.textboxKeyTyped(par1, par2); - addButton.enabled = newChannelTF.getText().trim().length() > 0; - } - - @Override - public IconEIO getIcon() { - switch (type) { - case FLUID: - return IconEIO.WRENCH_OVERLAY_FLUID; - case ITEM: - return IconEIO.WRENCH_OVERLAY_ITEM; - case POWER: - return IconEIO.WRENCH_OVERLAY_POWER; - case RAIL: - return IconEIO.ENDER_RAIL; - default: - return IconEIO.WRENCH_OVERLAY_POWER; } - } - @Override - public void updateScreen() { - newChannelTF.updateCursorCounter(); - } - - @Override - public void render(float partialTick, int mouseX, int mouseY) { - newChannelTF.drawTextBox(); - channelList.drawScreen(mouseX, mouseY, partialTick); - sendChannels.drawScreen(mouseX, mouseY, partialTick); - recieveChannels.drawScreen(mouseX, mouseY, partialTick); - - int left = parent.getGuiLeft(); - int top = parent.getGuiTop(); - int x = left + 59; - int y = top + 36; - parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); - - x = left + 199; - parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); - - y += 56; - parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - if(guiButton.id == ADD_BUTTON_ID) { - addChannelPressed(); - } else if(guiButton.id == DELETE_CHANNEL_BUTTON_ID) { - deleteChannelPressed(); - } else if(guiButton.id == SEND_BUTTON_ID) { - sendTogglePressed(); - } else if(guiButton.id == RECIEVE_BUTTON_ID) { - receiveTogglePressed(); + private void deleteChannelPressed() { + Channel c = channelList.getSelectedElement(); + if (c != null) { + ClientChannelRegister.instance.removeChannel(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, false)); + } } - } - protected void receiveTogglePressed() { - Channel c = channelList.getSelectedElement(); - if(c != null && !transceiver.getRecieveChannels(type).contains(c)) { - transceiver.addRecieveChanel(c); - PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, true, c)); - } else { - c = recieveChannels.getSelectedElement(); - if(c != null) { - transceiver.removeRecieveChanel(c); - PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, false, false, c)); - } + private void addChannelPressed() { + if (newChannelTF.getText() == null || newChannelTF.getText().trim().isEmpty()) { + return; + } + Channel c; + if (privateButton.isSelected()) { + c = new Channel( + newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile(), type); + } else { + c = new Channel(newChannelTF.getText(), type); + } + ClientChannelRegister.instance.addChannel(c); + PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, true)); + channelList.setSelection(c); + newChannelTF.setText(""); } - } - protected void sendTogglePressed() { - Channel c = channelList.getSelectedElement(); - if(c != null && !transceiver.getSendChannels(type).contains(c)) { - transceiver.addSendChanel(c); - PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, true, c)); - } else { - c = sendChannels.getSelectedElement(); - if(c != null) { - transceiver.removeSendChanel(c); - PacketHandler.INSTANCE.sendToServer(new PacketSendRecieveChannel(transceiver, true, false, c)); - } + @Override + public void mouseClicked(int x, int y, int par3) { + newChannelTF.mouseClicked(x, y, par3); } - } - - private void deleteChannelPressed() { - Channel c = channelList.getSelectedElement(); - if(c != null) { - ClientChannelRegister.instance.removeChannel(c); - PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, false)); - } - } - - private void addChannelPressed() { - if(newChannelTF.getText() == null || newChannelTF.getText().trim().isEmpty()) { - return; - } - Channel c; - if(privateButton.isSelected()) { - c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile(), type); - } else { - c = new Channel(newChannelTF.getText(), type); - } - ClientChannelRegister.instance.addChannel(c); - PacketHandler.INSTANCE.sendToServer(new PacketAddRemoveChannel(c, true)); - channelList.setSelection(c); - newChannelTF.setText(""); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - newChannelTF.mouseClicked(x, y, par3); - } - } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java index 01b0bacd..21562941 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java @@ -1,122 +1,121 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Point; -import java.util.Map.Entry; -import java.util.Set; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.enderio.machine.transceiver.TileTransceiver; +import java.awt.Point; +import java.util.Map.Entry; +import java.util.Set; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerTransceiver extends AbstractMachineContainer { - public static final int GUI_WIDTH = 256; + public static final int GUI_WIDTH = 256; - static final Point PLAYER_INV_OFFSET = new Point(47, 86); + static final Point PLAYER_INV_OFFSET = new Point(47, 86); - static final Point ITEM_INV_OFFSET = new Point(54, 30); - - static final Point HIDDEN_OFFSET = new Point(-3000, -3000); + static final Point ITEM_INV_OFFSET = new Point(54, 30); - static final Point FILTER_OFFSET = new Point(PLAYER_INV_OFFSET.x, 30); + static final Point HIDDEN_OFFSET = new Point(-3000, -3000); - public ContainerTransceiver(InventoryPlayer inventory, TileTransceiver te) { - super(inventory, te); - } + static final Point FILTER_OFFSET = new Point(PLAYER_INV_OFFSET.x, 30); - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { + public ContainerTransceiver(InventoryPlayer inventory, TileTransceiver te) { + super(inventory, te); + } - int i; - for (i = 0; i < 8; i++) { - addSlotToContainer(new Slot(getInv(), i, 0, 0) { - @Override - public boolean isItemValid(ItemStack itemstack) { - return getInv().isItemValidForSlot(getSlotIndex(), itemstack); - //return true; + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + + int i; + for (i = 0; i < 8; i++) { + addSlotToContainer(new Slot(getInv(), i, 0, 0) { + @Override + public boolean isItemValid(ItemStack itemstack) { + return getInv().isItemValidForSlot(getSlotIndex(), itemstack); + // return true; + } + }); } - }); - } - for (; i < 16; i++) { - addSlotToContainer(new Slot(getInv(), i, 0, 0) { - @Override - public boolean isItemValid(ItemStack p_75214_1_) { - return false; + for (; i < 16; i++) { + addSlotToContainer(new Slot(getInv(), i, 0, 0) { + @Override + public boolean isItemValid(ItemStack p_75214_1_) { + return false; + } + }); } - }); + setItemSlotLocations(getItemInventoryOffset()); } - setItemSlotLocations(getItemInventoryOffset()); - } - public void setPlayerInventoryVisible(boolean visible) { - Set> entries = playerSlotLocations.entrySet(); - for (Entry entry : entries) { - entry.getKey().xDisplayPosition = visible ? entry.getValue().x : -3000; - entry.getKey().yDisplayPosition = visible ? entry.getValue().y : -3000; + public void setPlayerInventoryVisible(boolean visible) { + Set> entries = playerSlotLocations.entrySet(); + for (Entry entry : entries) { + entry.getKey().xDisplayPosition = visible ? entry.getValue().x : -3000; + entry.getKey().yDisplayPosition = visible ? entry.getValue().y : -3000; + } } - } - public void setBufferSlotsVisible(boolean visible) { - Point itemOffset = visible ? getItemInventoryOffset() : HIDDEN_OFFSET; - setItemSlotLocations(itemOffset); - } - - private void setItemSlotLocations(Point offset) { - int i; - int x = offset.x; - int y = offset.y; - for (i = 0; i < 4; i++) { - ((Slot) inventorySlots.get(i)).xDisplayPosition = x; - ((Slot) inventorySlots.get(i)).yDisplayPosition = y; - x += 18; + public void setBufferSlotsVisible(boolean visible) { + Point itemOffset = visible ? getItemInventoryOffset() : HIDDEN_OFFSET; + setItemSlotLocations(itemOffset); } - x = offset.x; - y = offset.y + 18; - for (; i < 8; i++) { - ((Slot) inventorySlots.get(i)).xDisplayPosition = x; - ((Slot) inventorySlots.get(i)).yDisplayPosition = y; - x += 18; - } - - x = offset.x + (18 * 4) + getItemBufferSpacing(); - //y = offset.y + 18 + getItemRowSpacing(); - y = offset.y; - for (; i < 12; i++) { - ((Slot) inventorySlots.get(i)).xDisplayPosition = x; - ((Slot) inventorySlots.get(i)).yDisplayPosition = y; - x += 18; - } - x = offset.x + (18 * 4) + getItemBufferSpacing(); - y = offset.y + 18; - for (; i < 16; i++) { - ((Slot) inventorySlots.get(i)).xDisplayPosition = x; - ((Slot) inventorySlots.get(i)).yDisplayPosition = y; - x += 18; - } - } - @Override - public Point getPlayerInventoryOffset() { - return PLAYER_INV_OFFSET; - } - - public Point getItemInventoryOffset() { - return ITEM_INV_OFFSET; - } - - public Point getFilterOffset() { - return FILTER_OFFSET; - } + private void setItemSlotLocations(Point offset) { + int i; + int x = offset.x; + int y = offset.y; + for (i = 0; i < 4; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } + x = offset.x; + y = offset.y + 18; + for (; i < 8; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } - public int getItemBufferSpacing() { - return 5; - } + x = offset.x + (18 * 4) + getItemBufferSpacing(); + // y = offset.y + 18 + getItemRowSpacing(); + y = offset.y; + for (; i < 12; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } + x = offset.x + (18 * 4) + getItemBufferSpacing(); + y = offset.y + 18; + for (; i < 16; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } + } - @Override - protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { - return slotDef.getNumSlots(); - } + @Override + public Point getPlayerInventoryOffset() { + return PLAYER_INV_OFFSET; + } + + public Point getItemInventoryOffset() { + return ITEM_INV_OFFSET; + } + + public Point getFilterOffset() { + return FILTER_OFFSET; + } + + public int getItemBufferSpacing() { + return 5; + } + + @Override + protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { + return slotDef.getNumSlots(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index 2f1c1c43..8135b5d2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -1,18 +1,8 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Color; -import java.awt.Point; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterContainer; @@ -21,147 +11,161 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.transceiver.PacketItemFilter; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Point; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import org.lwjgl.opengl.GL11; public class FilterTab implements ITabPanel { - private final GuiTransceiver parent; - private final ContainerTransceiver container; - private final BasicItemFilterGui sendGui; - private final BasicItemFilterGui recGui; + private final GuiTransceiver parent; + private final ContainerTransceiver container; + private final BasicItemFilterGui sendGui; + private final BasicItemFilterGui recGui; - private final MultiIconButton sendRecB; + private final MultiIconButton sendRecB; - boolean showSend = true; + boolean showSend = true; - FilterTab(GuiTransceiver parent) { - this.parent = parent; - container = parent.getContainer(); - sendGui = new BasicItemFilterGui(parent, new FilterContainer(parent.getTransciever(), true), false, true, container.getFilterOffset().x, - container.getFilterOffset().y, 0); - recGui = new BasicItemFilterGui(parent, new FilterContainer(parent.getTransciever(), false), false, false, container.getFilterOffset().x, - container.getFilterOffset().y, 20); + FilterTab(GuiTransceiver parent) { + this.parent = parent; + container = parent.getContainer(); + sendGui = new BasicItemFilterGui( + parent, + new FilterContainer(parent.getTransciever(), true), + false, + true, + container.getFilterOffset().x, + container.getFilterOffset().y, + 0); + recGui = new BasicItemFilterGui( + parent, + new FilterContainer(parent.getTransciever(), false), + false, + false, + container.getFilterOffset().x, + container.getFilterOffset().y, + 20); - sendRecB = MultiIconButton.createRightArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20); - sendRecB.setSize(10, 16); - } - - @Override - public void onGuiInit(int x, int y, int width, int height) { - parent.getContainer().setPlayerInventoryVisible(true); - sendRecB.onGuiInit(); - updateSendRecieve(); - } - - protected void updateSendRecieve() { - parent.getGhostSlots().clear(); - if(showSend) { - sendGui.updateButtons(); - recGui.deactivate(); - sendGui.createFilterSlots(); - } else { - sendGui.deactivate(); - recGui.updateButtons(); - recGui.createFilterSlots(); - } - } - - @Override - public void deactivate() { - parent.getContainer().setPlayerInventoryVisible(false); - sendGui.deactivate(); - recGui.deactivate(); - sendRecB.detach(); - } - - @Override - public IconEIO getIcon() { - return IconEIO.FILTER; - } - - @Override - public void render(float par1, int par2, int par3) { - int top = parent.getGuiTop(); - int left = parent.getGuiLeft(); - - GL11.glColor3f(1, 1, 1); - - //Inventory - parent.bindGuiTexture(); - Point invRoot = container.getPlayerInventoryOffset(); - parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); - - if(showSend) { - sendGui.renderCustomOptions(0, par1, par2, par3); - } else { - recGui.renderCustomOptions(0, par1, par2, par3); - } - - String txt = EnderIO.lang.localize("gui.machine.sendfilter"); - if(!showSend) { - txt = EnderIO.lang.localize("gui.machine.receivefilter"); - } - FontRenderer fr = parent.getFontRenderer(); - int x = left + container.getFilterOffset().x; - int y = top - fr.FONT_HEIGHT + container.getFilterOffset().y - 7; - fr.drawStringWithShadow(txt, x, y, ColorUtil.getRGB(Color.WHITE)); - - //sendRecB.xPosition = left + container.getFilterOffset().x + fr.getStringWidth(txt) + 10; - //System.out.println("FilterTab.enclosing_method: " + (fr.getStringWidth(txt) + 10)); - } - - @Override - public void actionPerformed(GuiButton guiButton) { - if(guiButton == sendRecB) { - showSend = !showSend; - updateSendRecieve(); - } - if(showSend) { - sendGui.actionPerformed(guiButton); - } else { - recGui.actionPerformed(guiButton); - } - } - - @Override - public void mouseClicked(int x, int y, int par3) { - if(showSend) { - sendGui.mouseClicked(x, y, par3); - } else { - recGui.mouseClicked(x, y, par3); - } - } - - @Override - public void keyTyped(char par1, int par2) { - } - - @Override - public void updateScreen() { - } - - private static class FilterContainer implements IItemFilterContainer { - - private final TileTransceiver trans; - private final boolean isSend; - - private FilterContainer(TileTransceiver trans, boolean isSend) { - this.trans = trans; - this.isSend = isSend; + sendRecB = MultiIconButton.createRightArrowButton( + parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20); + sendRecB.setSize(10, 16); } @Override - public ItemFilter getItemFilter() { - if(isSend) { - return trans.getSendItemFilter(); - } - return trans.getReceiveItemFilter(); + public void onGuiInit(int x, int y, int width, int height) { + parent.getContainer().setPlayerInventoryVisible(true); + sendRecB.onGuiInit(); + updateSendRecieve(); + } + + protected void updateSendRecieve() { + parent.getGhostSlots().clear(); + if (showSend) { + sendGui.updateButtons(); + recGui.deactivate(); + sendGui.createFilterSlots(); + } else { + sendGui.deactivate(); + recGui.updateButtons(); + recGui.createFilterSlots(); + } } @Override - public void onFilterChanged() { - PacketHandler.INSTANCE.sendToServer(new PacketItemFilter(trans, isSend)); + public void deactivate() { + parent.getContainer().setPlayerInventoryVisible(false); + sendGui.deactivate(); + recGui.deactivate(); + sendRecB.detach(); } - } + @Override + public IconEIO getIcon() { + return IconEIO.FILTER; + } + @Override + public void render(float par1, int par2, int par3) { + int top = parent.getGuiTop(); + int left = parent.getGuiLeft(); + + GL11.glColor3f(1, 1, 1); + + // Inventory + parent.bindGuiTexture(); + Point invRoot = container.getPlayerInventoryOffset(); + parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); + + if (showSend) { + sendGui.renderCustomOptions(0, par1, par2, par3); + } else { + recGui.renderCustomOptions(0, par1, par2, par3); + } + + String txt = EnderIO.lang.localize("gui.machine.sendfilter"); + if (!showSend) { + txt = EnderIO.lang.localize("gui.machine.receivefilter"); + } + FontRenderer fr = parent.getFontRenderer(); + int x = left + container.getFilterOffset().x; + int y = top - fr.FONT_HEIGHT + container.getFilterOffset().y - 7; + fr.drawStringWithShadow(txt, x, y, ColorUtil.getRGB(Color.WHITE)); + + // sendRecB.xPosition = left + container.getFilterOffset().x + fr.getStringWidth(txt) + 10; + // System.out.println("FilterTab.enclosing_method: " + (fr.getStringWidth(txt) + 10)); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if (guiButton == sendRecB) { + showSend = !showSend; + updateSendRecieve(); + } + if (showSend) { + sendGui.actionPerformed(guiButton); + } else { + recGui.actionPerformed(guiButton); + } + } + + @Override + public void mouseClicked(int x, int y, int par3) { + if (showSend) { + sendGui.mouseClicked(x, y, par3); + } else { + recGui.mouseClicked(x, y, par3); + } + } + + @Override + public void keyTyped(char par1, int par2) {} + + @Override + public void updateScreen() {} + + private static class FilterContainer implements IItemFilterContainer { + + private final TileTransceiver trans; + private final boolean isSend; + + private FilterContainer(TileTransceiver trans, boolean isSend) { + this.trans = trans; + this.isSend = isSend; + } + + @Override + public ItemFilter getItemFilter() { + if (isSend) { + return trans.getSendItemFilter(); + } + return trans.getReceiveItemFilter(); + } + + @Override + public void onFilterChanged() { + PacketHandler.INSTANCE.sendToServer(new PacketItemFilter(trans, isSend)); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index c4a5b00d..398325fe 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -1,168 +1,177 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Color; -import java.awt.Point; -import java.awt.Rectangle; -import java.util.List; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.PacketItemBuffer; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Point; +import java.awt.Rectangle; +import java.util.List; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import org.lwjgl.opengl.GL11; public class GeneralTab implements ITabPanel { - private static final int SEND_BAR_OFFSET = 13; - ContainerTransceiver container; - GuiTransceiver parent; - GuiToolTip sendPowerBarTT; - - ToggleButton bufferSizeB; + private static final int SEND_BAR_OFFSET = 13; + ContainerTransceiver container; + GuiTransceiver parent; + GuiToolTip sendPowerBarTT; - public GeneralTab(GuiTransceiver guiTransceiver) { - parent = guiTransceiver; - container = parent.getContainer(); + ToggleButton bufferSizeB; - int x = parent.getXSize() - 5 - 16; - int y = 43; - bufferSizeB = new ToggleButton(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); - bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); - bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); - - sendPowerBarTT = new GuiToolTip(new Rectangle(parent.getPowerX() + SEND_BAR_OFFSET, parent.getPowerY(), parent.getPowerWidth(), parent.getPowerHeight()), "") { - @Override - protected void updateText() { - text.clear(); - if(parent.renderPowerBar()) { - updateSendPowerBarTooltip(text); - } - } - }; - parent.addToolTip(sendPowerBarTT); - } + public GeneralTab(GuiTransceiver guiTransceiver) { + parent = guiTransceiver; + container = parent.getContainer(); - @Override - public void onGuiInit(int x, int y, int width, int height) { - container.setPlayerInventoryVisible(true); - container.setBufferSlotsVisible(true); - bufferSizeB.onGuiInit(); - } + int x = parent.getXSize() - 5 - 16; + int y = 43; + bufferSizeB = new ToggleButton(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); + bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); + bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); - @Override - public void deactivate() { - container.setPlayerInventoryVisible(false); - container.setBufferSlotsVisible(false); - bufferSizeB.detach(); - } - - @Override - public IconEIO getIcon() { - return IconEIO.IO_CONFIG_UP; - } - - @Override - public void render(float par1, int par2, int par3) { - int top = parent.getGuiTop(); - int left = parent.getGuiLeft(); - - GL11.glColor3f(1, 1, 1); - - //Inventory - parent.bindGuiTexture(); - Point invRoot = container.getPlayerInventoryOffset(); - parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); - - invRoot = container.getItemInventoryOffset(); - parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 72, 36); - parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); - - FontRenderer fr = parent.getFontRenderer(); - String sendTxt = EnderIO.lang.localize("gui.send"); - int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; - int y = top + invRoot.y - fr.FONT_HEIGHT - 3; - fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); - String recText = EnderIO.lang.localize("gui.receive"); - x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; - fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); - - //Highlights - parent.renderSlotHighlights(); - - //Power - parent.bindGuiTexture(); - GL11.glColor3f(1, 1, 1); - - x = left + parent.getPowerX() - 1; - y = top + parent.getPowerY() - 1; - int maxHeight = parent.getPowerHeight(); - - parent.drawTexturedModalRect(x, y, 233, 196, 12, maxHeight + 2); - parent.drawTexturedModalRect(x + SEND_BAR_OFFSET, y, 233, 196, 12, maxHeight + 2); - - int totalPixelHeight = parent.getTransciever().getEnergyStoredScaled(maxHeight * 2); - int fillHeight = Math.min(totalPixelHeight,maxHeight); - - int fillY = y + 1 + parent.getPowerHeight() - fillHeight; - x += 1; - parent.drawTexturedModalRect(x, fillY, parent.getPowerU(), parent.getPowerV(), parent.getPowerWidth(), fillHeight); - - fillHeight = Math.max(0, totalPixelHeight - maxHeight); - fillY = y + 1 + parent.getPowerHeight() - fillHeight; - parent.drawTexturedModalRect(x + SEND_BAR_OFFSET, fillY, parent.getPowerU() - 25, parent.getPowerV(), parent.getPowerWidth(), fillHeight); - - } - - public void updatePowerBarTooltip(List text) { - text.add(EnderIO.lang.localize("gui.machine.localbuffer")); - text.add(EnderIO.lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); - int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; - int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); - text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); - } - - private void updateSendPowerBarTooltip(List text) { - text.add(EnderIO.lang.localize("gui.machine.sendReceivebuffer")); - text.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); - int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; - int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); - text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); - } - - - @Override - public void actionPerformed(GuiButton guiButton) { - if(guiButton == bufferSizeB) { - parent.getTransciever().setBufferStacks(bufferSizeB.isSelected()); - PacketHandler.INSTANCE.sendToServer(new PacketItemBuffer(parent.getTransciever())); + sendPowerBarTT = + new GuiToolTip( + new Rectangle( + parent.getPowerX() + SEND_BAR_OFFSET, + parent.getPowerY(), + parent.getPowerWidth(), + parent.getPowerHeight()), + "") { + @Override + protected void updateText() { + text.clear(); + if (parent.renderPowerBar()) { + updateSendPowerBarTooltip(text); + } + } + }; + parent.addToolTip(sendPowerBarTT); } - } - @Override - public void mouseClicked(int x, int y, int par3) { - } - - @Override - public void updateScreen() { - } + @Override + public void onGuiInit(int x, int y, int width, int height) { + container.setPlayerInventoryVisible(true); + container.setBufferSlotsVisible(true); + bufferSizeB.onGuiInit(); + } - @Override - public void keyTyped(char par1, int par2) { - } + @Override + public void deactivate() { + container.setPlayerInventoryVisible(false); + container.setBufferSlotsVisible(false); + bufferSizeB.detach(); + } + @Override + public IconEIO getIcon() { + return IconEIO.IO_CONFIG_UP; + } + @Override + public void render(float par1, int par2, int par3) { + int top = parent.getGuiTop(); + int left = parent.getGuiLeft(); + GL11.glColor3f(1, 1, 1); + + // Inventory + parent.bindGuiTexture(); + Point invRoot = container.getPlayerInventoryOffset(); + parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); + + invRoot = container.getItemInventoryOffset(); + parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 72, 36); + parent.drawTexturedModalRect( + left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), + top + invRoot.y - 1, + 24, + 180, + 72, + 36); + + FontRenderer fr = parent.getFontRenderer(); + String sendTxt = EnderIO.lang.localize("gui.send"); + int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt) / 2; + int y = top + invRoot.y - fr.FONT_HEIGHT - 3; + fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); + String recText = EnderIO.lang.localize("gui.receive"); + x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText) / 2; + fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); + + // Highlights + parent.renderSlotHighlights(); + + // Power + parent.bindGuiTexture(); + GL11.glColor3f(1, 1, 1); + + x = left + parent.getPowerX() - 1; + y = top + parent.getPowerY() - 1; + int maxHeight = parent.getPowerHeight(); + + parent.drawTexturedModalRect(x, y, 233, 196, 12, maxHeight + 2); + parent.drawTexturedModalRect(x + SEND_BAR_OFFSET, y, 233, 196, 12, maxHeight + 2); + + int totalPixelHeight = parent.getTransciever().getEnergyStoredScaled(maxHeight * 2); + int fillHeight = Math.min(totalPixelHeight, maxHeight); + + int fillY = y + 1 + parent.getPowerHeight() - fillHeight; + x += 1; + parent.drawTexturedModalRect( + x, fillY, parent.getPowerU(), parent.getPowerV(), parent.getPowerWidth(), fillHeight); + + fillHeight = Math.max(0, totalPixelHeight - maxHeight); + fillY = y + 1 + parent.getPowerHeight() - fillHeight; + parent.drawTexturedModalRect( + x + SEND_BAR_OFFSET, + fillY, + parent.getPowerU() - 25, + parent.getPowerV(), + parent.getPowerWidth(), + fillHeight); + } + + public void updatePowerBarTooltip(List text) { + text.add(EnderIO.lang.localize("gui.machine.localbuffer")); + text.add(EnderIO.lang.localize("gui.machine.upkeep") + " " + + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); + int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored() / 2; + int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); + text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); + } + + private void updateSendPowerBarTooltip(List text) { + text.add(EnderIO.lang.localize("gui.machine.sendReceivebuffer")); + text.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); + int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored() / 2; + int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); + text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if (guiButton == bufferSizeB) { + parent.getTransciever().setBufferStacks(bufferSizeB.isSelected()); + PacketHandler.INSTANCE.sendToServer(new PacketItemBuffer(parent.getTransciever())); + } + } + + @Override + public void mouseClicked(int x, int y, int par3) {} + + @Override + public void updateScreen() {} + + @Override + public void keyTyped(char par1, int par2) {} } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java index e2f2c858..2eb3dae5 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java @@ -1,75 +1,72 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Color; -import java.util.Set; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; - import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.render.ColorUtil; import com.google.common.base.Predicate; import com.google.common.collect.FluentIterable; import com.google.common.collect.Sets; - import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.transceiver.Channel; +import java.awt.Color; +import java.util.Set; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; public class GuiChannelList extends GuiScrollableList { - - private FluentIterable channels; -// private Channel activeChannel; + private FluentIterable channels; - private final GuiTransceiver parent; + // private Channel activeChannel; - public GuiChannelList(GuiTransceiver parent, int width, int height, int originX, int originY) { - super(width, height, originX, originY, Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 4); - this.parent = parent; - } + private final GuiTransceiver parent; - void setChannels(Set val, Predicate filter) { - if(val == null) { - channels = FluentIterable.from(Sets.newHashSet()); + public GuiChannelList(GuiTransceiver parent, int width, int height, int originX, int originY) { + super(width, height, originX, originY, Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 4); + this.parent = parent; } - channels = FluentIterable.from(val).filter(filter); - } - @Override - public int getNumElements() { - return channels.size(); - } + void setChannels(Set val, Predicate filter) { + if (val == null) { + channels = FluentIterable.from(Sets.newHashSet()); + } + channels = FluentIterable.from(val).filter(filter); + } - @Override - public Channel getElementAt(int index) { - if(index < 0 || index >= channels.size()) { - return null; + @Override + public int getNumElements() { + return channels.size(); } - return channels.get(index); - } - @Override - protected boolean elementClicked(int i, boolean flag) { - if(getElementAt(i) == null) { - return false; - } else { - return true; + @Override + public Channel getElementAt(int index) { + if (index < 0 || index >= channels.size()) { + return null; + } + return channels.get(index); } - } - @Override - protected void drawElement(int index, int xPosition, int yPosition, int rowHeight, Tessellator tessellator) { - if(index < 0 || index >= channels.size()) { - return; + @Override + protected boolean elementClicked(int i, boolean flag) { + if (getElementAt(i) == null) { + return false; + } else { + return true; + } } - Channel c = getElementAt(index); - if(c == null) { - return; + + @Override + protected void drawElement(int index, int xPosition, int yPosition, int rowHeight, Tessellator tessellator) { + if (index < 0 || index >= channels.size()) { + return; + } + Channel c = getElementAt(index); + if (c == null) { + return; + } + int col = ColorUtil.getRGB(Color.white); + parent.drawString(parent.getFontRenderer(), c.getName(), xPosition + margin, yPosition + margin / 2, col); + if (!c.isPublic()) { + IconEIO.map.render(IconEIO.LOCK_LOCKED, xPosition + width - 18, yPosition - 3, 16, 15, 0, true); + } } - int col = ColorUtil.getRGB(Color.white); - parent.drawString(parent.getFontRenderer(), c.getName(), xPosition + margin, yPosition + margin / 2, col); - if(!c.isPublic()) { - IconEIO.map.render(IconEIO.LOCK_LOCKED, xPosition + width - 18, yPosition - 3, 16, 15, 0, true); - } - } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index c62fdbf8..be7c52ce 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -1,254 +1,249 @@ package crazypants.enderio.machine.transceiver.gui; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.render.RenderUtil; - import cpw.mods.fml.common.Optional; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.transceiver.ChannelType; import crazypants.enderio.machine.transceiver.TileTransceiver; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.InventoryPlayer; +import org.lwjgl.opengl.GL11; public class GuiTransceiver extends GuiPoweredMachineBase { - private static final int TAB_HEIGHT = 24; + private static final int TAB_HEIGHT = 24; - private int activeTab = 0; - private final List tabs = new ArrayList(); - private final int tabYOffset = 4; - GeneralTab generalTab; + private int activeTab = 0; + private final List tabs = new ArrayList(); + private final int tabYOffset = 4; + GeneralTab generalTab; - public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { - super(te, new ContainerTransceiver(par1InventoryPlayer, te), "transceiver", "itemFilter"); + public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { + super(te, new ContainerTransceiver(par1InventoryPlayer, te), "transceiver", "itemFilter"); - generalTab = new GeneralTab(this); - tabs.add(generalTab); - FilterTab filterTab = new FilterTab(this); - tabs.add(filterTab); - tabs.add(new ChannelTab(this, ChannelType.POWER)); - tabs.add(new ChannelTab(this, ChannelType.ITEM)); - tabs.add(new ChannelTab(this, ChannelType.FLUID)); - if(Config.enderRailEnabled) { - tabs.add(new ChannelTab(this, ChannelType.RAIL)); - } - } - - @Override - protected void updatePowerBarTooltip(List text) { - generalTab.updatePowerBarTooltip(text); - } - - @Override - protected boolean showRecipeButton() { - return false; - } - - @Override - public int getXSize() { - return ContainerTransceiver.GUI_WIDTH; - } - - @Override - public void updateScreen() { - for (int i = 0; i < tabs.size(); i++) { - if(i == activeTab) { - tabs.get(i).updateScreen(); - return; - } - } - } - - @Override - protected void keyTyped(char par1, int par2) { - if(par2 == 1) { - for (IGuiOverlay overlay : overlays) { - if(overlay.isVisible()) { - overlay.setVisible(false); - return; + generalTab = new GeneralTab(this); + tabs.add(generalTab); + FilterTab filterTab = new FilterTab(this); + tabs.add(filterTab); + tabs.add(new ChannelTab(this, ChannelType.POWER)); + tabs.add(new ChannelTab(this, ChannelType.ITEM)); + tabs.add(new ChannelTab(this, ChannelType.FLUID)); + if (Config.enderRailEnabled) { + tabs.add(new ChannelTab(this, ChannelType.RAIL)); } - } - mc.thePlayer.closeScreen(); } - for (int i = 0; i < tabs.size(); i++) { - if(i == activeTab) { - tabs.get(i).keyTyped(par1, par2); - return; - } + @Override + protected void updatePowerBarTooltip(List text) { + generalTab.updatePowerBarTooltip(text); } - } - @Override - public void initGui() { - super.initGui(); - for (int i = 0; i < tabs.size(); i++) { - if(i != activeTab) { - tabs.get(i).deactivate(); - } + @Override + protected boolean showRecipeButton() { + return false; } - ghostSlots.clear(); - for (int i = 0; i < tabs.size(); i++) { - if(i == activeTab) { - tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); - } + + @Override + public int getXSize() { + return ContainerTransceiver.GUI_WIDTH; } - configB.visible = activeTab == 0; - redstoneButton.visible = activeTab == 0; - } - @Override - public void renderPowerBar(int k, int l) { - //super.renderPowerBar(k, l); - } - - @Override - protected boolean renderPowerBar() { - return activeTab == 0; - } - - @Override - public int getPowerX() { - return super.getPowerX() - 4; - } - - @Override - public int getPowerHeight() { - return 58; - } - - @Override - public int getPowerY() { - return super.getPowerY(); - } - - @Override - public int getPowerWidth() { - return POWER_WIDTH; - } - - @Override - public int getPowerV() { - return 196; - } - - @Override - public int getPowerU() { - return 246; - } - - - @Override - public String getPowerOutputLabel() { - return super.getPowerOutputLabel(); - } - - @Override - public int getPowerOutputValue() { - return super.getPowerOutputValue(); - } - - @Override - protected void mouseClicked(int x, int y, int par3) { - super.mouseClicked(x, y, par3); - - int tabLeftX = xSize; - int tabRightX = tabLeftX + 22; - - int minY = tabYOffset; - int maxY = minY + (tabs.size() * TAB_HEIGHT); - - x = (x - guiLeft); - y = (y - guiTop); - - if(x > tabLeftX && x < tabRightX + 24) { - if(y > minY && y < maxY) { - activeTab = (y - minY) / 24; - hideOverlays(); - initGui(); - return; - } + @Override + public void updateScreen() { + for (int i = 0; i < tabs.size(); i++) { + if (i == activeTab) { + tabs.get(i).updateScreen(); + return; + } + } } - tabs.get(activeTab).mouseClicked(x, y, par3); - } - @Override - protected void actionPerformed(GuiButton guiButton) { - super.actionPerformed(guiButton); - tabs.get(activeTab).actionPerformed(guiButton); - } + @Override + protected void keyTyped(char par1, int par2) { + if (par2 == 1) { + for (IGuiOverlay overlay : overlays) { + if (overlay.isVisible()) { + overlay.setVisible(false); + return; + } + } + mc.thePlayer.closeScreen(); + } - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + for (int i = 0; i < tabs.size(); i++) { + if (i == activeTab) { + tabs.get(i).keyTyped(par1, par2); + return; + } + } + } - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - int tabX = sx + xSize - 3; + @Override + public void initGui() { + super.initGui(); + for (int i = 0; i < tabs.size(); i++) { + if (i != activeTab) { + tabs.get(i).deactivate(); + } + } + ghostSlots.clear(); + for (int i = 0; i < tabs.size(); i++) { + if (i == activeTab) { + tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); + } + } + configB.visible = activeTab == 0; + redstoneButton.visible = activeTab == 0; + } - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - for (int i = 0; i < tabs.size(); i++) { - if(i != activeTab) { + @Override + public void renderPowerBar(int k, int l) { + // super.renderPowerBar(k, l); + } + + @Override + protected boolean renderPowerBar() { + return activeTab == 0; + } + + @Override + public int getPowerX() { + return super.getPowerX() - 4; + } + + @Override + public int getPowerHeight() { + return 58; + } + + @Override + public int getPowerY() { + return super.getPowerY(); + } + + @Override + public int getPowerWidth() { + return POWER_WIDTH; + } + + @Override + public int getPowerV() { + return 196; + } + + @Override + public int getPowerU() { + return 246; + } + + @Override + public String getPowerOutputLabel() { + return super.getPowerOutputLabel(); + } + + @Override + public int getPowerOutputValue() { + return super.getPowerOutputValue(); + } + + @Override + protected void mouseClicked(int x, int y, int par3) { + super.mouseClicked(x, y, par3); + + int tabLeftX = xSize; + int tabRightX = tabLeftX + 22; + + int minY = tabYOffset; + int maxY = minY + (tabs.size() * TAB_HEIGHT); + + x = (x - guiLeft); + y = (y - guiTop); + + if (x > tabLeftX && x < tabRightX + 24) { + if (y > minY && y < maxY) { + activeTab = (y - minY) / 24; + hideOverlays(); + initGui(); + return; + } + } + tabs.get(activeTab).mouseClicked(x, y, par3); + } + + @Override + protected void actionPerformed(GuiButton guiButton) { + super.actionPerformed(guiButton); + tabs.get(activeTab).actionPerformed(guiButton); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + for (int i = 0; i < tabs.size(); i++) { + if (i != activeTab) { + RenderUtil.bindTexture(IconEIO.TEXTURE); + IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); + IWidgetIcon icon = tabs.get(i).getIcon(); + icon.getMap().render(icon, tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); + } + } + + tes.draw(); + + bindGuiTexture(); + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture(IconEIO.TEXTURE); - IconEIO.map.render(IconEIO.INACTIVE_TAB, tabX, sy + tabYOffset + (i * 24)); - IWidgetIcon icon = tabs.get(i).getIcon(); - icon.getMap().render(icon, tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); - } + tes.startDrawingQuads(); + IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); + + if (tabs.size() > 0) { + IWidgetIcon icon = tabs.get(activeTab).getIcon(); + icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); + tes.draw(); + tabs.get(activeTab).render(par1, par2, par3); + } else { + tes.draw(); + } } - tes.draw(); - - bindGuiTexture(); - drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - RenderUtil.bindTexture(IconEIO.TEXTURE); - tes.startDrawingQuads(); - IconEIO.map.render(IconEIO.ACTIVE_TAB, tabX, sy + tabYOffset + (activeTab * TAB_HEIGHT)); - - if(tabs.size() > 0) { - IWidgetIcon icon = tabs.get(activeTab).getIcon(); - icon.getMap().render(icon, tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); - tes.draw(); - tabs.get(activeTab).render(par1, par2, par3); - } else { - tes.draw(); + public TileTransceiver getTransciever() { + return getTileEntity(); } - } - - public TileTransceiver getTransciever() { - return getTileEntity(); - } - - public ContainerTransceiver getContainer() { - return (ContainerTransceiver) inventorySlots; - } - @Override - @Optional.Method(modid = "NotEnoughItems") - public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { - if(tabs.size() > 0) { - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - int tabX = sx + xSize - 3; - int tabY = sy + tabYOffset; - - return (x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT); + public ContainerTransceiver getContainer() { + return (ContainerTransceiver) inventorySlots; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + if (tabs.size() > 0) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; + + return (x + w) >= tabX && x < (tabX + 14) && (y + h) >= tabY && y < (tabY + tabs.size() * TAB_HEIGHT); + } + return false; } - return false; - } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/RailTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/RailTab.java index f98d8532..6a85507c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/RailTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/RailTab.java @@ -4,9 +4,7 @@ import crazypants.enderio.machine.transceiver.ChannelType; public class RailTab extends ChannelTab { - public RailTab(GuiTransceiver guiTransceiver, ChannelType type) { - super(guiTransceiver, type); - - } - + public RailTab(GuiTransceiver guiTransceiver, ChannelType type) { + super(guiTransceiver, type); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java index 7b427000..749136c2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/IModel.java @@ -4,8 +4,7 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; public interface IModel { - void render(TileTransceiver cube, double x, double y, double z); - - void render(); + void render(TileTransceiver cube, double x, double y, double z); + void render(); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java index fca4eca1..cbf21924 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java @@ -1,43 +1,40 @@ package crazypants.enderio.machine.transceiver.render; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.machine.transceiver.TileTransceiver; import net.minecraft.client.model.ModelBase; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.machine.transceiver.TileTransceiver; - public class TransceiverModel extends ModelBase implements IModel { - - public static final float SCALE = 1 / 16f; - private static final String TEXTURE = "enderio:models/transceiver.png"; - private static final String MODEL = "enderio:models/transceiver.obj"; + public static final float SCALE = 1 / 16f; - private IModelCustom model; + private static final String TEXTURE = "enderio:models/transceiver.png"; + private static final String MODEL = "enderio:models/transceiver.obj"; - public TransceiverModel() { - model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); - } + private IModelCustom model; - @Override - public void render() { - GL11.glPushMatrix(); - GL11.glScalef(SCALE, SCALE, SCALE); - RenderUtil.bindTexture(TEXTURE); - model.renderAll(); - GL11.glPopMatrix(); - } + public TransceiverModel() { + model = AdvancedModelLoader.loadModel(new ResourceLocation(MODEL)); + } - @Override - public void render(TileTransceiver cube, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); - render(); - GL11.glPopMatrix(); - } + @Override + public void render() { + GL11.glPushMatrix(); + GL11.glScalef(SCALE, SCALE, SCALE); + RenderUtil.bindTexture(TEXTURE); + model.renderAll(); + GL11.glPopMatrix(); + } + + @Override + public void render(TileTransceiver cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); + render(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java index c26701c1..b88af40f 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java @@ -1,252 +1,248 @@ package crazypants.enderio.machine.transceiver.render; +import com.enderio.core.client.render.RenderUtil; +import crazypants.enderio.machine.transceiver.TileTransceiver; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import crazypants.enderio.machine.transceiver.TileTransceiver; - public class TransceiverModelAlt extends ModelBase implements IModel { - - private static final String TEXTURE = "enderio:models/transceiverAlt.png"; - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; - ModelRenderer Shape14; - ModelRenderer Shape15; - ModelRenderer Shape16; - ModelRenderer Shape17; - ModelRenderer Shape18; - ModelRenderer Shape19; - ModelRenderer Shape20; - ModelRenderer Shape21; - ModelRenderer Shape22; - ModelRenderer Shape23; - ModelRenderer Shape24; - ModelRenderer Shape25; + private static final String TEXTURE = "enderio:models/transceiverAlt.png"; - public TransceiverModelAlt() { - textureWidth = 32; - textureHeight = 32; + ModelRenderer Shape1; + ModelRenderer Shape2; + ModelRenderer Shape3; + ModelRenderer Shape4; + ModelRenderer Shape5; + ModelRenderer Shape6; + ModelRenderer Shape7; + ModelRenderer Shape8; + ModelRenderer Shape9; + ModelRenderer Shape10; + ModelRenderer Shape11; + ModelRenderer Shape12; + ModelRenderer Shape13; + ModelRenderer Shape14; + ModelRenderer Shape15; + ModelRenderer Shape16; + ModelRenderer Shape17; + ModelRenderer Shape18; + ModelRenderer Shape19; + ModelRenderer Shape20; + ModelRenderer Shape21; + ModelRenderer Shape22; + ModelRenderer Shape23; + ModelRenderer Shape24; + ModelRenderer Shape25; - Shape1 = new ModelRenderer(this, 0, 7); - Shape1.addBox(0F, 0F, 0F, 6, 1, 6); - Shape1.setRotationPoint(-3F, 24F, -8F); - Shape1.setTextureSize(32, 32); - Shape1.mirror = true; - setRotation(Shape1, 1.570796F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 0); - Shape2.addBox(0F, 0F, 0F, 6, 1, 5); - Shape2.setRotationPoint(7F, 23F, 3F); - Shape2.setTextureSize(32, 32); - Shape2.mirror = true; - setRotation(Shape2, 1.570796F, 1.570796F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 6, 1, 5); - Shape3.setRotationPoint(-3F, 23F, 7F); - Shape3.setTextureSize(32, 32); - Shape3.mirror = true; - setRotation(Shape3, 1.570796F, 0F, 0F); - Shape4 = new ModelRenderer(this, 0, 7); - Shape4.addBox(0F, 0F, 0F, 6, 1, 6); - Shape4.setRotationPoint(-8F, 24F, 3F); - Shape4.setTextureSize(32, 32); - Shape4.mirror = true; - setRotation(Shape4, 1.570796F, 1.570796F, 0F); - Shape5 = new ModelRenderer(this, 0, 0); - Shape5.addBox(0F, 0F, 0F, 6, 1, 5); - Shape5.setRotationPoint(-3F, 14F, -8F); - Shape5.setTextureSize(32, 32); - Shape5.mirror = true; - setRotation(Shape5, 1.570796F, 0F, 0F); - Shape6 = new ModelRenderer(this, 0, 7); - Shape6.addBox(0F, 0F, 0F, 6, 1, 6); - Shape6.setRotationPoint(-7F, 13F, 8F); - Shape6.setTextureSize(32, 32); - Shape6.mirror = true; - //setRotation(Shape6, 1.570796F, 1.570796F, 1.570796F); - setRotation(Shape6, 0F, 1.570796F, 1.570796F); - Shape7 = new ModelRenderer(this, 0, 7); - Shape7.addBox(0F, 0F, 0F, 6, 1, 6); - Shape7.setRotationPoint(-8F, 13F, -8F); - Shape7.setTextureSize(32, 32); - Shape7.mirror = true; - setRotation(Shape7, 1.570796F, 0F, 1.570796F); - Shape8 = new ModelRenderer(this, 0, 0); - Shape8.addBox(0F, 0F, 0F, 6, 1, 5); - Shape8.setRotationPoint(-8F, 14F, 3F); - Shape8.setTextureSize(32, 32); - Shape8.mirror = true; - setRotation(Shape8, 1.570796F, 1.570796F, 0F); - Shape9 = new ModelRenderer(this, 0, 7); - Shape9.addBox(0F, 0F, 0F, 6, 1, 6); - Shape9.setRotationPoint(-3F, 23F, 2F); - Shape9.setTextureSize(32, 32); - Shape9.mirror = true; - setRotation(Shape9, 0F, 0F, 0F); - Shape10 = new ModelRenderer(this, 0, 7); - Shape10.addBox(0F, 0F, 0F, 6, 1, 6); - Shape10.setRotationPoint(2F, 23F, 3F); - Shape10.setTextureSize(32, 32); - Shape10.mirror = true; - setRotation(Shape10, 0F, 1.570796F, 0F); - Shape11 = new ModelRenderer(this, 0, 7); - Shape11.addBox(0F, 0F, 0F, 6, 1, 6); - Shape11.setRotationPoint(-3F, 23F, -8F); - Shape11.setTextureSize(32, 32); - Shape11.mirror = true; - setRotation(Shape11, 0F, 0F, 0F); - Shape12 = new ModelRenderer(this, 0, 7); - Shape12.addBox(0F, 0F, 0F, 6, 1, 6); - Shape12.setRotationPoint(-8F, 23F, 3F); - Shape12.setTextureSize(32, 32); - Shape12.mirror = true; - setRotation(Shape12, 0F, 1.570796F, 0F); - Shape13 = new ModelRenderer(this, 0, 7); - Shape13.addBox(0F, 0F, 0F, 6, 1, 6); - Shape13.setRotationPoint(-8F, 8F, 3F); - Shape13.setTextureSize(32, 32); - Shape13.mirror = true; - setRotation(Shape13, 0F, 1.570796F, 0F); - Shape14 = new ModelRenderer(this, 0, 7); - Shape14.addBox(0F, 0F, 0F, 6, 1, 6); - Shape14.setRotationPoint(-3F, 8F, 2F); - Shape14.setTextureSize(32, 32); - Shape14.mirror = true; - setRotation(Shape14, 0F, 0F, 0F); - Shape15 = new ModelRenderer(this, 0, 7); - Shape15.addBox(0F, 0F, 0F, 6, 1, 6); - Shape15.setRotationPoint(-3F, 8F, -8F); - Shape15.setTextureSize(32, 32); - Shape15.mirror = true; - setRotation(Shape15, 0F, 0F, 0F); - Shape16 = new ModelRenderer(this, 0, 7); - Shape16.addBox(0F, 0F, 0F, 6, 1, 6); - Shape16.setRotationPoint(2F, 8F, 3F); - Shape16.setTextureSize(32, 32); - Shape16.mirror = true; - setRotation(Shape16, 0F, 1.570796F, 0F); - Shape17 = new ModelRenderer(this, 0, 7); - Shape17.addBox(0F, 0F, 0F, 6, 1, 6); - Shape17.setRotationPoint(7F, 14F, 3F); - Shape17.setTextureSize(32, 32); - Shape17.mirror = true; - setRotation(Shape17, 1.570796F, 1.570796F, 0F); - Shape18 = new ModelRenderer(this, 0, 7); - Shape18.addBox(0F, 0F, 0F, 6, 1, 6); - Shape18.setRotationPoint(-7F, 13F, -2F); - Shape18.setTextureSize(32, 32); - Shape18.mirror = true; - setRotation(Shape18, 0F, 1.570796F, 1.570796F); - Shape19 = new ModelRenderer(this, 0, 7); - Shape19.addBox(0F, 0F, 0F, 6, 1, 6); - Shape19.setRotationPoint(8F, 13F, -2F); - Shape19.setTextureSize(32, 32); - Shape19.mirror = true; - setRotation(Shape19, 0F, 1.570796F, 1.570796F); - Shape20 = new ModelRenderer(this, 0, 7); - Shape20.addBox(0F, 0F, 0F, 6, 1, 6); - Shape20.setRotationPoint(8F, 13F, 8F); - Shape20.setTextureSize(32, 32); - Shape20.mirror = true; - setRotation(Shape20, 0F, 1.570796F, 1.570796F); - Shape21 = new ModelRenderer(this, 0, 7); - Shape21.addBox(0F, 0F, 0F, 6, 1, 6); - Shape21.setRotationPoint(-3F, 14F, 7F); - Shape21.setTextureSize(32, 32); - Shape21.mirror = true; - setRotation(Shape21, 1.570796F, 0F, 0F); - Shape22 = new ModelRenderer(this, 0, 7); - Shape22.addBox(0F, 0F, 0F, 6, 1, 6); - Shape22.setRotationPoint(2F, 13F, -8F); - Shape22.setTextureSize(32, 32); - Shape22.mirror = true; - setRotation(Shape22, 1.570796F, 0F, 1.570796F); - Shape23 = new ModelRenderer(this, 0, 0); - Shape23.addBox(0F, 0F, 0F, 6, 1, 5); - Shape23.setRotationPoint(-8F, 13F, 7F); - Shape23.setTextureSize(32, 32); - Shape23.mirror = true; - setRotation(Shape23, 1.570796F, 0F, 1.570796F); - Shape24 = new ModelRenderer(this, 0, 7); - Shape24.addBox(0F, 0F, 0F, 6, 1, 6); - Shape24.setRotationPoint(2F, 13F, 7F); - Shape24.setTextureSize(32, 32); - Shape24.mirror = true; - setRotation(Shape24, 1.570796F, 0F, 1.570796F); - Shape25 = new ModelRenderer(this, 0, 15); - Shape25.addBox(0F, 0F, 0F, 8, 8, 8); - Shape25.setRotationPoint(-4F, 12F, -4F); - Shape25.setTextureSize(32, 32); - Shape25.mirror = true; - setRotation(Shape25, 0F, 0F, 0F); - } + public TransceiverModelAlt() { + textureWidth = 32; + textureHeight = 32; - @Override - public void render() { + Shape1 = new ModelRenderer(this, 0, 7); + Shape1.addBox(0F, 0F, 0F, 6, 1, 6); + Shape1.setRotationPoint(-3F, 24F, -8F); + Shape1.setTextureSize(32, 32); + Shape1.mirror = true; + setRotation(Shape1, 1.570796F, 0F, 0F); + Shape2 = new ModelRenderer(this, 0, 0); + Shape2.addBox(0F, 0F, 0F, 6, 1, 5); + Shape2.setRotationPoint(7F, 23F, 3F); + Shape2.setTextureSize(32, 32); + Shape2.mirror = true; + setRotation(Shape2, 1.570796F, 1.570796F, 0F); + Shape3 = new ModelRenderer(this, 0, 0); + Shape3.addBox(0F, 0F, 0F, 6, 1, 5); + Shape3.setRotationPoint(-3F, 23F, 7F); + Shape3.setTextureSize(32, 32); + Shape3.mirror = true; + setRotation(Shape3, 1.570796F, 0F, 0F); + Shape4 = new ModelRenderer(this, 0, 7); + Shape4.addBox(0F, 0F, 0F, 6, 1, 6); + Shape4.setRotationPoint(-8F, 24F, 3F); + Shape4.setTextureSize(32, 32); + Shape4.mirror = true; + setRotation(Shape4, 1.570796F, 1.570796F, 0F); + Shape5 = new ModelRenderer(this, 0, 0); + Shape5.addBox(0F, 0F, 0F, 6, 1, 5); + Shape5.setRotationPoint(-3F, 14F, -8F); + Shape5.setTextureSize(32, 32); + Shape5.mirror = true; + setRotation(Shape5, 1.570796F, 0F, 0F); + Shape6 = new ModelRenderer(this, 0, 7); + Shape6.addBox(0F, 0F, 0F, 6, 1, 6); + Shape6.setRotationPoint(-7F, 13F, 8F); + Shape6.setTextureSize(32, 32); + Shape6.mirror = true; + // setRotation(Shape6, 1.570796F, 1.570796F, 1.570796F); + setRotation(Shape6, 0F, 1.570796F, 1.570796F); + Shape7 = new ModelRenderer(this, 0, 7); + Shape7.addBox(0F, 0F, 0F, 6, 1, 6); + Shape7.setRotationPoint(-8F, 13F, -8F); + Shape7.setTextureSize(32, 32); + Shape7.mirror = true; + setRotation(Shape7, 1.570796F, 0F, 1.570796F); + Shape8 = new ModelRenderer(this, 0, 0); + Shape8.addBox(0F, 0F, 0F, 6, 1, 5); + Shape8.setRotationPoint(-8F, 14F, 3F); + Shape8.setTextureSize(32, 32); + Shape8.mirror = true; + setRotation(Shape8, 1.570796F, 1.570796F, 0F); + Shape9 = new ModelRenderer(this, 0, 7); + Shape9.addBox(0F, 0F, 0F, 6, 1, 6); + Shape9.setRotationPoint(-3F, 23F, 2F); + Shape9.setTextureSize(32, 32); + Shape9.mirror = true; + setRotation(Shape9, 0F, 0F, 0F); + Shape10 = new ModelRenderer(this, 0, 7); + Shape10.addBox(0F, 0F, 0F, 6, 1, 6); + Shape10.setRotationPoint(2F, 23F, 3F); + Shape10.setTextureSize(32, 32); + Shape10.mirror = true; + setRotation(Shape10, 0F, 1.570796F, 0F); + Shape11 = new ModelRenderer(this, 0, 7); + Shape11.addBox(0F, 0F, 0F, 6, 1, 6); + Shape11.setRotationPoint(-3F, 23F, -8F); + Shape11.setTextureSize(32, 32); + Shape11.mirror = true; + setRotation(Shape11, 0F, 0F, 0F); + Shape12 = new ModelRenderer(this, 0, 7); + Shape12.addBox(0F, 0F, 0F, 6, 1, 6); + Shape12.setRotationPoint(-8F, 23F, 3F); + Shape12.setTextureSize(32, 32); + Shape12.mirror = true; + setRotation(Shape12, 0F, 1.570796F, 0F); + Shape13 = new ModelRenderer(this, 0, 7); + Shape13.addBox(0F, 0F, 0F, 6, 1, 6); + Shape13.setRotationPoint(-8F, 8F, 3F); + Shape13.setTextureSize(32, 32); + Shape13.mirror = true; + setRotation(Shape13, 0F, 1.570796F, 0F); + Shape14 = new ModelRenderer(this, 0, 7); + Shape14.addBox(0F, 0F, 0F, 6, 1, 6); + Shape14.setRotationPoint(-3F, 8F, 2F); + Shape14.setTextureSize(32, 32); + Shape14.mirror = true; + setRotation(Shape14, 0F, 0F, 0F); + Shape15 = new ModelRenderer(this, 0, 7); + Shape15.addBox(0F, 0F, 0F, 6, 1, 6); + Shape15.setRotationPoint(-3F, 8F, -8F); + Shape15.setTextureSize(32, 32); + Shape15.mirror = true; + setRotation(Shape15, 0F, 0F, 0F); + Shape16 = new ModelRenderer(this, 0, 7); + Shape16.addBox(0F, 0F, 0F, 6, 1, 6); + Shape16.setRotationPoint(2F, 8F, 3F); + Shape16.setTextureSize(32, 32); + Shape16.mirror = true; + setRotation(Shape16, 0F, 1.570796F, 0F); + Shape17 = new ModelRenderer(this, 0, 7); + Shape17.addBox(0F, 0F, 0F, 6, 1, 6); + Shape17.setRotationPoint(7F, 14F, 3F); + Shape17.setTextureSize(32, 32); + Shape17.mirror = true; + setRotation(Shape17, 1.570796F, 1.570796F, 0F); + Shape18 = new ModelRenderer(this, 0, 7); + Shape18.addBox(0F, 0F, 0F, 6, 1, 6); + Shape18.setRotationPoint(-7F, 13F, -2F); + Shape18.setTextureSize(32, 32); + Shape18.mirror = true; + setRotation(Shape18, 0F, 1.570796F, 1.570796F); + Shape19 = new ModelRenderer(this, 0, 7); + Shape19.addBox(0F, 0F, 0F, 6, 1, 6); + Shape19.setRotationPoint(8F, 13F, -2F); + Shape19.setTextureSize(32, 32); + Shape19.mirror = true; + setRotation(Shape19, 0F, 1.570796F, 1.570796F); + Shape20 = new ModelRenderer(this, 0, 7); + Shape20.addBox(0F, 0F, 0F, 6, 1, 6); + Shape20.setRotationPoint(8F, 13F, 8F); + Shape20.setTextureSize(32, 32); + Shape20.mirror = true; + setRotation(Shape20, 0F, 1.570796F, 1.570796F); + Shape21 = new ModelRenderer(this, 0, 7); + Shape21.addBox(0F, 0F, 0F, 6, 1, 6); + Shape21.setRotationPoint(-3F, 14F, 7F); + Shape21.setTextureSize(32, 32); + Shape21.mirror = true; + setRotation(Shape21, 1.570796F, 0F, 0F); + Shape22 = new ModelRenderer(this, 0, 7); + Shape22.addBox(0F, 0F, 0F, 6, 1, 6); + Shape22.setRotationPoint(2F, 13F, -8F); + Shape22.setTextureSize(32, 32); + Shape22.mirror = true; + setRotation(Shape22, 1.570796F, 0F, 1.570796F); + Shape23 = new ModelRenderer(this, 0, 0); + Shape23.addBox(0F, 0F, 0F, 6, 1, 5); + Shape23.setRotationPoint(-8F, 13F, 7F); + Shape23.setTextureSize(32, 32); + Shape23.mirror = true; + setRotation(Shape23, 1.570796F, 0F, 1.570796F); + Shape24 = new ModelRenderer(this, 0, 7); + Shape24.addBox(0F, 0F, 0F, 6, 1, 6); + Shape24.setRotationPoint(2F, 13F, 7F); + Shape24.setTextureSize(32, 32); + Shape24.mirror = true; + setRotation(Shape24, 1.570796F, 0F, 1.570796F); + Shape25 = new ModelRenderer(this, 0, 15); + Shape25.addBox(0F, 0F, 0F, 8, 8, 8); + Shape25.setRotationPoint(-4F, 12F, -4F); + Shape25.setTextureSize(32, 32); + Shape25.mirror = true; + setRotation(Shape25, 0F, 0F, 0F); + } - RenderUtil.bindTexture(TEXTURE); - GL11.glPushMatrix(); - GL11.glTranslatef(0.5f, -1.5f, 0.5f); - GL11.glPushMatrix(); + @Override + public void render() { - float f5 = 0.0625f; - Shape1.render(f5); - Shape2.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape5.render(f5); - Shape6.render(f5); - Shape7.render(f5); - Shape8.render(f5); - Shape9.render(f5); - Shape10.render(f5); - Shape11.render(f5); - Shape12.render(f5); - Shape13.render(f5); - Shape14.render(f5); - Shape15.render(f5); - Shape16.render(f5); - Shape17.render(f5); - Shape18.render(f5); - Shape19.render(f5); - Shape20.render(f5); - Shape21.render(f5); - Shape22.render(f5); - Shape23.render(f5); - Shape24.render(f5); - //Shape25.render(f5); + RenderUtil.bindTexture(TEXTURE); + GL11.glPushMatrix(); + GL11.glTranslatef(0.5f, -1.5f, 0.5f); + GL11.glPushMatrix(); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - } + float f5 = 0.0625f; + Shape1.render(f5); + Shape2.render(f5); + Shape3.render(f5); + Shape4.render(f5); + Shape5.render(f5); + Shape6.render(f5); + Shape7.render(f5); + Shape8.render(f5); + Shape9.render(f5); + Shape10.render(f5); + Shape11.render(f5); + Shape12.render(f5); + Shape13.render(f5); + Shape14.render(f5); + Shape15.render(f5); + Shape16.render(f5); + Shape17.render(f5); + Shape18.render(f5); + Shape19.render(f5); + Shape20.render(f5); + Shape21.render(f5); + Shape22.render(f5); + Shape23.render(f5); + Shape24.render(f5); + // Shape25.render(f5); - private void setRotation(ModelRenderer model, float x, float y, float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } - @Override - public void render(TileTransceiver cube, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y + 1, (float) z); - render(); - GL11.glPopMatrix(); - } + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + @Override + public void render(TileTransceiver cube, double x, double y, double z) { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y + 1, (float) z); + render(); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index 1d98df40..ebb5e6a2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -1,5 +1,15 @@ package crazypants.enderio.machine.transceiver.render; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.CustomRenderBlocks; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.transceiver.TileTransceiver; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,184 +19,180 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.CustomRenderBlocks; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.transceiver.TileTransceiver; - @SideOnly(Side.CLIENT) public class TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - private IModel model; + private IModel model; - private BoundingBox bb; + private BoundingBox bb; - private boolean adjustForItem = false; + private boolean adjustForItem = false; - public TransceiverRenderer() { - float scale = 0.7f; - if(Config.useAlternateTesseractModel) { - model = new TransceiverModelAlt(); - scale = 0.8f; - adjustForItem = true; - } else { - model = new TransceiverModel(); - } - bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); - } - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - - TileTransceiver trans = (TileTransceiver) te; - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - float f = trans.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = trans.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); - - model.render(trans, x, y, z); - if(trans.isActive()) { - renderPower(te.getWorldObj(), x, y, z, true); - } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - GL11.glColor3f(1, 1, 1); - GL11.glDisable(GL11.GL_LIGHTING); - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setColorOpaque_F(f, f, f); - - - RenderUtil.bindBlockTexture(); - CustomRenderBlocks rb = new CustomRenderBlocks(te.getWorldObj()); - double scale = 0.88; - BoundingBox pushPullBounds = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); - BoundingBox disabledBounds = BoundingBox.UNIT_CUBE.scale(1.01, 1.01, 1.01); - - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IoMode mode = trans.getIoMode(dir); - if(mode != null) { - if(mode == IoMode.DISABLED) { - rb.setRenderBounds(disabledBounds.minX, disabledBounds.minY, disabledBounds.minZ, - disabledBounds.maxX, disabledBounds.maxY, disabledBounds.maxZ); + public TransceiverRenderer() { + float scale = 0.7f; + if (Config.useAlternateTesseractModel) { + model = new TransceiverModelAlt(); + scale = 0.8f; + adjustForItem = true; } else { - rb.setRenderBounds(pushPullBounds.minX, pushPullBounds.minY, pushPullBounds.minZ, - pushPullBounds.maxX, pushPullBounds.maxY, pushPullBounds.maxZ); + model = new TransceiverModel(); } - IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(trans, dir, mode); - if(icon != null) { - rb.doDefaultRenderFace(dir, EnderIO.blockTransceiver, 0, 0, 0, icon); + bb = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); + } + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { + + TileTransceiver trans = (TileTransceiver) te; + + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + float f = trans.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = trans.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + + model.render(trans, x, y, z); + if (trans.isActive()) { + renderPower(te.getWorldObj(), x, y, z, true); } - } + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glColor3f(1, 1, 1); + GL11.glDisable(GL11.GL_LIGHTING); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorOpaque_F(f, f, f); + + RenderUtil.bindBlockTexture(); + CustomRenderBlocks rb = new CustomRenderBlocks(te.getWorldObj()); + double scale = 0.88; + BoundingBox pushPullBounds = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); + BoundingBox disabledBounds = BoundingBox.UNIT_CUBE.scale(1.01, 1.01, 1.01); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IoMode mode = trans.getIoMode(dir); + if (mode != null) { + if (mode == IoMode.DISABLED) { + rb.setRenderBounds( + disabledBounds.minX, + disabledBounds.minY, + disabledBounds.minZ, + disabledBounds.maxX, + disabledBounds.maxY, + disabledBounds.maxZ); + } else { + rb.setRenderBounds( + pushPullBounds.minX, + pushPullBounds.minY, + pushPullBounds.minZ, + pushPullBounds.maxX, + pushPullBounds.maxY, + pushPullBounds.maxZ); + } + IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(trans, dir, mode); + if (icon != null) { + rb.doDefaultRenderFace(dir, EnderIO.blockTransceiver, 0, 0, 0, icon); + } + } + } + + Tessellator.instance.draw(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); } - Tessellator.instance.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); - - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(adjustForItem) { - switch (type) { - case ENTITY: - renderItem(0f, 0f, 0f); - return; - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: - renderItem(0f, 1f, 1f); - return; - case INVENTORY: - renderItem(0f, 0f, 0f); - return; - default: - renderItem(0f, 0f, 0f); - return; - } - } else { - renderItem(0, 0, 0); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; } - } - private void renderPower(World world, double x, double y, double z, boolean isActive) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - - RenderUtil.bindBlockTexture(); - IIcon icon = EnderIO.blockHyperCube.getPortalIcon(); - - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(!isActive) { - GL11.glColor4f(0, 1, 1, 0.5f); - } else { - GL11.glColor4f(1, 1, 1, 1f); + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - CubeRenderer.render(bb, icon); - tessellator.draw(); - GL11.glPopMatrix(); + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (adjustForItem) { + switch (type) { + case ENTITY: + renderItem(0f, 0f, 0f); + return; + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + renderItem(0f, 1f, 1f); + return; + case INVENTORY: + renderItem(0f, 0f, 0f); + return; + default: + renderItem(0f, 0f, 0f); + return; + } + } else { + renderItem(0, 0, 0); + } + } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - } + private void renderPower(World world, double x, double y, double z, boolean isActive) { - private void renderItem(float x, float y, float z) { - GL11.glPushMatrix(); - GL11.glTranslatef(x, y, z); - model.render(); - GL11.glPopMatrix(); - } + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); - // private class OverlayRenderer implements IRenderFace { - // - // @Override - // public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - // boolean translateToXyz) { - // - // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z,texture); - // if(curEnt != null && par1Block instanceof AbstractMachineBlock) { - // IoMode mode = curEnt.getIoMode(face); - // IIcon tex = ((AbstractMachineBlock)par1Block).getOverlayIconForMode(mode); - // if(tex != null) { - // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex); - // } - // } - // - // } - // - // } + RenderUtil.bindBlockTexture(); + IIcon icon = EnderIO.blockHyperCube.getPortalIcon(); + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if (!isActive) { + GL11.glColor4f(0, 1, 1, 0.5f); + } else { + GL11.glColor4f(1, 1, 1, 1f); + } + CubeRenderer.render(bb, icon); + tessellator.draw(); + + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_BLEND); + } + + private void renderItem(float x, float y, float z) { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + model.render(); + GL11.glPopMatrix(); + } + + // private class OverlayRenderer implements IRenderFace { + // + // @Override + // public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double + // z, IIcon texture, List refVertices, + // boolean translateToXyz) { + // + // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z,texture); + // if(curEnt != null && par1Block instanceof AbstractMachineBlock) { + // IoMode mode = curEnt.getIoMode(face); + // IIcon tex = ((AbstractMachineBlock)par1Block).getOverlayIconForMode(mode); + // if(tex != null) { + // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex); + // } + // } + // + // } + // + // } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index e53d55df..0293323e 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -1,5 +1,15 @@ package crazypants.enderio.machine.vacuum; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.api.redstone.IRedstoneConnectable; +import crazypants.enderio.network.PacketHandler; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -9,116 +19,104 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.TileEntityEnder; - -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.relauncher.Side; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.api.redstone.IRedstoneConnectable; -import crazypants.enderio.network.PacketHandler; - public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResourceTooltipProvider, IRedstoneConnectable { - public static BlockVacuumChest create() { - PacketHandler.INSTANCE.registerMessage(PacketVaccumChest.class,PacketVaccumChest.class,PacketHandler.nextID(), Side.SERVER); - BlockVacuumChest res = new BlockVacuumChest(); - res.init(); - return res; - } - - public static int renderId; - - protected BlockVacuumChest() { - super(ModObject.blockVacuumChest.unlocalisedName, TileVacuumChest.class); - setBlockTextureName("enderio:blockVacuumChest"); - } - - @Override - public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { - return true; - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - TileEntity ent = world.getTileEntity(x, y, z); - if(ent instanceof TileVacuumChest) { - ((TileVacuumChest) ent).onNeighborBlockChange(blockId); + public static BlockVacuumChest create() { + PacketHandler.INSTANCE.registerMessage( + PacketVaccumChest.class, PacketVaccumChest.class, PacketHandler.nextID(), Side.SERVER); + BlockVacuumChest res = new BlockVacuumChest(); + res.init(); + return res; } - } - @Override - protected void init() { - super.init(); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_VACUUM_CHEST, this); - } + public static int renderId; - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_VACUUM_CHEST, world, x, y, z); + protected BlockVacuumChest() { + super(ModObject.blockVacuumChest.unlocalisedName, TileVacuumChest.class); + setBlockTextureName("enderio:blockVacuumChest"); } - return true; - } - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - drop.stackTagCompound = new NBTTagCompound(); - if(te != null) { - ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); + @Override + public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { + return true; } - } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placedBy, ItemStack stack) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { - ((TileVacuumChest) te).readContentsFromNBT(stack.stackTagCompound); - world.markBlockForUpdate(x, y, z); - } + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + TileEntity ent = world.getTileEntity(x, y, z); + if (ent instanceof TileVacuumChest) { + ((TileVacuumChest) ent).onNeighborBlockChange(blockId); + } } - } - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - return new ContainerVacuumChest(player, player.inventory, (TileVacuumChest) te); + @Override + protected void init() { + super.init(); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_VACUUM_CHEST, this); } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - return new GuiVacuumChest(player, player.inventory, (TileVacuumChest) te); + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + if (!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_VACUUM_CHEST, world, x, y, z); + } + return true; } - return null; - } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if (te != null) { + ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); + } + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placedBy, ItemStack stack) { + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if (stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { + ((TileVacuumChest) te).readContentsFromNBT(stack.stackTagCompound); + world.markBlockForUpdate(x, y, z); + } + } + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileVacuumChest) { + return new ContainerVacuumChest(player, player.inventory, (TileVacuumChest) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileVacuumChest) { + return new GuiVacuumChest(player, player.inventory, (TileVacuumChest) te); + } + return null; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java index cfbba56b..b8b4f8b9 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java @@ -1,80 +1,77 @@ package crazypants.enderio.machine.vacuum; +import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.ContainerEnder; +import crazypants.enderio.EnderIO; import java.awt.Point; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; - -import crazypants.enderio.EnderIO; - public class ContainerVacuumChest extends ContainerEnder { - private Slot filterSlot; - private Runnable filterChangedCB; + private Slot filterSlot; + private Runnable filterChangedCB; - public ContainerVacuumChest(EntityPlayer player, InventoryPlayer inventory, final TileVacuumChest te) { - super(inventory, te); - } - - @Override - protected void addSlots(InventoryPlayer playerInv) { - filterSlot = new FilterSlot(new InventoryFilterUpgrade(getInv())); - addSlotToContainer(filterSlot); - - int x = 8; - int y = 18; - int index = -1; - for (int i = 0; i < TileVacuumChest.ITEM_ROWS; ++i) { - for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(getInv(), ++index, x + j * 18, y + i * 18)); - } - } - } - - public void createGhostSlots(List slots) { - slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, filterSlot)); - } - - @Override - public Point getPlayerInventoryOffset() { - Point p = super.getPlayerInventoryOffset(); - p.translate(0, 40); - return p; - } - - void setFilterChangedCB(Runnable filterChangedCB) { - this.filterChangedCB = filterChangedCB; - } - - void filterChanged() { - if(filterChangedCB != null) { - filterChangedCB.run(); - } - } - - class FilterSlot extends Slot { - InventoryFilterUpgrade inv; - - FilterSlot(InventoryFilterUpgrade inv) { - super(inv, 0, 8, 86); - this.inv = inv; + public ContainerVacuumChest(EntityPlayer player, InventoryPlayer inventory, final TileVacuumChest te) { + super(inventory, te); } @Override - public void onSlotChanged() { - filterChanged(); + protected void addSlots(InventoryPlayer playerInv) { + filterSlot = new FilterSlot(new InventoryFilterUpgrade(getInv())); + addSlotToContainer(filterSlot); + + int x = 8; + int y = 18; + int index = -1; + for (int i = 0; i < TileVacuumChest.ITEM_ROWS; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(getInv(), ++index, x + j * 18, y + i * 18)); + } + } + } + + public void createGhostSlots(List slots) { + slots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, filterSlot)); } @Override - public boolean isItemValid(ItemStack stack) { - return inv.isItemValidForSlot(0, stack); + public Point getPlayerInventoryOffset() { + Point p = super.getPlayerInventoryOffset(); + p.translate(0, 40); + return p; + } + + void setFilterChangedCB(Runnable filterChangedCB) { + this.filterChangedCB = filterChangedCB; + } + + void filterChanged() { + if (filterChangedCB != null) { + filterChangedCB.run(); + } + } + + class FilterSlot extends Slot { + InventoryFilterUpgrade inv; + + FilterSlot(InventoryFilterUpgrade inv) { + super(inv, 0, 8, 86); + this.inv = inv; + } + + @Override + public void onSlotChanged() { + filterChanged(); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return inv.isItemValidForSlot(0, stack); + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 4566c5a8..1de6fb04 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -1,228 +1,226 @@ package crazypants.enderio.machine.vacuum; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.EnderWidget; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class GuiVacuumChest extends GuiContainerBaseEIO { - private static final int RANGE_LEFT = 145; - private static final int RANGE_TOP = 86; - private static final int RANGE_WIDTH = 16; + private static final int RANGE_LEFT = 145; + private static final int RANGE_TOP = 86; + private static final int RANGE_WIDTH = 16; - private static final int FILTER_LEFT = 29; - private static final int FILTER_TOP = 85; + private static final int FILTER_LEFT = 29; + private static final int FILTER_TOP = 85; - private static final int ID_RANGE_UP = 4711; - private static final int ID_RANGE_DOWN = 4712; - private static final int ID_WHITELIST = 4713; - private static final int ID_MATCHMETA = 4714; - private static final int ID_REDSTONE = 4715; + private static final int ID_RANGE_UP = 4711; + private static final int ID_RANGE_DOWN = 4712; + private static final int ID_WHITELIST = 4713; + private static final int ID_MATCHMETA = 4714; + private static final int ID_REDSTONE = 4715; - private final TileVacuumChest te; + private final TileVacuumChest te; - private final GuiToolTip rangeTooltip; - private final MultiIconButton rangeUpB; - private final MultiIconButton rangeDownB; - private final ToggleButton whiteListB; - private final ToggleButton useMetaB; - private final RedstoneModeButton rsB; - private final String headerChest; - private final String headerFilter; - private final String headerRange; - private final String headerInventory; + private final GuiToolTip rangeTooltip; + private final MultiIconButton rangeUpB; + private final MultiIconButton rangeDownB; + private final ToggleButton whiteListB; + private final ToggleButton useMetaB; + private final RedstoneModeButton rsB; + private final String headerChest; + private final String headerFilter; + private final String headerRange; + private final String headerInventory; - public GuiVacuumChest(EntityPlayer player, InventoryPlayer inventory, TileVacuumChest te) { - super(new ContainerVacuumChest(player, inventory, te), "vacumChest"); - this.te = te; + public GuiVacuumChest(EntityPlayer player, InventoryPlayer inventory, TileVacuumChest te) { + super(new ContainerVacuumChest(player, inventory, te), "vacumChest"); + this.te = te; - ySize = 206; + ySize = 206; - int x = RANGE_LEFT; - int y = RANGE_TOP; + int x = RANGE_LEFT; + int y = RANGE_TOP; - rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), EnderIO.lang.localize("gui.vacuum.range")); + rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), EnderIO.lang.localize("gui.vacuum.range")); - x += RANGE_WIDTH; - rangeUpB = MultiIconButton.createAddButton(this, ID_RANGE_UP, x, y); + x += RANGE_WIDTH; + rangeUpB = MultiIconButton.createAddButton(this, ID_RANGE_UP, x, y); - y += 8; - rangeDownB = MultiIconButton.createMinusButton(this, ID_RANGE_DOWN, x, y); + y += 8; + rangeDownB = MultiIconButton.createMinusButton(this, ID_RANGE_DOWN, x, y); - x = xSize - 16 - 7; - y = 104; - rsB = new RedstoneModeButton(this, ID_REDSTONE, x, y, te, new BlockCoord(te)); + x = xSize - 16 - 7; + y = 104; + rsB = new RedstoneModeButton(this, ID_REDSTONE, x, y, te, new BlockCoord(te)); - x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS*18 + 2; - y = 86; - whiteListB = new ToggleButton(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); - whiteListB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); - whiteListB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); - whiteListB.setPaintSelectedBorder(false); + x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS * 18 + 2; + y = 86; + whiteListB = new ToggleButton(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); + whiteListB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + whiteListB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); + whiteListB.setPaintSelectedBorder(false); - y += 18; - useMetaB = new ToggleButton(this, ID_MATCHMETA, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); - useMetaB.setPaintSelectedBorder(false); + y += 18; + useMetaB = new ToggleButton(this, ID_MATCHMETA, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setPaintSelectedBorder(false); - for(int i=0 ; i= current.stackSize) { - result = current.copy(); - remaining = null; - } else { - result = current.copy(); - result.stackSize = num; - remaining = current.copy(); - remaining.stackSize -= num; - } - te.setFilterItem(remaining); - return result; + public InventoryFilterUpgrade(TileVacuumChest te) { + this.te = te; } - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack is) { - if(slot == 0) { - te.setFilterItem(is); + @Override + public int getSizeInventory() { + return 1; } - } - @Override - public String getInventoryName() { - return "FilterUpgrade"; - } + @Override + public ItemStack getStackInSlot(int slot) { + if (slot == 0) { + return te.getFilterItem(); + } + return null; + } - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public ItemStack decrStackSize(int slot, int num) { + if (slot == 0) { + ItemStack current = te.getFilterItem(); + if (current == null) { + return current; + } + ItemStack result; + ItemStack remaining; + if (num >= current.stackSize) { + result = current.copy(); + remaining = null; + } else { + result = current.copy(); + result.stackSize = num; + remaining = current.copy(); + remaining.stackSize -= num; + } + te.setFilterItem(remaining); + return result; + } - @Override - public int getInventoryStackLimit() { - return 1; - } + return null; + } - @Override - public void markDirty() { - } + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } - @Override - public boolean isUseableByPlayer(EntityPlayer ep) { - return true; - } + @Override + public void setInventorySlotContents(int slot, ItemStack is) { + if (slot == 0) { + te.setFilterItem(is); + } + } - @Override - public void openInventory() { - } + @Override + public String getInventoryName() { + return "FilterUpgrade"; + } - @Override - public void closeInventory() { - } + @Override + public boolean hasCustomInventoryName() { + return false; + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack is) { - return slot == 0 && te.isItemValidForFilter(is); - } + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public void markDirty() {} + + @Override + public boolean isUseableByPlayer(EntityPlayer ep) { + return true; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int slot, ItemStack is) { + return slot == 0 && te.isItemValidForFilter(is); + } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java index 7c3883c2..c6c9c346 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java @@ -1,98 +1,96 @@ package crazypants.enderio.machine.vacuum; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; -public class PacketVaccumChest extends MessageTileEntity implements IMessageHandler { +public class PacketVaccumChest extends MessageTileEntity + implements IMessageHandler { - public static final int CMD_SET_RANGE = 0; - public static final int CMD_SET_SLOT = 1; - public static final int CMD_SET_BLACKLIST = 2; - public static final int CMD_SET_MATCHMETA = 3; + public static final int CMD_SET_RANGE = 0; + public static final int CMD_SET_SLOT = 1; + public static final int CMD_SET_BLACKLIST = 2; + public static final int CMD_SET_MATCHMETA = 3; - private int cmd; - private int value; - private ItemStack stack; + private int cmd; + private int value; + private ItemStack stack; - public PacketVaccumChest() { - } + public PacketVaccumChest() {} - private PacketVaccumChest(TileVacuumChest tile, int cmd) { - super(tile); - this.cmd = cmd; - } - - public static PacketVaccumChest setRange(TileVacuumChest tile, int range) { - PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_RANGE); - msg.value = range; - tile.setRange(range); - return msg; - } - - public static PacketVaccumChest setFilterSlot(TileVacuumChest tile, int slot, ItemStack stack) { - PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_SLOT); - msg.value = slot; - msg.stack = stack; - tile.setItemFilterSlot(slot, stack); - return msg; - } - - public static PacketVaccumChest setFilterBlacklist(TileVacuumChest tile, boolean isBlacklist) { - PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_BLACKLIST); - msg.value = isBlacklist ? 1 : 0; - tile.setFilterBlacklist(isBlacklist); - return msg; - } - - public static PacketVaccumChest setFilterMatchMeta(TileVacuumChest tile, boolean matchMeta) { - PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_MATCHMETA); - msg.value = matchMeta ? 1 : 0; - tile.setFilterMatchMeta(matchMeta); - return msg; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - cmd = buf.readByte() & 255; - value = buf.readInt(); - stack = ByteBufUtils.readItemStack(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeByte(cmd); - buf.writeInt(value); - ByteBufUtils.writeItemStack(buf, stack); - } - - @Override - public IMessage onMessage(PacketVaccumChest msg, MessageContext ctx) { - TileVacuumChest te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - switch (msg.cmd) { - case CMD_SET_RANGE: - te.setRange(msg.value); - break; - case CMD_SET_SLOT: - te.setItemFilterSlot(msg.value, msg.stack); - break; - case CMD_SET_BLACKLIST: - te.setFilterBlacklist(msg.value != 0); - break; - case CMD_SET_MATCHMETA: - te.setFilterMatchMeta(msg.value != 0); - break; - } + private PacketVaccumChest(TileVacuumChest tile, int cmd) { + super(tile); + this.cmd = cmd; + } + + public static PacketVaccumChest setRange(TileVacuumChest tile, int range) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_RANGE); + msg.value = range; + tile.setRange(range); + return msg; + } + + public static PacketVaccumChest setFilterSlot(TileVacuumChest tile, int slot, ItemStack stack) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_SLOT); + msg.value = slot; + msg.stack = stack; + tile.setItemFilterSlot(slot, stack); + return msg; + } + + public static PacketVaccumChest setFilterBlacklist(TileVacuumChest tile, boolean isBlacklist) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_BLACKLIST); + msg.value = isBlacklist ? 1 : 0; + tile.setFilterBlacklist(isBlacklist); + return msg; + } + + public static PacketVaccumChest setFilterMatchMeta(TileVacuumChest tile, boolean matchMeta) { + PacketVaccumChest msg = new PacketVaccumChest(tile, CMD_SET_MATCHMETA); + msg.value = matchMeta ? 1 : 0; + tile.setFilterMatchMeta(matchMeta); + return msg; + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + cmd = buf.readByte() & 255; + value = buf.readInt(); + stack = ByteBufUtils.readItemStack(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeByte(cmd); + buf.writeInt(value); + ByteBufUtils.writeItemStack(buf, stack); + } + + @Override + public IMessage onMessage(PacketVaccumChest msg, MessageContext ctx) { + TileVacuumChest te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + switch (msg.cmd) { + case CMD_SET_RANGE: + te.setRange(msg.value); + break; + case CMD_SET_SLOT: + te.setItemFilterSlot(msg.value, msg.stack); + break; + case CMD_SET_BLACKLIST: + te.setFilterBlacklist(msg.value != 0); + break; + case CMD_SET_MATCHMETA: + te.setFilterMatchMeta(msg.value != 0); + break; + } + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index 200c385e..c4190cd3 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -1,7 +1,17 @@ package crazypants.enderio.machine.vacuum; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.common.util.ItemUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.conduit.item.FilterRegister; +import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.conduit.item.filter.ItemFilter; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.IRedstoneModeControlable; +import crazypants.enderio.machine.RedstoneControlMode; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; @@ -14,358 +24,344 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.common.util.ItemUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.enderio.conduit.item.filter.IItemFilter; -import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IRedstoneModeControlable; -import crazypants.enderio.machine.RedstoneControlMode; - public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory, IRedstoneModeControlable { - public static final int ITEM_ROWS = 3; - public static final int ITEM_SLOTS = 9*ITEM_ROWS; - public static final int FILTER_SLOTS = 5; + public static final int ITEM_ROWS = 3; + public static final int ITEM_SLOTS = 9 * ITEM_ROWS; + public static final int FILTER_SLOTS = 5; - private final ItemStack[] inv = new ItemStack[ITEM_SLOTS]; - private int range = Config.vacuumChestRange; - private ItemFilter filter; - private ItemStack filterItem; + private final ItemStack[] inv = new ItemStack[ITEM_SLOTS]; + private int range = Config.vacuumChestRange; + private ItemFilter filter; + private ItemStack filterItem; - protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; - protected boolean redstoneCheckPassed; - private boolean redstoneStateDirty = true; + protected RedstoneControlMode redstoneControlMode = RedstoneControlMode.IGNORE; + protected boolean redstoneCheckPassed; + private boolean redstoneStateDirty = true; - @Override - public void doUpdate() { - if(redstoneStateDirty) { - updateRedstoneStatus(); - } - if(redstoneCheckPassed && !isFull()) { - doHoover(); - } - } - - private void updateRedstoneStatus() { - boolean prevRedstoneCheckPassed = redstoneCheckPassed; - redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); - redstoneStateDirty = false; - if(redstoneCheckPassed != prevRedstoneCheckPassed) { - updateBlock(); - } - } - - public void onNeighborBlockChange(Block blockId) { - redstoneStateDirty = true; - } - - @Override - public boolean isEntityApplicable(Entity entity) { - if(entity.isDead) { - return false; - } - if(entity instanceof IProjectile) { - return entity.motionY < 0.01; - } - if(entity instanceof EntityItem) { - return true; - } - return false; - } - - @SuppressWarnings("unchecked") - private void doHoover() { - - int rangeSqr = range*range; - BoundingBox bb = new BoundingBox(getLocation()); - AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); - aabb = aabb.expand(range, range, range); - List interestingItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); - - for (EntityItem entity : interestingItems) { - if(filter == null || filter.doesItemPassFilter(entity.getEntityItem())) { - double x = (xCoord + 0.5D - entity.posX); - double y = (yCoord + 0.5D - entity.posY); - double z = (zCoord + 0.5D - entity.posZ); - - double distance = Math.sqrt(x * x + y * y + z * z); - if(distance < 1.25) { - hooverEntity(entity); - } else { - double speed = 0.06; - double distScale = 1.0 - Math.min(0.9, distance / rangeSqr); - distScale *= distScale; - - entity.motionX += x / distance * distScale * speed; - entity.motionY += y / distance * distScale * 0.2; - entity.motionZ += z / distance * distScale * speed; + @Override + public void doUpdate() { + if (redstoneStateDirty) { + updateRedstoneStatus(); } - } - } - } - - private void hooverEntity(Entity entity) { - if(!worldObj.isRemote) { - if(entity instanceof EntityItem && !entity.isDead) { - EntityItem item = (EntityItem) entity; - ItemStack stack = item.getEntityItem().copy(); - - int numInserted = ItemUtil.doInsertItem(this, stack, null); - stack.stackSize -= numInserted; - item.setEntityItemStack(stack); - if(stack.stackSize == 0) { - item.setDead(); + if (redstoneCheckPassed && !isFull()) { + doHoover(); } - } } - } - private boolean isFull() { - for (ItemStack stack : inv) { - if(stack == null || stack.stackSize < stack.getMaxStackSize()) { + private void updateRedstoneStatus() { + boolean prevRedstoneCheckPassed = redstoneCheckPassed; + redstoneCheckPassed = RedstoneControlMode.isConditionMet(redstoneControlMode, this); + redstoneStateDirty = false; + if (redstoneCheckPassed != prevRedstoneCheckPassed) { + updateBlock(); + } + } + + public void onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + } + + @Override + public boolean isEntityApplicable(Entity entity) { + if (entity.isDead) { + return false; + } + if (entity instanceof IProjectile) { + return entity.motionY < 0.01; + } + if (entity instanceof EntityItem) { + return true; + } return false; - } - } - return true; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return canPlayerAccess(player); - } - - @Override - public int getSizeInventory() { - return inv.length; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public ItemStack getStackInSlot(int slot) { - if(slot < 0 || slot >= inv.length) { - return null; - } - return inv[slot]; - } - - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack fromStack = inv[fromSlot]; - if(fromStack == null) { - return null; - } - if(fromStack.stackSize <= amount) { - inv[fromSlot] = null; - return fromStack; - } - ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); - if(fromStack.stackTagCompound != null) { - result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); - } - fromStack.stackSize -= amount; - return result; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - - if(slot < 0 || slot >= inv.length) { - System.out.println("TileVacumChest.setInventorySlotContents: " + slot); - return; } - if(contents == null) { - inv[slot] = contents; - } else { - inv[slot] = contents.copy(); - } + @SuppressWarnings("unchecked") + private void doHoover() { - if(contents != null && contents.stackSize > getInventoryStackLimit()) { - contents.stackSize = getInventoryStackLimit(); - } - } + int rangeSqr = range * range; + BoundingBox bb = new BoundingBox(getLocation()); + AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + aabb = aabb.expand(range, range, range); + List interestingItems = worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); - @Override - public ItemStack getStackInSlotOnClosing(int var1) { - return null; - } + for (EntityItem entity : interestingItems) { + if (filter == null || filter.doesItemPassFilter(entity.getEntityItem())) { + double x = (xCoord + 0.5D - entity.posX); + double y = (yCoord + 0.5D - entity.posY); + double z = (zCoord + 0.5D - entity.posZ); - @Override - public String getInventoryName() { - return ModObject.blockVacuumChest.unlocalisedName; - } + double distance = Math.sqrt(x * x + y * y + z * z); + if (distance < 1.25) { + hooverEntity(entity); + } else { + double speed = 0.06; + double distScale = 1.0 - Math.min(0.9, distance / rangeSqr); + distScale *= distScale; - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { - } - - @Override - public boolean isItemValidForSlot(int var1, ItemStack var2) { - return true; - } - - public boolean isItemValidForFilter(ItemStack itemstack) { - return itemstack != null && itemstack.getItem() == EnderIO.itemBasicFilterUpgrade && itemstack.getItemDamage() == 0; - } - - public int getRange() { - return range; - } - - private int limitRange(int range) { - return Math.max(1, Math.min(Config.vacuumChestRange, range)); - } - - public void setRange(int range) { - this.range = limitRange(range); - updateBlock(); - } - - public ItemStack getFilterItem() { - return filterItem; - } - - public void setFilterItem(ItemStack filterItem) { - IItemFilter newFilter = FilterRegister.getFilterForUpgrade(filterItem); - if(newFilter == null || newFilter instanceof ItemFilter) { - this.filterItem = filterItem; - this.filter = (ItemFilter)newFilter; - updateBlock(); - } - } - - public void setFilterBlacklist(boolean isBlacklist) { - if(filter != null) { - filter.setBlacklist(isBlacklist); - updateFilterItem(); - } - } - - public void setFilterMatchMeta(boolean matchMeta) { - if(filter != null) { - filter.setMatchMeta(matchMeta); - updateFilterItem(); - } - } - - public boolean hasItemFilter() { - return filter != null; - } - - public ItemFilter getItemFilter() { - return filter; - } - - public void setItemFilterSlot(int slot, ItemStack stack) { - if(slot >= 0 && slot < FILTER_SLOTS && filter != null) { - filter.setInventorySlotContents(slot, stack); - updateFilterItem(); - } - } - - private void updateFilterItem() { - FilterRegister.writeFilterToStack(filter, filterItem); - updateBlock(); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return redstoneControlMode; - } - - @Override - public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { - this.redstoneControlMode = redstoneControlMode; - redstoneStateDirty = true; - updateBlock(); - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - readContentsFromNBT(nbtRoot); - redstoneCheckPassed = nbtRoot.getBoolean("redstoneCheckPassed"); - } - - public void readContentsFromNBT(NBTTagCompound nbtRoot) { - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if(itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if(slot >= 0 && slot < inv.length) { - inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); + entity.motionX += x / distance * distScale * speed; + entity.motionY += y / distance * distScale * 0.2; + entity.motionZ += z / distance * distScale * speed; + } + } } - } - } - if(nbtRoot.hasKey("range")) { - range = limitRange(nbtRoot.getInteger("range")); - } else { - range = Config.vacuumChestRange; - } - if(nbtRoot.hasKey("filter")) { - NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag("filter"); - filterItem = ItemStack.loadItemStackFromNBT(filterTag); - IItemFilter flt = FilterRegister.getFilterForUpgrade(filterItem); - if(flt instanceof ItemFilter) { - filter = (ItemFilter)flt; - } else { - filterItem = null; - } - } else { - filterItem = null; - filter = null; } - int rsContr = nbtRoot.getInteger("redstoneControlMode"); - if(rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { - rsContr = 0; - } - redstoneControlMode = RedstoneControlMode.values()[rsContr]; - } + private void hooverEntity(Entity entity) { + if (!worldObj.isRemote) { + if (entity instanceof EntityItem && !entity.isDead) { + EntityItem item = (EntityItem) entity; + ItemStack stack = item.getEntityItem().copy(); - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - writeContentsToNBT(nbtRoot); - nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); - } - - public void writeContentsToNBT(NBTTagCompound nbtRoot) { - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inv.length; i++) { - if(inv[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inv[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } + int numInserted = ItemUtil.doInsertItem(this, stack, null); + stack.stackSize -= numInserted; + item.setEntityItemStack(stack); + if (stack.stackSize == 0) { + item.setDead(); + } + } + } } - nbtRoot.setTag("Items", itemList); - nbtRoot.setInteger("range", range); - if(filterItem != null) { - NBTTagCompound filterNBT = new NBTTagCompound(); - filterItem.writeToNBT(filterNBT); - nbtRoot.setTag("filter", filterNBT); - } - nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); - } + private boolean isFull() { + for (ItemStack stack : inv) { + if (stack == null || stack.stackSize < stack.getMaxStackSize()) { + return false; + } + } + return true; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return canPlayerAccess(player); + } + + @Override + public int getSizeInventory() { + return inv.length; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public ItemStack getStackInSlot(int slot) { + if (slot < 0 || slot >= inv.length) { + return null; + } + return inv[slot]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack fromStack = inv[fromSlot]; + if (fromStack == null) { + return null; + } + if (fromStack.stackSize <= amount) { + inv[fromSlot] = null; + return fromStack; + } + ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); + if (fromStack.stackTagCompound != null) { + result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); + } + fromStack.stackSize -= amount; + return result; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + + if (slot < 0 || slot >= inv.length) { + System.out.println("TileVacumChest.setInventorySlotContents: " + slot); + return; + } + + if (contents == null) { + inv[slot] = contents; + } else { + inv[slot] = contents.copy(); + } + + if (contents != null && contents.stackSize > getInventoryStackLimit()) { + contents.stackSize = getInventoryStackLimit(); + } + } + + @Override + public ItemStack getStackInSlotOnClosing(int var1) { + return null; + } + + @Override + public String getInventoryName() { + return ModObject.blockVacuumChest.unlocalisedName; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int var1, ItemStack var2) { + return true; + } + + public boolean isItemValidForFilter(ItemStack itemstack) { + return itemstack != null + && itemstack.getItem() == EnderIO.itemBasicFilterUpgrade + && itemstack.getItemDamage() == 0; + } + + public int getRange() { + return range; + } + + private int limitRange(int range) { + return Math.max(1, Math.min(Config.vacuumChestRange, range)); + } + + public void setRange(int range) { + this.range = limitRange(range); + updateBlock(); + } + + public ItemStack getFilterItem() { + return filterItem; + } + + public void setFilterItem(ItemStack filterItem) { + IItemFilter newFilter = FilterRegister.getFilterForUpgrade(filterItem); + if (newFilter == null || newFilter instanceof ItemFilter) { + this.filterItem = filterItem; + this.filter = (ItemFilter) newFilter; + updateBlock(); + } + } + + public void setFilterBlacklist(boolean isBlacklist) { + if (filter != null) { + filter.setBlacklist(isBlacklist); + updateFilterItem(); + } + } + + public void setFilterMatchMeta(boolean matchMeta) { + if (filter != null) { + filter.setMatchMeta(matchMeta); + updateFilterItem(); + } + } + + public boolean hasItemFilter() { + return filter != null; + } + + public ItemFilter getItemFilter() { + return filter; + } + + public void setItemFilterSlot(int slot, ItemStack stack) { + if (slot >= 0 && slot < FILTER_SLOTS && filter != null) { + filter.setInventorySlotContents(slot, stack); + updateFilterItem(); + } + } + + private void updateFilterItem() { + FilterRegister.writeFilterToStack(filter, filterItem); + updateBlock(); + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + return redstoneControlMode; + } + + @Override + public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { + this.redstoneControlMode = redstoneControlMode; + redstoneStateDirty = true; + updateBlock(); + } + + @Override + public void readCustomNBT(NBTTagCompound nbtRoot) { + readContentsFromNBT(nbtRoot); + redstoneCheckPassed = nbtRoot.getBoolean("redstoneCheckPassed"); + } + + public void readContentsFromNBT(NBTTagCompound nbtRoot) { + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + if (itemList != null) { + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if (slot >= 0 && slot < inv.length) { + inv[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } + if (nbtRoot.hasKey("range")) { + range = limitRange(nbtRoot.getInteger("range")); + } else { + range = Config.vacuumChestRange; + } + if (nbtRoot.hasKey("filter")) { + NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag("filter"); + filterItem = ItemStack.loadItemStackFromNBT(filterTag); + IItemFilter flt = FilterRegister.getFilterForUpgrade(filterItem); + if (flt instanceof ItemFilter) { + filter = (ItemFilter) flt; + } else { + filterItem = null; + } + } else { + filterItem = null; + filter = null; + } + + int rsContr = nbtRoot.getInteger("redstoneControlMode"); + if (rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { + rsContr = 0; + } + redstoneControlMode = RedstoneControlMode.values()[rsContr]; + } + + @Override + public void writeCustomNBT(NBTTagCompound nbtRoot) { + writeContentsToNBT(nbtRoot); + nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); + } + + public void writeContentsToNBT(NBTTagCompound nbtRoot) { + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inv.length; i++) { + if (inv[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inv[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); + nbtRoot.setInteger("range", range); + if (filterItem != null) { + NBTTagCompound filterNBT = new NBTTagCompound(); + filterItem.writeToNBT(filterNBT); + nbtRoot.setTag("filter", filterNBT); + } + nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java index c0a569bf..1540dda8 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java @@ -1,5 +1,9 @@ package crazypants.enderio.machine.vacuum; +import com.enderio.core.client.render.BoundingBox; +import com.enderio.core.client.render.CubeRenderer; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -9,82 +13,76 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; - public class VacuumChestRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0)); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90,0.90), EnderIO.blockVacuumChest.getIcon(0, 0)); - Tessellator.instance.draw(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - IIcon override = renderer.overrideBlockTexture; - - double size = 0.4; - renderer.renderMinX = 0.5 - size; - renderer.renderMaxX = 0.5 + size; - renderer.renderMinY = 0.5 - size; - renderer.renderMaxY = 0.5 + size; - renderer.renderMinZ = 0.5 - size; - renderer.renderMaxZ = 0.5 + size; - renderer.lockBlockBounds = true; - - if(!renderer.hasOverrideBlockTexture()) { - renderer.setOverrideBlockTexture(EnderIO.blockHyperCube.getIcon(0, 0)); + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0)); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90, 0.90), EnderIO.blockVacuumChest.getIcon(0, 0)); + Tessellator.instance.draw(); } - renderer.renderStandardBlock(Blocks.stone, x, y, z); - renderer.setOverrideBlockTexture(override); - renderer.lockBlockBounds = false; + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + IIcon override = renderer.overrideBlockTexture; - renderer.renderMinX = 0; - renderer.renderMaxX = 1; - renderer.renderMinY = 0; - renderer.renderMaxY = 1; - renderer.renderMinZ = 0; - renderer.renderMaxZ = 1; + double size = 0.4; + renderer.renderMinX = 0.5 - size; + renderer.renderMaxX = 0.5 + size; + renderer.renderMinY = 0.5 - size; + renderer.renderMaxY = 0.5 + size; + renderer.renderMinZ = 0.5 - size; + renderer.renderMaxZ = 0.5 + size; + renderer.lockBlockBounds = true; - if(!renderer.hasOverrideBlockTexture()) { - renderer.setOverrideBlockTexture(EnderIO.blockVacuumChest.getIcon(0, 0)); + if (!renderer.hasOverrideBlockTexture()) { + renderer.setOverrideBlockTexture(EnderIO.blockHyperCube.getIcon(0, 0)); + } + renderer.renderStandardBlock(Blocks.stone, x, y, z); + renderer.setOverrideBlockTexture(override); + + renderer.lockBlockBounds = false; + + renderer.renderMinX = 0; + renderer.renderMaxX = 1; + renderer.renderMinY = 0; + renderer.renderMaxY = 1; + renderer.renderMinZ = 0; + renderer.renderMaxZ = 1; + + if (!renderer.hasOverrideBlockTexture()) { + renderer.setOverrideBlockTexture(EnderIO.blockVacuumChest.getIcon(0, 0)); + } + renderer.renderStandardBlock(Blocks.stone, x, y, z); + renderer.setOverrideBlockTexture(override); + + return true; } - renderer.renderStandardBlock(Blocks.stone, x, y, z); - renderer.setOverrideBlockTexture(override); - return true; - } + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + @Override + public int getRenderId() { + return EnderIO.blockVacuumChest.renderId; + } - @Override - public int getRenderId() { - return EnderIO.blockVacuumChest.renderId; - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]); - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java index 19af8dcc..291912b4 100644 --- a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -1,7 +1,13 @@ package crazypants.enderio.machine.vat; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.network.PacketHandler; import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntitySmokeFX; @@ -12,153 +18,151 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.network.PacketHandler; public class BlockVat extends AbstractMachineBlock { - public static int renderId; + public static int renderId; - public static BlockVat create() { - PacketHandler.INSTANCE.registerMessage(PacketTanks.class,PacketTanks.class,PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketVatProgress.class, PacketVatProgress.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketDumpTank.class,PacketDumpTank.class,PacketHandler.nextID(), Side.SERVER); - BlockVat res = new BlockVat(); - res.init(); - return res; - } - - protected IIcon onIcon; - protected IIcon topIcon; - protected IIcon blockIconSingle; - protected IIcon blockIconSingleOn; - protected IIcon[][] overlays; - - public BlockVat() { - super(ModObject.blockVat, TileVat.class); - } - - protected String getModelIconKey(boolean active) { - return "enderio:vatModel"; - } - - @Override - public int getLightOpacity() { - return 0; - } - - @SideOnly(Side.CLIENT) - @Override - protected void registerOverlayIcons(IIconRegister iIconRegister) { - super.registerOverlayIcons(iIconRegister); - - overlays = new IIcon[2][IoMode.values().length]; - - overlays[0][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); - overlays[0][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); - overlays[0][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); - overlays[0][IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter"); - - overlays[1][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullTopBottom"); - overlays[1][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushTopBottom"); - overlays[1][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullTopBottom"); - overlays[1][IoMode.DISABLED.ordinal()] = overlays[0][IoMode.DISABLED.ordinal()]; - } - - @Override - public IIcon getOverlayIconForMode(TileVat tile, ForgeDirection face, IoMode mode) { - ForgeDirection side = tile.getFacingDir().getRotation(ForgeDirection.DOWN); - if(mode == IoMode.DISABLED || face == side || face == side.getOpposite()) { - return super.getOverlayIconForMode(tile, face, mode); - } else { - if(face == ForgeDirection.UP) { - return overlays[1][mode.ordinal()]; - } - return overlays[0][mode.ordinal()]; + public static BlockVat create() { + PacketHandler.INSTANCE.registerMessage( + PacketTanks.class, PacketTanks.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketVatProgress.class, PacketVatProgress.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage( + PacketDumpTank.class, PacketDumpTank.class, PacketHandler.nextID(), Side.SERVER); + BlockVat res = new BlockVat(); + res.init(); + return res; } - } - @Override - public int getRenderType() { - return renderId; - } + protected IIcon onIcon; + protected IIcon topIcon; + protected IIcon blockIconSingle; + protected IIcon blockIconSingleOn; + protected IIcon[][] overlays; - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // The server needs the container as it manages the adding and removing of - // items, which are then sent to the client for display - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVat) { - return new ContainerVat(player.inventory, (TileVat) te); + public BlockVat() { + super(ModObject.blockVat, TileVat.class); } - return null; - } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVat) { - return new GuiVat(player.inventory, (TileVat) te); + protected String getModelIconKey(boolean active) { + return "enderio:vatModel"; } - return null; - } - @Override - protected int getGuiId() { - return GuiHandler.GUI_ID_STILL; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return true; - } - - @Override - protected String getMachineFrontIconKey(boolean active) { - return getBackIconKey(active); - } - - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand) { - // Spit some "steam" out the spout - if (isActive(world, x, y, z)) { - TileVat te = (TileVat) world.getTileEntity(x, y, z); - float pX = x + 0.5f; - float pY = y + 0.7f; - float pZ = z + 0.5f; - - ForgeDirection dir = te.getFacingDir(); - pX += 0.6f * dir.offsetX; - pZ += 0.6f * dir.offsetZ; - - double velX = ((rand.nextDouble() * 0.075) + 0.025) * dir.offsetX; - double velZ = ((rand.nextDouble() * 0.075) + 0.025) * dir.offsetZ; - - int num = rand.nextInt(4) + 2; - for (int k = 0; k < num; k++) { - EffectRenderer er = Minecraft.getMinecraft().effectRenderer; - EntitySmokeFX fx = new EntitySmokeFX(world, pX, pY, pZ, 1, 1, 1); - fx.setRBGColorF(1 - (rand.nextFloat() * 0.2f), 1 - (rand.nextFloat() * 0.1f), 1 - (rand.nextFloat() * 0.2f)); - fx.setVelocity(velX, -0.06, velZ); - er.addEffect(fx); - } + @Override + public int getLightOpacity() { + return 0; + } + + @SideOnly(Side.CLIENT) + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + + overlays = new IIcon[2][IoMode.values().length]; + + overlays[0][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); + overlays[0][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); + overlays[0][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); + overlays[0][IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter"); + + overlays[1][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullTopBottom"); + overlays[1][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushTopBottom"); + overlays[1][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullTopBottom"); + overlays[1][IoMode.DISABLED.ordinal()] = overlays[0][IoMode.DISABLED.ordinal()]; + } + + @Override + public IIcon getOverlayIconForMode(TileVat tile, ForgeDirection face, IoMode mode) { + ForgeDirection side = tile.getFacingDir().getRotation(ForgeDirection.DOWN); + if (mode == IoMode.DISABLED || face == side || face == side.getOpposite()) { + return super.getOverlayIconForMode(tile, face, mode); + } else { + if (face == ForgeDirection.UP) { + return overlays[1][mode.ordinal()]; + } + return overlays[0][mode.ordinal()]; + } + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // The server needs the container as it manages the adding and removing of + // items, which are then sent to the client for display + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileVat) { + return new ContainerVat(player.inventory, (TileVat) te); + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileVat) { + return new GuiVat(player.inventory, (TileVat) te); + } + return null; + } + + @Override + protected int getGuiId() { + return GuiHandler.GUI_ID_STILL; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered( + IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { + return true; + } + + @Override + protected String getMachineFrontIconKey(boolean active) { + return getBackIconKey(active); + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // Spit some "steam" out the spout + if (isActive(world, x, y, z)) { + TileVat te = (TileVat) world.getTileEntity(x, y, z); + float pX = x + 0.5f; + float pY = y + 0.7f; + float pZ = z + 0.5f; + + ForgeDirection dir = te.getFacingDir(); + pX += 0.6f * dir.offsetX; + pZ += 0.6f * dir.offsetZ; + + double velX = ((rand.nextDouble() * 0.075) + 0.025) * dir.offsetX; + double velZ = ((rand.nextDouble() * 0.075) + 0.025) * dir.offsetZ; + + int num = rand.nextInt(4) + 2; + for (int k = 0; k < num; k++) { + EffectRenderer er = Minecraft.getMinecraft().effectRenderer; + EntitySmokeFX fx = new EntitySmokeFX(world, pX, pY, pZ, 1, 1, 1); + fx.setRBGColorF( + 1 - (rand.nextFloat() * 0.2f), 1 - (rand.nextFloat() * 0.1f), 1 - (rand.nextFloat() * 0.2f)); + fx.setVelocity(velX, -0.06, velZ); + er.addEffect(fx); + } + } } - } } diff --git a/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java index d92c43ea..d1f26f50 100644 --- a/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/ContainerVat.java @@ -1,30 +1,29 @@ package crazypants.enderio.machine.vat; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerVat extends AbstractMachineContainer { - public ContainerVat(InventoryPlayer playerInv, TileVat te) { - super(playerInv, te); - } - - @Override - protected void addMachineSlots(InventoryPlayer playerInv) { - addSlotToContainer(new Slot(getInv(), 0, 56, 12) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(0, itemStack); - } - }); - addSlotToContainer(new Slot(getInv(), 1, 105, 12) { - @Override - public boolean isItemValid(ItemStack itemStack) { - return getInv().isItemValidForSlot(1, itemStack); - } - }); - } + public ContainerVat(InventoryPlayer playerInv, TileVat te) { + super(playerInv, te); + } + @Override + protected void addMachineSlots(InventoryPlayer playerInv) { + addSlotToContainer(new Slot(getInv(), 0, 56, 12) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(0, itemStack); + } + }); + addSlotToContainer(new Slot(getInv(), 1, 105, 12) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return getInv().isItemValidForSlot(1, itemStack); + } + }); + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index df59a37e..70103c1d 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -1,219 +1,211 @@ package crazypants.enderio.machine.vat; -import java.awt.Color; -import java.awt.Rectangle; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; +import java.awt.Color; +import java.awt.Rectangle; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; +import org.lwjgl.opengl.GL11; public class GuiVat extends GuiPoweredMachineBase { - private static final String GUI_TEXTURE = "vat"; + private static final String GUI_TEXTURE = "vat"; - private final IconButton dump1, dump2; + private final IconButton dump1, dump2; - public GuiVat(InventoryPlayer inventory, TileVat te) { - super(te, new ContainerVat(inventory, te), GUI_TEXTURE); + public GuiVat(InventoryPlayer inventory, TileVat te) { + super(te, new ContainerVat(inventory, te), GUI_TEXTURE); - addToolTip(new GuiToolTip(new Rectangle(30, 12, 15, 47), "") { + addToolTip(new GuiToolTip(new Rectangle(30, 12, 15, 47), "") { - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("vat.inputTank"); - if(getTileEntity().inputTank.getFluid() != null) { - heading += ": " + getTileEntity().inputTank.getFluid().getLocalizedName(); + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("vat.inputTank"); + if (getTileEntity().inputTank.getFluid() != null) { + heading += ": " + getTileEntity().inputTank.getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().inputTank)); + } + }); + + addToolTip(new GuiToolTip(new Rectangle(132, 12, 15, 47), "") { + + @Override + protected void updateText() { + text.clear(); + String heading = EnderIO.lang.localize("vat.outputTank"); + if (getTileEntity().outputTank.getFluid() != null) { + heading += ": " + getTileEntity().outputTank.getFluid().getLocalizedName(); + } + text.add(heading); + text.add(Fluids.toCapactityString(getTileEntity().outputTank)); + } + }); + + dump1 = new IconButton(this, 1, 29, 62, IconEIO.REDSTONE_MODE_NEVER); + dump1.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.1")); + dump2 = new IconButton(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); + dump2.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.2")); + + addProgressTooltip(81, 63, 14, 14); + } + + @Override + public void initGui() { + super.initGui(); + dump1.onGuiInit(); + dump2.onGuiInit(); + } + + @Override + public void renderSlotHighlights(IoMode mode) { + super.renderSlotHighlights(mode); + + int x = 30; + int y = 12; + if (mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { + renderSlotHighlight(PULL_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().inputTank)); - } - - }); - - addToolTip(new GuiToolTip(new Rectangle(132, 12, 15, 47), "") { - - @Override - protected void updateText() { - text.clear(); - String heading = EnderIO.lang.localize("vat.outputTank"); - if(getTileEntity().outputTank.getFluid() != null) { - heading += ": " + getTileEntity().outputTank.getFluid().getLocalizedName(); + if (mode == IoMode.PUSH || mode == IoMode.PUSH_PULL) { + x = 132; + renderSlotHighlight(PUSH_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); } - text.add(heading); - text.add(Fluids.toCapactityString(getTileEntity().outputTank)); - } - - }); - - dump1 = new IconButton(this, 1, 29, 62, IconEIO.REDSTONE_MODE_NEVER); - dump1.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.1")); - dump2 = new IconButton(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); - dump2.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.2")); - - addProgressTooltip(81, 63, 14, 14); - } - - @Override - public void initGui() { - super.initGui(); - dump1.onGuiInit(); - dump2.onGuiInit(); - } - - @Override - public void renderSlotHighlights(IoMode mode) { - super.renderSlotHighlights(mode); - - int x = 30; - int y = 12; - if(mode == IoMode.PULL || mode == IoMode.PUSH_PULL) { - renderSlotHighlight(PULL_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); - } - if(mode == IoMode.PUSH || mode == IoMode.PUSH_PULL) { - x = 132; - renderSlotHighlight(PUSH_COLOR, x - 2, y - 2, 15 + 4, 47 + 4); - } - } - - /** - * Draw the background layer for the GuiContainer (everything behind the - * items) - */ - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - TileVat vat = getTileEntity(); - - if(shouldRenderProgress()) { - int scaled = getProgressScaled(14) + 1; - drawTexturedModalRect(guiLeft + 81, guiTop + 77 - scaled, 176, 14 - scaled, 14, scaled); - - IIcon inputIcon = null; - if(vat.currentTaskInputFluid != null) { - inputIcon = vat.currentTaskInputFluid.getStillIcon(); - } - IIcon outputIcon = null; - if(vat.currentTaskOutputFluid != null) { - outputIcon = vat.currentTaskOutputFluid.getStillIcon(); - } - - if(inputIcon != null && outputIcon != null) { - renderVat(inputIcon, outputIcon, vat.getProgress()); - } - } - int x = guiLeft + 30; - int y = guiTop + 12; - RenderUtil.renderGuiTank(vat.inputTank, x, y, zLevel, 15, 47); - x = guiLeft + 132; - RenderUtil.renderGuiTank(vat.outputTank, x, y, zLevel, 15, 47); + /** + * Draw the background layer for the GuiContainer (everything behind the + * items) + */ + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + TileVat vat = getTileEntity(); - Fluid outputFluid; - if (vat.outputTank.getFluidAmount() > 0) { - outputFluid = vat.outputTank.getFluid().getFluid(); - } else { - outputFluid = vat.currentTaskOutputFluid; - } - - Fluid inputFluid; - if (vat.inputTank.getFluidAmount() > 0) { - inputFluid = vat.inputTank.getFluid().getFluid(); - } else { - inputFluid = vat.currentTaskInputFluid; + if (shouldRenderProgress()) { + int scaled = getProgressScaled(14) + 1; + drawTexturedModalRect(guiLeft + 81, guiTop + 77 - scaled, 176, 14 - scaled, 14, scaled); + + IIcon inputIcon = null; + if (vat.currentTaskInputFluid != null) { + inputIcon = vat.currentTaskInputFluid.getStillIcon(); + } + IIcon outputIcon = null; + if (vat.currentTaskOutputFluid != null) { + outputIcon = vat.currentTaskOutputFluid.getStillIcon(); + } + + if (inputIcon != null && outputIcon != null) { + renderVat(inputIcon, outputIcon, vat.getProgress()); + } + } + + int x = guiLeft + 30; + int y = guiTop + 12; + RenderUtil.renderGuiTank(vat.inputTank, x, y, zLevel, 15, 47); + x = guiLeft + 132; + RenderUtil.renderGuiTank(vat.outputTank, x, y, zLevel, 15, 47); + + Fluid outputFluid; + if (vat.outputTank.getFluidAmount() > 0) { + outputFluid = vat.outputTank.getFluid().getFluid(); + } else { + outputFluid = vat.currentTaskOutputFluid; + } + + Fluid inputFluid; + if (vat.inputTank.getFluidAmount() > 0) { + inputFluid = vat.inputTank.getFluid().getFluid(); + } else { + inputFluid = vat.currentTaskInputFluid; + } + + float mult; + ItemStack inStack = vat.getStackInSlot(0); + if (inStack != null) { + mult = VatRecipeManager.instance.getMultiplierForInput(inputFluid, inStack, outputFluid); + if (mult > 0) { + String str = "x" + mult; + x = guiLeft + 63 - fontRendererObj.getStringWidth(str) / 2; + fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); + } + } + inStack = vat.getStackInSlot(1); + if (inStack != null) { + mult = VatRecipeManager.instance.getMultiplierForInput(inputFluid, inStack, outputFluid); + if (mult > 0) { + String str = "x" + mult; + x = guiLeft + 113 - fontRendererObj.getStringWidth(str) / 2; + fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); + } + } + + bindGuiTexture(); + super.drawGuiContainerBackgroundLayer(par1, par2, par3); } - float mult; - ItemStack inStack = vat.getStackInSlot(0); - if (inStack != null) { - mult = VatRecipeManager.instance.getMultiplierForInput(inputFluid, inStack, outputFluid); - if (mult > 0) { - String str = "x" + mult; - x = guiLeft + 63 - fontRendererObj.getStringWidth(str) / 2; - fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); - } - } - inStack = vat.getStackInSlot(1); - if (inStack != null) { - mult = VatRecipeManager.instance.getMultiplierForInput(inputFluid, inStack, outputFluid); - if (mult > 0) { - String str = "x" + mult; - x = guiLeft + 113 - fontRendererObj.getStringWidth(str) / 2; - fontRendererObj.drawString(str, x, guiTop + 32, ColorUtil.getRGB(Color.gray), false); - } + private void renderVat(IIcon inputIcon, IIcon outputIcon, float progress) { + RenderUtil.bindBlockTexture(); + + int x = guiLeft + 76; + int y = guiTop + 34; + + GL11.glEnable(GL11.GL_BLEND); + GL11.glColor4f(1, 1, 1, 0.75f * (1f - progress)); + drawTexturedModelRectFromIcon(x, y, inputIcon, 26, 28); + + GL11.glColor4f(1, 1, 1, 0.75f * progress); + drawTexturedModelRectFromIcon(x, y, outputIcon, 26, 28); + + GL11.glDisable(GL11.GL_BLEND); + + GL11.glColor4f(1, 1, 1, 1); + bindGuiTexture(); + drawTexturedModalRect(x, y, 0, 256 - 28, 26, 28); } - bindGuiTexture(); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); - } + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); - private void renderVat(IIcon inputIcon, IIcon outputIcon, float progress) { - RenderUtil.bindBlockTexture(); - - int x = guiLeft + 76; - int y = guiTop + 34; - - GL11.glEnable(GL11.GL_BLEND); - GL11.glColor4f(1, 1, 1, 0.75f * (1f - progress)); - drawTexturedModelRectFromIcon(x, y, inputIcon, 26, 28); - - GL11.glColor4f(1, 1, 1, 0.75f * progress); - drawTexturedModelRectFromIcon(x, y, outputIcon, 26, 28); - - GL11.glDisable(GL11.GL_BLEND); - - GL11.glColor4f(1, 1, 1, 1); - bindGuiTexture(); - drawTexturedModalRect(x, y, 0, 256 - 28, 26, 28); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - - if(b == dump1) { - dump(1); - } else if(b == dump2) { - dump(2); + if (b == dump1) { + dump(1); + } else if (b == dump2) { + dump(2); + } } - } - private void dump(int i) { - PacketHandler.INSTANCE.sendToServer(new PacketDumpTank(getTileEntity(), i)); - } + private void dump(int i) { + PacketHandler.INSTANCE.sendToServer(new PacketDumpTank(getTileEntity(), i)); + } - @Override - protected int getPowerX() { - return 10; - } + @Override + protected int getPowerX() { + return 10; + } - @Override - protected int getPowerY() { - return 13; - } - - @Override - protected int getPowerHeight() { - return 60; - } + @Override + protected int getPowerY() { + return 13; + } + @Override + protected int getPowerHeight() { + return 60; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java index 09f716a9..84235339 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java @@ -1,55 +1,53 @@ package crazypants.enderio.machine.vat; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.fluids.FluidTank; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.fluids.FluidTank; public class PacketDumpTank extends MessageTileEntity implements IMessageHandler { - - private int tank; - - public PacketDumpTank() { - super(); - } - - public PacketDumpTank(TileVat te, int tank) { - super(te); - this.tank = tank; - getTank(te).setFluid(null); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(tank); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - tank = buf.readInt(); - } - - private FluidTank getTank(TileVat te) { - if (tank == 1) { - return te.inputTank; - } else if (tank == 2) { - return te.outputTank; + + private int tank; + + public PacketDumpTank() { + super(); } - return null; - } - - @Override - public IMessage onMessage(PacketDumpTank message, MessageContext ctx) { - TileVat te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - message.getTank(te).setFluid(null); + + public PacketDumpTank(TileVat te, int tank) { + super(te); + this.tank = tank; + getTank(te).setFluid(null); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(tank); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + tank = buf.readInt(); + } + + private FluidTank getTank(TileVat te) { + if (tank == 1) { + return te.inputTank; + } else if (tank == 2) { + return te.outputTank; + } + return null; + } + + @Override + public IMessage onMessage(PacketDumpTank message, MessageContext ctx) { + TileVat te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te != null) { + message.getTank(te).setFluid(null); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java index 9745bfd9..ccf1945f 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java @@ -1,72 +1,69 @@ package crazypants.enderio.machine.vat; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; public class PacketTanks extends MessageTileEntity implements IMessageHandler { - private NBTTagCompound nbtRoot; + private NBTTagCompound nbtRoot; - public PacketTanks() { - } + public PacketTanks() {} - public PacketTanks(TileVat tile) { - super(tile); - nbtRoot = new NBTTagCompound(); - if(tile.inputTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.inputTank.writeToNBT(tankRoot); - nbtRoot.setTag("inputTank", tankRoot); + public PacketTanks(TileVat tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + if (tile.inputTank.getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.inputTank.writeToNBT(tankRoot); + nbtRoot.setTag("inputTank", tankRoot); + } + if (tile.outputTank.getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + tile.outputTank.writeToNBT(tankRoot); + nbtRoot.setTag("outputTank", tankRoot); + } } - if(tile.outputTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - tile.outputTank.writeToNBT(tankRoot); - nbtRoot.setTag("outputTank", tankRoot); - } - } - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - NetworkUtil.writeNBTTagCompound(nbtRoot, buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - nbtRoot = NetworkUtil.readNBTTagCompound(buf); - } - - @Override - public IMessage onMessage(PacketTanks message, MessageContext ctx) { - EntityPlayer player = ctx.side == Side.SERVER ? ctx.getServerHandler().playerEntity : EnderIO.proxy.getClientPlayer(); - TileVat tile = message.getTileEntity(player.worldObj); - if(tile == null) { - return null; + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); } - if(message.nbtRoot.hasKey("inputTank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("inputTank"); - tile.inputTank.readFromNBT(tankRoot); - } else { - tile.inputTank.setFluid(null); - } - if(message.nbtRoot.hasKey("outputTank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("outputTank"); - tile.outputTank.readFromNBT(tankRoot); - } else { - tile.outputTank.setFluid(null); - } - return null; - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + nbtRoot = NetworkUtil.readNBTTagCompound(buf); + } + + @Override + public IMessage onMessage(PacketTanks message, MessageContext ctx) { + EntityPlayer player = + ctx.side == Side.SERVER ? ctx.getServerHandler().playerEntity : EnderIO.proxy.getClientPlayer(); + TileVat tile = message.getTileEntity(player.worldObj); + if (tile == null) { + return null; + } + if (message.nbtRoot.hasKey("inputTank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("inputTank"); + tile.inputTank.readFromNBT(tankRoot); + } else { + tile.inputTank.setFluid(null); + } + if (message.nbtRoot.hasKey("outputTank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("outputTank"); + tile.outputTank.readFromNBT(tankRoot); + } else { + tile.outputTank.setFluid(null); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java index 6c0dbfbe..1607dc19 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java @@ -1,10 +1,6 @@ package crazypants.enderio.machine.vat; -import io.netty.buffer.ByteBuf; -import net.minecraftforge.fluids.FluidRegistry; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -14,80 +10,80 @@ import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.PoweredTaskProgress; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.fluids.FluidRegistry; -public class PacketVatProgress extends MessageTileEntity implements IMessageHandler { +public class PacketVatProgress extends MessageTileEntity + implements IMessageHandler { - private float progress = 0; + private float progress = 0; - private int inputFluidId = -1; - private int outputFluidId = -1; + private int inputFluidId = -1; + private int outputFluidId = -1; - public PacketVatProgress() { + public PacketVatProgress() {} - } + public PacketVatProgress(TileVat vat) { + super(vat); + progress = vat.getProgress(); - public PacketVatProgress(TileVat vat) { - super(vat); - progress = vat.getProgress(); - - IPoweredTask task = vat.getCurrentTask(); - if(task == null) { - return; - } - - for (MachineRecipeInput input : task.getInputs()) { - if(input.fluid != null && input.fluid.getFluid() != null) { - inputFluidId = input.fluid.getFluid().getID(); - break; - } - } - - IMachineRecipe rec = task.getRecipe(); - if (rec == null) { - return; - } - for (ResultStack res : rec.getCompletedResult(1.0f, task.getInputs())) { - if(res.fluid != null && res.fluid.getFluid() != null) { - outputFluidId = res.fluid.getFluid().getID(); - } - } - - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeFloat(progress); - buf.writeInt(inputFluidId); - buf.writeInt(outputFluidId); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - progress = buf.readFloat(); - inputFluidId = buf.readInt(); - outputFluidId = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketVatProgress message, MessageContext ctx) { - TileVat tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); - if(tile != null) { - tile.currentTaskInputFluid = null; - tile.currentTaskOutputFluid = null; - if(message.progress < 0) { - tile.setClientTask(null); - } else { - tile.setClientTask(new PoweredTaskProgress(message.progress)); - if(message.inputFluidId > 0) { - tile.currentTaskInputFluid = FluidRegistry.getFluid(message.inputFluidId); + IPoweredTask task = vat.getCurrentTask(); + if (task == null) { + return; } - if(message.outputFluidId > 0) { - tile.currentTaskOutputFluid = FluidRegistry.getFluid(message.outputFluidId); + + for (MachineRecipeInput input : task.getInputs()) { + if (input.fluid != null && input.fluid.getFluid() != null) { + inputFluidId = input.fluid.getFluid().getID(); + break; + } + } + + IMachineRecipe rec = task.getRecipe(); + if (rec == null) { + return; + } + for (ResultStack res : rec.getCompletedResult(1.0f, task.getInputs())) { + if (res.fluid != null && res.fluid.getFluid() != null) { + outputFluidId = res.fluid.getFluid().getID(); + } } - } } - return null; - } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeFloat(progress); + buf.writeInt(inputFluidId); + buf.writeInt(outputFluidId); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + progress = buf.readFloat(); + inputFluidId = buf.readInt(); + outputFluidId = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketVatProgress message, MessageContext ctx) { + TileVat tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); + if (tile != null) { + tile.currentTaskInputFluid = null; + tile.currentTaskOutputFluid = null; + if (message.progress < 0) { + tile.setClientTask(null); + } else { + tile.setClientTask(new PoweredTaskProgress(message.progress)); + if (message.inputFluidId > 0) { + tile.currentTaskInputFluid = FluidRegistry.getFluid(message.inputFluidId); + } + if (message.outputFluidId > 0) { + tile.currentTaskOutputFluid = FluidRegistry.getFluid(message.outputFluidId); + } + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/TileVat.java b/src/main/java/crazypants/enderio/machine/vat/TileVat.java index 5c687f0a..650bb282 100644 --- a/src/main/java/crazypants/enderio/machine/vat/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/TileVat.java @@ -1,5 +1,16 @@ package crazypants.enderio.machine.vat; +import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.FluidUtil; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.machine.IPoweredTask; +import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.network.PacketHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -10,340 +21,325 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.enderio.core.api.common.util.ITankAccess; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.FluidUtil; - -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractPoweredTaskEntity; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; -import crazypants.enderio.machine.IPoweredTask; -import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.network.PacketHandler; - public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler, ITankAccess { - final FluidTank inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); - final FluidTank outputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); + final FluidTank inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); + final FluidTank outputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 8); - private static int IO_MB_TICK = 100; + private static int IO_MB_TICK = 100; - boolean tanksDirty = false; + boolean tanksDirty = false; - //Used client side in the vat gui to render progress - Fluid currentTaskInputFluid; - Fluid currentTaskOutputFluid; + // Used client side in the vat gui to render progress + Fluid currentTaskInputFluid; + Fluid currentTaskOutputFluid; - public TileVat() { - super(new SlotDefinition(0, 1, -1, -1, -1, -1)); - } - - @Override - public String getInventoryName() { - return ModObject.blockVat.unlocalisedName; - } - - @Override - public boolean hasCustomInventoryName() { - return false; - } - - @Override - public String getMachineName() { - return ModObject.blockVat.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - MachineRecipeInput[] inputs = getRecipeInputs(); - inputs[i] = new MachineRecipeInput(i, itemstack); - return VatRecipeManager.getInstance().isValidInput(inputs); - } - - @Override - protected boolean doPush(ForgeDirection dir) { - - if(isSideDisabled(dir.ordinal())) { - return false; + public TileVat() { + super(new SlotDefinition(0, 1, -1, -1, -1, -1)); } - boolean res = super.doPush(dir); - if(outputTank.getFluidAmount() > 0) { + @Override + public String getInventoryName() { + return ModObject.blockVat.unlocalisedName; + } - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - if(target.canFill(dir.getOpposite(), outputTank.getFluid().getFluid())) { - FluidStack push = outputTank.getFluid().copy(); - push.amount = Math.min(push.amount, IO_MB_TICK); - int filled = target.fill(dir.getOpposite(), push, true); - if(filled > 0) { - outputTank.drain(filled, true); - tanksDirty = true; - return res; - } + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockVat.unlocalisedName; + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + MachineRecipeInput[] inputs = getRecipeInputs(); + inputs[i] = new MachineRecipeInput(i, itemstack); + return VatRecipeManager.getInstance().isValidInput(inputs); + } + + @Override + protected boolean doPush(ForgeDirection dir) { + + if (isSideDisabled(dir.ordinal())) { + return false; } - } - } - return res; - } + boolean res = super.doPush(dir); + if (outputTank.getFluidAmount() > 0) { - @Override - protected boolean doPull(ForgeDirection dir) { - - if(isSideDisabled(dir.ordinal())) { - return false; - } - - boolean res = super.doPull(dir); - if(inputTank.getFluidAmount() < inputTank.getCapacity()) { - BlockCoord loc = getLocation().getLocation(dir); - IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); - if(target != null) { - - if(inputTank.getFluidAmount() > 0) { - FluidStack canPull = inputTank.getFluid().copy(); - canPull.amount = inputTank.getCapacity() - inputTank.getFluidAmount(); - canPull.amount = Math.min(canPull.amount, IO_MB_TICK); - FluidStack drained = target.drain(dir.getOpposite(), canPull, true); - if(drained != null && drained.amount > 0) { - inputTank.fill(drained, true); - tanksDirty = true; - return res; - } - } else { - //empty input tank - FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); - if(infos != null) { - for (FluidTankInfo info : infos) { - if(info.fluid != null && info.fluid.amount > 0) { - if(canFill(dir, info.fluid.getFluid())) { - FluidStack canPull = info.fluid.copy(); - canPull.amount = Math.min(IO_MB_TICK, canPull.amount); - FluidStack drained = target.drain(dir.getOpposite(), canPull, true); - if(drained != null && drained.amount > 0) { - inputTank.fill(drained, true); - tanksDirty = true; - return res; - } + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { + if (target.canFill(dir.getOpposite(), outputTank.getFluid().getFluid())) { + FluidStack push = outputTank.getFluid().copy(); + push.amount = Math.min(push.amount, IO_MB_TICK); + int filled = target.fill(dir.getOpposite(), push, true); + if (filled > 0) { + outputTank.drain(filled, true); + tanksDirty = true; + return res; + } } - } } - } + } + return res; + } + + @Override + protected boolean doPull(ForgeDirection dir) { + + if (isSideDisabled(dir.ordinal())) { + return false; } - } - } - return res; - } + boolean res = super.doPull(dir); + if (inputTank.getFluidAmount() < inputTank.getCapacity()) { + BlockCoord loc = getLocation().getLocation(dir); + IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); + if (target != null) { - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(isSideDisabled(from.ordinal())) { - return 0; + if (inputTank.getFluidAmount() > 0) { + FluidStack canPull = inputTank.getFluid().copy(); + canPull.amount = inputTank.getCapacity() - inputTank.getFluidAmount(); + canPull.amount = Math.min(canPull.amount, IO_MB_TICK); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if (drained != null && drained.amount > 0) { + inputTank.fill(drained, true); + tanksDirty = true; + return res; + } + } else { + // empty input tank + FluidTankInfo[] infos = target.getTankInfo(dir.getOpposite()); + if (infos != null) { + for (FluidTankInfo info : infos) { + if (info.fluid != null && info.fluid.amount > 0) { + if (canFill(dir, info.fluid.getFluid())) { + FluidStack canPull = info.fluid.copy(); + canPull.amount = Math.min(IO_MB_TICK, canPull.amount); + FluidStack drained = target.drain(dir.getOpposite(), canPull, true); + if (drained != null && drained.amount > 0) { + inputTank.fill(drained, true); + tanksDirty = true; + return res; + } + } + } + } + } + } + } + } + return res; } - if(resource == null || !canFill(from, resource.getFluid())) { - return 0; - } - int res = inputTank.fill(resource, doFill); - if(res > 0 && doFill) { - tanksDirty = true; - } - return res; - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (isSideDisabled(from.ordinal())) { + return 0; + } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(isSideDisabled(from.ordinal())) { - return null; - } - if(outputTank.getFluid() == null || resource == null || !resource.isFluidEqual(outputTank.getFluid())) { - return null; - } - FluidStack res = outputTank.drain(resource.amount, doDrain); - if(res != null && res.amount > 0 && doDrain) { - tanksDirty = true; - } - return res; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(isSideDisabled(from.ordinal())) { - return null; - } - FluidStack res = outputTank.drain(maxDrain, doDrain); - if(res != null && res.amount > 0 && doDrain) { - tanksDirty = true; - } - return res; - } - - @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - boolean res = super.processTasks(redstoneChecksPassed); - if(tanksDirty && shouldDoWorkThisTick(10)) { - PacketHandler.sendToAllAround(new PacketTanks(this), this); - tanksDirty = false; - } - return res; - } - - @Override - protected void sendTaskProgressPacket() { - PacketHandler.sendToAllAround(new PacketVatProgress(this), this); - ticksSinceLastProgressUpdate = 0; - } - - @Override - protected void mergeFluidResult(ResultStack result) { - outputTank.fill(result.fluid, true); - tanksDirty = true; - } - - @Override - protected void drainInputFluid(MachineRecipeInput fluid) { - inputTank.drain(fluid.fluid.amount, true); - tanksDirty = true; - } - - @Override - protected boolean canInsertResultFluid(ResultStack fluid) { - int res = outputTank.fill(fluid.fluid, false); - return res >= fluid.fluid.amount; - } - - @Override - protected MachineRecipeInput[] getRecipeInputs() { - MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots() + 1]; - int fromSlot = slotDefinition.minInputSlot; - for (int i = 0; i < res.length - 1; i++) { - res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); - fromSlot++; + if (resource == null || !canFill(from, resource.getFluid())) { + return 0; + } + int res = inputTank.fill(resource, doFill); + if (res > 0 && doFill) { + tanksDirty = true; + } + return res; } - res[res.length - 1] = new MachineRecipeInput(0, inputTank.getFluid()); - - return res; - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - if(isSideDisabled(from.ordinal())) { - return false; - } - if(fluid == null || (inputTank.getFluid() != null && inputTank.getFluid().getFluid().getID() != fluid.getID())) { - return false; + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (isSideDisabled(from.ordinal())) { + return null; + } + if (outputTank.getFluid() == null || resource == null || !resource.isFluidEqual(outputTank.getFluid())) { + return null; + } + FluidStack res = outputTank.drain(resource.amount, doDrain); + if (res != null && res.amount > 0 && doDrain) { + tanksDirty = true; + } + return res; } - MachineRecipeInput[] inputs = getRecipeInputs(); - if(inputTank.getFluidAmount() <= 0) { - inputs[inputs.length - 1] = new MachineRecipeInput(0, new FluidStack(fluid, 1)); + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (isSideDisabled(from.ordinal())) { + return null; + } + FluidStack res = outputTank.drain(maxDrain, doDrain); + if (res != null && res.amount > 0 && doDrain) { + tanksDirty = true; + } + return res; } - return VatRecipeManager.getInstance().isValidInput(inputs); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(isSideDisabled(from.ordinal())) { - return false; - } - return outputTank.getFluid() != null && outputTank.getFluid().getFluid().getID() == fluid.getID(); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(isSideDisabled(from.ordinal())) { - return new FluidTankInfo[0]; - } - return new FluidTankInfo[] { inputTank.getInfo(), outputTank.getInfo() }; - } - - @Override - public void readCommon(NBTTagCompound nbtRoot) { - super.readCommon(nbtRoot); - - if(nbtRoot.hasKey("inputTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("inputTank"); - if(tankRoot != null) { - inputTank.readFromNBT(tankRoot); - } else { - inputTank.setFluid(null); - } - } else { - inputTank.setFluid(null); + @Override + protected boolean processTasks(boolean redstoneChecksPassed) { + boolean res = super.processTasks(redstoneChecksPassed); + if (tanksDirty && shouldDoWorkThisTick(10)) { + PacketHandler.sendToAllAround(new PacketTanks(this), this); + tanksDirty = false; + } + return res; } - if(nbtRoot.hasKey("outputTank")) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("outputTank"); - if(tankRoot != null) { - outputTank.readFromNBT(tankRoot); - } else { - outputTank.setFluid(null); - } - } else { - outputTank.setFluid(null); + @Override + protected void sendTaskProgressPacket() { + PacketHandler.sendToAllAround(new PacketVatProgress(this), this); + ticksSinceLastProgressUpdate = 0; } - } - - @Override - public void writeCommon(NBTTagCompound nbtRoot) { - super.writeCommon(nbtRoot); - if(inputTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - inputTank.writeToNBT(tankRoot); - nbtRoot.setTag("inputTank", tankRoot); + @Override + protected void mergeFluidResult(ResultStack result) { + outputTank.fill(result.fluid, true); + tanksDirty = true; } - if(outputTank.getFluidAmount() > 0) { - NBTTagCompound tankRoot = new NBTTagCompound(); - outputTank.writeToNBT(tankRoot); - nbtRoot.setTag("outputTank", tankRoot); + + @Override + protected void drainInputFluid(MachineRecipeInput fluid) { + inputTank.drain(fluid.fluid.amount, true); + tanksDirty = true; } - } - @Override - public int getPowerUsePerTick() { - return Config.vatPowerUserPerTickRF; - } + @Override + protected boolean canInsertResultFluid(ResultStack fluid) { + int res = outputTank.fill(fluid.fluid, false); + return res >= fluid.fluid.amount; + } - @Override - public String getSoundName() { - return "machine.vat"; - } + @Override + protected MachineRecipeInput[] getRecipeInputs() { + MachineRecipeInput[] res = new MachineRecipeInput[slotDefinition.getNumInputSlots() + 1]; + int fromSlot = slotDefinition.minInputSlot; + for (int i = 0; i < res.length - 1; i++) { + res[i] = new MachineRecipeInput(fromSlot, inventory[fromSlot]); + fromSlot++; + } - @Override - public float getPitch() { - return 0.3f; - } + res[res.length - 1] = new MachineRecipeInput(0, inputTank.getFluid()); - @Override - public float getVolume() { - return super.getVolume() * 0.3f; - } + return res; + } - void setClientTask(IPoweredTask currentTask) { - this.currentTask = currentTask; - } + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + if (isSideDisabled(from.ordinal())) { + return false; + } + if (fluid == null + || (inputTank.getFluid() != null + && inputTank.getFluid().getFluid().getID() != fluid.getID())) { + return false; + } - @Override - public FluidTank getInputTank(FluidStack forFluidType) { - return inputTank; - } + MachineRecipeInput[] inputs = getRecipeInputs(); + if (inputTank.getFluidAmount() <= 0) { + inputs[inputs.length - 1] = new MachineRecipeInput(0, new FluidStack(fluid, 1)); + } - @Override - public FluidTank[] getOutputTanks() { - return new FluidTank[] { outputTank /* , inputTank */}; - } + return VatRecipeManager.getInstance().isValidInput(inputs); + } - @Override - public void setTanksDirty() { - tanksDirty = true; - } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + if (isSideDisabled(from.ordinal())) { + return false; + } + return outputTank.getFluid() != null && outputTank.getFluid().getFluid().getID() == fluid.getID(); + } + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (isSideDisabled(from.ordinal())) { + return new FluidTankInfo[0]; + } + return new FluidTankInfo[] {inputTank.getInfo(), outputTank.getInfo()}; + } + + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + + if (nbtRoot.hasKey("inputTank")) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("inputTank"); + if (tankRoot != null) { + inputTank.readFromNBT(tankRoot); + } else { + inputTank.setFluid(null); + } + } else { + inputTank.setFluid(null); + } + + if (nbtRoot.hasKey("outputTank")) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag("outputTank"); + if (tankRoot != null) { + outputTank.readFromNBT(tankRoot); + } else { + outputTank.setFluid(null); + } + } else { + outputTank.setFluid(null); + } + } + + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + if (inputTank.getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + inputTank.writeToNBT(tankRoot); + nbtRoot.setTag("inputTank", tankRoot); + } + if (outputTank.getFluidAmount() > 0) { + NBTTagCompound tankRoot = new NBTTagCompound(); + outputTank.writeToNBT(tankRoot); + nbtRoot.setTag("outputTank", tankRoot); + } + } + + @Override + public int getPowerUsePerTick() { + return Config.vatPowerUserPerTickRF; + } + + @Override + public String getSoundName() { + return "machine.vat"; + } + + @Override + public float getPitch() { + return 0.3f; + } + + @Override + public float getVolume() { + return super.getVolume() * 0.3f; + } + + void setClientTask(IPoweredTask currentTask) { + this.currentTask = currentTask; + } + + @Override + public FluidTank getInputTank(FluidStack forFluidType) { + return inputTank; + } + + @Override + public FluidTank[] getOutputTanks() { + return new FluidTank[] {outputTank /* , inputTank */}; + } + + @Override + public void setTanksDirty() { + tanksDirty = true; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java index 5ff7b0cf..a789bccb 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatMachineRecipe.java @@ -1,70 +1,67 @@ package crazypants.enderio.machine.vat; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.AbstractMachineRecipe; import crazypants.enderio.machine.recipe.IRecipe; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class VatMachineRecipe extends AbstractMachineRecipe { - @Override - public String getUid() { - return "StillRecipe"; - } - - @Override - public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { - return VatRecipeManager.instance.getRecipeForInput(inputs); - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null) { - return false; + @Override + public String getUid() { + return "StillRecipe"; } - return VatRecipeManager.instance.isValidInput(input); - } - @Override - public String getMachineName() { - return ModObject.blockVat.unlocalisedName; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - - List result = new ArrayList(); - - VatRecipe rec = (VatRecipe) getRecipeForInputs(inputs); - FluidStack inputFluidStack = rec.getRequiredFluidInput(inputs); - result.add(new MachineRecipeInput(0, inputFluidStack)); - - for (MachineRecipeInput ri : inputs) { - if(!ri.isFluid() && ri.item != null) { - ItemStack st = ri.item.copy(); - st.stackSize = rec.getNumConsumed(ri.item); - result.add(new MachineRecipeInput(ri.slotNumber, st)); - } + @Override + public IRecipe getRecipeForInputs(MachineRecipeInput[] inputs) { + return VatRecipeManager.instance.getRecipeForInput(inputs); } - return result; - } - - @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - if(inputs == null || inputs.length <= 0) { - return new ResultStack[0]; + @Override + public boolean isValidInput(MachineRecipeInput input) { + if (input == null) { + return false; + } + return VatRecipeManager.instance.isValidInput(input); } - VatRecipe recipe = (VatRecipe) getRecipeForInputs(inputs); - if(recipe == null || !recipe.isValid()) { - return new ResultStack[0]; - } - return new ResultStack[] { new ResultStack(recipe.getFluidOutput(inputs)) }; - } + @Override + public String getMachineName() { + return ModObject.blockVat.unlocalisedName; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + + List result = new ArrayList(); + + VatRecipe rec = (VatRecipe) getRecipeForInputs(inputs); + FluidStack inputFluidStack = rec.getRequiredFluidInput(inputs); + result.add(new MachineRecipeInput(0, inputFluidStack)); + + for (MachineRecipeInput ri : inputs) { + if (!ri.isFluid() && ri.item != null) { + ItemStack st = ri.item.copy(); + st.stackSize = rec.getNumConsumed(ri.item); + result.add(new MachineRecipeInput(ri.slotNumber, st)); + } + } + return result; + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + if (inputs == null || inputs.length <= 0) { + return new ResultStack[0]; + } + VatRecipe recipe = (VatRecipe) getRecipeForInputs(inputs); + if (recipe == null || !recipe.isValid()) { + return new ResultStack[0]; + } + return new ResultStack[] {new ResultStack(recipe.getFluidOutput(inputs))}; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java index 7a98e6e9..4784abfc 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java @@ -2,262 +2,265 @@ package crazypants.enderio.machine.vat; import static crazypants.util.EE3Util.registerRecipe; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.lang3.NotImplementedException; - import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; - import crazypants.enderio.Log; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; -import crazypants.util.EE3Util; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.NotImplementedException; public class VatRecipe implements IRecipe { - protected final List inputStacks; - protected final boolean valid; + protected final List inputStacks; + protected final boolean valid; - protected final Table inputFluidStacks = HashBasedTable.create(); - protected final Table outputFluidStacks = HashBasedTable.create(); + protected final Table inputFluidStacks = HashBasedTable.create(); + protected final Table outputFluidStacks = HashBasedTable.create(); - protected final RecipeInput[] inputs; - protected final RecipeOutput[] output; - protected final int energyRequired; - private int requiredItems; + protected final RecipeInput[] inputs; + protected final RecipeOutput[] output; + protected final int energyRequired; + private int requiredItems; - public VatRecipe(IRecipe recipe) { + public VatRecipe(IRecipe recipe) { - FluidStack inputFluidStack = null, outputFluidStack = null; + FluidStack inputFluidStack = null, outputFluidStack = null; - inputs = recipe.getInputs(); + inputs = recipe.getInputs(); - for (RecipeOutput output : recipe.getOutputs()) { - if(output.isFluid()) { - outputFluidStack = output.getFluidOutput().copy(); - break; - } - } - - if (outputFluidStack == null) { - Log.warn("Ignoring invalid VAT recipe without output fluid"); - } else { - - requiredItems = 1; - for (RecipeInput ri : inputs) { - if (!ri.isFluid() && ri.getSlotNumber() == 1) { - requiredItems = 2; - } - } - - if (requiredItems == 2) { - for (RecipeInput r0 : inputs) { - if (!r0.isFluid() && r0.getSlotNumber() == 0) { - for (RecipeInput r1 : inputs) { - if (!r1.isFluid() && r1.getSlotNumber() == 1) { - for (RecipeInput r2 : inputs) { - if (r2.isFluid()) { - float im = r0.getMulitplier() * r1.getMulitplier(); - inputFluidStack = r2.getFluidInput().copy(); - inputFluidStack.amount = Math.round(FluidContainerRegistry.BUCKET_VOLUME * im); - outputFluidStack.amount = Math.round(im * r2.getMulitplier() * FluidContainerRegistry.BUCKET_VOLUME); - inputFluidStacks.put(r0, r1, inputFluidStack.copy()); - outputFluidStacks.put(r0, r1, outputFluidStack.copy()); - registerRecipe(outputFluidStack.copy(), r0.getInput().copy(), r1.getInput().copy(), inputFluidStack.copy()); - } - } - } + for (RecipeOutput output : recipe.getOutputs()) { + if (output.isFluid()) { + outputFluidStack = output.getFluidOutput().copy(); + break; } - } } - } else { - for (RecipeInput r0 : inputs) { - if (!r0.isFluid()) { - for (RecipeInput r2 : inputs) { - if (r2.isFluid()) { - float im = r0.getMulitplier(); - inputFluidStack = r2.getFluidInput().copy(); - inputFluidStack.amount = Math.round(FluidContainerRegistry.BUCKET_VOLUME * im); - outputFluidStack.amount = Math.round(im * r2.getMulitplier() * FluidContainerRegistry.BUCKET_VOLUME); - inputFluidStacks.put(r0, r0, inputFluidStack.copy()); - outputFluidStacks.put(r0, r0, outputFluidStack.copy()); - registerRecipe(outputFluidStack.copy(), r0.getInput().copy(), inputFluidStack.copy()); - } - } - } - } - } - if (inputFluidStack == null) { - Log.warn("Ignoring invalid VAT recipe without input fluid/stacks"); - } - } - - output = new RecipeOutput[] { new RecipeOutput(outputFluidStack) }; - energyRequired = recipe.getEnergyRequired(); - - this.inputStacks = recipe.getInputStacks(); - valid = inputFluidStack != null && inputStacks != null && !inputStacks.isEmpty() && inputStacks.size() > 0 - && outputFluidStack != null; - - } - - @Override - public boolean isValid() { - return valid; - } - - @Override - public int getEnergyRequired() { - return energyRequired; - } - - @Override - public RecipeOutput[] getOutputs() { - return output; - } - - @Override - public RecipeInput[] getInputs() { - return inputs; - } - - @Override - public List getInputStacks() { - return inputStacks; - } - - @Override - public RecipeBonusType getBonusType() { - return RecipeBonusType.NONE; - } - - private RecipeInput getRecipeInput(int slot, ItemStack item) { - if(item == null) { - return null; - } - for (RecipeInput ri : inputs) { - if (ri.getSlotNumber() == slot && ri.isInput(item)) { - return ri; - } - } - return null; - } - - @Override - public boolean isValidInput(int slot, ItemStack item) { - return getRecipeInput(slot, item) != null; - } - - @Override - public boolean isValidInput(FluidStack item) { - if(item == null) { - return false; - } - for (RecipeInput ri : inputs) { - if(item.getFluid() != null && item.isFluidEqual(ri.getFluidInput())) { - return true; - } - } - return false; - } - - private static class RecipeMatch { - RecipeInput r0, r1; - FluidStack in, out; - - void setRecipeInput(RecipeInput r) { - if (r != null) { - if (r.getSlotNumber() == 0) { - r0 = r; + if (outputFluidStack == null) { + Log.warn("Ignoring invalid VAT recipe without output fluid"); } else { - r1 = r; + + requiredItems = 1; + for (RecipeInput ri : inputs) { + if (!ri.isFluid() && ri.getSlotNumber() == 1) { + requiredItems = 2; + } + } + + if (requiredItems == 2) { + for (RecipeInput r0 : inputs) { + if (!r0.isFluid() && r0.getSlotNumber() == 0) { + for (RecipeInput r1 : inputs) { + if (!r1.isFluid() && r1.getSlotNumber() == 1) { + for (RecipeInput r2 : inputs) { + if (r2.isFluid()) { + float im = r0.getMulitplier() * r1.getMulitplier(); + inputFluidStack = r2.getFluidInput().copy(); + inputFluidStack.amount = Math.round(FluidContainerRegistry.BUCKET_VOLUME * im); + outputFluidStack.amount = Math.round( + im * r2.getMulitplier() * FluidContainerRegistry.BUCKET_VOLUME); + inputFluidStacks.put(r0, r1, inputFluidStack.copy()); + outputFluidStacks.put(r0, r1, outputFluidStack.copy()); + registerRecipe( + outputFluidStack.copy(), + r0.getInput().copy(), + r1.getInput().copy(), + inputFluidStack.copy()); + } + } + } + } + } + } + } else { + for (RecipeInput r0 : inputs) { + if (!r0.isFluid()) { + for (RecipeInput r2 : inputs) { + if (r2.isFluid()) { + float im = r0.getMulitplier(); + inputFluidStack = r2.getFluidInput().copy(); + inputFluidStack.amount = Math.round(FluidContainerRegistry.BUCKET_VOLUME * im); + outputFluidStack.amount = + Math.round(im * r2.getMulitplier() * FluidContainerRegistry.BUCKET_VOLUME); + inputFluidStacks.put(r0, r0, inputFluidStack.copy()); + outputFluidStacks.put(r0, r0, outputFluidStack.copy()); + registerRecipe( + outputFluidStack.copy(), r0.getInput().copy(), inputFluidStack.copy()); + } + } + } + } + } + + if (inputFluidStack == null) { + Log.warn("Ignoring invalid VAT recipe without input fluid/stacks"); + } } - } - } - } - private RecipeMatch matchRecipe(MachineRecipeInput... inputs) { - if (!isValid() || inputs == null || inputs.length < requiredItems + 1) { - return null; - } - FluidStack inputFluid = null; - RecipeMatch m = new RecipeMatch(); - for (MachineRecipeInput in : inputs) { - if(in.isFluid()) { - inputFluid = in.fluid; - } else { - m.setRecipeInput(getRecipeInput(in.slotNumber, in.item)); - } - } - if (requiredItems == 1) { - m.r1 = m.r0; - } - m.in = inputFluidStacks.get(m.r0, m.r1); - m.out = outputFluidStacks.get(m.r0, m.r1); - if (inputFluid != null && inputFluid.containsFluid(m.in)) { - return m; - } else { - return null; - } - } + output = new RecipeOutput[] {new RecipeOutput(outputFluidStack)}; + energyRequired = recipe.getEnergyRequired(); - @Override - public boolean isInputForRecipe(MachineRecipeInput... inputs) { - RecipeMatch m = matchRecipe(inputs); - return m != null; - } - - @Override - public List getInputFluidStacks() { - throw new NotImplementedException(""); - } - - public float getMultiplierForInput(FluidStack item) { - for (RecipeInput input : inputs) { - if(input.isInput(item)) { - return input.getMulitplier(); - } + this.inputStacks = recipe.getInputStacks(); + valid = inputFluidStack != null + && inputStacks != null + && !inputStacks.isEmpty() + && inputStacks.size() > 0 + && outputFluidStack != null; } - return 1; - } - public FluidStack getRequiredFluidInput(MachineRecipeInput[] inputs) { - RecipeMatch m = matchRecipe(inputs); - if (m != null) { - return m.in; - } else { - // inputs are no valid recipe. - return new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME * 999); + @Override + public boolean isValid() { + return valid; } - } - public FluidStack getFluidOutput(MachineRecipeInput... inputs) { - RecipeMatch m = matchRecipe(inputs); - if (m != null) { - return m.out; - } else { - // inputs are no valid recipe. - return new FluidStack(FluidRegistry.WATER, 0); + @Override + public int getEnergyRequired() { + return energyRequired; } - } - public int getNumConsumed(ItemStack item) { - for (RecipeInput input : inputs) { - if(input.isInput(item)) { - return input.getInput().stackSize; - } + @Override + public RecipeOutput[] getOutputs() { + return output; } - return 1; - } + @Override + public RecipeInput[] getInputs() { + return inputs; + } + + @Override + public List getInputStacks() { + return inputStacks; + } + + @Override + public RecipeBonusType getBonusType() { + return RecipeBonusType.NONE; + } + + private RecipeInput getRecipeInput(int slot, ItemStack item) { + if (item == null) { + return null; + } + for (RecipeInput ri : inputs) { + if (ri.getSlotNumber() == slot && ri.isInput(item)) { + return ri; + } + } + return null; + } + + @Override + public boolean isValidInput(int slot, ItemStack item) { + return getRecipeInput(slot, item) != null; + } + + @Override + public boolean isValidInput(FluidStack item) { + if (item == null) { + return false; + } + for (RecipeInput ri : inputs) { + if (item.getFluid() != null && item.isFluidEqual(ri.getFluidInput())) { + return true; + } + } + return false; + } + + private static class RecipeMatch { + RecipeInput r0, r1; + FluidStack in, out; + + void setRecipeInput(RecipeInput r) { + if (r != null) { + if (r.getSlotNumber() == 0) { + r0 = r; + } else { + r1 = r; + } + } + } + } + + private RecipeMatch matchRecipe(MachineRecipeInput... inputs) { + if (!isValid() || inputs == null || inputs.length < requiredItems + 1) { + return null; + } + FluidStack inputFluid = null; + RecipeMatch m = new RecipeMatch(); + for (MachineRecipeInput in : inputs) { + if (in.isFluid()) { + inputFluid = in.fluid; + } else { + m.setRecipeInput(getRecipeInput(in.slotNumber, in.item)); + } + } + if (requiredItems == 1) { + m.r1 = m.r0; + } + m.in = inputFluidStacks.get(m.r0, m.r1); + m.out = outputFluidStacks.get(m.r0, m.r1); + if (inputFluid != null && inputFluid.containsFluid(m.in)) { + return m; + } else { + return null; + } + } + + @Override + public boolean isInputForRecipe(MachineRecipeInput... inputs) { + RecipeMatch m = matchRecipe(inputs); + return m != null; + } + + @Override + public List getInputFluidStacks() { + throw new NotImplementedException(""); + } + + public float getMultiplierForInput(FluidStack item) { + for (RecipeInput input : inputs) { + if (input.isInput(item)) { + return input.getMulitplier(); + } + } + return 1; + } + + public FluidStack getRequiredFluidInput(MachineRecipeInput[] inputs) { + RecipeMatch m = matchRecipe(inputs); + if (m != null) { + return m.in; + } else { + // inputs are no valid recipe. + return new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME * 999); + } + } + + public FluidStack getFluidOutput(MachineRecipeInput... inputs) { + RecipeMatch m = matchRecipe(inputs); + if (m != null) { + return m.out; + } else { + // inputs are no valid recipe. + return new FluidStack(FluidRegistry.WATER, 0); + } + } + + public int getNumConsumed(ItemStack item) { + for (RecipeInput input : inputs) { + if (input.isInput(item)) { + return input.getInput().stackSize; + } + } + return 1; + } } diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java index 1b281ed0..9df71513 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipeManager.java @@ -1,11 +1,5 @@ package crazypants.enderio.machine.vat; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.machine.MachineRecipeInput; @@ -16,143 +10,145 @@ import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; public class VatRecipeManager { - - private static final String CORE_FILE_NAME = "VatRecipes_Core.xml"; - private static final String CUSTOM_FILE_NAME = "VatRecipes_User.xml"; - static final VatRecipeManager instance = new VatRecipeManager(); + private static final String CORE_FILE_NAME = "VatRecipes_Core.xml"; + private static final String CUSTOM_FILE_NAME = "VatRecipes_User.xml"; - public static VatRecipeManager getInstance() { - return instance; - } + static final VatRecipeManager instance = new VatRecipeManager(); - private final List recipes = new ArrayList(); - - public VatRecipeManager() { - } - - public void loadRecipesFromConfig() { - RecipeConfig config = RecipeConfig.loadRecipeConfig(CORE_FILE_NAME, CUSTOM_FILE_NAME, null); - if(config != null) { - processConfig(config); - } else { - Log.error("Could not load recipes for Vat."); + public static VatRecipeManager getInstance() { + return instance; } - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockVat.unlocalisedName, new VatMachineRecipe()); + private final List recipes = new ArrayList(); - } + public VatRecipeManager() {} - public void addCustomRecipes(String xmlDef) { - RecipeConfig config; - try { - config = RecipeConfigParser.parse(xmlDef, null); - } catch (Exception e) { - Log.error("Error parsing custom xml"); - return; - } - - if(config == null) { - Log.error("Could process custom XML"); - return; - } - processConfig(config); - } - - public IRecipe getRecipeForInput(MachineRecipeInput[] inputs) { - if(inputs == null || inputs.length == 0) { - return null; - } - for (IRecipe recipe : recipes) { - if(recipe.isInputForRecipe(inputs)) { - return recipe; - } - } - return null; - } - - private void processConfig(RecipeConfig config) { - - List newRecipes = config.getRecipes(false); - Log.info("Found " + newRecipes.size() + " valid Vat recipes in config."); - for (Recipe rec : newRecipes) { - addRecipe(rec); - } - Log.info("Finished processing Vat recipes. " + recipes.size() + " recipes avaliable."); - } - - public void addRecipe(IRecipe recipe) { - if(recipe == null || !recipe.isValid()) { - Log.debug("Could not add invalid Vat recipe: " + recipe); - return; - } - recipes.add(new VatRecipe(recipe)); - } - - public List getRecipes() { - return recipes; - } - - public boolean isValidInput(MachineRecipeInput input) { - for (IRecipe recipe : recipes) { - if(input.item != null && recipe.isValidInput(input.slotNumber, input.item)) { - return true; - } else if(input.fluid != null && recipe.isValidInput(input.fluid)) { - return true; - } - } - return false; - } - - public boolean isValidInput(MachineRecipeInput[] inputs) { - for (IRecipe recipe : recipes) { - boolean allValid = true; - for(MachineRecipeInput input : inputs) { - if(input.item != null) { - allValid = recipe.isValidInput(input.slotNumber, input.item); - } else if(input.fluid != null) { - allValid = recipe.isValidInput(input.fluid); + public void loadRecipesFromConfig() { + RecipeConfig config = RecipeConfig.loadRecipeConfig(CORE_FILE_NAME, CUSTOM_FILE_NAME, null); + if (config != null) { + processConfig(config); + } else { + Log.error("Could not load recipes for Vat."); } - if(!allValid) { - break; - } - } - if(allValid) { - return true; - } + + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockVat.unlocalisedName, new VatMachineRecipe()); } - return false; - } - - public float getMultiplierForInput(Fluid inputFluid, ItemStack input, Fluid output) { - if (input != null || output != null) { - for (IRecipe recipe : recipes) { - RecipeOutput out = recipe.getOutputs()[0]; - RecipeInput in = recipe.getInputs()[recipe.getInputs().length - 1]; - if ((inputFluid == null || in.getFluidInput().getFluid().getID() == inputFluid.getID()) && (output == null || out.getFluidOutput().getFluid().getID() == output.getID())) { - for (RecipeInput ri : recipe.getInputs()) { - if (ri.isInput(input)) { - return ri.getMulitplier(); + + public void addCustomRecipes(String xmlDef) { + RecipeConfig config; + try { + config = RecipeConfigParser.parse(xmlDef, null); + } catch (Exception e) { + Log.error("Error parsing custom xml"); + return; + } + + if (config == null) { + Log.error("Could process custom XML"); + return; + } + processConfig(config); + } + + public IRecipe getRecipeForInput(MachineRecipeInput[] inputs) { + if (inputs == null || inputs.length == 0) { + return null; + } + for (IRecipe recipe : recipes) { + if (recipe.isInputForRecipe(inputs)) { + return recipe; } - } } - } + return null; } - // no fluid or not an input for this fluid: best guess - // (after all, the item IS in the input slot) - float found = -1f; - for (IRecipe recipe : recipes) { - for (RecipeInput ri : recipe.getInputs()) { - if (ri.isInput(input)) { - if (found < 0f || found > ri.getMulitplier()) { - found = ri.getMulitplier(); - } - } - } - } - return found > 0 ? found : 0; - } + private void processConfig(RecipeConfig config) { + + List newRecipes = config.getRecipes(false); + Log.info("Found " + newRecipes.size() + " valid Vat recipes in config."); + for (Recipe rec : newRecipes) { + addRecipe(rec); + } + Log.info("Finished processing Vat recipes. " + recipes.size() + " recipes avaliable."); + } + + public void addRecipe(IRecipe recipe) { + if (recipe == null || !recipe.isValid()) { + Log.debug("Could not add invalid Vat recipe: " + recipe); + return; + } + recipes.add(new VatRecipe(recipe)); + } + + public List getRecipes() { + return recipes; + } + + public boolean isValidInput(MachineRecipeInput input) { + for (IRecipe recipe : recipes) { + if (input.item != null && recipe.isValidInput(input.slotNumber, input.item)) { + return true; + } else if (input.fluid != null && recipe.isValidInput(input.fluid)) { + return true; + } + } + return false; + } + + public boolean isValidInput(MachineRecipeInput[] inputs) { + for (IRecipe recipe : recipes) { + boolean allValid = true; + for (MachineRecipeInput input : inputs) { + if (input.item != null) { + allValid = recipe.isValidInput(input.slotNumber, input.item); + } else if (input.fluid != null) { + allValid = recipe.isValidInput(input.fluid); + } + if (!allValid) { + break; + } + } + if (allValid) { + return true; + } + } + return false; + } + + public float getMultiplierForInput(Fluid inputFluid, ItemStack input, Fluid output) { + if (input != null || output != null) { + for (IRecipe recipe : recipes) { + RecipeOutput out = recipe.getOutputs()[0]; + RecipeInput in = recipe.getInputs()[recipe.getInputs().length - 1]; + if ((inputFluid == null || in.getFluidInput().getFluid().getID() == inputFluid.getID()) + && (output == null || out.getFluidOutput().getFluid().getID() == output.getID())) { + for (RecipeInput ri : recipe.getInputs()) { + if (ri.isInput(input)) { + return ri.getMulitplier(); + } + } + } + } + } + // no fluid or not an input for this fluid: best guess + // (after all, the item IS in the input slot) + float found = -1f; + for (IRecipe recipe : recipes) { + for (RecipeInput ri : recipe.getInputs()) { + if (ri.isInput(input)) { + if (found < 0f || found > ri.getMulitplier()) { + found = ri.getMulitplier(); + } + } + } + } + return found > 0 ? found : 0; + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 63a85d34..6a7d62c6 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -1,5 +1,12 @@ package crazypants.enderio.machine.wireless; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.TileEntityEnder; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.network.PacketHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -9,126 +16,117 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.TileEntityEnder; +public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */ { -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.network.PacketHandler; + public static BlockWirelessCharger create() { -public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */{ + PacketHandler.INSTANCE.registerMessage( + PacketStoredEnergy.class, PacketStoredEnergy.class, PacketHandler.nextID(), Side.CLIENT); - public static BlockWirelessCharger create() { + BlockWirelessCharger res = new BlockWirelessCharger(); + res.init(); + return res; + } - PacketHandler.INSTANCE.registerMessage(PacketStoredEnergy.class, PacketStoredEnergy.class, PacketHandler.nextID(), Side.CLIENT); + public static int renderId = 0; - BlockWirelessCharger res = new BlockWirelessCharger(); - res.init(); - return res; - } + private IIcon centerOn; + private IIcon centerOff; - public static int renderId = 0; + protected BlockWirelessCharger() { + super(ModObject.blockWirelessCharger.unlocalisedName, TileWirelessCharger.class); + setLightOpacity(1); + } - private IIcon centerOn; - private IIcon centerOff; + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + centerOn = iIconRegister.registerIcon("enderio:blockWirelessChargerOn"); + centerOff = iIconRegister.registerIcon("enderio:blockWirelessChargerOff"); + } - protected BlockWirelessCharger() { - super(ModObject.blockWirelessCharger.unlocalisedName, TileWirelessCharger.class); - setLightOpacity(1); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int p_149673_5_) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileWirelessCharger) { + TileWirelessCharger twc = (TileWirelessCharger) te; + if (twc.isActive()) { + return centerOn; + } + } + return centerOff; + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - centerOn = iIconRegister.registerIcon("enderio:blockWirelessChargerOn"); - centerOff = iIconRegister.registerIcon("enderio:blockWirelessChargerOff"); - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + return centerOff; + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int p_149673_5_) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileWirelessCharger) { - TileWirelessCharger twc = (TileWirelessCharger) te; - if(twc.isActive()) { + public IIcon getCenterOn() { return centerOn; - } } - return centerOff; - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return centerOff; - } - - public IIcon getCenterOn() { - return centerOn; - } - - public IIcon getCenterOff() { - return centerOff; - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - // @Override - // public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileWire) { - // return new ContainerVacuumChest(player, player.inventory, (TileVacuumChest) te); - // } - // return null; - // } - // - // @Override - // public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileVacuumChest) { - // return new GuiVacuumChest(player, player.inventory, (TileVacuumChest) te); - // } - // return null; - // } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, player, stack); - - if(stack.stackTagCompound != null) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileWirelessCharger) { - ((TileWirelessCharger) te).readCustomNBT(stack.stackTagCompound); - } + public IIcon getCenterOff() { + return centerOff; } - } - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - drop.stackTagCompound = new NBTTagCompound(); - if(te instanceof TileWirelessCharger) { - ((TileWirelessCharger) te).writeCustomNBT(drop.stackTagCompound); + @Override + public int getRenderType() { + return renderId; } - } + @Override + public boolean isOpaqueCube() { + return false; + } + + // @Override + // public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileWire) { + // return new ContainerVacuumChest(player, player.inventory, (TileVacuumChest) te); + // } + // return null; + // } + // + // @Override + // public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileVacuumChest) { + // return new GuiVacuumChest(player, player.inventory, (TileVacuumChest) te); + // } + // return null; + // } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + + if (stack.stackTagCompound != null) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).readCustomNBT(stack.stackTagCompound); + } + } + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if (te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).writeCustomNBT(drop.stackTagCompound); + } + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index 375a11fe..836cced5 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -1,25 +1,24 @@ package crazypants.enderio.machine.wireless; +import com.enderio.core.common.util.BlockCoord; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.enderio.core.common.util.BlockCoord; - public interface IWirelessCharger { - World getWorld(); + World getWorld(); - BlockCoord getLocation(); + BlockCoord getLocation(); - boolean chargeItems(ItemStack[] items); + boolean chargeItems(ItemStack[] items); - int takeEnergy(int max); + int takeEnergy(int max); - /** - * Can prevent {@link #chargeItems(ItemStack[])} from being called. - * - * @return If this charger is "active". If the charger is not active it will - * not be attempted to be used. - */ - boolean isActive(); + /** + * Can prevent {@link #chargeItems(ItemStack[])} from being called. + * + * @return If this charger is "active". If the charger is not active it will + * not be attempted to be used. + */ + boolean isActive(); } diff --git a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java index 167c18ec..fdf6f812 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java +++ b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java @@ -1,62 +1,59 @@ package crazypants.enderio.machine.wireless; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketStoredEnergy implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private int storedEnergy; + private int x; + private int y; + private int z; + private int storedEnergy; - public PacketStoredEnergy() { - } - - public PacketStoredEnergy(TileWirelessCharger ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - storedEnergy = ent.storedEnergyRF; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(storedEnergy); - - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - storedEnergy = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketStoredEnergy message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileWirelessCharger) { - TileWirelessCharger me = (TileWirelessCharger) te; - boolean doRender = (me.storedEnergyRF <= 0 && message.storedEnergy > 0) || - (me.storedEnergyRF > 0 && message.storedEnergy <= 0); - me.storedEnergyRF = message.storedEnergy; - if(doRender) { - player.worldObj.markBlockRangeForRenderUpdate(message.x, message.y, message.z, message.x, message.y, message.z); - } + public PacketStoredEnergy() {} + public PacketStoredEnergy(TileWirelessCharger ent) { + x = ent.xCoord; + y = ent.yCoord; + z = ent.zCoord; + storedEnergy = ent.storedEnergyRF; } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(storedEnergy); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + storedEnergy = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketStoredEnergy message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof TileWirelessCharger) { + TileWirelessCharger me = (TileWirelessCharger) te; + boolean doRender = (me.storedEnergyRF <= 0 && message.storedEnergy > 0) + || (me.storedEnergyRF > 0 && message.storedEnergy <= 0); + me.storedEnergyRF = message.storedEnergy; + if (doRender) { + player.worldObj.markBlockRangeForRenderUpdate( + message.x, message.y, message.z, message.x, message.y, message.z); + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 518357a3..43972881 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -1,163 +1,160 @@ package crazypants.enderio.machine.wireless; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.TileEntityEio; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class TileWirelessCharger extends TileEntityEio implements IInternalPowerReceiver, IWirelessCharger { - public static final int MAX_ENERGY_STORED = 200000; - public static final int MAX_ENERGY_IN = 10000; - public static final int MAX_ENERGY_OUT = 10000; - - int storedEnergyRF; - - private double lastPowerUpdate = -1; - - private boolean registered = false; - - public TileWirelessCharger() { - } - - @Override - public void invalidate() { - super.invalidate(); - WirelessChargerController.instance.deregisterCharger(this); - registered = false; - } + public static final int MAX_ENERGY_STORED = 200000; + public static final int MAX_ENERGY_IN = 10000; + public static final int MAX_ENERGY_OUT = 10000; - @Override - public void doUpdate() { - - if (worldObj.isRemote) { - return; - } - - if(!registered) { - WirelessChargerController.instance.registerCharger(this); - registered = true; - } - - if( (lastPowerUpdate == -1) || - (lastPowerUpdate == 0 && storedEnergyRF > 0) || - (lastPowerUpdate > 0 && storedEnergyRF == 0) || - (lastPowerUpdate != storedEnergyRF && shouldDoWorkThisTick(20)) - ) { - lastPowerUpdate = storedEnergyRF; - PacketHandler.sendToAllAround(new PacketStoredEnergy(this), this); + int storedEnergyRF; + + private double lastPowerUpdate = -1; + + private boolean registered = false; + + public TileWirelessCharger() {} + + @Override + public void invalidate() { + super.invalidate(); + WirelessChargerController.instance.deregisterCharger(this); + registered = false; } - } - - @Override - public boolean chargeItems(ItemStack[] items) { - boolean chargedItem = false; - int available = Math.min(MAX_ENERGY_OUT, storedEnergyRF); - for (int i=0,end=items.length ; i0 ; i++) { - ItemStack item = items[i]; - if(item != null) { - if(item.getItem() instanceof IEnergyContainerItem && item.stackSize == 1) { - IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + @Override + public void doUpdate() { - int max = chargable.getMaxEnergyStored(item); - int cur = chargable.getEnergyStored(item); - int canUse = Math.min(available, max - cur); - if(cur < max) { - int used = chargable.receiveEnergy(item, canUse, false); - if(used > 0) { - storedEnergyRF = storedEnergyRF - used; - chargedItem = true; - available -= used; - } - } + if (worldObj.isRemote) { + return; + } + + if (!registered) { + WirelessChargerController.instance.registerCharger(this); + registered = true; + } + + if ((lastPowerUpdate == -1) + || (lastPowerUpdate == 0 && storedEnergyRF > 0) + || (lastPowerUpdate > 0 && storedEnergyRF == 0) + || (lastPowerUpdate != storedEnergyRF && shouldDoWorkThisTick(20))) { + lastPowerUpdate = storedEnergyRF; + PacketHandler.sendToAllAround(new PacketStoredEnergy(this), this); } - } } - return chargedItem; - } - @Override - protected void writeCustomNBT(NBTTagCompound root) { - root.setInteger("storedEnergyRF", storedEnergyRF); - } + @Override + public boolean chargeItems(ItemStack[] items) { + boolean chargedItem = false; + int available = Math.min(MAX_ENERGY_OUT, storedEnergyRF); + for (int i = 0, end = items.length; i < end && available > 0; i++) { + ItemStack item = items[i]; + if (item != null) { + if (item.getItem() instanceof IEnergyContainerItem && item.stackSize == 1) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - @Override - protected void readCustomNBT(NBTTagCompound root) { - if(root.hasKey("storedEnergy")) { - double storedMJ = root.getDouble("storedEnergy"); - storedEnergyRF = (int)(storedMJ * 10); - } else { - storedEnergyRF = root.getInteger("storedEnergyRF"); + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int canUse = Math.min(available, max - cur); + if (cur < max) { + int used = chargable.receiveEnergy(item, canUse, false); + if (used > 0) { + storedEnergyRF = storedEnergyRF - used; + chargedItem = true; + available -= used; + } + } + } + } + } + return chargedItem; } - } - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return MAX_ENERGY_IN; - } - - @Override - public int getEnergyStored() { - return storedEnergyRF; - } - - @Override - public int getMaxEnergyStored() { - return MAX_ENERGY_STORED; - } - - @Override - public void setEnergyStored(int stored) { - storedEnergyRF = stored; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - - @Override - public int takeEnergy(int max) { - if (isActive()) { - int prev = storedEnergyRF; - storedEnergyRF = Math.max(0, storedEnergyRF - max); - return prev - storedEnergyRF; + @Override + protected void writeCustomNBT(NBTTagCompound root) { + root.setInteger("storedEnergyRF", storedEnergyRF); } - return 0; - } - @Override - public int getEnergyStored(ForgeDirection from) { - return storedEnergyRF; - } + @Override + protected void readCustomNBT(NBTTagCompound root) { + if (root.hasKey("storedEnergy")) { + double storedMJ = root.getDouble("storedEnergy"); + storedEnergyRF = (int) (storedMJ * 10); + } else { + storedEnergyRF = root.getInteger("storedEnergyRF"); + } + } - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return MAX_ENERGY_STORED; - } + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return MAX_ENERGY_IN; + } - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return true; - } + @Override + public int getEnergyStored() { + return storedEnergyRF; + } - @Override - public World getWorld() { - return getWorldObj(); - } + @Override + public int getMaxEnergyStored() { + return MAX_ENERGY_STORED; + } - @Override - public boolean displayPower() { - return true; - } + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = stored; + } - public boolean isActive() { - return getEnergyStored() > 0 && !isPoweredRedstone(); - } + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } + + @Override + public int takeEnergy(int max) { + if (isActive()) { + int prev = storedEnergyRF; + storedEnergyRF = Math.max(0, storedEnergyRF - max); + return prev - storedEnergyRF; + } + return 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return storedEnergyRF; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return MAX_ENERGY_STORED; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } + + @Override + public World getWorld() { + return getWorldObj(); + } + + @Override + public boolean displayPower() { + return true; + } + + public boolean isActive() { + return getEnergyStored() > 0 && !isPoweredRedstone(); + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java index 7b40a87a..fc97fb4e 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java @@ -1,76 +1,74 @@ package crazypants.enderio.machine.wireless; +import com.enderio.core.common.util.BlockCoord; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import com.enderio.core.common.util.BlockCoord; - public class WirelessChargedLocation { - private final TileEntity te; - private int lastChangeCount; - private final List chargers; + private final TileEntity te; + private int lastChangeCount; + private final List chargers; - public WirelessChargedLocation(TileEntity te) { - this.te = te; - this.chargers = new ArrayList(); - /* Set lastChangeCount to one less than the current change count so that - the charger list is updated on first use (unless ~4B changes happen in between). - Do this instead directly updating so that WirelessChargedLocation can be used - while the TileEntity is still in construction (or loading). */ - this.lastChangeCount = WirelessChargerController.instance.getChangeCount() - 1; - } - - private void updateChargers() { - WirelessChargerController wcc = WirelessChargerController.instance; - chargers.clear(); - lastChangeCount = wcc.getChangeCount(); - final BlockCoord bc = new BlockCoord(te); - wcc.getChargers(te.getWorldObj(), bc, chargers); - Collections.sort(chargers, new Comparator() { - @Override - public int compare(IWirelessCharger o1, IWirelessCharger o2) { - int dist1 = o1.getLocation().getDistSq(bc); - int dist2 = o2.getLocation().getDistSq(bc); - return dist1 - dist2; - } - }); - } - - private void checkChangeCount() { - if(lastChangeCount != WirelessChargerController.instance.getChangeCount()) { - updateChargers(); + public WirelessChargedLocation(TileEntity te) { + this.te = te; + this.chargers = new ArrayList(); + /* Set lastChangeCount to one less than the current change count so that + the charger list is updated on first use (unless ~4B changes happen in between). + Do this instead directly updating so that WirelessChargedLocation can be used + while the TileEntity is still in construction (or loading). */ + this.lastChangeCount = WirelessChargerController.instance.getChangeCount() - 1; } - } - public boolean chargeItems(ItemStack[] items) { - checkChangeCount(); - for(IWirelessCharger wc : chargers) { - if(wc.isActive()) { - if(wc.chargeItems(items)) { - return true; + private void updateChargers() { + WirelessChargerController wcc = WirelessChargerController.instance; + chargers.clear(); + lastChangeCount = wcc.getChangeCount(); + final BlockCoord bc = new BlockCoord(te); + wcc.getChargers(te.getWorldObj(), bc, chargers); + Collections.sort(chargers, new Comparator() { + @Override + public int compare(IWirelessCharger o1, IWirelessCharger o2) { + int dist1 = o1.getLocation().getDistSq(bc); + int dist2 = o2.getLocation().getDistSq(bc); + return dist1 - dist2; + } + }); + } + + private void checkChangeCount() { + if (lastChangeCount != WirelessChargerController.instance.getChangeCount()) { + updateChargers(); } - } } - return false; - } - public int takeEnergy(int max) { - checkChangeCount(); - int charged = 0; - for(IWirelessCharger wc : chargers) { - if(wc.isActive()) { - charged += wc.takeEnergy(max - charged); - if(charged >= max) { - break; + public boolean chargeItems(ItemStack[] items) { + checkChangeCount(); + for (IWirelessCharger wc : chargers) { + if (wc.isActive()) { + if (wc.chargeItems(items)) { + return true; + } + } } - } + return false; + } + + public int takeEnergy(int max) { + checkChangeCount(); + int charged = 0; + for (IWirelessCharger wc : chargers) { + if (wc.isActive()) { + charged += wc.takeEnergy(max - charged); + if (charged >= max) { + break; + } + } + } + return charged; } - return charged; - } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 21c36053..0afbd53b 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -1,128 +1,125 @@ package crazypants.enderio.machine.wireless; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.config.Config; import crazypants.util.BaublesUtil; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; public class WirelessChargerController { - public static WirelessChargerController instance = new WirelessChargerController(); + public static WirelessChargerController instance = new WirelessChargerController(); - public static final int RANGE = Config.wirelessChargerRange; - public static final int RANGE_SQ = RANGE * RANGE; + public static final int RANGE = Config.wirelessChargerRange; + public static final int RANGE_SQ = RANGE * RANGE; - static { - FMLCommonHandler.instance().bus().register(WirelessChargerController.instance); - MinecraftForge.EVENT_BUS.register(WirelessChargerController.instance); - } - - private final Map> perWorldChargers = new HashMap>(); - private int changeCount; - - private WirelessChargerController() { - } - - public void registerCharger(IWirelessCharger charger) { - if(charger == null) { - return; + static { + FMLCommonHandler.instance().bus().register(WirelessChargerController.instance); + MinecraftForge.EVENT_BUS.register(WirelessChargerController.instance); } - Map chargers = getChargersForWorld(charger.getWorld()); - chargers.put(charger.getLocation(), charger); - changeCount++; - } - public void deregisterCharger(IWirelessCharger capBank) { - if(capBank == null) { - return; - } - Map chargers = getChargersForWorld(capBank.getWorld()); - chargers.remove(capBank.getLocation()); - changeCount++; - } + private final Map> perWorldChargers = + new HashMap>(); + private int changeCount; - @SubscribeEvent - public void onPlayerTick(TickEvent.PlayerTickEvent event) { - if(event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) { - return; - } - chargePlayersItems(event.player); - } + private WirelessChargerController() {} - public int getChangeCount() { - return changeCount; - } - - public void getChargers(World world, BlockCoord bc, Collection res) { - Map chargers = getChargersForWorld(world); - for (IWirelessCharger wc : chargers.values()) { - if(wc.getLocation().getDistSq(bc) <= RANGE_SQ) { - res.add(wc); - } - } - } - - public void chargePlayersItems(EntityPlayer player) { - Map chargers = getChargersForWorld(player.worldObj); - if(chargers.isEmpty()) { - return; - } - BlockCoord bc = new BlockCoord(player); - for (IWirelessCharger capBank : chargers.values()) { - if(capBank.isActive() && capBank.getLocation().getDistSq(bc) <= RANGE_SQ) { - boolean done = chargeFromCapBank(player, capBank); - if(done) { - return; + public void registerCharger(IWirelessCharger charger) { + if (charger == null) { + return; } - } + Map chargers = getChargersForWorld(charger.getWorld()); + chargers.put(charger.getLocation(), charger); + changeCount++; } - } - private boolean chargeFromCapBank(EntityPlayer player, IWirelessCharger capBank) { - boolean res = capBank.chargeItems(player.inventory.armorInventory); - res |= capBank.chargeItems(player.inventory.mainInventory); - IInventory baubles = BaublesUtil.instance().getBaubles(player); - if (baubles != null) { - ItemStack[] item = new ItemStack[1]; - for (int i = 0; i < baubles.getSizeInventory(); i++) { - item[0] = baubles.getStackInSlot(i); - if(capBank.chargeItems(item)) { - baubles.setInventorySlotContents(i, item[0]); - res = true; + public void deregisterCharger(IWirelessCharger capBank) { + if (capBank == null) { + return; } - } + Map chargers = getChargersForWorld(capBank.getWorld()); + chargers.remove(capBank.getLocation()); + changeCount++; } - return res; - } - private Map getChargersForWorld(World world) { - Map res = perWorldChargers.get(world.provider.dimensionId); - if(res == null) { - res = new HashMap(); - perWorldChargers.put(world.provider.dimensionId, res); + @SubscribeEvent + public void onPlayerTick(TickEvent.PlayerTickEvent event) { + if (event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) { + return; + } + chargePlayersItems(event.player); } - return res; - } - public Collection getChargers(World world) { - return getChargerMap(world).values(); - } + public int getChangeCount() { + return changeCount; + } - public Map getChargerMap(World world) { - return perWorldChargers.get(world.provider.dimensionId); - } + public void getChargers(World world, BlockCoord bc, Collection res) { + Map chargers = getChargersForWorld(world); + for (IWirelessCharger wc : chargers.values()) { + if (wc.getLocation().getDistSq(bc) <= RANGE_SQ) { + res.add(wc); + } + } + } + + public void chargePlayersItems(EntityPlayer player) { + Map chargers = getChargersForWorld(player.worldObj); + if (chargers.isEmpty()) { + return; + } + BlockCoord bc = new BlockCoord(player); + for (IWirelessCharger capBank : chargers.values()) { + if (capBank.isActive() && capBank.getLocation().getDistSq(bc) <= RANGE_SQ) { + boolean done = chargeFromCapBank(player, capBank); + if (done) { + return; + } + } + } + } + + private boolean chargeFromCapBank(EntityPlayer player, IWirelessCharger capBank) { + boolean res = capBank.chargeItems(player.inventory.armorInventory); + res |= capBank.chargeItems(player.inventory.mainInventory); + IInventory baubles = BaublesUtil.instance().getBaubles(player); + if (baubles != null) { + ItemStack[] item = new ItemStack[1]; + for (int i = 0; i < baubles.getSizeInventory(); i++) { + item[0] = baubles.getStackInSlot(i); + if (capBank.chargeItems(item)) { + baubles.setInventorySlotContents(i, item[0]); + res = true; + } + } + } + return res; + } + + private Map getChargersForWorld(World world) { + Map res = perWorldChargers.get(world.provider.dimensionId); + if (res == null) { + res = new HashMap(); + perWorldChargers.put(world.provider.dimensionId, res); + } + return res; + } + + public Collection getChargers(World world) { + return getChargerMap(world).values(); + } + + public Map getChargerMap(World world) { + return perWorldChargers.get(world.provider.dimensionId); + } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java index 4eefd864..c71d5b1d 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerRenderer.java @@ -1,11 +1,5 @@ package crazypants.enderio.machine.wireless; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; @@ -13,81 +7,86 @@ import com.enderio.core.client.render.VertexRotation; import com.enderio.core.client.render.VertexTransformComposite; import com.enderio.core.client.render.VertexTranslation; import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import crazypants.enderio.EnderIO; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; public class WirelessChargerRenderer implements ISimpleBlockRenderingHandler { - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { -// GL11.glPushMatrix(); -// GL11.glTranslatef(0, 0, 0.5f); -// GL11.glRotatef(45, 0, 1, 0); -// GL11.glTranslatef(0, 0, -0.5f); - //GL11.glTranslatef(0.5f, 0, 0); - - Tessellator.instance.startDrawingQuads(); - renderWorldBlock(null, 0, 0, 0, null, 0, renderer); - Tessellator.instance.draw(); -// GL11.glPopMatrix(); - } + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + // GL11.glPushMatrix(); + // GL11.glTranslatef(0, 0, 0.5f); + // GL11.glRotatef(45, 0, 1, 0); + // GL11.glTranslatef(0, 0, -0.5f); + // GL11.glTranslatef(0.5f, 0, 0); - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - Tessellator tes = Tessellator.instance; - - IIcon baseIcon = EnderIO.blockWirelessCharger.getIcon(0, 0); - - tes.addTranslation(x, y, z); - - VertexTransform rot = new VertexRotation(Math.toRadians(45), new Vector3d(0,1,0), new Vector3d(0.5,0.5,0.5)); - VertexTransform trans = new VertexTranslation(0, -0.5 + 0.025, 0); - - VertexTransformComposite xform = new VertexTransformComposite(rot, trans); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true); - - trans = new VertexTranslation(0, 0.5 - 0.025, 0); - xform = new VertexTransformComposite(rot, trans); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true); - - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.2, 0.91, 0.2), EnderIO.blockWirelessCharger.getCenterOn(), true); - - trans = new VertexTranslation(0, 0, 0.5 - 0.01); - xform = new VertexTransformComposite(trans); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); - - rot = new VertexRotation(Math.toRadians(90), new Vector3d(0,1,0), new Vector3d(0.5,0.5,0.5)); - xform = new VertexTransformComposite(trans, rot); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); - - rot = new VertexRotation(Math.toRadians(180), new Vector3d(0,1,0), new Vector3d(0.5,0.5,0.5)); - xform = new VertexTransformComposite(trans, rot); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); - - rot = new VertexRotation(Math.toRadians(270), new Vector3d(0,1,0), new Vector3d(0.5,0.5,0.5)); - xform = new VertexTransformComposite(trans, rot); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); - - - tes.addTranslation(-x, -y, -z); - - return false; - } + Tessellator.instance.startDrawingQuads(); + renderWorldBlock(null, 0, 0, 0, null, 0, renderer); + Tessellator.instance.draw(); + // GL11.glPopMatrix(); + } - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - @Override - public int getRenderId() { - return BlockWirelessCharger.renderId; - } + Tessellator tes = Tessellator.instance; + IIcon baseIcon = EnderIO.blockWirelessCharger.getIcon(0, 0); + + tes.addTranslation(x, y, z); + + VertexTransform rot = + new VertexRotation(Math.toRadians(45), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); + VertexTransform trans = new VertexTranslation(0, -0.5 + 0.025, 0); + + VertexTransformComposite xform = new VertexTransformComposite(rot, trans); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true); + + trans = new VertexTranslation(0, 0.5 - 0.025, 0); + xform = new VertexTransformComposite(rot, trans); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.7, 0.05, 0.7), baseIcon, xform, true); + + CubeRenderer.render( + BoundingBox.UNIT_CUBE.scale(0.2, 0.91, 0.2), EnderIO.blockWirelessCharger.getCenterOn(), true); + + trans = new VertexTranslation(0, 0, 0.5 - 0.01); + xform = new VertexTransformComposite(trans); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); + + rot = new VertexRotation(Math.toRadians(90), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); + xform = new VertexTransformComposite(trans, rot); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); + + rot = new VertexRotation(Math.toRadians(180), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); + xform = new VertexTransformComposite(trans, rot); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); + + rot = new VertexRotation(Math.toRadians(270), new Vector3d(0, 1, 0), new Vector3d(0.5, 0.5, 0.5)); + xform = new VertexTransformComposite(trans, rot); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.25, 0.25, 0.01), baseIcon, xform, true); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(0.01, 1, 0.01), baseIcon, xform, true); + + tes.addTranslation(-x, -y, -z); + + return false; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockWirelessCharger.renderId; + } } diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index df5c5064..11ba5be0 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -1,87 +1,81 @@ package crazypants.enderio.material; +import crazypants.enderio.EnderIO; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; - import org.apache.commons.lang3.StringUtils; -import crazypants.enderio.EnderIO; - public enum Alloy { + ELECTRICAL_STEEL("electricalSteel", 6.0f), + ENERGETIC_ALLOY("energeticAlloy", 7.0f), + PHASED_GOLD("phasedGold", 4.0f, "vibrantAlloy"), + REDSTONE_ALLOY("redstoneAlloy", 1.0f), + CONDUCTIVE_IRON("conductiveIron", 5.2f), + PHASED_IRON("phasedIron", 7.0f, "pulsatingIron"), + DARK_STEEL("darkSteel", 10.0f), + SOULARIUM("soularium", 10.0f), + END_STEEL("endSteel", 10.0f); - ELECTRICAL_STEEL("electricalSteel", 6.0f), - ENERGETIC_ALLOY("energeticAlloy", 7.0f), - PHASED_GOLD("phasedGold", 4.0f, "vibrantAlloy"), - REDSTONE_ALLOY("redstoneAlloy", 1.0f), - CONDUCTIVE_IRON("conductiveIron", 5.2f), - PHASED_IRON("phasedIron", 7.0f, "pulsatingIron"), - DARK_STEEL("darkSteel", 10.0f), - SOULARIUM("soularium", 10.0f), - END_STEEL("endSteel", 10.0f); + public final String unlocalisedName; + public final String iconKey; + private final List oreIngots = new ArrayList(); + private final List oreBlocks = new ArrayList(); + private final float hardness; - - public final String unlocalisedName; - public final String iconKey; - private final List oreIngots = new ArrayList(); - private final List oreBlocks = new ArrayList(); - private final float hardness; - - private Alloy(String baseName, float hardness, String oreDictName) { - this.unlocalisedName = "enderio." + baseName; - this.iconKey = "enderio:" + baseName; - if(oreDictName != null) { - this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); - this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + private Alloy(String baseName, float hardness, String oreDictName) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + if (oreDictName != null) { + this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); + this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + } + this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); + this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); + this.hardness = hardness; } - this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); - this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); - this.hardness = hardness; - } - private Alloy(String baseName, float hardness) { - this(baseName, hardness, null); - } + private Alloy(String baseName, float hardness) { + this(baseName, hardness, null); + } - public float getHardness() { - return hardness; - } + public float getHardness() { + return hardness; + } - public ItemStack getStackIngot() { - return getStackIngot(1); - } + public ItemStack getStackIngot() { + return getStackIngot(1); + } - public ItemStack getStackIngot(int size) { - return new ItemStack(EnderIO.itemAlloy, size, ordinal()); - } + public ItemStack getStackIngot(int size) { + return new ItemStack(EnderIO.itemAlloy, size, ordinal()); + } - public ItemStack getStackBall(int size) { - return new ItemStack(EnderIO.itemGrindingBall, size, ordinal()); - } + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBall, size, ordinal()); + } - public ItemStack getStackBlock() { - return getStackBlock(1); - } + public ItemStack getStackBlock() { + return getStackBlock(1); + } - public ItemStack getStackBlock(int size) { - return new ItemStack(EnderIO.blockIngotStorage, size, ordinal()); - } + public ItemStack getStackBlock(int size) { + return new ItemStack(EnderIO.blockIngotStorage, size, ordinal()); + } - public String getOreIngot() { - return oreIngots.get(0); - } + public String getOreIngot() { + return oreIngots.get(0); + } - public String getOreBlock() { - return oreBlocks.get(0); - } + public String getOreBlock() { + return oreBlocks.get(0); + } - public List getOreIngots() { - return oreIngots; - } - - public List getOreBlocks() { - return oreBlocks; - } + public List getOreIngots() { + return oreIngots; + } + public List getOreBlocks() { + return oreBlocks; + } } diff --git a/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java index 819b53b1..94cde6d1 100644 --- a/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java +++ b/src/main/java/crazypants/enderio/material/BlockDarkSteelBars.java @@ -1,69 +1,66 @@ package crazypants.enderio.material; -import net.minecraft.block.BlockPane; -import net.minecraft.block.material.Material; -import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; +import net.minecraftforge.oredict.OreDictionary; public class BlockDarkSteelBars extends BlockPane { - public static class BlockSoulariumBars extends BlockDarkSteelBars { + public static class BlockSoulariumBars extends BlockDarkSteelBars { - public BlockSoulariumBars() { - super(ModObject.blockSoulariumBars, "blockSoulariumBars"); - setBlockName(ModObject.blockSoulariumBars.unlocalisedName); - } + public BlockSoulariumBars() { + super(ModObject.blockSoulariumBars, "blockSoulariumBars"); + setBlockName(ModObject.blockSoulariumBars.unlocalisedName); + } - public static BlockSoulariumBars create() { - BlockSoulariumBars res = new BlockSoulariumBars(); - res.init(); - return res; - } + public static BlockSoulariumBars create() { + BlockSoulariumBars res = new BlockSoulariumBars(); + res.init(); + return res; + } + } - } + public static class BlockEndSteelBars extends BlockDarkSteelBars { - public static class BlockEndSteelBars extends BlockDarkSteelBars { + public BlockEndSteelBars() { + super(ModObject.blockEndSteelBars, "blockEndSteelBars"); + setBlockName(ModObject.blockEndSteelBars.unlocalisedName); + } - public BlockEndSteelBars() { - super(ModObject.blockEndSteelBars, "blockEndSteelBars"); - setBlockName(ModObject.blockEndSteelBars.unlocalisedName); - } + public static BlockEndSteelBars create() { + BlockEndSteelBars res = new BlockEndSteelBars(); + res.init(); + return res; + } + } - public static BlockEndSteelBars create() { - BlockEndSteelBars res = new BlockEndSteelBars(); - res.init(); - return res; - } + public static BlockDarkSteelBars create() { + BlockDarkSteelBars res = new BlockDarkSteelBars(); + res.init(); + return res; + } - } + ModObject modObj; - public static BlockDarkSteelBars create() { - BlockDarkSteelBars res = new BlockDarkSteelBars(); - res.init(); - return res; - } + public BlockDarkSteelBars(ModObject obj, String name) { + super("enderio:" + name, "enderio:" + name, Material.iron, true); + this.modObj = obj; + setResistance(2000.0F); // TNT Proof + setHardness(5.0F); + setStepSound(soundTypeMetal); + setBlockName(obj.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); + } - ModObject modObj; - - public BlockDarkSteelBars(ModObject obj, String name) { - super("enderio:"+name, "enderio:"+name, Material.iron, true); - this.modObj = obj; - setResistance(2000.0F); //TNT Proof - setHardness(5.0F); - setStepSound(soundTypeMetal); - setBlockName(obj.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - public BlockDarkSteelBars() { - this(ModObject.blockDarkIronBars,"blockDarkIronBars"); - } - - protected void init() { - GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, modObj.unlocalisedName); - OreDictionary.registerOre("barsIron", this); - } + public BlockDarkSteelBars() { + this(ModObject.blockDarkIronBars, "blockDarkIronBars"); + } + protected void init() { + GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, modObj.unlocalisedName); + OreDictionary.registerOre("barsIron", this); + } } diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 1fd678ae..62ddb13e 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -1,7 +1,14 @@ package crazypants.enderio.material; +import com.enderio.core.common.util.BlockCoord; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,241 +23,288 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.ModObject; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.painter.TileEntityPaintedBlock; - public class BlockFusedQuartz extends BlockEio { - public static int renderId; + public static int renderId; - private final static Type[] metaMapping = new Type[16]; - public enum Type { + private static final Type[] metaMapping = new Type[16]; - FUSED_QUARTZ("fusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem", false, true, 0), - GLASS("fusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem", false, false, 0), - ENLIGHTENED_FUSED_QUARTZ("enlightenedFusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem", true, true, 0), - ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", - "enderio:fusedGlassItem", true, false, 0), - DARK_FUSED_QUARTZ("darkFusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem", false, true, 255), - DARK_GLASS("darkFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem", false, false, 255); + public enum Type { + FUSED_QUARTZ( + "fusedQuartz", + "enderio:fusedQuartz", + "enderio:fusedQuartzFrame", + "enderio:fusedQuartzItem", + false, + true, + 0), + GLASS( + "fusedGlass", + "enderio:fusedGlass", + Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", + "enderio:fusedGlassItem", + false, + false, + 0), + ENLIGHTENED_FUSED_QUARTZ( + "enlightenedFusedQuartz", + "enderio:fusedQuartz", + "enderio:fusedQuartzFrame", + "enderio:fusedQuartzItem", + true, + true, + 0), + ENLIGHTENED_GLASS( + "enlightenedFusedGlass", + "enderio:fusedGlass", + Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", + "enderio:fusedGlassItem", + true, + false, + 0), + DARK_FUSED_QUARTZ( + "darkFusedQuartz", + "enderio:fusedQuartz", + "enderio:fusedQuartzFrame", + "enderio:fusedQuartzItem", + false, + true, + 255), + DARK_GLASS( + "darkFusedGlass", + "enderio:fusedGlass", + Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", + "enderio:fusedGlassItem", + false, + false, + 255); - final String unlocalisedName; - final String blockIcon; - final String frameIcon; - final String itemIcon; - final boolean enlightened; - final boolean blastResistance; - final int lightOpacity; - int connectedTextureMask; + final String unlocalisedName; + final String blockIcon; + final String frameIcon; + final String itemIcon; + final boolean enlightened; + final boolean blastResistance; + final int lightOpacity; + int connectedTextureMask; - private Type(String unlocalisedName, String blockIcon, String frameIcon, String itemIcon, boolean enlightened, boolean blastResistance, int lightOpacity) { - this.unlocalisedName = unlocalisedName; - this.frameIcon = frameIcon; - this.blockIcon = blockIcon; - this.itemIcon = itemIcon; - this.enlightened = enlightened; - this.blastResistance = blastResistance; - this.lightOpacity = lightOpacity; - connectedTextureMask = Config.clearGlassConnectToFusedQuartz ? ~0 : (1 << ordinal()); - metaMapping[this.ordinal()] = this; + private Type( + String unlocalisedName, + String blockIcon, + String frameIcon, + String itemIcon, + boolean enlightened, + boolean blastResistance, + int lightOpacity) { + this.unlocalisedName = unlocalisedName; + this.frameIcon = frameIcon; + this.blockIcon = blockIcon; + this.itemIcon = itemIcon; + this.enlightened = enlightened; + this.blastResistance = blastResistance; + this.lightOpacity = lightOpacity; + connectedTextureMask = Config.clearGlassConnectToFusedQuartz ? ~0 : (1 << ordinal()); + metaMapping[this.ordinal()] = this; + } + + public boolean connectTo(int otherMeta) { + return (connectedTextureMask & (1 << otherMeta)) != 0; + } + + void setConnectedTexture(Type other) { + connectedTextureMask |= 1 << other.ordinal(); + } + + public static Type byMeta(int meta) { + return metaMapping[meta] != null ? metaMapping[meta] : GLASS; + } } - public boolean connectTo(int otherMeta) { - return (connectedTextureMask & (1 << otherMeta)) != 0; + static { + Type.GLASS.setConnectedTexture(Type.ENLIGHTENED_GLASS); + Type.GLASS.setConnectedTexture(Type.DARK_GLASS); + Type.ENLIGHTENED_GLASS.setConnectedTexture(Type.GLASS); + Type.ENLIGHTENED_GLASS.setConnectedTexture(Type.DARK_GLASS); + Type.DARK_GLASS.setConnectedTexture(Type.GLASS); + Type.DARK_GLASS.setConnectedTexture(Type.ENLIGHTENED_GLASS); + Type.FUSED_QUARTZ.setConnectedTexture(Type.ENLIGHTENED_FUSED_QUARTZ); + Type.FUSED_QUARTZ.setConnectedTexture(Type.DARK_FUSED_QUARTZ); + Type.ENLIGHTENED_FUSED_QUARTZ.setConnectedTexture(Type.FUSED_QUARTZ); + Type.ENLIGHTENED_FUSED_QUARTZ.setConnectedTexture(Type.DARK_FUSED_QUARTZ); + Type.DARK_FUSED_QUARTZ.setConnectedTexture(Type.FUSED_QUARTZ); + Type.DARK_FUSED_QUARTZ.setConnectedTexture(Type.ENLIGHTENED_FUSED_QUARTZ); } - void setConnectedTexture(Type other) { - connectedTextureMask |= 1 << other.ordinal(); + public static BlockFusedQuartz create() { + BlockFusedQuartz result = new BlockFusedQuartz(); + result.init(); + return result; } - public static Type byMeta(int meta) { - return metaMapping[meta] != null ? metaMapping[meta] : GLASS; + IIcon[] blockIcon; + IIcon[] itemsIcons; + IIcon[] frameIcons; + + private BlockFusedQuartz() { + super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); + setStepSound(Block.soundTypeGlass); } - } - static { - Type.GLASS.setConnectedTexture(Type.ENLIGHTENED_GLASS); - Type.GLASS.setConnectedTexture(Type.DARK_GLASS); - Type.ENLIGHTENED_GLASS.setConnectedTexture(Type.GLASS); - Type.ENLIGHTENED_GLASS.setConnectedTexture(Type.DARK_GLASS); - Type.DARK_GLASS.setConnectedTexture(Type.GLASS); - Type.DARK_GLASS.setConnectedTexture(Type.ENLIGHTENED_GLASS); - Type.FUSED_QUARTZ.setConnectedTexture(Type.ENLIGHTENED_FUSED_QUARTZ); - Type.FUSED_QUARTZ.setConnectedTexture(Type.DARK_FUSED_QUARTZ); - Type.ENLIGHTENED_FUSED_QUARTZ.setConnectedTexture(Type.FUSED_QUARTZ); - Type.ENLIGHTENED_FUSED_QUARTZ.setConnectedTexture(Type.DARK_FUSED_QUARTZ); - Type.DARK_FUSED_QUARTZ.setConnectedTexture(Type.FUSED_QUARTZ); - Type.DARK_FUSED_QUARTZ.setConnectedTexture(Type.ENLIGHTENED_FUSED_QUARTZ); - } - - public static BlockFusedQuartz create() { - BlockFusedQuartz result = new BlockFusedQuartz(); - result.init(); - return result; - } - - IIcon[] blockIcon; - IIcon[] itemsIcons; - IIcon[] frameIcons; - - private BlockFusedQuartz() { - super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); - setStepSound(Block.soundTypeGlass); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, ItemFusedQuartz.class, name); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + @Override + protected void init() { + GameRegistry.registerBlock(this, ItemFusedQuartz.class, name); + if (teClass != null) { + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + } } - } - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - int meta = world.getBlockMetadata(x, y, z); - Type type = Type.byMeta(meta); - if (type.blastResistance) { - return 20; - } else { - return super.getExplosionResistance(par1Entity); + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + int meta = world.getBlockMetadata(x, y, z); + Type type = Type.byMeta(meta); + if (type.blastResistance) { + return 20; + } else { + return super.getExplosionResistance(par1Entity); + } } - } - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getRenderType() { - return renderId; - } - - //TODO:1.7 this makes it go splat - // @Override - // @SideOnly(Side.CLIENT) - // public int getRenderBlockPass() { - // return 1; - // } - // - // @Override - // public boolean canRenderInPass(int pass) { - // FusedQuartzRenderer.renderPass = pass; - // return true; - // } - - @Override - public int getLightOpacity(IBlockAccess world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - Type type = Type.byMeta(meta); - return type.lightOpacity; - } - - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - if(block != this) { - return super.getLightValue(world, x, y, z); + @Override + public boolean renderAsNormalBlock() { + return false; } - int meta = world.getBlockMetadata(x, y, z); - Type type = Type.byMeta(meta); - return type.enlightened ? 15 : super.getLightValue(world, x, y, z); - } - @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < Type.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + @Override + public boolean isOpaqueCube() { + return false; } - } - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - if(block == this) { - BlockCoord here = new BlockCoord(x, y, z).getLocation(ForgeDirection.VALID_DIRECTIONS[side].getOpposite()); - int myMeta = world.getBlockMetadata(here.x, here.y, here.z); - return !Type.byMeta(myMeta).connectTo(meta); + @Override + public int getRenderType() { + return renderId; } - return true; - } - @Override - public boolean isBlockSolid(IBlockAccess p_149747_1_, int p_149747_2_, int p_149747_3_, int p_149747_4_, int p_149747_5_) { - return true; - } + // TODO:1.7 this makes it go splat + // @Override + // @SideOnly(Side.CLIENT) + // public int getRenderBlockPass() { + // return 1; + // } + // + // @Override + // public boolean canRenderInPass(int pass) { + // FusedQuartzRenderer.renderPass = pass; + // return true; + // } - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - if(side == ForgeDirection.UP) { //stop drips - return false; + @Override + public int getLightOpacity(IBlockAccess world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + Type type = Type.byMeta(meta); + return type.lightOpacity; } - return true; - } - @Override - public boolean canPlaceTorchOnTop(World arg0, int arg1, int arg2, int arg3) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - //This little oddity is so the standard rendering used for items and breaking effects - //uses the item texture, while the custom renderer uses 'realBlockIcon' to render the 'non-frame' part of the block. - Type[] ts = Type.values(); - blockIcon = new IIcon[ts.length]; - itemsIcons = new IIcon[ts.length]; - frameIcons = new IIcon[ts.length]; - - for (int i = 0; i < ts.length; i++) { - blockIcon[i] = iIconRegister.registerIcon(ts[i].blockIcon); - itemsIcons[i] = iIconRegister.registerIcon(ts[i].itemIcon); - frameIcons[i] = iIconRegister.registerIcon(ts[i].frameIcon); + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + if (block != this) { + return super.getLightValue(world, x, y, z); + } + int meta = world.getBlockMetadata(x, y, z); + Type type = Type.byMeta(meta); + return type.enlightened ? 15 : super.getLightValue(world, x, y, z); } - } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int meta) { - meta = MathHelper.clamp_int(meta, 0, blockIcon.length - 1); - return blockIcon[meta]; - } + @Override + public int damageDropped(int par1) { + return par1; + } - public IIcon getItemIcon(int meta) { - meta = MathHelper.clamp_int(meta, 0, itemsIcons.length - 1); - return itemsIcons[meta]; - } + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < Type.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } - public IIcon getDefaultFrameIcon(int meta) { - meta = MathHelper.clamp_int(meta, 0, frameIcons.length - 1); - return frameIcons[meta]; - } + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + if (block == this) { + BlockCoord here = new BlockCoord(x, y, z).getLocation(ForgeDirection.VALID_DIRECTIONS[side].getOpposite()); + int myMeta = world.getBlockMetadata(here.x, here.y, here.z); + return !Type.byMeta(myMeta).connectTo(meta); + } + return true; + } - @Override - protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public boolean isBlockSolid( + IBlockAccess p_149747_1_, int p_149747_2_, int p_149747_3_, int p_149747_4_, int p_149747_5_) { + return true; + } + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + if (side == ForgeDirection.UP) { // stop drips + return false; + } + return true; + } + + @Override + public boolean canPlaceTorchOnTop(World arg0, int arg1, int arg2, int arg3) { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + // This little oddity is so the standard rendering used for items and breaking effects + // uses the item texture, while the custom renderer uses 'realBlockIcon' to render the 'non-frame' part of the + // block. + Type[] ts = Type.values(); + blockIcon = new IIcon[ts.length]; + itemsIcons = new IIcon[ts.length]; + frameIcons = new IIcon[ts.length]; + + for (int i = 0; i < ts.length; i++) { + blockIcon[i] = iIconRegister.registerIcon(ts[i].blockIcon); + itemsIcons[i] = iIconRegister.registerIcon(ts[i].itemIcon); + frameIcons[i] = iIconRegister.registerIcon(ts[i].frameIcon); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int par1, int meta) { + meta = MathHelper.clamp_int(meta, 0, blockIcon.length - 1); + return blockIcon[meta]; + } + + public IIcon getItemIcon(int meta) { + meta = MathHelper.clamp_int(meta, 0, itemsIcons.length - 1); + return itemsIcons[meta]; + } + + public IIcon getDefaultFrameIcon(int meta) { + meta = MathHelper.clamp_int(meta, 0, frameIcons.length - 1); + return frameIcons[meta]; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } } diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index ba844574..0aae9b28 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -1,7 +1,13 @@ package crazypants.enderio.material; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,94 +18,89 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; - public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvider { - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public static BlockIngotStorage create() { - BlockIngotStorage res = new BlockIngotStorage(); - res.init(); - return res; - } - - private BlockIngotStorage() { - super(ModObject.blockIngotStorage.unlocalisedName, null, Material.iron); - setStepSound(soundTypeMetal); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemIngotStorage.class, ModObject.blockIngotStorage.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[Alloy.values().length]; - for (Alloy alloy : Alloy.values()) { - icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public static BlockIngotStorage create() { + BlockIngotStorage res = new BlockIngotStorage(); + res.init(); + return res; } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, Alloy.values().length - 1); - return icons[meta]; - } - - @Override - public int getDamageValue(World world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public float getBlockHardness(World world, int x, int y, int z) { - return Alloy.values()[world.getBlockMetadata(x, y, z)].getHardness(); - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance - } - - @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { - return true; - } - - @Override - protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return false; - } - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); - } + private BlockIngotStorage() { + super(ModObject.blockIngotStorage.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemIngotStorage.class, ModObject.blockIngotStorage.unlocalisedName); + } - } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[Alloy.values().length]; + for (Alloy alloy : Alloy.values()) { + icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + } + } - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, Alloy.values().length - 1); + return icons[meta]; + } - } + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + return Alloy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + } + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} } diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java index 4ee5e1f2..67027201 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -1,25 +1,24 @@ package crazypants.enderio.material; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; public class BlockItemDarkIronBars extends ItemBlock { - public BlockItemDarkIronBars(Block block) { - super(block); - } + public BlockItemDarkIronBars(Block block) { + super(block); + } - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(EnderIO.lang.localize("blastResistant")); - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + par3List.add(EnderIO.lang.localize("blastResistant")); + } } diff --git a/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java index 33f73123..e260658a 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java @@ -1,39 +1,38 @@ package crazypants.enderio.material; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockItemIngotStorage extends ItemBlock { - public BlockItemIngotStorage(Block block) { - super(block); - setHasSubtypes(true); - setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return "tile." + Alloy.values()[stack.getItemDamage()].unlocalisedName; - } - - @Override - public int getMetadata(int damage) { - return damage; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (Alloy alloy : Alloy.values()) { - list.add(new ItemStack(this, 1, alloy.ordinal())); + public BlockItemIngotStorage(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + Alloy.values()[stack.getItemDamage()].unlocalisedName; + } + + @Override + public int getMetadata(int damage) { + return damage; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (Alloy alloy : Alloy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } } - } } diff --git a/src/main/java/crazypants/enderio/material/FrankenSkull.java b/src/main/java/crazypants/enderio/material/FrankenSkull.java index 6204c889..cb66648b 100644 --- a/src/main/java/crazypants/enderio/material/FrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/FrankenSkull.java @@ -1,36 +1,33 @@ package crazypants.enderio.material; public enum FrankenSkull { + ZOMBIE_ELECTRODE("skullZombieElectrode", false), + ZOMBIE_CONTROLLER("skullZombieController", false), + FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true), + ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false), + SENTIENT_ENDER("skullSentientEnder", "enderio:skullEnderResonator", true), + SKELETAL_CONTRACTOR("skullSkeletalContractor", "enderio:skullSkeletalContractor", false), + GUARDIAN_DIODE("skullGuardianDiode", "enderio:skullGuardianDiode", false); - ZOMBIE_ELECTRODE("skullZombieElectrode", false), - ZOMBIE_CONTROLLER("skullZombieController", false), - FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true), - ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false), - SENTIENT_ENDER("skullSentientEnder", "enderio:skullEnderResonator", true), - SKELETAL_CONTRACTOR("skullSkeletalContractor", "enderio:skullSkeletalContractor", false), - GUARDIAN_DIODE("skullGuardianDiode", "enderio:skullGuardianDiode", false); + public final String unlocalisedName; + public final String iconKey; + public final boolean isAnimated; + private FrankenSkull(String unlocalisedName, String iconKey, boolean isAnimated) { + this.unlocalisedName = unlocalisedName; + this.iconKey = iconKey; + this.isAnimated = isAnimated; + } - public final String unlocalisedName; - public final String iconKey; - public final boolean isAnimated; + private FrankenSkull(String unlocalisedName, boolean isAnimated) { + this(unlocalisedName, "enderio:" + unlocalisedName, isAnimated); + } - private FrankenSkull(String unlocalisedName, String iconKey, boolean isAnimated) { - this.unlocalisedName = unlocalisedName; - this.iconKey = iconKey; - this.isAnimated = isAnimated; - } - - private FrankenSkull(String unlocalisedName, boolean isAnimated) { - this(unlocalisedName, "enderio:" + unlocalisedName, isAnimated); - } - - public String getUnlocalisedName() { - return unlocalisedName; - } - - public String getIconKey() { - return iconKey; - } + public String getUnlocalisedName() { + return unlocalisedName; + } + public String getIconKey() { + return iconKey; + } } diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzFrameRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzFrameRenderer.java index afbac791..e4bcea99 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzFrameRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzFrameRenderer.java @@ -3,52 +3,53 @@ package crazypants.enderio.material; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; public class FusedQuartzFrameRenderer implements IItemRenderer { - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - RenderBlocks renderBlocks = (RenderBlocks) data[0]; - if(type == ItemRenderType.INVENTORY) { - renderToInventory(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED) { - renderEquipped(item, renderBlocks); - } else if(type == ItemRenderType.ENTITY) { - renderEntity(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - renderEntity(item, renderBlocks); + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type == ItemRenderType.ENTITY + || type == ItemRenderType.EQUIPPED + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.EQUIPPED_FIRST_PERSON; } - } - private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { - renderToInventory(item, renderBlocks); - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } - private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { - renderToInventory(item, renderBlocks); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + if (type == ItemRenderType.INVENTORY) { + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + renderEquipped(item, renderBlocks); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEntity(item, renderBlocks); + } + } - private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - renderFrame(item); - } + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } - private void renderFrame(ItemStack item) { - GL11.glDisable(GL11.GL_LIGHTING); - FusedQuartzRenderer r = new FusedQuartzRenderer(); - r.renderFrameItem(item); - GL11.glEnable(GL11.GL_LIGHTING); - } + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + renderToInventory(item, renderBlocks); + } + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + renderFrame(item); + } + + private void renderFrame(ItemStack item) { + GL11.glDisable(GL11.GL_LIGHTING); + FusedQuartzRenderer r = new FusedQuartzRenderer(); + r.renderFrameItem(item); + GL11.glEnable(GL11.GL_LIGHTING); + } } diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index acd70307..4cdf53a2 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -1,5 +1,15 @@ package crazypants.enderio.material; +import com.enderio.core.client.render.ConnectedTextureRenderer; +import com.enderio.core.client.render.ConnectedTextureRenderer.DefaultTextureCallback; +import com.enderio.core.client.render.CustomCubeRenderer; +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.render.ConduitBundleRenderer.FacadeAccessWrapper; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityPaintedBlock; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -10,111 +20,111 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.ConnectedTextureRenderer; -import com.enderio.core.client.render.ConnectedTextureRenderer.DefaultTextureCallback; -import com.enderio.core.client.render.CustomCubeRenderer; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; -import crazypants.enderio.conduit.render.ConduitBundleRenderer.FacadeAccessWrapper; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.painter.PainterUtil; -import crazypants.enderio.machine.painter.TileEntityPaintedBlock; - public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { - static int renderPass; + static int renderPass; - private ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { - @Override - public boolean matchesMetadata(int meta1, int meta2) { - return super.matchesMetadata(meta1, meta2) || BlockFusedQuartz.Type.byMeta(meta1).connectTo(meta2); - } - }; - - public FusedQuartzRenderer() { - connectedTextureRenderer.setMatchMeta(!Config.clearGlassConnectToFusedQuartz); - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.getItemIcon(metadata)); - renderer.renderBlockAsItem(Blocks.glass, 0, 1); - renderer.clearOverrideBlockTexture(); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockFusedQuartz.renderId; - } - - @Override - public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - int meta = blockAccess.getBlockMetadata(x, y, z); - //TODO:1.7 this makes it go splat - //if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) { - TileEntityPaintedBlock tecb = null; - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - tecb = (TileEntityPaintedBlock) te; - } - - if(renderer.hasOverrideBlockTexture()) { - renderer.renderStandardBlock(block, x, y, z); - } else { - IBlockAccess origBa = renderer.blockAccess; - renderer.blockAccess = new FacadeAccessWrapper(origBa); - try { - renderFrame(renderer.blockAccess, x, y, z, tecb, false, meta); - } finally { - renderer.blockAccess = origBa; - } - } - // } - return true; - } - - public void renderFrameItem(ItemStack stack) { - RenderUtil.bindBlockTexture(); - Tessellator.instance.startDrawingQuads(); - TileEntityPaintedBlock tecb = new TileEntityPaintedBlock(); - tecb.setSourceBlock(PainterUtil.getSourceBlock(stack)); - tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); - renderFrame(null, 0, 0, 0, tecb, true, stack.getItemDamage()); - Tessellator.instance.draw(); - } - - private void renderFrame(IBlockAccess blockAccess, int x, int y, int z, TileEntityPaintedBlock tecb, boolean forceAllEdges, int meta) { - - if(blockAccess == null) { - //No lighting - IIcon texture = EnderIO.blockFusedQuartz.getItemIcon(meta); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if(tecb != null && tecb.getSourceBlock() != null) { - texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata()); + private ConnectedTextureRenderer connectedTextureRenderer = new ConnectedTextureRenderer() { + @Override + public boolean matchesMetadata(int meta1, int meta2) { + return super.matchesMetadata(meta1, meta2) + || BlockFusedQuartz.Type.byMeta(meta1).connectTo(meta2); } - RenderUtil.renderConnectedTextureFace(blockAccess, EnderIO.blockFusedQuartz, x, y, z, face, texture, forceAllEdges); - } - return; + }; + + public FusedQuartzRenderer() { + connectedTextureRenderer.setMatchMeta(!Config.clearGlassConnectToFusedQuartz); } - CustomCubeRenderer.instance.setOverrideTexture(EnderIO.blockFusedQuartz.getIcon(0, meta)); - - if(tecb != null && tecb.getSourceBlock() != null) { - connectedTextureRenderer.setEdgeTexureCallback(new DefaultTextureCallback(tecb.getSourceBlock(), tecb.getSourceBlockMetadata())); - CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, - connectedTextureRenderer); - } else { - connectedTextureRenderer.setEdgeTexture(EnderIO.blockFusedQuartz.getDefaultFrameIcon(meta)); - CustomCubeRenderer.instance.renderBlock(blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer); + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + renderer.setOverrideBlockTexture(EnderIO.blockFusedQuartz.getItemIcon(metadata)); + renderer.renderBlockAsItem(Blocks.glass, 0, 1); + renderer.clearOverrideBlockTexture(); } - CustomCubeRenderer.instance.setOverrideTexture(null); - } + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockFusedQuartz.renderId; + } + + @Override + public boolean renderWorldBlock( + IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + int meta = blockAccess.getBlockMetadata(x, y, z); + // TODO:1.7 this makes it go splat + // if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) { + TileEntityPaintedBlock tecb = null; + TileEntity te = blockAccess.getTileEntity(x, y, z); + if (te instanceof TileEntityPaintedBlock) { + tecb = (TileEntityPaintedBlock) te; + } + + if (renderer.hasOverrideBlockTexture()) { + renderer.renderStandardBlock(block, x, y, z); + } else { + IBlockAccess origBa = renderer.blockAccess; + renderer.blockAccess = new FacadeAccessWrapper(origBa); + try { + renderFrame(renderer.blockAccess, x, y, z, tecb, false, meta); + } finally { + renderer.blockAccess = origBa; + } + } + // } + return true; + } + + public void renderFrameItem(ItemStack stack) { + RenderUtil.bindBlockTexture(); + Tessellator.instance.startDrawingQuads(); + TileEntityPaintedBlock tecb = new TileEntityPaintedBlock(); + tecb.setSourceBlock(PainterUtil.getSourceBlock(stack)); + tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack)); + renderFrame(null, 0, 0, 0, tecb, true, stack.getItemDamage()); + Tessellator.instance.draw(); + } + + private void renderFrame( + IBlockAccess blockAccess, + int x, + int y, + int z, + TileEntityPaintedBlock tecb, + boolean forceAllEdges, + int meta) { + + if (blockAccess == null) { + // No lighting + IIcon texture = EnderIO.blockFusedQuartz.getItemIcon(meta); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + if (tecb != null && tecb.getSourceBlock() != null) { + texture = tecb.getSourceBlock().getIcon(face.ordinal(), tecb.getSourceBlockMetadata()); + } + RenderUtil.renderConnectedTextureFace( + blockAccess, EnderIO.blockFusedQuartz, x, y, z, face, texture, forceAllEdges); + } + return; + } + + CustomCubeRenderer.instance.setOverrideTexture(EnderIO.blockFusedQuartz.getIcon(0, meta)); + + if (tecb != null && tecb.getSourceBlock() != null) { + connectedTextureRenderer.setEdgeTexureCallback( + new DefaultTextureCallback(tecb.getSourceBlock(), tecb.getSourceBlockMetadata())); + CustomCubeRenderer.instance.renderBlock( + blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer); + } else { + connectedTextureRenderer.setEdgeTexture(EnderIO.blockFusedQuartz.getDefaultFrameIcon(meta)); + CustomCubeRenderer.instance.renderBlock( + blockAccess, EnderIO.blockFusedQuartz, x, y, z, connectedTextureRenderer); + } + + CustomCubeRenderer.instance.setOverrideTexture(null); + } } diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index 665f5bdc..ee0dfd0a 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -1,86 +1,85 @@ package crazypants.enderio.material; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemAlloy extends Item { - static final boolean useNuggets = false; + static final boolean useNuggets = false; - protected final IIcon[] icons; - protected final int numItems; + protected final IIcon[] icons; + protected final int numItems; - public static ItemAlloy create() { - ItemAlloy alloy = new ItemAlloy(); - alloy.init(); - return alloy; - } - - protected ItemAlloy() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemAlloy.unlocalisedName); - - numItems = Alloy.values().length; - if(useNuggets) { - numItems = numItems * 2; + public static ItemAlloy create() { + ItemAlloy alloy = new ItemAlloy(); + alloy.init(); + return alloy; } - icons = new IIcon[numItems]; - } - private void init() { - GameRegistry.registerItem(this, ModObject.itemAlloy.unlocalisedName); - } + protected ItemAlloy() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloy.unlocalisedName); - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, numItems - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = Alloy.values().length; - for (int i = 0; i < numAlloys; i++) { - icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey); + numItems = Alloy.values().length; + if (useNuggets) { + numItems = numItems * 2; + } + icons = new IIcon[numItems]; } - if(useNuggets) { - for (int i = 0; i < numAlloys; i++) { - icons[i + numAlloys] = IIconRegister.registerIcon(Alloy.values()[i].iconKey + "Nugget"); - } - } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - if(i < Alloy.values().length) { - return Alloy.values()[i].unlocalisedName; - } else { - return Alloy.values()[i - Alloy.values().length].unlocalisedName + "Nugget"; + private void init() { + GameRegistry.registerItem(this, ModObject.itemAlloy.unlocalisedName); } - } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < numItems; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = Alloy.values().length; + for (int i = 0; i < numAlloys; i++) { + icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey); + } + if (useNuggets) { + for (int i = 0; i < numAlloys; i++) { + icons[i + numAlloys] = IIconRegister.registerIcon(Alloy.values()[i].iconKey + "Nugget"); + } + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + if (i < Alloy.values().length) { + return Alloy.values()[i].unlocalisedName; + } else { + return Alloy.values()[i - Alloy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < numItems; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } } - } } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 7a1d8146..7f36b932 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -1,19 +1,6 @@ package crazypants.enderio.material; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; - import com.enderio.core.client.handlers.SpecialTooltipHandler; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,94 +11,102 @@ import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.ICapacitorItem; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; public class ItemCapacitor extends Item implements ICapacitorItem { - private static final BasicCapacitor CAP = new BasicCapacitor(); + private static final BasicCapacitor CAP = new BasicCapacitor(); - public static ItemCapacitor create() { - ItemCapacitor result = new ItemCapacitor(); - result.init(); - return result; - } - - private final IIcon[] icons; - - protected ItemCapacitor() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemBasicCapacitor.unlocalisedName); - setHasSubtypes(true); - setMaxDamage(0); - setMaxStackSize(64); - - icons = new IIcon[Capacitors.values().length]; - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemBasicCapacitor.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, Capacitors.values().length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - for (int i = 0; i < Capacitors.values().length; i++) { - icons[i] = IIconRegister.registerIcon(Capacitors.values()[i].iconKey); - } - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); - return Capacitors.values()[i].unlocalisedName; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < Capacitors.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); - if(Capacitors.values()[j] == Capacitors.TOTEMIC_CAPACITOR) { - ItemStack stack = new ItemStack(par1, 1, j); - stack.addEnchantment(Enchantment.efficiency, 5); - par3List.add(stack); - } - } - } - - @Override - public ICapacitor getCapacitor(ItemStack stack) { - int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, Capacitors.values().length - 1); - - if(Capacitors.values()[damage] == Capacitors.TOTEMIC_CAPACITOR) { - damage = MathHelper.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.efficiency.effectId, stack)+1, 1, Capacitors.TOTEMIC_CAPACITOR.ordinal()); + public static ItemCapacitor create() { + ItemCapacitor result = new ItemCapacitor(); + result.init(); + return result; } - return Capacitors.values()[damage].capacitor; - } + private final IIcon[] icons; + protected ItemCapacitor() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBasicCapacitor.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); + setMaxStackSize(64); - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { - par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); - if(SpecialTooltipHandler.showAdvancedTooltips()) { - SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, "enderio.machine.tooltip.upgrade"); - } else { - SpecialTooltipHandler.addShowDetailsTooltip(par3List); - } + icons = new IIcon[Capacitors.values().length]; } - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemBasicCapacitor.unlocalisedName); + } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, Capacitors.values().length - 1); + return icons[damage]; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + for (int i = 0; i < Capacitors.values().length; i++) { + icons[i] = IIconRegister.registerIcon(Capacitors.values()[i].iconKey); + } + } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); + return Capacitors.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < Capacitors.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + if (Capacitors.values()[j] == Capacitors.TOTEMIC_CAPACITOR) { + ItemStack stack = new ItemStack(par1, 1, j); + stack.addEnchantment(Enchantment.efficiency, 5); + par3List.add(stack); + } + } + } + + @Override + public ICapacitor getCapacitor(ItemStack stack) { + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, Capacitors.values().length - 1); + + if (Capacitors.values()[damage] == Capacitors.TOTEMIC_CAPACITOR) { + damage = MathHelper.clamp_int( + EnchantmentHelper.getEnchantmentLevel(Enchantment.efficiency.effectId, stack) + 1, + 1, + Capacitors.TOTEMIC_CAPACITOR.ordinal()); + } + + return Capacitors.values()[damage].capacitor; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + if (par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { + par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); + if (SpecialTooltipHandler.showAdvancedTooltips()) { + SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, "enderio.machine.tooltip.upgrade"); + } else { + SpecialTooltipHandler.addShowDetailsTooltip(par3List); + } + } + } } diff --git a/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java index c43d9726..a9e7ced8 100644 --- a/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java @@ -1,78 +1,74 @@ package crazypants.enderio.material; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemFrankenSkull extends Item { - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemFrankenSkull create() { - ItemFrankenSkull alloy = new ItemFrankenSkull(); - alloy.init(); - return alloy; - } - - private ItemFrankenSkull() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemFrankenSkull.unlocalisedName); - icons = new IIcon[FrankenSkull.values().length]; - } - - private void init() { - GameRegistry.registerItem(this, ModObject.itemFrankenSkull.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, icons.length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - for (int i = 0; i < icons.length; i++) { - icons[i] = IIconRegister.registerIcon(FrankenSkull.values()[i].iconKey); + public static ItemFrankenSkull create() { + ItemFrankenSkull alloy = new ItemFrankenSkull(); + alloy.init(); + return alloy; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); - return FrankenSkull.values()[i].unlocalisedName; - } - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < FrankenSkull.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + private ItemFrankenSkull() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemFrankenSkull.unlocalisedName); + icons = new IIcon[FrankenSkull.values().length]; } - } - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack, int pass) { - int meta = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); - return FrankenSkull.values()[meta].isAnimated; - } + private void init() { + GameRegistry.registerItem(this, ModObject.itemFrankenSkull.unlocalisedName); + } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, icons.length - 1); + return icons[damage]; + } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + for (int i = 0; i < icons.length; i++) { + icons[i] = IIconRegister.registerIcon(FrankenSkull.values()[i].iconKey); + } + } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); + return FrankenSkull.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < FrankenSkull.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + int meta = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); + return FrankenSkull.values()[meta].isAnimated; + } } diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index 3a9ea3e2..6436ba05 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -1,55 +1,54 @@ package crazypants.enderio.material; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.material.BlockFusedQuartz.Type; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.material.BlockFusedQuartz.Type; public class ItemFusedQuartz extends ItemBlockWithMetadata { - public ItemFusedQuartz(Block block) { - super(block, block); - setCreativeTab(EnderIOTab.tabEnderIO); - } + public ItemFusedQuartz(Block block) { + super(block, block); + setCreativeTab(EnderIOTab.tabEnderIO); + } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - Type type = Type.byMeta(meta); - return "enderio.blockFusedQuartz." + type.unlocalisedName; - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int meta = par1ItemStack.getItemDamage(); + Type type = Type.byMeta(meta); + return "enderio.blockFusedQuartz." + type.unlocalisedName; + } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < BlockFusedQuartz.Type.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < BlockFusedQuartz.Type.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } } - } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - int meta = par1ItemStack.getItemDamage(); - Type type = Type.byMeta(meta); - if (type.blastResistance) { - par3List.add(EnderIO.lang.localize("blastResistant")); + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + int meta = par1ItemStack.getItemDamage(); + Type type = Type.byMeta(meta); + if (type.blastResistance) { + par3List.add(EnderIO.lang.localize("blastResistant")); + } + if (type.enlightened) { + par3List.add(EnderIO.lang.localize("lightEmitter")); + } + if (type.lightOpacity > 0) { + par3List.add(EnderIO.lang.localize("lightBlocker")); + } } - if (type.enlightened) { - par3List.add(EnderIO.lang.localize("lightEmitter")); - } - if (type.lightOpacity > 0) { - par3List.add(EnderIO.lang.localize("lightBlocker")); - } - } } diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java index 011412dd..c95a2c6d 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartzFrame.java @@ -1,13 +1,5 @@ package crazypants.enderio.material; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,87 +10,102 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.machine.painter.TileEntityPaintedBlock; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class ItemFusedQuartzFrame extends Item { - public static ItemFusedQuartzFrame create() { - ItemFusedQuartzFrame result = new ItemFusedQuartzFrame(); - result.init(); - return result; - } - - protected ItemFusedQuartzFrame() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName("enderio." + ModObject.itemFusedQuartzFrame.name()); - setMaxStackSize(64); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemFusedQuartzFrame.unlocalisedName); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new FramePainterRecipe(this)); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { - list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - } - - @Override - public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, - float par9, float par10) { - - if(world.getBlock(x, y, z) == EnderIO.blockFusedQuartz) { - TileEntityPaintedBlock tecb = (TileEntityPaintedBlock) world.getTileEntity(x, y, z); - if(tecb == null) { - return false; - } - tecb.setSourceBlock(PainterUtil.getSourceBlock(itemStack)); - tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); - world.markBlockForUpdate(x, y, z); - world.markBlockForUpdate(x, y, z); - if(!world.isRemote) { - if(!player.capabilities.isCreativeMode) { - itemStack.stackSize--; - } - } - return true; - } else { - return false; + public static ItemFusedQuartzFrame create() { + ItemFusedQuartzFrame result = new ItemFusedQuartzFrame(); + result.init(); + return result; } - } - @Override - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } + protected ItemFusedQuartzFrame() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName("enderio." + ModObject.itemFusedQuartzFrame.name()); + setMaxStackSize(64); + } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(item, par2EntityPlayer, list, par4); - list.add(PainterUtil.getTooltTipText(item)); - } + protected void init() { + GameRegistry.registerItem(this, ModObject.itemFusedQuartzFrame.unlocalisedName); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockPainter.unlocalisedName, new FramePainterRecipe(this)); + } - public final class FramePainterRecipe extends BasicPainterTemplate { - - private ItemFusedQuartzFrame i; - - public FramePainterRecipe(ItemFusedQuartzFrame itemFusedQuartzFrame) { - i = itemFusedQuartzFrame; + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { + list.add(PainterUtil.applyDefaultPaintedState(new ItemStack(item))); } @Override - public boolean isValidTarget(ItemStack target) { - return target != null && target.getItem() == i; + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) {} + + @Override + public boolean onItemUse( + ItemStack itemStack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float par8, + float par9, + float par10) { + + if (world.getBlock(x, y, z) == EnderIO.blockFusedQuartz) { + TileEntityPaintedBlock tecb = (TileEntityPaintedBlock) world.getTileEntity(x, y, z); + if (tecb == null) { + return false; + } + tecb.setSourceBlock(PainterUtil.getSourceBlock(itemStack)); + tecb.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + world.markBlockForUpdate(x, y, z); + world.markBlockForUpdate(x, y, z); + if (!world.isRemote) { + if (!player.capabilities.isCreativeMode) { + itemStack.stackSize--; + } + } + return true; + } else { + return false; + } } - } + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(item, par2EntityPlayer, list, par4); + list.add(PainterUtil.getTooltTipText(item)); + } + + public final class FramePainterRecipe extends BasicPainterTemplate { + + private ItemFusedQuartzFrame i; + + public FramePainterRecipe(ItemFusedQuartzFrame itemFusedQuartzFrame) { + i = itemFusedQuartzFrame; + } + + @Override + public boolean isValidTarget(ItemStack target) { + return target != null && target.getItem() == i; + } + } } diff --git a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java index 98289f01..9c51e047 100644 --- a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java +++ b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java @@ -11,40 +11,38 @@ import net.minecraft.util.MathHelper; public class ItemGrindingBall extends ItemAlloy { - public static ItemGrindingBall create() { - ItemGrindingBall ball = new ItemGrindingBall(); - ball.init(); - return ball; - } + public static ItemGrindingBall create() { + ItemGrindingBall ball = new ItemGrindingBall(); + ball.init(); + return ball; + } - private ItemGrindingBall() { - setUnlocalizedName(ModObject.itemGrindingBall.unlocalisedName); - } + private ItemGrindingBall() { + setUnlocalizedName(ModObject.itemGrindingBall.unlocalisedName); + } - private void init() { - GameRegistry.registerItem(this, ModObject.itemGrindingBall.unlocalisedName); - - } + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBall.unlocalisedName); + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, numItems - 1); - return icons[damage]; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = Alloy.values().length; - for (int i = 0; i < numAlloys; i++) - icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey+"GrindingBall"); + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = Alloy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey + "GrindingBall"); + } - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - return Alloy.values()[i].unlocalisedName+"_ball"; - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return Alloy.values()[i].unlocalisedName + "_ball"; + } } diff --git a/src/main/java/crazypants/enderio/material/ItemMachinePart.java b/src/main/java/crazypants/enderio/material/ItemMachinePart.java index 9ab3ad07..3720390f 100644 --- a/src/main/java/crazypants/enderio/material/ItemMachinePart.java +++ b/src/main/java/crazypants/enderio/material/ItemMachinePart.java @@ -1,71 +1,69 @@ package crazypants.enderio.material; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemMachinePart extends Item { - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemMachinePart create() { - ItemMachinePart mp = new ItemMachinePart(); - mp.init(); - return mp; - } - - private ItemMachinePart() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemMachinePart.unlocalisedName); - - icons = new IIcon[MachinePart.values().length]; - } - - private void init() { - GameRegistry.registerItem(this, ModObject.itemMachinePart.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, MachinePart.values().length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numParts = MachinePart.values().length; - for (int i = 0; i < numParts; i++) { - icons[i] = IIconRegister.registerIcon(MachinePart.values()[i].iconKey); + public static ItemMachinePart create() { + ItemMachinePart mp = new ItemMachinePart(); + mp.init(); + return mp; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, MachinePart.values().length - 1); - return MachinePart.values()[i].unlocalisedName; - } + private ItemMachinePart() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemMachinePart.unlocalisedName); - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < MachinePart.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + icons = new IIcon[MachinePart.values().length]; } - } + private void init() { + GameRegistry.registerItem(this, ModObject.itemMachinePart.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, MachinePart.values().length - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numParts = MachinePart.values().length; + for (int i = 0; i < numParts; i++) { + icons[i] = IIconRegister.registerIcon(MachinePart.values()[i].iconKey); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, MachinePart.values().length - 1); + return MachinePart.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < MachinePart.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } } diff --git a/src/main/java/crazypants/enderio/material/ItemMaterial.java b/src/main/java/crazypants/enderio/material/ItemMaterial.java index 1e432eb9..12e72b1d 100644 --- a/src/main/java/crazypants/enderio/material/ItemMaterial.java +++ b/src/main/java/crazypants/enderio/material/ItemMaterial.java @@ -1,81 +1,79 @@ package crazypants.enderio.material; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemMaterial extends Item { - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemMaterial create() { - ItemMaterial mp = new ItemMaterial(); - mp.init(); - return mp; - } - - private ItemMaterial() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemMaterial.unlocalisedName); - - icons = new IIcon[Material.values().length]; - } - - private void init() { - GameRegistry.registerItem(this, ModObject.itemMaterial.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, Material.values().length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numParts = Material.values().length; - for (int i = 0; i < numParts; i++) { - icons[i] = IIconRegister.registerIcon(Material.values()[i].iconKey); + public static ItemMaterial create() { + ItemMaterial mp = new ItemMaterial(); + mp.init(); + return mp; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); - return Material.values()[i].unlocalisedName; - } + private ItemMaterial() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemMaterial.unlocalisedName); - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < Material.values().length; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + icons = new IIcon[Material.values().length]; } - } - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack par1ItemStack, int pass) { - if(par1ItemStack == null) { - return false; + private void init() { + GameRegistry.registerItem(this, ModObject.itemMaterial.unlocalisedName); } - int damage = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); - return Material.values()[damage].hasEffect; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, Material.values().length - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numParts = Material.values().length; + for (int i = 0; i < numParts; i++) { + icons[i] = IIconRegister.registerIcon(Material.values()[i].iconKey); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); + return Material.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < Material.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + if (par1ItemStack == null) { + return false; + } + int damage = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); + return Material.values()[damage].hasEffect; + } } diff --git a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java index 36cb34e8..fd6cd773 100644 --- a/src/main/java/crazypants/enderio/material/ItemPowderIngot.java +++ b/src/main/java/crazypants/enderio/material/ItemPowderIngot.java @@ -1,73 +1,71 @@ package crazypants.enderio.material; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemPowderIngot extends Item { - private final IIcon[] icons; + private final IIcon[] icons; - public static ItemPowderIngot create() { - ItemPowderIngot mp = new ItemPowderIngot(); - mp.init(); - return mp; - } - - private ItemPowderIngot() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemPowderIngot.unlocalisedName); - - icons = new IIcon[PowderIngot.values().length]; - } - - private void init() { - GameRegistry.registerItem(this, ModObject.itemPowderIngot.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, PowderIngot.values().length - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numParts = PowderIngot.values().length; - for (int i = 0; i < numParts; i++) { - icons[i] = IIconRegister.registerIcon(PowderIngot.values()[i].iconKey); + public static ItemPowderIngot create() { + ItemPowderIngot mp = new ItemPowderIngot(); + mp.init(); + return mp; } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, PowderIngot.values().length - 1); - return PowderIngot.values()[i].unlocalisedName; - } + private ItemPowderIngot() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemPowderIngot.unlocalisedName); - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < PowderIngot.values().length; ++j) { - if(PowderIngot.values()[j].isDependancyMet()) { - par3List.add(new ItemStack(par1, 1, j)); - } + icons = new IIcon[PowderIngot.values().length]; } - } + private void init() { + GameRegistry.registerItem(this, ModObject.itemPowderIngot.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, PowderIngot.values().length - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numParts = PowderIngot.values().length; + for (int i = 0; i < numParts; i++) { + icons[i] = IIconRegister.registerIcon(PowderIngot.values()[i].iconKey); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, PowderIngot.values().length - 1); + return PowderIngot.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < PowderIngot.values().length; ++j) { + if (PowderIngot.values()[j].isDependancyMet()) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + } } diff --git a/src/main/java/crazypants/enderio/material/MachinePart.java b/src/main/java/crazypants/enderio/material/MachinePart.java index c2f8a0d9..783bc6f8 100644 --- a/src/main/java/crazypants/enderio/material/MachinePart.java +++ b/src/main/java/crazypants/enderio/material/MachinePart.java @@ -3,30 +3,27 @@ package crazypants.enderio.material; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; - import org.apache.commons.lang3.StringUtils; public enum MachinePart { + MACHINE_CHASSI("machineChassi"), + BASIC_GEAR("basicGear"), + SOUL_MACHINE_CHASSIS("soulMachineChassi"), + END_STEEL_MACHINE_CHASSIS("endSteelMachineChassi"); - MACHINE_CHASSI("machineChassi"), - BASIC_GEAR("basicGear"), - SOUL_MACHINE_CHASSIS("soulMachineChassi"), - END_STEEL_MACHINE_CHASSIS("endSteelMachineChassi"); + public final String unlocalisedName; + public final String iconKey; + public final String oreDict; - - public final String unlocalisedName; - public final String iconKey; - public final String oreDict; - - private MachinePart(String unlocalisedName) { - this.unlocalisedName = "enderio." + unlocalisedName; - this.iconKey = "enderio:" + unlocalisedName; - this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); - } - - public static void registerOres(Item item) { - for (MachinePart m : values()) { - OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); + private MachinePart(String unlocalisedName) { + this.unlocalisedName = "enderio." + unlocalisedName; + this.iconKey = "enderio:" + unlocalisedName; + this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); + } + + public static void registerOres(Item item) { + for (MachinePart m : values()) { + OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); + } } - } } diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index 1d89b680..d52a0fa2 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -1,5 +1,7 @@ package crazypants.enderio.material; +import crazypants.enderio.EnderIO; +import crazypants.enderio.Log; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -7,72 +9,69 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; -import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; - public class MachinePartRenderer implements IItemRenderer { - private ItemRenderer itemRenderer = new ItemRenderer(Minecraft.getMinecraft()); - private RenderItem renderItem = new RenderItem(); - private boolean loggedError = false; + private ItemRenderer itemRenderer = new ItemRenderer(Minecraft.getMinecraft()); + private RenderItem renderItem = new RenderItem(); + private boolean loggedError = false; - public MachinePartRenderer() { - } + public MachinePartRenderer() {} - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - if(item != null && item.getItemDamage() != MachinePart.BASIC_GEAR.ordinal()) { - return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY - || type == ItemRenderType.EQUIPPED_FIRST_PERSON; - } else { - return false; + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + if (item != null && item.getItemDamage() != MachinePart.BASIC_GEAR.ordinal()) { + return type == ItemRenderType.ENTITY + || type == ItemRenderType.EQUIPPED + || type == ItemRenderType.INVENTORY + || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } else { + return false; + } } - } - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if(type == ItemRenderType.INVENTORY) { - RenderBlocks renderBlocks = (RenderBlocks) data[0]; - renderToInventory(item, renderBlocks); - } else if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - renderEquipped(item, (RenderBlocks) data[0]); - } else if(type == ItemRenderType.ENTITY) { - renderEntity(item, (RenderBlocks) data[0]); - } else { - if(loggedError) { - Log.warn("MachinePartRenderer.renderItem: Unsupported render type"); - loggedError = true; - } + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; } - } - private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { - GL11.glPushMatrix(); - GL11.glScalef(0.5f, 0.5f, 0.5f); - renderToInventory(item, renderBlocks); - GL11.glPopMatrix(); - } + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if (type == ItemRenderType.INVENTORY) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + renderToInventory(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + renderEquipped(item, (RenderBlocks) data[0]); + } else if (type == ItemRenderType.ENTITY) { + renderEntity(item, (RenderBlocks) data[0]); + } else { + if (loggedError) { + Log.warn("MachinePartRenderer.renderItem: Unsupported render type"); + loggedError = true; + } + } + } - private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - renderToInventory(item, renderBlocks); - GL11.glPopMatrix(); - } + private void renderEntity(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glScalef(0.5f, 0.5f, 0.5f); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } - private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { - GL11.glEnable(GL11.GL_ALPHA_TEST); - renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage())); - renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); - renderBlocks.clearOverrideBlockTexture(); - GL11.glDisable(GL11.GL_ALPHA_TEST); - } + private void renderEquipped(ItemStack item, RenderBlocks renderBlocks) { + GL11.glPushMatrix(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + renderToInventory(item, renderBlocks); + GL11.glPopMatrix(); + } + + private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) { + GL11.glEnable(GL11.GL_ALPHA_TEST); + renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage())); + renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); + renderBlocks.clearOverrideBlockTexture(); + GL11.glDisable(GL11.GL_ALPHA_TEST); + } } diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 5baf4493..3e3e09e3 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -1,64 +1,58 @@ package crazypants.enderio.material; +import crazypants.enderio.EnderIO; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; - import org.apache.commons.lang3.StringUtils; -import crazypants.enderio.EnderIO; - public enum Material { + SILICON("silicon"), + CONDUIT_BINDER("conduitBinder"), + BINDER_COMPOSITE("binderComposite"), + PHASED_IRON_NUGGET("phasedIronNugget"), + VIBRANT_NUGGET("vibrantNugget"), + PULSATING_CYSTAL("pulsatingCrystal", true), + VIBRANT_CYSTAL("vibrantCrystal", true), + DARK_GRINDING_BALL("darkGrindingBall"), + ENDER_CRYSTAL("enderCrystal", true), + ATTRACTOR_CRYSTAL("attractorCrystal", true), + WEATHER_CRYSTAL("weatherCrystal", true), + END_STEEL_NUGGET("endSteelNugget"), + DARK_STEEL_ROD("darkSteelRod"), + PRECIENT_CRYSTAL("precientCrystal", true), + PULSATING_POWDER("pulsatingPowder", true), + VIBRANT_POWDER("vibrantPowder", true), + ENDER_POWDER("enderCrystalPowder", true), + PRECIENT_POWDER("precientPowder", true); - SILICON("silicon"), - CONDUIT_BINDER("conduitBinder"), - BINDER_COMPOSITE("binderComposite"), - PHASED_IRON_NUGGET("phasedIronNugget"), - VIBRANT_NUGGET("vibrantNugget"), - PULSATING_CYSTAL("pulsatingCrystal", true), - VIBRANT_CYSTAL("vibrantCrystal", true), - DARK_GRINDING_BALL("darkGrindingBall"), - ENDER_CRYSTAL("enderCrystal", true), - ATTRACTOR_CRYSTAL("attractorCrystal", true), - WEATHER_CRYSTAL("weatherCrystal", true), - END_STEEL_NUGGET("endSteelNugget"), - DARK_STEEL_ROD("darkSteelRod"), - PRECIENT_CRYSTAL("precientCrystal",true), - PULSATING_POWDER("pulsatingPowder", true), - VIBRANT_POWDER("vibrantPowder", true), - ENDER_POWDER("enderCrystalPowder", true), - PRECIENT_POWDER("precientPowder",true); + public final String unlocalisedName; + public final String iconKey; + public final String oreDict; + public final boolean hasEffect; - - - - public final String unlocalisedName; - public final String iconKey; - public final String oreDict; - public final boolean hasEffect; - - private Material(String unlocalisedName) { - this(unlocalisedName, false); - } - - private Material(String unlocalisedName, boolean hasEffect) { - this.unlocalisedName = "enderio." + unlocalisedName; - this.iconKey = "enderio:" + unlocalisedName; - this.hasEffect = hasEffect; - this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); - } - - public static void registerOres(Item item) { - for (Material m : values()) { - OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); + private Material(String unlocalisedName) { + this(unlocalisedName, false); } - } - public ItemStack getStack() { - return getStack(1); - } + private Material(String unlocalisedName, boolean hasEffect) { + this.unlocalisedName = "enderio." + unlocalisedName; + this.iconKey = "enderio:" + unlocalisedName; + this.hasEffect = hasEffect; + this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); + } - public ItemStack getStack(int size) { - return new ItemStack(EnderIO.itemMaterial, size, ordinal()); - } + public static void registerOres(Item item) { + for (Material m : values()) { + OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); + } + } + + public ItemStack getStack() { + return getStack(1); + } + + public ItemStack getStack(int size) { + return new ItemStack(EnderIO.itemMaterial, size, ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index c83e3023..0db986a6 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -1,327 +1,540 @@ package crazypants.enderio.material; -import java.util.ArrayList; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import static com.enderio.core.common.util.OreDictionaryHelper.*; +import static crazypants.enderio.material.Alloy.*; +import static crazypants.enderio.material.Material.*; +import static crazypants.enderio.material.endergy.AlloyEndergy.*; +import static crazypants.enderio.power.Capacitors.*; +import static crazypants.util.RecipeUtil.*; import com.enderio.core.common.util.OreDictionaryHelper; - import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.ItemEnderFood.EnderFood; import crazypants.enderio.material.endergy.AlloyEndergy; import crazypants.enderio.power.Capacitors; - -import static crazypants.enderio.power.Capacitors.*; -import static com.enderio.core.common.util.OreDictionaryHelper.*; -import static crazypants.enderio.material.Alloy.*; -import static crazypants.enderio.material.Material.*; -import static crazypants.enderio.material.endergy.AlloyEndergy.*; -import static crazypants.util.RecipeUtil.*; +import java.util.ArrayList; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class MaterialRecipes { - public static void registerDependantOresInDictionary() { - // late registration for powders that only exist if the ingot from another - // mod exists - for (PowderIngot powder : PowderIngot.values()) { - if (powder.hasDependancy() && powder.isDependancyMet()) { - OreDictionary.registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); - powder.setRegistered(); - } - } - } - - public static void registerOresInDictionary() { - //Ore Dictionary Registration - for (PowderIngot powder : PowderIngot.values()) { - if (!powder.hasDependancy()) { - OreDictionary.registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); - } + public static void registerDependantOresInDictionary() { + // late registration for powders that only exist if the ingot from another + // mod exists + for (PowderIngot powder : PowderIngot.values()) { + if (powder.hasDependancy() && powder.isDependancyMet()) { + OreDictionary.registerOre( + powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); + powder.setRegistered(); + } + } } - for(Capacitors capacitor: Capacitors.values()){ - OreDictionary.registerOre(capacitor.getOreTag(), new ItemStack(EnderIO.itemBasicCapacitor,1,capacitor.ordinal())); + public static void registerOresInDictionary() { + // Ore Dictionary Registration + for (PowderIngot powder : PowderIngot.values()) { + if (!powder.hasDependancy()) { + OreDictionary.registerOre( + powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); + } + } + + for (Capacitors capacitor : Capacitors.values()) { + OreDictionary.registerOre( + capacitor.getOreTag(), new ItemStack(EnderIO.itemBasicCapacitor, 1, capacitor.ordinal())); + } + + for (Alloy alloy : Alloy.values()) { + boolean isPrimaryName = true; + for (String oreDictName : alloy.getOreIngots()) { + OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + // Allow free conversion of additional/legacy oreDict name items into + // our item because we only register recipes for the primary oreDict + // name. Use a 2-to-2 recipe because the 1-to-n is already in use. + addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + } + } + isPrimaryName = true; + for (String oreDictName : alloy.getOreBlocks()) { + OreDictionary.registerOre(oreDictName, alloy.getStackBlock()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + } + } + } + + for (AlloyEndergy alloy : AlloyEndergy.values()) { + boolean isPrimaryName = true; + for (String oreDictName : alloy.getOreIngots()) { + OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + // Allow free conversion of additional/legacy oreDict name items into + // our item because we only register recipes for the primary oreDict + // name. Use a 2-to-2 recipe because the 1-to-n is already in use. + addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + } + } + isPrimaryName = true; + for (String oreDictName : alloy.getOreBlocks()) { + OreDictionary.registerOre(oreDictName, alloy.getStackBlock()); + if (isPrimaryName) { + isPrimaryName = false; + } else { + addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + } + } + } + + OreDictionary.registerOre( + "nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal())); + OreDictionary.registerOre( + "nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal())); + OreDictionary.registerOre( + "nuggetEndSteel", new ItemStack(EnderIO.itemMaterial, 1, Material.END_STEEL_NUGGET.ordinal())); + + OreDictionary.registerOre("glass", Blocks.glass); + OreDictionary.registerOre("stickWood", Items.stick); + OreDictionary.registerOre("woodStick", Items.stick); + OreDictionary.registerOre("sand", new ItemStack(Blocks.sand, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("ingotIron", Items.iron_ingot); + OreDictionary.registerOre("ingotGold", Items.gold_ingot); + + ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); + OreDictionary.registerOre("glass", pureGlass); + OreDictionary.registerOre("blockGlass", pureGlass); + OreDictionary.registerOre( + "blockGlassHardened", + new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); + + // Skulls + ItemStack skull = new ItemStack(Items.skull, 1, OreDictionary.WILDCARD_VALUE); + OreDictionary.registerOre("itemSkull", skull); + OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull)); + + // Glass stuff for compatibility + addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass); + addShapeless(new ItemStack(Blocks.glass), pureGlass); + addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass); + + Material.registerOres(EnderIO.itemMaterial); + MachinePart.registerOres(EnderIO.itemMachinePart); } - for (Alloy alloy : Alloy.values()) { - boolean isPrimaryName = true; - for (String oreDictName : alloy.getOreIngots()) { - OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); - if (isPrimaryName) { - isPrimaryName = false; + public static void addRecipes() { + + // Common Ingredients + String conduitBinder = CONDUIT_BINDER.oreDict; + + ItemStack fusedQuartzFrame = new ItemStack(EnderIO.itemFusedQuartzFrame, 1, 0); + + String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); + String phasedGold = PHASED_GOLD.getOreIngot(); + String phasedIron = PHASED_IRON.getOreIngot(); + String darkSteel = DARK_STEEL.getOreIngot(); + String soularium = SOULARIUM.getOreIngot(); + String endSteel = END_STEEL.getOreIngot(); + + String energeticSilver = ENERGETIC_SILVER.getOreIngot(); + String vividAlloy = VIVID_ALLOY.getOreIngot(); + String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); + String melodicAlloy = MELODIC_ALLOY.getOreIngot(); + String stellarAlloy = STELLAR_ALLOY.getOreIngot(); + + String capacitor = Capacitors.BASIC_CAPACITOR.getOreTag(); + String capacitorAdv = Capacitors.ACTIVATED_CAPACITOR.getOreTag(); + String capacitorEnder = Capacitors.ENDER_CAPACITOR.getOreTag(); + String capacitorCrystal = Capacitors.CRYSTALLINE_CAPACITOR.getOreTag(); + String capacitorMelodic = Capacitors.MELODIC_CAPACITOR.getOreTag(); + + String ingotCopper = + OreDictionary.doesOreNameExist("ingotCopper") && Config.useModMetals ? "ingotCopper" : "ingotIron"; + + // Capacitors + if (Config.useHardRecipes) { + addShaped( + BASIC_CAPACITOR.getItemStack(), + " gr", + "gig", + "rg ", + 'r', + "dustRedstone", + 'g', + "ingotGold", + 'i', + ingotCopper); + addShaped( + ACTIVATED_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + energeticAlloy, + 'c', + BASIC_CAPACITOR.getItemStack(), + 'C', + "dustCoal"); + addShaped( + ENDER_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + phasedGold, + 'c', + ACTIVATED_CAPACITOR.getItemStack(), + 'C', + "glowstone"); + + String prismarine = + OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine" : "itemPulsatingCrystal"; + addShaped( + CRYSTALLINE_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + crystallineAlloy, + 'c', + capacitorEnder, + 'C', + prismarine); + addShaped( + MELODIC_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + melodicAlloy, + 'c', + CRYSTALLINE_CAPACITOR.getItemStack(), + 'C', + endSteel); + addShaped( + STELLAR_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + stellarAlloy, + 'c', + MELODIC_CAPACITOR.getItemStack(), + 'C', + PRECIENT_CRYSTAL.oreDict); + + addShaped( + SILVER_CAPACITOR.getItemStack(), + " sr", + "sis", + "rs ", + 'r', + "dustRedstone", + 's', + "ingotSilver", + 'i', + "ingotLead"); + addShaped( + ENDERGETIC_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + energeticSilver, + 'c', + SILVER_CAPACITOR.getItemStack(), + 'C', + "dustCoal"); + addShaped( + ENDERGISED_CAPACITOR.getItemStack(), + "iii", + "cCc", + "iii", + 'i', + vividAlloy, + 'c', + ENDERGETIC_CAPACITOR.getItemStack(), + 'C', + "glowstone"); + } else { - // Allow free conversion of additional/legacy oreDict name items into - // our item because we only register recipes for the primary oreDict - // name. Use a 2-to-2 recipe because the 1-to-n is already in use. - addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); + addShaped( + BASIC_CAPACITOR.getItemStack(), + " gr", + "gig", + "rg ", + 'r', + "dustRedstone", + 'g', + "ingotGold", + 'i', + ingotCopper); + addShaped( + ACTIVATED_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + energeticAlloy, + 'c', + BASIC_CAPACITOR.getItemStack(), + 'C', + "dustCoal"); + addShaped( + ENDER_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + phasedGold, + 'c', + ACTIVATED_CAPACITOR.getItemStack(), + 'C', + "glowstone"); + + String prismarine = + OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine" : "itemPulsatingCrystal"; + addShaped( + CRYSTALLINE_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + crystallineAlloy, + 'c', + capacitorEnder, + 'C', + prismarine); + addShaped( + MELODIC_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + melodicAlloy, + 'c', + CRYSTALLINE_CAPACITOR.getItemStack(), + 'C', + endSteel); + addShaped( + STELLAR_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + stellarAlloy, + 'c', + MELODIC_CAPACITOR.getItemStack(), + 'C', + PRECIENT_CRYSTAL.oreDict); + + addShaped( + SILVER_CAPACITOR.getItemStack(), + " sr", + "sis", + "rs ", + 'r', + "dustRedstone", + 's', + "ingotSilver", + 'i', + "ingotLead"); + addShaped( + ENDERGETIC_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + energeticSilver, + 'c', + SILVER_CAPACITOR.getItemStack(), + 'C', + "dustCoal"); + addShaped( + ENDERGISED_CAPACITOR.getItemStack(), + " i ", + "cCc", + " i ", + 'i', + vividAlloy, + 'c', + ENDERGETIC_CAPACITOR.getItemStack(), + 'C', + "glowstone"); } - } - isPrimaryName = true; - for (String oreDictName : alloy.getOreBlocks()) { - OreDictionary.registerOre(oreDictName, alloy.getStackBlock()); - if (isPrimaryName) { - isPrimaryName = false; + + // Conduit Binder + ItemStack cbc = BINDER_COMPOSITE.getStack(8); + if (Config.useAlternateBinderRecipe) { + addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); } else { - addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); + addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); } - } - } + GameRegistry.addSmelting(BINDER_COMPOSITE.getStack(), CONDUIT_BINDER.getStack(4), 0); - for (AlloyEndergy alloy : AlloyEndergy.values()) { - boolean isPrimaryName = true; - for (String oreDictName : alloy.getOreIngots()) { - OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); - if (isPrimaryName) { - isPrimaryName = false; - } else { - // Allow free conversion of additional/legacy oreDict name items into - // our item because we only register recipes for the primary oreDict - // name. Use a 2-to-2 recipe because the 1-to-n is already in use. - addShapeless(alloy.getStackIngot(2), oreDictName, oreDictName); - } + // Nuggets + ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal()); + addShapeless(phasedIronNugget, phasedIron); + phasedIronNugget = phasedIronNugget.copy(); + phasedIronNugget.stackSize = 1; + addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget); + + ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal()); + addShapeless(vibrantNugget, phasedGold); + vibrantNugget = vibrantNugget.copy(); + vibrantNugget.stackSize = 1; + addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget); + + ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal()); + addShapeless(endSteelNugget, endSteel); + endSteelNugget = endSteelNugget.copy(); + endSteelNugget.stackSize = 1; + addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget); + + // Crystals + ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond"); + + ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); + + // Smelting + ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); + ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); + ItemStack ingotIron = new ItemStack(Items.iron_ingot); + ItemStack ingotGold = new ItemStack(Items.gold_ingot); + + GameRegistry.addSmelting(dustIron, ingotIron, 0); + GameRegistry.addSmelting(dustGold, ingotGold, 0); + + // Ender Dusts + ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); + + // Dark Iron Bars + ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); + addShaped(diBars, "ddd", "ddd", 'd', darkSteel); + + // Dark Iron Bars + ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0); + addShaped(soBars, "ddd", "ddd", 'd', soularium); + + // Dark Iron Bars + ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0); + addShaped(esBars, "ddd", "ddd", 'd', endSteel); + + // Fused Quartz Frame + addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); + addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); + + // Machine Chassis + + ArrayList steelIngots = OreDictionary.getOres("ingotSteel"); + + ItemStack chassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); + String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() + ? "ingotSteel" + : "ingotIron"; + addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); + + ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); + addShaped( + soulchassis, + "fif", + "ici", + "fif", + 'f', + EnderIO.blockSoulariumBars, + 'i', + Alloy.SOULARIUM.getOreIngot(), + 'c', + capacitor); + + ItemStack endchassis = + new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); + addShaped( + endchassis, + "fif", + "ici", + "fif", + 'f', + EnderIO.blockEndSteelBars, + 'i', + Alloy.END_STEEL.getOreIngot(), + 'c', + capacitor); + + // Basic Gear + ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); + addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone"); + + // Weather Crystal + ItemStack main = Config.useHardRecipes + ? new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()) + : new ItemStack(Items.diamond); + GameRegistry.addRecipe(new ShapelessOreRecipe( + new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()), + main /* TODO figure out new weather crystal recipe */)); + + if (Config.reinforcedObsidianEnabled) { + ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); + String corners = darkSteel; + if (Config.reinforcedObsidianUseDarkSteelBlocks) { + corners = Alloy.DARK_STEEL.getOreBlock(); + } + addShaped( + reinfObs, "dbd", "bob", "dbd", 'd', corners, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); } - isPrimaryName = true; - for (String oreDictName : alloy.getOreBlocks()) { - OreDictionary.registerOre(oreDictName, alloy.getStackBlock()); - if (isPrimaryName) { - isPrimaryName = false; - } else { - addShapeless(alloy.getStackBlock(2), oreDictName, oreDictName); - } + + addShaped(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", 'b', DARK_STEEL.getOreBlock(), 'i', darkSteel); + + addShaped(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars); + + for (Alloy alloy : Alloy.values()) { + addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); + addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); } - } - OreDictionary.registerOre("nuggetPulsatingIron", new ItemStack(EnderIO.itemMaterial, 1, Material.PHASED_IRON_NUGGET.ordinal())); - OreDictionary.registerOre("nuggetVibrantAlloy", new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_NUGGET.ordinal())); - OreDictionary.registerOre("nuggetEndSteel", new ItemStack(EnderIO.itemMaterial, 1, Material.END_STEEL_NUGGET.ordinal())); + for (AlloyEndergy alloy : AlloyEndergy.values()) { + addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); + addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); + addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); + } - OreDictionary.registerOre("glass", Blocks.glass); - OreDictionary.registerOre("stickWood", Items.stick); - OreDictionary.registerOre("woodStick", Items.stick); - OreDictionary.registerOre("sand", new ItemStack(Blocks.sand, 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre("ingotIron", Items.iron_ingot); - OreDictionary.registerOre("ingotGold", Items.gold_ingot); + // DS Rod + ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal()); + addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget); - ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); - OreDictionary.registerOre("glass", pureGlass); - OreDictionary.registerOre("blockGlass", pureGlass); - OreDictionary.registerOre("blockGlassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); + // Food + ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); + ItemStack bread = new ItemStack(Items.bread, 1, 0); - //Skulls - ItemStack skull = new ItemStack(Items.skull, 1, OreDictionary.WILDCARD_VALUE); - OreDictionary.registerOre("itemSkull", skull); - OreDictionary.registerOre("itemSkull", new ItemStack(EnderIO.blockEndermanSkull)); + GameRegistry.addSmelting(flour, bread, 0.35f); - //Glass stuff for compatibility - addShaped(new ItemStack(Blocks.glass_pane, 16, 0), "eee", "eee", 'e', pureGlass); - addShapeless(new ItemStack(Blocks.glass), pureGlass); - addShaped(new ItemStack(Items.glass_bottle, 3, 0), "g g", " g ", 'g', pureGlass); - - Material.registerOres(EnderIO.itemMaterial); - MachinePart.registerOres(EnderIO.itemMachinePart); - } - - public static void addRecipes() { - - //Common Ingredients - String conduitBinder = CONDUIT_BINDER.oreDict; - - ItemStack fusedQuartzFrame = new ItemStack(EnderIO.itemFusedQuartzFrame, 1, 0); - - String energeticAlloy = ENERGETIC_ALLOY.getOreIngot(); - String phasedGold = PHASED_GOLD.getOreIngot(); - String phasedIron = PHASED_IRON.getOreIngot(); - String darkSteel = DARK_STEEL.getOreIngot(); - String soularium = SOULARIUM.getOreIngot(); - String endSteel = END_STEEL.getOreIngot(); - - String energeticSilver = ENERGETIC_SILVER.getOreIngot(); - String vividAlloy = VIVID_ALLOY.getOreIngot(); - String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot(); - String melodicAlloy = MELODIC_ALLOY.getOreIngot(); - String stellarAlloy = STELLAR_ALLOY.getOreIngot(); - - String capacitor = Capacitors.BASIC_CAPACITOR.getOreTag(); - String capacitorAdv = Capacitors.ACTIVATED_CAPACITOR.getOreTag(); - String capacitorEnder = Capacitors.ENDER_CAPACITOR.getOreTag(); - String capacitorCrystal = Capacitors.CRYSTALLINE_CAPACITOR.getOreTag(); - String capacitorMelodic = Capacitors.MELODIC_CAPACITOR.getOreTag(); - - String ingotCopper = OreDictionary.doesOreNameExist("ingotCopper") && Config.useModMetals ? "ingotCopper": "ingotIron"; - - //Capacitors - if (Config.useHardRecipes) { - addShaped(BASIC_CAPACITOR.getItemStack(), " gr", "gig", "rg ", 'r', "dustRedstone", 'g', "ingotGold", 'i', ingotCopper); - addShaped(ACTIVATED_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', energeticAlloy, 'c', BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped(ENDER_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', phasedGold, 'c', ACTIVATED_CAPACITOR.getItemStack(), 'C', "glowstone"); - - String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine": "itemPulsatingCrystal"; - addShaped(CRYSTALLINE_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', crystallineAlloy, 'c', capacitorEnder, 'C', prismarine); - addShaped(MELODIC_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', melodicAlloy, 'c', CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); - addShaped(STELLAR_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', stellarAlloy, 'c', MELODIC_CAPACITOR.getItemStack(), 'C', PRECIENT_CRYSTAL.oreDict); - - addShaped(SILVER_CAPACITOR.getItemStack(), " sr", "sis", "rs ", 'r', "dustRedstone", 's', "ingotSilver", 'i', "ingotLead"); - addShaped(ENDERGETIC_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', energeticSilver, 'c', SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped(ENDERGISED_CAPACITOR.getItemStack(), "iii", "cCc", "iii", 'i', vividAlloy, 'c', ENDERGETIC_CAPACITOR.getItemStack(), 'C', "glowstone"); + ItemStack enderios = EnderFood.ENDERIOS.getStack(); + addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); + if (hasCopper()) { + ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); + ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); + GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); + } + if (hasTin()) { + ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); + ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); + GameRegistry.addSmelting(dustTin, ingotTin, 0); + } } - - else { - addShaped(BASIC_CAPACITOR.getItemStack(), " gr", "gig", "rg ", 'r', "dustRedstone", 'g', "ingotGold", 'i', ingotCopper); - addShaped(ACTIVATED_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', energeticAlloy, 'c', BASIC_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped(ENDER_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', phasedGold, 'c', ACTIVATED_CAPACITOR.getItemStack(), 'C', "glowstone"); - - String prismarine = OreDictionary.doesOreNameExist("shardPrismarine") ? "shardPrismarine": "itemPulsatingCrystal"; - addShaped(CRYSTALLINE_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', crystallineAlloy, 'c', capacitorEnder, 'C', prismarine); - addShaped(MELODIC_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', melodicAlloy, 'c', CRYSTALLINE_CAPACITOR.getItemStack(), 'C', endSteel); - addShaped(STELLAR_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', stellarAlloy, 'c', MELODIC_CAPACITOR.getItemStack(), 'C', PRECIENT_CRYSTAL.oreDict); - - addShaped(SILVER_CAPACITOR.getItemStack(), " sr", "sis", "rs ", 'r', "dustRedstone", 's', "ingotSilver", 'i', "ingotLead"); - addShaped(ENDERGETIC_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', energeticSilver, 'c', SILVER_CAPACITOR.getItemStack(), 'C', "dustCoal"); - addShaped(ENDERGISED_CAPACITOR.getItemStack(), " i ", "cCc", " i ", 'i', vividAlloy, 'c', ENDERGETIC_CAPACITOR.getItemStack(), 'C', "glowstone"); - } - - //Conduit Binder - ItemStack cbc = BINDER_COMPOSITE.getStack(8); - if (Config.useAlternateBinderRecipe) { - addShaped(cbc, "gcg", "sgs", "gcg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); - } else { - addShaped(cbc, "ggg", "scs", "ggg", 'g', Blocks.gravel, 's', "sand", 'c', Items.clay_ball); - } - GameRegistry.addSmelting(BINDER_COMPOSITE.getStack(), CONDUIT_BINDER.getStack(4), 0); - - //Nuggets - ItemStack phasedIronNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.PHASED_IRON_NUGGET.ordinal()); - addShapeless(phasedIronNugget, phasedIron); - phasedIronNugget = phasedIronNugget.copy(); - phasedIronNugget.stackSize = 1; - addShaped(PHASED_IRON.getStackIngot(), "eee", "eee", "eee", 'e', phasedIronNugget); - - ItemStack vibrantNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.VIBRANT_NUGGET.ordinal()); - addShapeless(vibrantNugget, phasedGold); - vibrantNugget = vibrantNugget.copy(); - vibrantNugget.stackSize = 1; - addShaped(PHASED_GOLD.getStackIngot(), "eee", "eee", "eee", 'e', vibrantNugget); - - ItemStack endSteelNugget = new ItemStack(EnderIO.itemMaterial, 9, Material.END_STEEL_NUGGET.ordinal()); - addShapeless(endSteelNugget, endSteel); - endSteelNugget = endSteelNugget.copy(); - endSteelNugget.stackSize = 1; - addShaped(END_STEEL.getStackIngot(), "eee", "eee", "eee", 'e', endSteelNugget); - - //Crystals - ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); - addShaped(pulsCry, "nnn", "ngn", "nnn", 'n', phasedIronNugget, 'g', "gemDiamond"); - - ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); - addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald"); - - //Smelting - ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); - ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); - ItemStack ingotIron = new ItemStack(Items.iron_ingot); - ItemStack ingotGold = new ItemStack(Items.gold_ingot); - - GameRegistry.addSmelting(dustIron, ingotIron, 0); - GameRegistry.addSmelting(dustGold, ingotGold, 0); - - //Ender Dusts - ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); - addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust); - - //Dark Iron Bars - ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0); - addShaped(diBars, "ddd", "ddd", 'd', darkSteel); - - //Dark Iron Bars - ItemStack soBars = new ItemStack(EnderIO.blockSoulariumBars, 16, 0); - addShaped(soBars, "ddd", "ddd", 'd', soularium); - - //Dark Iron Bars - ItemStack esBars = new ItemStack(EnderIO.blockEndSteelBars, 16, 0); - addShaped(esBars, "ddd", "ddd", 'd', endSteel); - - // Fused Quartz Frame - addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "stickWood"); - addShaped(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', "woodStick"); - - // Machine Chassis - - ArrayList steelIngots = OreDictionary.getOres("ingotSteel"); - - ItemStack chassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); - String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel" : "ingotIron"; - addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); - - ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); - addShaped(soulchassis, "fif", "ici", "fif", 'f', EnderIO.blockSoulariumBars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor); - - ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); - addShaped(endchassis, "fif", "ici", "fif", 'f', EnderIO.blockEndSteelBars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor); - - - // Basic Gear - ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); - addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); - addShaped(gear, "scs", "c c", "scs", 's', "woodStick", 'c', "cobblestone"); - - // Weather Crystal - ItemStack main = Config.useHardRecipes ? new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()) : new ItemStack(Items.diamond); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(EnderIO.itemMaterial, 1, Material.WEATHER_CRYSTAL.ordinal()), main /* TODO figure out new weather crystal recipe */)); - - if (Config.reinforcedObsidianEnabled) { - ItemStack reinfObs = new ItemStack(EnderIO.blockReinforcedObsidian); - String corners = darkSteel; - if (Config.reinforcedObsidianUseDarkSteelBlocks) { - corners = Alloy.DARK_STEEL.getOreBlock(); - } - addShaped(reinfObs, "dbd", "bob", "dbd", 'd', corners, 'b', EnderIO.blockDarkIronBars, 'o', Blocks.obsidian); - } - - addShaped(EnderIO.blockDarkSteelAnvil, "bbb", " i ", "iii", 'b', DARK_STEEL.getOreBlock(), 'i', darkSteel); - - addShaped(new ItemStack(EnderIO.blockDarkSteelLadder, 12), "b", "b", "b", 'b', EnderIO.blockDarkIronBars); - - for (Alloy alloy : Alloy.values()) { - addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); - addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); - addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); - } - - for (AlloyEndergy alloy : AlloyEndergy.values()) { - addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); - addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); - addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); - } - - //DS Rod - ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal()); - addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel,'n', endSteelNugget); - - //Food - ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal()); - ItemStack bread = new ItemStack(Items.bread, 1, 0); - - GameRegistry.addSmelting(flour, bread, 0.35f); - - ItemStack enderios = EnderFood.ENDERIOS.getStack(); - addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl"); - - if (hasCopper()) { - ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal()); - ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER); - GameRegistry.addSmelting(dustCopper, ingotCoppper, 0); - } - if (hasTin()) { - ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal()); - ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN); - GameRegistry.addSmelting(dustTin, ingotTin, 0); - } - } - } +} diff --git a/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java b/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java index 605dbc3d..bf7ffcec 100644 --- a/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java +++ b/src/main/java/crazypants/enderio/material/OreDictionaryPreferenceParser.java @@ -1,143 +1,138 @@ package crazypants.enderio.material; -import java.io.File; -import java.io.IOException; -import java.io.StringReader; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.DefaultHandler; - import crazypants.enderio.Log; import crazypants.enderio.config.Config; import crazypants.enderio.machine.recipe.RecipeConfig; import crazypants.enderio.machine.recipe.RecipeConfigParser; import crazypants.enderio.machine.recipe.RecipeInput; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; public final class OreDictionaryPreferenceParser extends DefaultHandler { - private static final String CORE_FILE_NAME = "OreDictionaryPreferences_Core.xml"; - private static final String CUSTOM_FILE_NAME = "OreDictionaryPreferences_User.xml"; + private static final String CORE_FILE_NAME = "OreDictionaryPreferences_Core.xml"; + private static final String CUSTOM_FILE_NAME = "OreDictionaryPreferences_User.xml"; - public static void loadConfig() { - File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); + public static void loadConfig() { + File coreFile = new File(Config.configDirectory, CORE_FILE_NAME); - String defaultVals = null; - try { - defaultVals = RecipeConfig.readRecipes(coreFile, CORE_FILE_NAME, true); - } catch (IOException e) { - Log.error("Could not load painter lists " + coreFile + " from EnderIO jar: " + e.getMessage()); - e.printStackTrace(); - return; - } - if(!coreFile.exists()) { - Log.error("Could not load default lists from " + coreFile + " as the file does not exist."); - return; - } - - try { - parse(defaultVals); - } catch (Exception e) { - Log.error("Could not parse default lists from " + coreFile + ": " + e); - } - - File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); - String userConfigStr = null; - try { - userConfigStr = RecipeConfig.readRecipes(userFile, CUSTOM_FILE_NAME, false); - if(userConfigStr == null || userConfigStr.trim().length() == 0) { - Log.error("Empty user config file: " + userFile.getAbsolutePath()); - } else { - parse(userConfigStr); - } - } catch (Exception e) { - Log.error("Could not load user defined painter lists from file: " + CUSTOM_FILE_NAME); - e.printStackTrace(); - } - } - - public static void parse(String str) throws Exception { - StringReader reader = new StringReader(str); - InputSource is = new InputSource(reader); - try { - parse(is); - } finally { - reader.close(); - } - - } - - private static void parse(InputSource is) throws Exception { - OreDictionaryPreferenceParser parser = new OreDictionaryPreferenceParser(OreDictionaryPreferences.instance); - - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setNamespaceAware(true); - SAXParser saxParser = spf.newSAXParser(); - XMLReader xmlReader = saxParser.getXMLReader(); - xmlReader.setContentHandler(parser); - xmlReader.parse(is); - } - - public static final String ELEMENT_PREF = "preference"; - public static final String ELEMENT_STACK = "itemStack"; - - private static final String AT_ORE_DICT = "oreDictionary"; - public static final String AT_ITEM_META = "itemMeta"; - public static final String AT_ITEM_NAME = "itemName"; - public static final String AT_MOD_ID = "modID"; - - private OreDictionaryPreferences prefs; - private String oreDictName; - private ItemStack prefStack; - - private OreDictionaryPreferenceParser(OreDictionaryPreferences prefs) { - this.prefs = prefs; - } - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { - if(ELEMENT_PREF.equals(localName)) { - oreDictName = RecipeConfigParser.getStringValue(AT_ORE_DICT, attributes, null); - return; - } - if(ELEMENT_STACK.equals(localName) && oreDictName != null && prefStack == null) { - RecipeInput ri = RecipeConfigParser.getItemStack(attributes); - if(ri != null && ri.getInput() != null) { - prefStack = ri.getInput(); - } - return; - } - } - - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if(ELEMENT_PREF.equals(localName)) { - if(oreDictName != null && prefStack != null) { - boolean matched = false; - int[] ids = OreDictionary.getOreIDs(prefStack); - if(ids != null) { - for (int i = 0; i < ids.length && !matched; i++) { - matched = oreDictName.equals(OreDictionary.getOreName(ids[i])); - } + String defaultVals = null; + try { + defaultVals = RecipeConfig.readRecipes(coreFile, CORE_FILE_NAME, true); + } catch (IOException e) { + Log.error("Could not load painter lists " + coreFile + " from EnderIO jar: " + e.getMessage()); + e.printStackTrace(); + return; } - if(matched) { - prefs.setPreference(oreDictName, prefStack); - } else { - Log.warn("OreDictionaryPreferenceParser: Attempted to register " + prefStack + " as the preffered output for " + oreDictName - + " but it is not registered in the OreDictionary as " + oreDictName); + if (!coreFile.exists()) { + Log.error("Could not load default lists from " + coreFile + " as the file does not exist."); + return; } - } - oreDictName = null; - prefStack = null; - } - } + try { + parse(defaultVals); + } catch (Exception e) { + Log.error("Could not parse default lists from " + coreFile + ": " + e); + } + + File userFile = new File(Config.configDirectory, CUSTOM_FILE_NAME); + String userConfigStr = null; + try { + userConfigStr = RecipeConfig.readRecipes(userFile, CUSTOM_FILE_NAME, false); + if (userConfigStr == null || userConfigStr.trim().length() == 0) { + Log.error("Empty user config file: " + userFile.getAbsolutePath()); + } else { + parse(userConfigStr); + } + } catch (Exception e) { + Log.error("Could not load user defined painter lists from file: " + CUSTOM_FILE_NAME); + e.printStackTrace(); + } + } + + public static void parse(String str) throws Exception { + StringReader reader = new StringReader(str); + InputSource is = new InputSource(reader); + try { + parse(is); + } finally { + reader.close(); + } + } + + private static void parse(InputSource is) throws Exception { + OreDictionaryPreferenceParser parser = new OreDictionaryPreferenceParser(OreDictionaryPreferences.instance); + + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setNamespaceAware(true); + SAXParser saxParser = spf.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setContentHandler(parser); + xmlReader.parse(is); + } + + public static final String ELEMENT_PREF = "preference"; + public static final String ELEMENT_STACK = "itemStack"; + + private static final String AT_ORE_DICT = "oreDictionary"; + public static final String AT_ITEM_META = "itemMeta"; + public static final String AT_ITEM_NAME = "itemName"; + public static final String AT_MOD_ID = "modID"; + + private OreDictionaryPreferences prefs; + private String oreDictName; + private ItemStack prefStack; + + private OreDictionaryPreferenceParser(OreDictionaryPreferences prefs) { + this.prefs = prefs; + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (ELEMENT_PREF.equals(localName)) { + oreDictName = RecipeConfigParser.getStringValue(AT_ORE_DICT, attributes, null); + return; + } + if (ELEMENT_STACK.equals(localName) && oreDictName != null && prefStack == null) { + RecipeInput ri = RecipeConfigParser.getItemStack(attributes); + if (ri != null && ri.getInput() != null) { + prefStack = ri.getInput(); + } + return; + } + } + + @Override + public void endElement(String uri, String localName, String qName) throws SAXException { + if (ELEMENT_PREF.equals(localName)) { + if (oreDictName != null && prefStack != null) { + boolean matched = false; + int[] ids = OreDictionary.getOreIDs(prefStack); + if (ids != null) { + for (int i = 0; i < ids.length && !matched; i++) { + matched = oreDictName.equals(OreDictionary.getOreName(ids[i])); + } + } + if (matched) { + prefs.setPreference(oreDictName, prefStack); + } else { + Log.warn("OreDictionaryPreferenceParser: Attempted to register " + prefStack + + " as the preffered output for " + oreDictName + + " but it is not registered in the OreDictionary as " + oreDictName); + } + } + oreDictName = null; + prefStack = null; + } + } } diff --git a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java index 9cff008a..5dbdf200 100644 --- a/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java +++ b/src/main/java/crazypants/enderio/material/OreDictionaryPreferences.java @@ -1,118 +1,113 @@ package crazypants.enderio.material; +import com.enderio.core.common.util.OreDictionaryHelper; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.enderio.core.common.util.OreDictionaryHelper; - public final class OreDictionaryPreferences { - public static final OreDictionaryPreferences instance = new OreDictionaryPreferences(); + public static final OreDictionaryPreferences instance = new OreDictionaryPreferences(); - public static void loadConfig() { - OreDictionaryPreferenceParser.loadConfig(); - } - - private Map preferences = new HashMap(); - private Map stackCache = new HashMap(); - - public void setPreference(String oreDictName, ItemStack stack) { - if(oreDictName == null || stack == null) { - return; + public static void loadConfig() { + OreDictionaryPreferenceParser.loadConfig(); } - preferences.put(oreDictName, stack.copy()); - } - public ItemStack getPreferred(String oreDictName) { - ItemStack result = null; - if(preferences.containsKey(oreDictName)) { - result = preferences.get(oreDictName); - } else { - List ores = OreDictionaryHelper.getOres(oreDictName); - if(!ores.isEmpty() && ores.get(0) != null) { - result = ores.get(0).copy(); - } - preferences.put(oreDictName, result); - } - return result; - } + private Map preferences = new HashMap(); + private Map stackCache = new HashMap(); - public ItemStack getPreferred(ItemStack stack) { - if(stack == null || stack.getItem() == null) { - return stack; - } - StackKey key = new StackKey(stack); - if(stackCache.containsKey(key)) { - return stackCache.get(key); - } - ItemStack result = null; - int[] ids = OreDictionary.getOreIDs(stack); - if(ids != null) { - for (int i = 0; i < ids.length && result == null; i++) { - String oreDict = OreDictionary.getOreName(ids[i]); - if(preferences.containsKey(oreDict)) { - result = preferences.get(oreDict); + public void setPreference(String oreDictName, ItemStack stack) { + if (oreDictName == null || stack == null) { + return; } - } + preferences.put(oreDictName, stack.copy()); } - if(result == null) { - result = stack.copy(); - } - stackCache.put(key, result); - return stack; - - } - - private static class StackKey { - - Item item; - int damage; - - StackKey(ItemStack stack) { - item = stack.getItem(); - damage = stack.getItemDamage(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + damage; - result = prime * result + ((item == null) ? 0 : item.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if(this == obj) { - return true; - } - if(obj == null) { - return false; - } - if(getClass() != obj.getClass()) { - return false; - } - StackKey other = (StackKey) obj; - if(damage != other.damage) { - return false; - } - if(item == null) { - if(other.item != null) { - return false; + public ItemStack getPreferred(String oreDictName) { + ItemStack result = null; + if (preferences.containsKey(oreDictName)) { + result = preferences.get(oreDictName); + } else { + List ores = OreDictionaryHelper.getOres(oreDictName); + if (!ores.isEmpty() && ores.get(0) != null) { + result = ores.get(0).copy(); + } + preferences.put(oreDictName, result); } - } else if(!item.equals(other.item)) { - return false; - } - return true; + return result; } - } + public ItemStack getPreferred(ItemStack stack) { + if (stack == null || stack.getItem() == null) { + return stack; + } + StackKey key = new StackKey(stack); + if (stackCache.containsKey(key)) { + return stackCache.get(key); + } + ItemStack result = null; + int[] ids = OreDictionary.getOreIDs(stack); + if (ids != null) { + for (int i = 0; i < ids.length && result == null; i++) { + String oreDict = OreDictionary.getOreName(ids[i]); + if (preferences.containsKey(oreDict)) { + result = preferences.get(oreDict); + } + } + } + if (result == null) { + result = stack.copy(); + } + stackCache.put(key, result); + return stack; + } + + private static class StackKey { + + Item item; + int damage; + + StackKey(ItemStack stack) { + item = stack.getItem(); + damage = stack.getItemDamage(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + damage; + result = prime * result + ((item == null) ? 0 : item.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + StackKey other = (StackKey) obj; + if (damage != other.damage) { + return false; + } + if (item == null) { + if (other.item != null) { + return false; + } + } else if (!item.equals(other.item)) { + return false; + } + return true; + } + } } diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index 04c9894a..5e91f3d8 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -3,65 +3,65 @@ package crazypants.enderio.material; import static com.enderio.core.common.util.OreDictionaryHelper.*; public enum PowderIngot { + POWDER_COAL("powderCoal", null, "dustCoal"), // + POWDER_IRON("powderIron", null, "dustIron"), // + POWDER_GOLD("powderGold", null, "dustGold"), // + POWDER_COPPER("powderCopper", INGOT_COPPER, "dustCopper"), // + POWDER_TIN("powderTin", INGOT_TIN, "dustTin"), // + POWDER_ENDER("powderEnder", DUST_ENDERPEARL, "dustEnderPearl", true), // + INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM, "ingotEnderiumBase"), // + POWDER_OBSIDIAN("powderObsidian", null, "dustObsidian"), // + FLOUR("dustWheat", null); + // POWDER_LEAD("powderLead", "Lead Powder", "powderLead"), + // POWDER_SILVER("powderSilver", "Silver Powder", "powderSilver"), + // POWDER_BRONZE("powderBronze", "Bronze Powder", "powderBronze"), + // INGOT_COPPER("ingotCopper", "Copper Ingot", "ingotCopper"); + // INGOT_TIN("ingotTin", "Tin Ingot", "ingotTin"), + // INGOT_LEAD("ingotLead", "Lead Ingot", "ingotLead"), + // INGOT_SILVER("ingotSilver", "Silver Ingot", "ingotSilver"), + // INGOT_BRONZE("ingotBronze", "Bronze Ingot", "ingotBronze"), + // INGOT_ELECTRUM("ingotElectrum", "Electrum Ingot", "ingotElectrum"); - POWDER_COAL("powderCoal", null, "dustCoal"), // - POWDER_IRON("powderIron", null, "dustIron"), // - POWDER_GOLD("powderGold", null, "dustGold"), // - POWDER_COPPER("powderCopper", INGOT_COPPER, "dustCopper"), // - POWDER_TIN("powderTin", INGOT_TIN, "dustTin"), // - POWDER_ENDER("powderEnder", DUST_ENDERPEARL, "dustEnderPearl", true), // - INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM, "ingotEnderiumBase"), // - POWDER_OBSIDIAN("powderObsidian", null, "dustObsidian"), // - FLOUR("dustWheat", null); - // POWDER_LEAD("powderLead", "Lead Powder", "powderLead"), - // POWDER_SILVER("powderSilver", "Silver Powder", "powderSilver"), - // POWDER_BRONZE("powderBronze", "Bronze Powder", "powderBronze"), - // INGOT_COPPER("ingotCopper", "Copper Ingot", "ingotCopper"); - // INGOT_TIN("ingotTin", "Tin Ingot", "ingotTin"), - // INGOT_LEAD("ingotLead", "Lead Ingot", "ingotLead"), - // INGOT_SILVER("ingotSilver", "Silver Ingot", "ingotSilver"), - // INGOT_BRONZE("ingotBronze", "Bronze Ingot", "ingotBronze"), - // INGOT_ELECTRUM("ingotElectrum", "Electrum Ingot", "ingotElectrum"); + public final String unlocalisedName; + public final String oreDictName; + public final String iconKey; + public final String oreDictDependancy; + public final boolean reverseDependency; + public boolean ignoreRuntimeDependencyCheck = false; - public final String unlocalisedName; - public final String oreDictName; - public final String iconKey; - public final String oreDictDependancy; - public final boolean reverseDependency; - public boolean ignoreRuntimeDependencyCheck = false; - - private PowderIngot(String unlocalisedName, String oreDictDependancy, String oreDictName, boolean reverseDependency) { - this.unlocalisedName = "enderio." + unlocalisedName; - iconKey = "enderio:" + unlocalisedName; - this.oreDictName = oreDictName; - this.oreDictDependancy = oreDictDependancy; - this.reverseDependency = reverseDependency; - } - - private PowderIngot(String unlocalisedName, String oreDictDependancy, boolean reverseDependency) { - this(unlocalisedName, oreDictDependancy, unlocalisedName, reverseDependency); - } - - private PowderIngot(String unlocalisedName, String oreDictDependancy, String oreDictName) { - this(unlocalisedName, oreDictDependancy, oreDictName, false); - } - - private PowderIngot(String unlocalisedName, String oreDictDependancy) { - this(unlocalisedName, oreDictDependancy, unlocalisedName, false); - } - - public boolean isDependancyMet() { - if (oreDictDependancy == null || ignoreRuntimeDependencyCheck) { - return true; + private PowderIngot( + String unlocalisedName, String oreDictDependancy, String oreDictName, boolean reverseDependency) { + this.unlocalisedName = "enderio." + unlocalisedName; + iconKey = "enderio:" + unlocalisedName; + this.oreDictName = oreDictName; + this.oreDictDependancy = oreDictDependancy; + this.reverseDependency = reverseDependency; } - return isRegistered(oreDictDependancy) == !reverseDependency; - } - public boolean hasDependancy() { - return oreDictDependancy == null; - } + private PowderIngot(String unlocalisedName, String oreDictDependancy, boolean reverseDependency) { + this(unlocalisedName, oreDictDependancy, unlocalisedName, reverseDependency); + } - public void setRegistered() { - ignoreRuntimeDependencyCheck = true; - } + private PowderIngot(String unlocalisedName, String oreDictDependancy, String oreDictName) { + this(unlocalisedName, oreDictDependancy, oreDictName, false); + } + + private PowderIngot(String unlocalisedName, String oreDictDependancy) { + this(unlocalisedName, oreDictDependancy, unlocalisedName, false); + } + + public boolean isDependancyMet() { + if (oreDictDependancy == null || ignoreRuntimeDependencyCheck) { + return true; + } + return isRegistered(oreDictDependancy) == !reverseDependency; + } + + public boolean hasDependancy() { + return oreDictDependancy == null; + } + + public void setRegistered() { + ignoreRuntimeDependencyCheck = true; + } } diff --git a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java index a49b6c5d..15e8a1b7 100644 --- a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java @@ -1,85 +1,79 @@ package crazypants.enderio.material.endergy; +import crazypants.enderio.EnderIO; import java.util.ArrayList; import java.util.List; - import net.minecraft.item.ItemStack; - import org.apache.commons.lang3.StringUtils; -import crazypants.enderio.EnderIO; - public enum AlloyEndergy { + CRUDE_STEEL("crudeSteel", 2.0f), + CRYSTALLINE_ALLOY("crystallineAlloy", 6.0f), + MELODIC_ALLOY("melodicAlloy", 5.0f), + STELLAR_ALLOY("stellarAlloy", 10.0f), + CRYSTALLINE_PINK_SLIME("crystallinePinkSlime", 7.0f), + ENERGETIC_SILVER("energeticSilver", 7.0f), + VIVID_ALLOY("vividAlloy", 4.0f); - CRUDE_STEEL("crudeSteel", 2.0f), - CRYSTALLINE_ALLOY("crystallineAlloy", 6.0f), - MELODIC_ALLOY("melodicAlloy", 5.0f), - STELLAR_ALLOY("stellarAlloy", 10.0f), - CRYSTALLINE_PINK_SLIME("crystallinePinkSlime", 7.0f), - ENERGETIC_SILVER("energeticSilver", 7.0f), - VIVID_ALLOY("vividAlloy", 4.0f); + public final String unlocalisedName; + public final String iconKey; + private final List oreIngots = new ArrayList(); + private final List oreBlocks = new ArrayList(); + private final float hardness; - - public final String unlocalisedName; - public final String iconKey; - private final List oreIngots = new ArrayList(); - private final List oreBlocks = new ArrayList(); - private final float hardness; - - private AlloyEndergy(String baseName, float hardness, String oreDictName) { - this.unlocalisedName = "enderio." + baseName; - this.iconKey = "enderio:" + baseName; - if(oreDictName != null) { - this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); - this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + private AlloyEndergy(String baseName, float hardness, String oreDictName) { + this.unlocalisedName = "enderio." + baseName; + this.iconKey = "enderio:" + baseName; + if (oreDictName != null) { + this.oreIngots.add("ingot" + StringUtils.capitalize(oreDictName)); + this.oreBlocks.add("block" + StringUtils.capitalize(oreDictName)); + } + this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); + this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); + this.hardness = hardness; } - this.oreIngots.add("ingot" + StringUtils.capitalize(baseName)); - this.oreBlocks.add("block" + StringUtils.capitalize(baseName)); - this.hardness = hardness; - } - private AlloyEndergy(String baseName, float hardness) { - this(baseName, hardness, null); - } + private AlloyEndergy(String baseName, float hardness) { + this(baseName, hardness, null); + } - public float getHardness() { - return hardness; - } + public float getHardness() { + return hardness; + } - public ItemStack getStackIngot() { - return getStackIngot(1); - } + public ItemStack getStackIngot() { + return getStackIngot(1); + } - public ItemStack getStackIngot(int size) { - return new ItemStack(EnderIO.itemAlloyEndergy, size, ordinal()); - } + public ItemStack getStackIngot(int size) { + return new ItemStack(EnderIO.itemAlloyEndergy, size, ordinal()); + } - public ItemStack getStackBall(int size) { - return new ItemStack(EnderIO.itemGrindingBallEndergy, size, ordinal()); - } + public ItemStack getStackBall(int size) { + return new ItemStack(EnderIO.itemGrindingBallEndergy, size, ordinal()); + } - public ItemStack getStackBlock() { - return getStackBlock(1); - } + public ItemStack getStackBlock() { + return getStackBlock(1); + } - public ItemStack getStackBlock(int size) { - return new ItemStack(EnderIO.blockIngotStorageEndergy, size, ordinal()); - } + public ItemStack getStackBlock(int size) { + return new ItemStack(EnderIO.blockIngotStorageEndergy, size, ordinal()); + } - public String getOreIngot() { - return oreIngots.get(0); - } + public String getOreIngot() { + return oreIngots.get(0); + } - public String getOreBlock() { - return oreBlocks.get(0); - } + public String getOreBlock() { + return oreBlocks.get(0); + } - public List getOreIngots() { - return oreIngots; - } - - public List getOreBlocks() { - return oreBlocks; - } + public List getOreIngots() { + return oreIngots; + } + public List getOreBlocks() { + return oreBlocks; + } } diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java index c55b5e87..edfbab59 100644 --- a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java @@ -1,7 +1,13 @@ package crazypants.enderio.material.endergy; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.ModObject; import java.util.List; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,94 +18,90 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.ModObject; - public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedTooltipProvider { - - @SideOnly(Side.CLIENT) - private IIcon[] icons; - public static BlockIngotStorageEndergy create() { - BlockIngotStorageEndergy res = new BlockIngotStorageEndergy(); - res.init(); - return res; - } - - private BlockIngotStorageEndergy() { - super(ModObject.blockIngotStorageEndergy.unlocalisedName, null, Material.iron); - setStepSound(soundTypeMetal); - } - - @Override - protected void init() { - GameRegistry.registerBlock(this, BlockItemIngotStorageEndergy.class, ModObject.blockIngotStorageEndergy.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[AlloyEndergy.values().length]; - for (AlloyEndergy alloy : AlloyEndergy.values()) { - icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public static BlockIngotStorageEndergy create() { + BlockIngotStorageEndergy res = new BlockIngotStorageEndergy(); + res.init(); + return res; } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.values().length - 1); - return icons[meta]; - } - - @Override - public int getDamageValue(World world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public float getBlockHardness(World world, int x, int y, int z) { - return AlloyEndergy.values()[world.getBlockMetadata(x, y, z)].getHardness(); - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance - } - - @Override - public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { - return true; - } - - @Override - protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - return false; - } - @Override - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); - } + private BlockIngotStorageEndergy() { + super(ModObject.blockIngotStorageEndergy.unlocalisedName, null, Material.iron); + setStepSound(soundTypeMetal); + } - @Override - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + protected void init() { + GameRegistry.registerBlock( + this, BlockItemIngotStorageEndergy.class, ModObject.blockIngotStorageEndergy.unlocalisedName); + } - } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[AlloyEndergy.values().length]; + for (AlloyEndergy alloy : AlloyEndergy.values()) { + icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); + } + } - @Override - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.values().length - 1); + return icons[meta]; + } - } + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + return AlloyEndergy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + } + + @Override + public float getExplosionResistance( + Entity par1Entity, + World world, + int x, + int y, + int z, + double explosionX, + double explosionY, + double explosionZ) { + return getBlockHardness(world, x, y, z) * 2.0f; // vanilla default is / 5.0f, this means hardness*2 = resistance + } + + @Override + public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { + return true; + } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} + + @Override + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} } diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java index b976917f..d91575e8 100644 --- a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java @@ -1,39 +1,38 @@ package crazypants.enderio.material.endergy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockItemIngotStorageEndergy extends ItemBlock { - public BlockItemIngotStorageEndergy(Block block) { - super(block); - setHasSubtypes(true); - setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return "tile." + AlloyEndergy.values()[stack.getItemDamage()].unlocalisedName; - } - - @Override - public int getMetadata(int damage) { - return damage; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (AlloyEndergy alloy : AlloyEndergy.values()) { - list.add(new ItemStack(this, 1, alloy.ordinal())); + public BlockItemIngotStorageEndergy(Block block) { + super(block); + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return "tile." + AlloyEndergy.values()[stack.getItemDamage()].unlocalisedName; + } + + @Override + public int getMetadata(int damage) { + return damage; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (AlloyEndergy alloy : AlloyEndergy.values()) { + list.add(new ItemStack(this, 1, alloy.ordinal())); + } } - } } diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java index 77f84ea7..6925507b 100644 --- a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java @@ -1,86 +1,85 @@ package crazypants.enderio.material.endergy; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; 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 net.minecraft.util.MathHelper; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; public class ItemAlloyEndergy extends Item { - static final boolean useNuggets = false; + static final boolean useNuggets = false; - protected final IIcon[] icons; - protected final int numItems; + protected final IIcon[] icons; + protected final int numItems; - public static ItemAlloyEndergy create() { - ItemAlloyEndergy alloy = new ItemAlloyEndergy(); - alloy.init(); - return alloy; - } - - protected ItemAlloyEndergy() { - setHasSubtypes(true); - setMaxDamage(0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); - - numItems = AlloyEndergy.values().length; - if(useNuggets) { - numItems = numItems * 2; + public static ItemAlloyEndergy create() { + ItemAlloyEndergy alloy = new ItemAlloyEndergy(); + alloy.init(); + return alloy; } - icons = new IIcon[numItems]; - } - private void init() { - GameRegistry.registerItem(this, ModObject.itemAlloyEndergy.unlocalisedName); - } + protected ItemAlloyEndergy() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, numItems - 1); - return icons[damage]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = AlloyEndergy.values().length; - for (int i = 0; i < numAlloys; i++) { - icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + numItems = AlloyEndergy.values().length; + if (useNuggets) { + numItems = numItems * 2; + } + icons = new IIcon[numItems]; } - if(useNuggets) { - for (int i = 0; i < numAlloys; i++) { - icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); - } - } - } - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - if(i < AlloyEndergy.values().length) { - return AlloyEndergy.values()[i].unlocalisedName; - } else { - return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + private void init() { + GameRegistry.registerItem(this, ModObject.itemAlloyEndergy.unlocalisedName); } - } - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < numItems; ++j) { - par3List.add(new ItemStack(par1, 1, j)); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) { + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + } + if (useNuggets) { + for (int i = 0; i < numAlloys; i++) { + icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); + } + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + if (i < AlloyEndergy.values().length) { + return AlloyEndergy.values()[i].unlocalisedName; + } else { + return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + } + } + + @Override + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < numItems; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } } - } } diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java index 46cb0766..6f4c2143 100644 --- a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java @@ -11,40 +11,38 @@ import net.minecraft.util.MathHelper; public class ItemGrindingBallEndergy extends ItemAlloyEndergy { - public static ItemGrindingBallEndergy create() { - ItemGrindingBallEndergy ball = new ItemGrindingBallEndergy(); - ball.init(); - return ball; - } + public static ItemGrindingBallEndergy create() { + ItemGrindingBallEndergy ball = new ItemGrindingBallEndergy(); + ball.init(); + return ball; + } - private ItemGrindingBallEndergy() { - setUnlocalizedName(ModObject.itemGrindingBallEndergy.unlocalisedName); - } + private ItemGrindingBallEndergy() { + setUnlocalizedName(ModObject.itemGrindingBallEndergy.unlocalisedName); + } - private void init() { - GameRegistry.registerItem(this, ModObject.itemGrindingBallEndergy.unlocalisedName); + private void init() { + GameRegistry.registerItem(this, ModObject.itemGrindingBallEndergy.unlocalisedName); + } - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, numItems - 1); + return icons[damage]; + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, numItems - 1); - return icons[damage]; - } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + int numAlloys = AlloyEndergy.values().length; + for (int i = 0; i < numAlloys; i++) + icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "GrindingBall"); + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = AlloyEndergy.values().length; - for (int i = 0; i < numAlloys; i++) - icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey+"GrindingBall"); - - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - return AlloyEndergy.values()[i].unlocalisedName+"GrindingBall"; - } + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); + return AlloyEndergy.values()[i].unlocalisedName + "GrindingBall"; + } } diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 61d3d28d..bfcf0b32 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -1,203 +1,200 @@ package crazypants.enderio.nei; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.EnderWidget; -import com.enderio.core.common.util.ItemUtil; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.common.util.ItemUtil; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.GuiAlloySmelter; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; +import org.lwjgl.opengl.GL11; public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.alloysmelter"); - } - - @Override - public String getGuiTexture() { - return "enderio:textures/gui/nei/alloySmelter.png"; - } - - @Override - public Class getGuiClass() { - return GuiAlloySmelter.class; - } - - @Override - public String getOverlayIdentifier() { - return "EnderIOAlloySmelter"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOAlloySmelter", new Object[0])); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - - if(result == null) { - return; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.alloysmelter"); } - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); - recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); - for (IRecipe recipe : recipes) { - ItemStack output = recipe.getOutputs()[0].getOutput(); - if(result.getItem() == output.getItem() && result.getItemDamage() == output.getItemDamage()) { - AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - arecipes.add(res); - } + @Override + public String getGuiTexture() { + return "enderio:textures/gui/nei/alloySmelter.png"; } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("EnderIOAlloySmelter") && getClass() == AlloySmelterRecipeHandler.class) { - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); - recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); - for (IRecipe recipe : recipes) { - ItemStack output = recipe.getOutputs()[0].getOutput(); - AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - arecipes.add(res); - } - } else { - super.loadCraftingRecipes(outputId, results); + @Override + public Class getGuiClass() { + return GuiAlloySmelter.class; } - } - @Override - public void loadUsageRecipes(ItemStack ingredient) { - List recipes = new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); - recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); - for (IRecipe recipe : recipes) { - if(recipe.isValidInput(0, ingredient)) { - ItemStack output = recipe.getOutputs()[0].getOutput(); - AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - res.setIngredientPermutation(res.input, ingredient); - arecipes.add(res); - } + @Override + public String getOverlayIdentifier() { + return "EnderIOAlloySmelter"; } - } - @Override - public void drawBackground(int recipeIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); - } + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, 32, 16, 16), "EnderIOAlloySmelter", new Object[0])); + } - @Override - public void drawExtras(int recipeIndex) { - drawProgressBar(51, 31, 166, 0, 22, 13, 48, 3); - drawProgressBar(99, 31, 166, 0, 22, 13, 48, 3); - AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex); - String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 100, 52, 0x808080, false); + @Override + public void loadCraftingRecipes(ItemStack result) { - int x = 149, y = 32; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } + if (result == null) { + return; + } - public List getInputs(RecipeInput input) { - List result = new ArrayList(); - result.add(input.getInput()); - ItemStack[] equivs = input.getEquivelentInputs(); - if(equivs != null) { - for (ItemStack item : equivs) { - if (item.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - List permutations = ItemList.itemMap.get(item.getItem()); - if (permutations.isEmpty()) { - ItemStack base = new ItemStack(item.getItem(), item.stackSize); - base.stackTagCompound = item.stackTagCompound; - result.add(base); - } else { - for (ItemStack stack : permutations) { - ItemStack perm = stack.copy(); - perm.stackSize = item.stackSize; - result.add(perm); + List recipes = + new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); + for (IRecipe recipe : recipes) { + ItemStack output = recipe.getOutputs()[0].getOutput(); + if (result.getItem() == output.getItem() && result.getItemDamage() == output.getItemDamage()) { + AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + arecipes.add(res); + } + } + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("EnderIOAlloySmelter") && getClass() == AlloySmelterRecipeHandler.class) { + List recipes = + new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); + for (IRecipe recipe : recipes) { + ItemStack output = recipe.getOutputs()[0].getOutput(); + AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + arecipes.add(res); } - } } else { - result.add(item.copy()); + super.loadCraftingRecipes(outputId, results); } - } - List result2 = new ArrayList(); - for (ItemStack candidate : result) { - boolean skip = false; - for (ItemStack existing : result2) { - skip = skip || ItemUtil.areStacksEqual(candidate, existing); - } - if (!skip) { - System.out.println("Adding " + candidate + " for " + input); - result2.add(candidate); - } - } - return result2; - } else { - return result; - } - } - - public class AlloySmelterRecipe extends TemplateRecipeHandler.CachedRecipe { - - private ArrayList input; - private PositionedStack output; - private int energy; - - public int getEnergy() { - return energy; } @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, input); + public void loadUsageRecipes(ItemStack ingredient) { + List recipes = + new ArrayList(AlloyRecipeManager.getInstance().getRecipes()); + recipes.addAll(AlloyRecipeManager.getInstance().getVanillaRecipe().getAllRecipes()); + for (IRecipe recipe : recipes) { + if (recipe.isValidInput(0, ingredient)) { + ItemStack output = recipe.getOutputs()[0].getOutput(); + AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + res.setIngredientPermutation(res.input, ingredient); + arecipes.add(res); + } + } } @Override - public PositionedStack getResult() { - return output; + public void drawBackground(int recipeIndex) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); } - public AlloySmelterRecipe(int energy, RecipeInput[] ingredients, ItemStack result) { - int recipeSize = ingredients.length; - this.input = new ArrayList(); - if(recipeSize > 0) { - this.input.add(new PositionedStack(getInputs(ingredients[0]), 50, 13)); - } - if(recipeSize > 1) { - this.input.add(new PositionedStack(getInputs(ingredients[1]), 75, 3)); - } - if(recipeSize > 2) { - this.input.add(new PositionedStack(getInputs(ingredients[2]), 99, 13)); - } - if(result != null) { - this.output = new PositionedStack(result, 75, 42); - } - this.energy = energy; + @Override + public void drawExtras(int recipeIndex) { + drawProgressBar(51, 31, 166, 0, 22, 13, 48, 3); + drawProgressBar(99, 31, 166, 0, 22, 13, 48, 3); + AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex); + String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); + GuiDraw.drawString(energyString, 100, 52, 0x808080, false); + + int x = 149, y = 32; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); } - } + public List getInputs(RecipeInput input) { + List result = new ArrayList(); + result.add(input.getInput()); + ItemStack[] equivs = input.getEquivelentInputs(); + if (equivs != null) { + for (ItemStack item : equivs) { + if (item.getItemDamage() == OreDictionary.WILDCARD_VALUE) { + List permutations = ItemList.itemMap.get(item.getItem()); + if (permutations.isEmpty()) { + ItemStack base = new ItemStack(item.getItem(), item.stackSize); + base.stackTagCompound = item.stackTagCompound; + result.add(base); + } else { + for (ItemStack stack : permutations) { + ItemStack perm = stack.copy(); + perm.stackSize = item.stackSize; + result.add(perm); + } + } + } else { + result.add(item.copy()); + } + } + List result2 = new ArrayList(); + for (ItemStack candidate : result) { + boolean skip = false; + for (ItemStack existing : result2) { + skip = skip || ItemUtil.areStacksEqual(candidate, existing); + } + if (!skip) { + System.out.println("Adding " + candidate + " for " + input); + result2.add(candidate); + } + } + return result2; + } else { + return result; + } + } + public class AlloySmelterRecipe extends TemplateRecipeHandler.CachedRecipe { + + private ArrayList input; + private PositionedStack output; + private int energy; + + public int getEnergy() { + return energy; + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, input); + } + + @Override + public PositionedStack getResult() { + return output; + } + + public AlloySmelterRecipe(int energy, RecipeInput[] ingredients, ItemStack result) { + int recipeSize = ingredients.length; + this.input = new ArrayList(); + if (recipeSize > 0) { + this.input.add(new PositionedStack(getInputs(ingredients[0]), 50, 13)); + } + if (recipeSize > 1) { + this.input.add(new PositionedStack(getInputs(ingredients[1]), 75, 3)); + } + if (recipeSize > 2) { + this.input.add(new PositionedStack(getInputs(ingredients[2]), 99, 13)); + } + if (result != null) { + this.output = new PositionedStack(result, 75, 42); + } + this.energy = energy; + } + } } diff --git a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java index 1969b347..ccd76e0e 100644 --- a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java @@ -1,13 +1,21 @@ package crazypants.enderio.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.EnderWidget; +import crazypants.enderio.gui.GuiContainerBaseEIO; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.enchanter.EnchanterRecipe; +import crazypants.enderio.machine.enchanter.EnchanterRecipeManager; +import crazypants.enderio.machine.enchanter.GuiEnchanter; +import crazypants.enderio.machine.enchanter.TileEnchanter; +import crazypants.enderio.machine.recipe.RecipeInput; import java.awt.Rectangle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; - -import com.enderio.core.client.render.EnderWidget; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.Enchantment; @@ -16,182 +24,172 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import crazypants.enderio.gui.GuiContainerBaseEIO; -import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.enchanter.EnchanterRecipe; -import crazypants.enderio.machine.enchanter.EnchanterRecipeManager; -import crazypants.enderio.machine.enchanter.GuiEnchanter; -import crazypants.enderio.machine.enchanter.TileEnchanter; -import crazypants.enderio.machine.recipe.RecipeInput; public class EnchanterRecipeHandler extends TemplateRecipeHandler { - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.enchanter"); - } - - @Override - public String getGuiTexture() { - return GuiContainerBaseEIO.getGuiTexture("enchanter").toString(); - } - - @Override - public Class getGuiClass() { - return GuiEnchanter.class; - } - - @Override - public String getOverlayIdentifier() { - return "EIOEnchanter"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, -3, 16, 16), "EIOEnchanter", new Object[0])); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - if(result == null || result.getItem() != Items.enchanted_book) { - return; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.enchanter"); } - Map enchants = EnchantmentHelper.getEnchantments(result); - List recipes = EnchanterRecipeManager.getInstance().getRecipes(); - for (Number id : enchants.keySet()) { - if(id != null && id.intValue() >= 0 && id.intValue() < Enchantment.enchantmentsList.length) { - Enchantment ench = Enchantment.enchantmentsList[id.intValue()]; - if(ench != null && ench.getName() != null) { + @Override + public String getGuiTexture() { + return GuiContainerBaseEIO.getGuiTexture("enchanter").toString(); + } - for (EnchanterRecipe recipe : recipes) { - if(recipe.isValid() && recipe.getEnchantment().getName().equals(ench.getName())) { - EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); - arecipes.add(rec); + @Override + public Class getGuiClass() { + return GuiEnchanter.class; + } + + @Override + public String getOverlayIdentifier() { + return "EIOEnchanter"; + } + + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, -3, 16, 16), "EIOEnchanter", new Object[0])); + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + if (result == null || result.getItem() != Items.enchanted_book) { + return; + } + Map enchants = EnchantmentHelper.getEnchantments(result); + List recipes = EnchanterRecipeManager.getInstance().getRecipes(); + + for (Number id : enchants.keySet()) { + if (id != null && id.intValue() >= 0 && id.intValue() < Enchantment.enchantmentsList.length) { + Enchantment ench = Enchantment.enchantmentsList[id.intValue()]; + if (ench != null && ench.getName() != null) { + + for (EnchanterRecipe recipe : recipes) { + if (recipe.isValid() + && recipe.getEnchantment().getName().equals(ench.getName())) { + EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); + arecipes.add(rec); + } + } + } } - } - } - } - } - - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("EIOEnchanter") && getClass() == EnchanterRecipeHandler.class) { - List recipes = EnchanterRecipeManager.getInstance().getRecipes(); - for (EnchanterRecipe recipe : recipes) { - if(recipe.isValid()) { - EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); - arecipes.add(rec); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - List recipes = EnchanterRecipeManager.getInstance().getRecipes(); - for (EnchanterRecipe recipe : recipes) { - if(recipe.isValid()) { - EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); - if(rec.contains(rec.input, ingredient)) { - rec.setIngredientPermutation(rec.input, ingredient); - arecipes.add(rec); - } - } - } - } - - @Override - public void drawExtras(int recipeIndex) { - EnchanterRecipeNEI recipe = (EnchanterRecipeNEI) arecipes.get(recipeIndex); - - GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, 0x808080, false); - - int level = 1; - List ingredients = recipe.getIngredients(); - if(ingredients != null && ingredients.size() == 2) { - ItemStack item = ingredients.get(1).item; - level = recipe.recipe.getLevelForStackSize(item.stackSize); - } - - int cost = TileEnchanter.getEnchantmentCost(recipe.recipe, level); - if(cost > 0) { - String s = I18n.format("container.repair.cost", new Object[] { cost }); - GuiDraw.drawStringC(s, 83, 46, 0x80FF20); - } - - int x = 149, y = -3; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } - - public List getInputs(RecipeInput input) { - List result = new ArrayList(); - result.add(input.getInput()); - ItemStack[] equivs = input.getEquivelentInputs(); - if(equivs != null && equivs.length > 0) { - result.addAll(Arrays.asList(equivs)); - } - return result; - } - - public class EnchanterRecipeNEI extends TemplateRecipeHandler.CachedRecipe { - - private final ArrayList input; - private final PositionedStack output; - private final EnchanterRecipe recipe; - - public String getEnchantName() { - int maxLevel = recipe.getEnchantment().getMaxLevel(); - if(maxLevel > 1) { - int cycle = cycleticks / 20; - int level = cycle % maxLevel + 1; - return recipe.getEnchantment().getTranslatedName(level); - } - return StatCollector.translateToLocal(recipe.getEnchantment().getName()); } @Override - public List getIngredients() { - int cycle = cycleticks / 20; - getCycledIngredients(cycle, input); - int maxLevel = recipe.getEnchantment().getMaxLevel(); - if(maxLevel > 1) { - int level = cycle % maxLevel + 1; - input.get(1).item.stackSize *= level; - } - return input; + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("EIOEnchanter") && getClass() == EnchanterRecipeHandler.class) { + List recipes = EnchanterRecipeManager.getInstance().getRecipes(); + for (EnchanterRecipe recipe : recipes) { + if (recipe.isValid()) { + EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); + arecipes.add(rec); + } + } + } else { + super.loadCraftingRecipes(outputId, results); + } } @Override - public PositionedStack getResult() { - int cycle = cycleticks / 20; - output.setPermutationToRender(cycle % output.items.length); - return output; + public void loadUsageRecipes(ItemStack ingredient) { + List recipes = EnchanterRecipeManager.getInstance().getRecipes(); + for (EnchanterRecipe recipe : recipes) { + if (recipe.isValid()) { + EnchanterRecipeNEI rec = new EnchanterRecipeNEI(recipe); + if (rec.contains(rec.input, ingredient)) { + rec.setIngredientPermutation(rec.input, ingredient); + arecipes.add(rec); + } + } + } } - public EnchanterRecipeNEI(EnchanterRecipe recipe) { - this.recipe = recipe; - input = new ArrayList(); - input.add(new PositionedStack(new ItemStack(Items.writable_book), 22, 24)); - input.add(new PositionedStack(getInputs(recipe.getInput()), 71, 24)); + @Override + public void drawExtras(int recipeIndex) { + EnchanterRecipeNEI recipe = (EnchanterRecipeNEI) arecipes.get(recipeIndex); - int maxLevel = recipe.getEnchantment().getMaxLevel(); - ItemStack[] outputItems = new ItemStack[maxLevel]; - for(int level = 0; level < maxLevel; level++) { - EnchantmentData enchantment = new EnchantmentData(recipe.getEnchantment(), level+1); - outputItems[level] = new ItemStack(Items.enchanted_book); - Items.enchanted_book.addEnchantment(outputItems[level], enchantment); - } - output = new PositionedStack(outputItems, 129, 24); + GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, 0x808080, false); + + int level = 1; + List ingredients = recipe.getIngredients(); + if (ingredients != null && ingredients.size() == 2) { + ItemStack item = ingredients.get(1).item; + level = recipe.recipe.getLevelForStackSize(item.stackSize); + } + + int cost = TileEnchanter.getEnchantmentCost(recipe.recipe, level); + if (cost > 0) { + String s = I18n.format("container.repair.cost", new Object[] {cost}); + GuiDraw.drawStringC(s, 83, 46, 0x80FF20); + } + + int x = 149, y = -3; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); + } + + public List getInputs(RecipeInput input) { + List result = new ArrayList(); + result.add(input.getInput()); + ItemStack[] equivs = input.getEquivelentInputs(); + if (equivs != null && equivs.length > 0) { + result.addAll(Arrays.asList(equivs)); + } + return result; + } + + public class EnchanterRecipeNEI extends TemplateRecipeHandler.CachedRecipe { + + private final ArrayList input; + private final PositionedStack output; + private final EnchanterRecipe recipe; + + public String getEnchantName() { + int maxLevel = recipe.getEnchantment().getMaxLevel(); + if (maxLevel > 1) { + int cycle = cycleticks / 20; + int level = cycle % maxLevel + 1; + return recipe.getEnchantment().getTranslatedName(level); + } + return StatCollector.translateToLocal(recipe.getEnchantment().getName()); + } + + @Override + public List getIngredients() { + int cycle = cycleticks / 20; + getCycledIngredients(cycle, input); + int maxLevel = recipe.getEnchantment().getMaxLevel(); + if (maxLevel > 1) { + int level = cycle % maxLevel + 1; + input.get(1).item.stackSize *= level; + } + return input; + } + + @Override + public PositionedStack getResult() { + int cycle = cycleticks / 20; + output.setPermutationToRender(cycle % output.items.length); + return output; + } + + public EnchanterRecipeNEI(EnchanterRecipe recipe) { + this.recipe = recipe; + input = new ArrayList(); + input.add(new PositionedStack(new ItemStack(Items.writable_book), 22, 24)); + input.add(new PositionedStack(getInputs(recipe.getInput()), 71, 24)); + + int maxLevel = recipe.getEnchantment().getMaxLevel(); + ItemStack[] outputItems = new ItemStack[maxLevel]; + for (int level = 0; level < maxLevel; level++) { + EnchantmentData enchantment = new EnchantmentData(recipe.getEnchantment(), level + 1); + outputItems[level] = new ItemStack(Items.enchanted_book); + Items.enchanted_book.addEnchantment(outputItems[level], enchantment); + } + output = new PositionedStack(outputItems, 129, 24); + } } - } } diff --git a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java index 3ca8f04e..f7c6e04a 100644 --- a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java +++ b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java @@ -1,7 +1,5 @@ package crazypants.enderio.nei; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import crazypants.enderio.EnderIO; @@ -10,76 +8,77 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.invpanel.GuiInventoryPanel; import crazypants.enderio.machine.invpanel.client.InventoryPanelNEIOverlayHandler; import crazypants.enderio.machine.painter.PainterUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; public class NEIEnderIOConfig implements IConfigureNEI { - @Override - public void loadConfig() { - API.registerRecipeHandler(new AlloySmelterRecipeHandler()); - API.registerUsageHandler(new AlloySmelterRecipeHandler()); + @Override + public void loadConfig() { + API.registerRecipeHandler(new AlloySmelterRecipeHandler()); + API.registerUsageHandler(new AlloySmelterRecipeHandler()); - API.registerRecipeHandler(new SagMillRecipeHandler()); - API.registerUsageHandler(new SagMillRecipeHandler()); + API.registerRecipeHandler(new SagMillRecipeHandler()); + API.registerUsageHandler(new SagMillRecipeHandler()); - API.registerRecipeHandler(new VatRecipeHandler()); - API.registerUsageHandler(new VatRecipeHandler()); + API.registerRecipeHandler(new VatRecipeHandler()); + API.registerUsageHandler(new VatRecipeHandler()); - API.registerRecipeHandler(new EnchanterRecipeHandler()); - API.registerUsageHandler(new EnchanterRecipeHandler()); + API.registerRecipeHandler(new EnchanterRecipeHandler()); + API.registerUsageHandler(new EnchanterRecipeHandler()); - API.registerRecipeHandler(new SliceAndSpliceRecipeHandler()); - API.registerUsageHandler(new SliceAndSpliceRecipeHandler()); + API.registerRecipeHandler(new SliceAndSpliceRecipeHandler()); + API.registerUsageHandler(new SliceAndSpliceRecipeHandler()); - API.registerRecipeHandler(new SoulBinderRecipeHandler()); - API.registerUsageHandler(new SoulBinderRecipeHandler()); + API.registerRecipeHandler(new SoulBinderRecipeHandler()); + API.registerUsageHandler(new SoulBinderRecipeHandler()); - API.registerGuiOverlayHandler(GuiInventoryPanel.class, new InventoryPanelNEIOverlayHandler(), "crafting"); + API.registerGuiOverlayHandler(GuiInventoryPanel.class, new InventoryPanelNEIOverlayHandler(), "crafting"); - API.hideItem(new ItemStack(EnderIO.blockConduitFacade)); - API.hideItem(new ItemStack(EnderIO.blockLightNode)); - API.hideItem(new ItemStack(EnderIO.itemEnderface)); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedCarpet))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedSlab))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFence))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFenceGate))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedGlowstone))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedStair))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedWall))); - API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedDoubleSlab))); + API.hideItem(new ItemStack(EnderIO.blockConduitFacade)); + API.hideItem(new ItemStack(EnderIO.blockLightNode)); + API.hideItem(new ItemStack(EnderIO.itemEnderface)); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedCarpet))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedSlab))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFence))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedFenceGate))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedGlowstone))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedStair))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedWall))); + API.hideItem(PainterUtil.applyDefaultPaintedState(new ItemStack(EnderIO.blockPaintedDoubleSlab))); - if(!Config.photovoltaicCellEnabled) { - API.hideItem(new ItemStack(EnderIO.blockSolarPanel)); + if (!Config.photovoltaicCellEnabled) { + API.hideItem(new ItemStack(EnderIO.blockSolarPanel)); + } + if (!Config.travelAnchorEnabled) { + API.hideItem(new ItemStack(EnderIO.itemTravelStaff)); + } + if (!Config.reinforcedObsidianEnabled) { + API.hideItem(new ItemStack(EnderIO.blockReinforcedObsidian)); + } + if ((!Config.transceiverEnabled || !Config.enderRailEnabled) && EnderIO.blockEnderRail != null) { + API.hideItem(new ItemStack(EnderIO.blockEnderRail)); + } + if (!Config.transceiverEnabled && EnderIO.blockTransceiver != null) { + API.hideItem(new ItemStack(EnderIO.blockTransceiver)); + } + if (!Config.reservoirEnabled) { + API.hideItem(new ItemStack(EnderIO.blockReservoir)); + } + if (!GasUtil.isGasConduitEnabled()) { + API.hideItem(new ItemStack(EnderIO.itemGasConduit)); + } + API.hideItem(new ItemStack(EnderIO.blockHyperCube)); + API.hideItem(new ItemStack(EnderIO.blockCapacitorBank, 1, OreDictionary.WILDCARD_VALUE)); } - if(!Config.travelAnchorEnabled) { - API.hideItem(new ItemStack(EnderIO.itemTravelStaff)); - } - if(!Config.reinforcedObsidianEnabled) { - API.hideItem(new ItemStack(EnderIO.blockReinforcedObsidian)); - } - if((!Config.transceiverEnabled || !Config.enderRailEnabled) && EnderIO.blockEnderRail != null) { - API.hideItem(new ItemStack(EnderIO.blockEnderRail)); - } - if(!Config.transceiverEnabled && EnderIO.blockTransceiver != null) { - API.hideItem(new ItemStack(EnderIO.blockTransceiver)); - } - if(!Config.reservoirEnabled) { - API.hideItem(new ItemStack(EnderIO.blockReservoir)); - } - if(!GasUtil.isGasConduitEnabled()) { - API.hideItem(new ItemStack(EnderIO.itemGasConduit)); - } - API.hideItem(new ItemStack(EnderIO.blockHyperCube)); - API.hideItem(new ItemStack(EnderIO.blockCapacitorBank, 1, OreDictionary.WILDCARD_VALUE)); - } - @Override - public String getName() { - return "Ender IO NEI Plugin"; - } - - @Override - public String getVersion() { - return EnderIO.VERSION; - } + @Override + public String getName() { + return "Ender IO NEI Plugin"; + } + @Override + public String getVersion() { + return EnderIO.VERSION; + } } diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index fae4070b..6a8a2048 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -1,25 +1,10 @@ package crazypants.enderio.nei; -import java.awt.Rectangle; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.EnderWidget; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.EnderWidget; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.GrindingBall; @@ -28,234 +13,248 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.Recipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; +import java.awt.Rectangle; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; public class SagMillRecipeHandler extends TemplateRecipeHandler { - private RecipeComparator comparator = new RecipeComparator(); + private RecipeComparator comparator = new RecipeComparator(); - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.sagmill"); - } - - @Override - public String getGuiTexture() { - return "enderio:textures/gui/nei/crusher.png"; - } - - public PositionedStack getResult() { - return null; - } - - @Override - public Class getGuiClass() { - return GuiCrusher.class; - } - - @Override - public String getOverlayIdentifier() { - return "EnderIOSagMill"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOSagMill", new Object[0])); - } - - @Override - public void loadCraftingRecipes(final ItemStack result) { - - List recipes = CrusherRecipeManager.getInstance().getRecipes(); - List toAdd = new ArrayList(); - for (Recipe recipe : recipes) { - if(recipe.hasOuput(result)) { - MillRecipe res = new MillRecipe(result, recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); - toAdd.add(res); - } - } - - Collections.sort(toAdd, comparator); - - arecipes.addAll(toAdd); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("EnderIOSagMill") && getClass() == SagMillRecipeHandler.class) { - List recipes = CrusherRecipeManager.getInstance().getRecipes(); - for (Recipe recipe : recipes) { - MillRecipe res = new MillRecipe(recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); - arecipes.add(res); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - List recipes = CrusherRecipeManager.getInstance().getRecipes(); - for (Recipe recipe : recipes) { - MillRecipe res = new MillRecipe(recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); - if(res.contains(res.input, ingredient)) { - res.setIngredientPermutation(res.input, ingredient); - arecipes.add(res); - } - } - } - - @Override - public void drawBackground(int recipeIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); - } - - @Override - public void drawExtras(int recipeIndex) { - drawProgressBar(73, 20, 166, 0, 17, 24, 40, 1); - drawProgressBar(136, 12, 166, 24, 4, 16, 160, 11); - - MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex); - String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 96, 33, 0x808080, false); - - int x = 149, y = 32; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } - - @Override - public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipeIndex) { - MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex); - float chance = recipe.getChanceForOutput(stack); - if(chance > 0 && chance < 1) { - int chanceInt = (int) (chance * 100); - currenttip.add(EnumChatFormatting.GRAY + MessageFormat.format(StatCollector.translateToLocal("enderio.nei.sagmill.outputchance"), chanceInt)); - } - return currenttip; - } - - public List getInputs(RecipeInput input) { - List result = new ArrayList(); - result.add(input.getInput()); - ItemStack[] eq = input.getEquivelentInputs(); - if(eq != null) { - for (ItemStack st : eq) { - result.add(st); - } - } - return result; - } - - public class MillRecipe extends TemplateRecipeHandler.CachedRecipe { - - protected int numTargetOuput; - protected int indexOfTargetOutput; - private List input; - private PositionedStack output; - private ArrayList otherOutputs; - private float[] outputChance; - private int energy; - - public int getEnergy() { - return energy; - } - - public float getChanceForOutput(ItemStack stack) { - if(stack == null) { - return -1; - } - if(output.item.equals(stack)) { - return outputChance[0]; - } - for (int i = 0; i < otherOutputs.size(); i++) { - PositionedStack oo = otherOutputs.get(i); - if(oo != null && oo.item.equals(stack) && i + 1 < outputChance.length) { - return outputChance[i + 1]; - } - } - return -1; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.sagmill"); } @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, input); + public String getGuiTexture() { + return "enderio:textures/gui/nei/crusher.png"; } - @Override public PositionedStack getResult() { - return output; + return null; } @Override - public List getOtherStacks() { - return otherOutputs; + public Class getGuiClass() { + return GuiCrusher.class; } - public MillRecipe(int energy, RecipeInput ingredient, RecipeOutput[] outputs) { - this(null, energy, ingredient, outputs); + @Override + public String getOverlayIdentifier() { + return "EnderIOSagMill"; } - public MillRecipe(ItemStack targetedResult, int energy, RecipeInput ingredient, RecipeOutput[] outputs) { - this.energy = energy; + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, 32, 16, 16), "EnderIOSagMill", new Object[0])); + } - input = new ArrayList(2); - input.add(new PositionedStack(getInputs(ingredient), 74, 2)); + @Override + public void loadCraftingRecipes(final ItemStack result) { - input.add(new PositionedStack(getBalls(), 116, 12)); - - output = new PositionedStack(outputs[0].getOutput(), 43, 46); - otherOutputs = new ArrayList(); - if(outputs.length > 1) { - otherOutputs.add(new PositionedStack(outputs[1].getOutput(), 64, 46)); - } - if(outputs.length > 2) { - otherOutputs.add(new PositionedStack(outputs[2].getOutput(), 85, 46)); - } - if(outputs.length > 3) { - otherOutputs.add(new PositionedStack(outputs[3].getOutput(), 106, 46)); - } - - outputChance = new float[outputs.length]; - indexOfTargetOutput = 0; - numTargetOuput = 1; - for (int i = 0; i < outputChance.length; i++) { - outputChance[i] = outputs[i].getChance(); - if(targetedResult != null && outputs[i].getOutput().isItemEqual(targetedResult)) { - indexOfTargetOutput = i; - numTargetOuput = outputs[i].getOutput().stackSize; + List recipes = CrusherRecipeManager.getInstance().getRecipes(); + List toAdd = new ArrayList(); + for (Recipe recipe : recipes) { + if (recipe.hasOuput(result)) { + MillRecipe res = + new MillRecipe(result, recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); + toAdd.add(res); + } } - } - } - private List getBalls() { - List daBalls = CrusherRecipeManager.getInstance().getBalls(); - List res = new ArrayList(); - for (GrindingBall ball : daBalls) { - res.add(ball.getInput()); - } - return res; - } - } + Collections.sort(toAdd, comparator); - private class RecipeComparator implements Comparator { + arecipes.addAll(toAdd); + } @Override - public int compare(MillRecipe o1, MillRecipe o2) { - float c1 = o1.outputChance[o1.indexOfTargetOutput]; - float c2 = o2.outputChance[o2.indexOfTargetOutput]; - if(c1 != c2) { - return -Float.compare(c1, c2); - } - int num1 = o1.numTargetOuput; - int num2 = o2.numTargetOuput; - return -compare(num1, num2); + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("EnderIOSagMill") && getClass() == SagMillRecipeHandler.class) { + List recipes = CrusherRecipeManager.getInstance().getRecipes(); + for (Recipe recipe : recipes) { + MillRecipe res = new MillRecipe(recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); + arecipes.add(res); + } + } else { + super.loadCraftingRecipes(outputId, results); + } } - public int compare(int x, int y) { - return (x < y) ? -1 : ((x == y) ? 0 : 1); + @Override + public void loadUsageRecipes(ItemStack ingredient) { + List recipes = CrusherRecipeManager.getInstance().getRecipes(); + for (Recipe recipe : recipes) { + MillRecipe res = new MillRecipe(recipe.getEnergyRequired(), recipe.getInputs()[0], recipe.getOutputs()); + if (res.contains(res.input, ingredient)) { + res.setIngredientPermutation(res.input, ingredient); + arecipes.add(res); + } + } } - } + @Override + public void drawBackground(int recipeIndex) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65); + } + + @Override + public void drawExtras(int recipeIndex) { + drawProgressBar(73, 20, 166, 0, 17, 24, 40, 1); + drawProgressBar(136, 12, 166, 24, 4, 16, 160, 11); + + MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex); + String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); + GuiDraw.drawString(energyString, 96, 33, 0x808080, false); + + int x = 149, y = 32; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); + } + + @Override + public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipeIndex) { + MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex); + float chance = recipe.getChanceForOutput(stack); + if (chance > 0 && chance < 1) { + int chanceInt = (int) (chance * 100); + currenttip.add(EnumChatFormatting.GRAY + + MessageFormat.format( + StatCollector.translateToLocal("enderio.nei.sagmill.outputchance"), chanceInt)); + } + return currenttip; + } + + public List getInputs(RecipeInput input) { + List result = new ArrayList(); + result.add(input.getInput()); + ItemStack[] eq = input.getEquivelentInputs(); + if (eq != null) { + for (ItemStack st : eq) { + result.add(st); + } + } + return result; + } + + public class MillRecipe extends TemplateRecipeHandler.CachedRecipe { + + protected int numTargetOuput; + protected int indexOfTargetOutput; + private List input; + private PositionedStack output; + private ArrayList otherOutputs; + private float[] outputChance; + private int energy; + + public int getEnergy() { + return energy; + } + + public float getChanceForOutput(ItemStack stack) { + if (stack == null) { + return -1; + } + if (output.item.equals(stack)) { + return outputChance[0]; + } + for (int i = 0; i < otherOutputs.size(); i++) { + PositionedStack oo = otherOutputs.get(i); + if (oo != null && oo.item.equals(stack) && i + 1 < outputChance.length) { + return outputChance[i + 1]; + } + } + return -1; + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, input); + } + + @Override + public PositionedStack getResult() { + return output; + } + + @Override + public List getOtherStacks() { + return otherOutputs; + } + + public MillRecipe(int energy, RecipeInput ingredient, RecipeOutput[] outputs) { + this(null, energy, ingredient, outputs); + } + + public MillRecipe(ItemStack targetedResult, int energy, RecipeInput ingredient, RecipeOutput[] outputs) { + this.energy = energy; + + input = new ArrayList(2); + input.add(new PositionedStack(getInputs(ingredient), 74, 2)); + + input.add(new PositionedStack(getBalls(), 116, 12)); + + output = new PositionedStack(outputs[0].getOutput(), 43, 46); + otherOutputs = new ArrayList(); + if (outputs.length > 1) { + otherOutputs.add(new PositionedStack(outputs[1].getOutput(), 64, 46)); + } + if (outputs.length > 2) { + otherOutputs.add(new PositionedStack(outputs[2].getOutput(), 85, 46)); + } + if (outputs.length > 3) { + otherOutputs.add(new PositionedStack(outputs[3].getOutput(), 106, 46)); + } + + outputChance = new float[outputs.length]; + indexOfTargetOutput = 0; + numTargetOuput = 1; + for (int i = 0; i < outputChance.length; i++) { + outputChance[i] = outputs[i].getChance(); + if (targetedResult != null && outputs[i].getOutput().isItemEqual(targetedResult)) { + indexOfTargetOutput = i; + numTargetOuput = outputs[i].getOutput().stackSize; + } + } + } + + private List getBalls() { + List daBalls = CrusherRecipeManager.getInstance().getBalls(); + List res = new ArrayList(); + for (GrindingBall ball : daBalls) { + res.add(ball.getInput()); + } + return res; + } + } + + private class RecipeComparator implements Comparator { + + @Override + public int compare(MillRecipe o1, MillRecipe o2) { + float c1 = o1.outputChance[o1.indexOfTargetOutput]; + float c2 = o2.outputChance[o2.indexOfTargetOutput]; + if (c1 != c2) { + return -Float.compare(c1, c2); + } + int num1 = o1.numTargetOuput; + int num2 = o2.numTargetOuput; + return -compare(num1, num2); + } + + public int compare(int x, int y) { + return (x < y) ? -1 : ((x == y) ? 0 : 1); + } + } } diff --git a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java index c4719291..3ce72817 100644 --- a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java @@ -1,22 +1,9 @@ package crazypants.enderio.nei; -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.EnderWidget; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.EnderWidget; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -25,152 +12,165 @@ import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice; import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice; import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager; +import java.awt.Point; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.slicensplice"); - } - - @Override - public String getGuiTexture() { - return GuiContainerBaseEIO.getGuiTexture("sliceAndSplice").toString(); - } - - @Override - public Class getGuiClass() { - return GuiSliceAndSplice.class; - } - - @Override - public String getOverlayIdentifier() { - return "EnderIOSliceAndSplice"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOSliceAndSplice", new Object[0])); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - - if(result == null) { - return; - } - - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); - for (IRecipe recipe : recipes) { - ItemStack output = recipe.getOutputs()[0].getOutput(); - if(result.getItem() == output.getItem() && result.getItemDamage() == output.getItemDamage()) { - SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); - arecipes.add(res); - } - } - - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("EnderIOSliceAndSplice") && getClass() == SliceAndSpliceRecipeHandler.class) { - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); - for (IRecipe recipe : recipes) { - SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); - arecipes.add(res); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - List recipes = new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); - for (IRecipe recipe : recipes) { - if(recipe.isValidInput(0, ingredient)) { - SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); - res.setIngredientPermutation(res.input, ingredient); - arecipes.add(res); - } - } - } - - @Override - public void drawBackground(int recipeIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(16, 0, 29, 11, 142, 65); - } - - @Override - public void drawExtras(int recipeIndex) { - drawProgressBar(91, 38, 177, 14, 23, 17, 120, 0); - - SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex); - String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawString(energyString, 100, 57, 0x808080, false); - - int x = 149, y = 32; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } - - public List getInputs(RecipeInput input) { - List result = new ArrayList(); - result.add(input.getInput()); - ItemStack[] equivs = input.getEquivelentInputs(); - if(equivs != null) { - for (ItemStack st : equivs) { - result.add(st); - } - } - return result; - } - - public class SliceAndSpliceRecipe extends TemplateRecipeHandler.CachedRecipe { - - private ArrayList input; - private PositionedStack output; - private int energy; - - public int getEnergy() { - return energy; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.slicensplice"); } @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, input); + public String getGuiTexture() { + return GuiContainerBaseEIO.getGuiTexture("sliceAndSplice").toString(); } @Override - public PositionedStack getResult() { - return output; + public Class getGuiClass() { + return GuiSliceAndSplice.class; } - public SliceAndSpliceRecipe(IRecipe recipe) { - input = new ArrayList(); - int yOff = 11; - int xOff = 13; + @Override + public String getOverlayIdentifier() { + return "EnderIOSliceAndSplice"; + } - Point pos; - for (RecipeInput recipeInput : recipe.getInputs()) { - if(recipeInput != null) { - pos = ContainerSliceAndSplice.INPUT_SLOTS[recipeInput.getSlotNumber()]; - input.add(new PositionedStack(getInputs(recipeInput), pos.x - xOff, pos.y - yOff)); + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, 32, 16, 16), "EnderIOSliceAndSplice", new Object[0])); + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + + if (result == null) { + return; } - } - pos = ContainerSliceAndSplice.INPUT_SLOTS[6]; - input.add(new PositionedStack(new ItemStack(Items.iron_axe), pos.x - xOff, pos.y - yOff)); - pos = ContainerSliceAndSplice.INPUT_SLOTS[7]; - input.add(new PositionedStack(new ItemStack(Items.shears), pos.x - xOff, pos.y - yOff)); - if(recipe.getOutputs()[0] != null) { - output = new PositionedStack(recipe.getOutputs()[0].getOutput(), ContainerSliceAndSplice.OUTPUT_SLOT.x - xOff, ContainerSliceAndSplice.OUTPUT_SLOT.y - - yOff); - } - energy = recipe.getEnergyRequired(); + List recipes = + new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); + for (IRecipe recipe : recipes) { + ItemStack output = recipe.getOutputs()[0].getOutput(); + if (result.getItem() == output.getItem() && result.getItemDamage() == output.getItemDamage()) { + SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); + arecipes.add(res); + } + } } - } + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("EnderIOSliceAndSplice") && getClass() == SliceAndSpliceRecipeHandler.class) { + List recipes = new ArrayList( + SliceAndSpliceRecipeManager.getInstance().getRecipes()); + for (IRecipe recipe : recipes) { + SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); + arecipes.add(res); + } + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + List recipes = + new ArrayList(SliceAndSpliceRecipeManager.getInstance().getRecipes()); + for (IRecipe recipe : recipes) { + if (recipe.isValidInput(0, ingredient)) { + SliceAndSpliceRecipe res = new SliceAndSpliceRecipe(recipe); + res.setIngredientPermutation(res.input, ingredient); + arecipes.add(res); + } + } + } + + @Override + public void drawBackground(int recipeIndex) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(16, 0, 29, 11, 142, 65); + } + + @Override + public void drawExtras(int recipeIndex) { + drawProgressBar(91, 38, 177, 14, 23, 17, 120, 0); + + SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex); + String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); + GuiDraw.drawString(energyString, 100, 57, 0x808080, false); + + int x = 149, y = 32; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); + } + + public List getInputs(RecipeInput input) { + List result = new ArrayList(); + result.add(input.getInput()); + ItemStack[] equivs = input.getEquivelentInputs(); + if (equivs != null) { + for (ItemStack st : equivs) { + result.add(st); + } + } + return result; + } + + public class SliceAndSpliceRecipe extends TemplateRecipeHandler.CachedRecipe { + + private ArrayList input; + private PositionedStack output; + private int energy; + + public int getEnergy() { + return energy; + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, input); + } + + @Override + public PositionedStack getResult() { + return output; + } + + public SliceAndSpliceRecipe(IRecipe recipe) { + input = new ArrayList(); + int yOff = 11; + int xOff = 13; + + Point pos; + for (RecipeInput recipeInput : recipe.getInputs()) { + if (recipeInput != null) { + pos = ContainerSliceAndSplice.INPUT_SLOTS[recipeInput.getSlotNumber()]; + input.add(new PositionedStack(getInputs(recipeInput), pos.x - xOff, pos.y - yOff)); + } + } + pos = ContainerSliceAndSplice.INPUT_SLOTS[6]; + input.add(new PositionedStack(new ItemStack(Items.iron_axe), pos.x - xOff, pos.y - yOff)); + pos = ContainerSliceAndSplice.INPUT_SLOTS[7]; + input.add(new PositionedStack(new ItemStack(Items.shears), pos.x - xOff, pos.y - yOff)); + + if (recipe.getOutputs()[0] != null) { + output = new PositionedStack( + recipe.getOutputs()[0].getOutput(), + ContainerSliceAndSplice.OUTPUT_SLOT.x - xOff, + ContainerSliceAndSplice.OUTPUT_SLOT.y - yOff); + } + energy = recipe.getEnergyRequired(); + } + } } diff --git a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java index 1f1be5c4..ad85cce9 100644 --- a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java @@ -1,23 +1,9 @@ package crazypants.enderio.nei; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.EnderWidget; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.enderio.core.client.render.EnderWidget; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.gui.GuiContainerBaseEIO; @@ -27,183 +13,202 @@ import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.soul.GuiSoulBinder; import crazypants.enderio.machine.soul.ISoulBinderRecipe; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; public class SoulBinderRecipeHandler extends TemplateRecipeHandler { - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.soulbinder"); - } - - @Override - public String getGuiTexture() { - return GuiContainerBaseEIO.getGuiTexture("soulFuser").toString(); - } - - @Override - public Class getGuiClass() { - return GuiSoulBinder.class; - } - - @Override - public String getOverlayIdentifier() { - return "EnderIOSoulBinder"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOSoulBinder", new Object[0])); - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - if(result == null || result.getItem() == null) { - return; - } - - Map recipes = MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); - if(recipes.isEmpty()) { - return; - } - for (IMachineRecipe recipe : recipes.values()) { - if(recipe instanceof ISoulBinderRecipe) { - ISoulBinderRecipe sbr = (ISoulBinderRecipe) recipe; - if(sbr.getOutputStack().isItemEqual(result)) { - arecipes.add(new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe)); - } - } - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - - if(outputId.equals("EnderIOSoulBinder") && getClass() == SoulBinderRecipeHandler.class) { - Map recipes = MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); - if(recipes.isEmpty()) { - return; - } - for (IMachineRecipe recipe : recipes.values()) { - if(recipe instanceof ISoulBinderRecipe) { - arecipes.add(new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - - if(ingredient == null || ingredient.getItem() == null) { - return; - } - - Map recipes = MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); - if(recipes.isEmpty()) { - return; - } - for (IMachineRecipe recipe : recipes.values()) { - if(recipe instanceof ISoulBinderRecipe) { - SoulBinderRecipeNEI sbr = new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe); - if(sbr.contains(sbr.input, ingredient)) { - arecipes.add(sbr); - } - } - } - - } - - @Override - public void drawBackground(int recipeIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(18, 0, 29, 11, 142, 65); - } - - @Override - public void drawExtras(int recipeIndex) { - drawProgressBar(70, 23, 177, 14, 23, 17, 160, 0); - - SoulBinderRecipeNEI recipe = (SoulBinderRecipeNEI) arecipes.get(recipeIndex); - - String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawStringC(energyString, 83, 45, 0x808080, false); - - int cost = recipe.getExperience(); - if(cost > 0) { - String s = I18n.format("container.repair.cost", new Object[] { Integer.valueOf(cost) }); - GuiDraw.drawStringC(s, 83, 55, 0x80FF20); - } - - int x = 149, y = 32; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } - - private static final ArrayList EMPTY_VIAL_OUTPUT = new ArrayList(); - static { - EMPTY_VIAL_OUTPUT.add(new PositionedStack(new ItemStack(EnderIO.itemSoulVessel), 101, 23)); - } - - public class SoulBinderRecipeNEI extends TemplateRecipeHandler.CachedRecipe { - - private final ArrayList input = new ArrayList(); - private final PositionedStack output; - private int energy; - private int experience; - - public int getEnergy() { - return energy; - } - - public int getExperience() { - return experience; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.soulbinder"); } @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 20, input); + public String getGuiTexture() { + return GuiContainerBaseEIO.getGuiTexture("soulFuser").toString(); } @Override - public PositionedStack getResult() { - return output; + public Class getGuiClass() { + return GuiSoulBinder.class; } @Override - public List getOtherStacks() { - return EMPTY_VIAL_OUTPUT; + public String getOverlayIdentifier() { + return "EnderIOSoulBinder"; } - public SoulBinderRecipeNEI(ISoulBinderRecipe recipe) { - this(recipe.getInputStack(), recipe.getOutputStack(), recipe.getEnergyRequired(), recipe.getExperienceLevelsRequired(), recipe.getSupportedSouls()); + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, 32, 16, 16), "EnderIOSoulBinder", new Object[0])); } - public SoulBinderRecipeNEI(ItemStack inputStack, ItemStack result, int energy, int experience, List list) { + @Override + public void loadCraftingRecipes(ItemStack result) { + if (result == null || result.getItem() == null) { + return; + } - int yOff = 11; - int xOff = 11; - - input.add(new PositionedStack(getSoulVialInputs(list), 38 - xOff, 34 - yOff)); - input.add(new PositionedStack(inputStack, 59 - xOff, 34 - yOff)); - output = new PositionedStack(result, 134 - xOff, 34 - yOff); - - this.energy = energy; - this.experience = experience; + Map recipes = + MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); + if (recipes.isEmpty()) { + return; + } + for (IMachineRecipe recipe : recipes.values()) { + if (recipe instanceof ISoulBinderRecipe) { + ISoulBinderRecipe sbr = (ISoulBinderRecipe) recipe; + if (sbr.getOutputStack().isItemEqual(result)) { + arecipes.add(new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe)); + } + } + } } - private List getSoulVialInputs(List mobs) { - List result = new ArrayList(mobs.size()); - for (String mobName : mobs) { - ItemStack sv = new ItemStack(EnderIO.itemSoulVessel); - sv.stackTagCompound = new NBTTagCompound(); - sv.stackTagCompound.setString("id", mobName); - result.add(sv); - } - return result; - } - } + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("EnderIOSoulBinder") && getClass() == SoulBinderRecipeHandler.class) { + Map recipes = + MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); + if (recipes.isEmpty()) { + return; + } + for (IMachineRecipe recipe : recipes.values()) { + if (recipe instanceof ISoulBinderRecipe) { + arecipes.add(new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe)); + } + } + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + + if (ingredient == null || ingredient.getItem() == null) { + return; + } + + Map recipes = + MachineRecipeRegistry.instance.getRecipesForMachine(ModObject.blockSoulBinder.unlocalisedName); + if (recipes.isEmpty()) { + return; + } + for (IMachineRecipe recipe : recipes.values()) { + if (recipe instanceof ISoulBinderRecipe) { + SoulBinderRecipeNEI sbr = new SoulBinderRecipeNEI((ISoulBinderRecipe) recipe); + if (sbr.contains(sbr.input, ingredient)) { + arecipes.add(sbr); + } + } + } + } + + @Override + public void drawBackground(int recipeIndex) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(18, 0, 29, 11, 142, 65); + } + + @Override + public void drawExtras(int recipeIndex) { + drawProgressBar(70, 23, 177, 14, 23, 17, 160, 0); + + SoulBinderRecipeNEI recipe = (SoulBinderRecipeNEI) arecipes.get(recipeIndex); + + String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation(); + GuiDraw.drawStringC(energyString, 83, 45, 0x808080, false); + + int cost = recipe.getExperience(); + if (cost > 0) { + String s = I18n.format("container.repair.cost", new Object[] {Integer.valueOf(cost)}); + GuiDraw.drawStringC(s, 83, 55, 0x80FF20); + } + + int x = 149, y = 32; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); + } + + private static final ArrayList EMPTY_VIAL_OUTPUT = new ArrayList(); + + static { + EMPTY_VIAL_OUTPUT.add(new PositionedStack(new ItemStack(EnderIO.itemSoulVessel), 101, 23)); + } + + public class SoulBinderRecipeNEI extends TemplateRecipeHandler.CachedRecipe { + + private final ArrayList input = new ArrayList(); + private final PositionedStack output; + private int energy; + private int experience; + + public int getEnergy() { + return energy; + } + + public int getExperience() { + return experience; + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, input); + } + + @Override + public PositionedStack getResult() { + return output; + } + + @Override + public List getOtherStacks() { + return EMPTY_VIAL_OUTPUT; + } + + public SoulBinderRecipeNEI(ISoulBinderRecipe recipe) { + this( + recipe.getInputStack(), + recipe.getOutputStack(), + recipe.getEnergyRequired(), + recipe.getExperienceLevelsRequired(), + recipe.getSupportedSouls()); + } + + public SoulBinderRecipeNEI( + ItemStack inputStack, ItemStack result, int energy, int experience, List list) { + + int yOff = 11; + int xOff = 11; + + input.add(new PositionedStack(getSoulVialInputs(list), 38 - xOff, 34 - yOff)); + input.add(new PositionedStack(inputStack, 59 - xOff, 34 - yOff)); + output = new PositionedStack(result, 134 - xOff, 34 - yOff); + + this.energy = energy; + this.experience = experience; + } + + private List getSoulVialInputs(List mobs) { + List result = new ArrayList(mobs.size()); + for (String mobName : mobs) { + ItemStack sv = new ItemStack(EnderIO.itemSoulVessel); + sv.stackTagCompound = new NBTTagCompound(); + sv.stackTagCompound.setString("id", mobName); + result.add(sv); + } + return result; + } + } } diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index e871952a..61995363 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -1,29 +1,14 @@ package crazypants.enderio.nei; -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - import com.enderio.core.client.render.EnderWidget; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.FluidUtil; - import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -31,284 +16,310 @@ import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.vat.GuiVat; import crazypants.enderio.machine.vat.VatRecipeManager; +import java.awt.Point; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; public class VatRecipeHandler extends TemplateRecipeHandler { - private Rectangle inTankBounds = new Rectangle(25, 1, 15, 47); - private Rectangle outTankBounds = new Rectangle(127, 1, 15, 47); + private Rectangle inTankBounds = new Rectangle(25, 1, 15, 47); + private Rectangle outTankBounds = new Rectangle(127, 1, 15, 47); - public VatRecipeHandler() { - } + public VatRecipeHandler() {} - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("enderio.nei.vat"); - } - - @Override - public String getGuiTexture() { - return GuiContainerBaseEIO.getGuiTexture("vat").toString(); - } - - public PositionedStack getResult() { - return null; - } - - @Override - public Class getGuiClass() { - return GuiVat.class; - } - - @Override - public String getOverlayIdentifier() { - return "EnderIOVat"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(149, 32, 16, 16), "EnderIOVat", new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if(outputId.equals("liquid")) { - loadCraftingRecipes((FluidStack) results[0]); - } else if(outputId.equals("EnderIOVat") && getClass() == VatRecipeHandler.class) { - List recipes = VatRecipeManager.getInstance().getRecipes(); - for (IRecipe recipe : recipes) { - FluidStack output = recipe.getOutputs()[0].getFluidOutput(); - InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - arecipes.add(res); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - FluidStack fluid = FluidUtil.getFluidFromItem(result); - if(fluid != null) { - loadCraftingRecipes(fluid); - } - } - - public void loadCraftingRecipes(FluidStack result) { - List recipes = VatRecipeManager.getInstance().getRecipes(); - for (IRecipe recipe : recipes) { - FluidStack output = recipe.getOutputs()[0].getFluidOutput(); - if(output.isFluidEqual(result)) { - InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - arecipes.add(res); - } - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) { - if(inputId.equals("liquid")) { - loadUsageRecipes((FluidStack) ingredients[0]); - } else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - FluidStack fluid = FluidUtil.getFluidFromItem(ingredient); - if(fluid != null) { - loadUsageRecipes(fluid); - } - - List recipes = VatRecipeManager.getInstance().getRecipes(); - for (IRecipe recipe : recipes) { - if(recipe.isValidInput(0, ingredient) || recipe.isValidInput(1, ingredient)) { - FluidStack output = recipe.getOutputs()[0].getFluidOutput(); - InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - res.setIngredientPermutation(res.inputs, ingredient); - arecipes.add(res); - } - } - } - - public void loadUsageRecipes(FluidStack ingredient) { - List recipes = VatRecipeManager.getInstance().getRecipes(); - for (IRecipe recipe : recipes) { - if(recipe.isValidInput(ingredient)) { - FluidStack output = recipe.getOutputs()[0].getFluidOutput(); - InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); - arecipes.add(res); - } - } - } - - @Override - public void drawBackground(int recipeIndex) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(22, 0, 27, 11, 123, 52); - } - - @Override - public void drawExtras(int recipeIndex) { - InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); - if(rec.inFluid != null && rec.inFluid.getFluid() != null) { - RenderUtil.renderGuiTank(rec.inFluid, rec.inFluid.amount, rec.inFluid.amount, inTankBounds.x, inTankBounds.y, 0, inTankBounds.width, - inTankBounds.height); - } - - if(rec.result != null && rec.result.getFluid() != null) { - RenderUtil - .renderGuiTank(rec.result, rec.result.amount, rec.result.amount, outTankBounds.x, outTankBounds.y, 0, outTankBounds.width, outTankBounds.height); - } - - String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation(); - GuiDraw.drawStringC(energyString, 86, 54, 0x808080, false); - - Fluid outputFluid = rec.result.getFluid(); - List stacks = rec.getIngredients(); - for (PositionedStack ps : stacks) { - float mult = VatRecipeManager.getInstance().getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid); - String str = "x" + mult; - GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false); - } - - int x = 149, y = 32; - EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); - IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); - } - - @Override - public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipeIndex) { - return currenttip; - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipeIndex) { - InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); - Point pos = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipeIndex); - Point relMouse = new Point(pos.x - ((gui.width - 176) / 2) - offset.x, pos.y - ((gui.height - 166) / 2) - offset.y); - - if(inTankBounds.contains(relMouse) || outTankBounds.contains(relMouse)) { - if(inTankBounds.contains(relMouse)) { - if(rec.inFluid != null && rec.inFluid.getFluid() != null) { - currenttip.add(rec.inFluid.getFluid().getLocalizedName(rec.inFluid)); - } - } else { - if(rec.result != null && rec.result.getFluid() != null) { - currenttip.add(rec.result.getFluid().getLocalizedName(rec.result)); - } - } - } - return super.handleTooltip(gui, currenttip, recipeIndex); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipeIndex) { - if(button == 0) { - if(this.transferFluidTanks(gui, recipeIndex, false)) { - return true; - } - } else if(button == 1) { - if(this.transferFluidTanks(gui, recipeIndex, true)) { - return true; - } - } - return super.mouseClicked(gui, button, recipeIndex); - } - - private boolean transferFluidTanks(GuiRecipe gui, int recipeIndex, boolean usage) { - InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); - Point pos = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipeIndex); - Point relMouse = new Point(pos.x - ((gui.width - 176) / 2) - offset.x, pos.y - ((gui.height - 166) / 2) - offset.y); - - if(inTankBounds.contains(relMouse)) { - transferFluidTank(rec.inFluid, usage); - } - else if(outTankBounds.contains(relMouse)) { - transferFluidTank(rec.result, usage); - } - return false; - } - - private boolean transferFluidTank(FluidStack tank, boolean usage) { - if(tank != null && tank.amount > 0) { - if(usage) { - if(!GuiUsageRecipe.openRecipeGui("liquid", new Object[] { tank.copy() })) { - return false; - } - } else { - if(!GuiCraftingRecipe.openRecipeGui("liquid", new Object[] { tank.copy() })) { - return false; - } - } - return true; - } - return false; - } - - public List getInputs(RecipeInput input) { - List result = new ArrayList(); - result.add(input.getInput()); - ItemStack[] eq = input.getEquivelentInputs(); - if(eq != null) { - for (ItemStack st : eq) { - result.add(st); - } - } - return result; - } - - public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe { - - private ArrayList inputs; - private int energy; - private FluidStack result; - private FluidStack inFluid; - - public int getEnergy() { - return energy; + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("enderio.nei.vat"); } @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 30, inputs); + public String getGuiTexture() { + return GuiContainerBaseEIO.getGuiTexture("vat").toString(); } - @Override public PositionedStack getResult() { - return null; + return null; } - public InnerVatRecipe(int energy, RecipeInput[] ingredients, FluidStack result) { - ArrayList inputsOne = new ArrayList(); - ArrayList inputsTwo = new ArrayList(); - for (RecipeInput input : ingredients) { - if(input.getInput() != null) { - List equivs = getInputs(input); - if(input.getSlotNumber() == 0) { - inputsOne.addAll(equivs); - } else if(input.getSlotNumber() == 1) { - inputsTwo.addAll(equivs); - } - } else if(input.getFluidInput() != null) { - inFluid = input.getFluidInput(); + @Override + public Class getGuiClass() { + return GuiVat.class; + } + + @Override + public String getOverlayIdentifier() { + return "EnderIOVat"; + } + + @Override + public void loadTransferRects() { + transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(149, 32, 16, 16), "EnderIOVat", new Object[0])); + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("liquid")) { + loadCraftingRecipes((FluidStack) results[0]); + } else if (outputId.equals("EnderIOVat") && getClass() == VatRecipeHandler.class) { + List recipes = VatRecipeManager.getInstance().getRecipes(); + for (IRecipe recipe : recipes) { + FluidStack output = recipe.getOutputs()[0].getFluidOutput(); + InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + arecipes.add(res); + } + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + FluidStack fluid = FluidUtil.getFluidFromItem(result); + if (fluid != null) { + loadCraftingRecipes(fluid); + } + } + + public void loadCraftingRecipes(FluidStack result) { + List recipes = VatRecipeManager.getInstance().getRecipes(); + for (IRecipe recipe : recipes) { + FluidStack output = recipe.getOutputs()[0].getFluidOutput(); + if (output.isFluidEqual(result)) { + InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + arecipes.add(res); + } + } + } + + @Override + public void loadUsageRecipes(String inputId, Object... ingredients) { + if (inputId.equals("liquid")) { + loadUsageRecipes((FluidStack) ingredients[0]); + } else { + super.loadUsageRecipes(inputId, ingredients); + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + FluidStack fluid = FluidUtil.getFluidFromItem(ingredient); + if (fluid != null) { + loadUsageRecipes(fluid); + } + + List recipes = VatRecipeManager.getInstance().getRecipes(); + for (IRecipe recipe : recipes) { + if (recipe.isValidInput(0, ingredient) || recipe.isValidInput(1, ingredient)) { + FluidStack output = recipe.getOutputs()[0].getFluidOutput(); + InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + res.setIngredientPermutation(res.inputs, ingredient); + arecipes.add(res); + } + } + } + + public void loadUsageRecipes(FluidStack ingredient) { + List recipes = VatRecipeManager.getInstance().getRecipes(); + for (IRecipe recipe : recipes) { + if (recipe.isValidInput(ingredient)) { + FluidStack output = recipe.getOutputs()[0].getFluidOutput(); + InnerVatRecipe res = new InnerVatRecipe(recipe.getEnergyRequired(), recipe.getInputs(), output); + arecipes.add(res); + } + } + } + + @Override + public void drawBackground(int recipeIndex) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(22, 0, 27, 11, 123, 52); + } + + @Override + public void drawExtras(int recipeIndex) { + InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); + if (rec.inFluid != null && rec.inFluid.getFluid() != null) { + RenderUtil.renderGuiTank( + rec.inFluid, + rec.inFluid.amount, + rec.inFluid.amount, + inTankBounds.x, + inTankBounds.y, + 0, + inTankBounds.width, + inTankBounds.height); + } + + if (rec.result != null && rec.result.getFluid() != null) { + RenderUtil.renderGuiTank( + rec.result, + rec.result.amount, + rec.result.amount, + outTankBounds.x, + outTankBounds.y, + 0, + outTankBounds.width, + outTankBounds.height); + } + + String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation(); + GuiDraw.drawStringC(energyString, 86, 54, 0x808080, false); + + Fluid outputFluid = rec.result.getFluid(); + List stacks = rec.getIngredients(); + for (PositionedStack ps : stacks) { + float mult = + VatRecipeManager.getInstance().getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid); + String str = "x" + mult; + GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false); + } + + int x = 149, y = 32; + EnderWidget.map.render(EnderWidget.BUTTON, x, y, 16, 16, 0, true); + IconEIO.map.render(IconEIO.RECIPE, x + 1, y + 1, 14, 14, 0, true); + } + + @Override + public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipeIndex) { + return currenttip; + } + + @Override + public List handleTooltip(GuiRecipe gui, List currenttip, int recipeIndex) { + InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); + Point pos = GuiDraw.getMousePosition(); + Point offset = gui.getRecipePosition(recipeIndex); + Point relMouse = + new Point(pos.x - ((gui.width - 176) / 2) - offset.x, pos.y - ((gui.height - 166) / 2) - offset.y); + + if (inTankBounds.contains(relMouse) || outTankBounds.contains(relMouse)) { + if (inTankBounds.contains(relMouse)) { + if (rec.inFluid != null && rec.inFluid.getFluid() != null) { + currenttip.add(rec.inFluid.getFluid().getLocalizedName(rec.inFluid)); + } + } else { + if (rec.result != null && rec.result.getFluid() != null) { + currenttip.add(rec.result.getFluid().getLocalizedName(rec.result)); + } + } + } + return super.handleTooltip(gui, currenttip, recipeIndex); + } + + @Override + public boolean mouseClicked(GuiRecipe gui, int button, int recipeIndex) { + if (button == 0) { + if (this.transferFluidTanks(gui, recipeIndex, false)) { + return true; + } + } else if (button == 1) { + if (this.transferFluidTanks(gui, recipeIndex, true)) { + return true; + } + } + return super.mouseClicked(gui, button, recipeIndex); + } + + private boolean transferFluidTanks(GuiRecipe gui, int recipeIndex, boolean usage) { + InnerVatRecipe rec = (InnerVatRecipe) arecipes.get(recipeIndex); + Point pos = GuiDraw.getMousePosition(); + Point offset = gui.getRecipePosition(recipeIndex); + Point relMouse = + new Point(pos.x - ((gui.width - 176) / 2) - offset.x, pos.y - ((gui.height - 166) / 2) - offset.y); + + if (inTankBounds.contains(relMouse)) { + transferFluidTank(rec.inFluid, usage); + } else if (outTankBounds.contains(relMouse)) { + transferFluidTank(rec.result, usage); + } + return false; + } + + private boolean transferFluidTank(FluidStack tank, boolean usage) { + if (tank != null && tank.amount > 0) { + if (usage) { + if (!GuiUsageRecipe.openRecipeGui("liquid", new Object[] {tank.copy()})) { + return false; + } + } else { + if (!GuiCraftingRecipe.openRecipeGui("liquid", new Object[] {tank.copy()})) { + return false; + } + } + return true; + } + return false; + } + + public List getInputs(RecipeInput input) { + List result = new ArrayList(); + result.add(input.getInput()); + ItemStack[] eq = input.getEquivelentInputs(); + if (eq != null) { + for (ItemStack st : eq) { + result.add(st); + } + } + return result; + } + + public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe { + + private ArrayList inputs; + private int energy; + private FluidStack result; + private FluidStack inFluid; + + public int getEnergy() { + return energy; + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 30, inputs); + } + + @Override + public PositionedStack getResult() { + return null; + } + + public InnerVatRecipe(int energy, RecipeInput[] ingredients, FluidStack result) { + ArrayList inputsOne = new ArrayList(); + ArrayList inputsTwo = new ArrayList(); + for (RecipeInput input : ingredients) { + if (input.getInput() != null) { + List equivs = getInputs(input); + if (input.getSlotNumber() == 0) { + inputsOne.addAll(equivs); + } else if (input.getSlotNumber() == 1) { + inputsTwo.addAll(equivs); + } + } else if (input.getFluidInput() != null) { + inFluid = input.getFluidInput(); + } + } + + inputs = new ArrayList(); + + if (!inputsOne.isEmpty()) { + inputs.add(new PositionedStack(inputsOne, 51, 1)); + } + if (!inputsTwo.isEmpty()) { + inputs.add(new PositionedStack(inputsTwo, 100, 1)); + } + + this.energy = energy; + this.result = result; } - } - - inputs = new ArrayList(); - - if (!inputsOne.isEmpty()) { - inputs.add(new PositionedStack(inputsOne, 51, 1)); - } - if (!inputsTwo.isEmpty()) { - inputs.add(new PositionedStack(inputsTwo, 100, 1)); - } - - this.energy = energy; - this.result = result; } - } } diff --git a/src/main/java/crazypants/enderio/network/PacketHandler.java b/src/main/java/crazypants/enderio/network/PacketHandler.java index baa5d0d4..5e36e89a 100644 --- a/src/main/java/crazypants/enderio/network/PacketHandler.java +++ b/src/main/java/crazypants/enderio/network/PacketHandler.java @@ -1,26 +1,26 @@ package crazypants.enderio.network; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; -public class PacketHandler -{ +public class PacketHandler { public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("enderio"); private static int ID = 0; - public static int nextID() - { + public static int nextID() { return ID++; } public static void sendToAllAround(IMessage message, TileEntity te, int range) { - INSTANCE.sendToAllAround(message, new TargetPoint(te.getWorldObj().provider.dimensionId, te.xCoord, te.yCoord, te.zCoord, range)); + INSTANCE.sendToAllAround( + message, + new TargetPoint(te.getWorldObj().provider.dimensionId, te.xCoord, te.yCoord, te.zCoord, range)); } public static void sendToAllAround(IMessage message, TileEntity te) { @@ -28,6 +28,6 @@ public class PacketHandler } public static void sendTo(IMessage message, EntityPlayerMP player) { - INSTANCE.sendTo(message, player); + INSTANCE.sendTo(message, player); } } diff --git a/src/main/java/crazypants/enderio/power/BasicCapacitor.java b/src/main/java/crazypants/enderio/power/BasicCapacitor.java index 5127edd3..e6225d83 100644 --- a/src/main/java/crazypants/enderio/power/BasicCapacitor.java +++ b/src/main/java/crazypants/enderio/power/BasicCapacitor.java @@ -2,67 +2,61 @@ package crazypants.enderio.power; public class BasicCapacitor implements ICapacitor { - private int maxEnergyReceived = 40; - private int maxEnergyStored = 100000; - private int maxEnergyExtracted = 20; - private int tier = 1; + private int maxEnergyReceived = 40; + private int maxEnergyStored = 100000; + private int maxEnergyExtracted = 20; + private int tier = 1; - public BasicCapacitor() { - } + public BasicCapacitor() {} - public BasicCapacitor(int maxEnergyIO) { - this(0, maxEnergyIO, maxEnergyIO, maxEnergyIO); - } + public BasicCapacitor(int maxEnergyIO) { + this(0, maxEnergyIO, maxEnergyIO, maxEnergyIO); + } - public BasicCapacitor(int maxEnergyIO, int maxEnergyStored) { - this(0, maxEnergyIO, maxEnergyStored, maxEnergyIO); - } + public BasicCapacitor(int maxEnergyIO, int maxEnergyStored) { + this(0, maxEnergyIO, maxEnergyStored, maxEnergyIO); + } - public BasicCapacitor(int tier, int maxEnergyIO, int maxEnergyStored) { - this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO); - } + public BasicCapacitor(int tier, int maxEnergyIO, int maxEnergyStored) { + this(tier, maxEnergyIO, maxEnergyStored, maxEnergyIO); + } - public BasicCapacitor(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { - configure(tier, maxEnergyReceived, maxEnergyStored, maxEnergyExtracted); - } + public BasicCapacitor(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { + configure(tier, maxEnergyReceived, maxEnergyStored, maxEnergyExtracted); + } + protected void configure(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { + this.tier = tier; + this.maxEnergyReceived = maxEnergyReceived; + this.maxEnergyStored = maxEnergyStored; + this.maxEnergyExtracted = maxEnergyExtracted; + } + @Override + public int getMaxEnergyReceived() { + return maxEnergyReceived; + } + protected void setMaxEnergyReceived(int maxEnergyReceived) { + this.maxEnergyReceived = maxEnergyReceived; + } -protected void configure(int tier, int maxEnergyReceived, int maxEnergyStored, int maxEnergyExtracted) { - this.tier = tier; - this.maxEnergyReceived = maxEnergyReceived; - this.maxEnergyStored = maxEnergyStored; - this.maxEnergyExtracted = maxEnergyExtracted; + @Override + public int getMaxEnergyStored() { + return maxEnergyStored; + } - } + protected void setMaxEnergyStored(int maxEnergyStored) { + this.maxEnergyStored = maxEnergyStored; + } - @Override - public int getMaxEnergyReceived() { - return maxEnergyReceived; - } - - protected void setMaxEnergyReceived(int maxEnergyReceived) { - this.maxEnergyReceived = maxEnergyReceived; - } - - @Override - public int getMaxEnergyStored() { - return maxEnergyStored; - } - - protected void setMaxEnergyStored(int maxEnergyStored) { - this.maxEnergyStored = maxEnergyStored; - } - - @Override - public int getMaxEnergyExtracted() { - return maxEnergyExtracted; - } - - @Override - public int getTier() { - return tier; - } + @Override + public int getMaxEnergyExtracted() { + return maxEnergyExtracted; + } + @Override + public int getTier() { + return tier; + } } diff --git a/src/main/java/crazypants/enderio/power/CapBankPI.java b/src/main/java/crazypants/enderio/power/CapBankPI.java index ed78a353..e3d386cb 100644 --- a/src/main/java/crazypants/enderio/power/CapBankPI.java +++ b/src/main/java/crazypants/enderio/power/CapBankPI.java @@ -1,22 +1,20 @@ package crazypants.enderio.power; -import cofh.api.energy.IEnergyHandler; import crazypants.enderio.machine.capbank.TileCapBank; public class CapBankPI extends EnergyReceiverPI { - public CapBankPI(TileCapBank powerReceptor) { - super(powerReceptor); - } + public CapBankPI(TileCapBank powerReceptor) { + super(powerReceptor); + } - @Override - public boolean isInputOnly() { - return false; - } - - @Override - public boolean isOutputOnly() { - return false; - } + @Override + public boolean isInputOnly() { + return false; + } + @Override + public boolean isOutputOnly() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index 062048d5..7f482534 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -1,78 +1,46 @@ package crazypants.enderio.power; -import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; +import net.minecraft.item.ItemStack; public enum Capacitors { + BASIC_CAPACITOR(new BasicCapacitor(1, 80, 100000, 20), "basicCapacitor", "Basic"), - BASIC_CAPACITOR( - new BasicCapacitor(1, 80, 100000, 20), - "basicCapacitor", - "Basic"), + ACTIVATED_CAPACITOR(new BasicCapacitor(2, 240, 200000, 60), "activatedCapacitor", "Advanced"), - ACTIVATED_CAPACITOR( - new BasicCapacitor(2, 240, 200000, 60), - "activatedCapacitor", - "Advanced"), + ENDER_CAPACITOR(new BasicCapacitor(3, 400, 500000, 100), "enderCapacitor", "Ender"), - ENDER_CAPACITOR( - new BasicCapacitor(3, 400, 500000, 100), - "enderCapacitor", - "Ender"), + CRYSTALLINE_CAPACITOR(new BasicCapacitor(4, 840, 1000000, 260), "crystallineCapacitor", "Crystalline"), - CRYSTALLINE_CAPACITOR( - new BasicCapacitor(4, 840, 1000000, 260), - "crystallineCapacitor", - "Crystalline"), + MELODIC_CAPACITOR(new BasicCapacitor(5, 1640, 2000000, 460), "melodicCapacitor", "Melodic"), - MELODIC_CAPACITOR( - new BasicCapacitor(5, 1640, 2000000, 460), - "melodicCapacitor", - "Melodic"), + STELLAR_CAPACITOR(new BasicCapacitor(6, 3320, 5000000, 980), "stellarCapacitor", "Stellar"), - STELLAR_CAPACITOR( - new BasicCapacitor(6, 3320, 5000000, 980), - "stellarCapacitor", - "Stellar"), + TOTEMIC_CAPACITOR(new BasicCapacitor(7, 6600, 10000000, 1900), "totemicCapacitor", "Totemic"), - TOTEMIC_CAPACITOR( - new BasicCapacitor(7, 6600, 10000000, 1900), - "totemicCapacitor", - "Totemic"), + SILVER_CAPACITOR(new BasicCapacitor(1, 80, 100000, 20), "silverCapacitor", "Basic"), - SILVER_CAPACITOR( - new BasicCapacitor(1, 80, 100000, 20), - "silverCapacitor", - "Basic"), + ENDERGETIC_CAPACITOR(new BasicCapacitor(2, 240, 200000, 60), "endergeticCapacitor", "Advanced"), - ENDERGETIC_CAPACITOR( - new BasicCapacitor(2, 240, 200000, 60), - "endergeticCapacitor", - "Advanced"), + ENDERGISED_CAPACITOR(new BasicCapacitor(3, 400, 500000, 100), "endergisedCapacitor", "Ender"); - ENDERGISED_CAPACITOR( - new BasicCapacitor(3, 400, 500000, 100), - "endergisedCapacitor", - "Ender"); + public final ICapacitor capacitor; + public final String unlocalisedName; + public final String iconKey; + public final String oreDict; - public final ICapacitor capacitor; - public final String unlocalisedName; - public final String iconKey; - public final String oreDict; + private Capacitors(ICapacitor capacitor, String unlocalisedName, String oreDict) { + this.capacitor = capacitor; + this.unlocalisedName = "enderio." + unlocalisedName; + this.iconKey = "enderio:" + unlocalisedName; + this.oreDict = oreDict; + } - private Capacitors(ICapacitor capacitor, String unlocalisedName, String oreDict) { - this.capacitor = capacitor; - this.unlocalisedName = "enderio." + unlocalisedName; - this.iconKey = "enderio:" + unlocalisedName; - this.oreDict = oreDict; - } - - public String getOreTag() { - return "capacitor"+oreDict; - } - - public ItemStack getItemStack() { - return new ItemStack(EnderIO.itemBasicCapacitor, 1, ordinal()); - } + public String getOreTag() { + return "capacitor" + oreDict; + } + public ItemStack getItemStack() { + return new ItemStack(EnderIO.itemBasicCapacitor, 1, ordinal()); + } } diff --git a/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java b/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java index 95f87b15..a9e6ba15 100644 --- a/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyConnectionPI.java @@ -1,62 +1,61 @@ package crazypants.enderio.power; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyConnection; +import net.minecraftforge.common.util.ForgeDirection; public class EnergyConnectionPI implements IPowerInterface { - private IEnergyConnection delegate; + private IEnergyConnection delegate; - public EnergyConnectionPI(IEnergyConnection delegate) { - this.delegate = delegate; - } - - @Override - public Object getDelegate() { - return delegate; - } - - @Override - public boolean canConduitConnect(ForgeDirection direction) { - if(delegate != null && direction != null) { - return delegate.canConnectEnergy(direction.getOpposite()); + public EnergyConnectionPI(IEnergyConnection delegate) { + this.delegate = delegate; } - return false; - } - @Override - public int getEnergyStored(ForgeDirection dir) { - return 0; - } + @Override + public Object getDelegate() { + return delegate; + } - @Override - public int getMaxEnergyStored(ForgeDirection dir) { - return 0; - } + @Override + public boolean canConduitConnect(ForgeDirection direction) { + if (delegate != null && direction != null) { + return delegate.canConnectEnergy(direction.getOpposite()); + } + return false; + } - @Override - public int getPowerRequest(ForgeDirection dir) { - return 0; - } + @Override + public int getEnergyStored(ForgeDirection dir) { + return 0; + } - @Override - public int getMinEnergyReceived(ForgeDirection dir) { - return 0; - } + @Override + public int getMaxEnergyStored(ForgeDirection dir) { + return 0; + } - @Override - public int recieveEnergy(ForgeDirection opposite, int canOffer) { - return 0; - } + @Override + public int getPowerRequest(ForgeDirection dir) { + return 0; + } - @Override - public boolean isOutputOnly() { - return true; - } + @Override + public int getMinEnergyReceived(ForgeDirection dir) { + return 0; + } - @Override - public boolean isInputOnly() { - return false; - } + @Override + public int recieveEnergy(ForgeDirection opposite, int canOffer) { + return 0; + } + @Override + public boolean isOutputOnly() { + return true; + } + + @Override + public boolean isInputOnly() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java b/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java index 34697fc7..14321e23 100644 --- a/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java @@ -4,20 +4,19 @@ import cofh.api.energy.IEnergyHandler; public class EnergyHandlerPI extends EnergyReceiverPI { - private IEnergyHandler rfPower; + private IEnergyHandler rfPower; - public EnergyHandlerPI(IEnergyHandler powerReceptor) { - super(powerReceptor); - } + public EnergyHandlerPI(IEnergyHandler powerReceptor) { + super(powerReceptor); + } - @Override - public boolean isInputOnly() { - return false; - } - - @Override - public boolean isOutputOnly() { - return false; - } + @Override + public boolean isInputOnly() { + return false; + } + @Override + public boolean isOutputOnly() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/power/EnergyProviderPI.java b/src/main/java/crazypants/enderio/power/EnergyProviderPI.java index d3f4b763..db3480ab 100644 --- a/src/main/java/crazypants/enderio/power/EnergyProviderPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyProviderPI.java @@ -1,68 +1,67 @@ package crazypants.enderio.power; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyProvider; +import net.minecraftforge.common.util.ForgeDirection; public class EnergyProviderPI implements IPowerInterface { - - private IEnergyProvider rfPower; - public EnergyProviderPI(IEnergyProvider powerReceptor) { - rfPower = powerReceptor; - } + private IEnergyProvider rfPower; - @Override - public Object getDelegate() { - return rfPower; - } - - @Override - public boolean canConduitConnect(ForgeDirection direction) { - if(rfPower != null && direction != null) { - return rfPower.canConnectEnergy(direction.getOpposite()); + public EnergyProviderPI(IEnergyProvider powerReceptor) { + rfPower = powerReceptor; } - return false; - } - @Override - public int getEnergyStored(ForgeDirection dir) { - if(rfPower != null && dir != null) { - return rfPower.getEnergyStored(dir); + @Override + public Object getDelegate() { + return rfPower; } - return 0; - } - @Override - public int getMaxEnergyStored(ForgeDirection dir) { - if(rfPower != null && dir != null) { - return rfPower.getMaxEnergyStored(dir); + @Override + public boolean canConduitConnect(ForgeDirection direction) { + if (rfPower != null && direction != null) { + return rfPower.canConnectEnergy(direction.getOpposite()); + } + return false; } - return 0; - } - @Override - public int getPowerRequest(ForgeDirection dir) { - return 0; - } - - @Override - public int getMinEnergyReceived(ForgeDirection dir) { - return 0; - } + @Override + public int getEnergyStored(ForgeDirection dir) { + if (rfPower != null && dir != null) { + return rfPower.getEnergyStored(dir); + } + return 0; + } - @Override - public int recieveEnergy(ForgeDirection opposite, int canOffer) { - return 0; - } + @Override + public int getMaxEnergyStored(ForgeDirection dir) { + if (rfPower != null && dir != null) { + return rfPower.getMaxEnergyStored(dir); + } + return 0; + } - @Override - public boolean isOutputOnly() { - return true; - } + @Override + public int getPowerRequest(ForgeDirection dir) { + return 0; + } - @Override - public boolean isInputOnly() { - return false; - } + @Override + public int getMinEnergyReceived(ForgeDirection dir) { + return 0; + } + @Override + public int recieveEnergy(ForgeDirection opposite, int canOffer) { + return 0; + } + + @Override + public boolean isOutputOnly() { + return true; + } + + @Override + public boolean isInputOnly() { + return false; + } } diff --git a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java index e31e50b7..c73299bf 100644 --- a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java @@ -1,81 +1,80 @@ package crazypants.enderio.power; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyReceiver; +import net.minecraftforge.common.util.ForgeDirection; public class EnergyReceiverPI implements IPowerInterface { - - private IEnergyReceiver rfPower; - public EnergyReceiverPI(IEnergyReceiver powerReceptor) { - rfPower = powerReceptor; - } + private IEnergyReceiver rfPower; - @Override - public Object getDelegate() { - return rfPower; - } - - @Override - public boolean canConduitConnect(ForgeDirection direction) { - if(rfPower != null && direction != null) { - return rfPower.canConnectEnergy(direction.getOpposite()); + public EnergyReceiverPI(IEnergyReceiver powerReceptor) { + rfPower = powerReceptor; } - return false; - } - @Override - public int getEnergyStored(ForgeDirection dir) { - if(rfPower != null && dir != null) { - return rfPower.getEnergyStored(dir); + @Override + public Object getDelegate() { + return rfPower; } - return 0; - } - @Override - public int getMaxEnergyStored(ForgeDirection dir) { - if(rfPower != null && dir != null) { - return rfPower.getMaxEnergyStored(dir); + @Override + public boolean canConduitConnect(ForgeDirection direction) { + if (rfPower != null && direction != null) { + return rfPower.canConnectEnergy(direction.getOpposite()); + } + return false; } - return 0; - } - @Override - public int getPowerRequest(ForgeDirection dir) { - if(rfPower != null && dir != null && rfPower.canConnectEnergy(dir)) { - return rfPower.receiveEnergy(dir, 99999999, true); + @Override + public int getEnergyStored(ForgeDirection dir) { + if (rfPower != null && dir != null) { + return rfPower.getEnergyStored(dir); + } + return 0; } - return 0; - } - public static int getPowerRequest(ForgeDirection dir, IEnergyReceiver handler) { - if(handler != null && dir != null && handler.canConnectEnergy(dir)) { - return handler.receiveEnergy(dir, 99999999, true); + @Override + public int getMaxEnergyStored(ForgeDirection dir) { + if (rfPower != null && dir != null) { + return rfPower.getMaxEnergyStored(dir); + } + return 0; } - return 0; - } - @Override - public int getMinEnergyReceived(ForgeDirection dir) { - return 0; - } - - @Override - public int recieveEnergy(ForgeDirection opposite, int canOffer) { - if(rfPower != null && opposite != null) { - return rfPower.receiveEnergy(opposite, canOffer, false); + @Override + public int getPowerRequest(ForgeDirection dir) { + if (rfPower != null && dir != null && rfPower.canConnectEnergy(dir)) { + return rfPower.receiveEnergy(dir, 99999999, true); + } + return 0; } - return 0; - } - @Override - public boolean isOutputOnly() { - return false; - } + public static int getPowerRequest(ForgeDirection dir, IEnergyReceiver handler) { + if (handler != null && dir != null && handler.canConnectEnergy(dir)) { + return handler.receiveEnergy(dir, 99999999, true); + } + return 0; + } - @Override - public boolean isInputOnly() { - return true; - } + @Override + public int getMinEnergyReceived(ForgeDirection dir) { + return 0; + } + @Override + public int recieveEnergy(ForgeDirection opposite, int canOffer) { + if (rfPower != null && opposite != null) { + return rfPower.receiveEnergy(opposite, canOffer, false); + } + return 0; + } + + @Override + public boolean isOutputOnly() { + return false; + } + + @Override + public boolean isInputOnly() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/power/ICapacitor.java b/src/main/java/crazypants/enderio/power/ICapacitor.java index fc8e297b..25031fc8 100644 --- a/src/main/java/crazypants/enderio/power/ICapacitor.java +++ b/src/main/java/crazypants/enderio/power/ICapacitor.java @@ -2,12 +2,11 @@ package crazypants.enderio.power; public interface ICapacitor { - int getMaxEnergyReceived(); + int getMaxEnergyReceived(); - int getMaxEnergyStored(); + int getMaxEnergyStored(); - int getMaxEnergyExtracted(); - - int getTier(); + int getMaxEnergyExtracted(); + int getTier(); } diff --git a/src/main/java/crazypants/enderio/power/ICapacitorItem.java b/src/main/java/crazypants/enderio/power/ICapacitorItem.java index 9fc86908..a7fa8b3e 100644 --- a/src/main/java/crazypants/enderio/power/ICapacitorItem.java +++ b/src/main/java/crazypants/enderio/power/ICapacitorItem.java @@ -4,6 +4,5 @@ import net.minecraft.item.ItemStack; public interface ICapacitorItem { - ICapacitor getCapacitor(ItemStack stack); - + ICapacitor getCapacitor(ItemStack stack); } diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java b/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java index af41c489..f1f2b22f 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java @@ -2,6 +2,4 @@ package crazypants.enderio.power; import cofh.api.energy.IEnergyHandler; -public interface IInternalPowerHandler extends IInternalPoweredTile, IEnergyHandler { - -} +public interface IInternalPowerHandler extends IInternalPoweredTile, IEnergyHandler {} diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java b/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java index a18a5469..b6f9fef7 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java @@ -2,6 +2,4 @@ package crazypants.enderio.power; import cofh.api.energy.IEnergyProvider; -public interface IInternalPowerProvider extends IInternalPoweredTile, IEnergyProvider { - -} +public interface IInternalPowerProvider extends IInternalPoweredTile, IEnergyProvider {} diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java b/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java index 154b8167..da98fa9d 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java @@ -2,6 +2,4 @@ package crazypants.enderio.power; import cofh.api.energy.IEnergyReceiver; -public interface IInternalPowerReceiver extends IInternalPoweredTile, IEnergyReceiver { - -} +public interface IInternalPowerReceiver extends IInternalPoweredTile, IEnergyReceiver {} diff --git a/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java b/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java index 38c7c960..76267f27 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java +++ b/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java @@ -1,18 +1,17 @@ package crazypants.enderio.power; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyConnection; +import net.minecraftforge.common.util.ForgeDirection; -//IEnergyHandler, +// IEnergyHandler, public interface IInternalPoweredTile extends IPowerContainer, IEnergyConnection { - int getMaxEnergyRecieved(ForgeDirection dir); - - int getMaxEnergyStored(); - - /** - * Should the power be displayed in WAILA or other places - */ - boolean displayPower(); - + int getMaxEnergyRecieved(ForgeDirection dir); + + int getMaxEnergyStored(); + + /** + * Should the power be displayed in WAILA or other places + */ + boolean displayPower(); } diff --git a/src/main/java/crazypants/enderio/power/IPowerContainer.java b/src/main/java/crazypants/enderio/power/IPowerContainer.java index 5b9f751c..fe9cfe94 100644 --- a/src/main/java/crazypants/enderio/power/IPowerContainer.java +++ b/src/main/java/crazypants/enderio/power/IPowerContainer.java @@ -4,10 +4,9 @@ import com.enderio.core.common.util.BlockCoord; public interface IPowerContainer { - int getEnergyStored(); + int getEnergyStored(); - void setEnergyStored(int storedEnergy); - - BlockCoord getLocation(); + void setEnergyStored(int storedEnergy); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/power/IPowerInterface.java b/src/main/java/crazypants/enderio/power/IPowerInterface.java index 6cb09d44..4595aa70 100644 --- a/src/main/java/crazypants/enderio/power/IPowerInterface.java +++ b/src/main/java/crazypants/enderio/power/IPowerInterface.java @@ -4,22 +4,21 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IPowerInterface { - Object getDelegate(); + Object getDelegate(); - boolean canConduitConnect(ForgeDirection direction); + boolean canConduitConnect(ForgeDirection direction); - int getEnergyStored(ForgeDirection dir); + int getEnergyStored(ForgeDirection dir); - int getMaxEnergyStored(ForgeDirection dir); + int getMaxEnergyStored(ForgeDirection dir); - int getPowerRequest(ForgeDirection dir); + int getPowerRequest(ForgeDirection dir); - int getMinEnergyReceived(ForgeDirection dir); + int getMinEnergyReceived(ForgeDirection dir); - int recieveEnergy(ForgeDirection opposite, int canOffer); + int recieveEnergy(ForgeDirection opposite, int canOffer); - boolean isOutputOnly(); - - boolean isInputOnly(); + boolean isOutputOnly(); + boolean isInputOnly(); } diff --git a/src/main/java/crazypants/enderio/power/IPowerStorage.java b/src/main/java/crazypants/enderio/power/IPowerStorage.java index 306ae6b1..0713cea1 100644 --- a/src/main/java/crazypants/enderio/power/IPowerStorage.java +++ b/src/main/java/crazypants/enderio/power/IPowerStorage.java @@ -4,32 +4,31 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IPowerStorage { - IPowerStorage getController(); + IPowerStorage getController(); - long getEnergyStoredL(); + long getEnergyStoredL(); - long getMaxEnergyStoredL(); + long getMaxEnergyStoredL(); - /** - * If false this connection will be treated the same a regular powered block. - * No power will be drawn over the connection and it will not be used to - * balance capacitor bank levels - * - * @param direction - * @return - */ - boolean isNetworkControlledIo(ForgeDirection direction); + /** + * If false this connection will be treated the same a regular powered block. + * No power will be drawn over the connection and it will not be used to + * balance capacitor bank levels + * + * @param direction + * @return + */ + boolean isNetworkControlledIo(ForgeDirection direction); - boolean isOutputEnabled(ForgeDirection direction); + boolean isOutputEnabled(ForgeDirection direction); - boolean isInputEnabled(ForgeDirection direction); + boolean isInputEnabled(ForgeDirection direction); - int getMaxOutput(); + int getMaxOutput(); - int getMaxInput(); + int getMaxInput(); - void addEnergy(int amount); - - boolean isCreative(); + void addEnergy(int amount); + boolean isCreative(); } diff --git a/src/main/java/crazypants/enderio/power/PerTickIntAverageCalculator.java b/src/main/java/crazypants/enderio/power/PerTickIntAverageCalculator.java index 743e2305..065bafe5 100644 --- a/src/main/java/crazypants/enderio/power/PerTickIntAverageCalculator.java +++ b/src/main/java/crazypants/enderio/power/PerTickIntAverageCalculator.java @@ -2,48 +2,48 @@ package crazypants.enderio.power; public class PerTickIntAverageCalculator { - private float lastSecondTotal = 0; - private int tickCount = 0; - private final float[] secondsCache; - private int writeIndex; - private int writeSize; + private float lastSecondTotal = 0; + private int tickCount = 0; + private final float[] secondsCache; + private int writeIndex; + private int writeSize; - public PerTickIntAverageCalculator() { - this(5); - } - - public PerTickIntAverageCalculator(int numSeconds) { - secondsCache = new float[numSeconds]; - } - - public float getAverage() { - int numTicks = tickCount + writeSize * 20; - if(numTicks == 0) { - return 0; + public PerTickIntAverageCalculator() { + this(5); } - float totalPower = lastSecondTotal; - for (int idx=writeIndex,cnt=writeSize ; cnt-->0 ;) { - totalPower += secondsCache[idx]; - if(++idx == secondsCache.length) { - idx = 0; - } - } - return totalPower / numTicks; - } - public void tick(long value) { - lastSecondTotal += value; - tickCount++; - if(tickCount == 20) { - secondsCache[writeIndex++] = lastSecondTotal; - if(writeIndex > writeSize) { - writeSize = writeIndex; - } - if(writeIndex == secondsCache.length) { - writeIndex = 0; - } - lastSecondTotal = 0; - tickCount = 0; + public PerTickIntAverageCalculator(int numSeconds) { + secondsCache = new float[numSeconds]; } - } -} \ No newline at end of file + + public float getAverage() { + int numTicks = tickCount + writeSize * 20; + if (numTicks == 0) { + return 0; + } + float totalPower = lastSecondTotal; + for (int idx = writeIndex, cnt = writeSize; cnt-- > 0; ) { + totalPower += secondsCache[idx]; + if (++idx == secondsCache.length) { + idx = 0; + } + } + return totalPower / numTicks; + } + + public void tick(long value) { + lastSecondTotal += value; + tickCount++; + if (tickCount == 20) { + secondsCache[writeIndex++] = lastSecondTotal; + if (writeIndex > writeSize) { + writeSize = writeIndex; + } + if (writeIndex == secondsCache.length) { + writeIndex = 0; + } + lastSecondTotal = 0; + tickCount = 0; + } + } +} diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index eb33b905..81b4e856 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -1,93 +1,88 @@ package crazypants.enderio.power; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.AbstractMachineEntity; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.machine.AbstractMachineEntity; - public class PowerDistributor { + private final List receptors = new ArrayList(); + private ListIterator receptorIterator = receptors.listIterator(); + private boolean receptorsDirty = true; - private final List receptors = new ArrayList(); - private ListIterator receptorIterator = receptors.listIterator(); - private boolean receptorsDirty = true; + private final BlockCoord bc; - private final BlockCoord bc; - - - public PowerDistributor(BlockCoord bc) { - this.bc = bc; - } - - - public void neighboursChanged() { - receptorsDirty = true; - } - - public int transmitEnergy(World worldObj, int available) { - - int transmitted = 0; - checkReceptors(worldObj); - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = receptors.listIterator(); + public PowerDistributor(BlockCoord bc) { + this.bc = bc; } - int appliedCount = 0; - int numReceptors = receptors.size(); - while (receptorIterator.hasNext() && available > 0 && appliedCount < numReceptors) { - Receptor receptor = receptorIterator.next(); - IPowerInterface pp = receptor.receptor; - if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= available) { - int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), available); - transmitted += used; - available -= used; - } - if(available <= 0) { - break; - } - - if(!receptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = receptors.listIterator(); - } - appliedCount++; + public void neighboursChanged() { + receptorsDirty = true; } - return transmitted; - } - private void checkReceptors(World worldObj) { - if(!receptorsDirty) { - return; - } - receptors.clear(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity transmitter = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if(!(transmitter instanceof AbstractMachineEntity) || ((AbstractMachineEntity) transmitter).getIoMode(dir).canOutput()) { - BlockCoord checkLoc = bc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - IPowerInterface pi = PowerHandlerUtil.create(te); - if (pi != null && pi.canConduitConnect(dir)) { - receptors.add(new Receptor(pi, dir)); + public int transmitEnergy(World worldObj, int available) { + + int transmitted = 0; + checkReceptors(worldObj); + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); } - } - } - receptorIterator = receptors.listIterator(); - receptorsDirty = false; - } - static class Receptor { - IPowerInterface receptor; - ForgeDirection fromDir; + int appliedCount = 0; + int numReceptors = receptors.size(); + while (receptorIterator.hasNext() && available > 0 && appliedCount < numReceptors) { + Receptor receptor = receptorIterator.next(); + IPowerInterface pp = receptor.receptor; + if (pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= available) { + int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), available); + transmitted += used; + available -= used; + } + if (available <= 0) { + break; + } - private Receptor(IPowerInterface rec, ForgeDirection fromDir) { - this.receptor = rec; - this.fromDir = fromDir; + if (!receptors.isEmpty() && !receptorIterator.hasNext()) { + receptorIterator = receptors.listIterator(); + } + appliedCount++; + } + return transmitted; + } + + private void checkReceptors(World worldObj) { + if (!receptorsDirty) { + return; + } + receptors.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + TileEntity transmitter = worldObj.getTileEntity(bc.x, bc.y, bc.z); + if (!(transmitter instanceof AbstractMachineEntity) + || ((AbstractMachineEntity) transmitter).getIoMode(dir).canOutput()) { + BlockCoord checkLoc = bc.getLocation(dir); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + IPowerInterface pi = PowerHandlerUtil.create(te); + if (pi != null && pi.canConduitConnect(dir)) { + receptors.add(new Receptor(pi, dir)); + } + } + } + receptorIterator = receptors.listIterator(); + receptorsDirty = false; + } + + static class Receptor { + IPowerInterface receptor; + ForgeDirection fromDir; + + private Receptor(IPowerInterface rec, ForgeDirection fromDir) { + this.receptor = rec; + this.fromDir = fromDir; + } } - } } diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 3e8262d8..cefee113 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -1,66 +1,64 @@ package crazypants.enderio.power; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; import crazypants.enderio.machine.capbank.TileCapBank; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class PowerHandlerUtil { - public static final String STORED_ENERGY_NBT_KEY = "storedEnergyRF"; + public static final String STORED_ENERGY_NBT_KEY = "storedEnergyRF"; - public static IPowerInterface create(Object o) { - if (o instanceof TileCapBank) { - return new CapBankPI((TileCapBank) o); - } else if (o instanceof IEnergyHandler) { - return new EnergyHandlerPI((IEnergyHandler) o); - } else if (o instanceof IEnergyProvider) { - return new EnergyProviderPI((IEnergyProvider) o); - } else if(o instanceof IEnergyReceiver) { - return new EnergyReceiverPI((IEnergyReceiver) o); - } else if(o instanceof IEnergyConnection) { - return new EnergyConnectionPI((IEnergyConnection) o); - } - return null; - } - - public static int getStoredEnergyForItem(ItemStack item) { - NBTTagCompound tag = item.getTagCompound(); - if(tag == null) { - return 0; + public static IPowerInterface create(Object o) { + if (o instanceof TileCapBank) { + return new CapBankPI((TileCapBank) o); + } else if (o instanceof IEnergyHandler) { + return new EnergyHandlerPI((IEnergyHandler) o); + } else if (o instanceof IEnergyProvider) { + return new EnergyProviderPI((IEnergyProvider) o); + } else if (o instanceof IEnergyReceiver) { + return new EnergyReceiverPI((IEnergyReceiver) o); + } else if (o instanceof IEnergyConnection) { + return new EnergyConnectionPI((IEnergyConnection) o); + } + return null; } - if(tag.hasKey("storedEnergy")) { - double storedMj = tag.getDouble("storedEnergy"); - return (int) (storedMj * 10); + public static int getStoredEnergyForItem(ItemStack item) { + NBTTagCompound tag = item.getTagCompound(); + if (tag == null) { + return 0; + } + + if (tag.hasKey("storedEnergy")) { + double storedMj = tag.getDouble("storedEnergy"); + return (int) (storedMj * 10); + } + + return tag.getInteger(STORED_ENERGY_NBT_KEY); } - return tag.getInteger(STORED_ENERGY_NBT_KEY); - } - - public static void setStoredEnergyForItem(ItemStack item, int storedEnergy) { - NBTTagCompound tag = item.getTagCompound(); - if(tag == null) { - tag = new NBTTagCompound(); + public static void setStoredEnergyForItem(ItemStack item, int storedEnergy) { + NBTTagCompound tag = item.getTagCompound(); + if (tag == null) { + tag = new NBTTagCompound(); + } + tag.setInteger(STORED_ENERGY_NBT_KEY, storedEnergy); + item.setTagCompound(tag); } - tag.setInteger(STORED_ENERGY_NBT_KEY, storedEnergy); - item.setTagCompound(tag); - } - - public static int recieveInternal(IInternalPoweredTile target, int maxReceive, ForgeDirection from, boolean simulate) { - int result = Math.min(target.getMaxEnergyRecieved(from), maxReceive); - result = Math.min(target.getMaxEnergyStored() - target.getEnergyStored(), result); - result = Math.max(0, result); - if(result > 0 && !simulate) { - target.setEnergyStored(target.getEnergyStored() + result); + public static int recieveInternal( + IInternalPoweredTile target, int maxReceive, ForgeDirection from, boolean simulate) { + int result = Math.min(target.getMaxEnergyRecieved(from), maxReceive); + result = Math.min(target.getMaxEnergyStored() - target.getEnergyStored(), result); + result = Math.max(0, result); + if (result > 0 && !simulate) { + target.setEnergyStored(target.getEnergyStored() + result); + } + return result; } - return result; - } - - } diff --git a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java index 06a16ef9..e00846c6 100644 --- a/src/main/java/crazypants/enderio/rail/BlockEnderRail.java +++ b/src/main/java/crazypants/enderio/rail/BlockEnderRail.java @@ -1,27 +1,8 @@ package crazypants.enderio.rail; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRail; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.MetadataUtil; import com.enderio.core.common.util.RoundRobinIterator; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -36,284 +17,300 @@ import crazypants.enderio.machine.transceiver.ServerChannelRegister; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRail; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityMinecart; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class BlockEnderRail extends BlockRail implements IResourceTooltipProvider { - public static boolean isReverse(int meta) { - return MetadataUtil.isBitSet(3, meta); - } - - public static ForgeDirection getDirection(int meta) { - ForgeDirection result; - if(isEastWest(meta)) { - result = ForgeDirection.EAST; - } else { - result = ForgeDirection.SOUTH; - } - if(isReverse(meta)) { - result = result.getOpposite(); - } - return result; - } - - private static boolean isEastWest(int meta) { - return MetadataUtil.isBitSet(0, meta); - } - - public static BlockEnderRail create() { - PacketHandler.INSTANCE.registerMessage(PacketTeleportEffects.class, PacketTeleportEffects.class, PacketHandler.nextID(), Side.CLIENT); - BlockEnderRail res = new BlockEnderRail(); - res.init(); - - if(Config.enderRailTeleportPlayers) { - FMLCommonHandler.instance().bus().register(PlayerTeleportHandler.instance); - } - return res; - } - - private IIcon iconEastWest; - private IIcon iconEastWestTurned; - - private int linkId; - - protected BlockEnderRail() { - setBlockName(ModObject.blockEnderRail.unlocalisedName); - setStepSound(Block.soundTypeMetal); - if(Config.transceiverEnabled && Config.enderRailEnabled) { - setCreativeTab(EnderIOTab.tabEnderIO); - } - setBlockTextureName("enderio:blockEnderRail"); - setHardness(0.7F); - setStepSound(soundTypeMetal); - } - - private void init() { - GameRegistry.registerBlock(this, ModObject.blockEnderRail.unlocalisedName); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - super.registerBlockIcons(register); - iconEastWest = register.registerIcon("enderio:blockEnderRailEastWest"); - iconEastWestTurned = register.registerIcon("enderio:blockEnderRailEastWest_turned"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - if(!isEastWest(meta)) { - return super.getIcon(side, meta); - } else if(isReverse(meta)) { - return iconEastWestTurned; - } - return iconEastWest; - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if(ToolUtil.isToolEquipped(player)) { - if(!world.isRemote) { - int meta = world.getBlockMetadata(x, y, z); - meta = MetadataUtil.setBit(3, !MetadataUtil.isBitSet(3, meta), meta); - world.setBlockMetadataWithNotify(x, y, z, meta, 2); - } - return true; - } - return false; - } - - @Override - public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { - return false; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y - 1, z); - if(te instanceof TileTransceiver) { - ((TileTransceiver) te).getRailController().dropNonSpawnedCarts(); - } - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - - @Override - public int getBasicRailMetadata(IBlockAccess world, EntityMinecart cart, int x, int y, int z) { - //Ignore turning bit, used for receive direction - return world.getBlockMetadata(x, y, z) & 7; - } - - @Override - public boolean canPlaceBlockAt(World world, int x, int y, int z) { - return world.getBlock(x, y - 1, z) == EnderIO.blockTransceiver; - } - - @Override - public boolean canBlockStay(World world, int x, int y, int z) { - return canPlaceBlockAt(world, x, y, z); - } - - @Override - public boolean isFlexibleRail(IBlockAccess world, int y, int x, int z) { - return false; - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - if(world.isRemote) { - return; + public static boolean isReverse(int meta) { + return MetadataUtil.isBitSet(3, meta); } - int origMeta = world.getBlockMetadata(x, y, z); - int newMeta = origMeta; - if(field_150053_a) { - newMeta = origMeta & 7; + public static ForgeDirection getDirection(int meta) { + ForgeDirection result; + if (isEastWest(meta)) { + result = ForgeDirection.EAST; + } else { + result = ForgeDirection.SOUTH; + } + if (isReverse(meta)) { + result = result.getOpposite(); + } + return result; } - if(!canBlockStay(world, x, y, z)) { - dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - world.setBlockToAir(x, y, z); - } else { - func_150048_a(world, x, y, z, origMeta, newMeta, block); + private static boolean isEastWest(int meta) { + return MetadataUtil.isBitSet(0, meta); } - } + public static BlockEnderRail create() { + PacketHandler.INSTANCE.registerMessage( + PacketTeleportEffects.class, PacketTeleportEffects.class, PacketHandler.nextID(), Side.CLIENT); + BlockEnderRail res = new BlockEnderRail(); + res.init(); - @Override - public void onMinecartPass(World world, EntityMinecart cart, int x, int y, int z) { - if(world.isRemote) { - return; + if (Config.enderRailTeleportPlayers) { + FMLCommonHandler.instance().bus().register(PlayerTeleportHandler.instance); + } + return res; } - TileEntity te = world.getTileEntity(x, y - 1, z); - if(!(te instanceof TileTransceiver)) { - return; - } - TileTransceiver ter = (TileTransceiver) te; - if(ter.getRailController().isRecievedCart(cart)) { - return; - } - tryTeleport(world, cart, x, y, z); - } - private void tryTeleport(World world, EntityMinecart cart, int x, int y, int z) { + private IIcon iconEastWest; + private IIcon iconEastWestTurned; - TileEntity te = world.getTileEntity(x, y - 1, z); - if(!(te instanceof TileTransceiver)) { - return; + private int linkId; + + protected BlockEnderRail() { + setBlockName(ModObject.blockEnderRail.unlocalisedName); + setStepSound(Block.soundTypeMetal); + if (Config.transceiverEnabled && Config.enderRailEnabled) { + setCreativeTab(EnderIOTab.tabEnderIO); + } + setBlockTextureName("enderio:blockEnderRail"); + setHardness(0.7F); + setStepSound(soundTypeMetal); } - TileTransceiver sender = (TileTransceiver) te; - if(!sender.isRedstoneChecksPassed()) { - return; + + private void init() { + GameRegistry.registerBlock(this, ModObject.blockEnderRail.unlocalisedName); } - if(!sender.hasPower()) { - return; + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + super.registerBlockIcons(register); + iconEastWest = register.registerIcon("enderio:blockEnderRailEastWest"); + iconEastWestTurned = register.registerIcon("enderio:blockEnderRailEastWest_turned"); } - Set sendChannels = sender.getSendChannels(ChannelType.RAIL); - for (Channel channel : sendChannels) { - RoundRobinIterator iter = ServerChannelRegister.instance.getIterator(channel); - for (TileTransceiver reciever : iter) { - if(isValidDestination(sender, channel, reciever)) { - int requiredPower = getPowerRequired(cart, sender, reciever); - if(sender.getEnergyStored() >= requiredPower) { - if(teleportCart(world, cart, sender, reciever)) { - sender.usePower(requiredPower); - return; + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + if (!isEastWest(meta)) { + return super.getIcon(side, meta); + } else if (isReverse(meta)) { + return iconEastWestTurned; + } + return iconEastWest; + } + + @Override + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + if (ToolUtil.isToolEquipped(player)) { + if (!world.isRemote) { + int meta = world.getBlockMetadata(x, y, z); + meta = MetadataUtil.setBit(3, !MetadataUtil.isBitSet(3, meta), meta); + world.setBlockMetadataWithNotify(x, y, z, meta, 2); } - } + return true; } - } - } - } - - private boolean isValidDestination(TileTransceiver sender, Channel channel, TileTransceiver reciever) { - if(reciever == sender) { - return false; - } - if(!reciever.getRecieveChannels(ChannelType.RAIL).contains(channel)) { - return false; - } - if(!reciever.isRedstoneChecksPassed() || !sender.isRedstoneChecksPassed()) { - return false; - } - if(!reciever.hasPower()) { - return false; - } - Block blk = reciever.getWorldObj().getBlock(reciever.xCoord, reciever.yCoord + 1, reciever.zCoord); - if(blk != EnderIO.blockEnderRail) { - return false; - } - return reciever.getRailController().isClear(); - } - - private int getPowerRequired(EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { - int powerPerCart = getPowerRequiredForSingleCart(sender, reciever); - int numCarts = CartLinkUtil.instance.getNumberOfCartsInTrain(cart); - return powerPerCart * numCarts; - } - - private int getPowerRequiredForSingleCart(TileTransceiver sender, TileTransceiver reciever) { - int powerRequired = 0; - if(sender.getWorldObj().provider.dimensionId != reciever.getWorldObj().provider.dimensionId) { - powerRequired = Config.enderRailPowerRequireCrossDimensions; - } else { - powerRequired += sender.getLocation().getDist(reciever.getLocation()) * Config.enderRailPowerRequiredPerBlock; - if(Config.enderRailCapSameDimensionPowerAtCrossDimensionCost) { - powerRequired = Math.min(powerRequired, Config.enderRailPowerRequireCrossDimensions); - } - } - return powerRequired; - } - - private boolean teleportCart(World world, EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { - - List allCarts = CartLinkUtil.instance.getCartsInTrain(cart); - if(allCarts.size() > 1) { - CartLinkUtil.instance.updateCartLinks(world, cart); + return false; } - List> toTeleport = new ArrayList>(allCarts.size()); - List toDespawn = new ArrayList(allCarts.size()); - EntityPlayerMP playerToTP = null; - EntityMinecart playerToMount = null; - for (EntityMinecart cartInTrain : allCarts) { - if(cartInTrain != null) { - List entities = TeleportUtil.createEntitiesForReciever(cartInTrain, sender, reciever); - if(entities != null) { - toTeleport.add(entities); - toDespawn.add(cartInTrain); - if(Config.enderRailTeleportPlayers && cartInTrain.riddenByEntity instanceof EntityPlayerMP) { - playerToTP = (EntityPlayerMP) cartInTrain.riddenByEntity; - playerToMount = getCart(entities); - } + @Override + public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis) { + return false; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y - 1, z); + if (te instanceof TileTransceiver) { + ((TileTransceiver) te).getRailController().dropNonSpawnedCarts(); + } } - } + return super.removedByPlayer(world, player, x, y, z, willHarvest); } - for (EntityMinecart despawnCart : toDespawn) { - TeleportUtil.spawnTeleportEffects(world, despawnCart); - TeleportUtil.despawn(sender.getWorldObj(), despawnCart); - } - reciever.getRailController().onTrainRecieved(toTeleport); - if(playerToTP != null) { - PlayerTeleportHandler.instance.teleportPlayer(reciever, playerToTP, playerToMount); - } - return true; - } - - private EntityMinecart getCart(List entities) { - for (Entity ent : entities) { - if(ent instanceof EntityMinecart) { - return (EntityMinecart) ent; - } + @Override + public int getBasicRailMetadata(IBlockAccess world, EntityMinecart cart, int x, int y, int z) { + // Ignore turning bit, used for receive direction + return world.getBlockMetadata(x, y, z) & 7; } - return null; - } + @Override + public boolean canPlaceBlockAt(World world, int x, int y, int z) { + return world.getBlock(x, y - 1, z) == EnderIO.blockTransceiver; + } + + @Override + public boolean canBlockStay(World world, int x, int y, int z) { + return canPlaceBlockAt(world, x, y, z); + } + + @Override + public boolean isFlexibleRail(IBlockAccess world, int y, int x, int z) { + return false; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + if (world.isRemote) { + return; + } + + int origMeta = world.getBlockMetadata(x, y, z); + int newMeta = origMeta; + if (field_150053_a) { + newMeta = origMeta & 7; + } + + if (!canBlockStay(world, x, y, z)) { + dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + world.setBlockToAir(x, y, z); + } else { + func_150048_a(world, x, y, z, origMeta, newMeta, block); + } + } + + @Override + public void onMinecartPass(World world, EntityMinecart cart, int x, int y, int z) { + if (world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y - 1, z); + if (!(te instanceof TileTransceiver)) { + return; + } + TileTransceiver ter = (TileTransceiver) te; + if (ter.getRailController().isRecievedCart(cart)) { + return; + } + tryTeleport(world, cart, x, y, z); + } + + private void tryTeleport(World world, EntityMinecart cart, int x, int y, int z) { + + TileEntity te = world.getTileEntity(x, y - 1, z); + if (!(te instanceof TileTransceiver)) { + return; + } + TileTransceiver sender = (TileTransceiver) te; + if (!sender.isRedstoneChecksPassed()) { + return; + } + if (!sender.hasPower()) { + return; + } + Set sendChannels = sender.getSendChannels(ChannelType.RAIL); + for (Channel channel : sendChannels) { + RoundRobinIterator iter = ServerChannelRegister.instance.getIterator(channel); + for (TileTransceiver reciever : iter) { + if (isValidDestination(sender, channel, reciever)) { + int requiredPower = getPowerRequired(cart, sender, reciever); + if (sender.getEnergyStored() >= requiredPower) { + if (teleportCart(world, cart, sender, reciever)) { + sender.usePower(requiredPower); + return; + } + } + } + } + } + } + + private boolean isValidDestination(TileTransceiver sender, Channel channel, TileTransceiver reciever) { + if (reciever == sender) { + return false; + } + if (!reciever.getRecieveChannels(ChannelType.RAIL).contains(channel)) { + return false; + } + if (!reciever.isRedstoneChecksPassed() || !sender.isRedstoneChecksPassed()) { + return false; + } + if (!reciever.hasPower()) { + return false; + } + Block blk = reciever.getWorldObj().getBlock(reciever.xCoord, reciever.yCoord + 1, reciever.zCoord); + if (blk != EnderIO.blockEnderRail) { + return false; + } + return reciever.getRailController().isClear(); + } + + private int getPowerRequired(EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { + int powerPerCart = getPowerRequiredForSingleCart(sender, reciever); + int numCarts = CartLinkUtil.instance.getNumberOfCartsInTrain(cart); + return powerPerCart * numCarts; + } + + private int getPowerRequiredForSingleCart(TileTransceiver sender, TileTransceiver reciever) { + int powerRequired = 0; + if (sender.getWorldObj().provider.dimensionId != reciever.getWorldObj().provider.dimensionId) { + powerRequired = Config.enderRailPowerRequireCrossDimensions; + } else { + powerRequired += + sender.getLocation().getDist(reciever.getLocation()) * Config.enderRailPowerRequiredPerBlock; + if (Config.enderRailCapSameDimensionPowerAtCrossDimensionCost) { + powerRequired = Math.min(powerRequired, Config.enderRailPowerRequireCrossDimensions); + } + } + return powerRequired; + } + + private boolean teleportCart(World world, EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { + + List allCarts = CartLinkUtil.instance.getCartsInTrain(cart); + if (allCarts.size() > 1) { + CartLinkUtil.instance.updateCartLinks(world, cart); + } + + List> toTeleport = new ArrayList>(allCarts.size()); + List toDespawn = new ArrayList(allCarts.size()); + EntityPlayerMP playerToTP = null; + EntityMinecart playerToMount = null; + for (EntityMinecart cartInTrain : allCarts) { + if (cartInTrain != null) { + List entities = TeleportUtil.createEntitiesForReciever(cartInTrain, sender, reciever); + if (entities != null) { + toTeleport.add(entities); + toDespawn.add(cartInTrain); + if (Config.enderRailTeleportPlayers && cartInTrain.riddenByEntity instanceof EntityPlayerMP) { + playerToTP = (EntityPlayerMP) cartInTrain.riddenByEntity; + playerToMount = getCart(entities); + } + } + } + } + for (EntityMinecart despawnCart : toDespawn) { + TeleportUtil.spawnTeleportEffects(world, despawnCart); + TeleportUtil.despawn(sender.getWorldObj(), despawnCart); + } + reciever.getRailController().onTrainRecieved(toTeleport); + if (playerToTP != null) { + PlayerTeleportHandler.instance.teleportPlayer(reciever, playerToTP, playerToMount); + } + return true; + } + + private EntityMinecart getCart(List entities) { + for (Entity ent : entities) { + if (ent instanceof EntityMinecart) { + return (EntityMinecart) ent; + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/rail/CartLinkUtil.java b/src/main/java/crazypants/enderio/rail/CartLinkUtil.java index 829da15b..4a7bb33c 100644 --- a/src/main/java/crazypants/enderio/rail/CartLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/CartLinkUtil.java @@ -1,70 +1,64 @@ package crazypants.enderio.rail; +import cpw.mods.fml.common.Loader; import java.util.Collections; import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Loader; public class CartLinkUtil implements ICartLinkUtil { - public static final ICartLinkUtil instance; + public static final ICartLinkUtil instance; - public static final ICartLinkUtil defaultInstance = new CartLinkUtil(); + public static final ICartLinkUtil defaultInstance = new CartLinkUtil(); - static { - ICartLinkUtil daInstance; - if(Loader.isModLoaded("Railcraft")) { - try { - daInstance = new RailcraftLinkUtil(); - } catch (Exception e) { - daInstance = defaultInstance; - } - } else { - daInstance = defaultInstance; + static { + ICartLinkUtil daInstance; + if (Loader.isModLoaded("Railcraft")) { + try { + daInstance = new RailcraftLinkUtil(); + } catch (Exception e) { + daInstance = defaultInstance; + } + } else { + daInstance = defaultInstance; + } + instance = daInstance; } - instance = daInstance; - } - private CartLinkUtil() { - } + private CartLinkUtil() {} - @Override - public void setCartDirection(EntityMinecart cart, ForgeDirection dir) { - double velocity = Math.max(Math.abs(cart.motionX), Math.abs(cart.motionZ)); - cart.motionX = dir.offsetX * velocity; - cart.motionZ = dir.offsetZ * velocity; - } - - @Override - public int getNumberOfCartsInTrain(EntityMinecart cart) { - if(cart == null) { - return 0; + @Override + public void setCartDirection(EntityMinecart cart, ForgeDirection dir) { + double velocity = Math.max(Math.abs(cart.motionX), Math.abs(cart.motionZ)); + cart.motionX = dir.offsetX * velocity; + cart.motionZ = dir.offsetZ * velocity; } - return 1; - } - @Override - public List getCartsInTrain(EntityMinecart cart) { - if(cart == null) { - return Collections.emptyList(); + @Override + public int getNumberOfCartsInTrain(EntityMinecart cart) { + if (cart == null) { + return 0; + } + return 1; } - return Collections.singletonList(cart); - } - @Override - public void updateCartLinks(World world, EntityMinecart cart) { - } + @Override + public List getCartsInTrain(EntityMinecart cart) { + if (cart == null) { + return Collections.emptyList(); + } + return Collections.singletonList(cart); + } - @Override - public void recreateLinks(EntityMinecart cart) { - } + @Override + public void updateCartLinks(World world, EntityMinecart cart) {} - @Override - public void breakLinks(World worldObj, Entity entity) { - } + @Override + public void recreateLinks(EntityMinecart cart) {} + @Override + public void breakLinks(World worldObj, Entity entity) {} } diff --git a/src/main/java/crazypants/enderio/rail/EnderRailController.java b/src/main/java/crazypants/enderio/rail/EnderRailController.java index f02ee802..7b3909a1 100644 --- a/src/main/java/crazypants/enderio/rail/EnderRailController.java +++ b/src/main/java/crazypants/enderio/rail/EnderRailController.java @@ -1,5 +1,11 @@ package crazypants.enderio.rail; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.EntityUtil; +import com.enderio.core.common.util.ForgeDirectionOffsets; +import com.enderio.core.common.vecmath.Vector3d; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.transceiver.TileTransceiver; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -8,7 +14,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; import java.util.UUID; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -24,321 +29,320 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.EntityUtil; -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector3d; - -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.transceiver.TileTransceiver; - public class EnderRailController { - //keep track of which carts we have received have left the track as they can't be teleported again until they have - private final Set newlySpawnedCarts = new HashSet(); + // keep track of which carts we have received have left the track as they can't be teleported again until they have + private final Set newlySpawnedCarts = new HashSet(); - private final LinkedList> cartsToSpawn = new LinkedList>(); - private final List playersToRemount = new ArrayList(); + private final LinkedList> cartsToSpawn = new LinkedList>(); + private final List playersToRemount = new ArrayList(); - private int ticksFailedToSpawn = 0; + private int ticksFailedToSpawn = 0; - private NBTTagList cartList; + private NBTTagList cartList; - private final TileTransceiver transciever; + private final TileTransceiver transciever; - public EnderRailController(TileTransceiver tileTransceiver) { - transciever = tileTransceiver; - } - - public void doTick() { - - if(cartList != null) { - loadCartsToSpawn(); - cartList = null; + public EnderRailController(TileTransceiver tileTransceiver) { + transciever = tileTransceiver; } - spawnRecievedCart(); + public void doTick() { - List carts = getMinecartsOnTrack(); - List toRemove = new ArrayList(); - - //any cart in the newly spawned list no longer on the track needs to be removed - for (UUID recievedCartUID : newlySpawnedCarts) { - EntityMinecart minecart = getMinecartWthUUID(recievedCartUID, carts); - if(minecart == null) { - toRemove.add(recievedCartUID); - } - } - for (UUID recievedCart : toRemove) { - newlySpawnedCarts.remove(recievedCart); - } - } - - private EntityMinecart getMinecartWthUUID(UUID recievedCartUID, Collection carts) { - for (EntityMinecart cart : carts) { - if(recievedCartUID.equals(cart.getPersistentID())) { - return cart; - } - } - return null; - } - - private void spawnRecievedCart() { - - if(Config.enderRailTeleportPlayers) { - ListIterator li = playersToRemount.listIterator(); - while (li.hasNext()) { - PlayerTpInfo tpi = li.next(); - if(tpi.attemptMount() || tpi.attemptsRemaining <= 0) { - li.remove(); + if (cartList != null) { + loadCartsToSpawn(); + cartList = null; } - } - } - if(cartsToSpawn.isEmpty()) { - ticksFailedToSpawn = 0; - return; - } - boolean failedSpawn = false; - if(!isClear()) { - ticksFailedToSpawn++; - if(ticksFailedToSpawn < Config.enderRailTicksBeforeForceSpawningLinkedCarts) { - return; - } - failedSpawn = true; - } - List spawnThisTick = cartsToSpawn.removeFirst(); - for (Entity ent : spawnThisTick) { - if(failedSpawn) { - doRandomSpawn(ent); - } else { - EntityMinecart cart = null; - if(ent instanceof EntityMinecart) { - cart = (EntityMinecart) ent; - setCartDirection(cart); - } - TeleportUtil.spawn(transciever.getWorldObj(), ent); - if(cart != null) { - newlySpawnedCarts.add(cart.getPersistentID()); - CartLinkUtil.instance.recreateLinks(cart); - } - } - } + spawnRecievedCart(); - ticksFailedToSpawn = 0; + List carts = getMinecartsOnTrack(); + List toRemove = new ArrayList(); - } - - private void setCartDirection(EntityMinecart cart) { - int meta = transciever.getWorldObj().getBlockMetadata(transciever.xCoord, transciever.yCoord + 1, transciever.zCoord); - ForgeDirection dir = BlockEnderRail.getDirection(meta); - CartLinkUtil.instance.setCartDirection(cart, dir); - } - - public void onTrainRecieved(List> toTeleport) { - cartsToSpawn.addAll(toTeleport); - } - - public boolean isRecievedCart(EntityMinecart mc) { - return newlySpawnedCarts.contains(mc.getPersistentID()); - } - - public boolean isClear() { - World worldObj = transciever.getWorldObj(); - - BlockCoord railCoord = new BlockCoord(transciever).getLocation(ForgeDirection.UP); - int meta = worldObj.getBlockMetadata(railCoord.x, railCoord.y, railCoord.z); - - double buf = 1; - ForgeDirection dir = BlockEnderRail.getDirection(meta); - Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); - offset.scale(buf); - offset.x = Math.abs(offset.x); - offset.z = Math.abs(offset.z); - List res = worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(railCoord.x - offset.x, railCoord.y, - railCoord.z - offset.z, railCoord.x + 1 + offset.x, railCoord.y + 1, railCoord.z + 1 + offset.z)); - return res == null || res.isEmpty(); - } - - public List getMinecartsOnTrack() { - return getMinecartsAt(transciever.getWorldObj(), transciever.xCoord, transciever.yCoord + 1, transciever.zCoord); - } - - public static List getMinecartsAt(World world, int x, int y, int z) { - List entities = world.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)); - List carts = new ArrayList(); - for (Object o : entities) { - EntityMinecart cart = (EntityMinecart) o; - if(!cart.isDead) { - carts.add((EntityMinecart) o); - } - } - return carts; - } - - private void loadCartsToSpawn() { - World worldObj = transciever.getWorldObj(); - while (cartList.tagCount() > 0) { - NBTTagList entityList = (NBTTagList) cartList.removeTag(0); - List ents = new ArrayList(entityList.tagCount()); - for (int i = 0; i < entityList.tagCount(); i++) { - NBTTagCompound entityRoot = entityList.getCompoundTagAt(i); - Entity entity = EntityList.createEntityFromNBT(entityRoot, worldObj); - if(entity != null) { - ents.add(entity); - } - } - cartsToSpawn.add(ents); - } - } - - public void readFromNBT(NBTTagCompound root) { - cartsToSpawn.clear(); - if(!root.hasKey("cartList")) { - return; - } - cartList = (NBTTagList) root.getTag("cartList"); - - newlySpawnedCarts.clear(); - if(root.hasKey("newlySpawnedCarts")) { - NBTTagList spawnedCartList = (NBTTagList) root.getTag("newlySpawnedCarts"); - for (int i = 0; i < spawnedCartList.tagCount(); i++) { - String uuisStr = spawnedCartList.getStringTagAt(i); - newlySpawnedCarts.add(UUID.fromString(uuisStr)); - } - } - } - - public void writeToNBT(NBTTagCompound root) { - if(cartsToSpawn.isEmpty()) { - return; - } - NBTTagList cartList = new NBTTagList(); - - for (List entsInCart : cartsToSpawn) { - if(entsInCart != null && !entsInCart.isEmpty()) { - NBTTagList entityList = new NBTTagList(); - cartList.appendTag(entityList); - for (Entity entity : entsInCart) { - NBTTagCompound entRoot = new NBTTagCompound(); - entRoot.setString("id", EntityList.getEntityString(entity)); - entity.writeToNBT(entRoot); - entityList.appendTag(entRoot); - } - } - } - root.setTag("cartList", cartList); - - if(!newlySpawnedCarts.isEmpty()) { - NBTTagList spawnedCartList = new NBTTagList(); - for (UUID uuid : newlySpawnedCarts) { - spawnedCartList.appendTag(new NBTTagString(uuid.toString())); - } - root.setTag("newlySpawnedCarts", spawnedCartList); - } - } - - public void dropNonSpawnedCarts() { - if(cartsToSpawn.isEmpty()) { - return; - } - for (List entList : cartsToSpawn) { - for (Entity entity : entList) { - doRandomSpawn(entity); - } - } - cartsToSpawn.clear(); - - } - - private void doRandomSpawn(Entity entity) { - if(entity == null) { - return; - } - double oX = entity.posX; - double oZ = entity.posZ; - World world = transciever.getWorldObj(); - MinecraftServer minecraftserver = MinecraftServer.getServer(); - WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); - for (int i = 0; i < 4; i++) { - int x = transciever.xCoord + randOffset(2); - int y = transciever.yCoord + 1; - int z = transciever.zCoord + randOffset(2); - Block b = world.getBlock(x, y, z); - entity.setPosition(x + 0.5, entity.posY, z + 0.5); - if(world.canPlaceEntityOnSide(b, x, y, z, false, ForgeDirection.UP.ordinal(), entity, null)) { - resetForRandomRandomSpawn(entity); - if(worldserver.spawnEntityInWorld(entity)) { - //entity.onUpdate(); - worldserver.updateEntity(entity); - return; - } - } - } - entity.setPosition(oX, entity.posY, oZ); - resetForRandomRandomSpawn(entity); - worldserver.spawnEntityInWorld(entity); - } - - private void resetForRandomRandomSpawn(Entity entity) { - CartLinkUtil.instance.breakLinks(transciever.getWorldObj(), entity); - entity.riddenByEntity = null; - entity.ridingEntity = null; - entity.motionX = 0; - entity.motionY = 0; - entity.motionZ = 0; - // if(entity instanceof EntityMinecart) { - // entity.posY -= 0.3; - // } - entity.prevPosX = entity.posX; - entity.prevPosY = entity.posY; - entity.prevPosZ = entity.posZ; - entity.rotationYaw = (float) (transciever.getWorldObj().rand.nextDouble() * 360); - } - - private int randOffset(int spread) { - return (int) Math.round((transciever.getWorldObj().rand.nextDouble() - 0.5) * spread * 2); - } - - public void onPlayerTeleported(EntityPlayerMP playerToTP, EntityMinecart toMount) { - if(playerToTP != null) { - playersToRemount.add(new PlayerTpInfo(playerToTP.getCommandSenderName(), toMount.getPersistentID(), 20)); - } - } - - private class PlayerTpInfo { - String playerName; - UUID cartId; - int attemptsRemaining; - - PlayerTpInfo(String playerName, UUID cartId, int attemptsRemaining) { - this.playerName = playerName; - this.cartId = cartId; - this.attemptsRemaining = attemptsRemaining; - } - - boolean attemptMount() { - attemptsRemaining--; - List carts = getMinecartsOnTrack(); - for (EntityMinecart cart : carts) { - if(cart != null && cart.getPersistentID().equals(cartId)) { - EntityPlayer player = transciever.getWorldObj().getPlayerEntityByName(playerName); - if(player != null) { - Vector3d playerPos = EntityUtil.getEntityPosition(player); - Vector3d cartPos = EntityUtil.getEntityPosition(cart); - if(playerPos.distanceSquared(cartPos) <= 9) { - player.posX = cart.posX; - player.posY = cart.posY; - player.posZ = cart.posZ; - player.mountEntity(cart); - return true; + // any cart in the newly spawned list no longer on the track needs to be removed + for (UUID recievedCartUID : newlySpawnedCarts) { + EntityMinecart minecart = getMinecartWthUUID(recievedCartUID, carts); + if (minecart == null) { + toRemove.add(recievedCartUID); } - } } - } - return false; + for (UUID recievedCart : toRemove) { + newlySpawnedCarts.remove(recievedCart); + } } - } + private EntityMinecart getMinecartWthUUID(UUID recievedCartUID, Collection carts) { + for (EntityMinecart cart : carts) { + if (recievedCartUID.equals(cart.getPersistentID())) { + return cart; + } + } + return null; + } + private void spawnRecievedCart() { + + if (Config.enderRailTeleportPlayers) { + ListIterator li = playersToRemount.listIterator(); + while (li.hasNext()) { + PlayerTpInfo tpi = li.next(); + if (tpi.attemptMount() || tpi.attemptsRemaining <= 0) { + li.remove(); + } + } + } + + if (cartsToSpawn.isEmpty()) { + ticksFailedToSpawn = 0; + return; + } + boolean failedSpawn = false; + if (!isClear()) { + ticksFailedToSpawn++; + if (ticksFailedToSpawn < Config.enderRailTicksBeforeForceSpawningLinkedCarts) { + return; + } + failedSpawn = true; + } + List spawnThisTick = cartsToSpawn.removeFirst(); + for (Entity ent : spawnThisTick) { + if (failedSpawn) { + doRandomSpawn(ent); + } else { + EntityMinecart cart = null; + if (ent instanceof EntityMinecart) { + cart = (EntityMinecart) ent; + setCartDirection(cart); + } + TeleportUtil.spawn(transciever.getWorldObj(), ent); + if (cart != null) { + newlySpawnedCarts.add(cart.getPersistentID()); + CartLinkUtil.instance.recreateLinks(cart); + } + } + } + + ticksFailedToSpawn = 0; + } + + private void setCartDirection(EntityMinecart cart) { + int meta = transciever + .getWorldObj() + .getBlockMetadata(transciever.xCoord, transciever.yCoord + 1, transciever.zCoord); + ForgeDirection dir = BlockEnderRail.getDirection(meta); + CartLinkUtil.instance.setCartDirection(cart, dir); + } + + public void onTrainRecieved(List> toTeleport) { + cartsToSpawn.addAll(toTeleport); + } + + public boolean isRecievedCart(EntityMinecart mc) { + return newlySpawnedCarts.contains(mc.getPersistentID()); + } + + public boolean isClear() { + World worldObj = transciever.getWorldObj(); + + BlockCoord railCoord = new BlockCoord(transciever).getLocation(ForgeDirection.UP); + int meta = worldObj.getBlockMetadata(railCoord.x, railCoord.y, railCoord.z); + + double buf = 1; + ForgeDirection dir = BlockEnderRail.getDirection(meta); + Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); + offset.scale(buf); + offset.x = Math.abs(offset.x); + offset.z = Math.abs(offset.z); + List res = worldObj.getEntitiesWithinAABB( + Entity.class, + AxisAlignedBB.getBoundingBox( + railCoord.x - offset.x, + railCoord.y, + railCoord.z - offset.z, + railCoord.x + 1 + offset.x, + railCoord.y + 1, + railCoord.z + 1 + offset.z)); + return res == null || res.isEmpty(); + } + + public List getMinecartsOnTrack() { + return getMinecartsAt( + transciever.getWorldObj(), transciever.xCoord, transciever.yCoord + 1, transciever.zCoord); + } + + public static List getMinecartsAt(World world, int x, int y, int z) { + List entities = world.getEntitiesWithinAABB( + EntityMinecart.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)); + List carts = new ArrayList(); + for (Object o : entities) { + EntityMinecart cart = (EntityMinecart) o; + if (!cart.isDead) { + carts.add((EntityMinecart) o); + } + } + return carts; + } + + private void loadCartsToSpawn() { + World worldObj = transciever.getWorldObj(); + while (cartList.tagCount() > 0) { + NBTTagList entityList = (NBTTagList) cartList.removeTag(0); + List ents = new ArrayList(entityList.tagCount()); + for (int i = 0; i < entityList.tagCount(); i++) { + NBTTagCompound entityRoot = entityList.getCompoundTagAt(i); + Entity entity = EntityList.createEntityFromNBT(entityRoot, worldObj); + if (entity != null) { + ents.add(entity); + } + } + cartsToSpawn.add(ents); + } + } + + public void readFromNBT(NBTTagCompound root) { + cartsToSpawn.clear(); + if (!root.hasKey("cartList")) { + return; + } + cartList = (NBTTagList) root.getTag("cartList"); + + newlySpawnedCarts.clear(); + if (root.hasKey("newlySpawnedCarts")) { + NBTTagList spawnedCartList = (NBTTagList) root.getTag("newlySpawnedCarts"); + for (int i = 0; i < spawnedCartList.tagCount(); i++) { + String uuisStr = spawnedCartList.getStringTagAt(i); + newlySpawnedCarts.add(UUID.fromString(uuisStr)); + } + } + } + + public void writeToNBT(NBTTagCompound root) { + if (cartsToSpawn.isEmpty()) { + return; + } + NBTTagList cartList = new NBTTagList(); + + for (List entsInCart : cartsToSpawn) { + if (entsInCart != null && !entsInCart.isEmpty()) { + NBTTagList entityList = new NBTTagList(); + cartList.appendTag(entityList); + for (Entity entity : entsInCart) { + NBTTagCompound entRoot = new NBTTagCompound(); + entRoot.setString("id", EntityList.getEntityString(entity)); + entity.writeToNBT(entRoot); + entityList.appendTag(entRoot); + } + } + } + root.setTag("cartList", cartList); + + if (!newlySpawnedCarts.isEmpty()) { + NBTTagList spawnedCartList = new NBTTagList(); + for (UUID uuid : newlySpawnedCarts) { + spawnedCartList.appendTag(new NBTTagString(uuid.toString())); + } + root.setTag("newlySpawnedCarts", spawnedCartList); + } + } + + public void dropNonSpawnedCarts() { + if (cartsToSpawn.isEmpty()) { + return; + } + for (List entList : cartsToSpawn) { + for (Entity entity : entList) { + doRandomSpawn(entity); + } + } + cartsToSpawn.clear(); + } + + private void doRandomSpawn(Entity entity) { + if (entity == null) { + return; + } + double oX = entity.posX; + double oZ = entity.posZ; + World world = transciever.getWorldObj(); + MinecraftServer minecraftserver = MinecraftServer.getServer(); + WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); + for (int i = 0; i < 4; i++) { + int x = transciever.xCoord + randOffset(2); + int y = transciever.yCoord + 1; + int z = transciever.zCoord + randOffset(2); + Block b = world.getBlock(x, y, z); + entity.setPosition(x + 0.5, entity.posY, z + 0.5); + if (world.canPlaceEntityOnSide(b, x, y, z, false, ForgeDirection.UP.ordinal(), entity, null)) { + resetForRandomRandomSpawn(entity); + if (worldserver.spawnEntityInWorld(entity)) { + // entity.onUpdate(); + worldserver.updateEntity(entity); + return; + } + } + } + entity.setPosition(oX, entity.posY, oZ); + resetForRandomRandomSpawn(entity); + worldserver.spawnEntityInWorld(entity); + } + + private void resetForRandomRandomSpawn(Entity entity) { + CartLinkUtil.instance.breakLinks(transciever.getWorldObj(), entity); + entity.riddenByEntity = null; + entity.ridingEntity = null; + entity.motionX = 0; + entity.motionY = 0; + entity.motionZ = 0; + // if(entity instanceof EntityMinecart) { + // entity.posY -= 0.3; + // } + entity.prevPosX = entity.posX; + entity.prevPosY = entity.posY; + entity.prevPosZ = entity.posZ; + entity.rotationYaw = (float) (transciever.getWorldObj().rand.nextDouble() * 360); + } + + private int randOffset(int spread) { + return (int) Math.round((transciever.getWorldObj().rand.nextDouble() - 0.5) * spread * 2); + } + + public void onPlayerTeleported(EntityPlayerMP playerToTP, EntityMinecart toMount) { + if (playerToTP != null) { + playersToRemount.add(new PlayerTpInfo(playerToTP.getCommandSenderName(), toMount.getPersistentID(), 20)); + } + } + + private class PlayerTpInfo { + String playerName; + UUID cartId; + int attemptsRemaining; + + PlayerTpInfo(String playerName, UUID cartId, int attemptsRemaining) { + this.playerName = playerName; + this.cartId = cartId; + this.attemptsRemaining = attemptsRemaining; + } + + boolean attemptMount() { + attemptsRemaining--; + List carts = getMinecartsOnTrack(); + for (EntityMinecart cart : carts) { + if (cart != null && cart.getPersistentID().equals(cartId)) { + EntityPlayer player = transciever.getWorldObj().getPlayerEntityByName(playerName); + if (player != null) { + Vector3d playerPos = EntityUtil.getEntityPosition(player); + Vector3d cartPos = EntityUtil.getEntityPosition(cart); + if (playerPos.distanceSquared(cartPos) <= 9) { + player.posX = cart.posX; + player.posY = cart.posY; + player.posZ = cart.posZ; + player.mountEntity(cart); + return true; + } + } + } + } + return false; + } + } } diff --git a/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java b/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java index e68c3d4f..007af55c 100644 --- a/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/ICartLinkUtil.java @@ -1,7 +1,6 @@ package crazypants.enderio.rail; import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.world.World; @@ -9,16 +8,15 @@ import net.minecraftforge.common.util.ForgeDirection; public interface ICartLinkUtil { - int getNumberOfCartsInTrain(EntityMinecart cart); + int getNumberOfCartsInTrain(EntityMinecart cart); - List getCartsInTrain(EntityMinecart cart); + List getCartsInTrain(EntityMinecart cart); - void updateCartLinks(World world, EntityMinecart cart); + void updateCartLinks(World world, EntityMinecart cart); - void recreateLinks(EntityMinecart cart); + void recreateLinks(EntityMinecart cart); - void breakLinks(World worldObj, Entity entity); - - void setCartDirection(EntityMinecart cart, ForgeDirection dir); + void breakLinks(World worldObj, Entity entity); + void setCartDirection(EntityMinecart cart, ForgeDirection dir); } diff --git a/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java b/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java index 05cabc32..87979c20 100644 --- a/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java +++ b/src/main/java/crazypants/enderio/rail/PacketTeleportEffects.java @@ -1,60 +1,64 @@ package crazypants.enderio.rail; -import io.netty.buffer.ByteBuf; - -import java.util.Random; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class PacketTeleportEffects implements IMessage, IMessageHandler { - double x; - double y; - double z; + double x; + double y; + double z; - public PacketTeleportEffects() { - } + public PacketTeleportEffects() {} - public PacketTeleportEffects(Entity ent) { - x = ent.posX; - y = ent.posY; - z = ent.posZ; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeDouble(x); - buf.writeDouble(y); - buf.writeDouble(z); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readDouble(); - y = buf.readDouble(); - z = buf.readDouble(); - } - - @Override - public IMessage onMessage(PacketTeleportEffects message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - World world = player.worldObj; - Random rand = world.rand; - for (int i = 0; i < 15; i++) { - double xOff = (rand.nextDouble() - 0.5) * 1.1; - double yOff = (rand.nextDouble() - 0.5) * 0.2; - double zOff = (rand.nextDouble() - 0.5) * 1.1; - Minecraft.getMinecraft().theWorld.spawnParticle("portal", message.x + xOff, message.y + yOff, message.z + zOff, (rand.nextDouble() - 0.5) * 1.5, -rand.nextDouble(), - (rand.nextDouble() - 0.5) * 1.5); + public PacketTeleportEffects(Entity ent) { + x = ent.posX; + y = ent.posY; + z = ent.posZ; } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeDouble(x); + buf.writeDouble(y); + buf.writeDouble(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readDouble(); + y = buf.readDouble(); + z = buf.readDouble(); + } + + @Override + public IMessage onMessage(PacketTeleportEffects message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + World world = player.worldObj; + Random rand = world.rand; + for (int i = 0; i < 15; i++) { + double xOff = (rand.nextDouble() - 0.5) * 1.1; + double yOff = (rand.nextDouble() - 0.5) * 0.2; + double zOff = (rand.nextDouble() - 0.5) * 1.1; + Minecraft.getMinecraft() + .theWorld + .spawnParticle( + "portal", + message.x + xOff, + message.y + yOff, + message.z + zOff, + (rand.nextDouble() - 0.5) * 1.5, + -rand.nextDouble(), + (rand.nextDouble() - 0.5) * 1.5); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java index 5b06425d..dcb3caf8 100644 --- a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java +++ b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java @@ -1,87 +1,89 @@ package crazypants.enderio.rail; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.EntityUtil; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.transceiver.TileTransceiver; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.EntityUtil; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.transceiver.TileTransceiver; - public class PlayerTeleportHandler { - public static final PlayerTeleportHandler instance = new PlayerTeleportHandler(); + public static final PlayerTeleportHandler instance = new PlayerTeleportHandler(); - List queue = new ArrayList(); + List queue = new ArrayList(); - @SubscribeEvent - public void onServerTick(TickEvent.ServerTickEvent event) { - if(event.phase != TickEvent.Phase.END) { - return; - } - for (TeleportAction action : queue) { - action.doTeleport(); - } - queue.clear(); - } - - public void teleportPlayer(TileTransceiver reciever, EntityPlayerMP playerToTP, EntityMinecart playerToMount) { - //Need to quete these as we cant perform the operation during a tile entities update phase as - //we need to remove the player from being tracked - queue.add(new TeleportAction(reciever, playerToTP, playerToMount)); - } - - private static class TeleportAction { - - TileTransceiver reciever; - EntityPlayerMP playerToTP; - EntityMinecart playerToMount; - - private TeleportAction(TileTransceiver reciever, EntityPlayerMP playerToTP, EntityMinecart playerToMount) { - this.reciever = reciever; - this.playerToTP = playerToTP; - this.playerToMount = playerToMount; - } - - void doTeleport() { - int toDim = reciever.getWorldObj().provider.dimensionId; - int meta = reciever.getBlockMetadata(); - - //Make sure player not on the track and is in a safe position - ForgeDirection railDir = EnderIO.blockEnderRail.getDirection(meta); - int xOffset = Math.abs(railDir.offsetX); - int zOffset = Math.abs(railDir.offsetZ); - BlockCoord startPos = new BlockCoord(reciever).getLocation(ForgeDirection.UP); - boolean foundSpot = false; - for (int i = 1; i < 3 && !foundSpot; i++) { - //try each side of the track - playerToTP.setPosition(startPos.x + 0.5 - (xOffset * i), startPos.y, startPos.z + 0.5 - (zOffset * i)); - List collides = EntityUtil.getCollidingBlockGeometry(reciever.getWorldObj(), playerToTP); - foundSpot = collides == null || collides.isEmpty(); - if(!foundSpot) { - playerToTP.setPosition(startPos.x + 0.5 + (xOffset * i), startPos.y, startPos.z + 0.5 + (zOffset * i)); - collides = EntityUtil.getCollidingBlockGeometry(reciever.getWorldObj(), playerToTP); - foundSpot = collides == null || collides.isEmpty(); + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; } - } - if(!foundSpot) { - //If not space each side will have to spawn on the track - playerToTP.setPosition(startPos.x + 0.5, startPos.y, startPos.z + 0.5); - } -// ChunkCoordinates spawn = new ChunkCoordinates((int) playerToTP.posX, (int) playerToTP.posY, (int) playerToTP.posZ); -// TeleportUtil.teleportPlayer((WorldServer) reciever.getWorldObj(), playerToTP, toDim, spawn); - - reciever.getRailController().onPlayerTeleported(playerToTP, playerToMount); - playerToTP.mcServer.getConfigurationManager().transferPlayerToDimension(playerToTP, toDim, new TeleporterEIO( playerToTP.mcServer.worldServerForDimension(toDim))); + for (TeleportAction action : queue) { + action.doTeleport(); + } + queue.clear(); } - } + public void teleportPlayer(TileTransceiver reciever, EntityPlayerMP playerToTP, EntityMinecart playerToMount) { + // Need to quete these as we cant perform the operation during a tile entities update phase as + // we need to remove the player from being tracked + queue.add(new TeleportAction(reciever, playerToTP, playerToMount)); + } + + private static class TeleportAction { + + TileTransceiver reciever; + EntityPlayerMP playerToTP; + EntityMinecart playerToMount; + + private TeleportAction(TileTransceiver reciever, EntityPlayerMP playerToTP, EntityMinecart playerToMount) { + this.reciever = reciever; + this.playerToTP = playerToTP; + this.playerToMount = playerToMount; + } + + void doTeleport() { + int toDim = reciever.getWorldObj().provider.dimensionId; + int meta = reciever.getBlockMetadata(); + + // Make sure player not on the track and is in a safe position + ForgeDirection railDir = EnderIO.blockEnderRail.getDirection(meta); + int xOffset = Math.abs(railDir.offsetX); + int zOffset = Math.abs(railDir.offsetZ); + BlockCoord startPos = new BlockCoord(reciever).getLocation(ForgeDirection.UP); + boolean foundSpot = false; + for (int i = 1; i < 3 && !foundSpot; i++) { + // try each side of the track + playerToTP.setPosition(startPos.x + 0.5 - (xOffset * i), startPos.y, startPos.z + 0.5 - (zOffset * i)); + List collides = EntityUtil.getCollidingBlockGeometry(reciever.getWorldObj(), playerToTP); + foundSpot = collides == null || collides.isEmpty(); + if (!foundSpot) { + playerToTP.setPosition( + startPos.x + 0.5 + (xOffset * i), startPos.y, startPos.z + 0.5 + (zOffset * i)); + collides = EntityUtil.getCollidingBlockGeometry(reciever.getWorldObj(), playerToTP); + foundSpot = collides == null || collides.isEmpty(); + } + } + if (!foundSpot) { + // If not space each side will have to spawn on the track + playerToTP.setPosition(startPos.x + 0.5, startPos.y, startPos.z + 0.5); + } + // ChunkCoordinates spawn = new ChunkCoordinates((int) playerToTP.posX, (int) playerToTP.posY, (int) + // playerToTP.posZ); + // TeleportUtil.teleportPlayer((WorldServer) reciever.getWorldObj(), playerToTP, toDim, spawn); + + reciever.getRailController().onPlayerTeleported(playerToTP, playerToMount); + playerToTP + .mcServer + .getConfigurationManager() + .transferPlayerToDimension( + playerToTP, toDim, new TeleporterEIO(playerToTP.mcServer.worldServerForDimension(toDim))); + } + } } diff --git a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java index 4179ebe3..6f1853c8 100644 --- a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java @@ -1,11 +1,11 @@ package crazypants.enderio.rail; +import com.enderio.core.common.vecmath.Vector3d; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.UUID; - import mods.railcraft.api.carts.CartTools; import mods.railcraft.api.carts.ILinkageManager; import net.minecraft.entity.Entity; @@ -14,226 +14,224 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.vecmath.Vector3d; - public class RailcraftLinkUtil implements ICartLinkUtil { - private Class directionalClass; + private Class directionalClass; - public RailcraftLinkUtil() throws Exception { - //Make sure the class we actually want to use exists, just in case the API changes - Class.forName("mods.railcraft.api.carts.CartTools"); + public RailcraftLinkUtil() throws Exception { + // Make sure the class we actually want to use exists, just in case the API changes + Class.forName("mods.railcraft.api.carts.CartTools"); - try { - directionalClass = Class.forName("mods.railcraft.common.carts.IDirectionalCart"); - } catch (Exception e) { - } - } - - @Override - public void setCartDirection(EntityMinecart cart, ForgeDirection dir) { - - if(!isDirectional(cart)) { - CartLinkUtil.defaultInstance.setCartDirection(cart, dir); - return; - } - - ForgeDirection oldDir = getCurrentDir(cart); - CartLinkUtil.defaultInstance.setCartDirection(cart, dir); - ForgeDirection newDir = getCurrentDir(cart); - - if(oldDir.getOpposite() == newDir) { - cart.rotationYaw += 180; - } - } - - private boolean isDirectional(EntityMinecart cart) { - if(directionalClass == null) { - return false; - } - return directionalClass.isAssignableFrom(cart.getClass()); - } - - private ForgeDirection getCurrentDir(EntityMinecart cart) { - boolean isX = true; - boolean isNeg = cart.motionX < 0; - if(Math.abs(cart.motionZ) > Math.abs(cart.motionX)) { - isX = false; - isNeg = cart.motionZ < 0; - } - if(isX) { - return isNeg ? ForgeDirection.WEST : ForgeDirection.EAST; - } - return isNeg ? ForgeDirection.NORTH : ForgeDirection.SOUTH; - } - - @Override - public void breakLinks(World world, Entity cart) { - if(cart instanceof EntityMinecart) { - breakLinks(world, (EntityMinecart) cart); - } - } - - public void breakLinks(World world, EntityMinecart cart) { - if(world == null || cart == null) { - return; - } - ILinkageManager linkMan = CartTools.getLinkageManager(world); - if(linkMan == null) { - return; - } - linkMan.breakLinks(cart); - } - - public void recreateLink(EntityMinecart existingCart, EntityMinecart newCart) { - if(existingCart == null || newCart == null) { - return; - } - ILinkageManager linkMan = CartTools.getLinkageManager(existingCart.worldObj); - if(linkMan == null) { - return; - } - UUID linkA = getLinkA(newCart); - if(linkA != null && linkA.equals(existingCart.getPersistentID())) { - if(!linkMan.areLinked(existingCart, newCart)) { - boolean res = linkMan.createLink(existingCart, newCart); - } - return; - } - UUID linkB = getLinkB(newCart); - if(linkB != null && linkB.equals(existingCart.getPersistentID())) { - if(!linkMan.areLinked(existingCart, newCart)) { - boolean res = linkMan.createLink(existingCart, newCart); - } - return; - } - } - - @Override - public void updateCartLinks(World world, EntityMinecart cart) { - ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); - if(linkMan == null || linkMan.countCartsInTrain(cart) <= 1) { - return; - } - Iterable allCarts = linkMan.getCartsInTrain(cart); - for (EntityMinecart aCart : allCarts) { - if(aCart != null) { - updateLink("a", aCart, linkMan.getLinkedCartA(aCart)); - updateLink("b", aCart, linkMan.getLinkedCartB(aCart)); - } - } - } - - private void updateLink(String prefix, EntityMinecart cart, EntityMinecart linkedCart) { - NBTTagCompound data = cart.getEntityData(); - long lastUpdateTime = -1; - String timeKey = prefix + "UpdateTime"; - if(data.hasKey(timeKey)) { - lastUpdateTime = data.getLong(timeKey); - } - long curTime = cart.worldObj.getTotalWorldTime(); - if(lastUpdateTime > 0 && curTime - lastUpdateTime < 100) { - return; - } - data.setLong(timeKey, curTime); - data.setString(prefix + "Link", linkedCart == null ? "null" : linkedCart.getPersistentID().toString()); - } - - public UUID getLinkA(EntityMinecart cart) { - return getLink("a", cart); - } - - public UUID getLinkB(EntityMinecart cart) { - return getLink("b", cart); - } - - private UUID getLink(String prefix, EntityMinecart cart) { - NBTTagCompound data = cart.getEntityData(); - String uuidStr = data.getString(prefix + "Link"); - if(uuidStr == null || uuidStr.trim().isEmpty() || "null".equals(uuidStr)) { - return null; - } - return UUID.fromString(uuidStr); - } - - @Override - public int getNumberOfCartsInTrain(EntityMinecart cart) { - if(cart == null) { - return 0; - } - ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); - if(linkMan == null) { - return 1; - } - return linkMan.countCartsInTrain(cart); - } - - @Override - public List getCartsInTrain(EntityMinecart cart) { - if(cart == null) { - Collections.emptyList(); - } - List result = new ArrayList(); - ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); - if(linkMan == null) { - result.add(cart); - return result; - } - - Iterable iter = linkMan.getCartsInTrain(cart); - for (EntityMinecart cartInTrain : iter) { - if(cartInTrain != null) { - result.add(cartInTrain); - } - } - Collections.sort(result, new TrainOrderComparator(cart)); - return result; - } - - @Override - public void recreateLinks(EntityMinecart cart) { - ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); - if(linkMan == null) { - return; - } - recreateLink(cart, linkMan, getLinkA(cart)); - recreateLink(cart, linkMan, getLinkB(cart)); - } - - private void recreateLink(EntityMinecart cart, ILinkageManager linkMan, UUID uuid) { - if(uuid != null) { - EntityMinecart linkTo = linkMan.getCartFromUUID(uuid); - if(!linkMan.areLinked(cart, linkTo)) { - linkMan.createLink(cart, linkTo); - } - } - } - - private static class TrainOrderComparator implements Comparator { - - private final Vector3d refPoint = new Vector3d(); - private final Vector3d loc1 = new Vector3d(); - private final Vector3d loc2 = new Vector3d(); - private double d1; - private double d2; - - TrainOrderComparator(EntityMinecart head) { - set(refPoint, head); + try { + directionalClass = Class.forName("mods.railcraft.common.carts.IDirectionalCart"); + } catch (Exception e) { + } } @Override - public int compare(EntityMinecart o1, EntityMinecart o2) { - set(loc1, o1); - set(loc2, o2); - d1 = refPoint.distanceSquared(loc1); - d2 = refPoint.distanceSquared(loc2); - return Double.compare(d1, d2); + public void setCartDirection(EntityMinecart cart, ForgeDirection dir) { + + if (!isDirectional(cart)) { + CartLinkUtil.defaultInstance.setCartDirection(cart, dir); + return; + } + + ForgeDirection oldDir = getCurrentDir(cart); + CartLinkUtil.defaultInstance.setCartDirection(cart, dir); + ForgeDirection newDir = getCurrentDir(cart); + + if (oldDir.getOpposite() == newDir) { + cart.rotationYaw += 180; + } } - private void set(Vector3d point, EntityMinecart cart) { - point.set(cart.posX, cart.posY, cart.posZ); + private boolean isDirectional(EntityMinecart cart) { + if (directionalClass == null) { + return false; + } + return directionalClass.isAssignableFrom(cart.getClass()); } - } + private ForgeDirection getCurrentDir(EntityMinecart cart) { + boolean isX = true; + boolean isNeg = cart.motionX < 0; + if (Math.abs(cart.motionZ) > Math.abs(cart.motionX)) { + isX = false; + isNeg = cart.motionZ < 0; + } + if (isX) { + return isNeg ? ForgeDirection.WEST : ForgeDirection.EAST; + } + return isNeg ? ForgeDirection.NORTH : ForgeDirection.SOUTH; + } + @Override + public void breakLinks(World world, Entity cart) { + if (cart instanceof EntityMinecart) { + breakLinks(world, (EntityMinecart) cart); + } + } + + public void breakLinks(World world, EntityMinecart cart) { + if (world == null || cart == null) { + return; + } + ILinkageManager linkMan = CartTools.getLinkageManager(world); + if (linkMan == null) { + return; + } + linkMan.breakLinks(cart); + } + + public void recreateLink(EntityMinecart existingCart, EntityMinecart newCart) { + if (existingCart == null || newCart == null) { + return; + } + ILinkageManager linkMan = CartTools.getLinkageManager(existingCart.worldObj); + if (linkMan == null) { + return; + } + UUID linkA = getLinkA(newCart); + if (linkA != null && linkA.equals(existingCart.getPersistentID())) { + if (!linkMan.areLinked(existingCart, newCart)) { + boolean res = linkMan.createLink(existingCart, newCart); + } + return; + } + UUID linkB = getLinkB(newCart); + if (linkB != null && linkB.equals(existingCart.getPersistentID())) { + if (!linkMan.areLinked(existingCart, newCart)) { + boolean res = linkMan.createLink(existingCart, newCart); + } + return; + } + } + + @Override + public void updateCartLinks(World world, EntityMinecart cart) { + ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); + if (linkMan == null || linkMan.countCartsInTrain(cart) <= 1) { + return; + } + Iterable allCarts = linkMan.getCartsInTrain(cart); + for (EntityMinecart aCart : allCarts) { + if (aCart != null) { + updateLink("a", aCart, linkMan.getLinkedCartA(aCart)); + updateLink("b", aCart, linkMan.getLinkedCartB(aCart)); + } + } + } + + private void updateLink(String prefix, EntityMinecart cart, EntityMinecart linkedCart) { + NBTTagCompound data = cart.getEntityData(); + long lastUpdateTime = -1; + String timeKey = prefix + "UpdateTime"; + if (data.hasKey(timeKey)) { + lastUpdateTime = data.getLong(timeKey); + } + long curTime = cart.worldObj.getTotalWorldTime(); + if (lastUpdateTime > 0 && curTime - lastUpdateTime < 100) { + return; + } + data.setLong(timeKey, curTime); + data.setString( + prefix + "Link", + linkedCart == null ? "null" : linkedCart.getPersistentID().toString()); + } + + public UUID getLinkA(EntityMinecart cart) { + return getLink("a", cart); + } + + public UUID getLinkB(EntityMinecart cart) { + return getLink("b", cart); + } + + private UUID getLink(String prefix, EntityMinecart cart) { + NBTTagCompound data = cart.getEntityData(); + String uuidStr = data.getString(prefix + "Link"); + if (uuidStr == null || uuidStr.trim().isEmpty() || "null".equals(uuidStr)) { + return null; + } + return UUID.fromString(uuidStr); + } + + @Override + public int getNumberOfCartsInTrain(EntityMinecart cart) { + if (cart == null) { + return 0; + } + ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); + if (linkMan == null) { + return 1; + } + return linkMan.countCartsInTrain(cart); + } + + @Override + public List getCartsInTrain(EntityMinecart cart) { + if (cart == null) { + Collections.emptyList(); + } + List result = new ArrayList(); + ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); + if (linkMan == null) { + result.add(cart); + return result; + } + + Iterable iter = linkMan.getCartsInTrain(cart); + for (EntityMinecart cartInTrain : iter) { + if (cartInTrain != null) { + result.add(cartInTrain); + } + } + Collections.sort(result, new TrainOrderComparator(cart)); + return result; + } + + @Override + public void recreateLinks(EntityMinecart cart) { + ILinkageManager linkMan = CartTools.getLinkageManager(cart.worldObj); + if (linkMan == null) { + return; + } + recreateLink(cart, linkMan, getLinkA(cart)); + recreateLink(cart, linkMan, getLinkB(cart)); + } + + private void recreateLink(EntityMinecart cart, ILinkageManager linkMan, UUID uuid) { + if (uuid != null) { + EntityMinecart linkTo = linkMan.getCartFromUUID(uuid); + if (!linkMan.areLinked(cart, linkTo)) { + linkMan.createLink(cart, linkTo); + } + } + } + + private static class TrainOrderComparator implements Comparator { + + private final Vector3d refPoint = new Vector3d(); + private final Vector3d loc1 = new Vector3d(); + private final Vector3d loc2 = new Vector3d(); + private double d1; + private double d2; + + TrainOrderComparator(EntityMinecart head) { + set(refPoint, head); + } + + @Override + public int compare(EntityMinecart o1, EntityMinecart o2) { + set(loc1, o1); + set(loc2, o2); + d1 = refPoint.distanceSquared(loc1); + d2 = refPoint.distanceSquared(loc2); + return Double.compare(d1, d2); + } + + private void set(Vector3d point, EntityMinecart cart) { + point.set(cart.posX, cart.posY, cart.posZ); + } + } } diff --git a/src/main/java/crazypants/enderio/rail/TeleportUtil.java b/src/main/java/crazypants/enderio/rail/TeleportUtil.java index 5f649ccd..e0abcc96 100644 --- a/src/main/java/crazypants/enderio/rail/TeleportUtil.java +++ b/src/main/java/crazypants/enderio/rail/TeleportUtil.java @@ -1,8 +1,11 @@ package crazypants.enderio.rail; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.enderio.network.PacketHandler; import java.util.ArrayList; import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.item.EntityMinecart; @@ -12,141 +15,142 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.enderio.network.PacketHandler; public class TeleportUtil { - public static List createEntitiesForReciever(EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { - int toDimension = reciever.getWorldObj().provider.dimensionId; - int toX = reciever.xCoord; - int toY = reciever.yCoord + 1; - int toZ = reciever.zCoord; + public static List createEntitiesForReciever( + EntityMinecart cart, TileTransceiver sender, TileTransceiver reciever) { + int toDimension = reciever.getWorldObj().provider.dimensionId; + int toX = reciever.xCoord; + int toY = reciever.yCoord + 1; + int toZ = reciever.zCoord; - MinecraftServer minecraftserver = MinecraftServer.getServer(); - WorldServer worldserver1 = minecraftserver.worldServerForDimension(toDimension); - EntityMinecart newCart = (EntityMinecart) EntityList.createEntityByName(EntityList.getEntityString(cart), worldserver1); - if(newCart == null) { - return null; + MinecraftServer minecraftserver = MinecraftServer.getServer(); + WorldServer worldserver1 = minecraftserver.worldServerForDimension(toDimension); + EntityMinecart newCart = + (EntityMinecart) EntityList.createEntityByName(EntityList.getEntityString(cart), worldserver1); + if (newCart == null) { + return null; + } + + NBTTagCompound nbttagcompound = new NBTTagCompound(); + cart.writeToNBT(nbttagcompound); + newCart.readFromNBT(nbttagcompound); + newCart.dimension = toDimension; + newCart.setLocationAndAngles(toX + 0.5, toY, toZ + 0.5, cart.rotationYaw, cart.rotationPitch); + newCart.isDead = false; + + List result = new ArrayList(); + result.add(newCart); + + Entity passenger = cart.riddenByEntity; + if (passenger != null && !(passenger instanceof EntityPlayer)) { + Entity newPas = EntityList.createEntityByName(EntityList.getEntityString(passenger), worldserver1); + newPas.copyDataFrom(passenger, true); + newPas.dimension = toDimension; + newPas.setLocationAndAngles(toX + 0.5, toY, toZ + 0.5, cart.rotationYaw, cart.rotationPitch); + newCart.riddenByEntity = newPas; + newPas.ridingEntity = newCart; + result.add(newPas); + } + return result; } - NBTTagCompound nbttagcompound = new NBTTagCompound(); - cart.writeToNBT(nbttagcompound); - newCart.readFromNBT(nbttagcompound); - newCart.dimension = toDimension; - newCart.setLocationAndAngles(toX + 0.5, toY, toZ + 0.5, cart.rotationYaw, cart.rotationPitch); - newCart.isDead = false; + public static void despawn(World world, EntityMinecart cart) { - List result = new ArrayList(); - result.add(newCart); + if (cart instanceof IInventory) { + IInventory cont = (IInventory) cart; + for (int i = 0; i < cont.getSizeInventory(); i++) { + cont.setInventorySlotContents(i, null); + } + } - Entity passenger = cart.riddenByEntity; - if(passenger != null && !(passenger instanceof EntityPlayer)) { - Entity newPas = EntityList.createEntityByName(EntityList.getEntityString(passenger), worldserver1); - newPas.copyDataFrom(passenger, true); - newPas.dimension = toDimension; - newPas.setLocationAndAngles(toX + 0.5, toY, toZ + 0.5, cart.rotationYaw, cart.rotationPitch); - newCart.riddenByEntity = newPas; - newPas.ridingEntity = newCart; - result.add(newPas); - } - return result; - } + MinecraftServer minecraftserver = MinecraftServer.getServer(); + WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); - public static void despawn(World world, EntityMinecart cart) { - - if(cart instanceof IInventory) { - IInventory cont = (IInventory) cart; - for (int i = 0; i < cont.getSizeInventory(); i++) { - cont.setInventorySlotContents(i, null); - } + Entity passenger = cart.riddenByEntity; + if (passenger != null && !(passenger instanceof EntityPlayer)) { + worldserver.removeEntity(passenger); + passenger.isDead = true; + } + worldserver.removeEntity(cart); + cart.isDead = true; } - MinecraftServer minecraftserver = MinecraftServer.getServer(); - WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); - - Entity passenger = cart.riddenByEntity; - if(passenger != null && !(passenger instanceof EntityPlayer)) { - worldserver.removeEntity(passenger); - passenger.isDead = true; + public static void spawn(World world, Entity entity) { + if (entity != null) { + MinecraftServer minecraftserver = MinecraftServer.getServer(); + WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); + worldserver.spawnEntityInWorld(entity); + } } - worldserver.removeEntity(cart); - cart.isDead = true; - } - - public static void spawn(World world, Entity entity) { - if(entity != null) { - MinecraftServer minecraftserver = MinecraftServer.getServer(); - WorldServer worldserver = minecraftserver.worldServerForDimension(world.provider.dimensionId); - worldserver.spawnEntityInWorld(entity); + public static void spawnTeleportEffects(World world, Entity entity) { + PacketHandler.INSTANCE.sendToAllAround( + new PacketTeleportEffects(entity), + new TargetPoint(world.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 64)); + if (Config.machineSoundsEnabled) { + world.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 0.5F, 0.25F); + } } - } - public static void spawnTeleportEffects(World world, Entity entity) { - PacketHandler.INSTANCE.sendToAllAround(new PacketTeleportEffects(entity), new TargetPoint(world.provider.dimensionId, entity.posX, entity.posY, - entity.posZ, 64)); - if(Config.machineSoundsEnabled) { - world.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 0.5F, 0.25F); - } - } - -// public static void teleportPlayer(WorldServer teleportTo, EntityPlayerMP player, int dimension, ChunkCoordinates spawn) { -// WorldServer originalWorld = (WorldServer) player.worldObj; -// if(player.ridingEntity != null) { -// player.mountEntity(null); -// } -// boolean changeDimension = originalWorld != teleportTo; -// -// player.closeScreen(); -// player.setLocationAndAngles(spawn.posX + 0.5D, spawn.posY, spawn.posZ + 0.5D, player.rotationYaw, player.rotationPitch); -// -// if(changeDimension) { -// player.dimension = dimension; -// player.playerNetServerHandler.sendPacket(new S07PacketRespawn(player.dimension, player.worldObj.difficultySetting, teleportTo.getWorldInfo() -// .getTerrainType(), player.theItemInWorldManager.getGameType())); -// removePlayerFromWorld(originalWorld, player); -// teleportTo.spawnEntityInWorld(player); -// player.setWorld(teleportTo); -// player.mcServer.getConfigurationManager().func_72375_a(player, teleportTo); -// player.theItemInWorldManager.setWorld((WorldServer) teleportTo); -// player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer) teleportTo); -// player.mcServer.getConfigurationManager().syncPlayerInventory(player); -// Iterator iter = player.getActivePotionEffects().iterator(); -// while (iter.hasNext()) { -// PotionEffect effect = (PotionEffect) iter.next(); -// player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), effect)); -// } -// player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); -// -// } else { -// teleportTo.theChunkProviderServer.loadChunk(spawn.posX >> 4, spawn.posZ >> 4); -// } -// -// player.playerNetServerHandler.setPlayerLocation(spawn.posX + 0.5D, spawn.posY, spawn.posZ + 0.5D, player.rotationYaw, player.rotationPitch); -// player.motionX = 0; -// player.motionY = 0; -// player.motionZ = 0; -// teleportTo.updateEntityWithOptionalForce(player, false); -// } -// -// private static void removePlayerFromWorld(WorldServer world, EntityPlayerMP player) { -// world.removePlayerEntityDangerously(player); -//// world.getPlayerManager().removePlayer(player); -//// world.playerEntities.remove(player); -//// world.updateAllPlayersSleepingFlag(); -//// int cx = player.chunkCoordX; -//// int cy = player.chunkCoordZ; -//// if((player.addedToChunk) && (world.getChunkProvider().chunkExists(cx, cy))) { -//// world.getChunkFromChunkCoords(cx, cy).removeEntity(player); -//// world.getChunkFromChunkCoords(cx, cy).isModified = true; -//// } -//// world.loadedEntityList.remove(player); -//// world.getEntityTracker().removeEntityFromAllTrackingPlayers(player); -// } - - + // public static void teleportPlayer(WorldServer teleportTo, EntityPlayerMP player, int dimension, ChunkCoordinates + // spawn) { + // WorldServer originalWorld = (WorldServer) player.worldObj; + // if(player.ridingEntity != null) { + // player.mountEntity(null); + // } + // boolean changeDimension = originalWorld != teleportTo; + // + // player.closeScreen(); + // player.setLocationAndAngles(spawn.posX + 0.5D, spawn.posY, spawn.posZ + 0.5D, player.rotationYaw, + // player.rotationPitch); + // + // if(changeDimension) { + // player.dimension = dimension; + // player.playerNetServerHandler.sendPacket(new S07PacketRespawn(player.dimension, + // player.worldObj.difficultySetting, teleportTo.getWorldInfo() + // .getTerrainType(), player.theItemInWorldManager.getGameType())); + // removePlayerFromWorld(originalWorld, player); + // teleportTo.spawnEntityInWorld(player); + // player.setWorld(teleportTo); + // player.mcServer.getConfigurationManager().func_72375_a(player, teleportTo); + // player.theItemInWorldManager.setWorld((WorldServer) teleportTo); + // player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer) teleportTo); + // player.mcServer.getConfigurationManager().syncPlayerInventory(player); + // Iterator iter = player.getActivePotionEffects().iterator(); + // while (iter.hasNext()) { + // PotionEffect effect = (PotionEffect) iter.next(); + // player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), effect)); + // } + // player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, + // player.experienceTotal, player.experienceLevel)); + // + // } else { + // teleportTo.theChunkProviderServer.loadChunk(spawn.posX >> 4, spawn.posZ >> 4); + // } + // + // player.playerNetServerHandler.setPlayerLocation(spawn.posX + 0.5D, spawn.posY, spawn.posZ + 0.5D, + // player.rotationYaw, player.rotationPitch); + // player.motionX = 0; + // player.motionY = 0; + // player.motionZ = 0; + // teleportTo.updateEntityWithOptionalForce(player, false); + // } + // + // private static void removePlayerFromWorld(WorldServer world, EntityPlayerMP player) { + // world.removePlayerEntityDangerously(player); + //// world.getPlayerManager().removePlayer(player); + //// world.playerEntities.remove(player); + //// world.updateAllPlayersSleepingFlag(); + //// int cx = player.chunkCoordX; + //// int cy = player.chunkCoordZ; + //// if((player.addedToChunk) && (world.getChunkProvider().chunkExists(cx, cy))) { + //// world.getChunkFromChunkCoords(cx, cy).removeEntity(player); + //// world.getChunkFromChunkCoords(cx, cy).isModified = true; + //// } + //// world.loadedEntityList.remove(player); + //// world.getEntityTracker().removeEntityFromAllTrackingPlayers(player); + // } } diff --git a/src/main/java/crazypants/enderio/rail/TeleporterEIO.java b/src/main/java/crazypants/enderio/rail/TeleporterEIO.java index 89a04945..1610bad6 100644 --- a/src/main/java/crazypants/enderio/rail/TeleporterEIO.java +++ b/src/main/java/crazypants/enderio/rail/TeleporterEIO.java @@ -6,31 +6,33 @@ import net.minecraft.world.WorldServer; public class TeleporterEIO extends Teleporter { - public TeleporterEIO(WorldServer p_i1963_1_) { - super(p_i1963_1_); - } + public TeleporterEIO(WorldServer p_i1963_1_) { + super(p_i1963_1_); + } - @Override - public boolean makePortal(Entity p_makePortal_1_) { - return true; - } + @Override + public boolean makePortal(Entity p_makePortal_1_) { + return true; + } - @Override - public boolean placeInExistingPortal(Entity p_placeInExistingPortal_1_, double p_placeInExistingPortal_2_, double p_placeInExistingPortal_4_, - double p_placeInExistingPortal_6_, float p_placeInExistingPortal_8_) { - return true; - } + @Override + public boolean placeInExistingPortal( + Entity p_placeInExistingPortal_1_, + double p_placeInExistingPortal_2_, + double p_placeInExistingPortal_4_, + double p_placeInExistingPortal_6_, + float p_placeInExistingPortal_8_) { + return true; + } - @Override - public void placeInPortal(Entity entity, double x, double y, double z, float p_77185_8_) { - entity.setLocationAndAngles(x, y, z, entity.rotationPitch, entity.rotationYaw); - entity.motionX = 0; - entity.motionY = 0; - entity.motionZ = 0; - } - - @Override - public void removeStalePortalLocations(long p_removeStalePortalLocations_1_) { - } + @Override + public void placeInPortal(Entity entity, double x, double y, double z, float p_77185_8_) { + entity.setLocationAndAngles(x, y, z, entity.rotationPitch, entity.rotationYaw); + entity.motionX = 0; + entity.motionY = 0; + entity.motionZ = 0; + } + @Override + public void removeStalePortalLocations(long p_removeStalePortalLocations_1_) {} } diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java index 87bb7982..c525b9e8 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java @@ -1,8 +1,13 @@ package crazypants.enderio.teleport; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.ContainerEnder; +import com.enderio.core.common.TileEntityEnder; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.packet.PacketPassword; import java.awt.Point; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -10,95 +15,83 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.ArrayInventory; - -import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.packet.PacketPassword; - public class ContainerTravelAccessable extends ContainerEnder { - ITravelAccessable ta; - TileEntity te; - World world; + ITravelAccessable ta; + TileEntity te; + World world; - public ContainerTravelAccessable(InventoryPlayer playerInv, final ITravelAccessable travelAccessable, World world) { - super(playerInv, playerInv); - ta = travelAccessable; - this.world = world; - if (ta instanceof TileEntity) { - te = ((TileEntity) ta); - } - } - - @Override - protected void addSlots(InventoryPlayer playerInv) { - } - - public void addGhostSlots(List ghostSlots) { - int x = 44; - int y = 73; - for (int i = 0; i < 5; i++) { - ghostSlots.add(new CtaGhostSlot(ta, i, x, y, true)); - x += 18; - } - - x = 125; - y = 10; - ghostSlots.add(new CtaGhostSlot(ta, 0, x, y, false)); - } - - @Override - public Point getPlayerInventoryOffset() { - return new Point(8, 103); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - return null; - } - - private static class CtaGhostSlot extends GhostSlot { - - private ITravelAccessable ta; - boolean isAuth; - - public CtaGhostSlot(ITravelAccessable ta, int slotIndex, int x, int y, boolean isAuth) { - this.slot = slotIndex; - this.x = x; - this.y = y; - this.displayStdOverlay = false; - this.grayOut = true; - this.stackSizeLimit = 1; - this.ta = ta; - this.isAuth = isAuth; + public ContainerTravelAccessable(InventoryPlayer playerInv, final ITravelAccessable travelAccessable, World world) { + super(playerInv, playerInv); + ta = travelAccessable; + this.world = world; + if (ta instanceof TileEntity) { + te = ((TileEntity) ta); + } } @Override - public ItemStack getStack() { - if (isAuth) { - return ta.getPassword()[slot]; - } else { - return ta.getItemLabel(); - } + protected void addSlots(InventoryPlayer playerInv) {} + + public void addGhostSlots(List ghostSlots) { + int x = 44; + int y = 73; + for (int i = 0; i < 5; i++) { + ghostSlots.add(new CtaGhostSlot(ta, i, x, y, true)); + x += 18; + } + + x = 125; + y = 10; + ghostSlots.add(new CtaGhostSlot(ta, 0, x, y, false)); } @Override - public void putStack(ItemStack stack) { - if (isAuth) { - if (ta instanceof TileEntityEnder) { - PacketHandler.INSTANCE.sendToServer(PacketPassword.setPassword((TileEntityEnder) ta, slot, stack)); - } - } else { - if (ta instanceof TileEntityEnder) { - PacketHandler.INSTANCE.sendToServer(PacketPassword.setLabel((TileEntityEnder) ta, stack)); - } - } + public Point getPlayerInventoryOffset() { + return new Point(8, 103); } - } + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + return null; + } + private static class CtaGhostSlot extends GhostSlot { + + private ITravelAccessable ta; + boolean isAuth; + + public CtaGhostSlot(ITravelAccessable ta, int slotIndex, int x, int y, boolean isAuth) { + this.slot = slotIndex; + this.x = x; + this.y = y; + this.displayStdOverlay = false; + this.grayOut = true; + this.stackSizeLimit = 1; + this.ta = ta; + this.isAuth = isAuth; + } + + @Override + public ItemStack getStack() { + if (isAuth) { + return ta.getPassword()[slot]; + } else { + return ta.getItemLabel(); + } + } + + @Override + public void putStack(ItemStack stack) { + if (isAuth) { + if (ta instanceof TileEntityEnder) { + PacketHandler.INSTANCE.sendToServer(PacketPassword.setPassword((TileEntityEnder) ta, slot, stack)); + } + } else { + if (ta instanceof TileEntityEnder) { + PacketHandler.INSTANCE.sendToServer(PacketPassword.setLabel((TileEntityEnder) ta, stack)); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java index 4e3e24fe..e986a659 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java @@ -1,152 +1,142 @@ package crazypants.enderio.teleport; +import com.enderio.core.client.gui.widget.GhostSlot; +import com.enderio.core.common.ContainerEnder; +import com.enderio.core.common.util.ArrayInventory; +import crazypants.enderio.teleport.ContainerTravelAuth.AuthInventory; import java.awt.Point; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.ArrayInventory; - -import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.ContainerTravelAuth.AuthInventory; -import crazypants.enderio.teleport.packet.PacketPassword; - public class ContainerTravelAuth extends ContainerEnder { - static class AuthInventory extends ArrayInventory { - private ContainerTravelAuth container; - - private AuthInventory(ItemStack[] inv) { - super(inv); + static class AuthInventory extends ArrayInventory { + private ContainerTravelAuth container; + + private AuthInventory(ItemStack[] inv) { + super(inv); + } + + private void setContainer(ContainerTravelAuth container) { + this.container = container; + } + + @Override + public void markDirty() { + super.markDirty(); + container.dirty = true; + } + + @Override + public int getSizeInventory() { + return items.length; + } + + @Override + public ItemStack getStackInSlot(int i) { + if (i < 0 || i >= items.length) { + return null; + } + return items[i]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack item = items[fromSlot]; + items[fromSlot] = null; + if (item == null) { + return null; + } + item.stackSize = 0; + return item; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + if (itemstack != null) { + items[i] = itemstack.copy(); + items[i].stackSize = 0; + } else { + items[i] = null; + } + } + + @Override + public String getInventoryName() { + return "Password"; + } + + @Override + public int getInventoryStackLimit() { + return 0; + } + + public ItemStack[] getInventory() { + return this.items; + } } - - private void setContainer(ContainerTravelAuth container) { - this.container = container; + + boolean dirty = false; + + public ContainerTravelAuth(InventoryPlayer playerInv) { + super(playerInv, new AuthInventory(new ItemStack[5])); + getInv().setContainer(this); } @Override - public void markDirty() { - super.markDirty(); - container.dirty = true; + protected void addSlots(InventoryPlayer playerInv) {} + + public void addGhostSlots(List ghostSlots) { + int x = 44; + int y = 28; + for (int i = 0; i < 5; i++) { + ghostSlots.add(new AuthGhostSlot(getInv(), i, x, y)); + x += 18; + } } @Override - public int getSizeInventory() { - return items.length; + public Point getPlayerInventoryOffset() { + Point p = super.getPlayerInventoryOffset(); + p.translate(0, -1); + return p; } @Override - public ItemStack getStackInSlot(int i) { - if(i < 0 || i >= items.length) { + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { return null; - } - return items[i]; } - @Override - public ItemStack decrStackSize(int fromSlot, int amount) { - ItemStack item = items[fromSlot]; - items[fromSlot] = null; - if(item == null) { - return null; - } - item.stackSize = 0; - return item; + private static class AuthGhostSlot extends GhostSlot { + + private AuthInventory inv; + + public AuthGhostSlot(AuthInventory ta, int slotIndex, int x, int y) { + this.slot = slotIndex; + this.x = x; + this.y = y; + this.displayStdOverlay = false; + this.grayOut = true; + this.stackSizeLimit = 1; + this.inv = ta; + } + + @Override + public ItemStack getStack() { + ItemStack stack = inv.getStackInSlot(slot); + return stack; + } + + @Override + public void putStack(ItemStack stack) { + inv.setInventorySlotContents(slot, stack); + } } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - if(itemstack != null) { - items[i] = itemstack.copy(); - items[i].stackSize = 0; - } else { - items[i] = null; - } - } - - @Override - public String getInventoryName() { - return "Password"; - } - - @Override - public int getInventoryStackLimit() { - return 0; - } - - public ItemStack[] getInventory() { - return this.items; - } - } - - boolean dirty = false; - - public ContainerTravelAuth(InventoryPlayer playerInv) { - super(playerInv, new AuthInventory(new ItemStack[5])); - getInv().setContainer(this); - } - - @Override - protected void addSlots(InventoryPlayer playerInv) { - } - - public void addGhostSlots(List ghostSlots) { - int x = 44; - int y = 28; - for (int i = 0; i < 5; i++) { - ghostSlots.add(new AuthGhostSlot(getInv(), i, x, y)); - x += 18; - } - } - - @Override - public Point getPlayerInventoryOffset() { - Point p = super.getPlayerInventoryOffset(); - p.translate(0, -1); - return p; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - return null; - } - - private static class AuthGhostSlot extends GhostSlot { - - private AuthInventory inv; - - public AuthGhostSlot(AuthInventory ta, int slotIndex, int x, int y) { - this.slot = slotIndex; - this.x = x; - this.y = y; - this.displayStdOverlay = false; - this.grayOut = true; - this.stackSizeLimit = 1; - this.inv = ta; - } - - @Override - public ItemStack getStack() { - ItemStack stack = inv.getStackInSlot(slot); - return stack; - } - - @Override - public void putStack(ItemStack stack) { - inv.setInventorySlotContents(slot, stack); - } - - } - } diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index dae3f726..ea997739 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -1,240 +1,234 @@ package crazypants.enderio.teleport; -import java.awt.Color; - +import com.enderio.core.client.gui.button.CheckBox; import com.enderio.core.client.gui.button.ToggleButton; +import com.enderio.core.client.gui.widget.TextFieldEnder; +import com.enderio.core.client.render.ColorUtil; +import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.EnderIO; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; +import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.teleport.packet.PacketAccessMode; +import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.enderio.teleport.packet.PacketVisibility; +import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.gui.button.CheckBox; -import com.enderio.core.client.gui.widget.TextFieldEnder; -import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; -import crazypants.enderio.gui.GuiContainerBaseEIO; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.teleport.packet.PacketAccessMode; -import crazypants.enderio.teleport.packet.PacketLabel; - public class GuiTravelAccessable extends GuiContainerBaseEIO { - private static final int ID_PUBLIC = 0; - private static final int ID_PRIVATE = 1; - private static final int ID_PROTECTED = 2; - private static final int ID_VISIBLE = -1; + private static final int ID_PUBLIC = 0; + private static final int ID_PRIVATE = 1; + private static final int ID_PROTECTED = 2; + private static final int ID_VISIBLE = -1; - private final CheckBox publicCB; - private final CheckBox privateCB; - private final CheckBox protectedCB; - private final ToggleButton visibleCB; + private final CheckBox publicCB; + private final CheckBox privateCB; + private final CheckBox protectedCB; + private final ToggleButton visibleCB; - private final TextFieldEnder tf; + private final TextFieldEnder tf; - private final String publicStr; - private final String privateStr; - private final String protectedStr; - private final String visibleStr; - private final String visibleDesc1Str; - private final String visibleDesc2Str; + private final String publicStr; + private final String privateStr; + private final String protectedStr; + private final String visibleStr; + private final String visibleDesc1Str; + private final String visibleDesc2Str; - private final ITravelAccessable te; - private int col0x; - private int col1x; - private int col2x; + private final ITravelAccessable te; + private int col0x; + private int col1x; + private int col2x; - protected World world; + protected World world; - public GuiTravelAccessable(InventoryPlayer playerInv, ITravelAccessable te, World world) { - this(new ContainerTravelAccessable(playerInv, te, world)); - } - - public GuiTravelAccessable(ContainerTravelAccessable container) { - super(container, "travelAccessable"); - this.te = container.ta; - this.world = container.world; - - publicStr = EnderIO.lang.localize("gui.travelAccessable.public"); - privateStr = EnderIO.lang.localize("gui.travelAccessable.private"); - protectedStr = EnderIO.lang.localize("gui.travelAccessable.protected"); - visibleStr = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible"); - visibleDesc1Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc1"); - visibleDesc2Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc2"); - - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - - tf = new TextFieldEnder(fr, 28, 10, 90, 16); - - col1x = 88; - col0x = (col1x - fr.getStringWidth(protectedStr) / 2) / 2; - col2x = (col1x + fr.getStringWidth(protectedStr) / 2); - col2x += (176 - col2x) / 2; - - int x = 0; - int y = 50; - - x = col0x - 8; - privateCB = new CheckBox(this, ID_PRIVATE, x, y); - privateCB.setSelected(te.getAccessMode() == AccessMode.PRIVATE); - - x = col1x - 8; - protectedCB = new CheckBox(this, ID_PROTECTED, x, y); - protectedCB.setSelected(te.getAccessMode() == AccessMode.PROTECTED); - - x = col2x - 8; - publicCB = new CheckBox(this, ID_PUBLIC, x, y); - publicCB.setSelected(te.getAccessMode() == AccessMode.PUBLIC); - - visibleCB = new ToggleButton(this, ID_VISIBLE, 150, 10, IconEIO.VISIBLE_NO, IconEIO.VISIBLE_YES); - visibleCB.setSelected(te.isVisible()); - visibleCB.setToolTip(visibleStr, visibleDesc1Str, visibleDesc2Str); - - ySize = 185; - - textFields.add(tf); - } - - @Override - protected void actionPerformed(GuiButton b) { - if (b.id >= 0) { - privateCB.setSelected(b.id == ID_PRIVATE); - protectedCB.setSelected(b.id == ID_PROTECTED); - publicCB.setSelected(b.id == ID_PUBLIC); - - AccessMode curMode = b.id == ID_PRIVATE ? AccessMode.PRIVATE : b.id == ID_PROTECTED ? AccessMode.PROTECTED : AccessMode.PUBLIC; - te.setAccessMode(curMode); - BlockCoord bc = te.getLocation(); - PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode); - PacketHandler.INSTANCE.sendToServer(p); - } else if (b == visibleCB) { - boolean visible = visibleCB.isSelected(); - te.setVisible(visible); - BlockCoord bc = te.getLocation(); - PacketVisibility p = new PacketVisibility(bc.x, bc.y, bc.z, visible); - PacketHandler.INSTANCE.sendToServer(p); + public GuiTravelAccessable(InventoryPlayer playerInv, ITravelAccessable te, World world) { + this(new ContainerTravelAccessable(playerInv, te, world)); } - } + public GuiTravelAccessable(ContainerTravelAccessable container) { + super(container, "travelAccessable"); + this.te = container.ta; + this.world = container.world; - @Override - public void initGui() { - super.initGui(); - buttonList.clear(); + publicStr = EnderIO.lang.localize("gui.travelAccessable.public"); + privateStr = EnderIO.lang.localize("gui.travelAccessable.private"); + protectedStr = EnderIO.lang.localize("gui.travelAccessable.protected"); + visibleStr = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible"); + visibleDesc1Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc1"); + visibleDesc2Str = EnderIO.lang.localize("gui.travelAccessable.tooltip.visible.desc2"); - publicCB.setPaintSelectedBorder(false); - publicCB.onGuiInit(); - privateCB.onGuiInit(); - protectedCB.onGuiInit(); - visibleCB.onGuiInit(); + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - tf.setMaxStringLength(32); - tf.setFocused(true); - String txt = te.getLabel(); - if(txt != null && txt.length() > 0) { - tf.setText(txt); + tf = new TextFieldEnder(fr, 28, 10, 90, 16); + + col1x = 88; + col0x = (col1x - fr.getStringWidth(protectedStr) / 2) / 2; + col2x = (col1x + fr.getStringWidth(protectedStr) / 2); + col2x += (176 - col2x) / 2; + + int x = 0; + int y = 50; + + x = col0x - 8; + privateCB = new CheckBox(this, ID_PRIVATE, x, y); + privateCB.setSelected(te.getAccessMode() == AccessMode.PRIVATE); + + x = col1x - 8; + protectedCB = new CheckBox(this, ID_PROTECTED, x, y); + protectedCB.setSelected(te.getAccessMode() == AccessMode.PROTECTED); + + x = col2x - 8; + publicCB = new CheckBox(this, ID_PUBLIC, x, y); + publicCB.setSelected(te.getAccessMode() == AccessMode.PUBLIC); + + visibleCB = new ToggleButton(this, ID_VISIBLE, 150, 10, IconEIO.VISIBLE_NO, IconEIO.VISIBLE_YES); + visibleCB.setSelected(te.isVisible()); + visibleCB.setToolTip(visibleStr, visibleDesc1Str, visibleDesc2Str); + + ySize = 185; + + textFields.add(tf); } - ((ContainerTravelAccessable) inventorySlots).addGhostSlots(getGhostSlots()); + @Override + protected void actionPerformed(GuiButton b) { + if (b.id >= 0) { + privateCB.setSelected(b.id == ID_PRIVATE); + protectedCB.setSelected(b.id == ID_PROTECTED); + publicCB.setSelected(b.id == ID_PUBLIC); - } - - @Override - public void updateScreen() { - super.updateScreen(); - } - - @Override - public void mouseClicked(int x, int y, int par3) { - super.mouseClicked(x, y, par3); - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int i, int j) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - int col = ColorUtil.getRGB(Color.white); - int x = sx; - int y = sy + 38; - - FontRenderer fontRenderer = getFontRenderer(); - x = sx + col0x - fontRenderer.getStringWidth(privateStr) / 2; - fontRenderer.drawStringWithShadow(privateStr, x, y, col); - - x = sx + col1x - fontRenderer.getStringWidth(protectedStr) / 2; - fontRenderer.drawStringWithShadow(protectedStr, x, y, col); - - x = sx + col2x - fontRenderer.getStringWidth(publicStr) / 2; - fontRenderer.drawStringWithShadow(publicStr, x, y, col); - checkLabelForChange(); - - super.drawGuiContainerBackgroundLayer(f, i, j); - } - - private void checkLabelForChange() { - String newTxt = tf.getText(); - if(newTxt != null && newTxt.length() == 0) { - newTxt = null; + AccessMode curMode = b.id == ID_PRIVATE + ? AccessMode.PRIVATE + : b.id == ID_PROTECTED ? AccessMode.PROTECTED : AccessMode.PUBLIC; + te.setAccessMode(curMode); + BlockCoord bc = te.getLocation(); + PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode); + PacketHandler.INSTANCE.sendToServer(p); + } else if (b == visibleCB) { + boolean visible = visibleCB.isSelected(); + te.setVisible(visible); + BlockCoord bc = te.getLocation(); + PacketVisibility p = new PacketVisibility(bc.x, bc.y, bc.z, visible); + PacketHandler.INSTANCE.sendToServer(p); + } } - String curText = te.getLabel(); - if(curText != null && curText.length() == 0) { - curText = null; + @Override + public void initGui() { + super.initGui(); + buttonList.clear(); + + publicCB.setPaintSelectedBorder(false); + publicCB.onGuiInit(); + privateCB.onGuiInit(); + protectedCB.onGuiInit(); + visibleCB.onGuiInit(); + + tf.setMaxStringLength(32); + tf.setFocused(true); + String txt = te.getLabel(); + if (txt != null && txt.length() > 0) { + tf.setText(txt); + } + + ((ContainerTravelAccessable) inventorySlots).addGhostSlots(getGhostSlots()); } - boolean changed = false; - if(newTxt == null) { - if(curText == null) { - changed = false; - } else { - changed = true; - } - } else { - changed = !newTxt.equals(curText); + @Override + public void updateScreen() { + super.updateScreen(); } - if(!changed) { - return; + + @Override + public void mouseClicked(int x, int y, int par3) { + super.mouseClicked(x, y, par3); } - te.setLabel(newTxt); - BlockCoord bc = te.getLocation(); - PacketLabel p = new PacketLabel(bc.x, bc.y, bc.z, te.getLabel()); - PacketHandler.INSTANCE.sendToServer(p); - } - @Override - protected void drawForegroundImpl(int mouseX, int mouseY) { - super.drawForegroundImpl(mouseX, mouseY); + @Override + public void drawGuiContainerBackgroundLayer(float f, int i, int j) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; - if(te.getAccessMode() != AccessMode.PROTECTED) { - bindGuiTexture(); - GL11.glColor4f(1, 1, 1, 0.75f); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_DEPTH_TEST); - drawTexturedModalRect(43, 72, 5, 35, 90, 18); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glColor4f(1, 1, 1, 1); + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + int col = ColorUtil.getRGB(Color.white); + int x = sx; + int y = sy + 38; + + FontRenderer fontRenderer = getFontRenderer(); + x = sx + col0x - fontRenderer.getStringWidth(privateStr) / 2; + fontRenderer.drawStringWithShadow(privateStr, x, y, col); + + x = sx + col1x - fontRenderer.getStringWidth(protectedStr) / 2; + fontRenderer.drawStringWithShadow(protectedStr, x, y, col); + + x = sx + col2x - fontRenderer.getStringWidth(publicStr) / 2; + fontRenderer.drawStringWithShadow(publicStr, x, y, col); + checkLabelForChange(); + + super.drawGuiContainerBackgroundLayer(f, i, j); } - } - @Override - public void drawScreen(int par1, int par2, float par3) { - super.drawScreen(par1, par2, par3); - } + private void checkLabelForChange() { + String newTxt = tf.getText(); + if (newTxt != null && newTxt.length() == 0) { + newTxt = null; + } + String curText = te.getLabel(); + if (curText != null && curText.length() == 0) { + curText = null; + } + + boolean changed = false; + if (newTxt == null) { + if (curText == null) { + changed = false; + } else { + changed = true; + } + } else { + changed = !newTxt.equals(curText); + } + if (!changed) { + return; + } + te.setLabel(newTxt); + BlockCoord bc = te.getLocation(); + PacketLabel p = new PacketLabel(bc.x, bc.y, bc.z, te.getLabel()); + PacketHandler.INSTANCE.sendToServer(p); + } + + @Override + protected void drawForegroundImpl(int mouseX, int mouseY) { + super.drawForegroundImpl(mouseX, mouseY); + + if (te.getAccessMode() != AccessMode.PROTECTED) { + bindGuiTexture(); + GL11.glColor4f(1, 1, 1, 0.75f); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_DEPTH_TEST); + drawTexturedModalRect(43, 72, 5, 35, 90, 18); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glColor4f(1, 1, 1, 1); + } + } + + @Override + public void drawScreen(int par1, int par2, float par3) { + super.drawScreen(par1, par2, par3); + } } diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 994eacea..8957f8a5 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -1,93 +1,88 @@ package crazypants.enderio.teleport; +import com.enderio.core.client.render.ColorUtil; +import crazypants.enderio.EnderIO; +import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.gui.GuiContainerBaseEIO; import java.awt.Color; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.ColorUtil; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.api.teleport.ITravelAccessable; -import crazypants.enderio.gui.GuiContainerBaseEIO; - public class GuiTravelAuth extends GuiContainerBaseEIO { - private final String title; - private final ITravelAccessable ta; - - private boolean failed = false; - private final EntityPlayer player; + private final String title; + private final ITravelAccessable ta; - public GuiTravelAuth(EntityPlayer player, ITravelAccessable te, World world) { - super(new ContainerTravelAuth(player.inventory), "travelAuth"); - this.ta = te; - title = EnderIO.lang.localize("gui.travelAccessable.enterCode"); - this.player = player; - } + private boolean failed = false; + private final EntityPlayer player; - @Override - public void initGui() { - super.initGui(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - String str = EnderIO.lang.localize("gui.travelAccessable.ok"); - int strLen = getFontRenderer().getStringWidth(str); - GuiButton okB = new GuiButton(0, width / 2 - (strLen / 2) - 5, sy + 50, strLen + 10, 20, str); - buttonList.clear(); - buttonList.add(okB); - ((ContainerTravelAuth) inventorySlots).addGhostSlots(getGhostSlots()); - } - - @Override - protected void actionPerformed(GuiButton par1GuiButton) { - ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots; - if(ta.authoriseUser(player, poo.getInv().getInventory())) { - this.mc.displayGuiScreen((GuiScreen) null); - this.mc.setIngameFocus(); - } else { - // System.out.print("GuiTravelAuth.actionPerformed: Password is: "); - // for (ItemStack is : ta.getPassword()) { - // System.out.print((is == null ? is : is.getDisplayName()) + ","); - // } - // System.out.println(); - // System.out.print("GuiTravelAuth.actionPerformed: I offered: "); - // for (ItemStack is : poo.enteredPassword) { - // System.out.print((is == null ? is : is.getDisplayName()) + ","); - // } - // System.out.println(); - // System.out.println(); - failed = true; - poo.dirty = false; - } - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int mx, int my) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - int sw = getFontRenderer().getStringWidth(title); - getFontRenderer().drawString(title, width / 2 - sw / 2, sy + 12, ColorUtil.getRGB(Color.red)); - - ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots; - if(poo.dirty) { - poo.dirty = false; - failed = false; + public GuiTravelAuth(EntityPlayer player, ITravelAccessable te, World world) { + super(new ContainerTravelAuth(player.inventory), "travelAuth"); + this.ta = te; + title = EnderIO.lang.localize("gui.travelAccessable.enterCode"); + this.player = player; } - if(failed) { - drawRect(sx + 43, sy + 27, sx + 43 + 90, sy + 27 + 18, ColorUtil.getARGB(new Color(1f, 0f, 0f, 0.5f))); + @Override + public void initGui() { + super.initGui(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + String str = EnderIO.lang.localize("gui.travelAccessable.ok"); + int strLen = getFontRenderer().getStringWidth(str); + GuiButton okB = new GuiButton(0, width / 2 - (strLen / 2) - 5, sy + 50, strLen + 10, 20, str); + buttonList.clear(); + buttonList.add(okB); + ((ContainerTravelAuth) inventorySlots).addGhostSlots(getGhostSlots()); } - super.drawGuiContainerBackgroundLayer(f, mx, my); - } + @Override + protected void actionPerformed(GuiButton par1GuiButton) { + ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots; + if (ta.authoriseUser(player, poo.getInv().getInventory())) { + this.mc.displayGuiScreen((GuiScreen) null); + this.mc.setIngameFocus(); + } else { + // System.out.print("GuiTravelAuth.actionPerformed: Password is: "); + // for (ItemStack is : ta.getPassword()) { + // System.out.print((is == null ? is : is.getDisplayName()) + ","); + // } + // System.out.println(); + // System.out.print("GuiTravelAuth.actionPerformed: I offered: "); + // for (ItemStack is : poo.enteredPassword) { + // System.out.print((is == null ? is : is.getDisplayName()) + ","); + // } + // System.out.println(); + // System.out.println(); + failed = true; + poo.dirty = false; + } + } + @Override + public void drawGuiContainerBackgroundLayer(float f, int mx, int my) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + int sw = getFontRenderer().getStringWidth(title); + getFontRenderer().drawString(title, width / 2 - sw / 2, sy + 12, ColorUtil.getRGB(Color.red)); + + ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots; + if (poo.dirty) { + poo.dirty = false; + failed = false; + } + + if (failed) { + drawRect(sx + 43, sy + 27, sx + 43 + 90, sy + 27 + 18, ColorUtil.getARGB(new Color(1f, 0f, 0f, 0.5f))); + } + + super.drawGuiContainerBackgroundLayer(f, mx, my); + } } diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index dbd4400d..fc66269d 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -1,18 +1,7 @@ package crazypants.enderio.teleport; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -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 cofh.api.energy.ItemEnergyContainer; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,148 +12,157 @@ import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; import crazypants.enderio.machine.power.PowerDisplayUtil; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +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; public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider { - public static boolean isEquipped(EntityPlayer ep) { - if(ep == null || ep.getCurrentEquippedItem() == null) { - return false; - } - return ep.getCurrentEquippedItem().getItem() == EnderIO.itemTravelStaff; - } - - private long lastBlickTick = 0; - - public static ItemTravelStaff create() { - ItemTravelStaff result = new ItemTravelStaff(); - result.init(); - return result; - } - - protected ItemTravelStaff() { - super(Config.darkSteelPowerStorageLevelTwo, Config.darkSteelPowerStorageLevelTwo / 100, 0); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemTravelStaff.name()); - setMaxDamage(16); - setMaxStackSize(1); - setHasSubtypes(true); - } - - protected void init() { - GameRegistry.registerItem(this, ModObject.itemTravelStaff.unlocalisedName); - } - - @Override - public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { - setEnergy(itemStack, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:itemTravelStaff"); - } - - @Override - public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { - if(player.isSneaking()) { - long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; - if(ticksSinceBlink < 0) { - lastBlickTick = -1; - } - if(Config.travelStaffBlinkEnabled && world.isRemote && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { - if(TravelController.instance.doBlink(equipped, player)) { - player.swingItem(); - lastBlickTick = EnderIO.proxy.getTickCount(); + public static boolean isEquipped(EntityPlayer ep) { + if (ep == null || ep.getCurrentEquippedItem() == null) { + return false; } - } - return equipped; + return ep.getCurrentEquippedItem().getItem() == EnderIO.itemTravelStaff; } - if(world.isRemote) { - TravelController.instance.activateTravelAccessable(equipped, world, player, TravelSource.STAFF); + private long lastBlickTick = 0; + + public static ItemTravelStaff create() { + ItemTravelStaff result = new ItemTravelStaff(); + result.init(); + return result; } - player.swingItem(); - return equipped; - } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - super.addInformation(itemStack, par2EntityPlayer, list, par4); - String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" - + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); - list.add(str); - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - int res = super.receiveEnergy(container, maxReceive, simulate); - if(res != 0 && !simulate) { - updateDamage(container); + protected ItemTravelStaff() { + super(Config.darkSteelPowerStorageLevelTwo, Config.darkSteelPowerStorageLevelTwo / 100, 0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemTravelStaff.name()); + setMaxDamage(16); + setMaxStackSize(1); + setHasSubtypes(true); } - return res; - } - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - int res = super.extractEnergy(container, maxExtract, simulate); - if(res != 0 && !simulate) { - updateDamage(container); + protected void init() { + GameRegistry.registerItem(this, ModObject.itemTravelStaff.unlocalisedName); } - return res; - } - @Override - public void extractInternal(ItemStack item, int powerUse) { - int res = Math.max(0, getEnergyStored(item) - powerUse); - setEnergy(item, res); - } - - void setEnergy(ItemStack container, int energy) { - if(container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + @Override + public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) { + setEnergy(itemStack, 0); } - container.stackTagCompound.setInteger("Energy", energy); - updateDamage(container); - } - public void setFull(ItemStack container) { - setEnergy(container, Config.darkSteelPowerStorageLevelTwo); - } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister IIconRegister) { + itemIcon = IIconRegister.registerIcon("enderio:itemTravelStaff"); + } - private void updateDamage(ItemStack stack) { - float r = (float) getEnergyStored(stack) / getMaxEnergyStored(stack); - int res = 16 - (int) (r * 16); - stack.setItemDamage(res); - } + @Override + public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { + if (player.isSneaking()) { + long ticksSinceBlink = EnderIO.proxy.getTickCount() - lastBlickTick; + if (ticksSinceBlink < 0) { + lastBlickTick = -1; + } + if (Config.travelStaffBlinkEnabled + && world.isRemote + && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { + if (TravelController.instance.doBlink(equipped, player)) { + player.swingItem(); + lastBlickTick = EnderIO.proxy.getTickCount(); + } + } + return equipped; + } - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { - ItemStack is = new ItemStack(this); - setFull(is); - par3List.add(is); + if (world.isRemote) { + TravelController.instance.activateTravelAccessable(equipped, world, player, TravelSource.STAFF); + } + player.swingItem(); + return equipped; + } - is = new ItemStack(this); - setEnergy(is, 0); - par3List.add(is); - } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + super.addInformation(itemStack, par2EntityPlayer, list, par4); + String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" + + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); + list.add(str); + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack stack) { - return getUnlocalizedName(); - } + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + int res = super.receiveEnergy(container, maxReceive, simulate); + if (res != 0 && !simulate) { + updateDamage(container); + } + return res; + } - @Override - public boolean isActive(EntityPlayer ep, ItemStack equipped) { - return isEquipped(ep); - } + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + int res = super.extractEnergy(container, maxExtract, simulate); + if (res != 0 && !simulate) { + updateDamage(container); + } + return res; + } - @Override - @SideOnly(Side.CLIENT) - public boolean isFull3D() { - return true; - } + @Override + public void extractInternal(ItemStack item, int powerUse) { + int res = Math.max(0, getEnergyStored(item) - powerUse); + setEnergy(item, res); + } + void setEnergy(ItemStack container, int energy) { + if (container.stackTagCompound == null) { + container.stackTagCompound = new NBTTagCompound(); + } + container.stackTagCompound.setInteger("Energy", energy); + updateDamage(container); + } + + public void setFull(ItemStack container) { + setEnergy(container, Config.darkSteelPowerStorageLevelTwo); + } + + private void updateDamage(ItemStack stack) { + float r = (float) getEnergyStored(stack) / getMaxEnergyStored(stack); + int res = 16 - (int) (r * 16); + stack.setItemDamage(res); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + ItemStack is = new ItemStack(this); + setFull(is); + par3List.add(is); + + is = new ItemStack(this); + setEnergy(is, 0); + par3List.add(is); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack stack) { + return getUnlocalizedName(); + } + + @Override + public boolean isActive(EntityPlayer ep, ItemStack equipped) { + return isEquipped(ep); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean isFull3D() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index 1882e03a..94f4cec7 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -1,9 +1,5 @@ package crazypants.enderio.teleport; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; @@ -12,41 +8,71 @@ import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.Material; import crazypants.enderio.power.Capacitors; import crazypants.enderio.teleport.telepad.ItemCoordSelector; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; public class TeleportRecipes { - public static void addRecipes() { + public static void addRecipes() { - ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal()); - ItemStack enderCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); + ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal()); + ItemStack enderCapacitor = new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); - //travel blocks - if(Config.travelAnchorEnabled) { - ItemStack travelBlock = new ItemStack(EnderIO.blockTravelPlatform); - ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); - GameRegistry.addRecipe(new ShapedOreRecipe(travelBlock, "ibi", "bcb", "ibi", 'i', "ingotIron", 'b', conduitBinder, 'c', pulsCry)); + // travel blocks + if (Config.travelAnchorEnabled) { + ItemStack travelBlock = new ItemStack(EnderIO.blockTravelPlatform); + ItemStack pulsCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); + GameRegistry.addRecipe(new ShapedOreRecipe( + travelBlock, "ibi", "bcb", "ibi", 'i', "ingotIron", 'b', conduitBinder, 'c', pulsCry)); + } + + if (Config.travelStaffEnabled) { + // travel staff + ItemStack travelStaff = new ItemStack(EnderIO.itemTravelStaff); + EnderIO.itemTravelStaff.setEnergy(travelStaff, 0); + ItemStack endCry = new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); + GameRegistry.addShapedRecipe( + travelStaff, " e", " s ", "s ", 's', darkSteel, 'c', enderCapacitor, 'e', endCry); + } + + if (Config.travelAnchorEnabled && Config.travelStaffEnabled) { + ItemStack travelBlock = new ItemStack(EnderIO.blockTravelPlatform); + ItemStack telepad = new ItemStack(EnderIO.blockTelePad); + ItemStack octadic = new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); + ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, OreDictionary.WILDCARD_VALUE); + ItemStack fq = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()); + GameRegistry.addRecipe(new ShapedOreRecipe( + telepad, + "gSg", + "dAd", + "dod", + 'g', + fq, + 'S', + staff, + 'd', + "ingotDarkSteel", + 'A', + travelBlock, + 'o', + octadic)); + } + + ItemStack coordSelector = new ItemStack(EnderIO.itemCoordSelector); + ItemCoordSelector.init(coordSelector); + GameRegistry.addRecipe(new ShapedOreRecipe( + coordSelector, + "sps", + " cs", + " s", + 's', + "ingotElectricalSteel", + 'p', + Items.ender_pearl, + 'c', + Items.compass)); } - - if(Config.travelStaffEnabled) { - //travel staff - ItemStack travelStaff = new ItemStack(EnderIO.itemTravelStaff); - EnderIO.itemTravelStaff.setEnergy(travelStaff, 0); - ItemStack endCry = new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); - ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); - GameRegistry.addShapedRecipe(travelStaff, " e", " s ", "s ", 's', darkSteel, 'c', enderCapacitor, 'e', endCry); - } - - if(Config.travelAnchorEnabled && Config.travelStaffEnabled) { - ItemStack travelBlock = new ItemStack(EnderIO.blockTravelPlatform); - ItemStack telepad = new ItemStack(EnderIO.blockTelePad); - ItemStack octadic = new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); - ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, OreDictionary.WILDCARD_VALUE); - ItemStack fq = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()); - GameRegistry.addRecipe(new ShapedOreRecipe(telepad, "gSg", "dAd", "dod", 'g', fq, 'S', staff, 'd', "ingotDarkSteel", 'A', travelBlock, 'o', octadic)); - } - - ItemStack coordSelector = new ItemStack(EnderIO.itemCoordSelector); - ItemCoordSelector.init(coordSelector); - GameRegistry.addRecipe(new ShapedOreRecipe(coordSelector, "sps", " cs", " s", 's', "ingotElectricalSteel", 'p', Items.ender_pearl, 'c', Items.compass)); - } } diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index e6495124..5744557c 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -1,28 +1,5 @@ package crazypants.enderio.teleport; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovementInput; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Camera; @@ -30,7 +7,6 @@ import com.enderio.core.common.vecmath.Matrix4d; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector2d; import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -50,697 +26,772 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketDrainStaff; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovementInput; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; public class TravelController { - public static final TravelController instance = new TravelController(); + public static final TravelController instance = new TravelController(); - private Random rand = new Random(); + private Random rand = new Random(); - private boolean wasJumping = false; + private boolean wasJumping = false; - private boolean wasSneaking = false; + private boolean wasSneaking = false; - private int delayTimer = 0; + private int delayTimer = 0; - private final int timer = Config.travelAnchorCooldown; + private final int timer = Config.travelAnchorCooldown; - private boolean tempJump; + private boolean tempJump; - private boolean tempSneak; + private boolean tempSneak; - private boolean showTargets = false; + private boolean showTargets = false; - private boolean insufficientPower; + private boolean insufficientPower; - public BlockCoord onBlockCoord; + public BlockCoord onBlockCoord; - public BlockCoord selectedCoord; + public BlockCoord selectedCoord; - Camera currentView = new Camera(); + Camera currentView = new Camera(); - private final HashMap candidates = new HashMap(); + private final HashMap candidates = new HashMap(); - private boolean selectionEnabled = true; + private boolean selectionEnabled = true; - private double fovRad; + private double fovRad; - private double tanFovRad; + private double tanFovRad; - private final List blackList = new ArrayList(); + private final List blackList = new ArrayList(); - private TravelController() { - String[] blackListNames = Config.travelStaffBlinkBlackList; - for (String name : blackListNames) { - blackList.add(new UniqueIdentifier(name)); + private TravelController() { + String[] blackListNames = Config.travelStaffBlinkBlackList; + for (String name : blackListNames) { + blackList.add(new UniqueIdentifier(name)); + } } - } - public void addBlockToBlinkBlackList(String blockName) { - blackList.add(new UniqueIdentifier(blockName)); - } - - public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source) { - if(!hasTarget()) { - return false; + public void addBlockToBlinkBlackList(String blockName) { + blackList.add(new UniqueIdentifier(blockName)); } - BlockCoord target = selectedCoord; - TileEntity te = world.getTileEntity(target.x, target.y, target.z); - if(te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if(ta.getRequiresPassword(player)) { - PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); - PacketHandler.INSTANCE.sendToServer(p); + + public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source) { + if (!hasTarget()) { + return false; + } + BlockCoord target = selectedCoord; + TileEntity te = world.getTileEntity(target.x, target.y, target.z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (ta.getRequiresPassword(player)) { + PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); + PacketHandler.INSTANCE.sendToServer(p); + return true; + } + } + if (isTargetEnderIO()) { + openEnderIO(equipped, world, player); + } else if (Config.travelAnchorEnabled) { + travelToSelectedTarget(player, source, false); + } return true; - } } - if(isTargetEnderIO()) { - openEnderIO(equipped, world, player); - } else if(Config.travelAnchorEnabled) { - travelToSelectedTarget(player, source, false); - } - return true; - } - public boolean doBlink(ItemStack equipped, EntityPlayer player) { - Vector3d eye = Util.getEyePositionEio(player); - Vector3d look = Util.getLookVecEio(player); + public boolean doBlink(ItemStack equipped, EntityPlayer player) { + Vector3d eye = Util.getEyePositionEio(player); + Vector3d look = Util.getLookVecEio(player); - Vector3d sample = new Vector3d(look); - sample.scale(Config.travelStaffMaxBlinkDistance); - sample.add(eye); - Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); - Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); - - double playerHeight = player.yOffset; - //if you looking at you feet, and your player height to the max distance, or part there of - double lookComp = -look.y * playerHeight; - double maxDistance = Config.travelStaffMaxBlinkDistance + lookComp; - - MovingObjectPosition p = player.worldObj.rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); - if(p == null) { - - //go as far as possible - for (double i = maxDistance; i > 1; i--) { - - sample.set(look); - sample.scale(i); + Vector3d sample = new Vector3d(look); + sample.scale(Config.travelStaffMaxBlinkDistance); sample.add(eye); - //we test against our feets location - sample.y -= playerHeight; - if(doBlinkAround(player, sample, true)) { - return true; + Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); + Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); + + double playerHeight = player.yOffset; + // if you looking at you feet, and your player height to the max distance, or part there of + double lookComp = -look.y * playerHeight; + double maxDistance = Config.travelStaffMaxBlinkDistance + lookComp; + + MovingObjectPosition p = + player.worldObj.rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); + if (p == null) { + + // go as far as possible + for (double i = maxDistance; i > 1; i--) { + + sample.set(look); + sample.scale(i); + sample.add(eye); + // we test against our feets location + sample.y -= playerHeight; + if (doBlinkAround(player, sample, true)) { + return true; + } + } + return false; + } else { + + List res = + Util.raytraceAll(player.worldObj, eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); + for (MovingObjectPosition pos : res) { + if (pos != null) { + Block hitBlock = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + if (isBlackListedBlock(player, pos, hitBlock)) { + maxDistance = Math.min( + maxDistance, + VecmathUtil.distance( + eye, new Vector3d(pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5)) + - 1.5 + - lookComp); + } + } + } + + eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); + + Vector3d targetBc = new Vector3d(p.blockX, p.blockY, p.blockZ); + double sampleDistance = 1.5; + double teleDistance = + VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + + sampleDistance; + + while (teleDistance < maxDistance) { + sample.set(look); + sample.scale(sampleDistance); + sample.add(targetBc); + // we test against our feets location + sample.y -= playerHeight; + + if (doBlinkAround(player, sample, false)) { + return true; + } + teleDistance++; + sampleDistance++; + } + sampleDistance = -0.5; + teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + + sampleDistance; + while (teleDistance > 1) { + sample.set(look); + sample.scale(sampleDistance); + sample.add(targetBc); + // we test against our feets location + sample.y -= playerHeight; + + if (doBlinkAround(player, sample, false)) { + return true; + } + sampleDistance--; + teleDistance--; + } } - } - return false; - } else { + return false; + } - List res = Util.raytraceAll(player.worldObj, eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); - for (MovingObjectPosition pos : res) { - if(pos != null) { - Block hitBlock = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - if(isBlackListedBlock(player, pos, hitBlock)) { - maxDistance = Math.min(maxDistance, VecmathUtil.distance(eye, new Vector3d(pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5)) - 1.5 - lookComp); - } + private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) { + UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock); + if (ui == null) { + return false; } - } + return blackList.contains(ui) + && (hitBlock.getBlockHardness(player.worldObj, pos.blockX, pos.blockY, pos.blockZ) < 0 + || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); + } - eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); - - Vector3d targetBc = new Vector3d(p.blockX, p.blockY, p.blockZ); - double sampleDistance = 1.5; - double teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + sampleDistance; - - while (teleDistance < maxDistance) { - sample.set(look); - sample.scale(sampleDistance); - sample.add(targetBc); - //we test against our feets location - sample.y -= playerHeight; - - if(doBlinkAround(player, sample, false)) { - return true; + private boolean doBlinkAround(EntityPlayer player, Vector3d sample, boolean conserveMomentum) { + if (doBlink( + player, + new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)), + conserveMomentum)) { + return true; } - teleDistance++; - sampleDistance++; - } - sampleDistance = -0.5; - teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + sampleDistance; - while (teleDistance > 1) { - sample.set(look); - sample.scale(sampleDistance); - sample.add(targetBc); - //we test against our feets location - sample.y -= playerHeight; - - if(doBlinkAround(player, sample, false)) { - return true; + if (doBlink( + player, + new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)), + conserveMomentum)) { + return true; } - sampleDistance--; - teleDistance--; - } + if (!Config.travelStaffSearchOptimize) { + if (doBlink( + player, + new BlockCoord( + (int) Math.floor(sample.x), (int) Math.floor(sample.y) - 1, (int) Math.floor(sample.z)), + conserveMomentum)) { + return true; + } + } + return false; } - return false; - } - private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) { - UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock); - if(ui == null) { - return false; + private boolean doBlink(EntityPlayer player, BlockCoord coord, boolean conserveMomentum) { + return travelToLocation(player, TravelSource.STAFF_BLINK, coord, conserveMomentum); } - return blackList.contains(ui) - && (hitBlock.getBlockHardness(player.worldObj, pos.blockX, pos.blockY, pos.blockZ) < 0 || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); - } - private boolean doBlinkAround(EntityPlayer player, Vector3d sample, boolean conserveMomentum) { - if(doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)), conserveMomentum)) { - return true; + public boolean showTargets() { + return showTargets && selectionEnabled; } - if(doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)), conserveMomentum)) { - return true; + + public void setSelectionEnabled(boolean b) { + selectionEnabled = b; + if (!selectionEnabled) { + candidates.clear(); + } } - if (!Config.travelStaffSearchOptimize) { - if (doBlink(player, new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) - 1, (int) Math.floor(sample.z)), conserveMomentum)) { + + public boolean isBlockSelected(BlockCoord coord) { + if (coord == null) { + return false; + } + return coord.equals(selectedCoord); + } + + public void addCandidate(BlockCoord coord) { + if (!candidates.containsKey(coord)) { + candidates.put(coord, -1f); + } + } + + public int getMaxTravelDistanceSq() { + return TravelSource.getMaxDistanceSq(); + } + + public boolean isTargetEnderIO() { + if (selectedCoord == null) { + return false; + } + return EnderIO.instance + .proxy + .getClientPlayer() + .worldObj + .getBlock(selectedCoord.x, selectedCoord.y, selectedCoord.z) + == EnderIO.blockEnderIo; + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onRender(RenderWorldLastEvent event) { + + Minecraft mc = Minecraft.getMinecraft(); + Vector3d eye = Util.getEyePositionEio(mc.thePlayer); + Vector3d lookAt = Util.getLookVecEio(mc.thePlayer); + lookAt.add(eye); + Matrix4d mv = VecmathUtil.createMatrixAsLookAt(eye, lookAt, new Vector3d(0, 1, 0)); + + float fov = Minecraft.getMinecraft().gameSettings.fovSetting; + Matrix4d pr = VecmathUtil.createProjectionMatrixAsPerspective( + fov, 0.05f, mc.gameSettings.renderDistanceChunks * 16, mc.displayWidth, mc.displayHeight); + currentView.setProjectionMatrix(pr); + currentView.setViewMatrix(mv); + currentView.setViewport(0, 0, mc.displayWidth, mc.displayHeight); + + fovRad = Math.toRadians(fov); + tanFovRad = Math.tanh(fovRad); + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase == TickEvent.Phase.END) { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (player == null) { + return; + } + onBlockCoord = getActiveTravelBlock(player); + boolean onBlock = onBlockCoord != null; + showTargets = onBlock || isTravelItemActive(player); + if (showTargets) { + updateSelectedTarget(player); + } else { + selectedCoord = null; + } + MovementInput input = player.movementInput; + tempJump = input.jump; + tempSneak = input.sneak; + + // Handles teleportation if a target is selected + if ((input.jump && !wasJumping && onBlock && selectedCoord != null && delayTimer == 0) + || (input.sneak + && !wasSneaking + && onBlock + && selectedCoord != null + && delayTimer == 0 + && Config.travelAnchorSneak)) { + + if (onInput(player)) { + delayTimer = timer; + } + } + // If there is no selected coordinate and the input is jump, go up + if (input.jump && !wasJumping && onBlock && selectedCoord == null && delayTimer == 0) { + + updateVerticalTarget(player, 1); + if (onInput(player)) { + delayTimer = timer; + } + } + + // If there is no selected coordinate and the input is sneak, go down + if (input.sneak && !wasSneaking && onBlock && selectedCoord == null && delayTimer == 0) { + updateVerticalTarget(player, -1); + if (onInput(player)) { + delayTimer = timer; + } + } + + if (delayTimer != 0) { + delayTimer--; + } + + wasJumping = tempJump; + wasSneaking = tempSneak; + candidates.clear(); + insufficientPower = false; + } + } + + public boolean hasTarget() { + return selectedCoord != null; + } + + public void openEnderIO(ItemStack equipped, World world, EntityPlayer player) { + BlockCoord target = TravelController.instance.selectedCoord; + TileEntity te = world.getTileEntity(target.x, target.y, target.z); + if (!(te instanceof TileEnderIO)) { + return; + } + TileEnderIO eio = (TileEnderIO) te; + if (eio.canBlockBeAccessed(player)) { + int requiredPower = equipped == null ? 0 : instance.getRequiredPower(player, TravelSource.STAFF, target); + if (requiredPower <= 0 || requiredPower <= getEnergyInTravelItem(equipped)) { + if (requiredPower > 0) { + PacketDrainStaff p = new PacketDrainStaff(requiredPower); + PacketHandler.INSTANCE.sendToServer(p); + } + player.openGui( + EnderIO.instance, + GuiHandler.GUI_ID_ENDERFACE, + world, + target.x, + TravelController.instance.selectedCoord.y, + TravelController.instance.selectedCoord.z); + } + } else { + player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); + } + } + + public int getEnergyInTravelItem(ItemStack equipped) { + if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)) { + return 0; + } + return ((IItemOfTravel) equipped.getItem()).getEnergyStored(equipped); + } + + public boolean isTravelItemActive(EntityPlayer ep) { + if (ep == null || ep.getCurrentEquippedItem() == null) { + return false; + } + ItemStack equipped = ep.getCurrentEquippedItem(); + if (equipped.getItem() instanceof IItemOfTravel) { + return ((IItemOfTravel) equipped.getItem()).isActive(ep, equipped); + } + return false; + } + + public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) { + return travelToLocation(player, source, selectedCoord, conserveMomentum); + } + + public boolean travelToLocation( + EntityPlayer player, TravelSource source, BlockCoord coord, boolean conserveMomentum) { + + if (source != TravelSource.STAFF_BLINK) { + TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (!ta.canBlockBeAccessed(player)) { + player.addChatComponentMessage( + new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); + return false; + } + } + } + + int requiredPower = 0; + requiredPower = getRequiredPower(player, source, coord); + if (requiredPower < 0) { + return false; + } + + if (!isInRangeTarget(player, coord, source.getMaxDistanceTravelledSq())) { + if (source != TravelSource.STAFF_BLINK) { + player.addChatComponentMessage(new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); + } + return false; + } + if (!isValidTarget(player, coord, source)) { + if (source != TravelSource.STAFF_BLINK) { + player.addChatComponentMessage( + new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget")); + } + return false; + } + if (doClientTeleport(player, coord, source, requiredPower, conserveMomentum)) { + for (int i = 0; i < 6; ++i) { + player.worldObj.spawnParticle( + "portal", + player.posX + (rand.nextDouble() - 0.5D), + player.posY + rand.nextDouble() * player.height - 0.25D, + player.posZ + (rand.nextDouble() - 0.5D), + (rand.nextDouble() - 0.5D) * 2.0D, + -rand.nextDouble(), + (rand.nextDouble() - 0.5D) * 2.0D); + } + } return true; - } } - return false; - } - private boolean doBlink(EntityPlayer player, BlockCoord coord, boolean conserveMomentum) { - return travelToLocation(player, TravelSource.STAFF_BLINK, coord, conserveMomentum); - } - - public boolean showTargets() { - return showTargets && selectionEnabled; - } - - public void setSelectionEnabled(boolean b) { - selectionEnabled = b; - if(!selectionEnabled) { - candidates.clear(); + public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) { + if (!isTravelItemActive(player)) { + return 0; + } + int requiredPower; + ItemStack staff = player.getCurrentEquippedItem(); + requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF()); + int canUsePower = getEnergyInTravelItem(staff); + if (requiredPower > canUsePower) { + // make sure chat is sent only once per trial + if (!insufficientPower) { + player.addChatComponentMessage(new ChatComponentTranslation("enderio.itemTravelStaff.notEnoughPower")); + insufficientPower = true; + } + return -1; + } + return requiredPower; } - } - public boolean isBlockSelected(BlockCoord coord) { - if(coord == null) { - return false; + private boolean isInRangeTarget(EntityPlayer player, BlockCoord bc, float maxSq) { + return getDistanceSquared(player, bc) <= maxSq; } - return coord.equals(selectedCoord); - } - public void addCandidate(BlockCoord coord) { - if(!candidates.containsKey(coord)) { - candidates.put(coord, -1f); + private double getDistanceSquared(EntityPlayer player, BlockCoord bc) { + if (player == null || bc == null) { + return 0; + } + Vector3d eye = Util.getEyePositionEio(player); + Vector3d target = new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); + return eye.distanceSquared(target); } - } - public int getMaxTravelDistanceSq() { - return TravelSource.getMaxDistanceSq(); - } - - public boolean isTargetEnderIO() { - if(selectedCoord == null) { - return false; + private double getDistance(EntityPlayer player, BlockCoord coord) { + return Math.sqrt(getDistanceSquared(player, coord)); } - return EnderIO.instance.proxy.getClientPlayer().worldObj.getBlock(selectedCoord.x, selectedCoord.y, selectedCoord.z) == EnderIO.blockEnderIo; - } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void onRender(RenderWorldLastEvent event) { + private boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) { + if (bc == null) { + return false; + } + World w = player.worldObj; + BlockCoord baseLoc = bc; + if (source != TravelSource.STAFF_BLINK) { + // targeting a block so go one up + baseLoc = bc.getLocation(ForgeDirection.UP); + } - Minecraft mc = Minecraft.getMinecraft(); - Vector3d eye = Util.getEyePositionEio(mc.thePlayer); - Vector3d lookAt = Util.getLookVecEio(mc.thePlayer); - lookAt.add(eye); - Matrix4d mv = VecmathUtil.createMatrixAsLookAt(eye, lookAt, new Vector3d(0, 1, 0)); + return canTeleportTo(player, source, baseLoc, w) + && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w); + } - float fov = Minecraft.getMinecraft().gameSettings.fovSetting; - Matrix4d pr = VecmathUtil.createProjectionMatrixAsPerspective(fov, 0.05f, mc.gameSettings.renderDistanceChunks * 16, mc.displayWidth, - mc.displayHeight); - currentView.setProjectionMatrix(pr); - currentView.setViewMatrix(mv); - currentView.setViewport(0, 0, mc.displayWidth, mc.displayHeight); + private boolean canTeleportTo(EntityPlayer player, TravelSource source, BlockCoord bc, World w) { + if (bc.y < 1) { + return false; + } + if (source == TravelSource.STAFF_BLINK && !Config.travelStaffBlinkThroughSolidBlocksEnabled) { + Vec3 start = Util.getEyePosition(player); + Vec3 target = Vec3.createVectorHelper(bc.x + 0.5f, bc.y + 0.5f, bc.z + 0.5f); + if (!canBlinkTo(bc, w, start, target)) { + return false; + } + } - fovRad = Math.toRadians(fov); - tanFovRad = Math.tanh(fovRad); - } + Block block = w.getBlock(bc.x, bc.y, bc.z); + if (block == null || block.isAir(w, bc.x, bc.y, bc.z)) { + return true; + } + final AxisAlignedBB aabb = block.getCollisionBoundingBoxFromPool(w, bc.x, bc.y, bc.z); + return aabb == null || aabb.getAverageEdgeLength() < 0.7; + } - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void onClientTick(TickEvent.ClientTickEvent event) { - if(event.phase == TickEvent.Phase.END) { - EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - if(player == null) { - return; - } - onBlockCoord = getActiveTravelBlock(player); - boolean onBlock = onBlockCoord != null; - showTargets = onBlock || isTravelItemActive(player); - if(showTargets) { - updateSelectedTarget(player); - } else { + private boolean canBlinkTo(BlockCoord bc, World w, Vec3 start, Vec3 target) { + MovingObjectPosition p = w.rayTraceBlocks(start, target, !Config.travelStaffBlinkThroughClearBlocksEnabled); + if (p != null) { + if (!Config.travelStaffBlinkThroughClearBlocksEnabled) { + return false; + } + Block block = w.getBlock(p.blockX, p.blockY, p.blockZ); + if (isClear(w, block, p.blockX, p.blockY, p.blockZ)) { + if (new BlockCoord(p.blockX, p.blockY, p.blockZ).equals(bc)) { + return true; + } + // need to step + Vector3d sv = new Vector3d(start.xCoord, start.yCoord, start.zCoord); + Vector3d rayDir = new Vector3d(target.xCoord, target.yCoord, target.zCoord); + rayDir.sub(sv); + rayDir.normalize(); + rayDir.add(sv); + return canBlinkTo(bc, w, Vec3.createVectorHelper(rayDir.x, rayDir.y, rayDir.z), target); + + } else { + return false; + } + } + return true; + } + + private boolean isClear(World w, Block block, int x, int y, int z) { + if (block == null || block.isAir(w, x, y, z)) { + return true; + } + final AxisAlignedBB aabb = block.getCollisionBoundingBoxFromPool(w, x, y, z); + if (aabb == null || aabb.getAverageEdgeLength() < 0.7) { + return true; + } + + return block.getLightOpacity(w, x, y, z) < 2; + } + + @SideOnly(Side.CLIENT) + private void updateVerticalTarget(EntityPlayer player, int direction) { + + BlockCoord currentBlock = getActiveTravelBlock(player); + World world = Minecraft.getMinecraft().theWorld; + for (int i = 0, y = currentBlock.y + direction; + i < Config.travelAnchorMaxDistance && y >= 0 && y <= 255; + i++, y += direction) { + + // Circumvents the raytracing used to find candidates on the y axis + TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z); + + if (selectedBlock instanceof ITravelAccessable) { + ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock; + BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z); + + if (Config.travelAnchorSkipWarning) { + if (travelBlock.getRequiresPassword(player)) { + player.addChatComponentMessage( + new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked")); + } + + if (travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE + && !travelBlock.canUiBeAccessed(player)) { + player.addChatComponentMessage( + new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate")); + } + if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + player.addChatComponentMessage( + new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed")); + } + } + if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + selectedCoord = targetBlock; + return; + } + } + } + } + + @SideOnly(Side.CLIENT) + private void updateSelectedTarget(EntityPlayer player) { selectedCoord = null; - } - MovementInput input = player.movementInput; - tempJump = input.jump; - tempSneak = input.sneak; - - // Handles teleportation if a target is selected - if((input.jump && !wasJumping && onBlock && selectedCoord != null && delayTimer == 0) - || (input.sneak && !wasSneaking && onBlock && selectedCoord != null && delayTimer == 0 && Config.travelAnchorSneak)) { - - if (onInput(player)) { - delayTimer = timer; + if (candidates.isEmpty()) { + return; } - } - // If there is no selected coordinate and the input is jump, go up - if(input.jump && !wasJumping && onBlock && selectedCoord == null && delayTimer == 0) { - updateVerticalTarget(player, 1); - if (onInput(player)) { - delayTimer = timer; + double closestDistance = Double.MAX_VALUE; + for (BlockCoord bc : candidates.keySet()) { + if (!bc.equals(onBlockCoord)) { + + double d = addRatio(bc); + if (d < closestDistance) { + selectedCoord = bc; + closestDistance = d; + } + } } - } - // If there is no selected coordinate and the input is sneak, go down - if(input.sneak && !wasSneaking && onBlock && selectedCoord == null && delayTimer == 0) { - updateVerticalTarget(player, -1); - if (onInput(player)) { - delayTimer = timer; + if (selectedCoord != null) { + + Vector3d blockCenter = new Vector3d(selectedCoord.x + 0.5, selectedCoord.y + 0.5, selectedCoord.z + 0.5); + Vector2d blockCenterPixel = currentView.getScreenPoint(blockCenter); + + Vector2d screenMidPixel = + new Vector2d(Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); + screenMidPixel.scale(0.5); + + double pixDist = blockCenterPixel.distance(screenMidPixel); + double rat = pixDist / Minecraft.getMinecraft().displayHeight; + if (rat != rat) { + rat = 0; + } + if (rat > 0.07) { + selectedCoord = null; + } } - } - - if(delayTimer != 0) { - delayTimer--; - } - - wasJumping = tempJump; - wasSneaking = tempSneak; - candidates.clear(); - insufficientPower = false; } - } - public boolean hasTarget() { - return selectedCoord != null; - } + @SideOnly(Side.CLIENT) + private boolean onInput(EntityClientPlayerMP player) { - public void openEnderIO(ItemStack equipped, World world, EntityPlayer player) { - BlockCoord target = TravelController.instance.selectedCoord; - TileEntity te = world.getTileEntity(target.x, target.y, target.z); - if(!(te instanceof TileEnderIO)) { - return; - } - TileEnderIO eio = (TileEnderIO) te; - if(eio.canBlockBeAccessed(player)) { - int requiredPower = equipped == null ? 0 : instance.getRequiredPower(player, TravelSource.STAFF, target); - if(requiredPower <= 0 || requiredPower <= getEnergyInTravelItem(equipped)) { - if(requiredPower > 0) { - PacketDrainStaff p = new PacketDrainStaff(requiredPower); - PacketHandler.INSTANCE.sendToServer(p); + MovementInput input = player.movementInput; + BlockCoord target = TravelController.instance.selectedCoord; + if (target == null) { + return false; } - player.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, target.x, - TravelController.instance.selectedCoord.y, TravelController.instance.selectedCoord.z); - } - } else { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); - } - } - public int getEnergyInTravelItem(ItemStack equipped) { - if(equipped == null || !(equipped.getItem() instanceof IItemOfTravel)) { - return 0; - } - return ((IItemOfTravel) equipped.getItem()).getEnergyStored(equipped); - } - - public boolean isTravelItemActive(EntityPlayer ep) { - if(ep == null || ep.getCurrentEquippedItem() == null) { - return false; - } - ItemStack equipped = ep.getCurrentEquippedItem(); - if(equipped.getItem() instanceof IItemOfTravel) { - return ((IItemOfTravel) equipped.getItem()).isActive(ep, equipped); - } - return false; - } - - public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) { - return travelToLocation(player, source, selectedCoord, conserveMomentum); - } - - public boolean travelToLocation(EntityPlayer player, TravelSource source, BlockCoord coord, boolean conserveMomentum) { - - if(source != TravelSource.STAFF_BLINK) { - TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z); - if(te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if(!ta.canBlockBeAccessed(player)) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); - return false; + TileEntity te = player.worldObj.getTileEntity(target.x, target.y, target.z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (ta.getRequiresPassword(player)) { + PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); + PacketHandler.INSTANCE.sendToServer(p); + return false; + } } - } - } - int requiredPower = 0; - requiredPower = getRequiredPower(player, source, coord); - if(requiredPower < 0) { - return false; - } - - if(!isInRangeTarget(player, coord, source.getMaxDistanceTravelledSq())) { - if(source != TravelSource.STAFF_BLINK) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); - } - return false; - } - if(!isValidTarget(player, coord, source)) { - if(source != TravelSource.STAFF_BLINK) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget")); - } - return false; - } - if(doClientTeleport(player, coord, source, requiredPower, conserveMomentum)) { - for (int i = 0; i < 6; ++i) { - player.worldObj.spawnParticle("portal", player.posX + (rand.nextDouble() - 0.5D), player.posY + rand.nextDouble() * player.height - 0.25D, - player.posZ + (rand.nextDouble() - 0.5D), (rand.nextDouble() - 0.5D) * 2.0D, -rand.nextDouble(), - (rand.nextDouble() - 0.5D) * 2.0D); - } - } - return true; - } - - public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) { - if(!isTravelItemActive(player)) { - return 0; - } - int requiredPower; - ItemStack staff = player.getCurrentEquippedItem(); - requiredPower = (int) (getDistance(player, coord) * source.getPowerCostPerBlockTraveledRF()); - int canUsePower = getEnergyInTravelItem(staff); - if(requiredPower > canUsePower) { - // make sure chat is sent only once per trial - if (!insufficientPower) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.itemTravelStaff.notEnoughPower")); - insufficientPower = true; - } - return -1; - } - return requiredPower; - } - - private boolean isInRangeTarget(EntityPlayer player, BlockCoord bc, float maxSq) { - return getDistanceSquared(player, bc) <= maxSq; - } - - private double getDistanceSquared(EntityPlayer player, BlockCoord bc) { - if(player == null || bc == null) { - return 0; - } - Vector3d eye = Util.getEyePositionEio(player); - Vector3d target = new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5); - return eye.distanceSquared(target); - } - - private double getDistance(EntityPlayer player, BlockCoord coord) { - return Math.sqrt(getDistanceSquared(player, coord)); - } - - private boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) { - if(bc == null) { - return false; - } - World w = player.worldObj; - BlockCoord baseLoc = bc; - if(source != TravelSource.STAFF_BLINK) { - //targeting a block so go one up - baseLoc = bc.getLocation(ForgeDirection.UP); - } - - return canTeleportTo(player, source, baseLoc, w) - && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w); - } - - private boolean canTeleportTo(EntityPlayer player, TravelSource source, BlockCoord bc, World w) { - if(bc.y < 1) { - return false; - } - if(source == TravelSource.STAFF_BLINK && !Config.travelStaffBlinkThroughSolidBlocksEnabled) { - Vec3 start = Util.getEyePosition(player); - Vec3 target = Vec3.createVectorHelper(bc.x + 0.5f, bc.y + 0.5f, bc.z + 0.5f); - if(!canBlinkTo(bc, w, start, target)) { + if (isTargetEnderIO()) { + openEnderIO(null, player.worldObj, player); + return true; + } else if (Config.travelAnchorEnabled && travelToSelectedTarget(player, TravelSource.BLOCK, false)) { + input.jump = false; + try { + ObfuscationReflectionHelper.setPrivateValue( + EntityPlayer.class, (EntityPlayer) player, 0, "flyToggleTimer", "field_71101_bC"); + } catch (Exception e) { + // ignore + } + return true; + } return false; - } } - Block block = w.getBlock(bc.x, bc.y, bc.z); - if(block == null || block.isAir(w, bc.x, bc.y, bc.z)) { - return true; - } - final AxisAlignedBB aabb = block.getCollisionBoundingBoxFromPool(w, bc.x, bc.y, bc.z); - return aabb == null || aabb.getAverageEdgeLength() < 0.7; - } + public double getScaleForCandidate(Vector3d loc) { - private boolean canBlinkTo(BlockCoord bc, World w, Vec3 start, Vec3 target) { - MovingObjectPosition p = w.rayTraceBlocks(start, target, !Config.travelStaffBlinkThroughClearBlocksEnabled); - if(p != null) { - if(!Config.travelStaffBlinkThroughClearBlocksEnabled) { - return false; - } - Block block = w.getBlock(p.blockX, p.blockY, p.blockZ); - if(isClear(w, block, p.blockX, p.blockY, p.blockZ)) { - if(new BlockCoord(p.blockX, p.blockY, p.blockZ).equals(bc)) { - return true; + if (!currentView.isValid()) { + return 1; } - //need to step - Vector3d sv = new Vector3d(start.xCoord, start.yCoord, start.zCoord); - Vector3d rayDir = new Vector3d(target.xCoord, target.yCoord, target.zCoord); - rayDir.sub(sv); - rayDir.normalize(); - rayDir.add(sv); - return canBlinkTo(bc, w, Vec3.createVectorHelper(rayDir.x, rayDir.y, rayDir.z), target); - } else { - return false; - } - } - return true; - } - - private boolean isClear(World w, Block block, int x, int y, int z) { - if(block == null || block.isAir(w, x, y, z)) { - return true; - } - final AxisAlignedBB aabb = block.getCollisionBoundingBoxFromPool(w, x, y, z); - if(aabb == null || aabb.getAverageEdgeLength() < 0.7) { - return true; - } - - return block.getLightOpacity(w, x, y, z) < 2; - } - - @SideOnly(Side.CLIENT) - private void updateVerticalTarget(EntityPlayer player, int direction) { - - BlockCoord currentBlock = getActiveTravelBlock(player); - World world = Minecraft.getMinecraft().theWorld; - for (int i = 0, y = currentBlock.y + direction; i < Config.travelAnchorMaxDistance && y >= 0 && y <= 255; i++, y += direction) { - - //Circumvents the raytracing used to find candidates on the y axis - TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z); - - if(selectedBlock instanceof ITravelAccessable) { - ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock; - BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z); - - if(Config.travelAnchorSkipWarning) { - if(travelBlock.getRequiresPassword(player)) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked")); - } - - if(travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE && !travelBlock.canUiBeAccessed(player)) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate")); - } - if(!isValidTarget(player, targetBlock, TravelSource.BLOCK)) { - player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed")); - } + BlockCoord bc = new BlockCoord(loc.x, loc.y, loc.z); + float ratio = -1; + Float r = candidates.get(bc); + if (r != null) { + ratio = r; } - if(travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) { - selectedCoord = targetBlock; - return; + if (ratio < 0) { + // no cached value + addRatio(bc); + ratio = candidates.get(bc); } - } - } - } - @SideOnly(Side.CLIENT) - private void updateSelectedTarget(EntityPlayer player) { - selectedCoord = null; - if(candidates.isEmpty()) { - return; - } + // smoothly zoom to a larger size, starting when the point is the middle 20% of the screen + float start = 0.2f; + float end = 0.01f; + double mix = MathHelper.clamp_float((start - ratio) / (start - end), 0, 1); + double scale = 1; + if (mix > 0) { - double closestDistance = Double.MAX_VALUE; - for (BlockCoord bc : candidates.keySet()) { - if(!bc.equals(onBlockCoord)) { + Vector3d eyePoint = Util.getEyePositionEio(EnderIO.proxy.getClientPlayer()); + scale = tanFovRad * eyePoint.distance(loc); - double d = addRatio(bc); - if(d < closestDistance) { - selectedCoord = bc; - closestDistance = d; + // Using this scale will give us the block full screen, we will make it 20% of the screen + scale *= Config.travelAnchorZoomScale; + + // only apply 70% of the scaling so more distance targets are still smaller than closer targets + float nf = 1 + - MathHelper.clamp_float( + (float) eyePoint.distanceSquared(loc) / TravelSource.STAFF.getMaxDistanceTravelledSq(), + 0, + 1); + scale = scale * (0.3 + 0.7 * nf); + + scale = (scale * mix) + (1 - mix); + scale = Math.max(1, scale); } - } + return scale; } - if(selectedCoord != null) { - - Vector3d blockCenter = new Vector3d(selectedCoord.x + 0.5, selectedCoord.y + 0.5, selectedCoord.z + 0.5); - Vector2d blockCenterPixel = currentView.getScreenPoint(blockCenter); - - Vector2d screenMidPixel = new Vector2d(Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); - screenMidPixel.scale(0.5); - - double pixDist = blockCenterPixel.distance(screenMidPixel); - double rat = pixDist / Minecraft.getMinecraft().displayHeight; - if(rat != rat) { - rat = 0; - } - if(rat > 0.07) { - selectedCoord = null; - } - - } - } - - @SideOnly(Side.CLIENT) - private boolean onInput(EntityClientPlayerMP player) { - - MovementInput input = player.movementInput; - BlockCoord target = TravelController.instance.selectedCoord; - if(target == null) { - return false; + @SideOnly(Side.CLIENT) + private double addRatio(BlockCoord bc) { + Vector2d sp = currentView.getScreenPoint(new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5)); + Vector2d mid = new Vector2d(Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); + mid.scale(0.5); + double d = sp.distance(mid); + if (d != d) { + d = 0f; + } + float ratio = (float) d / Minecraft.getMinecraft().displayWidth; + candidates.put(bc, ratio); + return d; } - TileEntity te = player.worldObj.getTileEntity(target.x, target.y, target.z); - if(te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if(ta.getRequiresPassword(player)) { - PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); + @SideOnly(Side.CLIENT) + private int getMaxTravelDistanceSqForPlayer(EntityPlayer player) { + if (isTravelItemActive(player)) { + return TravelSource.STAFF.getMaxDistanceTravelledSq(); + } + return TravelSource.BLOCK.getMaxDistanceTravelledSq(); + } + + @SideOnly(Side.CLIENT) + public boolean doClientTeleport( + Entity entity, BlockCoord bc, TravelSource source, int powerUse, boolean conserveMomentum) { + + TeleportEntityEvent evt = new TeleportEntityEvent(entity, source, bc.x, bc.y, bc.z); + if (MinecraftForge.EVENT_BUS.post(evt)) { + return false; + } + + bc = new BlockCoord(evt.targetX, evt.targetY, evt.targetZ); + PacketTravelEvent p = new PacketTravelEvent(entity, bc.x, bc.y, bc.z, powerUse, conserveMomentum, source); PacketHandler.INSTANCE.sendToServer(p); - return false; - } + return true; } - if(isTargetEnderIO()) { - openEnderIO(null, player.worldObj, player); - return true; - } else if(Config.travelAnchorEnabled && travelToSelectedTarget(player, TravelSource.BLOCK, false)) { - input.jump = false; - try { - ObfuscationReflectionHelper.setPrivateValue(EntityPlayer.class, (EntityPlayer) player, 0, "flyToggleTimer", "field_71101_bC"); - } catch (Exception e) { - //ignore - } - return true; - } - return false; - } - - public double getScaleForCandidate(Vector3d loc) { - - if(!currentView.isValid()) { - return 1; - } - - BlockCoord bc = new BlockCoord(loc.x, loc.y, loc.z); - float ratio = -1; - Float r = candidates.get(bc); - if(r != null) { - ratio = r; - } - if(ratio < 0) { - //no cached value - addRatio(bc); - ratio = candidates.get(bc); - } - - //smoothly zoom to a larger size, starting when the point is the middle 20% of the screen - float start = 0.2f; - float end = 0.01f; - double mix = MathHelper.clamp_float((start - ratio) / (start - end), 0, 1); - double scale = 1; - if(mix > 0) { - - Vector3d eyePoint = Util.getEyePositionEio(EnderIO.proxy.getClientPlayer()); - scale = tanFovRad * eyePoint.distance(loc); - - //Using this scale will give us the block full screen, we will make it 20% of the screen - scale *= Config.travelAnchorZoomScale; - - //only apply 70% of the scaling so more distance targets are still smaller than closer targets - float nf = 1 - MathHelper.clamp_float((float) eyePoint.distanceSquared(loc) / TravelSource.STAFF.getMaxDistanceTravelledSq(), 0, 1); - scale = scale * (0.3 + 0.7 * nf); - - scale = (scale * mix) + (1 - mix); - scale = Math.max(1, scale); - - } - return scale; - } - - @SideOnly(Side.CLIENT) - private double addRatio(BlockCoord bc) { - Vector2d sp = currentView.getScreenPoint(new Vector3d(bc.x + 0.5, bc.y + 0.5, bc.z + 0.5)); - Vector2d mid = new Vector2d(Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); - mid.scale(0.5); - double d = sp.distance(mid); - if(d != d) { - d = 0f; - } - float ratio = (float) d / Minecraft.getMinecraft().displayWidth; - candidates.put(bc, ratio); - return d; - } - - @SideOnly(Side.CLIENT) - private int getMaxTravelDistanceSqForPlayer(EntityPlayer player) { - if(isTravelItemActive(player)) { - return TravelSource.STAFF.getMaxDistanceTravelledSq(); - } - return TravelSource.BLOCK.getMaxDistanceTravelledSq(); - } - - @SideOnly(Side.CLIENT) - public boolean doClientTeleport(Entity entity, BlockCoord bc, TravelSource source, int powerUse, boolean conserveMomentum) { - - TeleportEntityEvent evt = new TeleportEntityEvent(entity, source, bc.x, bc.y, bc.z); - if(MinecraftForge.EVENT_BUS.post(evt)) { - return false; - } - - bc = new BlockCoord(evt.targetX, evt.targetY, evt.targetZ); - PacketTravelEvent p = new PacketTravelEvent(entity, bc.x, bc.y, bc.z, powerUse, conserveMomentum, source); - PacketHandler.INSTANCE.sendToServer(p); - return true; - } - - @SideOnly(Side.CLIENT) - private BlockCoord getActiveTravelBlock(EntityPlayer player) { - World world = Minecraft.getMinecraft().theWorld; - if(world != null && player != null) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.boundingBox.minY) - 1; - int z = MathHelper.floor_double(player.posZ); - TileEntity tileEntity = world.getTileEntity(x, y, z); - if(tileEntity instanceof ITravelAccessable) { - if (((ITravelAccessable) tileEntity).isTravelSource()) { - return new BlockCoord(x, y, z); + @SideOnly(Side.CLIENT) + private BlockCoord getActiveTravelBlock(EntityPlayer player) { + World world = Minecraft.getMinecraft().theWorld; + if (world != null && player != null) { + int x = MathHelper.floor_double(player.posX); + int y = MathHelper.floor_double(player.boundingBox.minY) - 1; + int z = MathHelper.floor_double(player.posZ); + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity instanceof ITravelAccessable) { + if (((ITravelAccessable) tileEntity).isTravelSource()) { + return new BlockCoord(x, y, z); + } + } } - } + return null; } - return null; - } - } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 9896afc5..5b4e98e6 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -1,27 +1,8 @@ package crazypants.enderio.teleport.anchor; -import javax.annotation.Nullable; - -import crazypants.enderio.teleport.packet.PacketVisibility; -import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.UsernameCache; -import net.minecraftforge.common.util.ForgeDirection; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.util.ChatUtil; - import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,242 +29,272 @@ import crazypants.enderio.teleport.packet.PacketLabel; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketPassword; import crazypants.enderio.teleport.packet.PacketTravelEvent; +import crazypants.enderio.teleport.packet.PacketVisibility; import crazypants.util.IFacade; import crazypants.util.UserIdent; +import javax.annotation.Nullable; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEntityProvider, IResourceTooltipProvider, IFacade { +public class BlockTravelAnchor extends BlockEio + implements IGuiHandler, ITileEntityProvider, IResourceTooltipProvider, IFacade { - public static int renderId = -1; + public static int renderId = -1; - public static BlockTravelAnchor create() { + public static BlockTravelAnchor create() { - PacketHandler.INSTANCE.registerMessage(PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketPassword.Handler.class, PacketPassword.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketVisibility.class, PacketVisibility.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketPassword.Handler.class, PacketPassword.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage( + PacketVisibility.class, PacketVisibility.class, PacketHandler.nextID(), Side.SERVER); - BlockTravelAnchor result = new BlockTravelAnchor(); - result.init(); + BlockTravelAnchor result = new BlockTravelAnchor(); + result.init(); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, result); - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TRAVEL_AUTH, result); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, result.new PainterTemplate()); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, result); + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TRAVEL_AUTH, result); + MachineRecipeRegistry.instance.registerRecipe( + ModObject.blockPainter.unlocalisedName, result.new PainterTemplate()); - return result; - } - - IIcon selectedOverlayIcon; - IIcon highlightOverlayIcon; - - private BlockTravelAnchor() { - super(ModObject.blockTravelAnchor.unlocalisedName, TileTravelAnchor.class); - if (!Config.travelAnchorEnabled) { - setCreativeTab(null); - } - } - - public BlockTravelAnchor(String unlocalisedName, Class teClass) { - super(unlocalisedName, teClass); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iIconRegister) { - super.registerBlockIcons(iIconRegister); - highlightOverlayIcon = iIconRegister.registerIcon("enderio:blockTravelAnchorHighlight"); - selectedOverlayIcon = iIconRegister.registerIcon("enderio:blockTravelAnchorSelected"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IPaintableTileEntity) { - Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); - if (sourceBlock != null && sourceBlock != this) { - return sourceBlock.getIcon(blockSide, ((IPaintableTileEntity) te).getSourceBlockMetadata()); - } - } - return super.getIcon(world, x, y, z, blockSide); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileTravelAnchor(); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack par6ItemStack) { - if (entity instanceof EntityPlayer) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - TileTravelAnchor ta = (TileTravelAnchor) te; - ta.setPlacedBy((EntityPlayer) entity); - Block b = PainterUtil.getSourceBlock(par6ItemStack); - ta.setSourceBlock(b); - ta.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par6ItemStack)); - world.markBlockForUpdate(x, y, z); - } - } - } - - @Override - public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (!world.isRemote && te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if (ta.canUiBeAccessed(entityPlayer)) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } else { - sendPrivateChatMessage(entityPlayer, ta.getOwner()); - } - } - return true; - } - - public static void sendPrivateChatMessage(EntityPlayer player, UserIdent owner) { - if (!player.isSneaking()) { - ChatUtil.sendNoSpam(player, EnderIO.lang.localize("gui.travelAccessable.privateBlock1") + " " + EnumChatFormatting.RED - + owner.getPlayerName() + EnumChatFormatting.WHITE + " " + EnderIO.lang.localize("gui.travelAccessable.privateBlock2")); - } - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof ITravelAccessable) { - if (ID == GuiHandler.GUI_ID_TRAVEL_ACCESSABLE) { - return new ContainerTravelAccessable(player.inventory, (ITravelAccessable) te, world); - } else { - return new ContainerTravelAuth(player.inventory); - } - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof ITravelAccessable) { - if (ID == GuiHandler.GUI_ID_TRAVEL_ACCESSABLE) { - return new GuiTravelAccessable(player.inventory, (ITravelAccessable) te, world); - } else { - return new GuiTravelAuth(player, (ITravelAccessable) te, world); - } - } - return null; - } - - @Override - protected void processDrop(World world, int x, int y, int z, @Nullable TileEntityEnder te, ItemStack drop) { - TileTravelAnchor anchor = (TileTravelAnchor) te; - - if (anchor == null) { - return; + return result; } - ItemStack itemStack = new ItemStack(this); - Block srcBlk = anchor.getSourceBlock(); - if (srcBlk != null) { - itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); - drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); + IIcon selectedOverlayIcon; + IIcon highlightOverlayIcon; + + private BlockTravelAnchor() { + super(ModObject.blockTravelAnchor.unlocalisedName, TileTravelAnchor.class); + if (!Config.travelAnchorEnabled) { + setCreativeTab(null); + } } - } - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IPaintableTileEntity) { - Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); - if (sourceBlock != null && sourceBlock != this) { - return sourceBlock.colorMultiplier(world, x, y, z); - } - } - return super.colorMultiplier(world, x, y, z); - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } - - public ItemStack createItemStackForSourceBlock(Block block, int damage) { - if (block == this) { - return new ItemStack(this); - } - ItemStack result = new ItemStack(this, 1, damage); - PainterUtil.setSourceBlock(result, block, damage); - return result; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - public final class PainterTemplate extends BasicPainterTemplate { - - public PainterTemplate() { - super(BlockTravelAnchor.this); + public BlockTravelAnchor(String unlocalisedName, Class teClass) { + super(unlocalisedName, teClass); } @Override - public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { - ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); - if (paintSource == null) { - return new ResultStack[0]; - } - return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) }; + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + highlightOverlayIcon = iIconRegister.registerIcon("enderio:blockTravelAnchorHighlight"); + selectedOverlayIcon = iIconRegister.registerIcon("enderio:blockTravelAnchorSelected"); } - } - @Override - public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - return ((TileTravelAnchor) te).getSourceBlockMetadata(); + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); + if (sourceBlock != null && sourceBlock != this) { + return sourceBlock.getIcon(blockSide, ((IPaintableTileEntity) te).getSourceBlockMetadata()); + } + } + return super.getIcon(world, x, y, z, blockSide); } - return 0; - } - @Override - public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IPaintableTileEntity) { - Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); - if (sourceBlock != null) { - return sourceBlock; - } + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return new TileTravelAnchor(); } - return this; - } - @Override - public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacade(world, x, y, z, side.ordinal()); - } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack par6ItemStack) { + if (entity instanceof EntityPlayer) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTravelAnchor) { + TileTravelAnchor ta = (TileTravelAnchor) te; + ta.setPlacedBy((EntityPlayer) entity); + Block b = PainterUtil.getSourceBlock(par6ItemStack); + ta.setSourceBlock(b); + ta.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(par6ItemStack)); + world.markBlockForUpdate(x, y, z); + } + } + } - @Override - public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return getFacadeMetadata(world, x, y, z, side.ordinal()); - } + @Override + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (!world.isRemote && te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (ta.canUiBeAccessed(entityPlayer)) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); + } else { + sendPrivateChatMessage(entityPlayer, ta.getOwner()); + } + } + return true; + } - @Override - public boolean supportsVisualConnections() { - return true; - } + public static void sendPrivateChatMessage(EntityPlayer player, UserIdent owner) { + if (!player.isSneaking()) { + ChatUtil.sendNoSpam( + player, + EnderIO.lang.localize("gui.travelAccessable.privateBlock1") + " " + EnumChatFormatting.RED + + owner.getPlayerName() + EnumChatFormatting.WHITE + " " + + EnderIO.lang.localize("gui.travelAccessable.privateBlock2")); + } + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITravelAccessable) { + if (ID == GuiHandler.GUI_ID_TRAVEL_ACCESSABLE) { + return new ContainerTravelAccessable(player.inventory, (ITravelAccessable) te, world); + } else { + return new ContainerTravelAuth(player.inventory); + } + } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITravelAccessable) { + if (ID == GuiHandler.GUI_ID_TRAVEL_ACCESSABLE) { + return new GuiTravelAccessable(player.inventory, (ITravelAccessable) te, world); + } else { + return new GuiTravelAuth(player, (ITravelAccessable) te, world); + } + } + return null; + } + + @Override + protected void processDrop(World world, int x, int y, int z, @Nullable TileEntityEnder te, ItemStack drop) { + TileTravelAnchor anchor = (TileTravelAnchor) te; + + if (anchor == null) { + return; + } + + ItemStack itemStack = new ItemStack(this); + Block srcBlk = anchor.getSourceBlock(); + if (srcBlk != null) { + itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); + } + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); + if (sourceBlock != null && sourceBlock != this) { + return sourceBlock.colorMultiplier(world, x, y, z); + } + } + return super.colorMultiplier(world, x, y, z); + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + public ItemStack createItemStackForSourceBlock(Block block, int damage) { + if (block == this) { + return new ItemStack(this); + } + ItemStack result = new ItemStack(this, 1, damage); + PainterUtil.setSourceBlock(result, block, damage); + return result; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + public final class PainterTemplate extends BasicPainterTemplate { + + public PainterTemplate() { + super(BlockTravelAnchor.this); + } + + @Override + public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) { + ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs); + if (paintSource == null) { + return new ResultStack[0]; + } + return new ResultStack[] { + new ResultStack(createItemStackForSourceBlock( + Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) + }; + } + } + + @Override + public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileTravelAnchor) { + return ((TileTravelAnchor) te).getSourceBlockMetadata(); + } + return 0; + } + + @Override + public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof IPaintableTileEntity) { + Block sourceBlock = ((IPaintableTileEntity) te).getSourceBlock(); + if (sourceBlock != null) { + return sourceBlock; + } + } + return this; + } + + @Override + public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacade(world, x, y, z, side.ordinal()); + } + + @Override + public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return getFacadeMetadata(world, x, y, z, side.ordinal()); + } + + @Override + public boolean supportsVisualConnections() { + return true; + } } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index a95accc4..5e49179f 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -1,21 +1,5 @@ package crazypants.enderio.teleport.anchor; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; - -import com.enderio.core.common.util.PlayerUtil; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.TileEntityEio; @@ -23,315 +7,326 @@ import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.machine.painter.IPaintableTileEntity; import crazypants.util.UserIdent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import javax.annotation.Nonnull; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable, IPaintableTileEntity { - private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock"; - private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; - - private Block sourceBlock; - private int sourceBlockMetadata; + private static final String KEY_SOURCE_BLOCK_ID = "sourceBlock"; + private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; - private AccessMode accessMode = AccessMode.PUBLIC; + private Block sourceBlock; + private int sourceBlockMetadata; - private ItemStack[] password = new ItemStack[5]; - - private ItemStack itemLabel; - - private String label; + private AccessMode accessMode = AccessMode.PUBLIC; - private @Nonnull UserIdent owner = UserIdent.nobody; + private ItemStack[] password = new ItemStack[5]; - private List authorisedUsers = new ArrayList(); + private ItemStack itemLabel; - private boolean visible = true; + private String label; - private boolean isAuthorisedUser(UserIdent ident) { - return authorisedUsers.contains(ident); - } + private @Nonnull UserIdent owner = UserIdent.nobody; - private boolean isOwnerUser(UserIdent ident) { - return owner.equals(ident); - } + private List authorisedUsers = new ArrayList(); - @Override - public boolean canBlockBeAccessed(EntityPlayer playerName) { - if(accessMode == AccessMode.PUBLIC) { - return true; + private boolean visible = true; + + private boolean isAuthorisedUser(UserIdent ident) { + return authorisedUsers.contains(ident); } - // Covers protected and private access modes - return isOwnerUser(UserIdent.create(playerName.getGameProfile())) || isAuthorisedUser(UserIdent.create(playerName.getGameProfile())); - } - - @Override - public void clearAuthorisedUsers() { - authorisedUsers.clear(); - } - - private boolean checkPassword(ItemStack[] pwd) { - if(pwd == null || pwd.length != password.length) { - return false; + private boolean isOwnerUser(UserIdent ident) { + return owner.equals(ident); } - for (int i = 0; i < pwd.length; i++) { - ItemStack pw = password[i]; - ItemStack tst = pwd[i]; - if(pw == null && tst != null) { + + @Override + public boolean canBlockBeAccessed(EntityPlayer playerName) { + if (accessMode == AccessMode.PUBLIC) { + return true; + } + // Covers protected and private access modes + return isOwnerUser(UserIdent.create(playerName.getGameProfile())) + || isAuthorisedUser(UserIdent.create(playerName.getGameProfile())); + } + + @Override + public void clearAuthorisedUsers() { + authorisedUsers.clear(); + } + + private boolean checkPassword(ItemStack[] pwd) { + if (pwd == null || pwd.length != password.length) { + return false; + } + for (int i = 0; i < pwd.length; i++) { + ItemStack pw = password[i]; + ItemStack tst = pwd[i]; + if (pw == null && tst != null) { + return false; + } + if (pw != null) { + if (tst == null || !ItemStack.areItemStacksEqual(pw, tst)) { + return false; + } + } + } + return true; + } + + @Override + public boolean getRequiresPassword(EntityPlayer playerName) { + return getAccessMode() == AccessMode.PROTECTED + && !canUiBeAccessed(playerName) + && !isAuthorisedUser(UserIdent.create(playerName.getGameProfile())); + } + + @Override + public boolean authoriseUser(EntityPlayer username, ItemStack[] password) { + if (checkPassword(password)) { + authorisedUsers.add(UserIdent.create(username.getGameProfile())); + return true; + } return false; - } - if(pw != null) { - if(tst == null || !ItemStack.areItemStacksEqual(pw, tst)) { - return false; + } + + @Override + public boolean canUiBeAccessed(EntityPlayer playerName) { + return isOwnerUser(UserIdent.create(playerName.getGameProfile())); + } + + @Override + public boolean canSeeBlock(EntityPlayer playerName) { + if (accessMode != AccessMode.PRIVATE) { + return true; } - } + return isOwnerUser(UserIdent.create(playerName.getGameProfile())); } - return true; - } - @Override - public boolean getRequiresPassword(EntityPlayer playerName) { - return getAccessMode() == AccessMode.PROTECTED && !canUiBeAccessed(playerName) - && !isAuthorisedUser(UserIdent.create(playerName.getGameProfile())); - } - - @Override - public boolean authoriseUser(EntityPlayer username, ItemStack[] password) { - if(checkPassword(password)) { - authorisedUsers.add(UserIdent.create(username.getGameProfile())); - return true; + @Override + public AccessMode getAccessMode() { + return accessMode; } - return false; - } - @Override - public boolean canUiBeAccessed(EntityPlayer playerName) { - return isOwnerUser(UserIdent.create(playerName.getGameProfile())); - } - - @Override - public boolean canSeeBlock(EntityPlayer playerName) { - if(accessMode != AccessMode.PRIVATE) { - return true; + @Override + public void setAccessMode(AccessMode accessMode) { + this.accessMode = accessMode; } - return isOwnerUser(UserIdent.create(playerName.getGameProfile())); - } - @Override - public AccessMode getAccessMode() { - return accessMode; - } - - @Override - public void setAccessMode(AccessMode accessMode) { - this.accessMode = accessMode; - } - - @Override - public ItemStack[] getPassword() { - return password; - } - - @Override - public void setPassword(ItemStack[] password) { - this.password = password; - } - - @Override - public ItemStack getItemLabel() { - return itemLabel; - } - - @Override - public void setItemLabel(ItemStack lableIcon) { - this.itemLabel = lableIcon; - } - - @Override - public String getLabel() { - return label; - } - - @Override - public void setLabel(String label) { - this.label = label; - } - - @Override - @Deprecated - public UUID getPlacedBy() { - return owner.getUUID(); - } - - @Override - public @Nonnull UserIdent getOwner() { - return owner; - } - - @Override - public void setPlacedBy(EntityPlayer player) { - if (player != null) { - this.owner = UserIdent.create(player.getGameProfile()); - } else { - this.owner = UserIdent.nobody; + @Override + public ItemStack[] getPassword() { + return password; } - } - @Override - public boolean shouldUpdate() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public double getMaxRenderDistanceSquared() { - return TravelSource.getMaxDistanceSq(); - } - - @Override - public boolean shouldRenderInPass(int pass) { - return pass == 1; - } - - @Override - public Block getSourceBlock() { - return sourceBlock; - } - - @Override - public void setSourceBlock(Block sourceBlock) { - this.sourceBlock = sourceBlock; - } - - @Override - public int getSourceBlockMetadata() { - return sourceBlockMetadata; - } - - @Override - public void setSourceBlockMetadata(int sourceBlockMetadata) { - this.sourceBlockMetadata = sourceBlockMetadata; - } - - @Override - protected void readCustomNBT(NBTTagCompound root) { - if(root.hasKey("accessMode")) { - accessMode = AccessMode.values()[root.getShort("accessMode")]; - } else { - //keep behavior the same for blocks placed prior to this update - accessMode = AccessMode.PUBLIC; + @Override + public void setPassword(ItemStack[] password) { + this.password = password; } - if (root.hasKey("visible")) { - visible = root.getBoolean("visible"); - } else { - visible = true; + + @Override + public ItemStack getItemLabel() { + return itemLabel; } - if (root.hasKey("placedBy")) { - owner = UserIdent.create(root.getString("placedBy")); - } else { - owner = UserIdent.readfromNbt(root, "owner"); + + @Override + public void setItemLabel(ItemStack lableIcon) { + this.itemLabel = lableIcon; } - for (int i = 0; i < password.length; i++) { - if(root.hasKey("password" + i)) { - NBTTagCompound stackRoot = (NBTTagCompound) root.getTag("password" + i); - password[i] = ItemStack.loadItemStackFromNBT(stackRoot); - } else { - password[i] = null; - } + + @Override + public String getLabel() { + return label; } - authorisedUsers.clear(); - if (root.hasKey("authorisedUsers")) { - String userStr = root.getString("authorisedUsers"); - if(userStr != null && userStr.length() > 0) { - String[] users = userStr.split(","); - for (String user : users) { - if(user != null) { - user = user.trim(); - if(user.length() > 0) { - authorisedUsers.add(UserIdent.create(user)); - } + + @Override + public void setLabel(String label) { + this.label = label; + } + + @Override + @Deprecated + public UUID getPlacedBy() { + return owner.getUUID(); + } + + @Override + public @Nonnull UserIdent getOwner() { + return owner; + } + + @Override + public void setPlacedBy(EntityPlayer player) { + if (player != null) { + this.owner = UserIdent.create(player.getGameProfile()); + } else { + this.owner = UserIdent.nobody; } - } } - } else { - int userIdx = 0; - while (UserIdent.existsInNbt(root, "authorisedUser" + userIdx)) { - UserIdent.readfromNbt(root, "authorisedUser" + userIdx); - userIdx++; - } - } - if(root.hasKey("itemLabel")) { - NBTTagCompound stackRoot = (NBTTagCompound) root.getTag("itemLabel"); - itemLabel = ItemStack.loadItemStackFromNBT(stackRoot); - } else { - itemLabel = null; - } - - String sourceBlockStr = root.getString(KEY_SOURCE_BLOCK_ID); - sourceBlock = Block.getBlockFromName(sourceBlockStr); - sourceBlockMetadata = root.getInteger(KEY_SOURCE_BLOCK_META); - - label = root.getString("label"); - if(label == null || label.trim().length() == 0) { - label = null; - } - } - @Override - protected void writeCustomNBT(NBTTagCompound root) { - root.setShort("accessMode", (short) accessMode.ordinal()); - root.setBoolean("visible", visible); - owner.saveToNbt(root, "owner"); - for (int i = 0; i < password.length; i++) { - ItemStack stack = password[i]; - if(stack != null) { - NBTTagCompound stackRoot = new NBTTagCompound(); - stack.writeToNBT(stackRoot); - root.setTag("password" + i, stackRoot); - } + @Override + public boolean shouldUpdate() { + return false; } - int userIdx = 0; - for (UserIdent user : authorisedUsers) { - if(user != null) { - user.saveToNbt(root, "authorisedUser" + userIdx); - userIdx++; - } - } - if(itemLabel != null) { - NBTTagCompound labelRoot = new NBTTagCompound(); - itemLabel.writeToNBT(labelRoot); - root.setTag("itemLabel", labelRoot); - } - - if(sourceBlock != null) { - root.setString(KEY_SOURCE_BLOCK_ID, Block.blockRegistry.getNameForObject(sourceBlock)); - } - root.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); - - if(label != null && label.trim().length() > 0) { - root.setString("label", label); - } - - } - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound tag = new NBTTagCompound(); - writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); - } - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readCustomNBT(pkt.func_148857_g()); - } + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() { + return TravelSource.getMaxDistanceSq(); + } - @Override - public boolean isVisible() { - return visible; - } + @Override + public boolean shouldRenderInPass(int pass) { + return pass == 1; + } - @Override - public void setVisible(boolean visible) { - this.visible = visible; - } + @Override + public Block getSourceBlock() { + return sourceBlock; + } + + @Override + public void setSourceBlock(Block sourceBlock) { + this.sourceBlock = sourceBlock; + } + + @Override + public int getSourceBlockMetadata() { + return sourceBlockMetadata; + } + + @Override + public void setSourceBlockMetadata(int sourceBlockMetadata) { + this.sourceBlockMetadata = sourceBlockMetadata; + } + + @Override + protected void readCustomNBT(NBTTagCompound root) { + if (root.hasKey("accessMode")) { + accessMode = AccessMode.values()[root.getShort("accessMode")]; + } else { + // keep behavior the same for blocks placed prior to this update + accessMode = AccessMode.PUBLIC; + } + if (root.hasKey("visible")) { + visible = root.getBoolean("visible"); + } else { + visible = true; + } + if (root.hasKey("placedBy")) { + owner = UserIdent.create(root.getString("placedBy")); + } else { + owner = UserIdent.readfromNbt(root, "owner"); + } + for (int i = 0; i < password.length; i++) { + if (root.hasKey("password" + i)) { + NBTTagCompound stackRoot = (NBTTagCompound) root.getTag("password" + i); + password[i] = ItemStack.loadItemStackFromNBT(stackRoot); + } else { + password[i] = null; + } + } + authorisedUsers.clear(); + if (root.hasKey("authorisedUsers")) { + String userStr = root.getString("authorisedUsers"); + if (userStr != null && userStr.length() > 0) { + String[] users = userStr.split(","); + for (String user : users) { + if (user != null) { + user = user.trim(); + if (user.length() > 0) { + authorisedUsers.add(UserIdent.create(user)); + } + } + } + } + } else { + int userIdx = 0; + while (UserIdent.existsInNbt(root, "authorisedUser" + userIdx)) { + UserIdent.readfromNbt(root, "authorisedUser" + userIdx); + userIdx++; + } + } + if (root.hasKey("itemLabel")) { + NBTTagCompound stackRoot = (NBTTagCompound) root.getTag("itemLabel"); + itemLabel = ItemStack.loadItemStackFromNBT(stackRoot); + } else { + itemLabel = null; + } + + String sourceBlockStr = root.getString(KEY_SOURCE_BLOCK_ID); + sourceBlock = Block.getBlockFromName(sourceBlockStr); + sourceBlockMetadata = root.getInteger(KEY_SOURCE_BLOCK_META); + + label = root.getString("label"); + if (label == null || label.trim().length() == 0) { + label = null; + } + } + + @Override + protected void writeCustomNBT(NBTTagCompound root) { + root.setShort("accessMode", (short) accessMode.ordinal()); + root.setBoolean("visible", visible); + owner.saveToNbt(root, "owner"); + for (int i = 0; i < password.length; i++) { + ItemStack stack = password[i]; + if (stack != null) { + NBTTagCompound stackRoot = new NBTTagCompound(); + stack.writeToNBT(stackRoot); + root.setTag("password" + i, stackRoot); + } + } + int userIdx = 0; + for (UserIdent user : authorisedUsers) { + if (user != null) { + user.saveToNbt(root, "authorisedUser" + userIdx); + userIdx++; + } + } + if (itemLabel != null) { + NBTTagCompound labelRoot = new NBTTagCompound(); + itemLabel.writeToNBT(labelRoot); + root.setTag("itemLabel", labelRoot); + } + + if (sourceBlock != null) { + root.setString(KEY_SOURCE_BLOCK_ID, Block.blockRegistry.getNameForObject(sourceBlock)); + } + root.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); + + if (label != null && label.trim().length() > 0) { + root.setString("label", label); + } + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound tag = new NBTTagCompound(); + writeCustomNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + readCustomNBT(pkt.func_148857_g()); + } + + @Override + public boolean isVisible() { + return visible; + } + + @Override + public void setVisible(boolean visible) { + this.visible = visible; + } } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java index 63a7ac58..666ee471 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java @@ -1,19 +1,5 @@ package crazypants.enderio.teleport.anchor; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.lwjgl.opengl.GL14; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; @@ -22,200 +8,210 @@ import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector3f; import com.enderio.core.common.vecmath.Vector4f; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.teleport.TravelController; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.GL14; @SideOnly(Side.CLIENT) public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer { - private final Vector4f selectedColor; - private final Vector4f highlightColor; + private final Vector4f selectedColor; + private final Vector4f highlightColor; - public TravelEntitySpecialRenderer() { - this(new Vector4f(1, 0.25f, 0, 0.5f), new Vector4f(1, 1, 1, 0.25f)); - } - - public TravelEntitySpecialRenderer(Vector4f selectedColor, Vector4f highlightColor) { - this.selectedColor = selectedColor; - this.highlightColor = highlightColor; - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - - if(!TravelController.instance.showTargets()) { - return; + public TravelEntitySpecialRenderer() { + this(new Vector4f(1, 0.25f, 0, 0.5f), new Vector4f(1, 1, 1, 0.25f)); } - ITravelAccessable ta = (ITravelAccessable) tileentity; - - if (!ta.isVisible()) { - return; + public TravelEntitySpecialRenderer(Vector4f selectedColor, Vector4f highlightColor) { + this.selectedColor = selectedColor; + this.highlightColor = highlightColor; } - BlockCoord onBlock = TravelController.instance.onBlockCoord; - if(onBlock != null && onBlock.equals(ta.getLocation())) { - return; - } - if(!ta.canSeeBlock(Minecraft.getMinecraft().thePlayer)) { - return; - } + @Override + public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - Vector3d eye = Util.getEyePositionEio(Minecraft.getMinecraft().thePlayer); - Vector3d loc = new Vector3d(tileentity.xCoord + 0.5, tileentity.yCoord + 0.5, tileentity.zCoord + 0.5); - double maxDistance = TravelController.instance.isTravelItemActive(Minecraft.getMinecraft().thePlayer) ? TravelSource.STAFF.getMaxDistanceTravelledSq() - : TravelSource.BLOCK.getMaxDistanceTravelledSq(); - if(eye.distanceSquared(loc) > maxDistance) { - return; - } - - double sf = TravelController.instance.getScaleForCandidate(loc); - - BlockCoord bc = new BlockCoord(tileentity); - TravelController.instance.addCandidate(bc); - - Minecraft.getMinecraft().entityRenderer.disableLightmap(0); - - RenderUtil.bindBlockTexture(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDisable(GL11.GL_LIGHTING); - - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glColor3f(1, 1, 1); - - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - - Tessellator.instance.startDrawingQuads(); - renderBlock(tileentity.getWorldObj(), sf); - Tessellator.instance.draw(); - - Tessellator.instance.startDrawingQuads(); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - if(TravelController.instance.isBlockSelected(bc)) { - Tessellator.instance.setColorRGBA_F(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getSelectedIcon()); - } else { - Tessellator.instance.setColorRGBA_F(highlightColor.x, highlightColor.y, highlightColor.z, highlightColor.w); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getHighlightIcon()); - } - Tessellator.instance.draw(); - GL11.glPopMatrix(); - - renderLabel(tileentity, x, y, z, ta, sf); - - GL11.glPopAttrib(); - GL11.glPopAttrib(); - - Minecraft.getMinecraft().entityRenderer.enableLightmap(0); - - } - - private EntityItem ei; - - private void renderLabel(TileEntity tileentity, double x, double y, double z, ITravelAccessable ta, double sf) { - float globalScale = (float) sf; - ItemStack itemLabel = ta.getItemLabel(); - if (itemLabel != null && itemLabel.getItem() != null) { - - boolean isBlock = itemLabel.getItem() instanceof ItemBlock; - - float alpha = 0.5f; - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_CONSTANT_COLOR); - float col = 0.5f; - GL14.glBlendColor(col, col, col, col); - GL11.glColor4f(1, 1, 1, 1); - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); - if (!isBlock && Minecraft.getMinecraft().gameSettings.fancyGraphics) { - RenderUtil.rotateToPlayer(); + if (!TravelController.instance.showTargets()) { + return; } - { - GL11.glPushMatrix(); - GL11.glScalef(globalScale, globalScale, globalScale); + ITravelAccessable ta = (ITravelAccessable) tileentity; - { - GL11.glPushMatrix(); - if (isBlock) { - GL11.glTranslatef(0f, -0.25f, 0); - } else { - GL11.glTranslatef(0f, -0.5f, 0); + if (!ta.isVisible()) { + return; + } + + BlockCoord onBlock = TravelController.instance.onBlockCoord; + if (onBlock != null && onBlock.equals(ta.getLocation())) { + return; + } + if (!ta.canSeeBlock(Minecraft.getMinecraft().thePlayer)) { + return; + } + + Vector3d eye = Util.getEyePositionEio(Minecraft.getMinecraft().thePlayer); + Vector3d loc = new Vector3d(tileentity.xCoord + 0.5, tileentity.yCoord + 0.5, tileentity.zCoord + 0.5); + double maxDistance = TravelController.instance.isTravelItemActive(Minecraft.getMinecraft().thePlayer) + ? TravelSource.STAFF.getMaxDistanceTravelledSq() + : TravelSource.BLOCK.getMaxDistanceTravelledSq(); + if (eye.distanceSquared(loc) > maxDistance) { + return; + } + + double sf = TravelController.instance.getScaleForCandidate(loc); + + BlockCoord bc = new BlockCoord(tileentity); + TravelController.instance.addCandidate(bc); + + Minecraft.getMinecraft().entityRenderer.disableLightmap(0); + + RenderUtil.bindBlockTexture(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_LIGHTING); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glColor3f(1, 1, 1); + + GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + + Tessellator.instance.startDrawingQuads(); + renderBlock(tileentity.getWorldObj(), sf); + Tessellator.instance.draw(); + + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setBrightness(15 << 20 | 15 << 4); + if (TravelController.instance.isBlockSelected(bc)) { + Tessellator.instance.setColorRGBA_F(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getSelectedIcon()); + } else { + Tessellator.instance.setColorRGBA_F(highlightColor.x, highlightColor.y, highlightColor.z, highlightColor.w); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf + 0.05, sf + 0.05, sf + 0.05), getHighlightIcon()); + } + Tessellator.instance.draw(); + GL11.glPopMatrix(); + + renderLabel(tileentity, x, y, z, ta, sf); + + GL11.glPopAttrib(); + GL11.glPopAttrib(); + + Minecraft.getMinecraft().entityRenderer.enableLightmap(0); + } + + private EntityItem ei; + + private void renderLabel(TileEntity tileentity, double x, double y, double z, ITravelAccessable ta, double sf) { + float globalScale = (float) sf; + ItemStack itemLabel = ta.getItemLabel(); + if (itemLabel != null && itemLabel.getItem() != null) { + + boolean isBlock = itemLabel.getItem() instanceof ItemBlock; + + float alpha = 0.5f; + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_CONSTANT_COLOR); + float col = 0.5f; + GL14.glBlendColor(col, col, col, col); + GL11.glColor4f(1, 1, 1, 1); + { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); + if (!isBlock && Minecraft.getMinecraft().gameSettings.fancyGraphics) { + RenderUtil.rotateToPlayer(); + } + + { + GL11.glPushMatrix(); + GL11.glScalef(globalScale, globalScale, globalScale); + + { + GL11.glPushMatrix(); + if (isBlock) { + GL11.glTranslatef(0f, -0.25f, 0); + } else { + GL11.glTranslatef(0f, -0.5f, 0); + } + + GL11.glScalef(2, 2, 2); + + if (ei == null) { + ei = new EntityItem(tileentity.getWorldObj(), x, y, z, itemLabel); + } else { + ei.setEntityItemStack(itemLabel); + } + RenderUtil.render3DItem(ei, false); + GL11.glPopMatrix(); + } + GL11.glPopMatrix(); + } + GL11.glPopMatrix(); + } + } + + String toRender = ta.getLabel(); + if (toRender != null && toRender.trim().length() > 0) { + GL11.glColor4f(1, 1, 1, 1); + Vector4f bgCol = RenderUtil.DEFAULT_TEXT_BG_COL; + if (TravelController.instance.isBlockSelected(new BlockCoord(tileentity))) { + bgCol = new Vector4f(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w); } - GL11.glScalef(2, 2, 2); - - if (ei == null) { - ei = new EntityItem(tileentity.getWorldObj(), x, y, z, itemLabel); - } else { - ei.setEntityItemStack(itemLabel); + { + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); + { + GL11.glPushMatrix(); + GL11.glScalef(globalScale, globalScale, globalScale); + Vector3f pos = new Vector3f(0, 1.2f, 0); + float size = 0.5f; + RenderUtil.drawBillboardedText(pos, toRender, size, bgCol); + GL11.glPopMatrix(); + } + GL11.glPopMatrix(); } - RenderUtil.render3DItem(ei, false); - GL11.glPopMatrix(); - } - GL11.glPopMatrix(); } - GL11.glPopMatrix(); - } } - String toRender = ta.getLabel(); - if (toRender != null && toRender.trim().length() > 0) { - GL11.glColor4f(1, 1, 1, 1); - Vector4f bgCol = RenderUtil.DEFAULT_TEXT_BG_COL; - if (TravelController.instance.isBlockSelected(new BlockCoord(tileentity))) { - bgCol = new Vector4f(selectedColor.x, selectedColor.y, selectedColor.z, selectedColor.w); - } - - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.5f, (float) z + 0.5f); - { - GL11.glPushMatrix(); - GL11.glScalef(globalScale, globalScale, globalScale); - Vector3f pos = new Vector3f(0, 1.2f, 0); - float size = 0.5f; - RenderUtil.drawBillboardedText(pos, toRender, size, bgCol); - GL11.glPopMatrix(); - } - GL11.glPopMatrix(); - } + protected void renderBlock(IBlockAccess world, double sf) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTravelPlatform.getIcon(0, 0)); } - } - protected void renderBlock(IBlockAccess world, double sf) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTravelPlatform.getIcon(0, 0)); - } + public Vector4f getSelectedColor() { + return selectedColor; + } - public Vector4f getSelectedColor() { - return selectedColor; - } + public IIcon getSelectedIcon() { + return EnderIO.blockTravelPlatform.selectedOverlayIcon; + } - public IIcon getSelectedIcon() { - return EnderIO.blockTravelPlatform.selectedOverlayIcon; - } - - public Vector4f getHighlightColor() { - return highlightColor; - } - - public IIcon getHighlightIcon() { - return EnderIO.blockTravelPlatform.highlightOverlayIcon; - } + public Vector4f getHighlightColor() { + return highlightColor; + } + public IIcon getHighlightIcon() { + return EnderIO.blockTravelPlatform.highlightOverlayIcon; + } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java index 4e965bd9..498123c7 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java @@ -1,58 +1,57 @@ package crazypants.enderio.teleport.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; /** * Created by CrazyPants on 27/02/14. */ public class PacketAccessMode implements IMessage, IMessageHandler { - int x; - int y; - int z; - TileTravelAnchor.AccessMode mode; + int x; + int y; + int z; + TileTravelAnchor.AccessMode mode; - public PacketAccessMode() { - } + public PacketAccessMode() {} - public PacketAccessMode(int x, int y, int z, TileTravelAnchor.AccessMode mode) { - this.x = x; - this.y = y; - this.z = z; - this.mode = mode; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeShort(mode.ordinal()); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - mode = TileTravelAnchor.AccessMode.values()[buf.readShort()]; - } - - public IMessage onMessage(PacketAccessMode message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof ITravelAccessable) { - ((ITravelAccessable) te).setAccessMode(message.mode); - player.worldObj.markBlockForUpdate(message.x, message.y, message.z); - player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te); + public PacketAccessMode(int x, int y, int z, TileTravelAnchor.AccessMode mode) { + this.x = x; + this.y = y; + this.z = z; + this.mode = mode; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeShort(mode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + mode = TileTravelAnchor.AccessMode.values()[buf.readShort()]; + } + + public IMessage onMessage(PacketAccessMode message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof ITravelAccessable) { + ((ITravelAccessable) te).setAccessMode(message.mode); + player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java index 48303999..fe2d281b 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java @@ -1,44 +1,43 @@ package crazypants.enderio.teleport.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.Log; import crazypants.enderio.api.teleport.IItemOfTravel; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class PacketDrainStaff implements IMessage, IMessageHandler { - int powerUse; + int powerUse; - public PacketDrainStaff() { - } + public PacketDrainStaff() {} - public PacketDrainStaff(int powerUse) { - this.powerUse = powerUse; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(powerUse); - } - - @Override - public void fromBytes(ByteBuf buffer) { - powerUse = buffer.readInt(); - } - - @Override - public IMessage onMessage(PacketDrainStaff message, MessageContext ctx) { - EntityPlayer ep = ctx.getServerHandler().playerEntity; - if(message.powerUse > 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { - ItemStack item = ep.getCurrentEquippedItem().copy(); - ((IItemOfTravel) item.getItem()).extractInternal(item, message.powerUse); - ep.setCurrentItemOrArmor(0, item); + public PacketDrainStaff(int powerUse) { + this.powerUse = powerUse; } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(powerUse); + } + + @Override + public void fromBytes(ByteBuf buffer) { + powerUse = buffer.readInt(); + } + + @Override + public IMessage onMessage(PacketDrainStaff message, MessageContext ctx) { + EntityPlayer ep = ctx.getServerHandler().playerEntity; + if (message.powerUse > 0 + && ep.getCurrentEquippedItem() != null + && ep.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { + ItemStack item = ep.getCurrentEquippedItem().copy(); + ((IItemOfTravel) item.getItem()).extractInternal(item, message.powerUse); + ep.setCurrentItemOrArmor(0, item); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java b/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java index 35571acb..1b620081 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketLabel.java @@ -1,66 +1,64 @@ package crazypants.enderio.teleport.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.ITravelAccessable; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; public class PacketLabel implements IMessage, IMessageHandler { - int x; - int y; - int z; - boolean labelNull; - String label; - + int x; + int y; + int z; + boolean labelNull; + String label; - public PacketLabel() { - } + public PacketLabel() {} - public PacketLabel(int x, int y, int z, String label) { - this.x = x; - this.y = y; - this.z = z; - this.label = label; - labelNull = label == null || label.length() == 0; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeBoolean(labelNull); - if(!labelNull) { - ByteBufUtils.writeUTF8String(buf, label); + public PacketLabel(int x, int y, int z, String label) { + this.x = x; + this.y = y; + this.z = z; + this.label = label; + labelNull = label == null || label.length() == 0; } - } - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - labelNull = buf.readBoolean(); - if(labelNull) { - label = null; - } else { - label = ByteBufUtils.readUTF8String(buf); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeBoolean(labelNull); + if (!labelNull) { + ByteBufUtils.writeUTF8String(buf, label); + } } - } - public IMessage onMessage(PacketLabel message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof ITravelAccessable) { - ((ITravelAccessable) te).setLabel(message.label); - player.worldObj.markBlockForUpdate(message.x, message.y, message.z); - player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te); + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + labelNull = buf.readBoolean(); + if (labelNull) { + label = null; + } else { + label = ByteBufUtils.readUTF8String(buf); + } + } + + public IMessage onMessage(PacketLabel message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if (te instanceof ITravelAccessable) { + ((ITravelAccessable) te).setLabel(message.label); + player.worldObj.markBlockForUpdate(message.x, message.y, message.z); + player.worldObj.markTileEntityChunkModified(message.x, message.y, message.z, te); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java index f5a4aa29..26dd3215 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java @@ -1,43 +1,49 @@ package crazypants.enderio.teleport.packet; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import io.netty.buffer.ByteBuf; public class PacketOpenAuthGui implements IMessage, IMessageHandler { - int x; - int y; - int z; + int x; + int y; + int z; - public PacketOpenAuthGui() { + public PacketOpenAuthGui() {} - } + public PacketOpenAuthGui(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } - public PacketOpenAuthGui(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void fromBytes(ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + } - @Override - public void fromBytes(ByteBuf buffer) { - x = buffer.readInt(); - y = buffer.readInt(); - z = buffer.readInt(); - } - - public IMessage onMessage(PacketOpenAuthGui message, cpw.mods.fml.common.network.simpleimpl.MessageContext ctx) { - ctx.getServerHandler().playerEntity.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ctx.getServerHandler().playerEntity.worldObj, message.x, message.y, message.z); - return null; - } + public IMessage onMessage(PacketOpenAuthGui message, cpw.mods.fml.common.network.simpleimpl.MessageContext ctx) { + ctx.getServerHandler() + .playerEntity + .openGui( + EnderIO.instance, + GuiHandler.GUI_ID_TRAVEL_AUTH, + ctx.getServerHandler().playerEntity.worldObj, + message.x, + message.y, + message.z); + return null; + } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java b/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java index 72da9fa5..eb86edc5 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java @@ -1,89 +1,79 @@ package crazypants.enderio.teleport.packet; -import java.util.ArrayList; -import java.util.List; - -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import com.enderio.core.EnderCore; -import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.TileEntityEnder; import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.ITravelAccessable; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; public class PacketPassword extends MessageTileEntity { - private ItemStack stack; - private int slot; - private boolean setLabel; + private ItemStack stack; + private int slot; + private boolean setLabel; - public PacketPassword() { - } + public PacketPassword() {} - private PacketPassword(TileEntityEnder tile) { - super(tile); - } + private PacketPassword(TileEntityEnder tile) { + super(tile); + } - public static IMessage setPassword(TileEntityEnder te, int slot, ItemStack stack) { - PacketPassword msg = new PacketPassword(te); - msg.slot = slot; - msg.stack = stack; - msg.setLabel = false; - return msg; - } + public static IMessage setPassword(TileEntityEnder te, int slot, ItemStack stack) { + PacketPassword msg = new PacketPassword(te); + msg.slot = slot; + msg.stack = stack; + msg.setLabel = false; + return msg; + } - public static PacketPassword setLabel(TileEntityEnder te, ItemStack stack) { - PacketPassword msg = new PacketPassword(te); - msg.slot = 0; - msg.stack = stack; - msg.setLabel = true; - return msg; - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - slot = buf.readShort(); - setLabel = buf.readBoolean(); - stack = ByteBufUtils.readItemStack(buf); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort(slot); - buf.writeBoolean(setLabel); - ByteBufUtils.writeItemStack(buf, stack); - } - - public static class Handler implements IMessageHandler { + public static PacketPassword setLabel(TileEntityEnder te, ItemStack stack) { + PacketPassword msg = new PacketPassword(te); + msg.slot = 0; + msg.stack = stack; + msg.setLabel = true; + return msg; + } @Override - public IMessage onMessage(PacketPassword msg, MessageContext ctx) { - TileEntityEnder te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te instanceof ITravelAccessable) { - if (((ITravelAccessable) te).canUiBeAccessed(ctx.getServerHandler().playerEntity)) { - if (msg.stack != null) { - msg.stack.stackSize = 0; - } - if (msg.setLabel) { - ((ITravelAccessable) te).setItemLabel(msg.stack); - } else { - ((ITravelAccessable) te).getPassword()[msg.slot] = msg.stack; - ((ITravelAccessable) te).clearAuthorisedUsers(); - } - te.getWorldObj().markBlockForUpdate(msg.x, msg.y, msg.z); - } - } - return null; + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + slot = buf.readShort(); + setLabel = buf.readBoolean(); + stack = ByteBufUtils.readItemStack(buf); } - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort(slot); + buf.writeBoolean(setLabel); + ByteBufUtils.writeItemStack(buf, stack); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(PacketPassword msg, MessageContext ctx) { + TileEntityEnder te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (te instanceof ITravelAccessable) { + if (((ITravelAccessable) te).canUiBeAccessed(ctx.getServerHandler().playerEntity)) { + if (msg.stack != null) { + msg.stack.stackSize = 0; + } + if (msg.setLabel) { + ((ITravelAccessable) te).setItemLabel(msg.stack); + } else { + ((ITravelAccessable) te).getPassword()[msg.slot] = msg.stack; + ((ITravelAccessable) te).clearAuthorisedUsers(); + } + te.getWorldObj().markBlockForUpdate(msg.x, msg.y, msg.z); + } + } + return null; + } + } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index 9f319926..cf049149 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -1,5 +1,13 @@ package crazypants.enderio.teleport.packet; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TeleportEntityEvent; +import crazypants.enderio.api.teleport.TravelSource; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -7,111 +15,109 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S12PacketEntityVelocity; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.api.teleport.IItemOfTravel; -import crazypants.enderio.api.teleport.TeleportEntityEvent; -import crazypants.enderio.api.teleport.TravelSource; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; public class PacketTravelEvent implements IMessage, IMessageHandler { - int x; - int y; - int z; - int powerUse; - boolean conserveMotion; - int entityId; - int source; + int x; + int y; + int z; + int powerUse; + boolean conserveMotion; + int entityId; + int source; - public PacketTravelEvent() { - } + public PacketTravelEvent() {} - public PacketTravelEvent(Entity entity, int x, int y, int z, int powerUse, boolean conserveMotion, TravelSource source) { - this.x = x; - this.y = y; - this.z = z; - this.powerUse = powerUse; - this.conserveMotion = conserveMotion; - this.entityId = entity instanceof EntityPlayer ? -1 : entity.getEntityId(); - this.source = source.ordinal(); - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(powerUse); - buf.writeBoolean(conserveMotion); - buf.writeInt(entityId); - buf.writeInt(source); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - powerUse = buf.readInt(); - conserveMotion = buf.readBoolean(); - entityId = buf.readInt(); - source = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketTravelEvent message, MessageContext ctx) { - Entity toTp = message.entityId == -1 ? ctx.getServerHandler().playerEntity : ctx.getServerHandler().playerEntity.worldObj.getEntityByID(message.entityId); - - int x = message.x, y = message.y, z = message.z; - - TravelSource source = TravelSource.values()[message.source]; - - doServerTeleport(toTp, x, y, z, message.powerUse, message.conserveMotion, source); - - return null; - } - - public static boolean doServerTeleport(Entity toTp, int x, int y, int z, int powerUse, boolean conserveMotion, TravelSource source) { - EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null; - - TeleportEntityEvent evt = new TeleportEntityEvent(toTp, source, x, y, z); - if(MinecraftForge.EVENT_BUS.post(evt)) { - return false; - } - x = evt.targetX; - y = evt.targetY; - z = evt.targetZ; - - toTp.worldObj.playSoundEffect(toTp.posX, toTp.posY, toTp.posZ, source.sound, 1.0F, 1.0F); - - toTp.playSound(source.sound, 1.0F, 1.0F); - - if(player != null) { - player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5); - } else { - toTp.setPosition(x, y, z); + public PacketTravelEvent( + Entity entity, int x, int y, int z, int powerUse, boolean conserveMotion, TravelSource source) { + this.x = x; + this.y = y; + this.z = z; + this.powerUse = powerUse; + this.conserveMotion = conserveMotion; + this.entityId = entity instanceof EntityPlayer ? -1 : entity.getEntityId(); + this.source = source.ordinal(); } - toTp.worldObj.playSoundEffect(x, y, z, source.sound, 1.0F, 1.0F); - toTp.fallDistance = 0; - - if(player != null) { - if(conserveMotion) { - Vector3d velocityVex = Util.getLookVecEio(player); - S12PacketEntityVelocity p = new S12PacketEntityVelocity(toTp.getEntityId(), velocityVex.x, velocityVex.y, velocityVex.z); - ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p); - } - - if(powerUse > 0 && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { - ItemStack item = player.getCurrentEquippedItem().copy(); - ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse); - toTp.setCurrentItemOrArmor(0, item); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(powerUse); + buf.writeBoolean(conserveMotion); + buf.writeInt(entityId); + buf.writeInt(source); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + powerUse = buf.readInt(); + conserveMotion = buf.readBoolean(); + entityId = buf.readInt(); + source = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketTravelEvent message, MessageContext ctx) { + Entity toTp = message.entityId == -1 + ? ctx.getServerHandler().playerEntity + : ctx.getServerHandler().playerEntity.worldObj.getEntityByID(message.entityId); + + int x = message.x, y = message.y, z = message.z; + + TravelSource source = TravelSource.values()[message.source]; + + doServerTeleport(toTp, x, y, z, message.powerUse, message.conserveMotion, source); + + return null; + } + + public static boolean doServerTeleport( + Entity toTp, int x, int y, int z, int powerUse, boolean conserveMotion, TravelSource source) { + EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null; + + TeleportEntityEvent evt = new TeleportEntityEvent(toTp, source, x, y, z); + if (MinecraftForge.EVENT_BUS.post(evt)) { + return false; + } + x = evt.targetX; + y = evt.targetY; + z = evt.targetZ; + + toTp.worldObj.playSoundEffect(toTp.posX, toTp.posY, toTp.posZ, source.sound, 1.0F, 1.0F); + + toTp.playSound(source.sound, 1.0F, 1.0F); + + if (player != null) { + player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5); + } else { + toTp.setPosition(x, y, z); + } + + toTp.worldObj.playSoundEffect(x, y, z, source.sound, 1.0F, 1.0F); + toTp.fallDistance = 0; + + if (player != null) { + if (conserveMotion) { + Vector3d velocityVex = Util.getLookVecEio(player); + S12PacketEntityVelocity p = + new S12PacketEntityVelocity(toTp.getEntityId(), velocityVex.x, velocityVex.y, velocityVex.z); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p); + } + + if (powerUse > 0 + && player.getCurrentEquippedItem() != null + && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { + ItemStack item = player.getCurrentEquippedItem().copy(); + ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse); + toTp.setCurrentItemOrArmor(0, item); + } + } + + return true; } - - return true; - } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketVisibility.java b/src/main/java/crazypants/enderio/teleport/packet/PacketVisibility.java index 36479b79..6f2014a1 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketVisibility.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketVisibility.java @@ -42,7 +42,7 @@ public class PacketVisibility implements IMessage, IMessageHandler { - - public ContainerTelePad(InventoryPlayer playerInv) { - super(playerInv, playerInv); - } - - @Override - public Point getPlayerInventoryOffset() { - Point p = super.getPlayerInventoryOffset(); - p.translate(0, 34); - return p; - } + + public ContainerTelePad(InventoryPlayer playerInv) { + super(playerInv, playerInv); + } + + @Override + public Point getPlayerInventoryOffset() { + Point p = super.getPlayerInventoryOffset(); + p.translate(0, 34); + return p; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java index 11203b65..22a2e46e 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java @@ -1,42 +1,43 @@ package crazypants.enderio.teleport.telepad; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.world.World; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.ContainerTravelAccessable; import crazypants.enderio.teleport.GuiTravelAccessable; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.world.World; public class GuiAugmentedTravelAccessible extends GuiTravelAccessable implements IToggleableGui { - private static final int ID_SWITCH_BUTTON = 99; + private static final int ID_SWITCH_BUTTON = 99; - ToggleTravelButton switchButton; + ToggleTravelButton switchButton; - private TileTelePad te; - - public GuiAugmentedTravelAccessible(InventoryPlayer playerInv, TileTelePad te, World world) { - super(playerInv, te, world); - this.te = te; - switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, GuiTelePad.SWITCH_X, GuiTelePad.SWITCH_Y, IconEIO.IO_WHATSIT); - switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.telepad")); - } - - public GuiAugmentedTravelAccessible(ContainerTravelAccessable container) { - super(container); - } + private TileTelePad te; - @Override - public void initGui() { - super.initGui(); - switchButton.onGuiInit(); - } + public GuiAugmentedTravelAccessible(InventoryPlayer playerInv, TileTelePad te, World world) { + super(playerInv, te, world); + this.te = te; + switchButton = new ToggleTravelButton( + this, ID_SWITCH_BUTTON, GuiTelePad.SWITCH_X, GuiTelePad.SWITCH_Y, IconEIO.IO_WHATSIT); + switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.telepad")); + } - @Override - public void switchGui() { - mc.thePlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TELEPAD, world, te.xCoord, te.yCoord, te.zCoord); - PacketHandler.INSTANCE.sendToServer(new PacketOpenServerGui(te, GuiHandler.GUI_ID_TELEPAD)); - } + public GuiAugmentedTravelAccessible(ContainerTravelAccessable container) { + super(container); + } + + @Override + public void initGui() { + super.initGui(); + switchButton.onGuiInit(); + } + + @Override + public void switchGui() { + mc.thePlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TELEPAD, world, te.xCoord, te.yCoord, te.zCoord); + PacketHandler.INSTANCE.sendToServer(new PacketOpenServerGui(te, GuiHandler.GUI_ID_TELEPAD)); + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 770241a9..eb72cee7 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -1,25 +1,10 @@ package crazypants.enderio.teleport.telepad; -import java.awt.Rectangle; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; -import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.config.Config; @@ -27,186 +12,206 @@ import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import java.awt.Rectangle; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; public class GuiTelePad extends GuiContainerBaseEIO implements IToggleableGui { - private static final int ID_SWITCH_BUTTON = 95; - private static final int ID_TELEPORT_BUTTON = 96; + private static final int ID_SWITCH_BUTTON = 95; + private static final int ID_TELEPORT_BUTTON = 96; - ToggleTravelButton switchButton; - GuiButton teleportButton; + ToggleTravelButton switchButton; + GuiButton teleportButton; - private World world; - private TileTelePad te; + private World world; + private TileTelePad te; - private TextFieldEnder xTF, yTF, zTF, dimTF; - - private int powerX = 8; - private int powerY = 9; - private int powerScale = 100; - - private int progressX = 26; - private int progressY = 90; - private int progressScale = 124; - - public static int SWITCH_X = 155, SWITCH_Y = 5; + private TextFieldEnder xTF, yTF, zTF, dimTF; - public GuiTelePad(InventoryPlayer playerInv, TileTelePad te, World world) { - super(new ContainerTelePad(playerInv), "telePad"); - this.world = world; - this.te = te; - ySize += 34; + private int powerX = 8; + private int powerY = 9; + private int powerScale = 100; - addToolTip(new GuiToolTip(new Rectangle(powerX, powerY, 10, powerScale), "") { - @Override - protected void updateText() { - text.clear(); - updatePowerBarTooltip(text); - } - }); - - addToolTip(new GuiToolTip(new Rectangle(progressX, progressY, progressScale, 10), "") { - @Override - protected void updateText() { - text.clear(); - text.add(Math.round(GuiTelePad.this.te.getProgress() * 100) + "%"); - } - }); + private int progressX = 26; + private int progressY = 90; + private int progressScale = 124; - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + public static int SWITCH_X = 155, SWITCH_Y = 5; - int x = 42; - int y = 8; - xTF = new TextFieldEnder(fr, x, y, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); - yTF = new TextFieldEnder(fr, x, y + xTF.height + 2, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); - zTF = new TextFieldEnder(fr, x, y + (xTF.height * 2) + 4, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); - dimTF = new TextFieldEnder(fr, x, y + (xTF.height * 3) + 6, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + public GuiTelePad(InventoryPlayer playerInv, TileTelePad te, World world) { + super(new ContainerTelePad(playerInv), "telePad"); + this.world = world; + this.te = te; + ySize += 34; - xTF.setText(Integer.toString(te.getX())); - yTF.setText(Integer.toString(te.getY())); - zTF.setText(Integer.toString(te.getZ())); - dimTF.setText(Integer.toString(te.getTargetDim())); + addToolTip(new GuiToolTip(new Rectangle(powerX, powerY, 10, powerScale), "") { + @Override + protected void updateText() { + text.clear(); + updatePowerBarTooltip(text); + } + }); - xTF.setCanLoseFocus(!Config.telepadLockCoords); - yTF.setCanLoseFocus(!Config.telepadLockCoords); - zTF.setCanLoseFocus(!Config.telepadLockCoords); - dimTF.setCanLoseFocus(!Config.telepadLockDimension); + addToolTip(new GuiToolTip(new Rectangle(progressX, progressY, progressScale, 10), "") { + @Override + protected void updateText() { + text.clear(); + text.add(Math.round(GuiTelePad.this.te.getProgress() * 100) + "%"); + } + }); - textFields.addAll(Lists.newArrayList(xTF, yTF, zTF, dimTF)); + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, SWITCH_X, SWITCH_Y, IconEIO.IO_WHATSIT); - switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.travel")); - } + int x = 42; + int y = 8; + xTF = new TextFieldEnder(fr, x, y, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + yTF = new TextFieldEnder(fr, x, y + xTF.height + 2, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + zTF = new TextFieldEnder(fr, x, y + (xTF.height * 2) + 4, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); + dimTF = new TextFieldEnder(fr, x, y + (xTF.height * 3) + 6, xSize - x * 2, 12, TextFieldEnder.FILTER_NUMERIC); - private String getPowerOutputLabel() { - return StatCollector.translateToLocal("enderio.gui.max"); - } + xTF.setText(Integer.toString(te.getX())); + yTF.setText(Integer.toString(te.getY())); + zTF.setText(Integer.toString(te.getZ())); + dimTF.setText(Integer.toString(te.getTargetDim())); - protected int getPowerOutputValue() { - return te.getUsage(); - } - - protected void updatePowerBarTooltip(List text) { - text.add(getPowerOutputLabel() + " " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr()); - text.add(PowerDisplayUtil.formatStoredPower(te.getEnergyStored(), te.getMaxEnergyStored())); - } + xTF.setCanLoseFocus(!Config.telepadLockCoords); + yTF.setCanLoseFocus(!Config.telepadLockCoords); + zTF.setCanLoseFocus(!Config.telepadLockCoords); + dimTF.setCanLoseFocus(!Config.telepadLockDimension); - @Override - public void initGui() { - super.initGui(); - switchButton.onGuiInit(); + textFields.addAll(Lists.newArrayList(xTF, yTF, zTF, dimTF)); - String text = EnderIO.lang.localize("gui.telepad.teleport"); - int width = getFontRenderer().getStringWidth(text) + 10; - - int x = guiLeft + (xSize / 2) - (width / 2); - int y = guiTop + 65; - - teleportButton = new GuiButton(ID_TELEPORT_BUTTON, x, y, width, 20, text); - addButton(teleportButton); - } - - @Override - public void updateScreen() { - super.updateScreen(); - } - - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - updateCoords(); - } - - private void updateCoords() { - BlockCoord bc = new BlockCoord(getIntFromTextBox(xTF), getIntFromTextBox(yTF), getIntFromTextBox(zTF)); - int targetDim = getIntFromTextBox(dimTF); - if(bc.x != te.getX() || bc.y != te.getY() || bc.z != te.getZ() || targetDim != te.getTargetDim()) { - te.setX(bc.x); - te.setY(bc.y); - te.setZ(bc.z); - te.setTargetDim(targetDim); - PacketHandler.INSTANCE.sendToServer(new PacketUpdateCoords(te, bc, targetDim)); - } - } - - private int getIntFromTextBox(TextFieldEnder tf) { - String text = tf.getText(); - if("".equals(text) || "-".equals(text)) { - return 0; - } - return Integer.parseInt(text); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - - int powerScaled = te.getPowerScaled(powerScale); - drawTexturedModalRect(sx + powerX, sy + powerY + powerScale - powerScaled, xSize, 0, 10, powerScaled); - int progressScaled = Util.getProgressScaled(progressScale, te); - drawTexturedModalRect(sx + progressX, sy + progressY, 0, ySize, progressScaled, 10); - - FontRenderer fnt = getFontRenderer(); - - String[] text = { "X", "Y", "Z", "DIM" }; - for (int i = 0; i < text.length; i++) { - TextFieldEnder f = textFields.get(i); - fnt.drawString(text[i], f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 10, f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2) + 1, 0x000000); - if(!f.getCanLoseFocus()) { - IconEIO.map.render(IconEIO.LOCK_LOCKED, f.xPosition + f.width - 2, f.yPosition - 2, true); - } + switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, SWITCH_X, SWITCH_Y, IconEIO.IO_WHATSIT); + switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.travel")); } - Entity e = te.getCurrentTarget(); - if(e != null) { - String name = e.getCommandSenderName(); - fnt.drawString(name, sx + xSize / 2 - fnt.getStringWidth(name) / 2, sy + progressY + fnt.FONT_HEIGHT + 6, 0x000000); - } else if(te.wasBlocked) { - String s = EnderIO.lang.localize("gui.telepad.blocked"); - fnt.drawString(s, sx + xSize / 2 - fnt.getStringWidth(s) / 2, sy + progressY + fnt.FONT_HEIGHT + 6, 0xAA0000); + private String getPowerOutputLabel() { + return StatCollector.translateToLocal("enderio.gui.max"); } - super.drawGuiContainerBackgroundLayer(p_146976_1_, p_146976_2_, p_146976_3_); - } - - @Override - public void switchGui() { - mc.thePlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TELEPAD_TRAVEL, world, te.xCoord, te.yCoord, te.zCoord); - PacketHandler.INSTANCE.sendToServer(new PacketOpenServerGui(te, GuiHandler.GUI_ID_TELEPAD_TRAVEL)); - } - - @Override - protected void actionPerformed(GuiButton button) { - super.actionPerformed(button); - - if (button.id == ID_TELEPORT_BUTTON) { - te.teleportAll(); + protected int getPowerOutputValue() { + return te.getUsage(); + } + + protected void updatePowerBarTooltip(List text) { + text.add(getPowerOutputLabel() + " " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + text.add(PowerDisplayUtil.formatStoredPower(te.getEnergyStored(), te.getMaxEnergyStored())); + } + + @Override + public void initGui() { + super.initGui(); + switchButton.onGuiInit(); + + String text = EnderIO.lang.localize("gui.telepad.teleport"); + int width = getFontRenderer().getStringWidth(text) + 10; + + int x = guiLeft + (xSize / 2) - (width / 2); + int y = guiTop + 65; + + teleportButton = new GuiButton(ID_TELEPORT_BUTTON, x, y, width, 20, text); + addButton(teleportButton); + } + + @Override + public void updateScreen() { + super.updateScreen(); + } + + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + updateCoords(); + } + + private void updateCoords() { + BlockCoord bc = new BlockCoord(getIntFromTextBox(xTF), getIntFromTextBox(yTF), getIntFromTextBox(zTF)); + int targetDim = getIntFromTextBox(dimTF); + if (bc.x != te.getX() || bc.y != te.getY() || bc.z != te.getZ() || targetDim != te.getTargetDim()) { + te.setX(bc.x); + te.setY(bc.y); + te.setZ(bc.z); + te.setTargetDim(targetDim); + PacketHandler.INSTANCE.sendToServer(new PacketUpdateCoords(te, bc, targetDim)); + } + } + + private int getIntFromTextBox(TextFieldEnder tf) { + String text = tf.getText(); + if ("".equals(text) || "-".equals(text)) { + return 0; + } + return Integer.parseInt(text); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + bindGuiTexture(); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + + int powerScaled = te.getPowerScaled(powerScale); + drawTexturedModalRect(sx + powerX, sy + powerY + powerScale - powerScaled, xSize, 0, 10, powerScaled); + int progressScaled = Util.getProgressScaled(progressScale, te); + drawTexturedModalRect(sx + progressX, sy + progressY, 0, ySize, progressScaled, 10); + + FontRenderer fnt = getFontRenderer(); + + String[] text = {"X", "Y", "Z", "DIM"}; + for (int i = 0; i < text.length; i++) { + TextFieldEnder f = textFields.get(i); + fnt.drawString( + text[i], + f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 10, + f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2) + 1, + 0x000000); + if (!f.getCanLoseFocus()) { + IconEIO.map.render(IconEIO.LOCK_LOCKED, f.xPosition + f.width - 2, f.yPosition - 2, true); + } + } + + Entity e = te.getCurrentTarget(); + if (e != null) { + String name = e.getCommandSenderName(); + fnt.drawString( + name, + sx + xSize / 2 - fnt.getStringWidth(name) / 2, + sy + progressY + fnt.FONT_HEIGHT + 6, + 0x000000); + } else if (te.wasBlocked) { + String s = EnderIO.lang.localize("gui.telepad.blocked"); + fnt.drawString( + s, sx + xSize / 2 - fnt.getStringWidth(s) / 2, sy + progressY + fnt.FONT_HEIGHT + 6, 0xAA0000); + } + + super.drawGuiContainerBackgroundLayer(p_146976_1_, p_146976_2_, p_146976_3_); + } + + @Override + public void switchGui() { + mc.thePlayer.openGui( + EnderIO.instance, GuiHandler.GUI_ID_TELEPAD_TRAVEL, world, te.xCoord, te.yCoord, te.zCoord); + PacketHandler.INSTANCE.sendToServer(new PacketOpenServerGui(te, GuiHandler.GUI_ID_TELEPAD_TRAVEL)); + } + + @Override + protected void actionPerformed(GuiButton button) { + super.actionPerformed(button); + + if (button.id == ID_TELEPORT_BUTTON) { + te.teleportAll(); + } } - } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java b/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java index adb7a51e..462aee82 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/IToggleableGui.java @@ -4,6 +4,5 @@ import com.enderio.core.api.client.gui.IGuiScreen; public interface IToggleableGui extends IGuiScreen { - void switchGui(); - + void switchGui(); } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java index 2e58fc70..b3b305d8 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java @@ -1,7 +1,17 @@ package crazypants.enderio.teleport.telepad; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import com.enderio.core.common.vecmath.Vector3d; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.api.teleport.ITelePad; +import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import java.util.List; - import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,203 +27,219 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.ModObject; -import crazypants.enderio.api.teleport.ITelePad; -import crazypants.enderio.teleport.anchor.BlockTravelAnchor; - public class ItemCoordSelector extends Item implements IResourceTooltipProvider { - public static ItemCoordSelector create() { - ItemCoordSelector ret = new ItemCoordSelector(); - GameRegistry.registerItem(ret, ModObject.itemCoordSelector.unlocalisedName); - return ret; - } - - private ItemCoordSelector() { - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemCoordSelector.unlocalisedName); - setTextureName("EnderIO:" + ModObject.itemCoordSelector.unlocalisedName); - setMaxStackSize(1); - } - - @SuppressWarnings("unchecked") - @Override - public void getSubItems(Item item, CreativeTabs p_150895_2_, @SuppressWarnings("rawtypes") List list) { - ItemStack stack = new ItemStack(item); - init(stack); - list.add(stack); - } - - public static void init(ItemStack stack) { - stack.stackTagCompound = new NBTTagCompound(); - new BlockCoord().writeToNBT(stack.stackTagCompound); - stack.stackTagCompound.setBoolean("default", true); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean p_77624_4_) { - if(!stack.stackTagCompound.getBoolean("default")) { - list.add(getCoords(stack).chatString(EnumChatFormatting.GRAY)); - } - super.addInformation(stack, player, list, p_77624_4_); - } - - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (rayTraceCoords(stack, world, player)) { - player.swingItem(); - } - return super.onItemRightClick(stack, world, player); - } - - @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - - if (!rayTraceCoords(stack, world, player)) { - return false; + public static ItemCoordSelector create() { + ItemCoordSelector ret = new ItemCoordSelector(); + GameRegistry.registerItem(ret, ModObject.itemCoordSelector.unlocalisedName); + return ret; } - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof ITelePad) { - ITelePad tp = (ITelePad) te; - TileTelePad tile = null; - if (te instanceof TileTelePad) { - tile = (TileTelePad) te; - } - if(tp.canBlockBeAccessed(player)) { - BlockCoord bc = getCoords(stack); - BlockCoord cur = new BlockCoord(tp.getX(), tp.getY(), tp.getZ()); - int dim = getDimension(stack); - int curDim = tp.getTargetDim(); + private ItemCoordSelector() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemCoordSelector.unlocalisedName); + setTextureName("EnderIO:" + ModObject.itemCoordSelector.unlocalisedName); + setMaxStackSize(1); + } - if(!bc.equals(cur)) { - if(tile != null) { - tile.setCoords_internal(bc); - } else { - tp.setCoords(bc); - } - if(!world.isRemote) { - player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.setCoords", bc.chatString()))); - } + @SuppressWarnings("unchecked") + @Override + public void getSubItems(Item item, CreativeTabs p_150895_2_, @SuppressWarnings("rawtypes") List list) { + ItemStack stack = new ItemStack(item); + init(stack); + list.add(stack); + } + + public static void init(ItemStack stack) { + stack.stackTagCompound = new NBTTagCompound(); + new BlockCoord().writeToNBT(stack.stackTagCompound); + stack.stackTagCompound.setBoolean("default", true); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean p_77624_4_) { + if (!stack.stackTagCompound.getBoolean("default")) { + list.add(getCoords(stack).chatString(EnumChatFormatting.GRAY)); + } + super.addInformation(stack, player, list, p_77624_4_); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (rayTraceCoords(stack, world, player)) { + player.swingItem(); + } + return super.onItemRightClick(stack, world, player); + } + + @Override + public boolean onItemUseFirst( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + + if (!rayTraceCoords(stack, world, player)) { + return false; } - if(dim != curDim) { - if(tile != null) { - tile.setTargetDim_internal(dim); - } else { - tp.setTargetDim(dim); - } - if(!world.isRemote) { - player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.setDimension", EnumChatFormatting.GREEN.toString(), - Integer.toString(dim)))); - } + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof ITelePad) { + ITelePad tp = (ITelePad) te; + TileTelePad tile = null; + if (te instanceof TileTelePad) { + tile = (TileTelePad) te; + } + if (tp.canBlockBeAccessed(player)) { + BlockCoord bc = getCoords(stack); + BlockCoord cur = new BlockCoord(tp.getX(), tp.getY(), tp.getZ()); + int dim = getDimension(stack); + int curDim = tp.getTargetDim(); + + if (!bc.equals(cur)) { + if (tile != null) { + tile.setCoords_internal(bc); + } else { + tp.setCoords(bc); + } + if (!world.isRemote) { + player.addChatMessage(new ChatComponentText( + EnderIO.lang.localize("itemCoordSelector.chat.setCoords", bc.chatString()))); + } + } + + if (dim != curDim) { + if (tile != null) { + tile.setTargetDim_internal(dim); + } else { + tp.setTargetDim(dim); + } + if (!world.isRemote) { + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize( + "itemCoordSelector.chat.setDimension", + EnumChatFormatting.GREEN.toString(), + Integer.toString(dim)))); + } + } + + if (bc.equals(cur) && dim == curDim) { + return false; + } + } else { + BlockTravelAnchor.sendPrivateChatMessage(player, tp.getOwner()); + } } - if(bc.equals(cur) && dim == curDim) { - return false; + if (world.isRemote) { + sendItemUsePacket(stack, player, world, x, y, z, side, hitX, hitY, hitZ); } - } else { - BlockTravelAnchor.sendPrivateChatMessage(player, tp.getOwner()); - } - } - - if(world.isRemote) { - sendItemUsePacket(stack, player, world, x, y, z, side, hitX, hitY, hitZ); - } - - return true; - } - // returns false if the raytrace provided no new information - private boolean rayTraceCoords(ItemStack stack, World world, EntityPlayer player) { - Vector3d headVec = Util.getEyePositionEio(player); - Vec3 start = headVec.getVec3(); - Vec3 lookVec = player.getLook(1.0F); - double reach = 500; - headVec.add(lookVec.xCoord * reach, lookVec.yCoord * reach, lookVec.zCoord * reach); - MovingObjectPosition mop = world.rayTraceBlocks(start, headVec.getVec3()); - if (mop == null) { - return false; - } - - BlockCoord bc = new BlockCoord(mop); - BlockCoord onStack = getCoords(stack); - TileEntity te = bc.getTileEntity(world); - if(te instanceof ITelePad) { - return true; + return true; } - if(!player.isSneaking()) { - ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[mop.sideHit]; - bc = bc.getLocation(dir); - } - - int dim = world.provider.dimensionId; - int curDim = getDimension(stack); - - boolean changed = false; - - if(!bc.equals(onStack)) { - setCoords(stack, bc); - onCoordsChanged(player, bc); - changed = true; + // returns false if the raytrace provided no new information + private boolean rayTraceCoords(ItemStack stack, World world, EntityPlayer player) { + Vector3d headVec = Util.getEyePositionEio(player); + Vec3 start = headVec.getVec3(); + Vec3 lookVec = player.getLook(1.0F); + double reach = 500; + headVec.add(lookVec.xCoord * reach, lookVec.yCoord * reach, lookVec.zCoord * reach); + MovingObjectPosition mop = world.rayTraceBlocks(start, headVec.getVec3()); + if (mop == null) { + return false; + } + + BlockCoord bc = new BlockCoord(mop); + BlockCoord onStack = getCoords(stack); + TileEntity te = bc.getTileEntity(world); + if (te instanceof ITelePad) { + return true; + } + + if (!player.isSneaking()) { + ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[mop.sideHit]; + bc = bc.getLocation(dir); + } + + int dim = world.provider.dimensionId; + int curDim = getDimension(stack); + + boolean changed = false; + + if (!bc.equals(onStack)) { + setCoords(stack, bc); + onCoordsChanged(player, bc); + changed = true; + } + + if (dim != curDim) { + setDimension(stack, world); + onDimensionChanged(player, getDimension(stack)); + changed = true; + } + + return changed; } - if (dim != curDim) { - setDimension(stack, world); - onDimensionChanged(player, getDimension(stack)); - changed = true; + private void sendItemUsePacket( + ItemStack stack, + EntityPlayer player, + World world, + int x, + int y, + int z, + int side, + float hitX, + float hitY, + float hitZ) { + NetHandlerPlayClient netClientHandler = + (NetHandlerPlayClient) FMLClientHandler.instance().getClientPlayHandler(); + netClientHandler.addToSendQueue( + new C08PacketPlayerBlockPlacement(x, y, z, side, player.inventory.getCurrentItem(), hitX, hitY, hitZ)); } - - return changed; - } - private void sendItemUsePacket(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - NetHandlerPlayClient netClientHandler = (NetHandlerPlayClient) FMLClientHandler.instance().getClientPlayHandler(); - netClientHandler.addToSendQueue(new C08PacketPlayerBlockPlacement(x, y, z, side, player.inventory.getCurrentItem(), hitX, hitY, hitZ)); - } - - private void onCoordsChanged(EntityPlayer player, BlockCoord bc) { - if(!player.worldObj.isRemote) { - player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newCoords", bc.chatString()))); + private void onCoordsChanged(EntityPlayer player, BlockCoord bc) { + if (!player.worldObj.isRemote) { + player.addChatMessage( + new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newCoords", bc.chatString()))); + } } - } - - private void onDimensionChanged(EntityPlayer player, int dim) { - if(!player.worldObj.isRemote) { - player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newDimension", EnumChatFormatting.GREEN.toString(), Integer.toString(dim)))); + + private void onDimensionChanged(EntityPlayer player, int dim) { + if (!player.worldObj.isRemote) { + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize( + "itemCoordSelector.chat.newDimension", + EnumChatFormatting.GREEN.toString(), + Integer.toString(dim)))); + } } - } - public void setCoords(ItemStack stack, BlockCoord bc) { - stack.stackTagCompound.setBoolean("default", false); - bc.writeToNBT(stack.stackTagCompound); - } - - public void setDimension(ItemStack stack, World world) { - stack.stackTagCompound.setInteger("dimension", world.provider.dimensionId); - } + public void setCoords(ItemStack stack, BlockCoord bc) { + stack.stackTagCompound.setBoolean("default", false); + bc.writeToNBT(stack.stackTagCompound); + } - public BlockCoord getCoords(ItemStack stack) { - return BlockCoord.readFromNBT(stack.stackTagCompound); - } - - public int getDimension(ItemStack stack) { - return stack.stackTagCompound.getInteger("dimension"); - } + public void setDimension(ItemStack stack, World world) { + stack.stackTagCompound.setInteger("dimension", world.provider.dimensionId); + } - @Override - public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); - } + public BlockCoord getCoords(ItemStack stack) { + return BlockCoord.readFromNBT(stack.stackTagCompound); + } + + public int getDimension(ItemStack stack) { + return stack.stackTagCompound.getInteger("dimension"); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java index d042697d..5a2dcb2a 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java @@ -1,50 +1,48 @@ package crazypants.enderio.teleport.telepad; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import com.enderio.core.common.network.MessageTileEntity; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; -public class PacketOpenServerGui extends MessageTileEntity implements IMessageHandler { +public class PacketOpenServerGui extends MessageTileEntity + implements IMessageHandler { - public PacketOpenServerGui() { - } + public PacketOpenServerGui() {} - int id; + int id; - public PacketOpenServerGui(TileTelePad te, int guiId) { - super(te); - this.id = guiId; - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(id); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - this.id = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketOpenServerGui message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - World world = message.getWorld(ctx); - TileTelePad te = message.getTileEntity(world); - - if(te != null) { - player.openGui(EnderIO.instance, message.id, world, te.xCoord, te.yCoord, te.zCoord); + public PacketOpenServerGui(TileTelePad te, int guiId) { + super(te); + this.id = guiId; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(id); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + this.id = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketOpenServerGui message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + World world = message.getWorld(ctx); + TileTelePad te = message.getTileEntity(world); + + if (te != null) { + player.openGui(EnderIO.instance, message.id, world, te.xCoord, te.yCoord, te.zCoord); + } + + return null; } - - return null; - } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java index 36f16764..5e67cd2f 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java @@ -1,80 +1,78 @@ package crazypants.enderio.teleport.telepad; +import com.enderio.core.common.network.MessageTileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.EnderIO; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.enderio.core.common.network.MessageTileEntity; +public class PacketTeleport extends MessageTileEntity + implements IMessageHandler { -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; - -public class PacketTeleport extends MessageTileEntity implements IMessageHandler { - - enum Type { - BEGIN, - END, - TELEPORT - } - - public PacketTeleport() { - super(); - } - - private int entityId; - private Type type; - private boolean wasBlocked; - - public PacketTeleport(Type type, TileTelePad te, int entityId) { - super(te); - this.entityId = entityId; - this.type = type; - } - - public PacketTeleport(Type type, TileTelePad te, boolean wasBlocked) { - super(te); - this.wasBlocked = wasBlocked; - this.type = type; - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(entityId); - buf.writeInt(type.ordinal()); - buf.writeBoolean(wasBlocked); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - entityId = buf.readInt(); - type = Type.values()[buf.readInt()]; - wasBlocked = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketTeleport message, MessageContext ctx) { - World world = ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx); - TileEntity te = message.getTileEntity(world); - if(te instanceof TileTelePad) { - Entity e = world.getEntityByID(message.entityId); - switch(message.type) { - case BEGIN: - ((TileTelePad) te).enqueueTeleport(e, false); - break; - case END: - ((TileTelePad) te).dequeueTeleport(e, false); - break; - case TELEPORT: - ((TileTelePad)te).wasBlocked = message.wasBlocked; - break; - } + enum Type { + BEGIN, + END, + TELEPORT } - return null; - } + public PacketTeleport() { + super(); + } + + private int entityId; + private Type type; + private boolean wasBlocked; + + public PacketTeleport(Type type, TileTelePad te, int entityId) { + super(te); + this.entityId = entityId; + this.type = type; + } + + public PacketTeleport(Type type, TileTelePad te, boolean wasBlocked) { + super(te); + this.wasBlocked = wasBlocked; + this.type = type; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(entityId); + buf.writeInt(type.ordinal()); + buf.writeBoolean(wasBlocked); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + entityId = buf.readInt(); + type = Type.values()[buf.readInt()]; + wasBlocked = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketTeleport message, MessageContext ctx) { + World world = ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx); + TileEntity te = message.getTileEntity(world); + if (te instanceof TileTelePad) { + Entity e = world.getEntityByID(message.entityId); + switch (message.type) { + case BEGIN: + ((TileTelePad) te).enqueueTeleport(e, false); + break; + case END: + ((TileTelePad) te).dequeueTeleport(e, false); + break; + case TELEPORT: + ((TileTelePad) te).wasBlocked = message.wasBlocked; + break; + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java index 12d4c776..4ffcbb45 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketUpdateCoords.java @@ -1,62 +1,62 @@ package crazypants.enderio.teleport.telepad; -import io.netty.buffer.ByteBuf; - import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import io.netty.buffer.ByteBuf; -public class PacketUpdateCoords extends MessageTileEntity implements IMessageHandler{ +public class PacketUpdateCoords extends MessageTileEntity + implements IMessageHandler { - public PacketUpdateCoords() { - super(); - } - - private int targetX, targetY, targetZ, targetDim; - - public PacketUpdateCoords(TileTelePad te, int x, int y, int z, int targetDim) { - super(te); - this.targetX = x; - this.targetY = y; - this.targetZ = z; - this.targetDim = targetDim; - } - - public PacketUpdateCoords(TileTelePad te, BlockCoord bc, int targetDim) { - this(te, bc.x, bc.y, bc.z, targetDim); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeInt(targetX); - buf.writeInt(targetY); - buf.writeInt(targetZ); - buf.writeInt(targetDim); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - targetX = buf.readInt(); - targetY = buf.readInt(); - targetZ = buf.readInt(); - targetDim = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketUpdateCoords message, MessageContext ctx) { - TileTelePad te = message.getTileEntity(ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx)); - if(te != null) { - te.setX(message.targetX); - te.setY(message.targetY); - te.setZ(message.targetZ); - te.setTargetDim(message.targetDim); + public PacketUpdateCoords() { + super(); + } + + private int targetX, targetY, targetZ, targetDim; + + public PacketUpdateCoords(TileTelePad te, int x, int y, int z, int targetDim) { + super(te); + this.targetX = x; + this.targetY = y; + this.targetZ = z; + this.targetDim = targetDim; + } + + public PacketUpdateCoords(TileTelePad te, BlockCoord bc, int targetDim) { + this(te, bc.x, bc.y, bc.z, targetDim); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(targetX); + buf.writeInt(targetY); + buf.writeInt(targetZ); + buf.writeInt(targetDim); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + targetX = buf.readInt(); + targetY = buf.readInt(); + targetZ = buf.readInt(); + targetDim = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketUpdateCoords message, MessageContext ctx) { + TileTelePad te = + message.getTileEntity(ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx)); + if (te != null) { + te.setX(message.targetX); + te.setY(message.targetY); + te.setZ(message.targetZ); + te.setTargetDim(message.targetDim); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index d6cb4eb5..2de5f75d 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -1,8 +1,13 @@ package crazypants.enderio.teleport.telepad; +import com.enderio.core.client.render.CubeRenderer; +import com.enderio.core.client.render.TechneModelRenderer; +import com.enderio.core.client.render.TechneUtil; +import com.enderio.core.common.util.BlockCoord; +import com.google.common.collect.Lists; +import crazypants.enderio.EnderIO; import java.util.Collection; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -11,88 +16,81 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.TechneModelRenderer; -import com.enderio.core.client.render.TechneUtil; -import com.enderio.core.common.util.BlockCoord; -import com.google.common.collect.Lists; - -import crazypants.enderio.EnderIO; - public class TelePadRenderer extends TechneModelRenderer { - private final Collection strippedModel = Lists.newArrayList(); + private final Collection strippedModel = Lists.newArrayList(); - public TelePadRenderer() { - super(TechneUtil.getModel(EnderIO.DOMAIN, "models/telePad"), BlockTelePad.renderId); - for (String s : this.model.keySet()) { - if(!s.equals("glass") && !s.contains("blade")) { - strippedModel.add(this.model.get(s)); - } + public TelePadRenderer() { + super(TechneUtil.getModel(EnderIO.DOMAIN, "models/telePad"), BlockTelePad.renderId); + for (String s : this.model.keySet()) { + if (!s.equals("glass") && !s.contains("blade")) { + strippedModel.add(this.model.get(s)); + } + } } - } - protected Collection getModel() { - return strippedModel; - } + protected Collection getModel() { + return strippedModel; + } - @Override - protected Collection getModel(Block block, int metadata) { - return getModel(); - } + @Override + protected Collection getModel(Block block, int metadata) { + return getModel(); + } - @Override - protected Collection getModel(IBlockAccess world, int x, int y, int z) { - return getModel(); - } + @Override + protected Collection getModel(IBlockAccess world, int x, int y, int z) { + return getModel(); + } - Map getFullModel() { - return model; - } + Map getFullModel() { + return model; + } - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); - boolean ret = true; - if (te.inNetwork()) { - if (renderer.hasOverrideBlockTexture()) { - IIcon icon = renderer.overrideBlockTexture; - renderer.renderFaceYNeg(block, x, y, z, icon); - renderer.renderFaceYPos(block, x, y, z, icon); - BlockCoord bc = te.getLocation(); - if (!isTelepad(world, bc, ForgeDirection.EAST)) { - renderer.renderFaceXPos(block, x, y, z, icon); - } - if (!isTelepad(world, bc, ForgeDirection.WEST)) { - renderer.renderFaceXNeg(block, x, y, z, icon); - } - if (!isTelepad(world, bc, ForgeDirection.SOUTH)) { - renderer.renderFaceZPos(block, x, y, z, icon); - } - if (!isTelepad(world, bc, ForgeDirection.NORTH)) { - renderer.renderFaceZNeg(block, x, y, z, icon); - } - } else { - if (te.isMaster()) { - super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + @Override + public boolean renderWorldBlock( + IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); + boolean ret = true; + if (te.inNetwork()) { + if (renderer.hasOverrideBlockTexture()) { + IIcon icon = renderer.overrideBlockTexture; + renderer.renderFaceYNeg(block, x, y, z, icon); + renderer.renderFaceYPos(block, x, y, z, icon); + BlockCoord bc = te.getLocation(); + if (!isTelepad(world, bc, ForgeDirection.EAST)) { + renderer.renderFaceXPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.WEST)) { + renderer.renderFaceXNeg(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.SOUTH)) { + renderer.renderFaceZPos(block, x, y, z, icon); + } + if (!isTelepad(world, bc, ForgeDirection.NORTH)) { + renderer.renderFaceZNeg(block, x, y, z, icon); + } + } else { + if (te.isMaster()) { + super.renderWorldBlock(world, x, y, z, block, modelId, renderer); + } else { + ret = false; + } + } } else { - ret = false; + renderer.renderStandardBlock(block, x, y, z); } - } - } else { - renderer.renderStandardBlock(block, x, y, z); + return ret; } - return ret; - } - - private boolean isTelepad(IBlockAccess world, BlockCoord pos, ForgeDirection dir) { - return pos.getLocation(dir).getTileEntity(world) instanceof TileTelePad; - } - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - Tessellator.instance.startDrawingQuads(); - CubeRenderer.render(block, metadata); - Tessellator.instance.draw(); - } + private boolean isTelepad(IBlockAccess world, BlockCoord pos, ForgeDirection dir) { + return pos.getLocation(dir).getTileEntity(world) instanceof TileTelePad; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + Tessellator.instance.startDrawingQuads(); + CubeRenderer.render(block, metadata); + Tessellator.instance.draw(); + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java index 0c1bb43b..6b592247 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadSpecialRenderer.java @@ -1,102 +1,99 @@ package crazypants.enderio.teleport.telepad; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.GroupObject; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.IconUtil; import com.enderio.core.client.render.TechneUtil; import com.google.common.collect.Lists; - import crazypants.enderio.EnderIO; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; +import java.util.List; +import java.util.Map; +import java.util.Random; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.obj.GroupObject; +import org.lwjgl.opengl.GL11; public class TelePadSpecialRenderer extends TravelEntitySpecialRenderer { - private final Map fullModel; + private final Map fullModel; - private final GroupObject blade1; - private final GroupObject blade2; - private final GroupObject blade3; - // Reverse order for top to bottom - private final List blades; + private final GroupObject blade1; + private final GroupObject blade2; + private final GroupObject blade3; + // Reverse order for top to bottom + private final List blades; - private final GroupObject glass; + private final GroupObject glass; - private static Random rand = new Random(); + private static Random rand = new Random(); - public TelePadSpecialRenderer(TelePadRenderer telePadRenderer) { - super(); - fullModel = telePadRenderer.getFullModel(); - blade1 = fullModel.get("blade1"); - blade2 = fullModel.get("blade2"); - blade3 = fullModel.get("blade3"); - blades = Lists.newArrayList(blade3, blade2, blade1); + public TelePadSpecialRenderer(TelePadRenderer telePadRenderer) { + super(); + fullModel = telePadRenderer.getFullModel(); + blade1 = fullModel.get("blade1"); + blade2 = fullModel.get("blade2"); + blade3 = fullModel.get("blade3"); + blades = Lists.newArrayList(blade3, blade2, blade1); - glass = fullModel.get("glass"); - } + glass = fullModel.get("glass"); + } - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float p_147500_8_) { - TileTelePad tp = (TileTelePad) te; - if (tp.isMaster() && tp.inNetwork()) { - TravelController.instance.addCandidate(tp.getLocation()); - { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y + 0.01, z + 0.5); - Tessellator tes = Tessellator.instance; - tes.setBrightness(0xF000F0); - GL11.glDepthMask(true); - rand.setSeed(te.xCoord + te.yCoord + te.zCoord); - for (int i = 0; i < 3; i++) { - GL11.glPushMatrix(); - GL11.glRotatef(tp.bladeRots[i] + rand.nextInt(360) + (tp.spinSpeed * p_147500_8_ * (i + 20)), 0, 1, 0); - render(blades.get(i), te, tes); - GL11.glPopMatrix(); + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float p_147500_8_) { + TileTelePad tp = (TileTelePad) te; + if (tp.isMaster() && tp.inNetwork()) { + TravelController.instance.addCandidate(tp.getLocation()); + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y + 0.01, z + 0.5); + Tessellator tes = Tessellator.instance; + tes.setBrightness(0xF000F0); + GL11.glDepthMask(true); + rand.setSeed(te.xCoord + te.yCoord + te.zCoord); + for (int i = 0; i < 3; i++) { + GL11.glPushMatrix(); + GL11.glRotatef( + tp.bladeRots[i] + rand.nextInt(360) + (tp.spinSpeed * p_147500_8_ * (i + 20)), 0, 1, 0); + render(blades.get(i), te, tes); + GL11.glPopMatrix(); + } + GL11.glEnable(GL11.GL_BLEND); + render(glass, te, tes); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + } } - GL11.glEnable(GL11.GL_BLEND); - render(glass, te, tes); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); - } + + super.renderTileEntityAt(te, x, y, z, p_147500_8_); } - super.renderTileEntityAt(te, x, y, z, p_147500_8_); - } - - @Override - protected void renderBlock(IBlockAccess world, double sf) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f); - CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTelePad.getHighlightIcon()); - } - - @Override - public IIcon getSelectedIcon() { - return IconUtil.whiteTexture; - } - - @Override - public IIcon getHighlightIcon() { - return IconUtil.whiteTexture; - } - - private void render(GroupObject model, TileEntity te, Tessellator tes) { - final IIcon icon = te.getBlockType().getIcon(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, 0); - if (icon != null && model != null) { - tes.startDrawingQuads(); - TechneUtil.renderWithIcon(model, icon, null, Tessellator.instance, te.getWorldObj(), 0, 0, 0, null, false); - tes.draw(); + @Override + protected void renderBlock(IBlockAccess world, double sf) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.75f); + CubeRenderer.render(BoundingBox.UNIT_CUBE.scale(sf, sf, sf), EnderIO.blockTelePad.getHighlightIcon()); + } + + @Override + public IIcon getSelectedIcon() { + return IconUtil.whiteTexture; + } + + @Override + public IIcon getHighlightIcon() { + return IconUtil.whiteTexture; + } + + private void render(GroupObject model, TileEntity te, Tessellator tes) { + final IIcon icon = te.getBlockType().getIcon(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, 0); + if (icon != null && model != null) { + tes.startDrawingQuads(); + TechneUtil.renderWithIcon(model, icon, null, Tessellator.instance, te.getWorldObj(), 0, 0, 0, null, false); + tes.draw(); + } } - } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java index 65296411..44f93bf0 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java @@ -1,118 +1,115 @@ package crazypants.enderio.teleport.telepad; +import static org.lwjgl.opengl.GL11.*; + +import com.enderio.core.client.render.RenderUtil; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.client.event.RenderLivingEvent; - import org.lwjgl.opengl.GL11; -import com.enderio.core.client.render.RenderUtil; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import static org.lwjgl.opengl.GL11.*; - public class TeleportEntityRenderHandler { - @SubscribeEvent - public void onEntityRender(RenderLivingEvent.Post event) { - - EntityLivingBase e = event.entity; - - if(e.getEntityData().getBoolean(TileTelePad.TELEPORTING_KEY)) { + @SubscribeEvent + public void onEntityRender(RenderLivingEvent.Post event) { - float radius = e.width / 2.0F; - AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(-radius, 0, -radius, radius, e.height + 0.25, radius); + EntityLivingBase e = event.entity; - glPushMatrix(); - glPushAttrib(GL_ALL_ATTRIB_BITS); - glDisable(GL_TEXTURE_2D); - glShadeModel(GL_SMOOTH); - glEnable(GL_BLEND); - OpenGlHelper.glBlendFunc(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE); - glDisable(GL_ALPHA_TEST); - glEnable(GL_CULL_FACE); - glDisable(GL_LIGHTING); - glDepthMask(false); - glTranslated(event.x, event.y, event.z); - bb = bb.expand(0.5, 0, 0.5); - float speed = e.getEntityData().getFloat(TileTelePad.PROGRESS_KEY) * 1.2f; - float rot = (e.getEntityData().getFloat("teleportrotation")) + speed; - glRotatef(rot + RenderUtil.getTimer().renderPartialTicks + e.ticksExisted, 0, 1, 0); + if (e.getEntityData().getBoolean(TileTelePad.TELEPORTING_KEY)) { - double yMax = bb.maxY + 1; + float radius = e.width / 2.0F; + AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(-radius, 0, -radius, radius, e.height + 0.25, radius); - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); + glPushMatrix(); + glPushAttrib(GL_ALL_ATTRIB_BITS); + glDisable(GL_TEXTURE_2D); + glShadeModel(GL_SMOOTH); + glEnable(GL_BLEND); + OpenGlHelper.glBlendFunc(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE); + glDisable(GL_ALPHA_TEST); + glEnable(GL_CULL_FACE); + glDisable(GL_LIGHTING); + glDepthMask(false); + glTranslated(event.x, event.y, event.z); + bb = bb.expand(0.5, 0, 0.5); + float speed = e.getEntityData().getFloat(TileTelePad.PROGRESS_KEY) * 1.2f; + float rot = (e.getEntityData().getFloat("teleportrotation")) + speed; + glRotatef(rot + RenderUtil.getTimer().renderPartialTicks + e.ticksExisted, 0, 1, 0); - colorBot(tes); - tes.addVertex(bb.minX, bb.minY, bb.minZ); - tes.addVertex(bb.minX, bb.minY, bb.maxZ); - colorTop(tes); - tes.addVertex(bb.minX, yMax, bb.maxZ); - tes.addVertex(bb.minX, yMax, bb.minZ); - colorBot(tes); - tes.addVertex(bb.minX, bb.minY, bb.maxZ); - tes.addVertex(bb.minX, bb.minY, bb.minZ); - colorTop(tes); - tes.addVertex(bb.minX, yMax, bb.minZ); - tes.addVertex(bb.minX, yMax, bb.maxZ); - - colorBot(tes); - tes.addVertex(bb.maxX, bb.minY, bb.minZ); - tes.addVertex(bb.maxX, bb.minY, bb.maxZ); - colorTop(tes); - tes.addVertex(bb.maxX, yMax, bb.maxZ); - tes.addVertex(bb.maxX, yMax, bb.minZ); - colorBot(tes); - tes.addVertex(bb.maxX, bb.minY, bb.maxZ); - tes.addVertex(bb.maxX, bb.minY, bb.minZ); - colorTop(tes); - tes.addVertex(bb.maxX, yMax, bb.minZ); - tes.addVertex(bb.maxX, yMax, bb.maxZ); - - colorBot(tes); - tes.addVertex(bb.minX, bb.minY, bb.minZ); - tes.addVertex(bb.maxX, bb.minY, bb.minZ); - colorTop(tes); - tes.addVertex(bb.maxX, yMax, bb.minZ); - tes.addVertex(bb.minX, yMax, bb.minZ); - colorBot(tes); - tes.addVertex(bb.maxX, bb.minY, bb.minZ); - tes.addVertex(bb.minX, bb.minY, bb.minZ); - colorTop(tes); - tes.addVertex(bb.minX, yMax, bb.minZ); - tes.addVertex(bb.maxX, yMax, bb.minZ); - - colorBot(tes); - tes.addVertex(bb.minX, bb.minY, bb.maxZ); - tes.addVertex(bb.maxX, bb.minY, bb.maxZ); - colorTop(tes); - tes.addVertex(bb.maxX, yMax, bb.maxZ); - tes.addVertex(bb.minX, yMax, bb.maxZ); - colorBot(tes); - tes.addVertex(bb.maxX, bb.minY, bb.maxZ); - tes.addVertex(bb.minX, bb.minY, bb.maxZ); - colorTop(tes); - tes.addVertex(bb.minX, yMax, bb.maxZ); - tes.addVertex(bb.maxX, yMax, bb.maxZ); + double yMax = bb.maxY + 1; - tes.draw(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); - GL11.glPopAttrib(); - GL11.glPopMatrix(); - - e.getEntityData().setFloat("teleportrotation", rot); + colorBot(tes); + tes.addVertex(bb.minX, bb.minY, bb.minZ); + tes.addVertex(bb.minX, bb.minY, bb.maxZ); + colorTop(tes); + tes.addVertex(bb.minX, yMax, bb.maxZ); + tes.addVertex(bb.minX, yMax, bb.minZ); + colorBot(tes); + tes.addVertex(bb.minX, bb.minY, bb.maxZ); + tes.addVertex(bb.minX, bb.minY, bb.minZ); + colorTop(tes); + tes.addVertex(bb.minX, yMax, bb.minZ); + tes.addVertex(bb.minX, yMax, bb.maxZ); + + colorBot(tes); + tes.addVertex(bb.maxX, bb.minY, bb.minZ); + tes.addVertex(bb.maxX, bb.minY, bb.maxZ); + colorTop(tes); + tes.addVertex(bb.maxX, yMax, bb.maxZ); + tes.addVertex(bb.maxX, yMax, bb.minZ); + colorBot(tes); + tes.addVertex(bb.maxX, bb.minY, bb.maxZ); + tes.addVertex(bb.maxX, bb.minY, bb.minZ); + colorTop(tes); + tes.addVertex(bb.maxX, yMax, bb.minZ); + tes.addVertex(bb.maxX, yMax, bb.maxZ); + + colorBot(tes); + tes.addVertex(bb.minX, bb.minY, bb.minZ); + tes.addVertex(bb.maxX, bb.minY, bb.minZ); + colorTop(tes); + tes.addVertex(bb.maxX, yMax, bb.minZ); + tes.addVertex(bb.minX, yMax, bb.minZ); + colorBot(tes); + tes.addVertex(bb.maxX, bb.minY, bb.minZ); + tes.addVertex(bb.minX, bb.minY, bb.minZ); + colorTop(tes); + tes.addVertex(bb.minX, yMax, bb.minZ); + tes.addVertex(bb.maxX, yMax, bb.minZ); + + colorBot(tes); + tes.addVertex(bb.minX, bb.minY, bb.maxZ); + tes.addVertex(bb.maxX, bb.minY, bb.maxZ); + colorTop(tes); + tes.addVertex(bb.maxX, yMax, bb.maxZ); + tes.addVertex(bb.minX, yMax, bb.maxZ); + colorBot(tes); + tes.addVertex(bb.maxX, bb.minY, bb.maxZ); + tes.addVertex(bb.minX, bb.minY, bb.maxZ); + colorTop(tes); + tes.addVertex(bb.minX, yMax, bb.maxZ); + tes.addVertex(bb.maxX, yMax, bb.maxZ); + + tes.draw(); + + GL11.glPopAttrib(); + GL11.glPopMatrix(); + + e.getEntityData().setFloat("teleportrotation", rot); + } } - } - private void colorBot(Tessellator tes) { - tes.setColorRGBA(175, 255, 255, 100); - } + private void colorBot(Tessellator tes) { + tes.setColorRGBA(175, 255, 255, 100); + } - private void colorTop(Tessellator tes) { - tes.setColorRGBA(220, 255, 255, 0); - } + private void colorTop(Tessellator tes) { + tes.setColorRGBA(220, 255, 255, 0); + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 04a965ac..6d731d33 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -1,9 +1,31 @@ package crazypants.enderio.teleport.telepad; +import cofh.api.energy.EnergyStorage; +import com.enderio.core.api.common.util.IProgressTile; +import com.enderio.core.common.util.BlockCoord; +import com.enderio.core.common.util.Util; +import com.google.common.base.Throwables; +import com.google.common.collect.Lists; +import com.google.common.collect.Queues; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.api.teleport.ITelePad; +import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.MachineSound; +import crazypants.enderio.machine.PacketPowerStorage; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.rail.TeleporterEIO; +import crazypants.enderio.teleport.TravelController; +import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import crazypants.enderio.teleport.packet.PacketTravelEvent; +import crazypants.enderio.teleport.telepad.PacketTeleport.Type; import java.util.EnumSet; import java.util.List; import java.util.Queue; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -22,727 +44,722 @@ import net.minecraft.world.Teleporter; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.EnergyStorage; - -import com.enderio.core.api.common.util.IProgressTile; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Util; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; -import com.google.common.collect.Queues; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.api.teleport.ITelePad; -import crazypants.enderio.api.teleport.TravelSource; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.MachineSound; -import crazypants.enderio.machine.PacketPowerStorage; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.IInternalPowerReceiver; -import crazypants.enderio.rail.TeleporterEIO; -import crazypants.enderio.teleport.TravelController; -import crazypants.enderio.teleport.anchor.TileTravelAnchor; -import crazypants.enderio.teleport.packet.PacketTravelEvent; -import crazypants.enderio.teleport.telepad.PacketTeleport.Type; public class TileTelePad extends TileTravelAnchor implements IInternalPowerReceiver, ITelePad, IProgressTile { - - private boolean inNetwork; - private boolean isMaster; - private EnergyStorage energy = new EnergyStorage(Config.telepadPowerStorageRF, Config.telepadPowerPerTickRF, - Config.telepadPowerPerTickRF); + private boolean inNetwork; + private boolean isMaster; - private TileTelePad master = null; + private EnergyStorage energy = + new EnergyStorage(Config.telepadPowerStorageRF, Config.telepadPowerPerTickRF, Config.telepadPowerPerTickRF); - private boolean autoUpdate = false; + private TileTelePad master = null; - private boolean coordsChanged = false; + private boolean autoUpdate = false; - private BlockCoord target = new BlockCoord(); - private int targetDim = Integer.MIN_VALUE; - - private int lastSyncPowerStored; + private boolean coordsChanged = false; - private Queue toTeleport = Queues.newArrayDeque(); - private int powerUsed; - private int maxPower; + private BlockCoord target = new BlockCoord(); + private int targetDim = Integer.MIN_VALUE; - private static final ResourceLocation activeRes = AbstractMachineEntity.getSoundFor("telepad.active"); - private MachineSound activeSound = null; - - private boolean redstoneActivePrev; - - public static final String TELEPORTING_KEY = "eio:teleporting"; - public static final String PROGRESS_KEY = "teleportprogress"; - - boolean wasBlocked = false; - - // Clientside rendering data - public float[] bladeRots = new float[3]; - public float spinSpeed = 0; - public float speedMult = 2.5f; - - @Override - public void doUpdate() { - super.doUpdate(); - - // my master is gone! - if(master != null && master.isInvalid()) { - master.breakNetwork(); - } - - if(autoUpdate) { - updateConnectedState(true); - autoUpdate = false; - } + private int lastSyncPowerStored; - if(targetDim == Integer.MIN_VALUE) { - targetDim = worldObj.provider.dimensionId; - } - - if(worldObj.isRemote && isMaster()) { - updateRotations(); - if(activeSound != null) { - activeSound.setPitch(MathHelper.clamp_float(0.5f + (spinSpeed / 1.5f), 0.5f, 2)); - } - if(active()) { - if(activeSound == null) { - activeSound = new MachineSound(activeRes, xCoord, yCoord, zCoord, 0.3f, 1); - playSound(); + private Queue toTeleport = Queues.newArrayDeque(); + private int powerUsed; + private int maxPower; + + private static final ResourceLocation activeRes = AbstractMachineEntity.getSoundFor("telepad.active"); + private MachineSound activeSound = null; + + private boolean redstoneActivePrev; + + public static final String TELEPORTING_KEY = "eio:teleporting"; + public static final String PROGRESS_KEY = "teleportprogress"; + + boolean wasBlocked = false; + + // Clientside rendering data + public float[] bladeRots = new float[3]; + public float spinSpeed = 0; + public float speedMult = 2.5f; + + @Override + public void doUpdate() { + super.doUpdate(); + + // my master is gone! + if (master != null && master.isInvalid()) { + master.breakNetwork(); } - updateQueuedEntities(); - } else if(!active() && activeSound != null) { - if(activeSound.getPitch() <= 0.5f) { - activeSound.endPlaying(); - activeSound = null; + + if (autoUpdate) { + updateConnectedState(true); + autoUpdate = false; } - } - } else if(!worldObj.isRemote) { - if(active()) { - if(powerUsed >= maxPower) { - teleport(toTeleport.poll()); - powerUsed = 0; - } else { - powerUsed += energy.extractEnergy(Math.min(getUsage(), maxPower), false); + + if (targetDim == Integer.MIN_VALUE) { + targetDim = worldObj.provider.dimensionId; } - if(shouldDoWorkThisTick(5)) { - updateQueuedEntities(); + + if (worldObj.isRemote && isMaster()) { + updateRotations(); + if (activeSound != null) { + activeSound.setPitch(MathHelper.clamp_float(0.5f + (spinSpeed / 1.5f), 0.5f, 2)); + } + if (active()) { + if (activeSound == null) { + activeSound = new MachineSound(activeRes, xCoord, yCoord, zCoord, 0.3f, 1); + playSound(); + } + updateQueuedEntities(); + } else if (!active() && activeSound != null) { + if (activeSound.getPitch() <= 0.5f) { + activeSound.endPlaying(); + activeSound = null; + } + } + } else if (!worldObj.isRemote) { + if (active()) { + if (powerUsed >= maxPower) { + teleport(toTeleport.poll()); + powerUsed = 0; + } else { + powerUsed += energy.extractEnergy(Math.min(getUsage(), maxPower), false); + } + if (shouldDoWorkThisTick(5)) { + updateQueuedEntities(); + } + } + + boolean powerChanged = (lastSyncPowerStored != getEnergyStored() && shouldDoWorkThisTick(5)); + if (powerChanged) { + lastSyncPowerStored = getEnergyStored(); + PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); + } + if (coordsChanged && inNetwork() && master != null && isMaster()) { + coordsChanged = false; + PacketHandler.sendToAllAround( + new PacketUpdateCoords( + master, master.getX(), master.getY(), master.getZ(), master.getTargetDim()), + master); + } } - } - - boolean powerChanged = (lastSyncPowerStored != getEnergyStored() && shouldDoWorkThisTick(5)); - if(powerChanged) { - lastSyncPowerStored = getEnergyStored(); - PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); - } - if(coordsChanged && inNetwork() && master != null && isMaster()) { - coordsChanged = false; - PacketHandler.sendToAllAround(new PacketUpdateCoords(master, master.getX(), master.getY(), master.getZ(), master.getTargetDim()), master); - } } - } - @SideOnly(Side.CLIENT) - private void playSound() { - FMLClientHandler.instance().getClient().getSoundHandler().playSound(activeSound); - } - - private void updateQueuedEntities() { - if(worldObj.isRemote) { - if(active()) { - getCurrentTarget().getEntityData().setFloat(PROGRESS_KEY, getProgress()); - } + @SideOnly(Side.CLIENT) + private void playSound() { + FMLClientHandler.instance().getClient().getSoundHandler().playSound(activeSound); } - List toRemove = Lists.newArrayList(); - for (Entity e : toTeleport) { - if(!isEntityInRange(e) || e.isDead) { - toRemove.add(e); - } + + private void updateQueuedEntities() { + if (worldObj.isRemote) { + if (active()) { + getCurrentTarget().getEntityData().setFloat(PROGRESS_KEY, getProgress()); + } + } + List toRemove = Lists.newArrayList(); + for (Entity e : toTeleport) { + if (!isEntityInRange(e) || e.isDead) { + toRemove.add(e); + } + } + for (Entity e : toRemove) { + dequeueTeleport(e, true); + } } - for (Entity e : toRemove) { - dequeueTeleport(e, true); + + public void updateConnectedState(boolean fromBlock) { + + EnumSet connections = EnumSet.noneOf(ForgeDirection.class); + + for (BlockCoord bc : getSurroundingCoords()) { + TileEntity te = bc.getTileEntity(worldObj); + ForgeDirection con = Util.getDirFromOffset(bc.x - xCoord, 0, bc.z - zCoord); + if (te instanceof TileTelePad) { + // let's find the master and let him do the work + if (fromBlock) { + // Recurse to all adjacent (diagonal and axis-aligned) telepads, but only 1 deep. + ((TileTelePad) te).updateConnectedState(false); + // If that telepad turned into a master, we can stop our search, as we were added to its network + if (((TileTelePad) te).inNetwork() && !inNetwork) { + return; + } + } + // otherwise we either are the master or this is a secondary call, so update connections + if (con != ForgeDirection.UNKNOWN && !((TileTelePad) te).inNetwork()) { + connections.add(con); + } + } else { + connections.remove(con); + if (master == this) { + breakNetwork(); + updateBlock(); + } else if (con != ForgeDirection.UNKNOWN) { + if (inNetwork() && master != null && fromBlock) { + master.updateConnectedState(false); + } + } + } + } + if (connections.size() == 4 && !inNetwork()) { + inNetwork = formNetwork(); + updateBlock(); + if (inNetwork()) { + if (target.equals(new BlockCoord())) { + target = new BlockCoord(this); + } + } + } } - } - public void updateConnectedState(boolean fromBlock) { - - EnumSet connections = EnumSet.noneOf(ForgeDirection.class); - - for (BlockCoord bc : getSurroundingCoords()) { - TileEntity te = bc.getTileEntity(worldObj); - ForgeDirection con = Util.getDirFromOffset(bc.x - xCoord, 0, bc.z - zCoord); - if(te instanceof TileTelePad) { - // let's find the master and let him do the work - if (fromBlock) { - // Recurse to all adjacent (diagonal and axis-aligned) telepads, but only 1 deep. - ((TileTelePad) te).updateConnectedState(false); - // If that telepad turned into a master, we can stop our search, as we were added to its network - if (((TileTelePad) te).inNetwork() && !inNetwork) { + public void updateRedstoneState() { + if (!inNetwork()) { return; - } } - // otherwise we either are the master or this is a secondary call, so update connections - if (con != ForgeDirection.UNKNOWN && !((TileTelePad) te).inNetwork()) { - connections.add(con); - } - } else { - connections.remove(con); - if(master == this) { - breakNetwork(); - updateBlock(); - } else if(con != ForgeDirection.UNKNOWN) { - if(inNetwork() && master != null && fromBlock) { - master.updateConnectedState(false); - } - } - } - } - if(connections.size() == 4 && !inNetwork()) { - inNetwork = formNetwork(); - updateBlock(); - if(inNetwork()) { - if(target.equals(new BlockCoord())) { - target = new BlockCoord(this); - } - } - } - } - public void updateRedstoneState() { - if(!inNetwork()) { - return; + boolean redstone = isPoweredRedstone(); + if (!master.redstoneActivePrev && redstone) { + teleportAll(); + } + master.redstoneActivePrev = redstone; } - boolean redstone = isPoweredRedstone(); - if(!master.redstoneActivePrev && redstone) { - teleportAll(); - } - master.redstoneActivePrev = redstone; - } + private boolean formNetwork() { + List temp = Lists.newArrayList(); - private boolean formNetwork() { - List temp = Lists.newArrayList(); - - for (BlockCoord c : getSurroundingCoords()) { - TileEntity te = c.getTileEntity(worldObj); - if (!(te instanceof TileTelePad) || ((TileTelePad)te).inNetwork()) { + for (BlockCoord c : getSurroundingCoords()) { + TileEntity te = c.getTileEntity(worldObj); + if (!(te instanceof TileTelePad) || ((TileTelePad) te).inNetwork()) { + return false; + } + temp.add((TileTelePad) te); + } + + for (TileTelePad te : temp) { + te.master = this; + te.inNetwork = true; + te.updateBlock(); + te.updateNeighborTEs(); + } + this.master = this; + this.isMaster = true; + return true; + } + + private void breakNetwork() { + master = null; + inNetwork = false; + isMaster = false; + for (BlockCoord c : getSurroundingCoords()) { + TileEntity te = c.getTileEntity(worldObj); + if (te instanceof TileTelePad) { + TileTelePad telepad = (TileTelePad) te; + telepad.master = null; + telepad.inNetwork = false; + telepad.updateBlock(); + telepad.updateNeighborTEs(); + } + } + } + + private List getSurroundingCoords() { + List ret = Lists.newArrayList(); + for (int x = -1; x <= 1; x++) { + for (int z = -1; z <= 1; z++) { + if (x != 0 || z != 0) { + ret.add(new BlockCoord(xCoord + x, yCoord, zCoord + z)); + } + } + } + return ret; + } + + private void updateNeighborTEs() { + BlockCoord bc = new BlockCoord(this); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord neighbor = bc.getLocation(dir); + Block block = neighbor.getBlock(worldObj); + if (!(block instanceof BlockTelePad)) { + block.onNeighborChange(worldObj, neighbor.x, neighbor.y, neighbor.z, xCoord, yCoord, zCoord); + } + } + } + + @Override + public boolean shouldUpdate() { + return true; + } + + @Override + protected void writeCustomNBT(NBTTagCompound root) { + super.writeCustomNBT(root); + energy.writeToNBT(root); + target.writeToNBT(root); + root.setInteger("targetDim", targetDim); + root.setBoolean("redstoneActive", redstoneActivePrev); + } + + @Override + protected void readCustomNBT(NBTTagCompound root) { + super.readCustomNBT(root); + energy.readFromNBT(root); + target = BlockCoord.readFromNBT(root); + targetDim = root.getInteger("targetDim"); + redstoneActivePrev = root.getBoolean("redstoneActive"); + autoUpdate = true; + } + + @Override + public Packet getDescriptionPacket() { + S35PacketUpdateTileEntity pkt = (S35PacketUpdateTileEntity) super.getDescriptionPacket(); + // pkt.func_148857_g().setBoolean("inNetwork", inNetwork); + return pkt; + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + // this.inNetwork = pkt.func_148857_g().getBoolean("inNetwork"); + } + + @Override + public void invalidate() { + super.invalidate(); + if (worldObj.isRemote) { + stopPlayingSound(); + } + } + + @Override + public void onChunkUnload() { + super.onChunkUnload(); + if (worldObj.isRemote) { + stopPlayingSound(); + } + } + + private void stopPlayingSound() { + if (activeSound != null) { + activeSound.endPlaying(); + activeSound = null; + } + } + + public int getPowerScaled(int scale) { + return (int) ((((float) getEnergyStored()) / ((float) getMaxEnergyStored())) * scale); + } + + private int calculateTeleportPower() { + if (worldObj.provider.dimensionId == targetDim) { + int distance = new BlockCoord(this).getDist(target); + double base = Math.log((0.005 * distance) + 1); + this.maxPower = (int) (base * Config.telepadPowerCoefficient); + if (this.maxPower <= 0) { + this.maxPower = 1; + } + } else { + this.maxPower = Config.telepadPowerInterdimensional; + } + return this.maxPower; + } + + public boolean active() { + return !toTeleport.isEmpty(); + } + + public Entity getCurrentTarget() { + return toTeleport.peek(); + } + + public AxisAlignedBB getBoundingBox() { + if (!inNetwork()) { + return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + } + TileTelePad master = getMaster(); + return AxisAlignedBB.getBoundingBox( + master.xCoord - 1, + master.yCoord, + master.zCoord - 1, + master.xCoord + 2, + master.yCoord + 1, + master.zCoord + 2); + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return getBoundingBox(); + } + + public void updateRotations() { + if (active()) { + spinSpeed = getProgress() * 2; + } else { + spinSpeed = Math.max(0, spinSpeed - 0.025f); + } + + for (int i = 0; i < bladeRots.length; i++) { + bladeRots[i] += spinSpeed * ((i * 2) + 20); + bladeRots[i] %= 360; + } + } + + /* IProgressTile */ + + @Override + public float getProgress() { + return ((float) powerUsed) / ((float) maxPower); + } + + @Override + protected int getProgressUpdateFreq() { + return 1; + } + + @Override + public void setProgress(float progress) { + this.powerUsed = progress < 0 ? 0 : (int) (((float) maxPower) * progress); + } + + @Override + public TileEntity getTileEntity() { + return this; + } + + /* ITravelAccessable */ + @Override + public boolean isTravelSource() { + return isMaster() && inNetwork(); + } + + @Override + public boolean isVisible() { + return super.isVisible() && isTravelSource(); + } + + /* ITelePad */ + + @Override + public boolean isMaster() { + return isMaster; + } + + @Override + public TileTelePad getMaster() { + return master; + } + + @Override + public boolean inNetwork() { + return inNetwork; + } + + @Override + public int getX() { + if (inNetwork()) { + return master.target.x; + } + return target.x; + } + + @Override + public int getY() { + if (inNetwork()) { + return master.target.y; + } + return target.y; + } + + @Override + public int getZ() { + if (inNetwork()) { + return master.target.z; + } + return target.z; + } + + @Override + public int getTargetDim() { + if (inNetwork()) { + return master.targetDim; + } + return targetDim; + } + + @Override + public ITelePad setX(int x) { + return Config.telepadLockCoords ? null : setX_internal(x); + } + + @Override + public ITelePad setY(int y) { + return Config.telepadLockCoords ? null : setY_internal(y); + } + + @Override + public ITelePad setZ(int z) { + return Config.telepadLockCoords ? null : setZ_internal(z); + } + + @Override + public ITelePad setTargetDim(int dimID) { + return Config.telepadLockDimension ? null : setTargetDim_internal(dimID); + } + + @Override + public void setCoords(BlockCoord coords) { + if (!Config.telepadLockCoords) { + setCoords_internal(coords); + } + } + + ITelePad setX_internal(int x) { + if (inNetwork()) { + setCoords(new BlockCoord(x, target.y, target.z)); + return master; + } + return null; + } + + ITelePad setY_internal(int y) { + if (inNetwork()) { + setCoords(new BlockCoord(target.x, y, target.z)); + return master; + } + return null; + } + + ITelePad setZ_internal(int z) { + if (inNetwork()) { + setCoords(new BlockCoord(target.x, target.y, z)); + return master; + } + return null; + } + + ITelePad setTargetDim_internal(int dimID) { + if (inNetwork()) { + master.targetDim = dimID; + coordsChanged = true; + return master; + } + return null; + } + + void setCoords_internal(BlockCoord coords) { + if (inNetwork()) { + if (isMaster()) { + this.target = coords; + this.coordsChanged = true; + } else { + this.master.setCoords_internal(coords); + } + } + } + + @Override + public void teleportSpecific(Entity entity) { + if (!inNetwork()) { + return; + } + if (isMaster()) { + if (isEntityInRange(entity)) { + enqueueTeleport(entity, true); + } + } else { + master.teleportSpecific(entity); + } + } + + @Override + public void teleportAll() { + if (!inNetwork()) { + return; + } + if (isMaster()) { + for (Entity e : getEntitiesInRange()) { + enqueueTeleport(e, true); + } + } else { + master.teleportAll(); + } + } + + @SuppressWarnings("unchecked") + private List getEntitiesInRange() { + return worldObj.getEntitiesWithinAABB(Entity.class, getRange()); + } + + private boolean isEntityInRange(Entity entity) { + return getRange().isVecInside(Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ)); + } + + private AxisAlignedBB getRange() { + return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); + } + + void enqueueTeleport(Entity entity, boolean sendUpdate) { + if (entity == null || toTeleport.contains(entity)) { + return; + } + + calculateTeleportPower(); + entity.getEntityData().setBoolean(TELEPORTING_KEY, true); + toTeleport.add(entity); + if (sendUpdate) { + if (entity.worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketTeleport(Type.BEGIN, this, entity.getEntityId())); + } else { + PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.BEGIN, this, entity.getEntityId())); + } + } + } + + void dequeueTeleport(Entity entity, boolean sendUpdate) { + if (entity == null) { + return; + } + toTeleport.remove(entity); + entity.getEntityData().setBoolean(TELEPORTING_KEY, false); + if (sendUpdate) { + if (worldObj.isRemote) { + PacketHandler.INSTANCE.sendToServer(new PacketTeleport(Type.END, this, entity.getEntityId())); + } else { + PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.END, this, entity.getEntityId())); + } + } + if (!active()) { + powerUsed = 0; + } + } + + private boolean teleport(Entity entity) { + if (maxPower > 0) { + entity.getEntityData().setBoolean(TELEPORTING_KEY, false); + wasBlocked = !(entity.worldObj.isRemote ? clientTeleport(entity) : serverTeleport(entity)); + PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.TELEPORT, this, wasBlocked)); + return !wasBlocked; + } return false; - } - temp.add((TileTelePad) te); } - - for (TileTelePad te : temp) { - te.master = this; - te.inNetwork = true; - te.updateBlock(); - te.updateNeighborTEs(); - } - this.master = this; - this.isMaster = true; - return true; - } - private void breakNetwork() { - master = null; - inNetwork = false; - isMaster = false; - for (BlockCoord c : getSurroundingCoords()) { - TileEntity te = c.getTileEntity(worldObj); - if(te instanceof TileTelePad) { - TileTelePad telepad = (TileTelePad) te; - telepad.master = null; - telepad.inNetwork = false; - telepad.updateBlock(); - telepad.updateNeighborTEs(); - } - } - } - - private List getSurroundingCoords() { - List ret = Lists.newArrayList(); - for (int x = -1; x <= 1; x++) { - for (int z = -1; z <= 1; z++) { - if(x != 0 || z != 0) { - ret.add(new BlockCoord(xCoord + x, yCoord, zCoord + z)); + private boolean clientTeleport(Entity entity) { + if (entity.worldObj.provider.dimensionId == targetDim) { + return TravelController.instance.doClientTeleport(entity, target, TravelSource.TELEPAD, 0, false); } - } - } - return ret; - } - - private void updateNeighborTEs() { - BlockCoord bc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord neighbor = bc.getLocation(dir); - Block block = neighbor.getBlock(worldObj); - if(!(block instanceof BlockTelePad)) { - block.onNeighborChange(worldObj, neighbor.x, neighbor.y, neighbor.z, xCoord, yCoord, zCoord); - } - } - } - - @Override - public boolean shouldUpdate() { - return true; - } - - @Override - protected void writeCustomNBT(NBTTagCompound root) { - super.writeCustomNBT(root); - energy.writeToNBT(root); - target.writeToNBT(root); - root.setInteger("targetDim", targetDim); - root.setBoolean("redstoneActive", redstoneActivePrev); - } - - @Override - protected void readCustomNBT(NBTTagCompound root) { - super.readCustomNBT(root); - energy.readFromNBT(root); - target = BlockCoord.readFromNBT(root); - targetDim = root.getInteger("targetDim"); - redstoneActivePrev = root.getBoolean("redstoneActive"); - autoUpdate = true; - } - - @Override - public Packet getDescriptionPacket() { - S35PacketUpdateTileEntity pkt = (S35PacketUpdateTileEntity) super.getDescriptionPacket(); -// pkt.func_148857_g().setBoolean("inNetwork", inNetwork); - return pkt; - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); -// this.inNetwork = pkt.func_148857_g().getBoolean("inNetwork"); - } - - @Override - public void invalidate() { - super.invalidate(); - if(worldObj.isRemote) { - stopPlayingSound(); - } - } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - if(worldObj.isRemote) { - stopPlayingSound(); - } - } - - private void stopPlayingSound() { - if(activeSound != null) { - activeSound.endPlaying(); - activeSound = null; - } - } - - public int getPowerScaled(int scale) { - return (int) ((((float) getEnergyStored()) / ((float) getMaxEnergyStored())) * scale); - } - - private int calculateTeleportPower() { - if (worldObj.provider.dimensionId == targetDim) { - int distance = new BlockCoord(this).getDist(target); - double base = Math.log((0.005 * distance) + 1); - this.maxPower = (int) (base * Config.telepadPowerCoefficient); - if (this.maxPower <= 0) { - this.maxPower = 1; - } - } else { - this.maxPower = Config.telepadPowerInterdimensional; - } - return this.maxPower; - } - - public boolean active() { - return !toTeleport.isEmpty(); - } - - public Entity getCurrentTarget() { - return toTeleport.peek(); - } - - public AxisAlignedBB getBoundingBox() { - if(!inNetwork()) { - return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); - } - TileTelePad master = getMaster(); - return AxisAlignedBB.getBoundingBox(master.xCoord - 1, master.yCoord, master.zCoord - 1, master.xCoord + 2, master.yCoord + 1, master.zCoord + 2); - } - - @Override - public AxisAlignedBB getRenderBoundingBox() { - return getBoundingBox(); - } - - public void updateRotations() { - if(active()) { - spinSpeed = getProgress() * 2; - } else { - spinSpeed = Math.max(0, spinSpeed - 0.025f); - } - - for (int i = 0; i < bladeRots.length; i++) { - bladeRots[i] += spinSpeed * ((i * 2) + 20); - bladeRots[i] %= 360; - } - } - - /* IProgressTile */ - - @Override - public float getProgress() { - return ((float) powerUsed) / ((float) maxPower); - } - - @Override - protected int getProgressUpdateFreq() { - return 1; - } - - @Override - public void setProgress(float progress) { - this.powerUsed = progress < 0 ? 0 : (int) (((float) maxPower) * progress); - } - - @Override - public TileEntity getTileEntity() { - return this; - } - - /* ITravelAccessable */ - @Override - public boolean isTravelSource() { - return isMaster() && inNetwork(); - } - - @Override - public boolean isVisible() { - return super.isVisible() && isTravelSource(); - } - - /* ITelePad */ - - @Override - public boolean isMaster() { - return isMaster; - } - - @Override - public TileTelePad getMaster() { - return master; - } - - @Override - public boolean inNetwork() { - return inNetwork; - } - - @Override - public int getX() { - if(inNetwork()) { - return master.target.x; - } - return target.x; - } - - @Override - public int getY() { - if(inNetwork()) { - return master.target.y; - } - return target.y; - } - - @Override - public int getZ() { - if(inNetwork()) { - return master.target.z; - } - return target.z; - } - - @Override - public int getTargetDim() { - if(inNetwork()) { - return master.targetDim; - } - return targetDim; - } - - @Override - public ITelePad setX(int x) { - return Config.telepadLockCoords ? null : setX_internal(x); - } - - @Override - public ITelePad setY(int y) { - return Config.telepadLockCoords ? null : setY_internal(y); - } - - @Override - public ITelePad setZ(int z) { - return Config.telepadLockCoords ? null : setZ_internal(z); - } - - @Override - public ITelePad setTargetDim(int dimID) { - return Config.telepadLockDimension ? null : setTargetDim_internal(dimID); - } - - @Override - public void setCoords(BlockCoord coords) { - if(!Config.telepadLockCoords) { - setCoords_internal(coords); - } - } - - ITelePad setX_internal(int x) { - if(inNetwork()) { - setCoords(new BlockCoord(x, target.y, target.z)); - return master; - } - return null; - } - - ITelePad setY_internal(int y) { - if(inNetwork()) { - setCoords(new BlockCoord(target.x, y, target.z)); - return master; - } - return null; - } - - ITelePad setZ_internal(int z) { - if(inNetwork()) { - setCoords(new BlockCoord(target.x, target.y, z)); - return master; - } - return null; - } - - ITelePad setTargetDim_internal(int dimID) { - if(inNetwork()) { - master.targetDim = dimID; - coordsChanged = true; - return master; - } - return null; - } - - void setCoords_internal(BlockCoord coords) { - if(inNetwork()) { - if(isMaster()) { - this.target = coords; - this.coordsChanged = true; - } else { - this.master.setCoords_internal(coords); - } - } - } - - @Override - public void teleportSpecific(Entity entity) { - if(!inNetwork()) { - return; - } - if(isMaster()) { - if(isEntityInRange(entity)) { - enqueueTeleport(entity, true); - } - } else { - master.teleportSpecific(entity); - } - } - - @Override - public void teleportAll() { - if(!inNetwork()) { - return; - } - if(isMaster()) { - for (Entity e : getEntitiesInRange()) { - enqueueTeleport(e, true); - } - } else { - master.teleportAll(); - } - } - - @SuppressWarnings("unchecked") - private List getEntitiesInRange() { - return worldObj.getEntitiesWithinAABB(Entity.class, getRange()); - } - - private boolean isEntityInRange(Entity entity) { - return getRange().isVecInside(Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ)); - } - - private AxisAlignedBB getRange() { - return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); - } - - void enqueueTeleport(Entity entity, boolean sendUpdate) { - if(entity == null || toTeleport.contains(entity)) { - return; + return true; } - calculateTeleportPower(); - entity.getEntityData().setBoolean(TELEPORTING_KEY, true); - toTeleport.add(entity); - if(sendUpdate) { - if(entity.worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketTeleport(Type.BEGIN, this, entity.getEntityId())); - } else { - PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.BEGIN, this, entity.getEntityId())); - } - } - } + private boolean serverTeleport(Entity entity) { + dequeueTeleport(entity, true); + int from = entity.dimension; + if (from != targetDim) { + MinecraftServer server = MinecraftServer.getServer(); + WorldServer fromDim = server.worldServerForDimension(from); + WorldServer toDim = server.worldServerForDimension(targetDim); + Teleporter teleporter = new TeleporterEIO(toDim); + server.worldServerForDimension(entity.dimension) + .playSoundEffect(entity.posX, entity.posY, entity.posZ, TravelSource.TELEPAD.sound, 1.0F, 1.0F); + if (entity instanceof EntityPlayer) { + EntityPlayerMP player = (EntityPlayerMP) entity; + server.getConfigurationManager().transferPlayerToDimension(player, targetDim, teleporter); + if (from == 1 && entity.isEntityAlive()) { // get around vanilla End hacks + toDim.spawnEntityInWorld(entity); + toDim.updateEntityWithOptionalForce(entity, false); + } + } else { + NBTTagCompound tagCompound = new NBTTagCompound(); + float rotationYaw = entity.rotationYaw; + float rotationPitch = entity.rotationPitch; + entity.writeToNBT(tagCompound); + Class entityClass = entity.getClass(); + fromDim.removeEntity(entity); - void dequeueTeleport(Entity entity, boolean sendUpdate) { - if (entity == null) { - return; - } - toTeleport.remove(entity); - entity.getEntityData().setBoolean(TELEPORTING_KEY, false); - if(sendUpdate) { - if(worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketTeleport(Type.END, this, entity.getEntityId())); - } else { - PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.END, this, entity.getEntityId())); - } - } - if(!active()) { - powerUsed = 0; - } - } - - private boolean teleport(Entity entity) { - if(maxPower > 0) { - entity.getEntityData().setBoolean(TELEPORTING_KEY, false); - wasBlocked = !(entity.worldObj.isRemote ? clientTeleport(entity) : serverTeleport(entity)); - PacketHandler.INSTANCE.sendToAll(new PacketTeleport(Type.TELEPORT, this, wasBlocked)); - return !wasBlocked; - } - return false; - } - - private boolean clientTeleport(Entity entity) { - if(entity.worldObj.provider.dimensionId == targetDim) { - return TravelController.instance.doClientTeleport(entity, target, TravelSource.TELEPAD, 0, false); - } - return true; - } - - private boolean serverTeleport(Entity entity) { - dequeueTeleport(entity, true); - int from = entity.dimension; - if(from != targetDim) { - MinecraftServer server = MinecraftServer.getServer(); - WorldServer fromDim = server.worldServerForDimension(from); - WorldServer toDim = server.worldServerForDimension(targetDim); - Teleporter teleporter = new TeleporterEIO(toDim); - server.worldServerForDimension(entity.dimension).playSoundEffect(entity.posX, entity.posY, entity.posZ, TravelSource.TELEPAD.sound, 1.0F, 1.0F); - if (entity instanceof EntityPlayer) { - EntityPlayerMP player = (EntityPlayerMP) entity; - server.getConfigurationManager().transferPlayerToDimension(player, targetDim, teleporter); - if (from == 1 && entity.isEntityAlive()) { // get around vanilla End hacks - toDim.spawnEntityInWorld(entity); - toDim.updateEntityWithOptionalForce(entity, false); + try { + Entity newEntity = entityClass.getConstructor(World.class).newInstance(toDim); + newEntity.readFromNBT(tagCompound); + newEntity.setLocationAndAngles(target.x, target.y, target.z, rotationYaw, rotationPitch); + newEntity.forceSpawn = true; + toDim.spawnEntityInWorld(newEntity); + newEntity.forceSpawn = false; // necessary? + } catch (Exception e) { + Throwables.propagate(e); + } + } } - } else { - NBTTagCompound tagCompound = new NBTTagCompound(); - float rotationYaw = entity.rotationYaw; - float rotationPitch = entity.rotationPitch; - entity.writeToNBT(tagCompound); - Class entityClass = entity.getClass(); - fromDim.removeEntity(entity); + return PacketTravelEvent.doServerTeleport(entity, target.x, target.y, target.z, 0, false, TravelSource.TELEPAD); + } - try { - Entity newEntity = entityClass.getConstructor(World.class).newInstance(toDim); - newEntity.readFromNBT(tagCompound); - newEntity.setLocationAndAngles(target.x, target.y, target.z, rotationYaw, rotationPitch); - newEntity.forceSpawn = true; - toDim.spawnEntityInWorld(newEntity); - newEntity.forceSpawn = false; // necessary? - } catch (Exception e) { - Throwables.propagate(e); + /* ITravelAccessable overrides */ + + @Override + public boolean canSeeBlock(EntityPlayer playerName) { + return isMaster() && inNetwork(); + } + + /* IInternalPowerReceiver */ + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return inNetwork() && master != null + ? master == this ? energy.getMaxReceive() : master.getMaxEnergyRecieved(dir) + : 0; + } + + @Override + public int getMaxEnergyStored() { + return inNetwork() && master != null + ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() + : 0; + } + + @Override + public boolean displayPower() { + return inNetwork() && master != null; + } + + @Override + public int getEnergyStored() { + return inNetwork() && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; + } + + @Override + public void setEnergyStored(int storedEnergy) { + if (inNetwork() && master != null) { + if (master == this) { + energy.setEnergyStored(storedEnergy); + } else { + master.setEnergyStored(storedEnergy); + } } - } } - return PacketTravelEvent.doServerTeleport(entity, target.x, target.y, target.z, 0, false, TravelSource.TELEPAD); - } - /* ITravelAccessable overrides */ - - @Override - public boolean canSeeBlock(EntityPlayer playerName) { - return isMaster() && inNetwork(); - } - - /* IInternalPowerReceiver */ - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return inNetwork() && master != null ? master == this ? energy.getMaxReceive() : master.getMaxEnergyRecieved(dir) : 0; - } - - @Override - public int getMaxEnergyStored() { - return inNetwork() && master != null ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() : 0; - } - - @Override - public boolean displayPower() { - return inNetwork() && master != null; - } - - @Override - public int getEnergyStored() { - return inNetwork() && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; - } - - @Override - public void setEnergyStored(int storedEnergy) { - if(inNetwork() && master != null) { - if(master == this) { - energy.setEnergyStored(storedEnergy); - } else { - master.setEnergyStored(storedEnergy); - } + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return inNetwork() && master != null; } - } - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return inNetwork() && master != null; - } + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return inNetwork() && master != null + ? master == this + ? energy.receiveEnergy(maxReceive, simulate) + : master.receiveEnergy(from, maxReceive, simulate) + : 0; + } - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return inNetwork() && master != null ? master == this ? energy.receiveEnergy(maxReceive, simulate) : master.receiveEnergy(from, maxReceive, simulate) : 0; - } + @Override + public int getEnergyStored(ForgeDirection from) { + return inNetwork() && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; + } - @Override - public int getEnergyStored(ForgeDirection from) { - return inNetwork() && master != null ? master == this ? energy.getEnergyStored() : master.getEnergyStored() : 0; - } + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return inNetwork() && master != null + ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() + : 0; + } - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return inNetwork() && master != null ? master == this ? energy.getMaxEnergyStored() : master.getMaxEnergyStored() : 0; - } - - public int getUsage() { - return energy.getMaxReceive(); - } + public int getUsage() { + return energy.getMaxReceive(); + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java index c3a2fb64..20e5d6cd 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java @@ -1,26 +1,24 @@ package crazypants.enderio.teleport.telepad; -import net.minecraft.client.Minecraft; - import com.enderio.core.client.gui.button.IconButton; - import crazypants.enderio.gui.IconEIO; +import net.minecraft.client.Minecraft; public class ToggleTravelButton extends IconButton { - IToggleableGui gui; - - public ToggleTravelButton(IToggleableGui gui, int id, int x, int y, IconEIO icon) { - super(gui, id, x, y, icon); - this.gui = gui; - } - - @Override - public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - boolean result = super.mousePressed(par1Minecraft, par2, par3); - if(result) { - gui.switchGui(); + IToggleableGui gui; + + public ToggleTravelButton(IToggleableGui gui, int id, int x, int y, IconEIO icon) { + super(gui, id, x, y, icon); + this.gui = gui; + } + + @Override + public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { + boolean result = super.mousePressed(par1Minecraft, par2, par3); + if (result) { + gui.switchGui(); + } + return result; } - return result; - } } diff --git a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java index eb70bd5f..9efe180a 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java +++ b/src/main/java/crazypants/enderio/thaumcraft/GogglesOfRevealingUpgrade.java @@ -1,85 +1,88 @@ package crazypants.enderio.thaumcraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.item.darksteel.upgrade.AbstractUpgrade; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class GogglesOfRevealingUpgrade extends AbstractUpgrade { - private static String UPGRADE_NAME = "gogglesRevealing"; + private static String UPGRADE_NAME = "gogglesRevealing"; - public static final GogglesOfRevealingUpgrade INSTANCE = new GogglesOfRevealingUpgrade(); + public static final GogglesOfRevealingUpgrade INSTANCE = new GogglesOfRevealingUpgrade(); - public static ItemStack getGoggles() { - Item i = GameRegistry.findItem("Thaumcraft", "ItemGoggles"); - if(i != null) { - return new ItemStack(i); + public static ItemStack getGoggles() { + Item i = GameRegistry.findItem("Thaumcraft", "ItemGoggles"); + if (i != null) { + return new ItemStack(i); + } + return null; } - return null; - } - public static GogglesOfRevealingUpgrade loadFromItem(ItemStack stack) { - if(stack == null) { - return null; + public static GogglesOfRevealingUpgrade loadFromItem(ItemStack stack) { + if (stack == null) { + return null; + } + if (stack.stackTagCompound == null) { + return null; + } + if (!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new GogglesOfRevealingUpgrade( + (NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); } - if(stack.stackTagCompound == null) { - return null; + + public static boolean isUpgradeEquipped(EntityPlayer player) { + ItemStack helmet = player.getEquipmentInSlot(4); + return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null; } - if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { - return null; + + public GogglesOfRevealingUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); } - return new GogglesOfRevealingUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); - } - public static boolean isUpgradeEquipped(EntityPlayer player) { - ItemStack helmet = player.getEquipmentInSlot(4); - return GogglesOfRevealingUpgrade.loadFromItem(helmet) != null; - } - - public GogglesOfRevealingUpgrade(NBTTagCompound tag) { - super(UPGRADE_NAME, tag); - } - - public GogglesOfRevealingUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.gogglesOfRevealing",getGoggles(), Config.darkSteelGogglesOfRevealingCost); - } - - @Override - public boolean canAddToItem(ItemStack stack) { - if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getGoggles() == null) { - return false; + public GogglesOfRevealingUpgrade() { + super( + UPGRADE_NAME, + "enderio.darksteel.upgrade.gogglesOfRevealing", + getGoggles(), + Config.darkSteelGogglesOfRevealingCost); } - GogglesOfRevealingUpgrade up = loadFromItem(stack); - if(up == null) { - return true; + + @Override + public boolean canAddToItem(ItemStack stack) { + if (stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0) || getGoggles() == null) { + return false; + } + GogglesOfRevealingUpgrade up = loadFromItem(stack); + if (up == null) { + return true; + } + return false; } - return false; - } - @Override - public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { - } + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) {} - @Override - public ItemStack getUpgradeItem() { - if(upgradeItem != null) { - return upgradeItem; + @Override + public ItemStack getUpgradeItem() { + if (upgradeItem != null) { + return upgradeItem; + } + upgradeItem = getGoggles(); + return upgradeItem; } - upgradeItem = getGoggles(); - return upgradeItem; - } - @Override - public String getUpgradeItemName() { - if(getUpgradeItem() == null) { - return "Goggles of Revealing"; + @Override + public String getUpgradeItemName() { + if (getUpgradeItem() == null) { + return "Goggles of Revealing"; + } + return super.getUpgradeItemName(); } - return super.getUpgradeItemName(); - } - } diff --git a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java index d20c6bec..2f5aea86 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java +++ b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java @@ -1,8 +1,16 @@ package crazypants.enderio.thaumcraft; +import cpw.mods.fml.common.Loader; +import crazypants.enderio.EnderIO; +import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; +import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; +import crazypants.enderio.material.Alloy; +import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.FrankenSkull; +import crazypants.enderio.material.Material; +import crazypants.enderio.power.Capacitors; import java.util.ArrayList; import java.util.List; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -13,163 +21,189 @@ import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import cpw.mods.fml.common.Loader; -import crazypants.enderio.EnderIO; -import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; -import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; -import crazypants.enderio.material.Alloy; -import crazypants.enderio.material.BlockFusedQuartz; -import crazypants.enderio.material.FrankenSkull; -import crazypants.enderio.material.Material; -import crazypants.enderio.power.Capacitors; public class ThaumcraftCompat { - public static void load() { - if(Loader.isModLoaded("Thaumcraft")) { - loadAspects(); - } - } - - private static void loadAspects() { - - ThaumcraftApi.registerObjectTag("dustCoal", new AspectList().add(getAspects(Items.coal))); - ThaumcraftApi.registerObjectTag("itemSilicon", new AspectList().add(Aspect.FIRE, 1).add(Aspect.ORDER, 1).add(Aspect.SENSES, 1)); - - ThaumcraftApi.registerObjectTag(Alloy.ELECTRICAL_STEEL.getOreIngot(), new AspectList() - .add(getAspects("dustCoal")) - .add(getAspects(Items.iron_ingot)) - .add(getAspects("itemSilicon"))); - - ThaumcraftApi.registerObjectTag(Alloy.ENERGETIC_ALLOY.getOreIngot(), new AspectList() - .add(getAspects(Items.glowstone_dust)) - .add(getAspects(Items.redstone)) - .add(getAspects(Items.gold_ingot))); - - ThaumcraftApi.registerObjectTag(Alloy.PHASED_GOLD.getOreIngot(), new AspectList() - .add(getAspects(Items.ender_pearl)) - .add(getAspects("ingotEnergeticAlloy"))); - - ThaumcraftApi.registerObjectTag(Alloy.REDSTONE_ALLOY.getOreIngot(), new AspectList() - .add(getAspects(Items.redstone)) - .add(getAspects("itemSilicon"))); - - ThaumcraftApi.registerObjectTag(Alloy.CONDUCTIVE_IRON.getOreIngot(), new AspectList() - .add(getAspects(Items.redstone)) - .add(getAspects(Items.iron_ingot))); - - ThaumcraftApi.registerObjectTag(Alloy.PHASED_IRON.getOreIngot(), new AspectList() - .add(getAspects(Items.ender_pearl)) - .add(getAspects(Items.iron_ingot))); - - ThaumcraftApi.registerObjectTag(Alloy.DARK_STEEL.getOreIngot(), new AspectList() - .add(getAspects(Items.iron_ingot)) - .add(getAspects("dustCoal")) - .add(getAspects(Blocks.obsidian))); - - ThaumcraftApi.registerObjectTag(Alloy.SOULARIUM.getOreIngot(), new AspectList() - .add(getAspects(Blocks.soul_sand)) - .add(getAspects(Items.gold_ingot))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockEndermanSkull), new AspectList() - .add(Aspect.MAGIC, 3) - .add(Aspect.TRAVEL, 4) - .add(Aspect.ELDRITCH, 4)); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockEndermanSkull, 1, SkullType.TORMENTED.ordinal()), new AspectList() - .add(getAspects(EnderIO.blockEndermanSkull)) - .add(getAspects(Items.potionitem)).add(getAspects(Items.potionitem)) - .add(getAspects(new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) - .add(getAspects(Alloy.SOULARIUM.getOreIngot())).add(getAspects(Alloy.SOULARIUM.getOreIngot()))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_ELECTRODE.ordinal()), new AspectList() - .add(getAspects(new ItemStack(Items.skull, 1, 2))) - .add(getAspects("itemSilicon")).add(getAspects("itemSilicon")) - .add(getAspects(new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) - .add(getAspects(Alloy.ENERGETIC_ALLOY.getOreIngot())).add(getAspects(Alloy.ENERGETIC_ALLOY.getOreIngot()))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()), new AspectList() - .add(getAspects(new ItemStack(Items.skull, 1, 2))) - .add(getAspects("itemSilicon")).add(getAspects("itemSilicon")) - .add(getAspects(new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) - .add(getAspects(Alloy.SOULARIUM.getOreIngot())).add(getAspects(Alloy.SOULARIUM.getOreIngot()))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()), new AspectList() - .add(Aspect.UNDEAD, 2) - .add(Aspect.MAN, 1) - .add(Aspect.EARTH, 1) - .add(getAspects(new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal())))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()), new AspectList() - .add(getAspects(EnderIO.blockEndermanSkull)) - .add(getAspects("itemSilicon")).add(getAspects("itemSilicon")) - .add(getAspects(Alloy.PHASED_GOLD.getOreIngot())) - .add(getAspects(Alloy.SOULARIUM.getOreIngot())).add(getAspects(Alloy.SOULARIUM.getOreIngot()))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), new AspectList() - .add(Aspect.AIR, 2) - .add(Aspect.ELDRITCH, 4) - .add(Aspect.TRAVEL, 2) - .add(getAspects(Items.emerald))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()), new AspectList() - .add(Aspect.AIR, 2) - .add(Aspect.MAN, 3) - .add(getAspects(new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal())))); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()), new AspectList() - .add(getAspects(new ItemStack(Items.quartz, 4))) - .add(Aspect.CRYSTAL, 1)); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()), new AspectList() - .add(Aspect.CRYSTAL, 2)); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_FUSED_QUARTZ.ordinal()), new AspectList() - .add(getAspects(new ItemStack(Items.quartz, 4))) - .add(Aspect.LIGHT, 8) - .add(Aspect.SENSES, 2)); - - ThaumcraftApi.registerObjectTag(new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_GLASS.ordinal()), new AspectList() - .add(Aspect.CRYSTAL, 2) - .add(Aspect.LIGHT, 8) - .add(Aspect.SENSES, 2)); - - // This is a horrible hack due to the fact that I am assembling my aspects after TC does recipe parsing - // Therefore I redo all EIO items - for (Object o : Item.itemRegistry.getKeys()) { - if(o instanceof String) { - String ownermod = ((String) o).substring(0, ((String) o).indexOf(':')); - if(EnderIO.MODID.equals(ownermod)) { - for (int idx = 0; idx < 16; idx++) { - addAspectsFromRecipes((Item) Item.itemRegistry.getObject((String) o), idx); - } + public static void load() { + if (Loader.isModLoaded("Thaumcraft")) { + loadAspects(); } - } } - } - private static AspectList getAspects(Block block) { - return getAspects(Item.getItemFromBlock(block)); - } + private static void loadAspects() { - private static AspectList getAspects(String ore) { - ArrayList ores = OreDictionary.getOres(ore); - return ores.isEmpty() ? new AspectList() : getAspects(ores.get(0)); - } + ThaumcraftApi.registerObjectTag("dustCoal", new AspectList().add(getAspects(Items.coal))); + ThaumcraftApi.registerObjectTag( + "itemSilicon", + new AspectList().add(Aspect.FIRE, 1).add(Aspect.ORDER, 1).add(Aspect.SENSES, 1)); - private static AspectList getAspects(Item item) { - return getAspects(new ItemStack(item)); - } + ThaumcraftApi.registerObjectTag( + Alloy.ELECTRICAL_STEEL.getOreIngot(), + new AspectList() + .add(getAspects("dustCoal")) + .add(getAspects(Items.iron_ingot)) + .add(getAspects("itemSilicon"))); - private static AspectList getAspects(ItemStack item) { - return new AspectList(item); - } + ThaumcraftApi.registerObjectTag( + Alloy.ENERGETIC_ALLOY.getOreIngot(), + new AspectList() + .add(getAspects(Items.glowstone_dust)) + .add(getAspects(Items.redstone)) + .add(getAspects(Items.gold_ingot))); - private static void addAspectsFromRecipes(Item item, int meta) { - ThaumcraftApi.registerObjectTag(new ItemStack(item, 1, meta), ThaumcraftApiHelper.generateTags(item, meta)); - } + ThaumcraftApi.registerObjectTag( + Alloy.PHASED_GOLD.getOreIngot(), + new AspectList().add(getAspects(Items.ender_pearl)).add(getAspects("ingotEnergeticAlloy"))); - public static void loadUpgrades(List upgrades) { - upgrades.add(GogglesOfRevealingUpgrade.INSTANCE); - } + ThaumcraftApi.registerObjectTag( + Alloy.REDSTONE_ALLOY.getOreIngot(), + new AspectList().add(getAspects(Items.redstone)).add(getAspects("itemSilicon"))); + + ThaumcraftApi.registerObjectTag( + Alloy.CONDUCTIVE_IRON.getOreIngot(), + new AspectList().add(getAspects(Items.redstone)).add(getAspects(Items.iron_ingot))); + + ThaumcraftApi.registerObjectTag( + Alloy.PHASED_IRON.getOreIngot(), + new AspectList().add(getAspects(Items.ender_pearl)).add(getAspects(Items.iron_ingot))); + + ThaumcraftApi.registerObjectTag( + Alloy.DARK_STEEL.getOreIngot(), + new AspectList() + .add(getAspects(Items.iron_ingot)) + .add(getAspects("dustCoal")) + .add(getAspects(Blocks.obsidian))); + + ThaumcraftApi.registerObjectTag( + Alloy.SOULARIUM.getOreIngot(), + new AspectList().add(getAspects(Blocks.soul_sand)).add(getAspects(Items.gold_ingot))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockEndermanSkull), + new AspectList().add(Aspect.MAGIC, 3).add(Aspect.TRAVEL, 4).add(Aspect.ELDRITCH, 4)); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockEndermanSkull, 1, SkullType.TORMENTED.ordinal()), + new AspectList() + .add(getAspects(EnderIO.blockEndermanSkull)) + .add(getAspects(Items.potionitem)) + .add(getAspects(Items.potionitem)) + .add(getAspects( + new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) + .add(getAspects(Alloy.SOULARIUM.getOreIngot())) + .add(getAspects(Alloy.SOULARIUM.getOreIngot()))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_ELECTRODE.ordinal()), + new AspectList() + .add(getAspects(new ItemStack(Items.skull, 1, 2))) + .add(getAspects("itemSilicon")) + .add(getAspects("itemSilicon")) + .add(getAspects( + new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) + .add(getAspects(Alloy.ENERGETIC_ALLOY.getOreIngot())) + .add(getAspects(Alloy.ENERGETIC_ALLOY.getOreIngot()))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()), + new AspectList() + .add(getAspects(new ItemStack(Items.skull, 1, 2))) + .add(getAspects("itemSilicon")) + .add(getAspects("itemSilicon")) + .add(getAspects( + new ItemStack(EnderIO.itemBasicCapacitor, 1, Capacitors.BASIC_CAPACITOR.ordinal()))) + .add(getAspects(Alloy.SOULARIUM.getOreIngot())) + .add(getAspects(Alloy.SOULARIUM.getOreIngot()))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()), + new AspectList() + .add(Aspect.UNDEAD, 2) + .add(Aspect.MAN, 1) + .add(Aspect.EARTH, 1) + .add(getAspects( + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal())))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()), + new AspectList() + .add(getAspects(EnderIO.blockEndermanSkull)) + .add(getAspects("itemSilicon")) + .add(getAspects("itemSilicon")) + .add(getAspects(Alloy.PHASED_GOLD.getOreIngot())) + .add(getAspects(Alloy.SOULARIUM.getOreIngot())) + .add(getAspects(Alloy.SOULARIUM.getOreIngot()))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()), + new AspectList() + .add(Aspect.AIR, 2) + .add(Aspect.ELDRITCH, 4) + .add(Aspect.TRAVEL, 2) + .add(getAspects(Items.emerald))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.itemMaterial, 1, Material.ATTRACTOR_CRYSTAL.ordinal()), + new AspectList() + .add(Aspect.AIR, 2) + .add(Aspect.MAN, 3) + .add(getAspects(new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal())))); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()), + new AspectList().add(getAspects(new ItemStack(Items.quartz, 4))).add(Aspect.CRYSTAL, 1)); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()), + new AspectList().add(Aspect.CRYSTAL, 2)); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_FUSED_QUARTZ.ordinal()), + new AspectList() + .add(getAspects(new ItemStack(Items.quartz, 4))) + .add(Aspect.LIGHT, 8) + .add(Aspect.SENSES, 2)); + + ThaumcraftApi.registerObjectTag( + new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_GLASS.ordinal()), + new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.LIGHT, 8).add(Aspect.SENSES, 2)); + + // This is a horrible hack due to the fact that I am assembling my aspects after TC does recipe parsing + // Therefore I redo all EIO items + for (Object o : Item.itemRegistry.getKeys()) { + if (o instanceof String) { + String ownermod = ((String) o).substring(0, ((String) o).indexOf(':')); + if (EnderIO.MODID.equals(ownermod)) { + for (int idx = 0; idx < 16; idx++) { + addAspectsFromRecipes((Item) Item.itemRegistry.getObject((String) o), idx); + } + } + } + } + } + + private static AspectList getAspects(Block block) { + return getAspects(Item.getItemFromBlock(block)); + } + + private static AspectList getAspects(String ore) { + ArrayList ores = OreDictionary.getOres(ore); + return ores.isEmpty() ? new AspectList() : getAspects(ores.get(0)); + } + + private static AspectList getAspects(Item item) { + return getAspects(new ItemStack(item)); + } + + private static AspectList getAspects(ItemStack item) { + return new AspectList(item); + } + + private static void addAspectsFromRecipes(Item item, int meta) { + ThaumcraftApi.registerObjectTag(new ItemStack(item, 1, meta), ThaumcraftApiHelper.generateTags(item, meta)); + } + + public static void loadUpgrades(List upgrades) { + upgrades.add(GogglesOfRevealingUpgrade.INSTANCE); + } } diff --git a/src/main/java/crazypants/enderio/tool/AEToolProvider.java b/src/main/java/crazypants/enderio/tool/AEToolProvider.java index a8e6d6e2..6ee49a2c 100644 --- a/src/main/java/crazypants/enderio/tool/AEToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/AEToolProvider.java @@ -1,58 +1,56 @@ package crazypants.enderio.tool; -import java.lang.reflect.Method; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import appeng.api.implementations.items.IAEWrench; import crazypants.enderio.api.tool.ITool; +import java.lang.reflect.Method; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class AEToolProvider implements IToolProvider, IToolImpl { - private AETool aeTool = new AETool(); + private AETool aeTool = new AETool(); - public AEToolProvider() throws Exception { - //Do a check for so we throw an exception in the constructor if we dont have the - // wrench class - Class.forName("appeng.api.implementations.items.IAEWrench"); - } - - @Override - public Class getInterface() { - return IAEWrench.class; - } - - @Override - public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { - return true; - } - - @Override - public ITool getTool(ItemStack stack) { - if(!(stack.getItem() instanceof IAEWrench)) { - return null; - } - return aeTool; - } - - public static class AETool implements ITool { - - @Override - public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { - if(!(stack.getItem() instanceof IAEWrench)) { - return false; - } - IAEWrench wrench = (IAEWrench) stack.getItem(); - return wrench.canWrench(stack, player, x, y, z); + public AEToolProvider() throws Exception { + // Do a check for so we throw an exception in the constructor if we dont have the + // wrench class + Class.forName("appeng.api.implementations.items.IAEWrench"); } @Override - public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { + public Class getInterface() { + return IAEWrench.class; } - + @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; + public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { + return true; + } + + @Override + public ITool getTool(ItemStack stack) { + if (!(stack.getItem() instanceof IAEWrench)) { + return null; + } + return aeTool; + } + + public static class AETool implements ITool { + + @Override + public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { + if (!(stack.getItem() instanceof IAEWrench)) { + return false; + } + IAEWrench wrench = (IAEWrench) stack.getItem(); + return wrench.canWrench(stack, player, x, y, z); + } + + @Override + public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) {} + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } - } } diff --git a/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java index 887fb5f7..84b3fcc3 100644 --- a/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java +++ b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java @@ -4,32 +4,31 @@ import java.lang.reflect.Array; public class ArrayMappingTool { - private final byte[] from_mapping; - private final byte[] to_mapping; + private final byte[] from_mapping; + private final byte[] to_mapping; - public ArrayMappingTool(String from_mapping, String to_mapping) { - this.from_mapping = from_mapping.getBytes(); - this.to_mapping = to_mapping.getBytes(); - } - - private T getNextT(T[] in, byte what) { - for (int i = 0; i < from_mapping.length; i++) { - if (from_mapping[i] == what && in[i] != null) { - T result = in[i]; - in[i] = null; - return result; - } + public ArrayMappingTool(String from_mapping, String to_mapping) { + this.from_mapping = from_mapping.getBytes(); + this.to_mapping = to_mapping.getBytes(); } - return null; - } - public T[] map(T[] in) { - T[] in_tmp = in.clone(); - T[] out = (T[]) Array.newInstance(in.getClass().getComponentType(), to_mapping.length); - for (int i = 0; i < to_mapping.length; i++) { - out[i] = getNextT(in_tmp, to_mapping[i]); + private T getNextT(T[] in, byte what) { + for (int i = 0; i < from_mapping.length; i++) { + if (from_mapping[i] == what && in[i] != null) { + T result = in[i]; + in[i] = null; + return result; + } + } + return null; } - return out; - } + public T[] map(T[] in) { + T[] in_tmp = in.clone(); + T[] out = (T[]) Array.newInstance(in.getClass().getComponentType(), to_mapping.length); + for (int i = 0; i < to_mapping.length; i++) { + out[i] = getNextT(in_tmp, to_mapping[i]); + } + return out; + } } diff --git a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java index a3a56408..15afee7b 100644 --- a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java @@ -1,63 +1,62 @@ package crazypants.enderio.tool; -import java.lang.reflect.Method; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import buildcraft.api.tools.IToolWrench; import crazypants.enderio.api.tool.ITool; +import java.lang.reflect.Method; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class BuildCraftToolProvider implements IToolProvider, IToolImpl { - private BCWrench wrench = new BCWrench(); + private BCWrench wrench = new BCWrench(); - public BuildCraftToolProvider() throws Exception { - //Do a check for so we throw an exception in the constructor if we dont have the - // wrench class - Class.forName("buildcraft.api.tools.IToolWrench"); - } - - @Override - public ITool getTool(ItemStack stack) { - if(MpsUtil.instance.isPowerFistEquiped(stack) && !MpsUtil.instance.isOmniToolActive(stack)) { - return null; - } - if(stack.getItem() instanceof IToolWrench) { - return wrench; - } - return null; - } - - @Override - public Class getInterface() { - return IToolWrench.class; - } - - @Override - public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { - if("canWrench".equals(method.getName())) { - return true; - } else if("wrenchUsed".equals(method.getName())) { - return null; - } - return null; - } - - public static class BCWrench implements ITool { - - @Override - public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { - return ((IToolWrench) stack.getItem()).canWrench(player, x, y, z); + public BuildCraftToolProvider() throws Exception { + // Do a check for so we throw an exception in the constructor if we dont have the + // wrench class + Class.forName("buildcraft.api.tools.IToolWrench"); } @Override - public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { - ((IToolWrench) stack.getItem()).wrenchUsed(player, x, y, z); + public ITool getTool(ItemStack stack) { + if (MpsUtil.instance.isPowerFistEquiped(stack) && !MpsUtil.instance.isOmniToolActive(stack)) { + return null; + } + if (stack.getItem() instanceof IToolWrench) { + return wrench; + } + return null; } - + @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; + public Class getInterface() { + return IToolWrench.class; + } + + @Override + public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { + if ("canWrench".equals(method.getName())) { + return true; + } else if ("wrenchUsed".equals(method.getName())) { + return null; + } + return null; + } + + public static class BCWrench implements ITool { + + @Override + public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { + return ((IToolWrench) stack.getItem()).canWrench(player, x, y, z); + } + + @Override + public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { + ((IToolWrench) stack.getItem()).wrenchUsed(player, x, y, z); + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } - } } diff --git a/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java b/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java index 631ff5b7..59793a70 100644 --- a/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java +++ b/src/main/java/crazypants/enderio/tool/EnderIOCrashCallable.java @@ -1,8 +1,5 @@ package crazypants.enderio.tool; -import java.util.ArrayList; -import java.util.List; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.API; import cpw.mods.fml.common.FMLCommonHandler; @@ -12,109 +9,124 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; import crazypants.enderio.api.EnderIOAPIProps; +import java.util.ArrayList; +import java.util.List; public class EnderIOCrashCallable implements ICrashCallable { - public static void create() { - FMLCommonHandler.instance().registerCrashCallable(new EnderIOCrashCallable()); - } - - private List collectData() { - List result = new ArrayList(); - if (FMLCommonHandler.instance().getSide() == Side.CLIENT && FMLClientHandler.instance().hasOptifine()) { - result.add(" * Optifine is installed. This is NOT supported."); + public static void create() { + FMLCommonHandler.instance().registerCrashCallable(new EnderIOCrashCallable()); } - for (ModContainer modContainer : ModAPIManager.INSTANCE.getAPIList()) { - if ("appliedenergistics2|API".equals(modContainer.getModId())) { - if ("rv1".equals(modContainer.getVersion()) || "rv2".equals(modContainer.getVersion())) { - result.add(" * An unsupportted old AE2 API is installed (" + modContainer.getVersion() + " from " - + modContainer.getSource().getName() + ")."); - result.add(" Ender IO was build against API version rv3 and will NOT work with older versions."); - } else if (!"rv3".equals(modContainer.getVersion())) { - result.add(" * An unknown AE2 API is installed (" + modContainer.getVersion() + " from " - + modContainer.getSource().getName() + ")."); - result.add(" Ender IO was build against API version rv3 and may or may not work with a newer version."); + private List collectData() { + List result = new ArrayList(); + if (FMLCommonHandler.instance().getSide() == Side.CLIENT + && FMLClientHandler.instance().hasOptifine()) { + result.add(" * Optifine is installed. This is NOT supported."); } - } else if ("CoFHAPI|energy".equals(modContainer.getModId())) { - if ("1.7.10R1.0.0".equals(modContainer.getVersion()) || "1.7.10R1.0.1".equals(modContainer.getVersion())) { - result.add(" * An unsupportted old RF API is installed (" + modContainer.getVersion() + " from " - + modContainer.getSource().getName() + ")."); - result.add(" Ender IO needs at least 1.7.10R1.0.2 and will NOT work with older versions."); - } else { - Package caep = Package.getPackage("cofh.api.energy"); - if (caep != null) { - API api = caep.getAnnotation(cpw.mods.fml.common.API.class); - if (api != null) { - String apiVersion = api.apiVersion(); - if (apiVersion != null) { - if (!apiVersion.equals(modContainer.getVersion())) { - if ("1.7.10R1.0.0".equals(apiVersion) || "1.7.10R1.0.1".equals(apiVersion)) { - result.add(" * An unsupportted old RF API is installed (" + apiVersion + " from )."); - result.add(" Ender IO needs at least 1.7.10R1.0.2 and will NOT work with older versions."); - } else { - result.add(" * The RF API that is being used (" + apiVersion - + " from ) differes from that that is reported as being loaded (" + modContainer.getVersion() - + " from " + modContainer.getSource().getName() + ")."); - result.add(" It is a supported version, but that difference may lead to problems."); - } + + for (ModContainer modContainer : ModAPIManager.INSTANCE.getAPIList()) { + if ("appliedenergistics2|API".equals(modContainer.getModId())) { + if ("rv1".equals(modContainer.getVersion()) || "rv2".equals(modContainer.getVersion())) { + result.add(" * An unsupportted old AE2 API is installed (" + modContainer.getVersion() + " from " + + modContainer.getSource().getName() + ")."); + result.add(" Ender IO was build against API version rv3 and will NOT work with older versions."); + } else if (!"rv3".equals(modContainer.getVersion())) { + result.add(" * An unknown AE2 API is installed (" + modContainer.getVersion() + " from " + + modContainer.getSource().getName() + ")."); + result.add( + " Ender IO was build against API version rv3 and may or may not work with a newer version."); + } + } else if ("CoFHAPI|energy".equals(modContainer.getModId())) { + if ("1.7.10R1.0.0".equals(modContainer.getVersion()) + || "1.7.10R1.0.1".equals(modContainer.getVersion())) { + result.add(" * An unsupportted old RF API is installed (" + modContainer.getVersion() + " from " + + modContainer.getSource().getName() + ")."); + result.add(" Ender IO needs at least 1.7.10R1.0.2 and will NOT work with older versions."); + } else { + Package caep = Package.getPackage("cofh.api.energy"); + if (caep != null) { + API api = caep.getAnnotation(cpw.mods.fml.common.API.class); + if (api != null) { + String apiVersion = api.apiVersion(); + if (apiVersion != null) { + if (!apiVersion.equals(modContainer.getVersion())) { + if ("1.7.10R1.0.0".equals(apiVersion) || "1.7.10R1.0.1".equals(apiVersion)) { + result.add(" * An unsupportted old RF API is installed (" + apiVersion + + " from )."); + result.add( + " Ender IO needs at least 1.7.10R1.0.2 and will NOT work with older versions."); + } else { + result.add(" * The RF API that is being used (" + apiVersion + + " from ) differes from that that is reported as being loaded (" + + modContainer.getVersion() + + " from " + + modContainer.getSource().getName() + ")."); + result.add( + " It is a supported version, but that difference may lead to problems."); + } + } + } else { + result.add( + " * The RF API that is being used has no version number. This may lead to problems."); + } + } else { + result.add( + " * The RF API that is being used has no API annotation. This may lead to problems."); + } + } else { + result.add(" * No RF API could be found in memory. This may be may due to an early crash."); + } + } + } else if (modContainer.getModId() != null + && modContainer.getModId().startsWith("EnderIOAPI")) { + if (!EnderIOAPIProps.VERSION.equals(modContainer.getVersion())) { + result.add(" * Another mod is shipping a version of our API that doesn't match our version (" + + modContainer.getVersion() + " from " + + modContainer.getSource().getName() + "). That may not actually work."); + } else if (modContainer.getSource().getName() != null + && (!modContainer.getSource().getName().startsWith("EnderIO") + && !modContainer.getSource().getName().startsWith("enderio"))) { + result.add(" * Our API got loaded from " + + modContainer.getSource().getName() + ". That's unexpected."); } - } else { - result.add(" * The RF API that is being used has no version number. This may lead to problems."); - } - } else { - result.add(" * The RF API that is being used has no API annotation. This may lead to problems."); } - } else { - result.add(" * No RF API could be found in memory. This may be may due to an early crash."); - } } - } else if (modContainer.getModId() != null && modContainer.getModId().startsWith("EnderIOAPI")) { - if (!EnderIOAPIProps.VERSION.equals(modContainer.getVersion())) { - result.add(" * Another mod is shipping a version of our API that doesn't match our version (" + modContainer.getVersion() - + " from " + modContainer.getSource().getName() + "). That may not actually work."); - } else if (modContainer.getSource().getName() != null - && (!modContainer.getSource().getName().startsWith("EnderIO") && !modContainer.getSource().getName() - .startsWith("enderio"))) { - result.add(" * Our API got loaded from " + modContainer.getSource().getName() + ". That's unexpected."); + + String badBrand = null; + for (String brand : FMLCommonHandler.instance().getModName().split(",")) { + if (brand != null && !brand.equals("fml") && !brand.equals("forge")) { + if (badBrand == null) { + badBrand = brand; + } else { + badBrand += ", " + brand; + } + } } - } + if (badBrand != null) { + result.add("An unsupported base software is installed: '" + badBrand + "'. This is NOT supported."); + } + return result; } - String badBrand = null; - for (String brand : FMLCommonHandler.instance().getModName().split(",")) { - if (brand != null && !brand.equals("fml") && !brand.equals("forge")) { - if (badBrand == null) { - badBrand = brand; + @Override + public String call() throws Exception { + List data = collectData(); + if (data.isEmpty()) { + return "No known problems detected."; } else { - badBrand += ", " + brand; + String msg = "Found the following problem(s) with your installation:\n"; + for (String string : data) { + msg += " " + string + "\n"; + } + msg += + " This may have caused the error. Try reproducing the crash WITHOUT this/these mod(s) before reporting it."; + return msg; } - } } - if (badBrand != null) { - result.add("An unsupported base software is installed: '" + badBrand + "'. This is NOT supported."); + + @Override + public String getLabel() { + return EnderIO.MODID; } - return result; - } - - @Override - public String call() throws Exception { - List data = collectData(); - if (data.isEmpty()) { - return "No known problems detected."; - } else { - String msg = "Found the following problem(s) with your installation:\n"; - for (String string : data) { - msg += " " + string + "\n"; - } - msg += " This may have caused the error. Try reproducing the crash WITHOUT this/these mod(s) before reporting it."; - return msg; - } - } - - @Override - public String getLabel() { - return EnderIO.MODID; - } - } diff --git a/src/main/java/crazypants/enderio/tool/IToolImpl.java b/src/main/java/crazypants/enderio/tool/IToolImpl.java index 3e26b4a7..b88eda41 100644 --- a/src/main/java/crazypants/enderio/tool/IToolImpl.java +++ b/src/main/java/crazypants/enderio/tool/IToolImpl.java @@ -1,13 +1,11 @@ package crazypants.enderio.tool; -import java.lang.reflect.Method; - import crazypants.enderio.api.tool.ITool; +import java.lang.reflect.Method; public interface IToolImpl { - Class getInterface(); - - Object handleMethod(ITool yetaWrench, Method method, Object[] args); + Class getInterface(); + Object handleMethod(ITool yetaWrench, Method method, Object[] args); } diff --git a/src/main/java/crazypants/enderio/tool/IToolProvider.java b/src/main/java/crazypants/enderio/tool/IToolProvider.java index 4d428510..716ccbb5 100644 --- a/src/main/java/crazypants/enderio/tool/IToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/IToolProvider.java @@ -1,10 +1,9 @@ package crazypants.enderio.tool; -import net.minecraft.item.ItemStack; import crazypants.enderio.api.tool.ITool; +import net.minecraft.item.ItemStack; public interface IToolProvider { - ITool getTool(ItemStack stack); - + ITool getTool(ItemStack stack); } diff --git a/src/main/java/crazypants/enderio/tool/MpsUtil.java b/src/main/java/crazypants/enderio/tool/MpsUtil.java index b9fc5dfc..314d2a68 100644 --- a/src/main/java/crazypants/enderio/tool/MpsUtil.java +++ b/src/main/java/crazypants/enderio/tool/MpsUtil.java @@ -1,60 +1,57 @@ package crazypants.enderio.tool; import java.lang.reflect.Method; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class MpsUtil { - public static final MpsUtil instance = new MpsUtil(); + public static final MpsUtil instance = new MpsUtil(); - private static String WRENCH_MODUL_NAME = "Prototype OmniWrench"; + private static String WRENCH_MODUL_NAME = "Prototype OmniWrench"; - private boolean isMpsInstalled; + private boolean isMpsInstalled; - private Class powerFistClass; + private Class powerFistClass; - private Method itemActiveMethod; + private Method itemActiveMethod; - private MpsUtil() { - isMpsInstalled = false; - try { - powerFistClass = Class.forName("net.machinemuse.powersuits.item.ItemPowerFist"); + private MpsUtil() { + isMpsInstalled = false; + try { + powerFistClass = Class.forName("net.machinemuse.powersuits.item.ItemPowerFist"); - Class moduleManagerClass = Class.forName("net.machinemuse.api.ModuleManager"); - itemActiveMethod = moduleManagerClass.getMethod("itemHasActiveModule", ItemStack.class, String.class); + Class moduleManagerClass = Class.forName("net.machinemuse.api.ModuleManager"); + itemActiveMethod = moduleManagerClass.getMethod("itemHasActiveModule", ItemStack.class, String.class); - isMpsInstalled = true; - } catch (Exception e) { + isMpsInstalled = true; + } catch (Exception e) { + } } - } + public boolean isPowerFistEquiped(ItemStack equipped) { + if (!isMpsInstalled || equipped == null || equipped.getItem() == null) { + return false; + } + Item item = equipped.getItem(); + if (powerFistClass.isAssignableFrom(item.getClass())) { + return true; + } + return false; + } - public boolean isPowerFistEquiped(ItemStack equipped) { - if(!isMpsInstalled || equipped == null || equipped.getItem() == null) { - return false; + public boolean isOmniToolActive(ItemStack equipped) { + if (!isMpsInstalled || equipped == null || itemActiveMethod == null) { + return false; + } + try { + Object res = itemActiveMethod.invoke(null, equipped, WRENCH_MODUL_NAME); + if (res instanceof Boolean) { + return ((Boolean) res).booleanValue(); + } + } catch (Exception e) { + } + return false; } - Item item = equipped.getItem(); - if(powerFistClass.isAssignableFrom(item.getClass())) { - return true; - } - return false; - } - - public boolean isOmniToolActive(ItemStack equipped) { - if(!isMpsInstalled || equipped == null || itemActiveMethod == null) { - return false; - } - try { - Object res = itemActiveMethod.invoke(null, equipped, WRENCH_MODUL_NAME); - if(res instanceof Boolean) { - return ((Boolean) res).booleanValue(); - } - } catch (Exception e) { - } - return false; - } - } diff --git a/src/main/java/crazypants/enderio/tool/SmartTank.java b/src/main/java/crazypants/enderio/tool/SmartTank.java index 427fe861..5d64948d 100644 --- a/src/main/java/crazypants/enderio/tool/SmartTank.java +++ b/src/main/java/crazypants/enderio/tool/SmartTank.java @@ -1,8 +1,6 @@ package crazypants.enderio.tool; import com.google.common.base.Strings; - -import crazypants.enderio.EnderIO; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -11,155 +9,156 @@ import net.minecraftforge.fluids.FluidTank; public class SmartTank extends FluidTank { - protected Fluid restriction; - - public SmartTank(FluidStack liquid, int capacity) { - super(liquid, capacity); - if (liquid != null) { - restriction = liquid.getFluid(); - } else { - restriction = null; - } - } + protected Fluid restriction; - public SmartTank(int capacity) { - super(capacity); - } - - public SmartTank(Fluid liquid, int capacity) { - super(capacity); - restriction = liquid; - } - - public void setRestriction(Fluid restriction) { - this.restriction = restriction; - } - - public float getFilledRatio() { - return (float) getFluidAmount() / getCapacity(); - } - - public boolean isFull() { - return getFluidAmount() >= getCapacity(); - } - - public boolean canDrainFluidType(FluidStack resource) { - if(resource == null || resource.getFluid() == null || fluid == null) { - return false; - } - return fluid.isFluidEqual(resource); - } - - public boolean canDrainFluidType(Fluid fl) { - if(fl == null || fluid == null) { - return false; - } - return fl.getID() == fluid.getFluidID(); - } - - public FluidStack drain(FluidStack resource, boolean doDrain) { - if(!canDrainFluidType(resource)) { - return null; - } - return drain(resource.amount, doDrain); - } - - public boolean canFill(FluidStack resource) { - if (fluid != null) { - return fluid.isFluidEqual(resource); - } else if (restriction != null) { - return resource.getFluid() != null && restriction.getID() == resource.getFluid().getID(); - } else { - return true; - } - } - - public boolean canFill(Fluid fl) { - if (fluid != null) { - return fluid.getFluid().getID() == fl.getID(); - } else if (restriction != null) { - return restriction.getID() == fl.getID(); - } else { - return true; - } - } - - public void setFluidAmount(int amount) { - if(amount > 0) { - if (fluid != null) { - fluid.amount = Math.min(capacity, amount); - } else if (restriction != null) { - setFluid(new FluidStack(restriction, Math.min(capacity, amount))); - } else { - throw new RuntimeException("Cannot set fluid amount of an empty tank"); - } - } else { - setFluid(null); - } - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - if(!canFill(resource)) { - return 0; - } - return super.fill(resource, doFill); - } - - @Override - public FluidStack getFluid() { - if (fluid != null) { - return fluid; - } else if (restriction != null) { - return new FluidStack(restriction, 0); - } else { - return null; - } - } - - public int getAvailableSpace() { - return getCapacity() - getFluidAmount(); - } - - public void addFluidAmount(int amount) { - setFluidAmount(getFluidAmount() + amount); - } - - @Override - public void setCapacity(int capacity) { - super.setCapacity(capacity); - if(getFluidAmount() > capacity) { - setFluidAmount(capacity); - } - } - - public void writeCommon(String name, NBTTagCompound nbtRoot) { - if(getFluidAmount() > 0 || restriction != null) { - NBTTagCompound tankRoot = new NBTTagCompound(); - writeToNBT(tankRoot); - if (restriction != null) { - tankRoot.setString("FluidRestriction", FluidRegistry.getFluidName(restriction.getID())); - } - nbtRoot.setTag(name, tankRoot); - } else { - nbtRoot.removeTag(name); - } - } - - public void readCommon(String name, NBTTagCompound nbtRoot) { - NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); - if(tankRoot != null) { - readFromNBT(tankRoot); - restriction = null; - if (tankRoot.hasKey("FluidRestriction")) { - String fluidName = tankRoot.getString("FluidRestriction"); - if (!Strings.isNullOrEmpty(fluidName)) { - restriction = FluidRegistry.getFluid(fluidName); + public SmartTank(FluidStack liquid, int capacity) { + super(liquid, capacity); + if (liquid != null) { + restriction = liquid.getFluid(); + } else { + restriction = null; + } + } + + public SmartTank(int capacity) { + super(capacity); + } + + public SmartTank(Fluid liquid, int capacity) { + super(capacity); + restriction = liquid; + } + + public void setRestriction(Fluid restriction) { + this.restriction = restriction; + } + + public float getFilledRatio() { + return (float) getFluidAmount() / getCapacity(); + } + + public boolean isFull() { + return getFluidAmount() >= getCapacity(); + } + + public boolean canDrainFluidType(FluidStack resource) { + if (resource == null || resource.getFluid() == null || fluid == null) { + return false; + } + return fluid.isFluidEqual(resource); + } + + public boolean canDrainFluidType(Fluid fl) { + if (fl == null || fluid == null) { + return false; + } + return fl.getID() == fluid.getFluidID(); + } + + public FluidStack drain(FluidStack resource, boolean doDrain) { + if (!canDrainFluidType(resource)) { + return null; + } + return drain(resource.amount, doDrain); + } + + public boolean canFill(FluidStack resource) { + if (fluid != null) { + return fluid.isFluidEqual(resource); + } else if (restriction != null) { + return resource.getFluid() != null + && restriction.getID() == resource.getFluid().getID(); + } else { + return true; + } + } + + public boolean canFill(Fluid fl) { + if (fluid != null) { + return fluid.getFluid().getID() == fl.getID(); + } else if (restriction != null) { + return restriction.getID() == fl.getID(); + } else { + return true; + } + } + + public void setFluidAmount(int amount) { + if (amount > 0) { + if (fluid != null) { + fluid.amount = Math.min(capacity, amount); + } else if (restriction != null) { + setFluid(new FluidStack(restriction, Math.min(capacity, amount))); + } else { + throw new RuntimeException("Cannot set fluid amount of an empty tank"); + } + } else { + setFluid(null); + } + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + if (!canFill(resource)) { + return 0; + } + return super.fill(resource, doFill); + } + + @Override + public FluidStack getFluid() { + if (fluid != null) { + return fluid; + } else if (restriction != null) { + return new FluidStack(restriction, 0); + } else { + return null; + } + } + + public int getAvailableSpace() { + return getCapacity() - getFluidAmount(); + } + + public void addFluidAmount(int amount) { + setFluidAmount(getFluidAmount() + amount); + } + + @Override + public void setCapacity(int capacity) { + super.setCapacity(capacity); + if (getFluidAmount() > capacity) { + setFluidAmount(capacity); + } + } + + public void writeCommon(String name, NBTTagCompound nbtRoot) { + if (getFluidAmount() > 0 || restriction != null) { + NBTTagCompound tankRoot = new NBTTagCompound(); + writeToNBT(tankRoot); + if (restriction != null) { + tankRoot.setString("FluidRestriction", FluidRegistry.getFluidName(restriction.getID())); + } + nbtRoot.setTag(name, tankRoot); + } else { + nbtRoot.removeTag(name); + } + } + + public void readCommon(String name, NBTTagCompound nbtRoot) { + NBTTagCompound tankRoot = (NBTTagCompound) nbtRoot.getTag(name); + if (tankRoot != null) { + readFromNBT(tankRoot); + restriction = null; + if (tankRoot.hasKey("FluidRestriction")) { + String fluidName = tankRoot.getString("FluidRestriction"); + if (!Strings.isNullOrEmpty(fluidName)) { + restriction = FluidRegistry.getFluid(fluidName); + } + } + } else { + setFluid(null); + // not reseting 'restriction' here on purpose } - } - } else { - setFluid(null); - // not reseting 'restriction' here on purpose } - } } diff --git a/src/main/java/crazypants/enderio/tool/TEToolProvider.java b/src/main/java/crazypants/enderio/tool/TEToolProvider.java index 24de53b7..f1e99bdb 100644 --- a/src/main/java/crazypants/enderio/tool/TEToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/TEToolProvider.java @@ -1,70 +1,69 @@ package crazypants.enderio.tool; +import cofh.api.block.IDismantleable; +import cofh.api.item.IToolHammer; +import crazypants.enderio.api.tool.ITool; import java.lang.reflect.Method; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cofh.api.block.IDismantleable; -import cofh.api.item.IToolHammer; -import crazypants.enderio.api.tool.ITool; public class TEToolProvider implements IToolProvider, IToolImpl { - private TEHammer wrench = new TEHammer(); - - @Override - public ITool getTool(ItemStack stack) { - if(stack.getItem() instanceof IToolHammer) { - return wrench; - } - return null; - } - - public static class TEHammer implements ITool { + private TEHammer wrench = new TEHammer(); @Override - public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { - return ((IToolHammer) stack.getItem()).isUsable(stack, player, x, y, z); + public ITool getTool(ItemStack stack) { + if (stack.getItem() instanceof IToolHammer) { + return wrench; + } + return null; + } + + public static class TEHammer implements ITool { + + @Override + public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z) { + return ((IToolHammer) stack.getItem()).isUsable(stack, player, x, y, z); + } + + @Override + public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { + ((IToolHammer) stack.getItem()).toolUsed(stack, player, x, y, z); + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } @Override - public void used(ItemStack stack, EntityPlayer player, int x, int y, int z) { - ((IToolHammer) stack.getItem()).toolUsed(stack, player, x, y, z); + public Class getInterface() { + return IToolHammer.class; } - + @Override - public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { - return true; + public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { + if ("isUsable".equals(method.getName())) { + return true; + } else if ("toolUsed".equals(method.getName())) { + toolUsed((ItemStack) args[0], (EntityLivingBase) args[1], (Integer) args[2], (Integer) args[3], (Integer) + args[4]); + return null; + } + return null; } - } - @Override - public Class getInterface() { - return IToolHammer.class; - } - - @Override - public Object handleMethod(ITool yetaWrench, Method method, Object[] args) { - if("isUsable".equals(method.getName())) { - return true; - } else if("toolUsed".equals(method.getName())) { - toolUsed((ItemStack) args[0], (EntityLivingBase) args[1], (Integer) args[2], (Integer) args[3], (Integer) args[4]); - return null; + public void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z) { + Block block = user.worldObj.getBlock(x, y, z); + if (user.isSneaking() && block instanceof IDismantleable && user instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) user; + IDismantleable machine = (IDismantleable) block; + if (machine.canDismantle(player, player.worldObj, x, y, z) && !player.worldObj.isRemote) { + machine.dismantleBlock(player, player.worldObj, x, y, z, false); + } + } } - return null; - } - - public void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z) { - Block block = user.worldObj.getBlock(x, y, z); - if(user.isSneaking() && block instanceof IDismantleable && user instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) user; - IDismantleable machine = (IDismantleable) block; - if(machine.canDismantle(player, player.worldObj, x, y, z) && !player.worldObj.isRemote) { - machine.dismantleBlock(player, player.worldObj, x, y, z, false); - } - } - } - } diff --git a/src/main/java/crazypants/enderio/tool/ToolUtil.java b/src/main/java/crazypants/enderio/tool/ToolUtil.java index 71cad6f6..2d1362cd 100644 --- a/src/main/java/crazypants/enderio/tool/ToolUtil.java +++ b/src/main/java/crazypants/enderio/tool/ToolUtil.java @@ -1,11 +1,14 @@ package crazypants.enderio.tool; +import crazypants.enderio.EnderIO; +import crazypants.enderio.Log; +import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.item.ItemYetaWrench; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,149 +16,146 @@ import net.minecraft.world.World; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; -import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; -import crazypants.enderio.api.tool.ITool; -import crazypants.enderio.item.ItemYetaWrench; public class ToolUtil { - public static boolean isToolEquipped(EntityPlayer player) { - return getInstance().isToolEquippedImpl(player); - } - - public static ITool getEquippedTool(EntityPlayer player) { - return getInstance().getEquippedToolImpl(player); - } - - public static ItemYetaWrench addInterfaces(ItemYetaWrench item) { - return getInstance().addInterfacesImpl(item); - } - - public static boolean breakBlockWithTool(Block block, World world, int x, int y, int z, EntityPlayer entityPlayer) { - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(block.removedByPlayer(world, entityPlayer, x, y, z, true)) { - block.harvestBlock(world, entityPlayer, x, y, z, world.getBlockMetadata(x, y, z)); - } - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - return false; - } - - private static ToolUtil instance; - - private static ToolUtil getInstance() { - if(instance == null) { - instance = new ToolUtil(); - } - return instance; - } - - private final List toolProviders = new ArrayList(); - private final List toolImpls = new ArrayList(); - - private ToolUtil() { - - try { - Object obj = Class.forName("crazypants.enderio.tool.BuildCraftToolProvider").newInstance(); - toolProviders.add((IToolProvider) obj); - toolImpls.add((IToolImpl) obj); - } catch (Exception e) { - Log.warn("Could not find Build Craft Wrench definition. Wrench integration with other mods may fail"); - } - try { - Object obj = Class.forName("crazypants.enderio.tool.AEToolProvider").newInstance(); - toolProviders.add((IToolProvider) obj); - toolImpls.add((IToolImpl) obj); - } catch (Exception e) { - Log.debug("Could not find AE Wrench definition. Wrench integration with AE may fail"); + public static boolean isToolEquipped(EntityPlayer player) { + return getInstance().isToolEquippedImpl(player); } - toolProviders.add(new TEToolProvider()); - toolImpls.add(new TEToolProvider()); - - } - - public void registerToolProvider(IToolProvider toolProvider) { - toolProviders.add(toolProvider); - } - - private boolean isToolEquippedImpl(EntityPlayer player) { - return getEquippedToolImpl(player) != null; - } - - private ITool getEquippedToolImpl(EntityPlayer player) { - player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if(player == null) { - return null; - } - ItemStack equipped = player.getCurrentEquippedItem(); - if(equipped == null) { - return null; - } - if(equipped.getItem() instanceof ITool) { - return (ITool) equipped.getItem(); - } - return getToolImpl(equipped); - - } - - private ITool getToolImpl(ItemStack equipped) { - for (IToolProvider provider : toolProviders) { - ITool result = provider.getTool(equipped); - if(result != null) { - return result; - } - } - return null; - } - - private ItemYetaWrench addInterfacesImpl(ItemYetaWrench item) { - Enhancer e = new Enhancer(); - YetaWrenchProxy proxy = new YetaWrenchProxy(item, toolImpls); - e.setCallback(proxy); - e.setSuperclass(item.getClass()); - e.setInterceptDuringConstruction(false); - Class[] interfaces = new Class[toolImpls.size()]; - int i = 0; - for (IToolImpl tool : toolImpls) { - interfaces[i] = tool.getInterface(); - ++i; - } - e.setInterfaces(interfaces); - ItemYetaWrench proxifiedObj = (ItemYetaWrench) e.create(); - - return proxifiedObj; - } - - public static class YetaWrenchProxy implements MethodInterceptor { - - private ItemYetaWrench item; - private Map, IToolImpl> impls; - - private YetaWrenchProxy(ItemYetaWrench item, List toolImpls) { - this.item = item; - impls = new HashMap, IToolImpl>(); - for (IToolImpl tool : toolImpls) { - impls.put(tool.getInterface(), tool); - } + public static ITool getEquippedTool(EntityPlayer player) { + return getInstance().getEquippedToolImpl(player); } - @Override - public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { - try { - IToolImpl impl = impls.get(method.getDeclaringClass()); - if(impl != null) { - return impl.handleMethod(item, method, args); + public static ItemYetaWrench addInterfaces(ItemYetaWrench item) { + return getInstance().addInterfacesImpl(item); + } + + public static boolean breakBlockWithTool(Block block, World world, int x, int y, int z, EntityPlayer entityPlayer) { + ITool tool = ToolUtil.getEquippedTool(entityPlayer); + if (tool != null + && entityPlayer.isSneaking() + && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { + if (block.removedByPlayer(world, entityPlayer, x, y, z, true)) { + block.harvestBlock(world, entityPlayer, x, y, z, world.getBlockMetadata(x, y, z)); + } + tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); + return true; + } + return false; + } + + private static ToolUtil instance; + + private static ToolUtil getInstance() { + if (instance == null) { + instance = new ToolUtil(); + } + return instance; + } + + private final List toolProviders = new ArrayList(); + private final List toolImpls = new ArrayList(); + + private ToolUtil() { + + try { + Object obj = Class.forName("crazypants.enderio.tool.BuildCraftToolProvider") + .newInstance(); + toolProviders.add((IToolProvider) obj); + toolImpls.add((IToolImpl) obj); + } catch (Exception e) { + Log.warn("Could not find Build Craft Wrench definition. Wrench integration with other mods may fail"); + } + try { + Object obj = Class.forName("crazypants.enderio.tool.AEToolProvider").newInstance(); + toolProviders.add((IToolProvider) obj); + toolImpls.add((IToolImpl) obj); + } catch (Exception e) { + Log.debug("Could not find AE Wrench definition. Wrench integration with AE may fail"); + } + + toolProviders.add(new TEToolProvider()); + toolImpls.add(new TEToolProvider()); + } + + public void registerToolProvider(IToolProvider toolProvider) { + toolProviders.add(toolProvider); + } + + private boolean isToolEquippedImpl(EntityPlayer player) { + return getEquippedToolImpl(player) != null; + } + + private ITool getEquippedToolImpl(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return null; + } + ItemStack equipped = player.getCurrentEquippedItem(); + if (equipped == null) { + return null; + } + if (equipped.getItem() instanceof ITool) { + return (ITool) equipped.getItem(); + } + return getToolImpl(equipped); + } + + private ITool getToolImpl(ItemStack equipped) { + for (IToolProvider provider : toolProviders) { + ITool result = provider.getTool(equipped); + if (result != null) { + return result; + } + } + return null; + } + + private ItemYetaWrench addInterfacesImpl(ItemYetaWrench item) { + Enhancer e = new Enhancer(); + YetaWrenchProxy proxy = new YetaWrenchProxy(item, toolImpls); + e.setCallback(proxy); + e.setSuperclass(item.getClass()); + e.setInterceptDuringConstruction(false); + Class[] interfaces = new Class[toolImpls.size()]; + int i = 0; + for (IToolImpl tool : toolImpls) { + interfaces[i] = tool.getInterface(); + ++i; + } + e.setInterfaces(interfaces); + ItemYetaWrench proxifiedObj = (ItemYetaWrench) e.create(); + + return proxifiedObj; + } + + public static class YetaWrenchProxy implements MethodInterceptor { + + private ItemYetaWrench item; + private Map, IToolImpl> impls; + + private YetaWrenchProxy(ItemYetaWrench item, List toolImpls) { + this.item = item; + impls = new HashMap, IToolImpl>(); + for (IToolImpl tool : toolImpls) { + impls.put(tool.getInterface(), tool); + } + } + + @Override + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + try { + IToolImpl impl = impls.get(method.getDeclaringClass()); + if (impl != null) { + return impl.handleMethod(item, method, args); + } + method.setAccessible(true); + return method.invoke(item, args); + } catch (Exception e) { + e.printStackTrace(); + return null; + } } - method.setAccessible(true); - return method.invoke(item, args); - } catch (Exception e) { - e.printStackTrace(); - return null; - } } - } } diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index 27a77ec0..8770bdf6 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -1,37 +1,35 @@ package crazypants.enderio.waila; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - public interface IWailaInfoProvider { - - public static final int BIT_BASIC = 0x1; - public static final int BIT_COMMON = 0x2; - public static final int BIT_DETAILED = 0x4; - public static final int ALL_BITS = BIT_BASIC | BIT_COMMON | BIT_DETAILED; - - /** - * Adds the block's info to the WAILA information - * @param tooltip - current list of strings in the WAILA body - * @param world - * @param x - * @param y - * @param z - */ - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z); - - /** - * A bitmask for the default tooltips to show, use static ints in {@link IWailaInfoProvider} - *

    - * Unneded if your block doesn't implement {@link IAdvancedTooltipProvider} - * - * @return Bits enabled corresponding to the tooltip sections you want displayed. - *

    - * Should be returned in the format bit | otherbit (ex. BIT_BASIC | BIT_COMMON). Return ALL_BITS to show all, or 0 to show none. - */ - public int getDefaultDisplayMask(World world, int x, int y, int z); + + public static final int BIT_BASIC = 0x1; + public static final int BIT_COMMON = 0x2; + public static final int BIT_DETAILED = 0x4; + public static final int ALL_BITS = BIT_BASIC | BIT_COMMON | BIT_DETAILED; + + /** + * Adds the block's info to the WAILA information + * @param tooltip - current list of strings in the WAILA body + * @param world + * @param x + * @param y + * @param z + */ + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z); + + /** + * A bitmask for the default tooltips to show, use static ints in {@link IWailaInfoProvider} + *

    + * Unneded if your block doesn't implement {@link IAdvancedTooltipProvider} + * + * @return Bits enabled corresponding to the tooltip sections you want displayed. + *

    + * Should be returned in the format bit | otherbit (ex. BIT_BASIC | BIT_COMMON). Return ALL_BITS to show all, or 0 to show none. + */ + public int getDefaultDisplayMask(World world, int x, int y, int z); } diff --git a/src/main/java/crazypants/enderio/waila/IWailaNBTProvider.java b/src/main/java/crazypants/enderio/waila/IWailaNBTProvider.java index ddc28951..c74bfee4 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaNBTProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaNBTProvider.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound; * Provides NBT info from a TE to be sent to the client */ public interface IWailaNBTProvider { - - void getData(NBTTagCompound tag); - + + void getData(NBTTagCompound tag); } diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 8ca7e2ed..eca7fbba 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -1,9 +1,30 @@ package crazypants.enderio.waila; +import static crazypants.enderio.waila.IWailaInfoProvider.*; + +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; +import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import com.enderio.core.client.handlers.SpecialTooltipHandler; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.block.BlockDarkSteelAnvil; +import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.liquid.AbstractTankConduit; +import crazypants.enderio.conduit.me.IMEConduit; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.fluid.Fluids; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.invpanel.TileInventoryPanel; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.util.IFacade; import java.text.MessageFormat; import java.util.List; import java.util.Locale; - import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -26,323 +47,354 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; - -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.block.BlockDarkSteelAnvil; -import crazypants.enderio.conduit.ConduitUtil; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.liquid.AbstractTankConduit; -import crazypants.enderio.conduit.me.IMEConduit; -import crazypants.enderio.conduit.power.IPowerConduit; -import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.machine.IIoConfigurable; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.invpanel.TileInventoryPanel; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.power.IInternalPoweredTile; -import crazypants.util.IFacade; - -import static crazypants.enderio.waila.IWailaInfoProvider.*; - public class WailaCompat implements IWailaDataProvider { - private class WailaWorldWrapper extends World { - private final World wrapped; - - private WailaWorldWrapper(World wrapped) { - super(wrapped.getSaveHandler(), wrapped.getWorldInfo().getWorldName(), wrapped.provider, new WorldSettings(wrapped.getWorldInfo()), wrapped.theProfiler); - this.wrapped = wrapped; - this.isRemote = wrapped.isRemote; + private class WailaWorldWrapper extends World { + private final World wrapped; + + private WailaWorldWrapper(World wrapped) { + super( + wrapped.getSaveHandler(), + wrapped.getWorldInfo().getWorldName(), + wrapped.provider, + new WorldSettings(wrapped.getWorldInfo()), + wrapped.theProfiler); + this.wrapped = wrapped; + this.isRemote = wrapped.isRemote; + } + + @Override + public Block getBlock(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if (block instanceof IFacade) { + return ((IFacade) block).getFacade(wrapped, x, y, z, -1); + } + return block; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if (block instanceof IFacade) { + return ((IFacade) block).getFacadeMetadata(wrapped, x, y, z, -1); + } + return wrapped.getBlockMetadata(x, y, z); + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + int meta = getBlockMetadata(x, y, z); + Block block = getBlock(x, y, z); + if (block == null || !block.hasTileEntity(meta)) { + return null; + } + TileEntity te = block.createTileEntity(this, meta); + if (te == null) { + return null; + } + + te.setWorldObj(this); + te.xCoord = x; + te.yCoord = y; + te.zCoord = z; + + return te; + } + + @Override + protected IChunkProvider createChunkProvider() { + return null; + } + + @Override + protected int func_152379_p() { + return 0; + } + + @Override + public Entity getEntityByID(int p_73045_1_) { + return null; + } + } + + public static final WailaCompat INSTANCE = new WailaCompat(); + + private static IWailaDataAccessor _accessor = null; + + public static void load(IWailaRegistrar registrar) { + registrar.registerStackProvider(INSTANCE, IFacade.class); + registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class); + + registrar.registerBodyProvider(INSTANCE, BlockEio.class); + + registrar.registerNBTProvider(INSTANCE, TileEntityEio.class); + + ConfigHandler.instance() + .addConfig(EnderIO.MOD_NAME, "facades.hidden", EnderIO.lang.localize("waila.config.hiddenfacades")); } @Override - public Block getBlock(int x, int y, int z) { - Block block = wrapped.getBlock(x, y, z); - if(block instanceof IFacade) { - return ((IFacade) block).getFacade(wrapped, x, y, z, -1); - } - return block; - } - - @Override - public int getBlockMetadata(int x, int y, int z) { - Block block = wrapped.getBlock(x, y, z); - if(block instanceof IFacade) { - return ((IFacade) block).getFacadeMetadata(wrapped, x, y, z, -1); - } - return wrapped.getBlockMetadata(x, y, z); - } - - @Override - public TileEntity getTileEntity(int x, int y, int z) { - int meta = getBlockMetadata(x, y, z); - Block block = getBlock(x, y, z); - if(block == null || !block.hasTileEntity(meta)) { + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + MovingObjectPosition pos = accessor.getPosition(); + if (config.getConfig("facades.hidden")) { + if (accessor.getBlock() instanceof IFacade) { + // If facades are hidden, we need to ignore it + if (accessor.getTileEntity() instanceof IConduitBundle + && ConduitUtil.isFacadeHidden( + (IConduitBundle) accessor.getTileEntity(), accessor.getPlayer())) { + return null; + } + IFacade bundle = (IFacade) accessor.getBlock(); + Block facade = bundle.getFacade( + accessor.getWorld(), + pos.blockX, + pos.blockY, + pos.blockZ, + accessor.getSide().ordinal()); + if (facade != accessor.getBlock()) { + ItemStack ret = facade.getPickBlock( + pos, + new WailaWorldWrapper(accessor.getWorld()), + pos.blockX, + pos.blockY, + pos.blockZ, + accessor.getPlayer()); + return ret; + } + } + } else if (accessor.getBlock() instanceof BlockDarkSteelAnvil) { + return accessor.getBlock() + .getPickBlock( + accessor.getPosition(), + accessor.getWorld(), + accessor.getPosition().blockX, + accessor.getPosition().blockY, + accessor.getPosition().blockZ, + accessor.getPlayer()); + } return null; - } - TileEntity te = block.createTileEntity(this, meta); - if(te == null) { - return null; - } - - te.setWorldObj(this); - te.xCoord = x; - te.yCoord = y; - te.zCoord = z; - - return te; } @Override - protected IChunkProvider createChunkProvider() { - return null; + public List getWailaHead( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @SuppressWarnings("unchecked") + @Override + public List getWailaBody( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + _accessor = accessor; + + EntityPlayer player = accessor.getPlayer(); + MovingObjectPosition pos = accessor.getPosition(); + int x = pos.blockX, y = pos.blockY, z = pos.blockZ; + World world = accessor.getWorld(); + Block block = world.getBlock(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + Item item = Item.getItemFromBlock(block); + + // let's get rid of WAILA's default RF stuff, only supported on WAILA 1.5.9+ + ((ITaggedList) currenttip).removeEntries("RFEnergyStorage"); + + if (te instanceof IIoConfigurable && block == accessor.getBlock()) { + IIoConfigurable machine = (IIoConfigurable) te; + ForgeDirection side = accessor.getSide(); + IoMode mode = machine.getIoMode(side); + currenttip.add(EnumChatFormatting.YELLOW + + EnderIO.lang.localize( + "gui.machine.side", + EnumChatFormatting.WHITE + + EnderIO.lang.localize( + "gui.machine.side." + side.name().toLowerCase(Locale.US)))); + if (!(te instanceof TileInventoryPanel)) { + currenttip.add(EnumChatFormatting.YELLOW + + EnderIO.lang.localize("gui.machine.ioMode", mode.colorLocalisedName())); + } + } + + if (block instanceof IWailaInfoProvider) { + IWailaInfoProvider info = (IWailaInfoProvider) block; + + if (block instanceof IAdvancedTooltipProvider) { + int mask = info.getDefaultDisplayMask(world, pos.blockX, pos.blockY, pos.blockZ); + boolean basic = (mask & BIT_BASIC) == BIT_BASIC; + boolean common = (mask & BIT_COMMON) == BIT_COMMON; + boolean detailed = (mask & BIT_DETAILED) == BIT_DETAILED; + + IAdvancedTooltipProvider adv = (IAdvancedTooltipProvider) block; + + if (common) { + adv.addCommonEntries(itemStack, player, currenttip, false); + } + + if (SpecialTooltipHandler.showAdvancedTooltips() && detailed) { + adv.addDetailedEntries(itemStack, player, currenttip, false); + } else if (detailed) { // show "" + SpecialTooltipHandler.addShowDetailsTooltip(currenttip); + } + + if (!SpecialTooltipHandler.showAdvancedTooltips() && basic) { + adv.addBasicEntries(itemStack, player, currenttip, false); + } + } else if (block instanceof IResourceTooltipProvider) { + SpecialTooltipHandler.INSTANCE.addInformation( + (IResourceTooltipProvider) block, itemStack, player, currenttip); + } + + if (currenttip.size() > 0) { + currenttip.add(""); + } + + info.getWailaInfo(currenttip, player, world, pos.blockX, pos.blockY, pos.blockZ); + } else { + if (block instanceof IAdvancedTooltipProvider) { + SpecialTooltipHandler.INSTANCE.addInformation( + (IAdvancedTooltipProvider) block, itemStack, player, currenttip, false); + } else if (item instanceof IAdvancedTooltipProvider) { + SpecialTooltipHandler.INSTANCE.addInformation( + (IAdvancedTooltipProvider) item, itemStack, player, currenttip, false); + } else if (block instanceof IResourceTooltipProvider) { + SpecialTooltipHandler.INSTANCE.addInformation( + (IResourceTooltipProvider) block, itemStack, player, currenttip); + } + } + + if (te instanceof IConduitBundle) { + getWailaBodyConduitBundle(itemStack, currenttip); + + } else if (te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) { + IInternalPoweredTile power = (IInternalPoweredTile) te; + + if (power.displayPower()) { + + if (currenttip.size() > 4) { + currenttip.add(""); + } + + int stored = accessor.getNBTData().getInteger("storedEnergyRF"); + int max = accessor.getNBTData().getInteger("maxStoredRF"); + + currenttip.add(String.format( + "%s%s%s / %s%s%s %s", + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(stored), + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(max), + EnumChatFormatting.RESET, + PowerDisplayUtil.abrevation())); + } + } + + return currenttip; + } + + private void getWailaBodyConduitBundle(ItemStack itemStack, List currenttip) { + if (itemStack == null) { + return; + } + + if (itemStack.getItem() == EnderIO.itemPowerConduit) { + NBTTagCompound nbtRoot = _accessor.getNBTData(); + if (nbtRoot.hasKey("storedEnergyRF")) { + int stored = nbtRoot.getInteger("storedEnergyRF"); + int max = nbtRoot.getInteger("maxStoredRF"); + currenttip.add(String.format( + "%s%s%s / %s%s%s %s", + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(stored), + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(max), + EnumChatFormatting.RESET, + PowerDisplayUtil.abrevation())); + } + + } else if (itemStack.getItem() == EnderIO.itemLiquidConduit) { + NBTTagCompound nbtRoot = _accessor.getNBTData(); + if (nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) { + boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); + FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot); + String lockedStr = fluidTypeLocked ? EnderIO.lang.localize("itemLiquidConduit.lockedWaila") : ""; + String fluidName = fluid.getLocalizedName(); + int fluidAmount = fluid.amount; + if (fluidAmount > 0) { + // NOTE: using PowerDisplayUtil.formatPower here to handle the non breaking space issue + currenttip.add(String.format( + "%s%s%s%s %s%s%s %s", + lockedStr, + EnumChatFormatting.WHITE, + fluidName, + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, + PowerDisplayUtil.formatPower(fluidAmount), + EnumChatFormatting.RESET, + Fluids.MB())); + } else if (fluidTypeLocked) { + currenttip.add(String.format( + "%s%s%s%s", lockedStr, EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); + } + } + + } else if (itemStack.getItem() == EnderIO.itemMEConduit) { + NBTTagCompound nbtRoot = _accessor.getNBTData(); + if (nbtRoot.hasKey("isDense")) { + boolean isDense = nbtRoot.getBoolean("isDense"); + int channelsInUse = nbtRoot.getInteger("channelsInUse"); + currenttip.add(MessageFormat.format( + EnderIO.lang.localize("itemMEConduit.channelsUsed"), channelsInUse, isDense ? 32 : 8)); + } + } } @Override - protected int func_152379_p() { - return 0; + public List getWailaTail( + ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; } @Override - public Entity getEntityByID(int p_73045_1_) { - return null; - } - } - - public static final WailaCompat INSTANCE = new WailaCompat(); - - private static IWailaDataAccessor _accessor = null; - - public static void load(IWailaRegistrar registrar) { - registrar.registerStackProvider(INSTANCE, IFacade.class); - registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class); - - registrar.registerBodyProvider(INSTANCE, BlockEio.class); - - registrar.registerNBTProvider(INSTANCE, TileEntityEio.class); - - ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", EnderIO.lang.localize("waila.config.hiddenfacades")); - } - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - MovingObjectPosition pos = accessor.getPosition(); - if(config.getConfig("facades.hidden")) { - if(accessor.getBlock() instanceof IFacade) { - // If facades are hidden, we need to ignore it - if(accessor.getTileEntity() instanceof IConduitBundle && ConduitUtil.isFacadeHidden((IConduitBundle) accessor.getTileEntity(), accessor.getPlayer())) { - return null; + public NBTTagCompound getNBTData( + EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + if (te instanceof IWailaNBTProvider) { + ((IWailaNBTProvider) te).getData(tag); } - IFacade bundle = (IFacade) accessor.getBlock(); - Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); - if(facade != accessor.getBlock()) { - ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ, accessor.getPlayer()); - return ret; - } - } - } else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) { - return accessor.getBlock().getPickBlock(accessor.getPosition(), accessor.getWorld(), accessor.getPosition().blockX, accessor.getPosition().blockY, - accessor.getPosition().blockZ, accessor.getPlayer()); - - } - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - return currenttip; - } - - @SuppressWarnings("unchecked") - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - - _accessor = accessor; - - EntityPlayer player = accessor.getPlayer(); - MovingObjectPosition pos = accessor.getPosition(); - int x = pos.blockX, y = pos.blockY, z = pos.blockZ; - World world = accessor.getWorld(); - Block block = world.getBlock(x, y, z); - TileEntity te = world.getTileEntity(x, y, z); - Item item = Item.getItemFromBlock(block); - - // let's get rid of WAILA's default RF stuff, only supported on WAILA 1.5.9+ - ((ITaggedList) currenttip).removeEntries("RFEnergyStorage"); - - if(te instanceof IIoConfigurable && block == accessor.getBlock()) { - IIoConfigurable machine = (IIoConfigurable) te; - ForgeDirection side = accessor.getSide(); - IoMode mode = machine.getIoMode(side); - currenttip.add(EnumChatFormatting.YELLOW - + EnderIO.lang.localize("gui.machine.side", EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase(Locale.US)))); - if(!(te instanceof TileInventoryPanel)) { - currenttip.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("gui.machine.ioMode", mode.colorLocalisedName())); - } - } - - if(block instanceof IWailaInfoProvider) { - IWailaInfoProvider info = (IWailaInfoProvider) block; - - if(block instanceof IAdvancedTooltipProvider) { - int mask = info.getDefaultDisplayMask(world, pos.blockX, pos.blockY, pos.blockZ); - boolean basic = (mask & BIT_BASIC) == BIT_BASIC; - boolean common = (mask & BIT_COMMON) == BIT_COMMON; - boolean detailed = (mask & BIT_DETAILED) == BIT_DETAILED; - - IAdvancedTooltipProvider adv = (IAdvancedTooltipProvider) block; - - if(common) { - adv.addCommonEntries(itemStack, player, currenttip, false); + if (te instanceof IConduitBundle) { + IConduitBundle icb = (IConduitBundle) te; + IPowerConduit pc = icb.getConduit(IPowerConduit.class); + if (pc != null) { + tag.setInteger("storedEnergyRF", pc.getEnergyStored()); + tag.setInteger("maxStoredRF", pc.getMaxEnergyStored()); + } + AbstractTankConduit atc = icb.getConduit(AbstractTankConduit.class); + if (atc != null) { + FluidStack fluid = atc.getTank().getFluid(); + if (fluid != null) { + tag.setBoolean("fluidLocked", atc.isFluidTypeLocked()); + fluid.writeToNBT(tag); + } + } + IMEConduit mec = icb.getConduit(IMEConduit.class); + if (mec != null) { + tag.setInteger("channelsInUse", mec.getChannelsInUse()); + tag.setBoolean("isDense", mec.isDense()); + } + } else if (te instanceof IInternalPoweredTile) { + IInternalPoweredTile ipte = (IInternalPoweredTile) te; + tag.setInteger("storedEnergyRF", ipte.getEnergyStored()); + tag.setInteger("maxStoredRF", ipte.getMaxEnergyStored()); } - if(SpecialTooltipHandler.showAdvancedTooltips() && detailed) { - adv.addDetailedEntries(itemStack, player, currenttip, false); - } else if(detailed) { // show "" - SpecialTooltipHandler.addShowDetailsTooltip(currenttip); - } - - if(!SpecialTooltipHandler.showAdvancedTooltips() && basic) { - adv.addBasicEntries(itemStack, player, currenttip, false); - } - } else if(block instanceof IResourceTooltipProvider) { - SpecialTooltipHandler.INSTANCE.addInformation((IResourceTooltipProvider) block, itemStack, player, currenttip); - } - - if(currenttip.size() > 0) { - currenttip.add(""); - } - - info.getWailaInfo(currenttip, player, world, pos.blockX, pos.blockY, pos.blockZ); + tag.setInteger("x", x); + tag.setInteger("y", y); + tag.setInteger("z", z); + return tag; } - else { - if(block instanceof IAdvancedTooltipProvider) { - SpecialTooltipHandler.INSTANCE.addInformation((IAdvancedTooltipProvider) block, itemStack, player, currenttip, false); - } else if(item instanceof IAdvancedTooltipProvider) { - SpecialTooltipHandler.INSTANCE.addInformation((IAdvancedTooltipProvider) item, itemStack, player, currenttip, false); - } else if(block instanceof IResourceTooltipProvider) { - SpecialTooltipHandler.INSTANCE.addInformation((IResourceTooltipProvider) block, itemStack, player, currenttip); - } + public static NBTTagCompound getNBTData() { + return _accessor.getNBTData(); } - - if(te instanceof IConduitBundle) { - getWailaBodyConduitBundle(itemStack, currenttip); - - } else if(te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) { - IInternalPoweredTile power = (IInternalPoweredTile) te; - - if(power.displayPower()) { - - if(currenttip.size() > 4) { - currenttip.add(""); - } - - int stored = accessor.getNBTData().getInteger("storedEnergyRF"); - int max = accessor.getNBTData().getInteger("maxStoredRF"); - - currenttip.add(String.format("%s%s%s / %s%s%s %s", EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(stored), EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(max), EnumChatFormatting.RESET, PowerDisplayUtil.abrevation())); - } - } - - return currenttip; - } - - private void getWailaBodyConduitBundle(ItemStack itemStack, List currenttip) { - if(itemStack == null) { - return; - } - - if(itemStack.getItem() == EnderIO.itemPowerConduit) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); - if(nbtRoot.hasKey("storedEnergyRF")) { - int stored = nbtRoot.getInteger("storedEnergyRF"); - int max = nbtRoot.getInteger("maxStoredRF"); - currenttip.add(String.format("%s%s%s / %s%s%s %s", EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(stored), EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(max), EnumChatFormatting.RESET, PowerDisplayUtil.abrevation())); - } - - } else if(itemStack.getItem() == EnderIO.itemLiquidConduit) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); - if(nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) { - boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); - FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot); - String lockedStr = fluidTypeLocked ? EnderIO.lang.localize("itemLiquidConduit.lockedWaila") : ""; - String fluidName = fluid.getLocalizedName(); - int fluidAmount = fluid.amount; - if(fluidAmount > 0) { - // NOTE: using PowerDisplayUtil.formatPower here to handle the non breaking space issue - currenttip.add(String.format("%s%s%s%s %s%s%s %s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, PowerDisplayUtil.formatPower(fluidAmount), EnumChatFormatting.RESET, - Fluids.MB())); - } else if(fluidTypeLocked) { - currenttip.add(String.format("%s%s%s%s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); - } - } - - } else if(itemStack.getItem() == EnderIO.itemMEConduit) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); - if(nbtRoot.hasKey("isDense")) { - boolean isDense = nbtRoot.getBoolean("isDense"); - int channelsInUse = nbtRoot.getInteger("channelsInUse"); - currenttip.add(MessageFormat.format(EnderIO.lang.localize("itemMEConduit.channelsUsed"), - channelsInUse, isDense ? 32 : 8)); - } - } - } - - @Override - 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) { - if(te instanceof IWailaNBTProvider) { - ((IWailaNBTProvider) te).getData(tag); - } - if(te instanceof IConduitBundle) { - IConduitBundle icb = (IConduitBundle) te; - IPowerConduit pc = icb.getConduit(IPowerConduit.class); - if(pc != null) { - tag.setInteger("storedEnergyRF", pc.getEnergyStored()); - tag.setInteger("maxStoredRF", pc.getMaxEnergyStored()); - } - AbstractTankConduit atc = icb.getConduit(AbstractTankConduit.class); - if(atc != null) { - FluidStack fluid = atc.getTank().getFluid(); - if(fluid != null) { - tag.setBoolean("fluidLocked", atc.isFluidTypeLocked()); - fluid.writeToNBT(tag); - } - } - IMEConduit mec = icb.getConduit(IMEConduit.class); - if(mec != null) { - tag.setInteger("channelsInUse", mec.getChannelsInUse()); - tag.setBoolean("isDense", mec.isDense()); - } - } else if(te instanceof IInternalPoweredTile) { - IInternalPoweredTile ipte = (IInternalPoweredTile) te; - tag.setInteger("storedEnergyRF", ipte.getEnergyStored()); - tag.setInteger("maxStoredRF", ipte.getMaxEnergyStored()); - } - - tag.setInteger("x", x); - tag.setInteger("y", y); - tag.setInteger("z", z); - return tag; - } - - public static NBTTagCompound getNBTData() { - return _accessor.getNBTData(); - } } diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index e1a7646a..d13cf3d5 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -1,50 +1,45 @@ package crazypants.enderio.xp; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; - -import org.lwjgl.opengl.GL11; - import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; - import crazypants.enderio.gui.IconEIO; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import org.lwjgl.opengl.GL11; public class ExperienceBarRenderer { - public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont) { - render(gui, x, y, length, xpCont, -1); - } - - public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont, int required) { - - String text = xpCont.getExperienceLevel() + ""; - int color = 8453920; - boolean shadow = true; - if(required > 0) { - text += "/" + required; - if(required > xpCont.getExperienceLevel()) { - color = ColorUtil.getRGB(1f, 0, 0.1f); - shadow = false; - } + public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont) { + render(gui, x, y, length, xpCont, -1); } - FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - int strX = x + length / 2 - fr.getStringWidth(text) / 2; - fr.drawString(text, strX, y - 11, color, shadow); - RenderUtil.bindTexture(IconEIO.TEXTURE); - GL11.glColor3f(1, 1, 1); - int xpScaled = xpCont.getXpBarScaled(length - 2); + public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont, int required) { - // x, y, u, v, width, height - //start of 'slot' - gui.drawTexturedModalRect(x, y, 0, 91, 1, 5); - gui.drawTexturedModalRect(x + 1, y, 1, 91, length - 2, 5); - gui.drawTexturedModalRect(x + length - 1, y, 125, 91, 1, 5); + String text = xpCont.getExperienceLevel() + ""; + int color = 8453920; + boolean shadow = true; + if (required > 0) { + text += "/" + required; + if (required > xpCont.getExperienceLevel()) { + color = ColorUtil.getRGB(1f, 0, 0.1f); + shadow = false; + } + } + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + int strX = x + length / 2 - fr.getStringWidth(text) / 2; + fr.drawString(text, strX, y - 11, color, shadow); - RenderUtil.renderQuad2D(x + 1, y + 1, 0, xpScaled, 3, ColorUtil.getRGB(0, 127, 14)); + RenderUtil.bindTexture(IconEIO.TEXTURE); + GL11.glColor3f(1, 1, 1); + int xpScaled = xpCont.getXpBarScaled(length - 2); - } + // x, y, u, v, width, height + // start of 'slot' + gui.drawTexturedModalRect(x, y, 0, 91, 1, 5); + gui.drawTexturedModalRect(x + 1, y, 1, 91, length - 2, 5); + gui.drawTexturedModalRect(x + length - 1, y, 125, 91, 1, 5); + RenderUtil.renderQuad2D(x + 1, y + 1, 0, xpScaled, 3, ColorUtil.getRGB(0, 127, 14)); + } } diff --git a/src/main/java/crazypants/enderio/xp/ExperienceContainer.java b/src/main/java/crazypants/enderio/xp/ExperienceContainer.java index 94efe259..ec4bd7c5 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceContainer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceContainer.java @@ -1,9 +1,8 @@ package crazypants.enderio.xp; +import crazypants.enderio.EnderIO; import io.netty.buffer.ByteBuf; - import java.security.InvalidParameterException; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -11,279 +10,272 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; -import crazypants.enderio.EnderIO; public class ExperienceContainer extends FluidTank { - // Note: We extend FluidTank instead of implementing IFluidTank because it has - // some methods we need. + // Note: We extend FluidTank instead of implementing IFluidTank because it has + // some methods we need. - private int experienceLevel; - private float experience; - private int experienceTotal; - private boolean xpDirty; - private final int maxXp; - - public ExperienceContainer() { - this(Integer.MAX_VALUE); - } - - public ExperienceContainer(int maxStored) { - super(null, 0); - // enforce overflow-safe value - maxXp = Math.min(maxStored, XpUtil.liquidToExperience(Integer.MAX_VALUE)); - } - - public int getMaximumExperiance() { - return maxXp; - } + private int experienceLevel; + private float experience; + private int experienceTotal; + private boolean xpDirty; + private final int maxXp; - public int getExperienceLevel() { - return experienceLevel; - } - - public float getExperience() { - return experience; - } - - public int getExperienceTotal() { - return experienceTotal; - } - - public boolean isDirty() { - return xpDirty; - } - - public void setDirty(boolean isDirty) { - xpDirty = isDirty; - } - - public void set(ExperienceContainer xpCon) { - experienceTotal = xpCon.experienceTotal; - experienceLevel = xpCon.experienceLevel; - experience = xpCon.experience; - } - - public int addExperience(int xpToAdd) { - int j = maxXp - experienceTotal; - if(xpToAdd > j) { - xpToAdd = j; + public ExperienceContainer() { + this(Integer.MAX_VALUE); } - experience += (float) xpToAdd / (float) getXpBarCapacity(); - experienceTotal += xpToAdd; - for (; experience >= 1.0F; experience /= getXpBarCapacity()) { - experience = (experience - 1.0F) * getXpBarCapacity(); - experienceLevel++; + public ExperienceContainer(int maxStored) { + super(null, 0); + // enforce overflow-safe value + maxXp = Math.min(maxStored, XpUtil.liquidToExperience(Integer.MAX_VALUE)); } - xpDirty = true; - return xpToAdd; - } - private int getXpBarCapacity() { - return XpUtil.getXpBarCapacity(experienceLevel); - } - - public int getXpBarScaled(int scale) { - int result = (int) (experience * scale); - return result; - - } - - public void givePlayerXp(EntityPlayer player, int levels) { - for (int i = 0; i < levels && experienceTotal > 0; i++) { - givePlayerXpLevel(player); + public int getMaximumExperiance() { + return maxXp; } - } - public void givePlayerXpLevel(EntityPlayer player) { - int currentXP = XpUtil.getPlayerXP(player); - int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1; - int requiredXP = nextLevelXP - currentXP; - - requiredXP = Math.min(experienceTotal, requiredXP); - player.addExperience(requiredXP); - - int newXp = experienceTotal - requiredXP; - experience = 0; - experienceLevel = 0; - experienceTotal = 0; - addExperience(newXp); - } - - - public void drainPlayerXpToReachContainerLevel(EntityPlayer player, int level) { - int targetXP = XpUtil.getExperienceForLevel(level); - int requiredXP = targetXP - experienceTotal; - if(requiredXP <= 0) { - return; + public int getExperienceLevel() { + return experienceLevel; } - int drainXP = Math.min(requiredXP, XpUtil.getPlayerXP(player)); - addExperience(drainXP); - XpUtil.addPlayerXP(player, -drainXP); - } - - public void drainPlayerXpToReachPlayerLevel(EntityPlayer player, int level) { - int targetXP = XpUtil.getExperienceForLevel(level); - int drainXP = XpUtil.getPlayerXP(player) - targetXP; - if(drainXP <= 0) { - return; - } - drainXP = addExperience(drainXP); - if(drainXP > 0) { - XpUtil.addPlayerXP(player, -drainXP); + + public float getExperience() { + return experience; } - } - - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(resource == null || !canDrain(from, resource.getFluid())) { - return null; - } - return drain(from, resource.amount, doDrain); - } - - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(EnderIO.fluidXpJuice == null) { - return null; + public int getExperienceTotal() { + return experienceTotal; } - int available = getFluidAmount(); - int canDrain = Math.min(available, maxDrain); - final int xpAskedToExtract = XpUtil.liquidToExperience(canDrain); - // only return multiples of 1 XP (20mB) to avoid duping XP when being asked - // for low values (like 10mB/t) - final int fluidToExtract = XpUtil.experienceToLiquid(xpAskedToExtract); - final int xpToExtract = XpUtil.liquidToExperience(fluidToExtract); - if(doDrain) { - int newXp = experienceTotal - xpToExtract; - experience = 0; - experienceLevel = 0; - experienceTotal = 0; - addExperience(newXp); + + public boolean isDirty() { + return xpDirty; } - return new FluidStack(EnderIO.fluidXpJuice, fluidToExtract); - } - public boolean canFill(ForgeDirection from, Fluid fluid) { - return fluid != null && EnderIO.fluidXpJuice != null && fluid.getID() == EnderIO.fluidXpJuice.getID(); - } - - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource == null) { - return 0; + public void setDirty(boolean isDirty) { + xpDirty = isDirty; } - if(resource.amount <= 0) { - return 0; + + public void set(ExperienceContainer xpCon) { + experienceTotal = xpCon.experienceTotal; + experienceLevel = xpCon.experienceLevel; + experience = xpCon.experience; } - if(!canFill(from, resource.getFluid())) { - return 0; + + public int addExperience(int xpToAdd) { + int j = maxXp - experienceTotal; + if (xpToAdd > j) { + xpToAdd = j; + } + + experience += (float) xpToAdd / (float) getXpBarCapacity(); + experienceTotal += xpToAdd; + for (; experience >= 1.0F; experience /= getXpBarCapacity()) { + experience = (experience - 1.0F) * getXpBarCapacity(); + experienceLevel++; + } + xpDirty = true; + return xpToAdd; } - //need to do these calcs in XP instead of fluid space to avoid type overflows - int xp = XpUtil.liquidToExperience(resource.amount); - int xpSpace = getMaximumExperiance() - getExperienceTotal(); - int canFillXP = Math.min(xp, xpSpace); - if(canFillXP <= 0) { - return 0; + + private int getXpBarCapacity() { + return XpUtil.getXpBarCapacity(experienceLevel); } - if(doFill) { - addExperience(canFillXP); + + public int getXpBarScaled(int scale) { + int result = (int) (experience * scale); + return result; } - return XpUtil.experienceToLiquid(canFillXP); - } - - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return fluid != null && EnderIO.fluidXpJuice != null && fluid.getID() == EnderIO.fluidXpJuice.getID(); - } - - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(EnderIO.fluidXpJuice == null) { - return new FluidTankInfo[0]; + + public void givePlayerXp(EntityPlayer player, int levels) { + for (int i = 0; i < levels && experienceTotal > 0; i++) { + givePlayerXpLevel(player); + } } - return new FluidTankInfo[] { - new FluidTankInfo(new FluidStack(EnderIO.fluidXpJuice, getFluidAmount()), getCapacity()) - }; - } - @Override - public int getCapacity() { - if(maxXp == Integer.MAX_VALUE) { - return Integer.MAX_VALUE; + public void givePlayerXpLevel(EntityPlayer player) { + int currentXP = XpUtil.getPlayerXP(player); + int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1; + int requiredXP = nextLevelXP - currentXP; + + requiredXP = Math.min(experienceTotal, requiredXP); + player.addExperience(requiredXP); + + int newXp = experienceTotal - requiredXP; + experience = 0; + experienceLevel = 0; + experienceTotal = 0; + addExperience(newXp); } - return XpUtil.experienceToLiquid(maxXp); - } - @Override - public int getFluidAmount() { - return XpUtil.experienceToLiquid(experienceTotal); - } - - @Override - public FluidTank readFromNBT(NBTTagCompound nbtRoot) { - experienceLevel = nbtRoot.getInteger("experienceLevel"); - experienceTotal = nbtRoot.getInteger("experienceTotal"); - experience = nbtRoot.getFloat("experience"); - return this; - } - - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbtRoot) { - nbtRoot.setInteger("experienceLevel", experienceLevel); - nbtRoot.setInteger("experienceTotal", experienceTotal); - nbtRoot.setFloat("experience", experience); - return nbtRoot; - } - - public void toBytes(ByteBuf buf) { - buf.writeInt(experienceTotal); - buf.writeInt(experienceLevel); - buf.writeFloat(experience); - } - - public void fromBytes(ByteBuf buf) { - experienceTotal = buf.readInt(); - experienceLevel = buf.readInt(); - experience = buf.readFloat(); - } - - - @Override - public FluidStack getFluid() { - return new FluidStack(EnderIO.fluidXpJuice, getFluidAmount()); - } - - @Override - public FluidTankInfo getInfo() { - return getTankInfo(ForgeDirection.UNKNOWN)[0]; - } - - @Override - public int fill(FluidStack resource, boolean doFill) { - return fill(ForgeDirection.UNKNOWN, resource, doFill); - } - - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - return drain(ForgeDirection.UNKNOWN, maxDrain, doDrain); - } - - @Override - public void setFluid(FluidStack fluid) { - experience = 0; - experienceLevel = 0; - experienceTotal = 0; - if (fluid != null && fluid.getFluid() != null) { - if (EnderIO.fluidXpJuice == fluid.getFluid()) { - addExperience(XpUtil.liquidToExperience(fluid.amount)); - } else { - throw new InvalidParameterException(fluid.getFluid() + " is no XP juice"); - } + public void drainPlayerXpToReachContainerLevel(EntityPlayer player, int level) { + int targetXP = XpUtil.getExperienceForLevel(level); + int requiredXP = targetXP - experienceTotal; + if (requiredXP <= 0) { + return; + } + int drainXP = Math.min(requiredXP, XpUtil.getPlayerXP(player)); + addExperience(drainXP); + XpUtil.addPlayerXP(player, -drainXP); } - xpDirty = true; - } - @Override - public void setCapacity(int capacity) { - throw new InvalidParameterException(); - } + public void drainPlayerXpToReachPlayerLevel(EntityPlayer player, int level) { + int targetXP = XpUtil.getExperienceForLevel(level); + int drainXP = XpUtil.getPlayerXP(player) - targetXP; + if (drainXP <= 0) { + return; + } + drainXP = addExperience(drainXP); + if (drainXP > 0) { + XpUtil.addPlayerXP(player, -drainXP); + } + } + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if (resource == null || !canDrain(from, resource.getFluid())) { + return null; + } + return drain(from, resource.amount, doDrain); + } + + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if (EnderIO.fluidXpJuice == null) { + return null; + } + int available = getFluidAmount(); + int canDrain = Math.min(available, maxDrain); + final int xpAskedToExtract = XpUtil.liquidToExperience(canDrain); + // only return multiples of 1 XP (20mB) to avoid duping XP when being asked + // for low values (like 10mB/t) + final int fluidToExtract = XpUtil.experienceToLiquid(xpAskedToExtract); + final int xpToExtract = XpUtil.liquidToExperience(fluidToExtract); + if (doDrain) { + int newXp = experienceTotal - xpToExtract; + experience = 0; + experienceLevel = 0; + experienceTotal = 0; + addExperience(newXp); + } + return new FluidStack(EnderIO.fluidXpJuice, fluidToExtract); + } + + public boolean canFill(ForgeDirection from, Fluid fluid) { + return fluid != null && EnderIO.fluidXpJuice != null && fluid.getID() == EnderIO.fluidXpJuice.getID(); + } + + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if (resource == null) { + return 0; + } + if (resource.amount <= 0) { + return 0; + } + if (!canFill(from, resource.getFluid())) { + return 0; + } + // need to do these calcs in XP instead of fluid space to avoid type overflows + int xp = XpUtil.liquidToExperience(resource.amount); + int xpSpace = getMaximumExperiance() - getExperienceTotal(); + int canFillXP = Math.min(xp, xpSpace); + if (canFillXP <= 0) { + return 0; + } + if (doFill) { + addExperience(canFillXP); + } + return XpUtil.experienceToLiquid(canFillXP); + } + + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return fluid != null && EnderIO.fluidXpJuice != null && fluid.getID() == EnderIO.fluidXpJuice.getID(); + } + + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if (EnderIO.fluidXpJuice == null) { + return new FluidTankInfo[0]; + } + return new FluidTankInfo[] { + new FluidTankInfo(new FluidStack(EnderIO.fluidXpJuice, getFluidAmount()), getCapacity()) + }; + } + + @Override + public int getCapacity() { + if (maxXp == Integer.MAX_VALUE) { + return Integer.MAX_VALUE; + } + return XpUtil.experienceToLiquid(maxXp); + } + + @Override + public int getFluidAmount() { + return XpUtil.experienceToLiquid(experienceTotal); + } + + @Override + public FluidTank readFromNBT(NBTTagCompound nbtRoot) { + experienceLevel = nbtRoot.getInteger("experienceLevel"); + experienceTotal = nbtRoot.getInteger("experienceTotal"); + experience = nbtRoot.getFloat("experience"); + return this; + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setInteger("experienceLevel", experienceLevel); + nbtRoot.setInteger("experienceTotal", experienceTotal); + nbtRoot.setFloat("experience", experience); + return nbtRoot; + } + + public void toBytes(ByteBuf buf) { + buf.writeInt(experienceTotal); + buf.writeInt(experienceLevel); + buf.writeFloat(experience); + } + + public void fromBytes(ByteBuf buf) { + experienceTotal = buf.readInt(); + experienceLevel = buf.readInt(); + experience = buf.readFloat(); + } + + @Override + public FluidStack getFluid() { + return new FluidStack(EnderIO.fluidXpJuice, getFluidAmount()); + } + + @Override + public FluidTankInfo getInfo() { + return getTankInfo(ForgeDirection.UNKNOWN)[0]; + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + return fill(ForgeDirection.UNKNOWN, resource, doFill); + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + return drain(ForgeDirection.UNKNOWN, maxDrain, doDrain); + } + + @Override + public void setFluid(FluidStack fluid) { + experience = 0; + experienceLevel = 0; + experienceTotal = 0; + if (fluid != null && fluid.getFluid() != null) { + if (EnderIO.fluidXpJuice == fluid.getFluid()) { + addExperience(XpUtil.liquidToExperience(fluid.amount)); + } else { + throw new InvalidParameterException(fluid.getFluid() + " is no XP juice"); + } + } + xpDirty = true; + } + + @Override + public void setCapacity(int capacity) { + throw new InvalidParameterException(); + } } diff --git a/src/main/java/crazypants/enderio/xp/IHaveExperience.java b/src/main/java/crazypants/enderio/xp/IHaveExperience.java index ab5883e7..3100c73b 100644 --- a/src/main/java/crazypants/enderio/xp/IHaveExperience.java +++ b/src/main/java/crazypants/enderio/xp/IHaveExperience.java @@ -2,6 +2,5 @@ package crazypants.enderio.xp; public interface IHaveExperience { - ExperienceContainer getContainer(); - + ExperienceContainer getContainer(); } diff --git a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java index 632c7e69..9299d13c 100644 --- a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java @@ -1,71 +1,69 @@ package crazypants.enderio.xp; import com.enderio.core.common.network.MessageTileEntity; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketDrainPlayerXP extends MessageTileEntity implements IMessageHandler { +public class PacketDrainPlayerXP extends MessageTileEntity + implements IMessageHandler { - private static boolean isRegistered = false; - - public static void register() { - if(!isRegistered) { - PacketHandler.INSTANCE.registerMessage(PacketDrainPlayerXP.class, PacketDrainPlayerXP.class, PacketHandler.nextID(), Side.SERVER); - isRegistered = true; - } - } - - - int targetLevel; - boolean isContainerLevel; - - public PacketDrainPlayerXP() { - } + private static boolean isRegistered = false; - public PacketDrainPlayerXP(TileEntity tile, int targetLevel, boolean isContainerLevel) { - super(tile); - this.targetLevel = targetLevel; - this.isContainerLevel = isContainerLevel; - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort((short)targetLevel); - buf.writeBoolean(isContainerLevel); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - targetLevel = buf.readShort(); - isContainerLevel = buf.readBoolean(); - } - - @Override - public IMessage onMessage(PacketDrainPlayerXP message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity tile = message.getTileEntity(player.worldObj); - if (tile instanceof IHaveExperience) { - IHaveExperience xpTile = (IHaveExperience)tile; - if(player.capabilities.isCreativeMode && message.isContainerLevel) { - xpTile.getContainer().addExperience(XpUtil.getExperienceForLevel(message.targetLevel)); - } else { - if(message.isContainerLevel) { - xpTile.getContainer().drainPlayerXpToReachContainerLevel(player, message.targetLevel); - } else { - xpTile.getContainer().drainPlayerXpToReachPlayerLevel(player, message.targetLevel); + public static void register() { + if (!isRegistered) { + PacketHandler.INSTANCE.registerMessage( + PacketDrainPlayerXP.class, PacketDrainPlayerXP.class, PacketHandler.nextID(), Side.SERVER); + isRegistered = true; } - } } - return null; - } + int targetLevel; + boolean isContainerLevel; + + public PacketDrainPlayerXP() {} + + public PacketDrainPlayerXP(TileEntity tile, int targetLevel, boolean isContainerLevel) { + super(tile); + this.targetLevel = targetLevel; + this.isContainerLevel = isContainerLevel; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort((short) targetLevel); + buf.writeBoolean(isContainerLevel); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + targetLevel = buf.readShort(); + isContainerLevel = buf.readBoolean(); + } + + @Override + public IMessage onMessage(PacketDrainPlayerXP message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity tile = message.getTileEntity(player.worldObj); + if (tile instanceof IHaveExperience) { + IHaveExperience xpTile = (IHaveExperience) tile; + if (player.capabilities.isCreativeMode && message.isContainerLevel) { + xpTile.getContainer().addExperience(XpUtil.getExperienceForLevel(message.targetLevel)); + } else { + if (message.isContainerLevel) { + xpTile.getContainer().drainPlayerXpToReachContainerLevel(player, message.targetLevel); + } else { + xpTile.getContainer().drainPlayerXpToReachPlayerLevel(player, message.targetLevel); + } + } + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java index caa214ab..a78640fe 100644 --- a/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java +++ b/src/main/java/crazypants/enderio/xp/PacketExperianceContainer.java @@ -1,60 +1,64 @@ package crazypants.enderio.xp; import com.enderio.core.common.network.MessageTileEntity; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.EnderIO; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketExperianceContainer extends MessageTileEntity implements IMessageHandler { +public class PacketExperianceContainer extends MessageTileEntity + implements IMessageHandler { - private static boolean registered = false; - - public static void register() { - if(!registered) { - PacketHandler.INSTANCE.registerMessage(PacketExperianceContainer.class, PacketExperianceContainer.class, PacketHandler.nextID(), Side.CLIENT); - registered = true; + private static boolean registered = false; + + public static void register() { + if (!registered) { + PacketHandler.INSTANCE.registerMessage( + PacketExperianceContainer.class, + PacketExperianceContainer.class, + PacketHandler.nextID(), + Side.CLIENT); + registered = true; + } } - } - - private ExperienceContainer xpCon; - public PacketExperianceContainer() { - xpCon = new ExperienceContainer(); - } + private ExperienceContainer xpCon; - public PacketExperianceContainer(TileEntity tile) { - super(tile); - IHaveExperience xpTile = (IHaveExperience)tile; - xpCon = xpTile.getContainer(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - xpCon.toBytes(buf); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - xpCon.fromBytes(buf); - } - - @Override - public IMessage onMessage(PacketExperianceContainer message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity tile = message.getTileEntity(player.worldObj); - if (tile instanceof IHaveExperience) { - IHaveExperience xpTile = (IHaveExperience)tile; - xpTile.getContainer().set(message.xpCon); + public PacketExperianceContainer() { + xpCon = new ExperienceContainer(); + } + + public PacketExperianceContainer(TileEntity tile) { + super(tile); + IHaveExperience xpTile = (IHaveExperience) tile; + xpCon = xpTile.getContainer(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + xpCon.toBytes(buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + xpCon.fromBytes(buf); + } + + @Override + public IMessage onMessage(PacketExperianceContainer message, MessageContext ctx) { + EntityPlayer player = EnderIO.proxy.getClientPlayer(); + TileEntity tile = message.getTileEntity(player.worldObj); + if (tile instanceof IHaveExperience) { + IHaveExperience xpTile = (IHaveExperience) tile; + xpTile.getContainer().set(message.xpCon); + } + return null; } - return null; - } } diff --git a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java index bc95285e..01efc4b4 100644 --- a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java @@ -1,59 +1,57 @@ package crazypants.enderio.xp; import com.enderio.core.common.network.MessageTileEntity; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; -public class PacketGivePlayerXP extends MessageTileEntity implements IMessageHandler { +public class PacketGivePlayerXP extends MessageTileEntity + implements IMessageHandler { - private static boolean isRegistered = false; - - public static void register() { - if(!isRegistered) { - PacketHandler.INSTANCE.registerMessage(PacketGivePlayerXP.class, PacketGivePlayerXP.class, PacketHandler.nextID(), Side.SERVER); - isRegistered = true; + private static boolean isRegistered = false; + + public static void register() { + if (!isRegistered) { + PacketHandler.INSTANCE.registerMessage( + PacketGivePlayerXP.class, PacketGivePlayerXP.class, PacketHandler.nextID(), Side.SERVER); + isRegistered = true; + } } - } - - - int levels; - - public PacketGivePlayerXP() { - } - public PacketGivePlayerXP(TileEntity tile, int levels) { - super(tile); - this.levels = levels; - } + int levels; - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeShort((short)levels); - } + public PacketGivePlayerXP() {} - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - levels = buf.readShort(); - } - - @Override - public IMessage onMessage(PacketGivePlayerXP message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity tile = message.getTileEntity(player.worldObj); - if (tile instanceof IHaveExperience) { - IHaveExperience xpTile = (IHaveExperience)tile; - xpTile.getContainer().givePlayerXp(player, message.levels); + public PacketGivePlayerXP(TileEntity tile, int levels) { + super(tile); + this.levels = levels; } - return null; - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeShort((short) levels); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + levels = buf.readShort(); + } + + @Override + public IMessage onMessage(PacketGivePlayerXP message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity tile = message.getTileEntity(player.worldObj); + if (tile instanceof IHaveExperience) { + IHaveExperience xpTile = (IHaveExperience) tile; + xpTile.getContainer().givePlayerXp(player, message.levels); + } + return null; + } } diff --git a/src/main/java/crazypants/enderio/xp/XpUtil.java b/src/main/java/crazypants/enderio/xp/XpUtil.java index 1012283e..537db79e 100644 --- a/src/main/java/crazypants/enderio/xp/XpUtil.java +++ b/src/main/java/crazypants/enderio/xp/XpUtil.java @@ -9,60 +9,58 @@ import net.minecraft.entity.player.EntityPlayer; */ public class XpUtil { - //Values taken from OpenBlocks to ensure compatibility - - public static final int XP_PER_BOTTLE = 8; - public static final int RATIO = 20; - public static final int LIQUID_PER_XP_BOTTLE = XP_PER_BOTTLE * RATIO; - - - public static int liquidToExperience(int liquid) { - return liquid / RATIO; - } + // Values taken from OpenBlocks to ensure compatibility - public static int experienceToLiquid(int xp) { - return xp * RATIO; - } + public static final int XP_PER_BOTTLE = 8; + public static final int RATIO = 20; + public static final int LIQUID_PER_XP_BOTTLE = XP_PER_BOTTLE * RATIO; - public static int getLiquidForLevel(int level) { - return experienceToLiquid(getExperienceForLevel(level)); - } - - public static int getExperienceForLevel(int level) { - if (level == 0) { return 0; } - if (level > 0 && level < 16) { - return level * 17; - } else if (level > 15 && level < 31) { - return (int)(1.5 * Math.pow(level, 2) - 29.5 * level + 360); - } else { - return (int)(3.5 * Math.pow(level, 2) - 151.5 * level + 2220); + public static int liquidToExperience(int liquid) { + return liquid / RATIO; } - } - - public static int getXpBarCapacity(int level) { - return level >= 30 ? 62 + (level - 30) * 7 : (level >= 15 ? 17 + (level - 15) * 3 : 17); - } - - public static int getLevelForExperience(int experience) { - int i = 0; - while (getExperienceForLevel(i) <= experience) { - i++; - } - return i - 1; - } - public static int getPlayerXP(EntityPlayer player) { - return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap())); - } - - public static void addPlayerXP(EntityPlayer player, int amount) { - int experience = getPlayerXP(player) + amount; - player.experienceTotal = experience; - player.experienceLevel = getLevelForExperience(experience); - int expForLevel = getExperienceForLevel(player.experienceLevel); - player.experience = (float)(experience - expForLevel) / (float)player.xpBarCap(); - } - - - + public static int experienceToLiquid(int xp) { + return xp * RATIO; + } + + public static int getLiquidForLevel(int level) { + return experienceToLiquid(getExperienceForLevel(level)); + } + + public static int getExperienceForLevel(int level) { + if (level == 0) { + return 0; + } + if (level > 0 && level < 16) { + return level * 17; + } else if (level > 15 && level < 31) { + return (int) (1.5 * Math.pow(level, 2) - 29.5 * level + 360); + } else { + return (int) (3.5 * Math.pow(level, 2) - 151.5 * level + 2220); + } + } + + public static int getXpBarCapacity(int level) { + return level >= 30 ? 62 + (level - 30) * 7 : (level >= 15 ? 17 + (level - 15) * 3 : 17); + } + + public static int getLevelForExperience(int experience) { + int i = 0; + while (getExperienceForLevel(i) <= experience) { + i++; + } + return i - 1; + } + + public static int getPlayerXP(EntityPlayer player) { + return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap())); + } + + public static void addPlayerXP(EntityPlayer player, int amount) { + int experience = getPlayerXP(player) + amount; + player.experienceTotal = experience; + player.experienceLevel = getLevelForExperience(experience); + int expForLevel = getExperienceForLevel(player.experienceLevel); + player.experience = (float) (experience - expForLevel) / (float) player.xpBarCap(); + } } diff --git a/src/main/java/crazypants/util/BaublesUtil.java b/src/main/java/crazypants/util/BaublesUtil.java index ebc7135f..cce0f32e 100644 --- a/src/main/java/crazypants/util/BaublesUtil.java +++ b/src/main/java/crazypants/util/BaublesUtil.java @@ -1,90 +1,91 @@ package crazypants.util; +import baubles.api.BaublesApi; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.Log; import java.lang.reflect.Field; - import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; -import baubles.api.BaublesApi; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import crazypants.enderio.Log; public class BaublesUtil { - public static enum WhoAmI { - SPCLIENT, MPCLIENT, SPSERVER, MPSERVER, OTHER; - - public static BaublesUtil.WhoAmI whoAmI(World world) { - Side side = FMLCommonHandler.instance().getSide(); - if (side == Side.CLIENT) { - if (Minecraft.getMinecraft().isIntegratedServerRunning()) { - if (world.isRemote) { - return SPCLIENT; - } else { - return SPSERVER; - } - } else { - return MPCLIENT; + public static enum WhoAmI { + SPCLIENT, + MPCLIENT, + SPSERVER, + MPSERVER, + OTHER; + + public static BaublesUtil.WhoAmI whoAmI(World world) { + Side side = FMLCommonHandler.instance().getSide(); + if (side == Side.CLIENT) { + if (Minecraft.getMinecraft().isIntegratedServerRunning()) { + if (world.isRemote) { + return SPCLIENT; + } else { + return SPSERVER; + } + } else { + return MPCLIENT; + } + } else if (side == Side.SERVER) { + if (MinecraftServer.getServer().isDedicatedServer()) { + return MPSERVER; + } else if (Minecraft.getMinecraft().isIntegratedServerRunning()) { + return SPSERVER; + } + } + return OTHER; } - } else if (side == Side.SERVER) { - if (MinecraftServer.getServer().isDedicatedServer()) { - return MPSERVER; - } else if (Minecraft.getMinecraft().isIntegratedServerRunning()) { - return SPSERVER; + } + + private static final BaublesUtil instance = new BaublesUtil(); + private static final boolean baublesLoaded; + + static { + baublesLoaded = Loader.isModLoaded("Baubles"); + } + + private BaublesUtil() {} + + public static BaublesUtil instance() { + return instance; + } + + public boolean hasBaubles() { + return baublesLoaded; + } + + /** + * Do NOT modify this inventory on the client side of a singleplayer game! + * + * Wrap it in a ShadowInventory if you need to. + */ + public IInventory getBaubles(EntityPlayer player) { + return hasBaubles() ? getBaublesInvUnsafe(player) : null; + } + + private IInventory getBaublesInvUnsafe(EntityPlayer player) { + return BaublesApi.getBaubles(player); + } + + private static boolean failedDirectAccess = false; + + public void disableCallbacks(IInventory baubles, boolean b) { + if (!failedDirectAccess) { + try { + Class inventoryBaubles = Class.forName("baubles.common.container.InventoryBaubles"); + Field blockEvents = inventoryBaubles.getDeclaredField("blockEvents"); + blockEvents.set(baubles, b); + } catch (Throwable t) { + Log.info("Failed to access Baubles internals: " + t); + failedDirectAccess = true; + } } - } - return OTHER; } - } - - private static final BaublesUtil instance = new BaublesUtil(); - private static final boolean baublesLoaded; - static { - baublesLoaded = Loader.isModLoaded("Baubles"); - } - - private BaublesUtil() { - } - - public static BaublesUtil instance() { - return instance; - } - - public boolean hasBaubles() { - return baublesLoaded; - } - - /** - * Do NOT modify this inventory on the client side of a singleplayer game! - * - * Wrap it in a ShadowInventory if you need to. - */ - public IInventory getBaubles(EntityPlayer player) { - return hasBaubles() ? getBaublesInvUnsafe(player) : null; - } - - private IInventory getBaublesInvUnsafe(EntityPlayer player) { - return BaublesApi.getBaubles(player); - } - - private static boolean failedDirectAccess = false; - public void disableCallbacks(IInventory baubles, boolean b) { - if (!failedDirectAccess) { - try { - Class inventoryBaubles = Class.forName("baubles.common.container.InventoryBaubles"); - Field blockEvents = inventoryBaubles.getDeclaredField("blockEvents"); - blockEvents.set(baubles, b); - } catch (Throwable t) { - Log.info("Failed to access Baubles internals: " + t); - failedDirectAccess = true; - } - } - } - } diff --git a/src/main/java/crazypants/util/BotaniaUtil.java b/src/main/java/crazypants/util/BotaniaUtil.java index dbd896a2..05e1505a 100644 --- a/src/main/java/crazypants/util/BotaniaUtil.java +++ b/src/main/java/crazypants/util/BotaniaUtil.java @@ -1,43 +1,42 @@ package crazypants.util; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import crazypants.enderio.Log; +import java.lang.reflect.Method; import net.minecraft.entity.Entity; public class BotaniaUtil { - private static final String SOLEGNOLIA = "vazkii.botania.common.block.subtile.functional.SubTileSolegnolia"; - private static final String HAS_SOLEGNOLIA_AROUND = "hasSolegnoliaAround"; - private static Method hasSolegnoliaAround = null; - private static int errorCount = -1; + private static final String SOLEGNOLIA = "vazkii.botania.common.block.subtile.functional.SubTileSolegnolia"; + private static final String HAS_SOLEGNOLIA_AROUND = "hasSolegnoliaAround"; + private static Method hasSolegnoliaAround = null; + private static int errorCount = -1; - public static boolean hasSolegnoliaAround(Entity entity) { - if (errorCount < 0) { - errorCount = 0; - try { - Class solegnolia = Class.forName(SOLEGNOLIA); - hasSolegnoliaAround = solegnolia.getMethod(HAS_SOLEGNOLIA_AROUND, Entity.class); - } catch (Throwable t) { - Log.debug("Didn't find Botania's Solegnolia class. Magnet will be greedy."); - } - } - if (hasSolegnoliaAround != null) { - try { - Boolean result = (Boolean) hasSolegnoliaAround.invoke(null, entity); - if (errorCount > 0) { - errorCount--; + public static boolean hasSolegnoliaAround(Entity entity) { + if (errorCount < 0) { + errorCount = 0; + try { + Class solegnolia = Class.forName(SOLEGNOLIA); + hasSolegnoliaAround = solegnolia.getMethod(HAS_SOLEGNOLIA_AROUND, Entity.class); + } catch (Throwable t) { + Log.debug("Didn't find Botania's Solegnolia class. Magnet will be greedy."); + } } - return result; - } catch (Throwable t) { - if (errorCount++ > 10) { - Log.warn("Failed to interact with Botania too often. Magnet will ignore Solegnolias from now on. Last error was: " + t); - hasSolegnoliaAround = null; + if (hasSolegnoliaAround != null) { + try { + Boolean result = (Boolean) hasSolegnoliaAround.invoke(null, entity); + if (errorCount > 0) { + errorCount--; + } + return result; + } catch (Throwable t) { + if (errorCount++ > 10) { + Log.warn( + "Failed to interact with Botania too often. Magnet will ignore Solegnolias from now on. Last error was: " + + t); + hasSolegnoliaAround = null; + } + } } - } + return false; } - return false; - } - } diff --git a/src/main/java/crazypants/util/BuildcraftUtil.java b/src/main/java/crazypants/util/BuildcraftUtil.java index e0b31860..4dce4536 100644 --- a/src/main/java/crazypants/util/BuildcraftUtil.java +++ b/src/main/java/crazypants/util/BuildcraftUtil.java @@ -1,54 +1,52 @@ package crazypants.util; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; - import com.enderio.core.api.common.util.IFluidReceptor; import com.enderio.core.api.common.util.IItemReceptor; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.ItemUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; public class BuildcraftUtil implements IItemReceptor, IFluidReceptor { - static { - //Only register if we can actually load the IPipeTile class - try { - Class.forName("buildcraft.api.transport.IPipeTile"); - BuildcraftUtil instance = new BuildcraftUtil(); - ItemUtil.receptors.add(instance); - FluidUtil.fluidReceptors.add(instance); - } catch (Exception e) { + static { + // Only register if we can actually load the IPipeTile class + try { + Class.forName("buildcraft.api.transport.IPipeTile"); + BuildcraftUtil instance = new BuildcraftUtil(); + ItemUtil.receptors.add(instance); + FluidUtil.fluidReceptors.add(instance); + } catch (Exception e) { + } } - } - @Override - public int doInsertItem(Object into, ItemStack item, ForgeDirection side) { - if(into instanceof IPipeTile) { - return ((IPipeTile) into).injectItem(item, true, side); + @Override + public int doInsertItem(Object into, ItemStack item, ForgeDirection side) { + if (into instanceof IPipeTile) { + return ((IPipeTile) into).injectItem(item, true, side); + } + return 0; } - return 0; - } - @Override - public boolean canInsertIntoObject(Object into, ForgeDirection side) { - if(into instanceof IPipeTile) { - IPipeTile pipe = (IPipeTile) into; - return pipe.getPipeType() == PipeType.ITEM; + @Override + public boolean canInsertIntoObject(Object into, ForgeDirection side) { + if (into instanceof IPipeTile) { + IPipeTile pipe = (IPipeTile) into; + return pipe.getPipeType() == PipeType.ITEM; + } + return false; } - return false; - } - @Override - public boolean isValidReceptor(IFluidHandler handler) { - if(handler instanceof IPipeTile) { - IPipeTile pipe = (IPipeTile) handler; - return pipe.getPipeType() == PipeType.FLUID; + @Override + public boolean isValidReceptor(IFluidHandler handler) { + if (handler instanceof IPipeTile) { + IPipeTile pipe = (IPipeTile) handler; + return pipe.getPipeType() == PipeType.FLUID; + } + return true; } - return true; - } - } diff --git a/src/main/java/crazypants/util/ClientUtil.java b/src/main/java/crazypants/util/ClientUtil.java index ed1e4e42..21a46a75 100644 --- a/src/main/java/crazypants/util/ClientUtil.java +++ b/src/main/java/crazypants/util/ClientUtil.java @@ -1,13 +1,6 @@ package crazypants.util; -import java.util.Random; - -import net.minecraft.client.Minecraft; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - import com.enderio.core.common.util.BlockCoord; - import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.gas.IGasConduit; @@ -18,73 +11,87 @@ import crazypants.enderio.machine.generator.combustion.PacketCombustionTank; import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator; import crazypants.enderio.machine.generator.stirling.PacketBurnTime; import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; +import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; public class ClientUtil { - public static void doFluidLevelUpdate(int x, int y, int z, PacketFluidLevel pkt) { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); - if(pkt.tc == null || !(tile instanceof IConduitBundle)) { - return; - } - IConduitBundle bundle = (IConduitBundle) tile; - ILiquidConduit con = bundle.getConduit(ILiquidConduit.class); - if(con == null) { - return; - } - con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION); - } - - public static void doGasLevelUpdate(int x, int y, int z, PacketGasLevel pkt) { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); - if(pkt.tc == null || !(tile instanceof IConduitBundle)) { - return; - } - IConduitBundle bundle = (IConduitBundle) tile; - IGasConduit con = bundle.getConduit(IGasConduit.class); - if(con == null) { - return; - } - con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION); - } - - public static void spawnFarmParcticles(Random rand, BlockCoord bc) { - double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; - double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2; - double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; - Minecraft.getMinecraft().theWorld.spawnParticle("portal", bc.x + xOff, bc.y + yOff, bc.z + zOff, (rand.nextDouble() - 0.5) * 1.5, -rand.nextDouble(), - (rand.nextDouble() - 0.5) * 1.5); - } - - public static void setTankNBT(PacketCombustionTank message, int x, int y, int z) { - TileCombustionGenerator tile = (TileCombustionGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); - if(tile == null) { - //no loaded on client when receiving message, can happen when loading the chunks - return; + public static void doFluidLevelUpdate(int x, int y, int z, PacketFluidLevel pkt) { + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + if (pkt.tc == null || !(tile instanceof IConduitBundle)) { + return; + } + IConduitBundle bundle = (IConduitBundle) tile; + ILiquidConduit con = bundle.getConduit(ILiquidConduit.class); + if (con == null) { + return; + } + con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION); } - if(message.nbtRoot.hasKey("coolantTank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("coolantTank"); - tile.getCoolantTank().readFromNBT(tankRoot); - } else { - tile.getCoolantTank().setFluid(null); - } - if(message.nbtRoot.hasKey("fuelTank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("fuelTank"); - tile.getFuelTank().readFromNBT(tankRoot); - } else { - tile.getFuelTank().setFluid(null); - } - } - - public static void setStirlingBurnTime(PacketBurnTime message, int x, int y, int z) { - - TileEntityStirlingGenerator tile = (TileEntityStirlingGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); - if(tile == null) { - //no loaded on client when receiving message, can happen when loading the chunks - return; + public static void doGasLevelUpdate(int x, int y, int z, PacketGasLevel pkt) { + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + if (pkt.tc == null || !(tile instanceof IConduitBundle)) { + return; + } + IConduitBundle bundle = (IConduitBundle) tile; + IGasConduit con = bundle.getConduit(IGasConduit.class); + if (con == null) { + return; + } + con.readFromNBT(pkt.tc, TileConduitBundle.NBT_VERSION); } - tile.burnTime = message.burnTime; - tile.totalBurnTime = message.totalBurnTime; - } + public static void spawnFarmParcticles(Random rand, BlockCoord bc) { + double xOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + double yOff = 0.5 + (rand.nextDouble() - 0.5) * 0.2; + double zOff = 0.5 + (rand.nextDouble() - 0.5) * 1.1; + Minecraft.getMinecraft() + .theWorld + .spawnParticle( + "portal", + bc.x + xOff, + bc.y + yOff, + bc.z + zOff, + (rand.nextDouble() - 0.5) * 1.5, + -rand.nextDouble(), + (rand.nextDouble() - 0.5) * 1.5); + } + + public static void setTankNBT(PacketCombustionTank message, int x, int y, int z) { + TileCombustionGenerator tile = + (TileCombustionGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + if (tile == null) { + // no loaded on client when receiving message, can happen when loading the chunks + return; + } + + if (message.nbtRoot.hasKey("coolantTank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("coolantTank"); + tile.getCoolantTank().readFromNBT(tankRoot); + } else { + tile.getCoolantTank().setFluid(null); + } + if (message.nbtRoot.hasKey("fuelTank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("fuelTank"); + tile.getFuelTank().readFromNBT(tankRoot); + } else { + tile.getFuelTank().setFluid(null); + } + } + + public static void setStirlingBurnTime(PacketBurnTime message, int x, int y, int z) { + + TileEntityStirlingGenerator tile = + (TileEntityStirlingGenerator) Minecraft.getMinecraft().theWorld.getTileEntity(x, y, z); + if (tile == null) { + // no loaded on client when receiving message, can happen when loading the chunks + return; + } + + tile.burnTime = message.burnTime; + tile.totalBurnTime = message.totalBurnTime; + } } diff --git a/src/main/java/crazypants/util/EE3Util.java b/src/main/java/crazypants/util/EE3Util.java index f8e66667..13d6b7a1 100644 --- a/src/main/java/crazypants/util/EE3Util.java +++ b/src/main/java/crazypants/util/EE3Util.java @@ -4,26 +4,10 @@ import static crazypants.enderio.material.Material.BINDER_COMPOSITE; import static crazypants.enderio.material.Material.CONDUIT_BINDER; import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET; import static crazypants.enderio.material.Material.SILICON; -import static crazypants.util.RecipeUtil.addShaped; -import static crazypants.util.RecipeUtil.addShapeless; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.ItemEnderFood.EnderFood; @@ -31,153 +15,159 @@ import crazypants.enderio.machine.recipe.Recipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.PowderIngot; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; public class EE3Util { - public static final String EE3_ID = "EE3"; - public static final boolean IS_EE3_LOADED = Loader.isModLoaded(EE3_ID); - - public static void registerItemStack(ItemStack itemStack, int emv) { - if (IS_EE3_LOADED) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(itemStack, emv); - } - } - - public static void registerItemStackLike(ItemStack itemStack, ItemStack copyFrom) { - if (IS_EE3_LOADED) { - RecipeRegistryProxy.addRecipe(itemStack, Collections.singletonList(copyFrom)); - } - } - - public static void registerFluidStack(FluidStack fluidStack, int emv) { - if (IS_EE3_LOADED) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(fluidStack, emv); - } - } - - public static void registerRecipe(ItemStack itemStack, List recipeInputList) { - if (IS_EE3_LOADED) { - RecipeRegistryProxy.addRecipe(itemStack, recipeInputList); - } - } - - public static void registerRecipe(FluidStack fluidStack, List recipeInputList) { - if (IS_EE3_LOADED) { - RecipeRegistryProxy.addRecipe(fluidStack, recipeInputList); - } - } - - public static void registerRecipe(ItemStack itemStack, Object... recipeInputList) { - if (IS_EE3_LOADED) { - RecipeRegistryProxy.addRecipe(itemStack, Arrays.asList(recipeInputList)); - } - } - - public static void registerRecipe(FluidStack fluidStack, Object... recipeInputList) { - if (IS_EE3_LOADED) { - RecipeRegistryProxy.addRecipe(fluidStack, Arrays.asList(recipeInputList)); - } - } - - // - - /** - * Registers various recipes with EE3. - *

    - * Some of them are ManyToMany recipes (e.g. SAG Mill), others are vanilla - * crafting recipes that fail in EE3 because of too much oreDicting. Those - * ones could be removed after EE3 fixes that. - *

    - * This does not take into account changes the user may have done in the - * recipe xml files. Those are ManyToMany, they contain chances, and they - * don't usually sum up nicely (e.g. coal ore (emc 32) => 8*coal (emc 32) plus - * a chance of coal and coal dust). It is not unreasonable to require the user - * to also change emc values after changing the recipes for our core items. - *

    - * This also ignores OreDict, as it is only about the emc values. For those, - * the base vanilla items are the best source. - */ - public static void registerMiscRecipes() { - if (IS_EE3_LOADED) { - ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); - ItemStack stick4 = new ItemStack(Items.stick, 4); - ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4); - registerRecipe(basicGear, stick4, cobble4); - - ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal()); - ItemStack wheat5 = new ItemStack(Items.wheat, 5); - ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1); - registerRecipe(flour10, wheat5, seeds1); - - ItemStack enderios = EnderFood.ENDERIOS.getStack(); - ItemStack bowl = new ItemStack(Items.bowl, 1); - ItemStack wheat = new ItemStack(Items.wheat, 1); - ItemStack milkb = new ItemStack(Items.milk_bucket, 1); - FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb); - ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); - if (milk != null) { - registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl); - } else { - registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl); - } - - ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal()); - ItemStack coal = new ItemStack(Items.coal, 1); - registerRecipe(dustCoal, coal); - - ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); - ItemStack iron = new ItemStack(Items.iron_ingot, 1); - registerRecipe(dustIron, iron); - - ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); - ItemStack gold = new ItemStack(Items.gold_ingot, 1); - registerRecipe(dustGold, gold); - - ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal()); - ItemStack obsidian = new ItemStack(Blocks.obsidian, 1); - registerRecipe(dustObsidian4, obsidian); - - ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal()); - ItemStack enderPearl = new ItemStack(Items.ender_pearl); - registerRecipe(enderDust9, enderPearl); - - ItemStack cbc8 = BINDER_COMPOSITE.getStack(8); - ItemStack sand2 = new ItemStack(Blocks.sand, 2); - ItemStack gravel5 = new ItemStack(Blocks.gravel, 5); - ItemStack gravel6 = new ItemStack(Blocks.gravel, 6); - ItemStack clay_ball2 = new ItemStack(Items.clay_ball, 2); - ItemStack clay_ball1 = new ItemStack(Items.clay_ball, 1); - if (Config.useAlternateBinderRecipe) { - registerRecipe(cbc8, gravel5, clay_ball2, sand2); - } else { - registerRecipe(cbc8, gravel6, clay_ball1, sand2); - } - registerRecipe(cbc8, gravel6, clay_ball1, sand2); - ItemStack cbc = BINDER_COMPOSITE.getStack(); - ItemStack binder4 = CONDUIT_BINDER.getStack(4); - registerRecipe(binder4, cbc); - - ItemStack silicon = SILICON.getStack(1); - registerRecipe(silicon, sand2); - - int numConduits = Config.numConduitsPerRecipe; - ItemStack phasedIronNugget3 = PHASED_IRON_NUGGET.getStack(3); - ItemStack binder6 = CONDUIT_BINDER.getStack(6); - ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); - registerRecipe(itemConduit, phasedIronNugget3, binder6); + public static final String EE3_ID = "EE3"; + public static final boolean IS_EE3_LOADED = Loader.isModLoaded(EE3_ID); + public static void registerItemStack(ItemStack itemStack, int emv) { + if (IS_EE3_LOADED) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(itemStack, emv); + } } - } - - public static void registerBasicToManyRecipe(Recipe recipe) { - if (IS_EE3_LOADED) { - List in = new ArrayList(); - for (RecipeInput r0 : recipe.getInputs()) { - in.add(r0.getInput().copy()); - } - registerRecipe(recipe.getOutputs()[0].getOutput().copy(), in); + public static void registerItemStackLike(ItemStack itemStack, ItemStack copyFrom) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, Collections.singletonList(copyFrom)); + } } - } + public static void registerFluidStack(FluidStack fluidStack, int emv) { + if (IS_EE3_LOADED) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(fluidStack, emv); + } + } + + public static void registerRecipe(ItemStack itemStack, List recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, recipeInputList); + } + } + + public static void registerRecipe(FluidStack fluidStack, List recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(fluidStack, recipeInputList); + } + } + + public static void registerRecipe(ItemStack itemStack, Object... recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, Arrays.asList(recipeInputList)); + } + } + + public static void registerRecipe(FluidStack fluidStack, Object... recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(fluidStack, Arrays.asList(recipeInputList)); + } + } + + // + + /** + * Registers various recipes with EE3. + *

    + * Some of them are ManyToMany recipes (e.g. SAG Mill), others are vanilla + * crafting recipes that fail in EE3 because of too much oreDicting. Those + * ones could be removed after EE3 fixes that. + *

    + * This does not take into account changes the user may have done in the + * recipe xml files. Those are ManyToMany, they contain chances, and they + * don't usually sum up nicely (e.g. coal ore (emc 32) => 8*coal (emc 32) plus + * a chance of coal and coal dust). It is not unreasonable to require the user + * to also change emc values after changing the recipes for our core items. + *

    + * This also ignores OreDict, as it is only about the emc values. For those, + * the base vanilla items are the best source. + */ + public static void registerMiscRecipes() { + if (IS_EE3_LOADED) { + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack stick4 = new ItemStack(Items.stick, 4); + ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4); + registerRecipe(basicGear, stick4, cobble4); + + ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal()); + ItemStack wheat5 = new ItemStack(Items.wheat, 5); + ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1); + registerRecipe(flour10, wheat5, seeds1); + + ItemStack enderios = EnderFood.ENDERIOS.getStack(); + ItemStack bowl = new ItemStack(Items.bowl, 1); + ItemStack wheat = new ItemStack(Items.wheat, 1); + ItemStack milkb = new ItemStack(Items.milk_bucket, 1); + FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb); + ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + if (milk != null) { + registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl); + } else { + registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl); + } + + ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal()); + ItemStack coal = new ItemStack(Items.coal, 1); + registerRecipe(dustCoal, coal); + + ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); + ItemStack iron = new ItemStack(Items.iron_ingot, 1); + registerRecipe(dustIron, iron); + + ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); + ItemStack gold = new ItemStack(Items.gold_ingot, 1); + registerRecipe(dustGold, gold); + + ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal()); + ItemStack obsidian = new ItemStack(Blocks.obsidian, 1); + registerRecipe(dustObsidian4, obsidian); + + ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal()); + ItemStack enderPearl = new ItemStack(Items.ender_pearl); + registerRecipe(enderDust9, enderPearl); + + ItemStack cbc8 = BINDER_COMPOSITE.getStack(8); + ItemStack sand2 = new ItemStack(Blocks.sand, 2); + ItemStack gravel5 = new ItemStack(Blocks.gravel, 5); + ItemStack gravel6 = new ItemStack(Blocks.gravel, 6); + ItemStack clay_ball2 = new ItemStack(Items.clay_ball, 2); + ItemStack clay_ball1 = new ItemStack(Items.clay_ball, 1); + if (Config.useAlternateBinderRecipe) { + registerRecipe(cbc8, gravel5, clay_ball2, sand2); + } else { + registerRecipe(cbc8, gravel6, clay_ball1, sand2); + } + registerRecipe(cbc8, gravel6, clay_ball1, sand2); + ItemStack cbc = BINDER_COMPOSITE.getStack(); + ItemStack binder4 = CONDUIT_BINDER.getStack(4); + registerRecipe(binder4, cbc); + + ItemStack silicon = SILICON.getStack(1); + registerRecipe(silicon, sand2); + + int numConduits = Config.numConduitsPerRecipe; + ItemStack phasedIronNugget3 = PHASED_IRON_NUGGET.getStack(3); + ItemStack binder6 = CONDUIT_BINDER.getStack(6); + ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); + registerRecipe(itemConduit, phasedIronNugget3, binder6); + } + } + + public static void registerBasicToManyRecipe(Recipe recipe) { + if (IS_EE3_LOADED) { + List in = new ArrayList(); + for (RecipeInput r0 : recipe.getInputs()) { + in.add(r0.getInput().copy()); + } + registerRecipe(recipe.getOutputs()[0].getOutput().copy(), in); + } + } } diff --git a/src/main/java/crazypants/util/GalacticraftUtil.java b/src/main/java/crazypants/util/GalacticraftUtil.java index 7a2d1d48..a9590512 100644 --- a/src/main/java/crazypants/util/GalacticraftUtil.java +++ b/src/main/java/crazypants/util/GalacticraftUtil.java @@ -1,44 +1,42 @@ package crazypants.util; +import crazypants.enderio.Log; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import crazypants.enderio.Log; - /** * This is a near-verbatim copy of Galacticraft's API class 'AccessInventoryGC'. - * + * * We don't need the extended functionality and already have more APIs included * than is good for our sanity. * */ public class GalacticraftUtil { - private static Class playerStatsClass; - private static Method getMethod; - private static Field extendedInventoryField; + private static Class playerStatsClass; + private static Method getMethod; + private static Field extendedInventoryField; - private static boolean accessFailed = false; + private static boolean accessFailed = false; - public static IInventory getGCInventoryForPlayer(EntityPlayerMP player) { - if (!accessFailed) { - try { - if (playerStatsClass == null || getMethod == null || extendedInventoryField == null) { - playerStatsClass = Class.forName("micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats"); - getMethod = playerStatsClass.getMethod("get", EntityPlayerMP.class); - extendedInventoryField = playerStatsClass.getField("extendedInventory"); + public static IInventory getGCInventoryForPlayer(EntityPlayerMP player) { + if (!accessFailed) { + try { + if (playerStatsClass == null || getMethod == null || extendedInventoryField == null) { + playerStatsClass = Class.forName("micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats"); + getMethod = playerStatsClass.getMethod("get", EntityPlayerMP.class); + extendedInventoryField = playerStatsClass.getField("extendedInventory"); + } + Object stats = getMethod.invoke(null, player); + return stats == null ? null : (IInventory) extendedInventoryField.get(stats); + } catch (Exception e) { + Log.info("Galacticraft inventory inaccessable. Most likely because it is not installed."); + accessFailed = true; + } } - Object stats = getMethod.invoke(null, player); - return stats == null ? null : (IInventory) extendedInventoryField.get(stats); - } catch (Exception e) { - Log.info("Galacticraft inventory inaccessable. Most likely because it is not installed."); - accessFailed = true; - } - } - return null; - } -} \ No newline at end of file + return null; + } +} diff --git a/src/main/java/crazypants/util/IFacade.java b/src/main/java/crazypants/util/IFacade.java index eb2f1648..a6949440 100644 --- a/src/main/java/crazypants/util/IFacade.java +++ b/src/main/java/crazypants/util/IFacade.java @@ -5,5 +5,5 @@ import cpw.mods.fml.common.Optional; @Optional.Interface(modid = "chisel", iface = "com.cricketcraft.chisel.api.IFacade") public interface IFacade extends com.cricketcraft.chisel.api.IFacade, IBlockAppearance { - // :( + // :( } diff --git a/src/main/java/crazypants/util/IoUtil.java b/src/main/java/crazypants/util/IoUtil.java index f8b7a5ee..6e103597 100644 --- a/src/main/java/crazypants/util/IoUtil.java +++ b/src/main/java/crazypants/util/IoUtil.java @@ -1,62 +1,61 @@ package crazypants.util; +import crazypants.enderio.config.Config; import java.io.File; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; - import org.apache.commons.io.IOUtils; -import crazypants.enderio.config.Config; - public class IoUtil { - public static String copyConfigFromJar(String fileName, boolean replaceIfExists) throws IOException { - - if(replaceIfExists || !getConfigFile(fileName).exists()) { - IOUtils.copy(IoUtil.class.getResourceAsStream(getConfigResourcePath(fileName)), new FileOutputStream(getConfigFile(fileName))); - } - return IOUtils.toString(new FileReader(getConfigFile(fileName))); - } - - public static String readConfigFile(String fileName) throws IOException { - return IOUtils.toString(new FileReader(getConfigFile(fileName))); - } - - public static String readConfigFileFromClassPath(String fileName) throws IOException { - return readFileFromClassPath(getConfigResourcePath(fileName)); - } - - public static String getConfigResourcePath(String name) { - return "/assets/enderio/config/" + name; - } - - public static File getConfigFile(String name) { - return new File(Config.configDirectory, name); - } - - public static String readFileFromClassPath(String fileName) throws IOException { - InputStream in = IoUtil.class.getResourceAsStream(fileName); - if(in == null) { - throw new IOException("Could find resource " + fileName + " in classpath. "); - } - return IOUtils.toString(in); - } - - -// public static void writeTextFileToConfig(String fileName, String contents) throws IOException { -// writeTextFile(prependConfigPath(fileName), contents); -// } -// -// public static void writeTextFile(String fileName, String contents) throws IOException { -// BufferedWriter writer = null; -// try { -// writer = new BufferedWriter(new FileWriter(fileName, false)); -// writer.write(contents); -// } finally { -// IOUtils.closeQuietly(writer); -// } -// } - + public static String copyConfigFromJar(String fileName, boolean replaceIfExists) throws IOException { + + if (replaceIfExists || !getConfigFile(fileName).exists()) { + IOUtils.copy( + IoUtil.class.getResourceAsStream(getConfigResourcePath(fileName)), + new FileOutputStream(getConfigFile(fileName))); + } + return IOUtils.toString(new FileReader(getConfigFile(fileName))); + } + + public static String readConfigFile(String fileName) throws IOException { + return IOUtils.toString(new FileReader(getConfigFile(fileName))); + } + + public static String readConfigFileFromClassPath(String fileName) throws IOException { + return readFileFromClassPath(getConfigResourcePath(fileName)); + } + + public static String getConfigResourcePath(String name) { + return "/assets/enderio/config/" + name; + } + + public static File getConfigFile(String name) { + return new File(Config.configDirectory, name); + } + + public static String readFileFromClassPath(String fileName) throws IOException { + InputStream in = IoUtil.class.getResourceAsStream(fileName); + if (in == null) { + throw new IOException("Could find resource " + fileName + " in classpath. "); + } + return IOUtils.toString(in); + } + + // public static void writeTextFileToConfig(String fileName, String contents) throws IOException { + // writeTextFile(prependConfigPath(fileName), contents); + // } + // + // public static void writeTextFile(String fileName, String contents) throws IOException { + // BufferedWriter writer = null; + // try { + // writer = new BufferedWriter(new FileWriter(fileName, false)); + // writer.write(contents); + // } finally { + // IOUtils.closeQuietly(writer); + // } + // } + } diff --git a/src/main/java/crazypants/util/RecipeUtil.java b/src/main/java/crazypants/util/RecipeUtil.java index fb9f5226..ca584043 100644 --- a/src/main/java/crazypants/util/RecipeUtil.java +++ b/src/main/java/crazypants/util/RecipeUtil.java @@ -1,35 +1,35 @@ package crazypants.util; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import cpw.mods.fml.common.registry.GameRegistry; public class RecipeUtil { - public static void addShaped(Item res, Object... recipe) { - addShaped(new ItemStack(res), recipe); - } + public static void addShaped(Item res, Object... recipe) { + addShaped(new ItemStack(res), recipe); + } - public static void addShaped(Block res, Object... recipe) { - addShaped(new ItemStack(res), recipe); - } + public static void addShaped(Block res, Object... recipe) { + addShaped(new ItemStack(res), recipe); + } - public static void addShaped(ItemStack res, Object... recipe) { - GameRegistry.addRecipe(new ShapedOreRecipe(res, recipe)); - } + public static void addShaped(ItemStack res, Object... recipe) { + GameRegistry.addRecipe(new ShapedOreRecipe(res, recipe)); + } - public static void addShapeless(Item res, Object... recipe) { - addShapeless(new ItemStack(res), recipe); - } + public static void addShapeless(Item res, Object... recipe) { + addShapeless(new ItemStack(res), recipe); + } - public static void addShapeless(Block res, Object... recipe) { - addShapeless(new ItemStack(res), recipe); - } + public static void addShapeless(Block res, Object... recipe) { + addShapeless(new ItemStack(res), recipe); + } - public static void addShapeless(ItemStack res, Object... recipe) { - GameRegistry.addRecipe(new ShapelessOreRecipe(res, recipe)); - } + public static void addShapeless(ItemStack res, Object... recipe) { + GameRegistry.addRecipe(new ShapelessOreRecipe(res, recipe)); + } } diff --git a/src/main/java/crazypants/util/RenderPassHelper.java b/src/main/java/crazypants/util/RenderPassHelper.java index 5c949e96..6bbeedf5 100644 --- a/src/main/java/crazypants/util/RenderPassHelper.java +++ b/src/main/java/crazypants/util/RenderPassHelper.java @@ -1,82 +1,80 @@ package crazypants.util; -import java.lang.reflect.Field; - -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Log; +import java.lang.reflect.Field; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.MinecraftForgeClient; @SideOnly(Side.CLIENT) public class RenderPassHelper { - private static Field worldRenderPass = null; - private static int savedWorldRenderPass = -1; - private static int savedEntityRenderPass = -1; + private static Field worldRenderPass = null; + private static int savedWorldRenderPass = -1; + private static int savedEntityRenderPass = -1; - static { - try { - worldRenderPass = ForgeHooksClient.class.getDeclaredField("worldRenderPass"); - worldRenderPass.setAccessible(true); - } catch (Exception e) { - Log.warn("Failed to access ForgeHooksClient.worldRenderPass because of: " + e); - e.printStackTrace(); + static { + try { + worldRenderPass = ForgeHooksClient.class.getDeclaredField("worldRenderPass"); + worldRenderPass.setAccessible(true); + } catch (Exception e) { + Log.warn("Failed to access ForgeHooksClient.worldRenderPass because of: " + e); + e.printStackTrace(); + } } - } - private RenderPassHelper() { - } + private RenderPassHelper() {} - public static void setBlockRenderPass(int pass) { - savedWorldRenderPass = ForgeHooksClient.getWorldRenderPass(); - savedEntityRenderPass = MinecraftForgeClient.getRenderPass(); - setBlockRenderPassImpl(pass); - setEntityRenderPass(pass); - } - - private static void setBlockRenderPassImpl(int pass) { - if (worldRenderPass != null) { - try { - worldRenderPass.setInt(null, pass); - } catch (Exception e) { - Log.warn("Failed to access ForgeHooksClient.worldRenderPass because of: " + e); - e.printStackTrace(); - worldRenderPass = null; - } + public static void setBlockRenderPass(int pass) { + savedWorldRenderPass = ForgeHooksClient.getWorldRenderPass(); + savedEntityRenderPass = MinecraftForgeClient.getRenderPass(); + setBlockRenderPassImpl(pass); + setEntityRenderPass(pass); } - } - public static void clearBlockRenderPass() { - setBlockRenderPassImpl(savedWorldRenderPass); - setEntityRenderPass(savedEntityRenderPass); - } - - public static int getBlockRenderPass() { - int pass = ForgeHooksClient.getWorldRenderPass(); - if (pass < 0) { - // We are outside Minecraft's block rendering, so most probably we are - // being rendered by some mod. But it forgot to set the current block - // render pass. Maybe it set the entity render pass instead? - pass = MinecraftForgeClient.getRenderPass(); - if (pass < 0) { - // No, it didn't. That's not good. Let's assume pass 0, that one renders - // more stuff. - pass = 0; - } + private static void setBlockRenderPassImpl(int pass) { + if (worldRenderPass != null) { + try { + worldRenderPass.setInt(null, pass); + } catch (Exception e) { + Log.warn("Failed to access ForgeHooksClient.worldRenderPass because of: " + e); + e.printStackTrace(); + worldRenderPass = null; + } + } } - return pass; - } - public static void setEntityRenderPass(int pass) { - ForgeHooksClient.setRenderPass(pass); - } + public static void clearBlockRenderPass() { + setBlockRenderPassImpl(savedWorldRenderPass); + setEntityRenderPass(savedEntityRenderPass); + } - public static void clearEntityRenderPass() { - ForgeHooksClient.setRenderPass(-1); - } + public static int getBlockRenderPass() { + int pass = ForgeHooksClient.getWorldRenderPass(); + if (pass < 0) { + // We are outside Minecraft's block rendering, so most probably we are + // being rendered by some mod. But it forgot to set the current block + // render pass. Maybe it set the entity render pass instead? + pass = MinecraftForgeClient.getRenderPass(); + if (pass < 0) { + // No, it didn't. That's not good. Let's assume pass 0, that one renders + // more stuff. + pass = 0; + } + } + return pass; + } - public static int getEntityRenderPass() { - return MinecraftForgeClient.getRenderPass(); - } + public static void setEntityRenderPass(int pass) { + ForgeHooksClient.setRenderPass(pass); + } + + public static void clearEntityRenderPass() { + ForgeHooksClient.setRenderPass(-1); + } + + public static int getEntityRenderPass() { + return MinecraftForgeClient.getRenderPass(); + } } diff --git a/src/main/java/crazypants/util/ShadowInventory.java b/src/main/java/crazypants/util/ShadowInventory.java index be72e2c8..580af0b4 100644 --- a/src/main/java/crazypants/util/ShadowInventory.java +++ b/src/main/java/crazypants/util/ShadowInventory.java @@ -1,87 +1,84 @@ package crazypants.util; import com.enderio.core.common.util.Util; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; public class ShadowInventory implements IInventory { - private final ItemStack[] items; - private final IInventory master; + private final ItemStack[] items; + private final IInventory master; - public ShadowInventory(IInventory master) { - this.master = master; - items = new ItemStack[master.getSizeInventory()]; - for (int i = 0; i < master.getSizeInventory(); i++) { - items[i] = master.getStackInSlot(i); + public ShadowInventory(IInventory master) { + this.master = master; + items = new ItemStack[master.getSizeInventory()]; + for (int i = 0; i < master.getSizeInventory(); i++) { + items[i] = master.getStackInSlot(i); + } } - } - @Override - public int getSizeInventory() { - return master.getSizeInventory(); - } + @Override + public int getSizeInventory() { + return master.getSizeInventory(); + } - @Override - public ItemStack getStackInSlot(int p_70301_1_) { - return items[p_70301_1_]; - } + @Override + public ItemStack getStackInSlot(int p_70301_1_) { + return items[p_70301_1_]; + } - @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { - return Util.decrStackSize(this, p_70298_1_, p_70298_2_); - } + @Override + public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { + return Util.decrStackSize(this, p_70298_1_, p_70298_2_); + } - @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - ItemStack stack = getStackInSlot(p_70304_1_); - setInventorySlotContents(p_70304_1_, null); - return stack; - } + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + ItemStack stack = getStackInSlot(p_70304_1_); + setInventorySlotContents(p_70304_1_, null); + return stack; + } - @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { - items[p_70299_1_] = p_70299_2_; - } + @Override + public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { + items[p_70299_1_] = p_70299_2_; + } - @Override - public String getInventoryName() { - return master.getInventoryName(); - } + @Override + public String getInventoryName() { + return master.getInventoryName(); + } - @Override - public boolean hasCustomInventoryName() { - return master.hasCustomInventoryName(); - } + @Override + public boolean hasCustomInventoryName() { + return master.hasCustomInventoryName(); + } - @Override - public int getInventoryStackLimit() { - return master.getInventoryStackLimit(); - } + @Override + public int getInventoryStackLimit() { + return master.getInventoryStackLimit(); + } - @Override - public void markDirty() { - } + @Override + public void markDirty() {} - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { - return master.isUseableByPlayer(p_70300_1_); - } + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + return master.isUseableByPlayer(p_70300_1_); + } - @Override - public void openInventory() { - master.openInventory(); - } + @Override + public void openInventory() { + master.openInventory(); + } - @Override - public void closeInventory() { - master.closeInventory(); - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { - return master.isItemValidForSlot(p_94041_1_, p_94041_2_); - } + @Override + public void closeInventory() { + master.closeInventory(); + } + @Override + public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { + return master.isItemValidForSlot(p_94041_1_, p_94041_2_); + } } diff --git a/src/main/java/crazypants/util/UserIdent.java b/src/main/java/crazypants/util/UserIdent.java index d54b154e..216ba88a 100644 --- a/src/main/java/crazypants/util/UserIdent.java +++ b/src/main/java/crazypants/util/UserIdent.java @@ -1,230 +1,226 @@ package crazypants.util; -import java.util.UUID; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.UsernameCache; - import com.enderio.core.common.util.PlayerUtil; import com.google.common.base.Charsets; import com.mojang.authlib.GameProfile; - import crazypants.enderio.Log; +import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.UsernameCache; public class UserIdent { - private static final String NONE_MARKER = "none"; - private final @Nullable UUID uuid; - private final @Nonnull UUID uuid_offline; - private final @Nonnull String playerName; + private static final String NONE_MARKER = "none"; + private final @Nullable UUID uuid; + private final @Nonnull UUID uuid_offline; + private final @Nonnull String playerName; - public @Nonnull String getPlayerName() { - if (uuid != null) { - String lastKnownName = UsernameCache.getLastKnownUsername(uuid); - if (lastKnownName != null) { - return lastKnownName; - } - } - return playerName; - } - - public UUID getUUID() { - return uuid != null ? uuid : uuid_offline; - } - - @SuppressWarnings("null") - // it's final(!), eclipse... - public String getUUIDString() { - return uuid != null ? uuid.toString() : NONE_MARKER; - } - - /** - * Create a UserIdent from a UUID object and a name. Use this when reading - * stored data, it will check for username changes, implement them and write a - * log message. - */ - public static @Nonnull UserIdent create(@Nullable UUID uuid, @Nullable String playerName) { - if (uuid != null) { - if (nobody.equals(uuid)) { - return nobody; - } - if (playerName != null) { - String lastKnownName = UsernameCache.getLastKnownUsername(uuid); - if (lastKnownName != null && !lastKnownName.equals(playerName)) { - Log.warn("The user with the UUID " + uuid + " changed name from '" + playerName + "' to '" + lastKnownName + "'"); - return new UserIdent(uuid, lastKnownName); + public @Nonnull String getPlayerName() { + if (uuid != null) { + String lastKnownName = UsernameCache.getLastKnownUsername(uuid); + if (lastKnownName != null) { + return lastKnownName; + } } - } - return new UserIdent(uuid, playerName); - } else if (playerName != null) { - return new UserIdent(null, playerName); - } else { - return nobody; - } - } - - /** - * Create a UserIdent from a UUID string and a name. Use this when reading - * stored data, it will check for username changes, implement them and write a - * log message. - */ - public static @Nonnull UserIdent create(@Nonnull String suuid, @Nullable String playerName) { - if (NONE_MARKER.equals(suuid)) { - return new UserIdent(null, playerName); - } - try { - UUID uuid = UUID.fromString(suuid); - if (nobody.equals(uuid)) { - return nobody; - } - return create(uuid, playerName); - } catch (IllegalArgumentException e) { - return nobody; - } - } - - /** - * Create a UserIdent from a legacy string. The string can either be a UUID or - * a player name. Use this when reading legacy data or user configured values. - */ - public static @Nonnull UserIdent create(@Nullable String legacyData) { - UUID uuid = PlayerUtil.getPlayerUIDUnstable(legacyData); - if (uuid != null) { - return new UserIdent(uuid, legacyData); - } else if (legacyData != null) { - return new UserIdent(null, legacyData); - } else { - return nobody; - } - } - - /** - * Create a UserIdent from a GameProfile. Use this when creating a UserIdent - * for a currently active player. - */ - public static @Nonnull UserIdent create(@Nullable GameProfile gameProfile) { - if (gameProfile != null && (gameProfile.getId() != null || gameProfile.getName() != null)) { - if (gameProfile.getId() != null && gameProfile.getName() != null - && gameProfile.getId().equals(offlineUUID(gameProfile.getName()))) { - return new UserIdent(null, gameProfile.getName()); - } else { - return new UserIdent(gameProfile.getId(), gameProfile.getName()); - } - } else { - return nobody; - } - } - - private static @Nonnull UUID offlineUUID(String playerName) { - UUID result = UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(Charsets.UTF_8)); - return result != null ? result : new UUID(-1, -1); - } - - private UserIdent(UUID uuid, String playerName) { - this.uuid = uuid; - this.uuid_offline = offlineUUID(playerName); - this.playerName = playerName != null ? playerName : "[" + uuid + "]"; - } - - @SuppressWarnings("null") - // it's final(!), eclipse... - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + playerName.hashCode(); - result = prime * result + ((uuid == null) ? 0 : uuid.hashCode()); - return result; - } - - /** - * Please note that a UserIdent will successfully equal against GameProfiles - * and UUIDs. - */ - @SuppressWarnings("null") - // it's final(!), eclipse... - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj instanceof UserIdent) { - UserIdent other = (UserIdent) obj; - if (this.uuid != null && other.uuid != null) { - return this.uuid.equals(other.uuid); - } - return this.uuid_offline.equals(other.uuid_offline); - } else if (obj instanceof GameProfile) { - GameProfile other = (GameProfile) obj; - UUID other_uuid = other.getId(); - if (this.uuid != null && other_uuid != null) { - return this.uuid.equals(other_uuid); - } - UUID uuid_offline_other = offlineUUID(other.getName()); - return uuid_offline_other.equals(this.uuid) || this.uuid_offline.equals(uuid_offline_other); - } else if (obj instanceof UUID) { - return obj.equals(uuid) || obj.equals(uuid_offline); - } - return false; - } - - @SuppressWarnings("null") - // it's final(!), eclipse... - public void saveToNbt(NBTTagCompound nbt, String prefix) { - if (uuid != null) { - nbt.setString(prefix + ".uuid", uuid.toString()); - } - nbt.setString(prefix + ".login", playerName); - } - - public static boolean existsInNbt(NBTTagCompound nbt, String prefix) { - return nbt.hasKey(prefix + ".uuid") || nbt.hasKey(prefix + ".login"); - } - - public static @Nonnull UserIdent readfromNbt(NBTTagCompound nbt, String prefix) { - String suuid = nbt.getString(prefix + ".uuid"); - String login = nbt.getString(prefix + ".login"); - if (Nobody.NOBODY_MARKER.equals(suuid)) { - return nobody; - } - try { - UUID uuid = UUID.fromString(suuid); - return create(uuid, login); - } catch (IllegalArgumentException e) { - if (login != null && !login.isEmpty()) { - return new UserIdent(null, login); - } else { - return nobody; - } - } - } - - @Override - public String toString() { - return "User [uuid=" + (uuid != null ? uuid : "(unknown)") + ", name=" + playerName + "]"; - } - - public static final @Nonnull Nobody nobody = new Nobody(); - - private static class Nobody extends UserIdent { - private static final String NOBODY_MARKER = "nobody"; - - private Nobody() { - super(null, "[unknown player]"); + return playerName; } + public UUID getUUID() { + return uuid != null ? uuid : uuid_offline; + } + + @SuppressWarnings("null") + // it's final(!), eclipse... + public String getUUIDString() { + return uuid != null ? uuid.toString() : NONE_MARKER; + } + + /** + * Create a UserIdent from a UUID object and a name. Use this when reading + * stored data, it will check for username changes, implement them and write a + * log message. + */ + public static @Nonnull UserIdent create(@Nullable UUID uuid, @Nullable String playerName) { + if (uuid != null) { + if (nobody.equals(uuid)) { + return nobody; + } + if (playerName != null) { + String lastKnownName = UsernameCache.getLastKnownUsername(uuid); + if (lastKnownName != null && !lastKnownName.equals(playerName)) { + Log.warn("The user with the UUID " + uuid + " changed name from '" + playerName + "' to '" + + lastKnownName + "'"); + return new UserIdent(uuid, lastKnownName); + } + } + return new UserIdent(uuid, playerName); + } else if (playerName != null) { + return new UserIdent(null, playerName); + } else { + return nobody; + } + } + + /** + * Create a UserIdent from a UUID string and a name. Use this when reading + * stored data, it will check for username changes, implement them and write a + * log message. + */ + public static @Nonnull UserIdent create(@Nonnull String suuid, @Nullable String playerName) { + if (NONE_MARKER.equals(suuid)) { + return new UserIdent(null, playerName); + } + try { + UUID uuid = UUID.fromString(suuid); + if (nobody.equals(uuid)) { + return nobody; + } + return create(uuid, playerName); + } catch (IllegalArgumentException e) { + return nobody; + } + } + + /** + * Create a UserIdent from a legacy string. The string can either be a UUID or + * a player name. Use this when reading legacy data or user configured values. + */ + public static @Nonnull UserIdent create(@Nullable String legacyData) { + UUID uuid = PlayerUtil.getPlayerUIDUnstable(legacyData); + if (uuid != null) { + return new UserIdent(uuid, legacyData); + } else if (legacyData != null) { + return new UserIdent(null, legacyData); + } else { + return nobody; + } + } + + /** + * Create a UserIdent from a GameProfile. Use this when creating a UserIdent + * for a currently active player. + */ + public static @Nonnull UserIdent create(@Nullable GameProfile gameProfile) { + if (gameProfile != null && (gameProfile.getId() != null || gameProfile.getName() != null)) { + if (gameProfile.getId() != null + && gameProfile.getName() != null + && gameProfile.getId().equals(offlineUUID(gameProfile.getName()))) { + return new UserIdent(null, gameProfile.getName()); + } else { + return new UserIdent(gameProfile.getId(), gameProfile.getName()); + } + } else { + return nobody; + } + } + + private static @Nonnull UUID offlineUUID(String playerName) { + UUID result = UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(Charsets.UTF_8)); + return result != null ? result : new UUID(-1, -1); + } + + private UserIdent(UUID uuid, String playerName) { + this.uuid = uuid; + this.uuid_offline = offlineUUID(playerName); + this.playerName = playerName != null ? playerName : "[" + uuid + "]"; + } + + @SuppressWarnings("null") + // it's final(!), eclipse... + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + playerName.hashCode(); + result = prime * result + ((uuid == null) ? 0 : uuid.hashCode()); + return result; + } + + /** + * Please note that a UserIdent will successfully equal against GameProfiles + * and UUIDs. + */ + @SuppressWarnings("null") + // it's final(!), eclipse... @Override public boolean equals(Object obj) { - return this == obj; + if (this == obj) { + return true; + } + if (obj instanceof UserIdent) { + UserIdent other = (UserIdent) obj; + if (this.uuid != null && other.uuid != null) { + return this.uuid.equals(other.uuid); + } + return this.uuid_offline.equals(other.uuid_offline); + } else if (obj instanceof GameProfile) { + GameProfile other = (GameProfile) obj; + UUID other_uuid = other.getId(); + if (this.uuid != null && other_uuid != null) { + return this.uuid.equals(other_uuid); + } + UUID uuid_offline_other = offlineUUID(other.getName()); + return uuid_offline_other.equals(this.uuid) || this.uuid_offline.equals(uuid_offline_other); + } else if (obj instanceof UUID) { + return obj.equals(uuid) || obj.equals(uuid_offline); + } + return false; + } + + @SuppressWarnings("null") + // it's final(!), eclipse... + public void saveToNbt(NBTTagCompound nbt, String prefix) { + if (uuid != null) { + nbt.setString(prefix + ".uuid", uuid.toString()); + } + nbt.setString(prefix + ".login", playerName); + } + + public static boolean existsInNbt(NBTTagCompound nbt, String prefix) { + return nbt.hasKey(prefix + ".uuid") || nbt.hasKey(prefix + ".login"); + } + + public static @Nonnull UserIdent readfromNbt(NBTTagCompound nbt, String prefix) { + String suuid = nbt.getString(prefix + ".uuid"); + String login = nbt.getString(prefix + ".login"); + if (Nobody.NOBODY_MARKER.equals(suuid)) { + return nobody; + } + try { + UUID uuid = UUID.fromString(suuid); + return create(uuid, login); + } catch (IllegalArgumentException e) { + if (login != null && !login.isEmpty()) { + return new UserIdent(null, login); + } else { + return nobody; + } + } } @Override - public void saveToNbt(NBTTagCompound nbt, String prefix) { - nbt.setString(prefix + ".uuid", NOBODY_MARKER); + public String toString() { + return "User [uuid=" + (uuid != null ? uuid : "(unknown)") + ", name=" + playerName + "]"; } - } + public static final @Nonnull Nobody nobody = new Nobody(); -} \ No newline at end of file + private static class Nobody extends UserIdent { + private static final String NOBODY_MARKER = "nobody"; + + private Nobody() { + super(null, "[unknown player]"); + } + + @Override + public boolean equals(Object obj) { + return this == obj; + } + + @Override + public void saveToNbt(NBTTagCompound nbt, String prefix) { + nbt.setString(prefix + ".uuid", NOBODY_MARKER); + } + } +} diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java index 2ec1f76b..cc9108b5 100644 --- a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -4,32 +4,31 @@ import net.minecraft.item.ItemStack; public interface IDeepStorageUnit { - /** - * @return A populated ItemStack with stackSize for the full amount of - * materials in the DSU.
    - * May have a stackSize > getMaxStackSize(). May have a stackSize of - * 0 (indicating locked contents). - */ - ItemStack getStoredItemType(); + /** + * @return A populated ItemStack with stackSize for the full amount of + * materials in the DSU.
    + * May have a stackSize > getMaxStackSize(). May have a stackSize of + * 0 (indicating locked contents). + */ + ItemStack getStoredItemType(); - /** - * Sets the total amount of the item currently being stored, or zero if all - * items are to be removed. - */ - void setStoredItemCount(int amount); + /** + * Sets the total amount of the item currently being stored, or zero if all + * items are to be removed. + */ + void setStoredItemCount(int amount); - /** - * Sets the type of the stored item and initializes the number of stored - * items to amount. - *

    - * Will overwrite any existing stored items. - */ - void setStoredItemType(ItemStack type, int amount); - - /** - * @return The maximum number of items the DSU can hold.
    - * May change based on the current type stored. - */ - int getMaxStoredCount(); + /** + * Sets the type of the stored item and initializes the number of stored + * items to amount. + *

    + * Will overwrite any existing stored items. + */ + void setStoredItemType(ItemStack type, int amount); + /** + * @return The maximum number of items the DSU can hold.
    + * May change based on the current type stored. + */ + int getMaxStoredCount(); }