From ef5a92448c7a65e27d0928beb0f8bc3566885f56 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 11 Dec 2022 04:14:47 +0900 Subject: [PATCH] Rewrite GUIs with ModularUI (#52) * Rewrite GUIs with ModularUI * Check null stack --- build.gradle | 254 ++++++++++++++---- dependencies.gradle | 2 +- src/main/java/emt/EMT.java | 1 - .../emt/block/BlockEssentiaGenerators.java | 6 +- src/main/java/emt/block/BlockMachines.java | 10 +- src/main/java/emt/block/BlockSolars.java | 3 +- .../java/emt/client/gui/EMT_UITextures.java | 22 ++ .../emt/client/gui/GuiEtherealMacerator.java | 35 --- .../java/emt/client/gui/GuiGenerator.java | 91 ------- .../gui/GuiIndustrialWandRecharger.java | 35 --- src/main/java/emt/client/gui/GuiSolar.java | 132 --------- .../gui/container/ConainerGenerator.java | 91 ------- .../container/ContainerEtheralMacerator.java | 83 ------ .../ContainerIndustrialWandRecharge.java | 69 ----- .../client/gui/container/ContainerSolars.java | 59 ---- .../common/implementations/EssentiaHatch.java | 18 +- .../common/loader/EMT_RecipeAdder.java | 32 +-- src/main/java/emt/proxy/CommonProxy.java | 64 +---- .../emt/tile/TileEntityEtherealMacerator.java | 72 +++-- .../TileEntityIndustrialWandRecharge.java | 32 ++- .../generator/TileEntityBaseGenerator.java | 187 ++++++++++++- .../emt/tile/solar/TileEntitySolarBase.java | 156 ++++++++++- src/main/java/emt/util/EMTCreativeTab.java | 12 - src/main/java/emt/util/EMTTextHelper.java | 12 + src/main/resources/assets/emt/lang/en_US.lang | 1 + .../emt/textures/guis/etherealmacerator.png | Bin 16004 -> 0 bytes .../assets/emt/textures/guis/generator.png | Bin 2126 -> 0 bytes .../guis/overlay_slot/fusion_crafter.png | Bin 0 -> 2885 bytes .../emt/textures/guis/overlay_slot/wand.png | Bin 0 -> 174 bytes .../textures/guis/picture/gauge_empty_11.png | Bin 0 -> 140 bytes .../textures/guis/picture/gauge_empty_25.png | Bin 0 -> 164 bytes .../textures/guis/picture/gauge_generator.png | Bin 0 -> 1033 bytes .../emt/textures/guis/picture/gauge_solar.png | Bin 0 -> 504 bytes .../textures/guis/picture/solar_indicator.png | Bin 0 -> 137 bytes .../assets/emt/textures/guis/solar.png | Bin 1845 -> 0 bytes .../assets/emt/textures/guis/wandcharger.png | Bin 15672 -> 0 bytes .../gui/basicmachines/FusionCrafter.png | Bin 5094 -> 0 bytes .../container/creative_inventory/tab_emt.png | Bin 18682 -> 0 bytes 38 files changed, 686 insertions(+), 793 deletions(-) create mode 100644 src/main/java/emt/client/gui/EMT_UITextures.java delete mode 100644 src/main/java/emt/client/gui/GuiEtherealMacerator.java delete mode 100644 src/main/java/emt/client/gui/GuiGenerator.java delete mode 100644 src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java delete mode 100644 src/main/java/emt/client/gui/GuiSolar.java delete mode 100644 src/main/java/emt/client/gui/container/ConainerGenerator.java delete mode 100644 src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java delete mode 100644 src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java delete mode 100644 src/main/java/emt/client/gui/container/ContainerSolars.java delete mode 100644 src/main/resources/assets/emt/textures/guis/etherealmacerator.png delete mode 100644 src/main/resources/assets/emt/textures/guis/generator.png create mode 100644 src/main/resources/assets/emt/textures/guis/overlay_slot/fusion_crafter.png create mode 100644 src/main/resources/assets/emt/textures/guis/overlay_slot/wand.png create mode 100644 src/main/resources/assets/emt/textures/guis/picture/gauge_empty_11.png create mode 100644 src/main/resources/assets/emt/textures/guis/picture/gauge_empty_25.png create mode 100644 src/main/resources/assets/emt/textures/guis/picture/gauge_generator.png create mode 100644 src/main/resources/assets/emt/textures/guis/picture/gauge_solar.png create mode 100644 src/main/resources/assets/emt/textures/guis/picture/solar_indicator.png delete mode 100644 src/main/resources/assets/emt/textures/guis/solar.png delete mode 100644 src/main/resources/assets/emt/textures/guis/wandcharger.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png delete mode 100644 src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_emt.png diff --git a/build.gradle b/build.gradle index 054e7d9..a173375 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,17 @@ -//version: 1661114848 +//version: 1670512927 /* 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. + Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/master/build.gradle for updates. */ import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.matthewprenger.cursegradle.CurseArtifact +import com.matthewprenger.cursegradle.CurseRelation +import com.modrinth.minotaur.dependencies.ModDependency +import com.modrinth.minotaur.dependencies.VersionDependency import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory @@ -41,7 +45,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.9' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.11' } } plugins { @@ -59,6 +63,8 @@ plugins { id 'de.undercouch.download' version '5.0.1' id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.modrinth.minotaur' version '2.+' apply false + id 'com.matthewprenger.cursegradle' version '1.4.0' apply false } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -127,26 +133,35 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly") checkPropertyExists("usesShadowedDependencies") checkPropertyExists("developmentEnvironmentUserName") -boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false -boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() -boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false -String channel = project.hasProperty('channel') ? project.channel : 'stable' -String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12' +propertyDefaultIfUnset("noPublishedSources", false) +propertyDefaultIfUnset("usesMixinDebug", project.usesMixins) +propertyDefaultIfUnset("forceEnableMixins", false) +propertyDefaultIfUnset("channel", "stable") +propertyDefaultIfUnset("mappingsVersion", "12") +propertyDefaultIfUnset("modrinthProjectId", "") +propertyDefaultIfUnset("modrinthRelations", "") +propertyDefaultIfUnset("curseForgeProjectId", "") +propertyDefaultIfUnset("curseForgeRelations", "") + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" -String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") -String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") -String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + +final String modGroupPath = modGroup.toString().replaceAll("\\.", "/") +final String apiPackagePath = apiPackage.toString().replaceAll("\\.", "/") + +String targetPackageJava = javaSourceDir + modGroupPath +String targetPackageScala = scalaSourceDir + modGroupPath +String targetPackageKotlin = kotlinSourceDir + modGroupPath if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } if (apiPackage) { - targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + targetPackageJava = javaSourceDir + modGroupPath + "/" + apiPackagePath + targetPackageScala = scalaSourceDir + modGroupPath + "/" + apiPackagePath + targetPackageKotlin = kotlinSourceDir + modGroupPath + "/" + apiPackagePath if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } @@ -160,31 +175,36 @@ if (accessTransformersFile) { } if (usesMixins.toBoolean()) { - if (mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { - throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") + if (mixinsPackage.isEmpty()) { + throw new GradleException("\"usesMixins\" requires \"mixinsPackage\" to be set!") } + final String mixinPackagePath = mixinsPackage.toString().replaceAll("\\.", "/") + final String mixinPluginPath = mixinPlugin.toString().replaceAll("\\.", "/") - targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + targetPackageJava = javaSourceDir + modGroupPath + "/" + mixinPackagePath + targetPackageScala = scalaSourceDir + modGroupPath + "/" + mixinPackagePath + targetPackageKotlin = kotlinSourceDir + modGroupPath + "/" + mixinPackagePath if (!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) { throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin) } - String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" - String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" - String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" - String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt" - if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { - throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) + if (!mixinPlugin.isEmpty()) { + String targetFileJava = javaSourceDir + modGroupPath + "/" + mixinPluginPath + ".java" + String targetFileScala = scalaSourceDir + modGroupPath + "/" + mixinPluginPath + ".scala" + String targetFileScalaJava = scalaSourceDir + modGroupPath + "/" + mixinPluginPath + ".java" + String targetFileKotlin = kotlinSourceDir + modGroupPath + "/" + mixinPluginPath + ".kt" + if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { + throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) + } } } if (coreModClass) { - String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" - String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" - String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" - String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt" + final String coreModPath = coreModClass.toString().replaceAll("\\.", "/") + String targetFileJava = javaSourceDir + modGroupPath + "/" + coreModPath + ".java" + String targetFileScala = scalaSourceDir + modGroupPath + "/" + coreModPath + ".scala" + String targetFileScalaJava = scalaSourceDir + modGroupPath + "/" + coreModPath + ".java" + String targetFileKotlin = kotlinSourceDir + modGroupPath + "/" + coreModPath + ".kt" if (!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) { throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin) } @@ -240,7 +260,7 @@ if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { def arguments = [] def jvmArguments = [] -if (usesMixins.toBoolean() || forceEnableMixins) { +if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { arguments += [ "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] @@ -305,13 +325,10 @@ repositories { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' } - if (usesMixins.toBoolean() || forceEnableMixins) { + if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { maven { - name 'sponge' - url 'https://repo.spongepowered.org/repository/maven-public' - } - maven { - url 'https://jitpack.io' + name = "GTNH Maven" + url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" } } } @@ -321,19 +338,10 @@ dependencies { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT') + annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.2:processor') } - 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 - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - exclude module: 'log4j-core' - } - compile('com.github.GTNewHorizons:SpongeMixins:1.5.0') + if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { + compile('com.gtnewhorizon:gtnhmixins:2.1.2') } } @@ -345,13 +353,18 @@ def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" task generateAssets { if (usesMixins.toBoolean()) { - def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json"); + def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json") if (!mixinConfigFile.exists()) { + def mixinPluginLine = "" + if(!mixinPlugin.isEmpty()) { + // We might not have a mixin plugin if we're using early/late mixins + mixinPluginLine += """\n "plugin": "${modGroup}.${mixinPlugin}", """ + } + mixinConfigFile.text = """{ "required": true, - "minVersion": "0.7.11", - "package": "${modGroup}.${mixinsPackage}", - "plugin": "${modGroup}.${mixinPlugin}", + "minVersion": "0.8.5-GTNH", + "package": "${modGroup}.${mixinsPackage}",${mixinPluginLine} "refmap": "${mixingConfigRefMap}", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", @@ -563,11 +576,11 @@ task devJar(type: Jar) { task apiJar(type: Jar) { from(sourceSets.main.allSource) { - include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' + include modGroupPath + "/" + apiPackagePath + '/**' } from(sourceSets.main.output) { - include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' + include modGroupPath + "/" + apiPackagePath + '/**' } from(sourceSets.main.resources.srcDirs) { @@ -651,6 +664,124 @@ publishing { } } +if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { + apply plugin: 'com.modrinth.minotaur' + + File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md") + + modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = modrinthProjectId + versionNumber = identifiedVersion + versionType = identifiedVersion.endsWith("-pre") ? "beta" : "release" + changelog = changelogFile.exists() ? changelogFile.getText("UTF-8") : "" + uploadFile = jar + additionalFiles = getSecondaryArtifacts() + gameVersions = [minecraftVersion] + loaders = ["forge"] + debugMode = false + } + + if (modrinthRelations.size() != 0) { + String[] deps = modrinthRelations.split(";") + deps.each { dep -> + if (dep.size() == 0) { + return + } + String[] parts = dep.split(":") + String[] qual = parts[0].split("-") + addModrinthDep(qual[0], qual[1], parts[1]) + } + } + if (usesMixins.toBoolean()) { + addModrinthDep("required", "version", "gtnhmixins") + } + tasks.modrinth.dependsOn(build) + tasks.publish.dependsOn(tasks.modrinth) +} + +if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null) { + apply plugin: 'com.matthewprenger.cursegradle' + + File changelogFile = new File(System.getenv("CHANGELOG_FILE") ?: "CHANGELOG.md") + + curseforge { + apiKey = System.getenv("CURSEFORGE_TOKEN") + project { + id = curseForgeProjectId + if (changelogFile.exists()) { + changelogType = "markdown" + changelog = changelogFile + } + releaseType = identifiedVersion.endsWith("-pre") ? "beta" : "release" + addGameVersion minecraftVersion + addGameVersion "Forge" + mainArtifact jar + for (artifact in getSecondaryArtifacts()) addArtifact artifact + } + + options { + javaIntegration = false + forgeGradleIntegration = false + debug = false + } + } + + if (curseForgeRelations.size() != 0) { + String[] deps = curseForgeRelations.split(";") + deps.each { dep -> + if (dep.size() == 0) { + return + } + String[] parts = dep.split(":") + addCurseForgeRelation(parts[0], parts[1]) + } + } + if (usesMixins.toBoolean()) { + addCurseForgeRelation("requiredDependency", "gtnhmixins") + } + tasks.curseforge.dependsOn(build) + tasks.publish.dependsOn(tasks.curseforge) +} + +def addModrinthDep(scope, type, name) { + com.modrinth.minotaur.dependencies.Dependency dep; + if (!(scope in [ + "required", + "optional", + "incompatible", + "embedded" + ])) { + throw new Exception("Invalid modrinth dependency scope: " + scope) + } + switch (type) { + case "project": + dep = new ModDependency(name, scope) + break + case "version": + dep = new VersionDependency(name, scope) + break + default: + throw new Exception("Invalid modrinth dependency type: " + type) + } + project.modrinth.dependencies.add(dep) +} + +def addCurseForgeRelation(type, name) { + if (!(type in [ + "requiredDependency", + "embeddedLibrary", + "optionalDependency", + "tool", + "incompatible" + ])) { + throw new Exception("Invalid CurseForge relation type: " + type) + } + CurseArtifact artifact = project.curseforge.curseProjects[0].mainArtifact + CurseRelation rel = (artifact.curseRelations ?: (artifact.curseRelations = new CurseRelation())) + rel."$type"(name) +} + // Updating task updateBuildScript { doLast { @@ -963,6 +1094,21 @@ if (!project.hasProperty(propertyName)) { } } +def propertyDefaultIfUnset(String propertyName, defaultValue) { +if (!project.hasProperty(propertyName) || project.property(propertyName) == "") { + project.ext.setProperty(propertyName, defaultValue) +} +} + def getFile(String relativePath) { return new File(projectDir, relativePath) } + +def getSecondaryArtifacts() { +// Because noPublishedSources from the beginning of the script is somehow not visible here... +boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false +def secondaryArtifacts = [devJar] +if (!noPublishedSources) secondaryArtifacts += [sourcesJar] +if (apiPackage) secondaryArtifacts += [apiJar] +return secondaryArtifacts +} diff --git a/dependencies.gradle b/dependencies.gradle index 8082522..0559c57 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.05:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.161:dev' compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev' compile 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index a609624..a0d0461 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -82,7 +82,6 @@ public class EMT { } EMTDungeonChestGenerator.generateLoot(); EMTEntities.registerEMTEntities(); - NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); NEI_Config.Init(); } diff --git a/src/main/java/emt/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java index 97c4022..6d5658c 100644 --- a/src/main/java/emt/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -1,5 +1,6 @@ package emt.block; +import com.gtnewhorizons.modularui.api.UIInfos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; @@ -45,6 +46,7 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { iconSets[5].frontOff = ir.registerIcon(EMT.TEXTURE_PATH + ":essentiagenerator/aerfront"); } + @Override @SideOnly(Side.CLIENT) public void getSubBlocks(Item id, CreativeTabs tab, List list) { list.add(new ItemStack(id, 1, 0)); @@ -60,6 +62,7 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { return new TileEntityBaseGenerator(meta); } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random random) { TileEntityBaseGenerator te = (TileEntityBaseGenerator) world.getTileEntity(x, y, z); @@ -75,6 +78,7 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { } } + @Override public boolean onBlockActivated( World world, int i, int j, int k, EntityPlayer player, int s, float f1, float f2, float f3) { if (player.isSneaking()) { @@ -85,7 +89,7 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { } TileEntity tileentity = world.getTileEntity(i, j, k); if (tileentity != null) { - player.openGui(emt.EMT.instance, 1, world, i, j, k); + UIInfos.TILE_MODULAR_UI.open(player, world, i, j, k); } return true; } diff --git a/src/main/java/emt/block/BlockMachines.java b/src/main/java/emt/block/BlockMachines.java index 1d7fef7..62753e4 100644 --- a/src/main/java/emt/block/BlockMachines.java +++ b/src/main/java/emt/block/BlockMachines.java @@ -1,5 +1,6 @@ package emt.block; +import com.gtnewhorizons.modularui.api.UIInfos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; @@ -78,10 +79,11 @@ public class BlockMachines extends BlockBaseContainer { @Override public boolean onBlockActivated( World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityIndustrialWandRecharge) { - player.openGui(EMT.instance, 0, world, x, y, z); - } else if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityEtherealMacerator) { - player.openGui(EMT.instance, 1, world, x, y, z); + if (!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof TileEntityIndustrialWandRecharge || te instanceof TileEntityEtherealMacerator) { + UIInfos.TILE_MODULAR_UI.open(player, world, x, y, z); + } } return true; } diff --git a/src/main/java/emt/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java index 3a0c7f0..b3cfa3d 100644 --- a/src/main/java/emt/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -1,5 +1,6 @@ package emt.block; +import com.gtnewhorizons.modularui.api.UIInfos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; @@ -145,7 +146,7 @@ public class BlockSolars extends BlockBaseContainer { } TileEntity tileentity = world.getTileEntity(i, j, k); if (tileentity != null) { - player.openGui(emt.EMT.instance, 1, world, i, j, k); + UIInfos.TILE_MODULAR_UI.open(player, world, i, j, k); } return true; } diff --git a/src/main/java/emt/client/gui/EMT_UITextures.java b/src/main/java/emt/client/gui/EMT_UITextures.java new file mode 100644 index 0000000..59a1578 --- /dev/null +++ b/src/main/java/emt/client/gui/EMT_UITextures.java @@ -0,0 +1,22 @@ +package emt.client.gui; + +import static emt.EMT.TEXTURE_PATH; + +import com.gtnewhorizons.modularui.api.drawable.UITexture; + +public class EMT_UITextures { + + public static final UITexture OVERLAY_SLOT_FUSION_CRAFTING = + UITexture.fullImage(TEXTURE_PATH, "guis/overlay_slot/fusion_crafter"); + public static final UITexture OVERLAY_SLOT_WAND = UITexture.fullImage(TEXTURE_PATH, "guis/overlay_slot/wand"); + + public static final UITexture PICTURE_GAUGE_EMPTY_25 = + UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_25"); + public static final UITexture PICTURE_GAUGE_GENERATOR = + UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_generator"); + public static final UITexture PICTURE_GAUGE_SOLAR = UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_solar"); + public static final UITexture PICTURE_GAUGE_EMPTY_11 = + UITexture.fullImage(TEXTURE_PATH, "guis/picture/gauge_empty_11"); + public static final UITexture PICTURE_SOLAR_INDICATOR = + UITexture.fullImage(TEXTURE_PATH, "guis/picture/solar_indicator"); +} diff --git a/src/main/java/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/emt/client/gui/GuiEtherealMacerator.java deleted file mode 100644 index 3da44a5..0000000 --- a/src/main/java/emt/client/gui/GuiEtherealMacerator.java +++ /dev/null @@ -1,35 +0,0 @@ -package emt.client.gui; - -import emt.EMT; -import emt.client.gui.container.ContainerEtheralMacerator; -import emt.tile.TileEntityEtherealMacerator; -import emt.util.EMTTextHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -public class GuiEtherealMacerator extends GuiContainer { - - public static final ResourceLocation texture = - new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/etherealmacerator.png"); - - public GuiEtherealMacerator(InventoryPlayer inventory, TileEntityEtherealMacerator te) { - super(new ContainerEtheralMacerator(inventory, te)); - xSize = 176; - ySize = 165; - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int j, int i) { - GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - } - - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.etherealMacerator.title"), 6, 6, 4210752); - this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/emt/client/gui/GuiGenerator.java b/src/main/java/emt/client/gui/GuiGenerator.java deleted file mode 100644 index 79959f6..0000000 --- a/src/main/java/emt/client/gui/GuiGenerator.java +++ /dev/null @@ -1,91 +0,0 @@ -package emt.client.gui; - -import emt.EMT; -import emt.client.gui.container.ConainerGenerator; -import emt.tile.generator.TileEntityBaseGenerator; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; - -public class GuiGenerator extends GuiContainer { - - private static ResourceLocation tex = new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/generator.png"); - - TileEntityBaseGenerator tileentity; - private int xSize; - private int ySize; - - public GuiGenerator(InventoryPlayer invPlayer, TileEntityBaseGenerator entity) { - super(new ConainerGenerator(invPlayer, entity)); - this.tileentity = entity; - this.allowUserInput = false; - this.xSize = 194; - this.ySize = 168; - } - - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - String formatPanelName = I18n.format(this.tileentity.getInventoryName()); - int nmPos = (this.xSize - this.fontRendererObj.getStringWidth(formatPanelName)) / 2; - this.fontRendererObj.drawStringWithShadow(formatPanelName, nmPos, 7, 6618118); - String storageString = I18n.format("emt.Storage"); - String fuel = I18n.format("emt.Fuel"); - if (this.tileentity.maxstorage < 1000) - this.fontRendererObj.drawString( - storageString + this.tileentity.mpshownstroage * 1000 + "/" + this.tileentity.maxstorage + "EU", - 36, - 22, - 0); - else if (10000 <= this.tileentity.maxstorage && this.tileentity.maxstorage < 10000000) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mpshownstroage) + "/" + (this.tileentity.maxstorage / 1000) - + "kEU", - 36, - 22, - 0); - else if (10000000 <= this.tileentity.maxstorage && this.tileentity.maxstorage < 1000000000) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mpshownstroage / 1000) + "/" - + (this.tileentity.maxstorage / 1000000) + "MEU", - 36, - 22, - 0); - else if (1000000000 <= this.tileentity.maxstorage) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mpshownstroage / 1000000) + "/" - + (this.tileentity.maxstorage / 1000000000) + "GEU", - 36, - 22, - 0); - if (this.tileentity.isActive) - this.fontRendererObj.drawString( - I18n.format("emt.Generating") + Double.toString(this.tileentity.generating / 20 / 20) + " EU/t", - 36, - 35, - 0); - else this.fontRendererObj.drawString(I18n.format("emt.Generating") + "0 EU/t", 36, 35, 0); - this.fontRendererObj.drawString(fuel + ": " + Integer.toString(this.tileentity.fuel), 36, 48, 0); - this.fontRendererObj.drawString( - fuel + "/t: " + Integer.toString((this.tileentity.fuel * 20 * 20) - this.tileentity.tick), 36, 63, 0); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { - // GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.renderEngine.bindTexture(tex); - - int h = (this.width - this.xSize) / 2; - int k = (this.height - this.ySize) / 2; - drawTexturedModalRect(h, k, 0, 0, this.xSize, this.ySize); - if (this.tileentity.mpshownstroage > 0) { - int l = this.tileentity.gaugeEnergyScaled(33); - drawTexturedModalRect(h + 18, k + 23, 195, 0, l, 14); - } - - if (this.tileentity.fuel > 0) { - int l = this.tileentity.gaugeFuelScaled(33); - drawTexturedModalRect(h + 18, k + 42, 195, 0, l, 14); - } - } -} diff --git a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java deleted file mode 100644 index 391b524..0000000 --- a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java +++ /dev/null @@ -1,35 +0,0 @@ -package emt.client.gui; - -import emt.EMT; -import emt.client.gui.container.ContainerIndustrialWandRecharge; -import emt.tile.TileEntityIndustrialWandRecharge; -import emt.util.EMTTextHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -public class GuiIndustrialWandRecharger extends GuiContainer { - - public static final ResourceLocation texture = - new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/wandcharger.png"); - - public GuiIndustrialWandRecharger(InventoryPlayer inventory, TileEntityIndustrialWandRecharge te) { - super(new ContainerIndustrialWandRecharge(inventory, te)); - xSize = 176; - ySize = 165; - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int j, int i) { - GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - } - - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.wandRecharge.title"), 6, 6, 4210752); - this.fontRendererObj.drawString(EMTTextHelper.localize("gui.EMT.inventory"), 8, this.ySize - 96 + 2, 4210752); - } -} diff --git a/src/main/java/emt/client/gui/GuiSolar.java b/src/main/java/emt/client/gui/GuiSolar.java deleted file mode 100644 index 691f232..0000000 --- a/src/main/java/emt/client/gui/GuiSolar.java +++ /dev/null @@ -1,132 +0,0 @@ -package emt.client.gui; - -import emt.EMT; -import emt.client.gui.container.ContainerSolars; -import emt.tile.solar.TileEntitySolarBase; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -public class GuiSolar extends GuiContainer { - - private static ResourceLocation tex = new ResourceLocation(EMT.TEXTURE_PATH, "textures/guis/solar.png"); - - TileEntitySolarBase tileentity; - private boolean allowUserInput; - private int xSize; - private int ySize; - private String color; - private int cColor; - - public GuiSolar(InventoryPlayer invPlayer, TileEntitySolarBase entity) { - super(new ContainerSolars(invPlayer, entity)); - this.tileentity = entity; - this.allowUserInput = false; - this.xSize = 194; - this.ySize = 168; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { - color = this.tileentity - .getInventoryName() - .replaceAll("Solar", "") - .replaceAll("Compressed", "") - .replaceAll("Triple", "") - .replaceAll("Double", "") - .trim(); - if (color != null) - switch (color) { - case "Aer": { - GL11.glColor4f(1.0f, 0.86f, 0.0f, 1.0f); - break; - } - case "Terra": { - GL11.glColor4f(0.0f, 0.66f, 0.08f, 1.0f); - cColor = 8224255; - break; - } - case "Ordo": { - GL11.glColor4f(0.8f, 0.8f, 0.8f, 1.0f); - break; - } - case "Perditio": { - GL11.glColor4f(0.33F, 0.33F, 0.33F, 1.0F); - break; - } - case "Ignis": { - GL11.glColor4f(0.82f, 0.11f, 0.11f, 1.0f); - break; - } - case "Aqua": { - GL11.glColor4f(0.27f, 0.65f, 1.0f, 1.0f); - break; - } - default: { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - break; - } - } - else GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.renderEngine.bindTexture(tex); - - int h = (this.width - this.xSize) / 2; - int k = (this.height - this.ySize) / 2; - drawTexturedModalRect(h, k, 0, 0, this.xSize, this.ySize); - if (this.tileentity.mp_storage > 0) { - int l = this.tileentity.gaugeEnergyScaled(33); - drawTexturedModalRect(h + 18, k + 23, 195, 0, l, 14); - } - if (this.tileentity.generating > 9) drawTexturedModalRect(h + 18, k + 42, 195, 20, 11, 14); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - String formatPanelName = I18n.format(this.tileentity.getInventoryName(), new Object[0]); - int nmPos = (this.xSize - this.fontRendererObj.getStringWidth(formatPanelName)) / 2; - - if (!color.equals("Terra")) this.fontRendererObj.drawStringWithShadow(formatPanelName, 0, 7, 6618118); - else this.fontRendererObj.drawStringWithShadow(formatPanelName, 0, 7, cColor); - - String storageString = I18n.format("emt.Storage", new Object[0]); - - if (this.tileentity.maxstorage < 1000) - this.fontRendererObj.drawString( - storageString + this.tileentity.storage + "/" + this.tileentity.maxstorage + "EU", 36, 22, 0); - else if (10000 <= this.tileentity.maxstorage && this.tileentity.maxstorage < 10000000) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mp_storage) + "/" + (this.tileentity.maxstorage / 1000) + "kEU", - 36, - 22, - 0); - else if (10000000 <= this.tileentity.maxstorage && this.tileentity.maxstorage < 1000000000) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mp_storage / 1000) + "/" + (this.tileentity.maxstorage / 1000000) - + "MEU", - 36, - 22, - 0); - else if (1000000000 <= this.tileentity.maxstorage) - this.fontRendererObj.drawString( - storageString + (this.tileentity.mp_storage / 1000000) + "/" - + (this.tileentity.maxstorage / 1000000000) + "GEU", - 36, - 22, - 0); - if (this.tileentity.isActive) - // if (Double.toString(this.tileentity.generating).length()>5) - // this.fontRendererObj.drawString(I18n.format("emt.Generating",new - // Object[0])+Double.toString(this.tileentity.generating).substring(0, 4)+" EU/t", 36, 35, 0); - // else - this.fontRendererObj.drawString( - I18n.format("emt.Generating", new Object[0]) + Double.toString(this.tileentity.generating) - + " EU/t", - 36, - 35, - 0); - else this.fontRendererObj.drawString(I18n.format("emt.Generating", new Object[0]) + "0 EU/t", 36, 35, 0); - } -} diff --git a/src/main/java/emt/client/gui/container/ConainerGenerator.java b/src/main/java/emt/client/gui/container/ConainerGenerator.java deleted file mode 100644 index b442b3b..0000000 --- a/src/main/java/emt/client/gui/container/ConainerGenerator.java +++ /dev/null @@ -1,91 +0,0 @@ -package emt.client.gui.container; - -import emt.tile.generator.TileEntityBaseGenerator; -import java.util.Locale; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; - -public class ConainerGenerator extends Container { - private TileEntityBaseGenerator tileentity; - - public ConainerGenerator(InventoryPlayer inventoryplayer, TileEntityBaseGenerator tileentity) { - this.tileentity = tileentity; - } - - public void detectAndSendChanges() { - for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); - - icrafting.sendProgressBarUpdate(this, 0, (short) (this.tileentity.generating / 400)); - icrafting.sendProgressBarUpdate(this, 1, (byte) this.tileentity.fuel); - icrafting.sendProgressBarUpdate(this, 2, (short) (this.tileentity.storage / 1000)); - icrafting.sendProgressBarUpdate(this, 3, (byte) encryptAspect(this.tileentity.aspect)); - icrafting.sendProgressBarUpdate(this, 4, (byte) (this.tileentity.isActive ? 1 : 0)); - } - } - - private byte encryptAspect(Aspect aspect) { - switch (aspect.getTag().toUpperCase(Locale.US)) { - case "POTENTIA": - return 0; - case "IGNIS": - return 1; - case "AURAM": - return 2; - case "ARBOR": - return 3; - case "AER": - return 4; - case "LUCRUM": - return 5; - } - return 0; - } - - public void updateProgressBar(int i, int j) { - if (i == 0) { - this.tileentity.generating = (((int) j) * 400); - } else if (i == 1) { - if (j == 0 || this.tileentity.fuel != j) this.tileentity.tick = 0; - this.tileentity.fuel = ((byte) j); - } else if (i == 2) { - this.tileentity.mpshownstroage = (short) j; - } else if (i == 3 && this.tileentity.aspect == null) - switch (j) { - case 0: - this.tileentity.aspect = Aspect.ENERGY; - break; - case 1: - this.tileentity.aspect = Aspect.FIRE; - break; - case 2: - this.tileentity.aspect = Aspect.AURA; - break; - case 3: - this.tileentity.aspect = Aspect.TREE; - break; - case 4: - this.tileentity.aspect = Aspect.AIR; - break; - case 5: - this.tileentity.aspect = Aspect.GREED; - break; - } - else if (i == 4) { - this.tileentity.isActive = ((byte) j) == ((byte) 1); - } - } - - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - return null; - } - - public boolean canInteractWith(EntityPlayer entityplayer) { - this.detectAndSendChanges(); - return this.tileentity.isUseableByPlayer(entityplayer); - } -} diff --git a/src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java deleted file mode 100644 index a558e89..0000000 --- a/src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java +++ /dev/null @@ -1,83 +0,0 @@ -package emt.client.gui.container; - -import emt.tile.TileEntityEtherealMacerator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntity; -import thaumcraft.common.container.SlotOutput; - -public class ContainerEtheralMacerator extends Container { - - TileEntityEtherealMacerator te; - - public ContainerEtheralMacerator(InventoryPlayer inventory, TileEntity te) { - this.te = ((TileEntityEtherealMacerator) te); - addSlotToContainer(new Slot(this.te, 0, 56, 26)); - addSlotToContainer(new SlotOutput(this.te, 2, 116, 26)); - addSlotToContainer(new SlotOutput(this.te, 1, 116, 53)); - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return this.te.isUseableByPlayer(player); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(par2); - - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (par2 == 1) { - if (!this.mergeItemStack(itemstack1, 2, 38, true)) { - return null; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (par2 != 0) { - if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) { - if (!this.mergeItemStack(itemstack1, 0, 1, false)) { - return null; - } - } else if (par2 >= 2 && par2 < 29) { - if (!this.mergeItemStack(itemstack1, 29, 38, false)) { - return null; - } - } else if (par2 >= 29 && par2 < 38 && !this.mergeItemStack(itemstack1, 2, 29, false)) { - return null; - } - } else if (!this.mergeItemStack(itemstack1, 3, 38, false)) { - return null; - } - - if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - if (itemstack1.stackSize == itemstack.stackSize) { - return null; - } - - slot.onPickupFromSlot(par1EntityPlayer, itemstack1); - } - - return itemstack; - } -} diff --git a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java deleted file mode 100644 index a64abcb..0000000 --- a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ /dev/null @@ -1,69 +0,0 @@ -package emt.client.gui.container; - -import emt.tile.TileEntityIndustrialWandRecharge; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerIndustrialWandRecharge extends Container { - - TileEntityIndustrialWandRecharge charger; - - public ContainerIndustrialWandRecharge(InventoryPlayer invPlayer, TileEntityIndustrialWandRecharge entity) { - this.charger = entity; - - for (int x = 0; x < 9; x++) { - this.addSlotToContainer(new Slot(invPlayer, x, 8 + x * 18, 142)); - } - - for (int y = 0; y < 3; y++) { - for (int x = 0; x < 9; x++) { - this.addSlotToContainer(new Slot(invPlayer, 9 + x + y * 9, 8 + x * 18, 84 + y * 18)); - } - } - - this.addSlotToContainer(new Slot(charger, 0, 80, 35)); - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return charger.isUseableByPlayer(player); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(par2); - - if (slot != null && slot.getHasStack()) { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (par2 == 36) { - if (!this.mergeItemStack(itemstack1, 0, 35, false)) { - return null; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (!charger.isItemValidForSlot(0, itemstack1) || !this.mergeItemStack(itemstack1, 36, 37, false)) { - return null; - } - - if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - if (itemstack1.stackSize == itemstack.stackSize) { - return null; - } - - slot.onPickupFromSlot(par1EntityPlayer, itemstack1); - } - - return itemstack; - } -} diff --git a/src/main/java/emt/client/gui/container/ContainerSolars.java b/src/main/java/emt/client/gui/container/ContainerSolars.java deleted file mode 100644 index b8fa5b6..0000000 --- a/src/main/java/emt/client/gui/container/ContainerSolars.java +++ /dev/null @@ -1,59 +0,0 @@ -package emt.client.gui.container; - -import emt.tile.solar.TileEntitySolarBase; -import java.nio.ByteBuffer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.item.ItemStack; - -public class ContainerSolars extends Container { - byte[] generating = new byte[8]; - byte[] mpStorage = new byte[8]; - private TileEntitySolarBase tileentity; - - public ContainerSolars(InventoryPlayer inventoryplayer, TileEntitySolarBase tileentity) { - this.tileentity = tileentity; - } - - public void detectAndSendChanges() { - byte[] generating = - ByteBuffer.allocate(8).putDouble(this.tileentity.generating).array(); - byte[] mpStorage = ByteBuffer.allocate(8) - .putDouble(this.tileentity.getSourceStored() / 1000) - .array(); - for (int i = 0; i < this.crafters.size(); i++) { - ICrafting icrafting = (ICrafting) this.crafters.get(i); - - for (int j = 0; j < generating.length; j++) { - icrafting.sendProgressBarUpdate(this, j, generating[j]); - } - - for (int j = 0; j < mpStorage.length; j++) { - icrafting.sendProgressBarUpdate(this, 8 + j, mpStorage[j]); - } - } - } - - public void updateProgressBar(int i, int j) { - if (i < 8) { - generating[i] = (byte) j; - if (i == 7) this.tileentity.generating = ByteBuffer.wrap(generating).getDouble(); - } - if (i > 7 && i < 16) { - mpStorage[i - 8] = (byte) j; - if (i == 15) - this.tileentity.mp_storage = (long) ByteBuffer.wrap(mpStorage).getDouble(); - } - } - - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) { - return null; - } - - public boolean canInteractWith(EntityPlayer entityplayer) { - this.detectAndSendChanges(); - return this.tileentity.isUseableByPlayer(entityplayer); - } -} diff --git a/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java b/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java index 7643d60..43cec58 100644 --- a/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java +++ b/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java @@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import java.util.ArrayList; -import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -47,21 +47,15 @@ public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input { return current; } + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new EssentiaHatch( "Essentia Hatch " + GT_Values.VN[this.mTier], this.mTier, this.getDescription(), this.mTextures); } @Override - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - // TODO: new GUI. - return null; - } - - @Override - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - // TODO: new contanier GUI. - return null; + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + return false; } @Override @@ -146,18 +140,22 @@ public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input { return ret; } + @Override public boolean isFluidInputAllowed(FluidStack aFluid) { return false; } + @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } + @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } + @Override public int getCapacity() { return 0; } diff --git a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java index b9a803e..6e306f7 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import cpw.mods.fml.common.Loader; +import emt.client.gui.EMT_UITextures; import emt.init.EMTItems; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -20,21 +21,22 @@ import net.minecraftforge.fluids.FluidStack; public class EMT_RecipeAdder { public static final GT_Recipe.GT_Recipe_Map sFusionCraftingRecipes = new GT_Recipe.GT_Recipe_Map( - new HashSet<>(4), - "emt.recipe.fusioncrafting", - "Draconic Evolution Fusion Crafter", - null, - RES_PATH_GUI + "basicmachines/FusionCrafter", - 9, - 1, - 1, - 0, - 1, - "Tier Casing: ", - 1, - E, - false, - false); + new HashSet<>(16), + "emt.recipe.fusioncrafting", + "Draconic Evolution Fusion Crafter", + null, + RES_PATH_GUI + "basicmachines/FusionCrafter", + 9, + 1, + 1, + 0, + 1, + "Tier Casing: ", + 1, + E, + false, + false) + .setSlotOverlay(false, false, EMT_UITextures.OVERLAY_SLOT_FUSION_CRAFTING); public static void addFusionCraftingRecipe( ItemStack[] inputs, diff --git a/src/main/java/emt/proxy/CommonProxy.java b/src/main/java/emt/proxy/CommonProxy.java index 4082f66..482b24e 100644 --- a/src/main/java/emt/proxy/CommonProxy.java +++ b/src/main/java/emt/proxy/CommonProxy.java @@ -1,23 +1,6 @@ package emt.proxy; -import cpw.mods.fml.common.network.IGuiHandler; -import emt.client.gui.GuiEtherealMacerator; -import emt.client.gui.GuiGenerator; -import emt.client.gui.GuiIndustrialWandRecharger; -import emt.client.gui.GuiSolar; -import emt.client.gui.container.ConainerGenerator; -import emt.client.gui.container.ContainerEtheralMacerator; -import emt.client.gui.container.ContainerIndustrialWandRecharge; -import emt.client.gui.container.ContainerSolars; -import emt.tile.TileEntityEtherealMacerator; -import emt.tile.TileEntityIndustrialWandRecharge; -import emt.tile.generator.TileEntityBaseGenerator; -import emt.tile.solar.TileEntitySolarBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class CommonProxy implements IGuiHandler { +public class CommonProxy { public void load() { registerRenders(); @@ -26,49 +9,4 @@ public class CommonProxy implements IGuiHandler { public void registerRenders() { /* Empty in base proxy */ } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); - - switch (ID) { - case 0: - if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { - return new ContainerIndustrialWandRecharge( - player.inventory, (TileEntityIndustrialWandRecharge) entity); - } - case 1: - if (entity != null && entity instanceof TileEntityEtherealMacerator) { - return new ContainerEtheralMacerator(player.inventory, (TileEntityEtherealMacerator) entity); - } else if (entity != null && entity instanceof TileEntityBaseGenerator) { - return new ConainerGenerator(player.inventory, (TileEntityBaseGenerator) entity); - } else if (entity != null && entity instanceof TileEntitySolarBase) { - return new ContainerSolars(player.inventory, (TileEntitySolarBase) entity); - } - default: - return null; - } - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); - - switch (ID) { - case 0: - if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { - return new GuiIndustrialWandRecharger(player.inventory, (TileEntityIndustrialWandRecharge) entity); - } - case 1: - if (entity != null && entity instanceof TileEntityEtherealMacerator) { - return new GuiEtherealMacerator(player.inventory, (TileEntityEtherealMacerator) entity); - } else if (entity != null && entity instanceof TileEntityBaseGenerator) { - return new GuiGenerator(player.inventory, (TileEntityBaseGenerator) entity); - } else if (entity != null && entity instanceof TileEntitySolarBase) { - return new GuiSolar(player.inventory, (TileEntitySolarBase) entity); - } - default: - return null; - } - } } diff --git a/src/main/java/emt/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java index 766c573..c2211e5 100644 --- a/src/main/java/emt/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -1,7 +1,17 @@ package emt.tile; +import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.forge.InvWrapper; +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.widget.ProgressBar; +import com.gtnewhorizons.modularui.common.widget.SlotWidget; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; +import gregtech.api.gui.modularui.GT_UITextures; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -12,7 +22,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { +public class TileEntityEtherealMacerator extends TileEntityEMT + implements ISidedInventory, IWrenchable, ITileWithModularUI { private static final int[] slots_top = new int[] {0}; private static final int[] slots_bottom = new int[] {2, 1}; @@ -21,14 +32,17 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided public int cookTime; private ItemStack[] slots = new ItemStack[3]; + @Override public int getSizeInventory() { return this.slots.length; } + @Override public ItemStack getStackInSlot(int par1) { return this.slots[par1]; } + @Override public ItemStack decrStackSize(int par1, int par2) { if (this.slots[par1] != null) { ItemStack itemstack; @@ -51,6 +65,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided } } + @Override public ItemStack getStackInSlotOnClosing(int par1) { if (this.slots[par1] != null) { ItemStack itemstack = this.slots[par1]; @@ -61,6 +76,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided } } + @Override public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { this.slots[par1] = par2ItemStack; @@ -69,14 +85,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided } } - public String getInvName() { - return "Ethereal Processor"; - } - - public boolean isInvNameLocalized() { - return false; - } - + @Override public void readFromNBT(NBTTagCompound tagCompound) { super.readFromNBT(tagCompound); NBTTagList nbttaglist = tagCompound.getTagList("Items", 10); @@ -93,6 +102,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided this.cookTime = tagCompound.getShort("CookTime"); } + @Override public void writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); tagCompound.setShort("CookTime", (short) this.cookTime); @@ -109,12 +119,14 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided tagCompound.setTag("Items", nbttaglist); } + @Override public int getInventoryStackLimit() { return 64; } + @Override public void updateEntity() { - if (this.canSmelt() && !isOverLimit(1) && !isOverLimit(2) && isAllowed()) { + if (this.canSmelt() && !isOverLimit(1) && !isOverLimit(2) && isAllowed(this.slots[0])) { ++this.cookTime; this.isOn = true; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -177,6 +189,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided } } + @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false @@ -185,10 +198,6 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided <= 64.0D; } - public void openChest() {} - - public void closeChest() {} - @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { if (slot != 0) return false; @@ -196,14 +205,17 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided return false; } + @Override public int[] getAccessibleSlotsFromSide(int par1) { return par1 == 0 ? slots_bottom : (par1 == 1 ? slots_top : slots_sides); } + @Override public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { return this.isItemValidForSlot(par1, par2ItemStack); } + @Override public boolean canExtractItem(int par1, ItemStack par2ItemStack, int par3) { return true; } @@ -218,9 +230,9 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided } } - public boolean isAllowed() { - - int[] oreDictIDs = OreDictionary.getOreIDs(this.slots[0]); + public boolean isAllowed(ItemStack stack) { + if (stack == null) return false; + int[] oreDictIDs = OreDictionary.getOreIDs(stack); for (int oreDictID : oreDictIDs) { String tName = OreDictionary.getOreName(oreDictID); for (String allowed : EMTConfigHandler.etherealMaceratorWhiteList) { @@ -273,4 +285,30 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided @Override public void closeInventory() {} + + @Override + public ModularWindow createWindow(UIBuildContext buildContext) { + ModularWindow.Builder builder = ModularWindow.builder(176, 166); + builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); + builder.bindPlayerInventory(buildContext.getPlayer()); + InvWrapper invWrapper = new InvWrapper(this); + + builder.widget(new SlotWidget(invWrapper, 0) + .setFilter(stack -> + isAllowed(stack) && FurnaceRecipes.smelting().getSmeltingResult(stack) != null) + .setPos(55, 25)) + .widget(new SlotWidget(invWrapper, 2) + .setAccess(true, false) + .setBackground(ModularUITextures.ITEM_SLOT.withFixedSize(26, 26, -4, -4)) + .setPos(115, 25)) + .widget(new SlotWidget(invWrapper, 1).setAccess(true, false).setPos(115, 52)) + .widget(new ProgressBar() + .setTexture(GT_UITextures.PROGRESSBAR_MACERATE, 20) + .setProgress(() -> (float) cookTime / maceratingSpeed) + .setPos(81, 36) + .setSize(20, 18)) + .widget(new TextWidget(EMTTextHelper.localize("gui.EMT.etherealMacerator.title")).setPos(6, 6)); + + return builder.build(); + } } diff --git a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java index 78ebfdc..5274c05 100644 --- a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java @@ -1,8 +1,17 @@ package emt.tile; +import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.forge.InvWrapper; +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.widget.SlotWidget; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.common.FMLCommonHandler; +import emt.client.gui.EMT_UITextures; import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import ic2.api.energy.tile.IEnergySink; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; @@ -16,19 +25,23 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable, IEnergySink { +public class TileEntityIndustrialWandRecharge extends TileEntityEMT + implements IInventory, IWrenchable, IEnergySink, ITileWithModularUI { private static final int capacity = 1000000; private static final int tier = 4; private double energyStored = 0; + @Override public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { return true; } + @Override public double getDemandedEnergy() { return Math.max(0.0D, (double) capacity - this.energyStored); } + @Override public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { if (this.getDemandedEnergy() > 0) { this.energyStored += amount; @@ -37,6 +50,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I return amount; } + @Override public int getSinkTier() { return tier; } @@ -135,6 +149,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I } } + @Override public void readFromNBT(NBTTagCompound p_145839_1_) { super.readFromNBT(p_145839_1_); NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); @@ -154,6 +169,7 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I } } + @Override public void writeToNBT(NBTTagCompound p_145841_1_) { super.writeToNBT(p_145841_1_); NBTTagList nbttaglist = new NBTTagList(); @@ -233,4 +249,18 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { return new ItemStack(EMTBlocks.emtMachines, 1, 0); } + + @Override + public ModularWindow createWindow(UIBuildContext buildContext) { + ModularWindow.Builder builder = ModularWindow.builder(176, 166); + builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); + builder.bindPlayerInventory(buildContext.getPlayer()); + + builder.widget(new SlotWidget(new InvWrapper(this), 0) + .setBackground(ModularUITextures.ITEM_SLOT, EMT_UITextures.OVERLAY_SLOT_WAND) + .setPos(79, 34)) + .widget(new TextWidget(EMTTextHelper.localize("gui.EMT.wandRecharge.title")).setPos(6, 6)); + + return builder.build(); + } } diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index 6a604e8..f86f28a 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -1,10 +1,20 @@ package emt.tile.generator; +import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.drawable.Text; +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; +import com.gtnewhorizons.modularui.common.widget.ProgressBar; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.common.network.NetworkRegistry; +import emt.client.gui.EMT_UITextures; import emt.tile.DefinitelyNotAIC2Source; import emt.tile.TileEntityEMT; import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; +import emt.util.EMTTextHelper; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; import gregtech.api.interfaces.tileentity.IEnergyConnected; @@ -34,7 +44,8 @@ public class TileEntityBaseGenerator extends TileEntityEMT IEssentiaTransport, IHasWorldObjectAndCoords, IEnergyConnected, - IBasicEnergyContainer { + IBasicEnergyContainer, + ITileWithModularUI { public DefinitelyNotAIC2Source energySource = new DefinitelyNotAIC2Source(this, 100000L, 2); public Aspect aspect; public double generating; @@ -86,6 +97,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT this.color = -1; } + @Override public void updateEntity() { this.side = !this.worldObj.isRemote; this.dead = false; @@ -158,6 +170,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT } } + @Override public String getInventoryName() { return StatCollector.translateToLocal("tile.EMT.essentia." + this.aspect.getTag() + ".name"); } @@ -188,6 +201,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT } } + @Override public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); this.energySource.setEnergyStored(tag.getLong("estore")); @@ -200,6 +214,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT } } + @Override public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); tag.setInteger("fuel", this.fuel); @@ -207,38 +222,48 @@ public class TileEntityBaseGenerator extends TileEntityEMT if (aspect != null) tag.setString("aspect", this.aspect.getTag()); } + @Override public int getSizeInventory() { return 5; } + @Override public ItemStack getStackInSlot(int i) { return null; } + @Override public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { return null; } + @Override public ItemStack getStackInSlotOnClosing(int p_70304_1_) { return null; } + @Override public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {} + @Override public boolean hasCustomInventoryName() { return false; } + @Override public int getInventoryStackLimit() { return 0; } + @Override public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { return true; } + @Override public void openInventory() {} + @Override public void closeInventory() {} public int gaugeEnergyScaled(int i) { @@ -249,20 +274,25 @@ public class TileEntityBaseGenerator extends TileEntityEMT return this.fuel * i / this.maxfuel; } + @Override public boolean isItemValidForSlot(int i, ItemStack Stack) { return false; } + @Override public AspectList getAspects() { return new AspectList().add(this.aspect, this.fuel); } + @Override public void setAspects(AspectList aspects) {} + @Override public boolean doesContainerAccept(Aspect tag) { return tag.equals(this.aspect); } + @Override public int addToContainer(Aspect tag, int amount) { if ((!tag.equals(this.aspect)) || (amount < 0)) { return amount; @@ -275,52 +305,65 @@ public class TileEntityBaseGenerator extends TileEntityEMT return amount - (this.maxfuel - this.fuel); } + @Override public boolean takeFromContainer(Aspect tag, int amount) { return false; } + @Override public boolean takeFromContainer(AspectList ot) { return false; } + @Override public boolean doesContainerContainAmount(Aspect tag, int amount) { return (tag.equals(this.aspect)) && (amount <= this.fuel); } + @Override public boolean doesContainerContain(AspectList ot) { return ot.aspects.containsKey(this.aspect) && ot.aspects.get(this.aspect) == this.fuel; } + @Override public int containerContains(Aspect tag) { return tag == this.aspect ? this.fuel : 0; } + @Override public boolean isConnectable(ForgeDirection face) { return true; } + @Override public boolean canInputFrom(ForgeDirection face) { return true; } + @Override public boolean canOutputTo(ForgeDirection face) { return false; } + @Override public void setSuction(Aspect aspect, int amount) {} + @Override public Aspect getSuctionType(ForgeDirection face) { return this.aspect; } + @Override public int getSuctionAmount(ForgeDirection face) { return this.fuel == this.maxfuel ? 0 : 128; } + @Override public int takeEssentia(Aspect aspect, int amount, ForgeDirection face) { return 0; } + @Override public int addEssentia(Aspect aspect, int amount, ForgeDirection face) { if (amount < this.maxfuel - this.fuel) { return amount; @@ -328,18 +371,22 @@ public class TileEntityBaseGenerator extends TileEntityEMT return this.maxfuel - addToContainer(aspect, amount); } + @Override public Aspect getEssentiaType(ForgeDirection face) { return this.aspect; } + @Override public int getEssentiaAmount(ForgeDirection face) { return this.fuel; } + @Override public int getMinimumSuction() { return Integer.MAX_VALUE; } + @Override public boolean renderExtendedTube() { return true; } @@ -353,27 +400,33 @@ public class TileEntityBaseGenerator extends TileEntityEMT } } + @Override public byte getColorization() { return this.color; } + @Override public byte setColorization(byte aColor) { this.color = aColor; return this.color; } + @Override public boolean isUniversalEnergyStored(long aEnergyAmount) { return aEnergyAmount < this.energySource.getEnergyStored(); } + @Override public long getUniversalEnergyStored() { return (long) this.energySource.getEnergyStored(); } + @Override public long getUniversalEnergyCapacity() { return (long) this.energySource.getCapacity(); } + @Override public long getOutputAmperage() { if (this.generating / 20.0D / 20.0D <= GT_Values.V[this.energySource.getSourceTier()]) { return 1L; @@ -384,18 +437,22 @@ public class TileEntityBaseGenerator extends TileEntityEMT return (long) (1L + (this.generating / 20.0D / 20.0D / GT_Values.V[this.energySource.getSourceTier()])); } + @Override public long getOutputVoltage() { return GT_Values.V[this.energySource.getSourceTier()]; } + @Override public long getInputAmperage() { return 0L; } + @Override public long getInputVoltage() { return 0L; } + @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) { if (this.energySource.getEnergyStored() > aEnergy) { this.energySource.drawEnergy(aEnergy); @@ -405,51 +462,63 @@ public class TileEntityBaseGenerator extends TileEntityEMT return false; } + @Override public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; } + @Override public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { return decreaseStoredEnergyUnits( aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage); } + @Override public long getAverageElectricInput() { return 0L; } + @Override public long getAverageElectricOutput() { return 0L; } + @Override public long getStoredEU() { return (long) this.energySource.getEnergyStored(); } + @Override public long getEUCapacity() { return (long) this.energySource.getCapacity(); } + @Override public long getStoredSteam() { return 0L; } + @Override public long getSteamCapacity() { return 0L; } + @Override public boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; } + @Override public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { return 0L; } + @Override public boolean inputEnergyFrom(byte aSide) { return false; } + @Override public boolean outputsEnergyTo(byte aSide) { return true; } @@ -458,42 +527,52 @@ public class TileEntityBaseGenerator extends TileEntityEMT return true; } + @Override public World getWorld() { return this.worldObj; } + @Override public int getXCoord() { return this.xCoord; } + @Override public short getYCoord() { return (short) this.yCoord; } + @Override public int getZCoord() { return this.zCoord; } + @Override public boolean isServerSide() { return !worldObj.isRemote; } + @Override public boolean isClientSide() { return worldObj.isRemote; } + @Override public int getRandomNumber(int aRange) { return this.worldObj.rand.nextInt(aRange); } + @Override public TileEntity getTileEntity(int aX, int aY, int aZ) { return this.worldObj.getTileEntity(aX, aY, aZ); } + @Override public TileEntity getTileEntityOffset(int aX, int aY, int aZ) { return this.worldObj.getTileEntity(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public TileEntity getTileEntityAtSide(byte aSide) { if ((aSide < 0) || (aSide >= 6)) { return null; @@ -504,6 +583,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT return this.worldObj.getTileEntity(tX, tY, tZ); } + @Override public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getTileEntityAtSide(aSide); @@ -511,38 +591,47 @@ public class TileEntityBaseGenerator extends TileEntityEMT return getTileEntity(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public IInventory getIInventory(int aX, int aY, int aZ) { return null; } + @Override public IInventory getIInventoryOffset(int aX, int aY, int aZ) { return null; } + @Override public IInventory getIInventoryAtSide(byte aSide) { return null; } + @Override public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { return null; } + @Override public IFluidHandler getITankContainer(int aX, int aY, int aZ) { return null; } + @Override public IFluidHandler getITankContainerOffset(int aX, int aY, int aZ) { return null; } + @Override public IFluidHandler getITankContainerAtSide(byte aSide) { return null; } + @Override public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance) { return null; } + @Override public IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ) { TileEntity tTileEntity = getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -551,10 +640,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT return null; } + @Override public IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, int aZ) { return getIGregTechTileEntity(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide) { TileEntity tTileEntity = getTileEntityAtSide(aSide); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -563,6 +654,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT return null; } + @Override public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance) { TileEntity tTileEntity = getTileEntityAtSideAndDistance(aSide, aDistance); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -571,14 +663,17 @@ public class TileEntityBaseGenerator extends TileEntityEMT return null; } + @Override public Block getBlock(int aX, int aY, int aZ) { return this.worldObj.getBlock(aX, aY, aZ); } + @Override public Block getBlockOffset(int aX, int aY, int aZ) { return getBlock(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public Block getBlockAtSide(byte aSide) { if ((aSide < 0) || (aSide >= 6)) { return null; @@ -589,6 +684,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT return this.worldObj.getBlock(tX, tY, tZ); } + @Override public Block getBlockAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getBlockAtSide(aSide); @@ -596,14 +692,17 @@ public class TileEntityBaseGenerator extends TileEntityEMT return getBlock(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public byte getMetaID(int aX, int aY, int aZ) { return (byte) this.worldObj.getBlockMetadata(aX, aY, aZ); } + @Override public byte getMetaIDOffset(int aX, int aY, int aZ) { return getMetaID(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public byte getMetaIDAtSide(byte aSide) { int tX = getOffsetX(aSide, 1); int tY = getOffsetY(aSide, 1); @@ -611,6 +710,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT return (byte) this.worldObj.getBlockMetadata(tX, tY, tZ); } + @Override public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getMetaIDAtSide(aSide); @@ -618,38 +718,47 @@ public class TileEntityBaseGenerator extends TileEntityEMT return getMetaID(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public byte getLightLevel(int aX, int aY, int aZ) { return 0; } + @Override public byte getLightLevelOffset(int aX, int aY, int aZ) { return 0; } + @Override public byte getLightLevelAtSide(byte aSide) { return 0; } + @Override public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { return 0; } + @Override public boolean getOpacity(int aX, int aY, int aZ) { return false; } + @Override public boolean getOpacityOffset(int aX, int aY, int aZ) { return false; } + @Override public boolean getOpacityAtSide(byte aSide) { return false; } + @Override public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance) { return false; } + @Override public boolean getSky(int aX, int aY, int aZ) { boolean sky = true; do { @@ -660,58 +769,72 @@ public class TileEntityBaseGenerator extends TileEntityEMT return sky; } + @Override public boolean getSkyOffset(int aX, int aY, int aZ) { return getSky(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public boolean getSkyAtSide(byte aSide) { return false; } + @Override public boolean getSkyAtSideAndDistance(byte aSide, int aDistance) { return false; } + @Override public boolean getAir(int aX, int aY, int aZ) { return this.worldObj.getBlock(aX, aY, aZ).equals(Blocks.air); } + @Override public boolean getAirOffset(int aX, int aY, int aZ) { return getAir(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public boolean getAirAtSide(byte aSide) { return getAirAtSideAndDistance(aSide, 1); } + @Override public boolean getAirAtSideAndDistance(byte aSide, int aDistance) { return getAir(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public BiomeGenBase getBiome() { return this.worldObj.getBiomeGenForCoords(this.xCoord, this.zCoord); } + @Override public BiomeGenBase getBiome(int aX, int aZ) { return this.worldObj.getBiomeGenForCoords(aX, aZ); } + @Override public int getOffsetX(byte aSide, int aMultiplier) { return this.xCoord + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier; } + @Override public short getOffsetY(byte aSide, int aMultiplier) { return (short) (this.yCoord + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier); } + @Override public int getOffsetZ(byte aSide, int aMultiplier) { return this.zCoord + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier; } + @Override public boolean isDead() { return this.dead; } + @Override public void sendBlockEvent(byte aID, byte aValue) { GT_Values.NW.sendPacketToAllPlayersInRange( this.worldObj, @@ -720,29 +843,75 @@ public class TileEntityBaseGenerator extends TileEntityEMT this.zCoord); } + @Override public long getTimer() { return this.timer; } + @Override public void setLightValue(byte aLightValue) {} + @Override public boolean isInvalidTileEntity() { return this.tileEntityInvalid; } - public boolean openGUI(EntityPlayer aPlayer, int aID) { - return false; - } - - public boolean openGUI(EntityPlayer aPlayer) { - return false; - } - + @Override public boolean outputsEnergyTo(byte b, boolean b1) { return true; } + @Override public boolean inputEnergyFrom(byte b, boolean b1) { return false; } + + @Override + public ModularWindow createWindow(UIBuildContext buildContext) { + ModularWindow.Builder builder = ModularWindow.builder(176, 107); + builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); + + builder.widget(new TextWidget( + new Text(getInventoryName()).color(0x64fc06).shadow()) + .setPos(9, 9)) + .widget(new ProgressBar() + .setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_GENERATOR, 25) + .setProgress(() -> (float) storage / this.maxstorage) + .setSynced(false, false) + .setPos(9, 24) + .setSize(25, 11)) + .widget(new ProgressBar() + .setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_GENERATOR, 25) + .setProgress(() -> (float) fuel / this.maxfuel) + .setSynced(false, false) + .setPos(9, 43) + .setSize(25, 11)) + .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Storage") + + EMTTextHelper.formatNumber(storage) + "/" + + EMTTextHelper.formatNumber(maxstorage) + "EU") + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 22)) + .widget(new FakeSyncWidget.IntegerSyncer(() -> storage, val -> storage = val)) + .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Generating") + + (isActive ? generating / 20 / 20 : 0) + " EU/t") + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 35)) + .widget(new FakeSyncWidget.DoubleSyncer(() -> generating, val -> generating = val)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> isActive, val -> isActive = val)) + .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Fuel") + ": " + fuel) + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 48)) + .widget(new FakeSyncWidget.ByteSyncer(() -> fuel, val -> fuel = val)) + .widget(TextWidget.dynamicString(() -> + StatCollector.translateToLocal("emt.remaining_second") + ((fuel * 20 * 20) - tick) / 20) + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 63)) + .widget(new FakeSyncWidget.IntegerSyncer(() -> tick, val -> tick = val)); + + return builder.build(); + } } diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index 1d2bdee..0f04475 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -1,9 +1,19 @@ package emt.tile.solar; +import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.drawable.Text; +import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; +import com.gtnewhorizons.modularui.common.widget.ProgressBar; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.common.FMLCommonHandler; +import emt.client.gui.EMT_UITextures; import emt.init.EMTBlocks; import emt.tile.DefinitelyNotAIC2Source; import emt.tile.TileEntityEMT; +import emt.util.EMTTextHelper; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; import gregtech.api.interfaces.tileentity.IEnergyConnected; @@ -19,6 +29,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; @@ -27,7 +38,12 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.visnet.VisNetHandler; public class TileEntitySolarBase extends TileEntityEMT - implements IInventory, IWrenchable, IHasWorldObjectAndCoords, IEnergyConnected, IBasicEnergyContainer { + implements IInventory, + IWrenchable, + IHasWorldObjectAndCoords, + IEnergyConnected, + IBasicEnergyContainer, + ITileWithModularUI { private static final byte NOTHING = 0; private static final byte ORDO = 1; @@ -98,6 +114,7 @@ public class TileEntitySolarBase extends TileEntityEMT this.side = !this.worldObj.isRemote ? FMLCommonHandler.instance().getEffectiveSide().isServer() : FMLCommonHandler.instance().getSide().isServer(); + if (!side) return; this.dead = false; this.timer = +1L; inputintoGTnet(); @@ -284,42 +301,53 @@ public class TileEntitySolarBase extends TileEntityEMT this.mp_storage = this.storage / 1000; } + @Override public int getSizeInventory() { return 0; } + @Override public ItemStack getStackInSlot(int i) { return null; } + @Override public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { return null; } + @Override public ItemStack getStackInSlotOnClosing(int p_70304_1_) { return null; } + @Override public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {} + @Override public boolean hasCustomInventoryName() { return true; } + @Override public String getInventoryName() { return guiname; } + @Override public int getInventoryStackLimit() { return 0; } + @Override public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { return true; } + @Override public void openInventory() {} + @Override public void closeInventory() {} public int gaugeEnergyScaled(long i) { @@ -368,23 +396,28 @@ public class TileEntitySolarBase extends TileEntityEMT } } + @Override public byte getColorization() { return this.color; } + @Override public byte setColorization(byte aColor) { this.color = aColor; return this.color; } + @Override public boolean isUniversalEnergyStored(long aEnergyAmount) { return aEnergyAmount < this.energySource.getEnergyStored(); } + @Override public long getUniversalEnergyStored() { return (long) this.energySource.getEnergyStored(); } + @Override public long getUniversalEnergyCapacity() { return (long) this.energySource.getCapacity(); } @@ -401,6 +434,7 @@ public class TileEntitySolarBase extends TileEntityEMT return voltAmp; } + @Override public long getOutputAmperage() { return calculateMaxVoltAmp()[1]; // long ret; @@ -424,18 +458,22 @@ public class TileEntitySolarBase extends TileEntityEMT // return ret; } + @Override public long getOutputVoltage() { return GT_Values.V[this.energySource.getSourceTier()]; } + @Override public long getInputAmperage() { return 0L; } + @Override public long getInputVoltage() { return 0L; } + @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) { if (this.energySource.getEnergyStored() > aEnergy) { this.energySource.drawEnergy(aEnergy); @@ -445,51 +483,63 @@ public class TileEntitySolarBase extends TileEntityEMT return false; } + @Override public boolean increaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; } + @Override public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { return decreaseStoredEnergyUnits( aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage); } + @Override public long getAverageElectricInput() { return 0L; } + @Override public long getAverageElectricOutput() { return 0L; } + @Override public long getStoredEU() { return (long) this.energySource.getEnergyStored(); } + @Override public long getEUCapacity() { return (long) this.energySource.getCapacity(); } + @Override public long getStoredSteam() { return 0L; } + @Override public long getSteamCapacity() { return 0L; } + @Override public boolean increaseStoredSteam(long aEnergy, boolean aIgnoreTooMuchEnergy) { return false; } + @Override public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { return 0L; } + @Override public boolean inputEnergyFrom(byte aSide) { return false; } + @Override public boolean outputsEnergyTo(byte aSide) { return true; } @@ -498,42 +548,52 @@ public class TileEntitySolarBase extends TileEntityEMT return false; } + @Override public World getWorld() { return this.worldObj; } + @Override public int getXCoord() { return this.xCoord; } + @Override public short getYCoord() { return (short) this.yCoord; } + @Override public int getZCoord() { return this.zCoord; } + @Override public boolean isServerSide() { return side; } + @Override public boolean isClientSide() { return side; } + @Override public int getRandomNumber(int aRange) { return this.worldObj.rand.nextInt(aRange); } + @Override public TileEntity getTileEntity(int aX, int aY, int aZ) { return this.worldObj.getTileEntity(aX, aY, aZ); } + @Override public TileEntity getTileEntityOffset(int aX, int aY, int aZ) { return this.worldObj.getTileEntity(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public TileEntity getTileEntityAtSide(byte aSide) { if ((aSide < 0) || (aSide >= 6)) { return null; @@ -544,6 +604,7 @@ public class TileEntitySolarBase extends TileEntityEMT return this.worldObj.getTileEntity(tX, tY, tZ); } + @Override public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getTileEntityAtSide(aSide); @@ -551,38 +612,47 @@ public class TileEntitySolarBase extends TileEntityEMT return getTileEntity(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public IInventory getIInventory(int aX, int aY, int aZ) { return null; } + @Override public IInventory getIInventoryOffset(int aX, int aY, int aZ) { return null; } + @Override public IInventory getIInventoryAtSide(byte aSide) { return null; } + @Override public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { return null; } + @Override public IFluidHandler getITankContainer(int aX, int aY, int aZ) { return null; } + @Override public IFluidHandler getITankContainerOffset(int aX, int aY, int aZ) { return null; } + @Override public IFluidHandler getITankContainerAtSide(byte aSide) { return null; } + @Override public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance) { return null; } + @Override public IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ) { TileEntity tTileEntity = getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -591,10 +661,12 @@ public class TileEntitySolarBase extends TileEntityEMT return null; } + @Override public IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, int aZ) { return getIGregTechTileEntity(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide) { TileEntity tTileEntity = getTileEntityAtSide(aSide); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -603,6 +675,7 @@ public class TileEntitySolarBase extends TileEntityEMT return null; } + @Override public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance) { TileEntity tTileEntity = getTileEntityAtSideAndDistance(aSide, aDistance); if ((tTileEntity instanceof IGregTechTileEntity)) { @@ -611,14 +684,17 @@ public class TileEntitySolarBase extends TileEntityEMT return null; } + @Override public Block getBlock(int aX, int aY, int aZ) { return this.worldObj.getBlock(aX, aY, aZ); } + @Override public Block getBlockOffset(int aX, int aY, int aZ) { return getBlock(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public Block getBlockAtSide(byte aSide) { if ((aSide < 0) || (aSide >= 6)) { return null; @@ -629,6 +705,7 @@ public class TileEntitySolarBase extends TileEntityEMT return this.worldObj.getBlock(tX, tY, tZ); } + @Override public Block getBlockAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getBlockAtSide(aSide); @@ -636,14 +713,17 @@ public class TileEntitySolarBase extends TileEntityEMT return getBlock(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public byte getMetaID(int aX, int aY, int aZ) { return (byte) this.worldObj.getBlockMetadata(aX, aY, aZ); } + @Override public byte getMetaIDOffset(int aX, int aY, int aZ) { return getMetaID(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public byte getMetaIDAtSide(byte aSide) { int tX = getOffsetX(aSide, 1); int tY = getOffsetY(aSide, 1); @@ -651,6 +731,7 @@ public class TileEntitySolarBase extends TileEntityEMT return (byte) this.worldObj.getBlockMetadata(tX, tY, tZ); } + @Override public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance) { if (aDistance == 1) { return getMetaIDAtSide(aSide); @@ -658,38 +739,47 @@ public class TileEntitySolarBase extends TileEntityEMT return getMetaID(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public byte getLightLevel(int aX, int aY, int aZ) { return 0; } + @Override public byte getLightLevelOffset(int aX, int aY, int aZ) { return 0; } + @Override public byte getLightLevelAtSide(byte aSide) { return 0; } + @Override public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { return 0; } + @Override public boolean getOpacity(int aX, int aY, int aZ) { return false; } + @Override public boolean getOpacityOffset(int aX, int aY, int aZ) { return false; } + @Override public boolean getOpacityAtSide(byte aSide) { return false; } + @Override public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance) { return false; } + @Override public boolean getSky(int aX, int aY, int aZ) { boolean sky = true; do { @@ -700,58 +790,72 @@ public class TileEntitySolarBase extends TileEntityEMT return sky; } + @Override public boolean getSkyOffset(int aX, int aY, int aZ) { return getSky(aX + this.xCoord, aY + this.yCoord, aZ + this.zCoord); } + @Override public boolean getSkyAtSide(byte aSide) { return false; } + @Override public boolean getSkyAtSideAndDistance(byte aSide, int aDistance) { return false; } + @Override public boolean getAir(int aX, int aY, int aZ) { return this.worldObj.getBlock(aX, aY, aZ).equals(Blocks.air); } + @Override public boolean getAirOffset(int aX, int aY, int aZ) { return getAir(this.xCoord + aX, this.yCoord + aY, this.zCoord + aZ); } + @Override public boolean getAirAtSide(byte aSide) { return getAirAtSideAndDistance(aSide, 1); } + @Override public boolean getAirAtSideAndDistance(byte aSide, int aDistance) { return getAir(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); } + @Override public BiomeGenBase getBiome() { return this.worldObj.getBiomeGenForCoords(this.xCoord, this.zCoord); } + @Override public BiomeGenBase getBiome(int aX, int aZ) { return this.worldObj.getBiomeGenForCoords(aX, aZ); } + @Override public int getOffsetX(byte aSide, int aMultiplier) { return this.xCoord + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier; } + @Override public short getOffsetY(byte aSide, int aMultiplier) { return (short) (this.yCoord + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier); } + @Override public int getOffsetZ(byte aSide, int aMultiplier) { return this.zCoord + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier; } + @Override public boolean isDead() { return this.dead; } + @Override public void sendBlockEvent(byte aID, byte aValue) { GT_Values.NW.sendPacketToAllPlayersInRange( this.worldObj, @@ -760,29 +864,63 @@ public class TileEntitySolarBase extends TileEntityEMT this.zCoord); } + @Override public long getTimer() { return this.timer; } + @Override public void setLightValue(byte aLightValue) {} + @Override public boolean isInvalidTileEntity() { return this.tileEntityInvalid; } - public boolean openGUI(EntityPlayer aPlayer, int aID) { - return false; - } - - public boolean openGUI(EntityPlayer aPlayer) { - return false; - } - + @Override public boolean outputsEnergyTo(byte b, boolean b1) { return true; } + @Override public boolean inputEnergyFrom(byte b, boolean b1) { return false; } + + @Override + public ModularWindow createWindow(UIBuildContext buildContext) { + ModularWindow.Builder builder = ModularWindow.builder(176, 107); + builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); + + builder.widget(new TextWidget( + new Text(getInventoryName()).color(0x64fc06).shadow()) + .setPos(9, 9)) + .widget(new ProgressBar() + .setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_25, EMT_UITextures.PICTURE_GAUGE_SOLAR, 25) + .setProgress(() -> (float) storage / this.maxstorage) + .setSynced(false, false) + .setPos(9, 24) + .setSize(25, 11)) + .widget(new ProgressBar() + .setTexture(EMT_UITextures.PICTURE_GAUGE_EMPTY_11, EMT_UITextures.PICTURE_SOLAR_INDICATOR, 11) + .setProgress(() -> generating > 9 ? 1f : 0f) + .setSynced(false, false) + .setPos(9, 43) + .setSize(11, 11)) + .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("emt.Storage") + + EMTTextHelper.formatNumber(storage) + "/" + + EMTTextHelper.formatNumber(maxstorage) + "EU") + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 22)) + .widget(new FakeSyncWidget.LongSyncer(() -> storage, val -> storage = val)) + .widget(TextWidget.dynamicString( + () -> StatCollector.translateToLocal("emt.Generating") + generating + " EU/t") + .setSynced(false) + .setDefaultColor(0) + .setPos(36, 35)) + .widget(new FakeSyncWidget.DoubleSyncer(() -> generating, val -> generating = val)); + + return builder.build(); + } } diff --git a/src/main/java/emt/util/EMTCreativeTab.java b/src/main/java/emt/util/EMTCreativeTab.java index d895c0c..e86c749 100644 --- a/src/main/java/emt/util/EMTCreativeTab.java +++ b/src/main/java/emt/util/EMTCreativeTab.java @@ -8,22 +8,10 @@ public class EMTCreativeTab extends CreativeTabs { public EMTCreativeTab(String tabLabel) { super(tabLabel); - // setBackgroundImageName("emt.png"); } @Override public Item getTabIconItem() { return EMTItems.electricThorHammer; } - - /* - @Override - public boolean hasSearchBar() { - return true; - } - - @Override - public int getSearchbarWidth() { - return 60; - }*/ } diff --git a/src/main/java/emt/util/EMTTextHelper.java b/src/main/java/emt/util/EMTTextHelper.java index b8336e7..b0f46be 100644 --- a/src/main/java/emt/util/EMTTextHelper.java +++ b/src/main/java/emt/util/EMTTextHelper.java @@ -42,4 +42,16 @@ public class EMTTextHelper { public static String localize(String key) { return StatCollector.translateToLocal(key); } + + public static String formatNumber(long number) { + if (number < 10_000) { + return String.valueOf(number); + } else if (number < 10_000_000) { + return (number / 1000) + "k"; + } else if (number < 1_000_000_000) { + return (number / 1_000_000) + "M"; + } else { + return (number / 1_000_000_000) + "G"; + } + } } diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang index a5bbc54..ac764f8 100644 --- a/src/main/resources/assets/emt/lang/en_US.lang +++ b/src/main/resources/assets/emt/lang/en_US.lang @@ -18,6 +18,7 @@ emt.PressShift= emt.Generating=Generating: emt.Fuel=Fuel emt.OutputMax=Output at Max: +emt.remaining_second=Remaining seconds: #=============Tooltips============= #This comes after a player name. The 's is depicting ownership. diff --git a/src/main/resources/assets/emt/textures/guis/etherealmacerator.png b/src/main/resources/assets/emt/textures/guis/etherealmacerator.png deleted file mode 100644 index ac677d83c8ae306399364f652281a6bd53bc4a46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16004 zcmeI3Yj6|S6~~YKAYdNB&=x|WRs<=KMBbIKY-ueC5etwr$hfvMm;{Q~tF^sgX@#`L z!o;yi%M3IPk4%!n6dWftkB}CeHVK4M>`4=7m}F82G!BsB0n!%2qdZcaCXIWqB+J)E z;wByXZFfeyN9X>}IrskVL;A97ii>6s&lr~h0K*Gi&Jq9(GBq%G5PB>K?5IMIA%55V zAi#*X@kjIA10%i+}(l`G}$Ih-JSvw4qPDQ1VfexwGlP7nEcVTq_{E5&NbXVYEz zeY;L8d2G6QCO7N$7l<{It05qkHWZZ!4NC-zM>pM`VGVI8fmc*`ZOB{e3vwZwE|Ql+ zHg+>QZA79hvFT>ug4%L-v9>@Ch+0#&NiVQQgEr5SZ7}6n42B1_M%FNmF|dr$qBj`0 zoIK8utBqYcdj_(s0Z$cI;+z#LhrZc#HHzZr7^c3yKD&Newj8Kt3>J%pVU3K@s7DHY zaJf(6Lwa9uVl+u_9;X--0+L^mWS?|-qJ5f`N#rJ?B8!YG^aT~( zCy0ekJ91=8l7}-Jr19SZdF=OihH}l6r1HLWdk*OK5QKzio*GX>KXyl7eVyE+>{OTDXy8tW;du-`m?z zD@BeYKOYE+c(d7by}K=be#MU`9242J953L5%r4-)AbPA!KW|^R;*qg1>3^NTXnrC* zd5!uS(RaHI6-^aUB~KERtCV^^AkL^pYl5=PqY3**49sk0@R?sL^`C>NxBt}iF4kM8 z(u$8V4lM)JB|d`RU}bLc^;M4Q%kgy9)rwj_+4 zpEQzaiA6>yi})Fj%w^Pz{v@FPCrtbgO8;q&?}9sQ^bP3_CnnRWMMxS{Tg631L<&?~ zBn_&q;-VrV1u8C*2Gv$^Q4x^>6&Fc^YOA=Yh)98oi=;udRa{g=q(H?*(xBQZE-E5Y zpyDEFP;C_#6%i>=agj8rwu+02h!m)}NE%dI#YII#3RGMq4XUl;q9P&%DlU=+)mCv) z5s?BF7fFL^tGK9$NP&urq(QY+TvSA)K*dGUpxP=fDk4&#;v#8KZ50<45h+k{ku<2b zii?Vf6sWjJ8dO`wMMXpkR9qwts;%OpA|eGUE|Lb-R&h}gkpdMLNrP(N7FR~!D}SO7 zz2{etUg&FTzWf1t8Bi;@O56Yq_W^`|0`Nr-dY%WUV*xHy0B{=t#>mesdS@0u`k6xK zjIz*)i=WI0yfSO-sv}MFe*M!=J4d(Q^Vz7Ai|0PL>8*;E;|<$>`Kz7swfo;(I$qJe zTatg~%ja7kZa8&t=^V?}XDeS>z1r5a@O|6muYA7OPaW9xk!z}^1z^{dJv)78&GwPt z;33fd;?bU+SH3)Uv+-xE)51@}-o0r6F4Qml*i^Uhrt(MBJJ|W%Fh90=@%eqoofclC z+53qPX{;%z33?XYBb>U%xIAjPq2x8}X9cQ0xx&cEY;!LVu3>Hl0|mS*_R z=cQa~ymurNwQ3yclT&QhiyT){YsQA#_oqTj^PZFyS*YiJ9`@gjhk&o}qfNsGM@@9! zmC~`{smAe#7Fsfqvu0%2HrPCB7_!EOf1ZC=T$bEee|`Rq)ApzFE2J&=!nQ>p-k7s* zbJO?G*YI@nhHW|U*zD4LoO?%i&P!jsoV%iF>Z;Kz-nZqLuU+8(H20gOB`WTJKfjrQEQsbWYHC;|E z{Nv0z_;I7Icz^dG&~&{$H~N+=04|;Q3Lnfrx%(kh_gv->v<J_v+1KD%?)dSw6Sk+!%W$m8I@|f`*+XGy6HvFm$qfVR7=aV!8>5Y2!H;8$VE(eb-Z4#zSW2^aF1m{WulT*69|M1^(X7!qv~+&n=z;#Ss2W zPx^ft$0(Q-xk2|2U9dh43jZIsA#h+wZ=t@Dcgji$PXbrsTkC~?kB7q>_MCcRXv-8t P4hm-$Id?r&@#KF26pA$2 diff --git a/src/main/resources/assets/emt/textures/guis/generator.png b/src/main/resources/assets/emt/textures/guis/generator.png deleted file mode 100644 index 6f27604531b285c36f9e21dd2cfb48651dcbee5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2126 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fn+H>=ES4z)+>iz|hdl!0_`w zkbcR)P-?)y@G60U!DEMV4}2gN^gul5 zky!8}@!*$YL9axDUx|ji5=*|Noq9_z>!xY$ZOf&nt5zMWU3#s2>7|P0_p4T3s9trg zZpq_{rLW6ZKCkZS=~=h4aox`5&D&cy?rC0stZCh;=JjWqx18$Q_^9>h(WA$X9Rqr8 z6pV%d{tyT#Qp^KoqLLuL;Qu2VFa&>R2bLQQoCO|{#S9F5J3*Ln2b=hQprB-lYeY$K zep*R+Vo@qXL1JcJiC$i6iGqoqfu51!M}^F(z!GJ;r;B4qMcmsNk>Qse7~Hr;x3VV3 zF5rsV+O;KBB<59{^t=E6`H!mXb;!QGM;Ra^d9vhtZlA3o=1F0df>O&nxpq|+%M-F*)HYZ%l8}2Id8;LQTf^}W4-;W*7FztUWnW;$2NTt`@`5H z1$L(e9z00b-eSJ1IZ^pl>$&fFFU%LseRw#V=lN!t*$LWrS$;2+^WFlxcXa$HV@^{6N0V5ePj*tYvAr-wrF53xZC=Wf$zYbsRtOnI49J;na%o` zd&wS#o9*`}zjvIYQ7bJIy+6Klu9vREsTbJ_9BeZpfLzVorsO$uJ8YTm{9F7rT|J6X zP5%EI4dDjygv$o|98Pf-G!`<2bk zFibnjxIu@nA+?Y}r<*w;QikF5qfx0;L4JYb^^C>I93SgLI46LLLQhvemvv4FO#s`a B8sPu{ diff --git a/src/main/resources/assets/emt/textures/guis/overlay_slot/fusion_crafter.png b/src/main/resources/assets/emt/textures/guis/overlay_slot/fusion_crafter.png new file mode 100644 index 0000000000000000000000000000000000000000..e08a173166f751467a8d422f8b331bd1ddf74fde GIT binary patch literal 2885 zcmV-L3%c})P)uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u0E$UOK~y-)wbM}w1R)3p;D2QA6yh~H zO1J1-(XpI|A&A*Z!CfJcu#YmlQc8$M&KaMPM52@e!jHm)L_|eIL(mLZ7c9>$n>`;qApoA~ j_hO-;bw{lgsv2H58&G&XK}QoK00000NkvXXu0mjfmfwVy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/emt/textures/guis/overlay_slot/wand.png b/src/main/resources/assets/emt/textures/guis/overlay_slot/wand.png new file mode 100644 index 0000000000000000000000000000000000000000..285cb03900a32a3d01ff722015ed79405f339d15 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheQcoAh5R21mFW=@ppuoWzkh5!2 zqM%zMw|lY1uhdI!A#!^=JLAH2jT>Y=|M8&dFmi2yQnw;TOVt=~S6=*zzr>mdKI;Vst06J|l>i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/emt/textures/guis/picture/gauge_empty_25.png b/src/main/resources/assets/emt/textures/guis/picture/gauge_empty_25.png new file mode 100644 index 0000000000000000000000000000000000000000..cb006e2bd5a362b46a6010111e61a8b49f63e2f4 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^l0eMO!3HF|zN>u(QrVs^jv*GOw@$vudBA|fML$+` z|HEyC{{!E+YwCJ#;W8~?x$?PFk+)&d51HZx{Cch`chv;@CxtNFI$pZJ^!b{K3(Q-; zuzEbnIkD#M6-R%|2aOfl8yGnI+JEp?cM|x+RY*mcA}u`MkQPr)S;H#&tWJH*as9-RNdI_C?2#&I{uOu7w_qMcUO)6eLSt(9_-eU@vw}2-mSZFc^tdZuG1Tq zMXz|lwarasPLNAQ((!_zz3(@i%1lm) rs~`OA_~1Y1wyENG&dP000XJ1^@s6iuWe-0005MNklK&coQM=Du)LE0f+*{NESErvpqTS42d3R@h}c8V1xFJTC1P z=wEhLii`nZr?3mEWOFYWkA|qOhLOz|Ek;BF-1W~ks!F%>ebGMvym(Wg+dhpvTUANB z1-k7s0In{6M93@EL$1zS>*HD$gc||0zj;;(z^n3G0Q#4mh;jhm_W|&l$IRz*+oya` z3rNHmM8pD@vG4m9{JL_$*_ThuXEUo@RhfnIa15}Wb!mO|g1gz@TPoGVh-xtgv-lFp z6sO(?0GwFN*6i2b6IPB;l>wdshtz7b6b$Tr)oTGH uk5k*6d~8MpsVX8uu~b3o_4=Lv@&5pz2iKG9&@H6^0000oq=l#CF zDBbYlf`cp8oLVm;kf5i_@TPdLN>rJjh1G^wv8O9H_MJX?hiA{p4AIAY?pwc}Q{S4E}H-V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/emt/textures/guis/solar.png b/src/main/resources/assets/emt/textures/guis/solar.png deleted file mode 100644 index 41a65c0c840826654bceecf34f66f4b4c8c2c286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1845 zcmdT_YfMvT82&nz!jM|yA`ELmG#aB)WXeqis)B--qN1QcDOf25L%#d&iNh*zk%WAUE(L(^7TL%F9YXGJVa2*C9WeWf! zVE}Bu3V>C@kEHg!F!r-VpOeV|EEO1E#42v^F8I)z=6!BSRSJGTHiJ0h%JedJ?r9VAE4pElU3QDj}}L$-2@?mJnqg=Cptw*qgGsSB0r)leEN zG8#s=OB|LaAVdY}iOtj^=Ig9>3fJ>)zj}Z~C%=+Hewun)0rlCY(*(4ZeE8AKoU39k z5B;4An=#Xw$kJ@-^R+rTQrm#UGtIuReM5vS!!!s|?3k`cXOG8#y!+FM=^{lYn@X@a zUoRR7Z@i4F5>t{<>?yl2$+OA^$z?CW1%gGNZ)Ivt5I0`JW_K?dtIA^h$r39%M2p>x> ztL4syBiIy}k_*QByujaYYZu))+&!Ur z&d=WHTM_}H7i9R^SA34udg?9+Og{v4_s&u&A7H8veR!K6Y1rEe{;DwUn0F!UJfv=V ztqHzqQNTDlGQVoFIF8bB>m#`S4}pD5YGvItiX9YaUm<2d_lO?pJmcn*AtuoyjwiMZ j7;%Sx2mh0YO(<}MTs+iRrg?O#-YDAFo8VQkJM8@5UP3ux diff --git a/src/main/resources/assets/emt/textures/guis/wandcharger.png b/src/main/resources/assets/emt/textures/guis/wandcharger.png deleted file mode 100644 index 137d7817d2f2e52a91a2745bf299c37c20507b48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15672 zcmeI3Z)_Xo9mgN1rX*o>=_X3Fk#TY~i9((8UE(-C9Fs0?n?M~xnn7A^!{_rQxz+Yv zeHYuQHuW^Lp$$f(j;Yl)216hrF(#0<6>VMXPOF%-7YH`0s#FkEUN9&$LI^soDf>Nl zj{VrN`@oc!kCo*4`FXy-KhNj+lY4VN9v|CrefwA15kl9Gj>IMq@_^|W; zXxfaC-6ldC{(^r!JN~=y96|$|w8<%JD!x-v^h}SO(vxaWF=K!lp~xLYLss^x7ME0K zwCteo;-63WI4w2kyDu0I#EoHfRvX!$Q+Mqjn^gAiRl+IX9ntnkQGx&&)snelCY?2< z;-JroD}jx>c^~IUti6N2tvDe!6(8q@^_}0!h*1c69YmoF9dio z>=y*7FC+>5T>0aRwu2SPrKY8c*!FTd_%`U9wJby8`9h)4Q|Rr{b2GdU4u|=G$cv&M z6n=9)Ysp1_*6enJti*|_rjpYPOVhI)jw>hiIcw18!-*=N^1L!eB~jKavjd8JQ8sv? zC%`vyN+}f|V=k9=N=qrcnpQJv)-u6QXy|9m>XvTK>P=EshMOjaHHpV7xf|A-$uvxD zTHEq~pp3Mkr#U%qsQiR#>T@|o-Ij-`bT^v4rA=2CrzR2}XvCCsJqL?R}gZ;!`ve|{I{4yo(tTCvn6Av>BT^2X`kbK& z_f?_q&S`MH$!S7^tN*+y8iZMuYD6<(Q_d5c6}GH%f$dWF)%LCoq&4RvGUS}8;$t@G zTRCTyo2zm$VISwXO0t5lu&9Dhftrf&HNDlcDxPIG?f+dsH$LIsJV#+x&0g&&xuG0Y z^B|@^Z58C4x^)Kj1m%Fc0c$<#BS(0A+o!eKHE?@tmu6+Nu3pLrzQiQh22hgh;1?qN zs=jJwS3iZ9Gd<_%!@+^xJ`w)g!Kds>4%fTxzPc+pT<==-{AO0OqHqMALhHH-FMQLw zH^MG>C{UyQ!C-GN!q<1#dyH#EH9Zy6;OLroLyE!vvQzy?L(kn!J&BRBr@L6hKX7L) z-ClS+fF~2a@@P`K%#~BH#zu8YYaEyi$C8jVs5ZkzMMMf1E|Lb-X1J(`NCCq|(xBQ5 z7ZnjHV7N#cRGZS;h)4m$MbeOsQg* zYBO9^M5KV>B56=Q4x^>hKr;@wHYodB2vI`ku<0_!$n0z3K%Yu z2GwS`sE9}b!$s1d+6)&J5h-A}NE%f8s<_&#FZ-!kc*Cy%ukyX~%9nowuK{w($V42W z{a;7OegL8WdWA(>wH+bvuSR2ACyQq&Kq%{r*obS=*tnmA;g&UM9{78>@KEc^6UdwR z7mCFWpZ>+nW*oNFMqlW%_dJV@-*(!2-Wx;SA+%|E!{V$L3~%De$2~Xw6iTtt&X0#n z-5WcQr^9YLaNW{(-SJoNUw8aV9uIUMxpWa-`H3sN^5D>kZQu@}F5Ojn+y|53&_kCu zFBRMXKfJ=*7xD1r84mlpKb@zSulZp4!!6egA@Ie+wT+{~RUyw1>bPnHyg`ivf0o96 zVcmlH!KRJ*3)cIsrLV5**!b-|dz~*fItOv7iFzYgu}2`Q|4+`Nt!V{hId}-3wizmNxq!%74#W9>?A#*c5d! z8m9pWkPs5ol~;-f^XFRM-p++yJF~BQ;UGF5{KNTf8x0)EL+Ll|#PitjVi(Nl+H=@{ zT^8n4@*IWw7VXzzsz&L39Q6h0NW6p|rc*fidt6Q8EUqSitEm>hcyHq98)x_3_WW%pOFvIk4#uY+ zeRy4I-gBmV>9Xqsc;ui5MSj`8eE1cs1Hor>+gR*(-$?x6e_^_-Gynhq diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png deleted file mode 100644 index de5986d0f95efc31d4e5910bc2a2f528c8cbb713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5094 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 D5OW?N diff --git a/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_emt.png b/src/main/resources/assets/minecraft/textures/gui/container/creative_inventory/tab_emt.png deleted file mode 100644 index a9759017c0294b3d96f39f010a77f8cd29fc7c03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18682 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