diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-04-19 19:17:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 19:17:49 +0200 |
| commit | c7edae3460915e0a3b9173d9cf4b188f1b0a91a7 (patch) | |
| tree | 9a0c0c9506e15ed5401a01746c49dbe48ca1e625 | |
| parent | 8217c7f13cbdfa7341773ae9725b8e650392b32d (diff) | |
| parent | 0428dcaa50cbaac66f78f184142c7ad72ca420b2 (diff) | |
| download | GT5-Unofficial-c7edae3460915e0a3b9173d9cf4b188f1b0a91a7.tar.gz GT5-Unofficial-c7edae3460915e0a3b9173d9cf4b188f1b0a91a7.tar.bz2 GT5-Unofficial-c7edae3460915e0a3b9173d9cf4b188f1b0a91a7.zip | |
Merge pull request #190 from GTNewHorizons/cleanup
Cleanup
100 files changed, 548 insertions, 804 deletions
diff --git a/build.gradle b/build.gradle index 927ed20fdb..f82d369676 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1678003329 +//version: 1681680742 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -65,22 +65,23 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false - id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle + id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version + id 'com.palantir.git-version' version '3.0.0' apply false id 'de.undercouch.download' version '5.3.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3' + id 'com.gtnewhorizons.retrofuturagradle' version '1.2.5' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -160,6 +161,14 @@ java { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -193,6 +202,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -397,8 +414,6 @@ minecraft { extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -513,14 +528,6 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } - } - } maven { name 'sonatype' url 'https://oss.sonatype.org/content/repositories/snapshots/' @@ -559,29 +566,49 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.6" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.13') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -695,13 +722,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.1.35' + def lwjgl3ifyVersion = '1.3.3' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.40') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -793,10 +820,6 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 } this.classpath(project.java17DependenciesCfg) - - if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) { - this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") - } } } @@ -1006,6 +1029,7 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] @@ -1125,7 +1149,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -1169,7 +1193,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) @@ -1204,7 +1228,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.1" +def buildscriptGradleVersion = "8.0.2" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1373,7 +1397,7 @@ static int replaceParams(File file, Map<String, String> params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1415,11 +1439,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1427,34 +1447,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1462,50 +1455,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) -} - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() + return dependencies.rfg.deobf(files(obfFile)) } - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/gradle.properties b/gradle.properties index 7625dfe249..64768ac51a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,40 +15,61 @@ autoUpdateBuildScript = false minecraftVersion = 1.7.10 forgeVersion = 10.13.4.1614 -# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you +# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task. +channel = stable +mappingsVersion = 12 + +# Define other MCP mappings for dependency deobfuscation +remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ + +# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you # restart Minecraft in development. Choose this dependent on your mod: # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty developmentEnvironmentUserName = Developer -# Define a source file of your project with: -# public static final String VERSION = "GRADLETOKEN_VERSION"; -# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's -# version in @Mod([...], version = VERSION, [...]) -# Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = Reference.java +# Enables using modern java syntax (up to version 17) via Jabel, while still targetting JVM 8. +# See https://github.com/bsideup/jabel for details on how this works. +enableModernJavaSyntax = true + +# Enables injecting missing generics into the decompiled source code for a better coding experience +# Turns most publically visible List, Map, etc. into proper List<Type>, Map<K, V> types +enableGenericInjection = true + +# Generate a class with String fields for the mod id, name, version and group name named with the fields below +generateGradleTokenClass = com.github.technus.tectech.Tags gradleTokenModId = gradleTokenModName = -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION gradleTokenGroupName = +# [DEPRECATED] +# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java +# public static final String VERSION = "GRADLETOKEN_VERSION"; +# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's +# version in @Mod([...], version = VERSION, [...]) +# Leave these properties empty to skip individual token replacements +replaceGradleTokenInFile = -# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can +# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. # Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api apiPackage = -# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/ -# Example value: mymodid_at.cfg +# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ +# There can be multiple files in a comma-separated list. +# Example value: mymodid_at.cfg,nei_at.cfg accessTransformersFile = tectech_at.cfg # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false +# Adds some debug arguments like verbose output and export +usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! -# This parameter is for legacy compatability only +# This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin coreModClass = # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class @@ -58,10 +79,65 @@ containsMixinsAndOrCoreModOnly = false # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. forceEnableMixins = true -# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your +# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. usesShadowedDependencies = true +# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access +# their own classes, making the minimization unreliable. +minimizeShadowedDependencies = true +# If disabled, won't rename the shadowed classes. +relocateShadowedDependencies = true + +# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories +includeWellKnownRepositories = true + +# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token. + +# The project's ID on Modrinth. Can be either the slug or the ID. +# Leave this empty if you don't want to publish on Modrinth. +modrinthProjectId = + +# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. +# Syntax: scope1-type1:name1;scope2-type2:name2;... +# Where scope can be one of [required, optional, incompatible, embedded], +# type can be one of [project, version], +# and the name is the Modrinth project or version slug/id of the other mod. +# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech +# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +modrinthRelations = + + +# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. + +# The project's numeric ID on CurseForge. You can find this in the About Project box. +# Leave this empty if you don't want to publish on CurseForge. +curseForgeProjectId = + +# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. +# Syntax: type1:name1;type2:name2;... +# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], +# and the name is the CurseForge project slug of the other mod. +# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft +# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +curseForgeRelations = + # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older # projects. New projects should not use this parameter. customArchiveBaseName = TecTech + +# Optional parameter to prevent the source code from being published +# noPublishedSources = + +# Uncomment this to disable spotless checks +# This should only be uncommented to keep it easier to sync with upstream/other forks. +# That is, if there is no other active fork/upstream, NEVER change this. +# disableSpotless = true + +# Override the IDEA build type. Valid value is "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" +# (force use delegated build). +# This is meant to be set in $HOME/.gradle/gradle.properties. +# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be always native build. +# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want! +# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you. +# ideaOverrideBuildType = idea diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java index e343b9fc77..928a4a4e0f 100644 --- a/src/main/java/com/github/technus/tectech/Reference.java +++ b/src/main/java/com/github/technus/tectech/Reference.java @@ -6,7 +6,7 @@ public final class Reference { public static final String MODID = Mods.Names.TECTECH; public static final String NAME = "TecTech - Tec Technology!"; - public static final String VERSION = "GRADLETOKEN_VERSION"; + public static final String VERSION = Tags.VERSION; public static final String COLLECTIONNAME = "TecTech"; public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index ae49064f64..ee68c7123f 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -195,7 +195,7 @@ public class TecTech { } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection<?> c) { return false; } @@ -203,20 +203,21 @@ public class TecTech { public void clear() {} @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection<?> c) { return false; } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection<?> c) { return false; } @Override - public boolean containsAll(Collection c) { + public boolean containsAll(Collection<?> c) { return false; } + @SuppressWarnings("unchecked") @Override public Object[] toArray(Object[] a) { return new Object[0]; diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index f141c52091..4a1a350196 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -22,7 +22,7 @@ public class TurretBaseItemEM extends ItemBlock { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List<String> list, boolean p_77624_4_) { list.add(CommonValues.TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + translateToLocal("tooptip.energy.label") + "--"); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index 46dfa94e57..f32029460b 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -26,7 +26,7 @@ public class TurretHeadItemEM extends ItemBlock { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List<String> list, boolean p_77624_4_) { list.add(TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + translateToLocal("tooltip.info") + "--"); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java index 45592244c3..fdffd31001 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java @@ -16,7 +16,7 @@ import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; /** @@ -94,7 +94,7 @@ public class projectileEM extends LaserProjectile { && hitBlock.getMaterial().isSolid()) { GT_Utility.sendSoundToPlayers( worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1.0F, movingobjectposition.blockX, @@ -147,7 +147,7 @@ public class projectileEM extends LaserProjectile { if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) { GT_Utility.sendSoundToPlayers( worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1.0F, (int) movingobjectposition.entityHit.posX, @@ -165,6 +165,8 @@ public class projectileEM extends LaserProjectile { true); } break; + default: + break; } } setDead(); diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java index 47bba94c2e..d03f57bb76 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java @@ -70,7 +70,8 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity { } private EMInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) { - hatch.updateTexture((byte) 8, (byte) 4); + hatch.onValueUpdate((byte) 4); + hatch.onTexturePageUpdate((byte) 8); return hatch.getContentHandler(); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java index 26e70e095b..3e2181d041 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java @@ -32,10 +32,6 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate { this(true, new EMConstantStackMap(aspects)); } - private EMComplexAspectDefinition(boolean check, EMDefinitionStack... aspects) throws EMException { - this(check, new EMConstantStackMap(aspects)); - } - public EMComplexAspectDefinition(EMConstantStackMap aspects) throws EMException { this(true, aspects); } diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 1dce2f4848..4fcfd42b05 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -9,9 +9,6 @@ import static com.github.technus.tectech.TecTech.proxy; import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat; import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; -import static gregtech.api.enums.GT_Values.W; -import static gregtech.api.enums.Mods.ElectroMagicTools; -import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TwilightForest; @@ -20,7 +17,6 @@ import java.util.Collection; import java.util.HashMap; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -49,10 +45,10 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +@SuppressWarnings("deprecation") public final class MainLoader { public static DamageSource microwaving, elementalPollution, subspace; @@ -166,78 +162,6 @@ public final class MainLoader { ProgressManager.pop(progressBarPostLoad); } - private static void registerExtraHazmats() { - ItemStack EMT_iqC = GT_ModHandler.getModItem(ElectroMagicTools.ID, "itemArmorQuantumChestplate", 1, W); - ItemStack GRAVI_gC = GT_ModHandler.getModItem(GraviSuite.ID, "graviChestPlate", 1, W); - ItemStack GRAVI_anC = GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, W); - - ItemStack IC2_qH = GT_ModHandler.getIC2Item("quantumHelmet", 1L, W); - ItemStack IC2_qC = GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, W); - ItemStack IC2_qL = GT_ModHandler.getIC2Item("quantumLeggings", 1L, W); - ItemStack IC2_qB = GT_ModHandler.getIC2Item("quantumBoots", 1L, W); - - ItemStack IC2_nH = GT_ModHandler.getIC2Item("nanoHelmet", 1L, W); - ItemStack IC2_nC = GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, W); - ItemStack IC2_nL = GT_ModHandler.getIC2Item("nanoLeggings", 1L, W); - ItemStack IC2_nB = GT_ModHandler.getIC2Item("nanoBoots", 1L, W); - - GregTech_API.sFrostHazmatList.add(EMT_iqC); - GregTech_API.sFrostHazmatList.add(GRAVI_gC); - GregTech_API.sFrostHazmatList.add(IC2_qH); - GregTech_API.sFrostHazmatList.add(IC2_qC); - GregTech_API.sFrostHazmatList.add(IC2_qL); - GregTech_API.sFrostHazmatList.add(IC2_qB); - - GregTech_API.sHeatHazmatList.add(EMT_iqC); - GregTech_API.sHeatHazmatList.add(GRAVI_gC); - GregTech_API.sHeatHazmatList.add(IC2_qH); - GregTech_API.sHeatHazmatList.add(IC2_qC); - GregTech_API.sHeatHazmatList.add(IC2_qL); - GregTech_API.sHeatHazmatList.add(IC2_qB); - - GregTech_API.sBioHazmatList.add(EMT_iqC); - GregTech_API.sBioHazmatList.add(GRAVI_gC); - GregTech_API.sBioHazmatList.add(IC2_qH); - GregTech_API.sBioHazmatList.add(IC2_qC); - GregTech_API.sBioHazmatList.add(IC2_qL); - GregTech_API.sBioHazmatList.add(IC2_qB); - - GregTech_API.sBioHazmatList.add(GRAVI_anC); - GregTech_API.sBioHazmatList.add(IC2_nH); - GregTech_API.sBioHazmatList.add(IC2_nC); - GregTech_API.sBioHazmatList.add(IC2_nL); - GregTech_API.sBioHazmatList.add(IC2_nB); - - GregTech_API.sGasHazmatList.add(EMT_iqC); - GregTech_API.sGasHazmatList.add(GRAVI_gC); - GregTech_API.sGasHazmatList.add(IC2_qH); - GregTech_API.sGasHazmatList.add(IC2_qC); - GregTech_API.sGasHazmatList.add(IC2_qL); - GregTech_API.sGasHazmatList.add(IC2_qB); - - GregTech_API.sGasHazmatList.add(GRAVI_anC); - GregTech_API.sGasHazmatList.add(IC2_nH); - GregTech_API.sGasHazmatList.add(IC2_nC); - GregTech_API.sGasHazmatList.add(IC2_nL); - GregTech_API.sGasHazmatList.add(IC2_nB); - - GregTech_API.sRadioHazmatList.add(EMT_iqC); - GregTech_API.sRadioHazmatList.add(GRAVI_gC); - GregTech_API.sRadioHazmatList.add(IC2_qH); - GregTech_API.sRadioHazmatList.add(IC2_qC); - GregTech_API.sRadioHazmatList.add(IC2_qL); - GregTech_API.sRadioHazmatList.add(IC2_qB); - - GregTech_API.sElectroHazmatList.add(EMT_iqC); - GregTech_API.sElectroHazmatList.add(GRAVI_gC); - GregTech_API.sElectroHazmatList.add(IC2_qH); - GregTech_API.sElectroHazmatList.add(IC2_qC); - GregTech_API.sElectroHazmatList.add(IC2_qL); - GregTech_API.sElectroHazmatList.add(IC2_qB); - - // todo add GC GS stuff - } - public static void addAfterGregTechPostLoadRunner() { GregTech_API.sAfterGTPostload.add(() -> { if (TecTech.configTecTech.NERF_FUSION) { diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java index 0166c2302d..9c4a9d4ae6 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; @@ -25,7 +26,7 @@ public class CreativeTabTecTech extends CreativeTabs { } @Override - public void displayAllReleventItems(List stuffToShow) { + public void displayAllReleventItems(List<ItemStack> stuffToShow) { for (CustomItemList item : CustomItemList.values()) { if (item.hasBeenSet() && item.getBlock() == GregTech_API.sBlockMachines) { stuffToShow.add(item.get(1)); diff --git a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java index 637ac7b181..0768592d03 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java @@ -1,9 +1,9 @@ package com.github.technus.tectech.loader.gui; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.github.technus.tectech.thing.item.gui.ProgrammerScreen; import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; import cpw.mods.fml.common.network.IGuiHandler; @@ -25,7 +25,7 @@ public class ModGuiHandler implements IGuiHandler { if (ID == SCAN_DISPLAY_SCREEN_ID) { return new ScanDisplayScreen(player); } else if (ID == PROGRAMMER_DISPLAY_SCREEN_ID) { - return new ProgrammerScreen(player); + return new GuiScreen(); } return null; } diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java index f1332bd2cf..f5caf493e2 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java @@ -34,7 +34,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex. import com.github.technus.tectech.util.TT_Utility; import cpw.mods.fml.common.gameevent.TickEvent; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Utility; @@ -141,7 +141,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } GT_Utility.sendSoundToPlayers( other.worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, (int) other.posX, @@ -149,7 +149,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { (int) other.posZ); GT_Utility.sendSoundToPlayers( player.worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, (int) player.posX, @@ -200,7 +200,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } GT_Utility.sendSoundToPlayers( a.worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, (a.xPosition << 4) + x, @@ -217,7 +217,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler { } GT_Utility.sendSoundToPlayers( b.worldObj, - GregTech_API.sSoundList.get(209), + SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, (b.xPosition << 4) + x, diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java index 7de3238cff..b152a0c008 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java +++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataHandler.java @@ -87,7 +87,7 @@ public class ChunkDataHandler { } else if (!chunkMemory.isLoaded) { chunkMemory.isLoaded = true; - Set<String> tagsDuplicated = new HashSet(loadedKeys); + Set<String> tagsDuplicated = new HashSet<>(loadedKeys); tagsDuplicated.retainAll(chunkMemory.data.func_150296_c()); if (tagsDuplicated.isEmpty()) { @@ -204,7 +204,7 @@ public class ChunkDataHandler { public void registerChunkMetaDataHandler(IChunkMetaDataHandler handler) { metaDataHandlerHashMap.put(handler.getTagName(), handler); dimensionWiseMetaChunkData.put(handler.getTagName(), new HashMap<>()); - Class clazz = handler.getClass(); + Class<?> clazz = handler.getClass(); try { if (clazz.getMethod("tickServer", HashMap.class, TickEvent.ServerTickEvent.class).getDeclaringClass() != IChunkMetaDataHandler.class) { @@ -339,6 +339,7 @@ public class ChunkDataHandler { return storageMeta.get(key); } + @SuppressWarnings("unlikely-arg-type") @Override public void clear() { storageMeta.entrySet().forEach(this::remove); diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java index 5c6b78993c..ad0b2d5d84 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java @@ -5,6 +5,8 @@ package com.github.technus.tectech.mechanics.elementalMatter.core; */ public final class EMException extends RuntimeException { + private static final long serialVersionUID = 8030521803764577214L; + public EMException(String message) { super(message); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java index eb1fa33e11..4fdffc790e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java @@ -30,6 +30,7 @@ abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> { @Override public abstract EMStackMap<T> clone(); + @SuppressWarnings("unchecked") @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java index 5f571ac510..e83d59186f 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java @@ -30,6 +30,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> { return removeAmount(def, amountToConsume, amountRequired); } + @SuppressWarnings("unchecked") default boolean removeAmount(IEMDefinition def, double amountToConsume, double amountRequired) { T current = get(def); if (current != null) { @@ -85,6 +86,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> { * @param stack thing to put * @return new mapping or null if merging actually removed stuff */ + @SuppressWarnings("unchecked") default T putUnify(T stack) { T target = get(stack.getDefinition()); if (target == null) { @@ -102,7 +104,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> { } } - default void putUnifyAll(T... defs) { + default void putUnifyAll(@SuppressWarnings("unchecked") T... defs) { for (T def : defs) { putUnify(def); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java index 342d8b3645..89c02774a2 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java @@ -62,7 +62,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe); } - default void putReplaceAll(T... defStacksUnsafe) { + default void putReplaceAll(@SuppressWarnings("unchecked") T... defStacksUnsafe) { for (T defStack : defStacksUnsafe) { putReplace(defStack); } @@ -89,6 +89,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { * @param amountToConsume * @return */ + @SuppressWarnings("unchecked") default boolean removeAmountExact(IEMDefinition def, double amountToConsume) { T current = get(def); if (current != null) { @@ -134,6 +135,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { return true; } + @SuppressWarnings("unchecked") default T putUnifyExact(T stack) { T target = get(stack.getDefinition()); if (target == null) { @@ -151,7 +153,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> { } } - default void putUnifyAllExact(T... defs) { + default void putUnifyAllExact(@SuppressWarnings("unchecked") T... defs) { for (T def : defs) { putUnifyExact(def); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java index e63b68f6f6..bfe913a4a3 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java @@ -42,6 +42,7 @@ public class EMRecipe<T> implements Comparable<EMRecipe<T>> { return Integer.compare(getID(), o.getID()); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public boolean equals(Object obj) { if (obj instanceof EMRecipe) { diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java index 29f2045b8e..24c397dc2e 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java @@ -197,10 +197,6 @@ public class EMAtomDefinition extends EMComplexTemplate { this(true, new EMConstantStackMap(things)); } - private EMAtomDefinition(boolean check, EMDefinitionStack... things) throws EMException { - this(check, new EMConstantStackMap(things)); - } - public EMAtomDefinition(EMConstantStackMap things) throws EMException { this(true, things); } diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java index cae4a3a876..f86dc9c96a 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java +++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java @@ -7,7 +7,6 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.TreeMap; public final class EMNuclideIAEA { @@ -276,16 +275,6 @@ public final class EMNuclideIAEA { } } - private static HashSet<String> decays = new HashSet<>(); - - private static boolean add(String s) { - if (decays.add(s)) { - System.out.println(s); - return true; - } - return false; - } - private static iaeaDecay[] getDecaysFixed(String decay1, double chance1, String decay2, double chance2, String decay3, double chance3) { boolean do1, do2, do3; diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java index 1e48250040..e700c54b17 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTag.java @@ -7,6 +7,7 @@ import com.google.common.base.Objects; public class EnderLinkTag implements Serializable { + private static final long serialVersionUID = 6884008436570077863L; private final String frequency; private final UUID player; diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java index b9e1f2a89d..7208a0a3fa 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderLinkTank.java @@ -10,6 +10,7 @@ import com.google.common.base.Objects; public class EnderLinkTank implements Serializable { + private static final long serialVersionUID = 1030297456736434221L; private final int X; private final int Y; private final int Z; diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java index 5e590740a0..125ce33304 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java +++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderWorldSavedData.java @@ -40,6 +40,7 @@ public class EnderWorldSavedData extends WorldSavedData { super(s); } + @SuppressWarnings("unchecked") @Override public void readFromNBT(NBTTagCompound nbtTagCompound) { try { diff --git a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java index 7558db0a63..aa1351793f 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java +++ b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java @@ -31,6 +31,7 @@ public class RendererMessage implements IMessage { public RendererMessage() {} + @SuppressWarnings("unchecked") @Override public void fromBytes(ByteBuf pBuffer) { try { diff --git a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java index 78b027f801..033882609b 100644 --- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java +++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java @@ -31,10 +31,6 @@ public class IMCForNEI { FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); } - private static void sendHandler(String aName, String aBlock) { - sendHandler(aName, aBlock, 2); - } - private static void sendCatalyst(String aName, String aStack, int aPriority) { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handlerID", aName); diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 98ae87a15b..3e8e591574 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -44,7 +44,9 @@ public class EyeOfHarmonyRecipe { Materials.Universium.getMolten(1152), Materials.Universium.getMolten(4_608), Materials.Universium.getMolten(18_432) }; - HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<ItemStack>() { + HashingStrategy<ItemStack> itemStackHashingStrategy = new HashingStrategy<>() { + + private static final long serialVersionUID = -3966004160368229212L; @Override public int computeHashCode(ItemStack stack) { @@ -337,6 +339,8 @@ public class EyeOfHarmonyRecipe { public static class HashMapHelper extends HashMap<Materials, Double> { + private static final long serialVersionUID = 2297018142561480614L; + void add(Materials material, double value) { // If key already exists. @@ -461,7 +465,9 @@ public class EyeOfHarmonyRecipe { Materials.Oxygen, Materials.Tin).collect(Collectors.toList()); - private static final HashMap<String, Long> plasmaEnergyMap = new HashMap<String, Long>() { + private static final HashMap<String, Long> plasmaEnergyMap = new HashMap<>() { + + private static final long serialVersionUID = 7933945171103801933L; { VALID_PLASMAS.forEach( diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java index 2da0eb5758..a27892bc65 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -32,7 +32,9 @@ public class EyeOfHarmonyRecipeStorage { private static final double CHANCE_DECREASE_PER_DIMENSION = 0.05; // Map is unique so this is fine. - HashMap<Block, String> blocksMapInverted = new HashMap<Block, String>() { + HashMap<Block, String> blocksMapInverted = new HashMap<>() { + + private static final long serialVersionUID = -1634011860327553337L; { ModBlocks.blocks.forEach((dimString, dimBlock) -> { put(dimBlock, dimString); }); @@ -41,6 +43,8 @@ public class EyeOfHarmonyRecipeStorage { private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<String, EyeOfHarmonyRecipe>() { + private static final long serialVersionUID = -3501819612517400500L; + { for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) { BlockDimensionDisplay blockDimensionDisplay = (BlockDimensionDisplay) ModBlocks.blocks diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java index c76d67bfaf..6f1d2bd37b 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java @@ -2,7 +2,6 @@ package com.github.technus.tectech.recipe; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import static com.google.common.math.LongMath.pow; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import static gregtech.api.util.GT_Utility.formatNumbers; import static java.lang.Math.min; import static net.minecraft.util.EnumChatFormatting.BOLD; @@ -236,7 +235,7 @@ public class TT_recipe extends GT_Recipe { "gt.recipe.eyeofharmony", "Eye of Harmony", null, - RES_PATH_GUI + "basicmachines/Extractor", + "gregtech:textures/gui/basicmachines/Extractor", 1, 9 * 9, 1, diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java index 86273974ff..0993aef19f 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java @@ -23,7 +23,7 @@ public class QuantumGlassItem extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(TEC_MARK_EM); aList.add(translateToLocal("tile.quantumGlass.desc.0")); // Dense yet transparent aList.add( diff --git a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java index b97d294e91..9ee98f7774 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java @@ -23,7 +23,7 @@ public class ReactorSimItem extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { aList.add(TEC_MARK_GENERAL); aList.add(translateToLocal("tile.reactorSim.desc.0")); // Fission Reaction Uncertainty Resolver 9001 aList.add( diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java index 82987db448..fc950fa1a2 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java @@ -219,7 +219,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { } @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 12; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index 8378ea2e4c..c2647985bd 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -188,7 +188,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { } @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 15; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java index da7d5efd01..87c0ce7ae1 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java @@ -25,7 +25,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { if (aStack.getItemDamage() < 15) { aList.add(THETA_MOVEMENT); } else { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java index c362b9aaaf..c06571112b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java @@ -23,7 +23,7 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { if (aStack.getItemDamage() < 15) { aList.add(TEC_MARK_EM); } else { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java index 0f38f5fadf..2492761763 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java @@ -21,7 +21,7 @@ public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java index 728335e754..f40cfeef44 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java @@ -19,7 +19,7 @@ public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java index 0fc4d31f72..3e82a63bb3 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java @@ -19,7 +19,7 @@ public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { switch (aStack.getItemDamage()) { case 0: case 1: diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index b0a890a599..46857b778b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -111,9 +111,8 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index d3d30f0357..3191e59d10 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -108,9 +108,8 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 1d86f4eeb5..56f1c1e0dd 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -111,9 +111,8 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { return getIcon(aSide, tMeta); } - @SuppressWarnings("unchecked") @Override - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i < MAX_BLOCK_TIER; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java index 190384e1ce..8df0b63de9 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java +++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java @@ -118,7 +118,7 @@ public class AvrProgrammer extends Item implements IMedia { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { if (aStack.stackTagCompound.hasKey("avr")) { NBTTagCompound avr = aStack.stackTagCompound.getCompoundTag("avr"); aList.add(translateToLocal("item.em.programmer.desc.0") + ": " + avr.getInteger("programCounter")); // Current @@ -215,7 +215,7 @@ public class AvrProgrammer extends Item implements IMedia { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack stack = new ItemStack(item, 1, 0); stack.setTagCompound(new NBTTagCompound()); list.add(stack); diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java index e730caf1e7..255f156765 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java @@ -103,7 +103,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); try { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -131,7 +131,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java index a32fd2adc3..02977907ea 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java @@ -95,7 +95,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); try { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -118,7 +118,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java index 97fda7b051..a915a563b9 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java @@ -75,7 +75,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("content")) { aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.definitionScanStorage.desc.0")); // Contains @@ -113,7 +113,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); list.add(that); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java index 34b0f26685..00a1c29599 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java @@ -29,7 +29,7 @@ public final class EnderFluidLinkCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.enderfluidlinkcover.desc.0")); // Ender-Fluid-Enables Machines! aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.enderfluidlinkcover.desc.1")); // Use on any side diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java index b572dcdc83..5751efb343 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java +++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java @@ -14,6 +14,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -146,13 +147,13 @@ public class EuMeterGT extends Item { } } if (!(aPlayer instanceof EntityPlayerMP)) { - GT_Utility.doSoundAtClient(Reference.MODID + ":fx_scan", 1, 1.0F, aX, aY, aZ); + GT_Utility.doSoundAtClient(new ResourceLocation(Reference.MODID, "fx_scan"), 1, 1.0F, aX, aY, aZ); } return false; } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.TEC_MARK_GENERAL); aList.add(translateToLocal("item.em.EuMeterGT.desc.0")); // Measures basic EU related stuff aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.EuMeterGT.desc.1")); // Just right click on diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java index 28d5fd22d8..814ef51b59 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java @@ -133,7 +133,7 @@ public final class ParametrizerMemoryCard extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { NBTTagCompound tNBT = aStack.getTagCompound(); aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.em.parametrizerMemoryCard.desc.0")); // Stores Parameters @@ -194,7 +194,7 @@ public final class ParametrizerMemoryCard extends Item { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) { ItemStack that = new ItemStack(this, 1); that.setTagCompound(new NBTTagCompound()); list.add(that); diff --git a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java index a03eae6674..015d284c4e 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java @@ -29,7 +29,7 @@ public final class PowerPassUpgradeCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.powerpassupgradecover.desc.0")); // Add power pass functionality to TecTech // Multiblocks diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java index 434c106cfa..c98c7246c7 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java @@ -33,7 +33,7 @@ public final class TeslaCoilCapacitor extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 6) { aList.add( @@ -100,7 +100,7 @@ public final class TeslaCoilCapacitor extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { for (int i = 0; i <= 6; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java index 366b000273..b4f1d33382 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java @@ -32,7 +32,7 @@ public final class TeslaCoilComponent extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.itemTeslaComponent.desc")); // Tesla bois need // these! @@ -65,7 +65,7 @@ public final class TeslaCoilComponent extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { aList.add(new ItemStack(aItem, 1, 0)); aList.add(new ItemStack(aItem, 1, 1)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java index 073d29153b..3ee7fd3e93 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java @@ -32,7 +32,7 @@ public final class TeslaCoilCover extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); switch (aStack.getItemDamage()) { case 0: @@ -80,7 +80,7 @@ public final class TeslaCoilCover extends Item { } @Override - public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List<ItemStack> aList) { aList.add(new ItemStack(aItem, 1, 0)); aList.add(new ItemStack(aItem, 1, 1)); } diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java index 28520a2678..88028f910c 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java +++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java @@ -11,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import com.github.technus.tectech.Reference; import com.github.technus.tectech.util.CommonValues; @@ -28,7 +29,7 @@ public final class TeslaStaff extends Item { } @Override - public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { + public void addInformation(ItemStack aStack, EntityPlayer ep, List<String> aList, boolean boo) { aList.add(CommonValues.THETA_MOVEMENT); aList.add(translateToLocal("item.tm.teslaStaff.desc")); } @@ -40,7 +41,7 @@ public final class TeslaStaff extends Item { double aX = aPlayer.posX; double aY = aPlayer.posY; double aZ = aPlayer.posZ; - GT_Utility.doSoundAtClient(Reference.MODID + ":fx_scan", 1, 1.0F, aX, aY, aZ); + GT_Utility.doSoundAtClient(new ResourceLocation(Reference.MODID, "fx_scan"), 1, 1.0F, aX, aY, aZ); } return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java deleted file mode 100644 index 3b9267ca85..0000000000 --- a/src/main/java/com/github/technus/tectech/thing/item/gui/ProgrammerScreen.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.technus.tectech.thing.item.gui; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - -public class ProgrammerScreen extends GuiScreen { - - private NBTTagCompound tag; - - public ProgrammerScreen(EntityPlayer player) { - tag = player.getHeldItem().getTagCompound(); - } -} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java index ca0ef296f8..99e35f57f3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java @@ -43,11 +43,18 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i private static Map<String, GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> componentBinds = new HashMap<>(); public GT_MetaTileEntity_Hatch_Capacitor(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 16, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 16, + new String[] { CommonValues.THETA_MOVEMENT, translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Capacitor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Capacitor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 16, aDescription, aTextures); } @@ -76,7 +83,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Capacitor(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Capacitor(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -120,16 +127,6 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i return getBaseMetaTileEntity().isActive() ? 0 : mInventory.length; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.THETA_MOVEMENT, translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), // For - // Tesla - // Tower - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") // Stores 'nergy! - // (for a while) - }; - } - public long[] getCapacitors() { long tier = -1; long tCurrent = 0; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java index f40c4d0ae1..bbca09fda4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java @@ -24,18 +24,25 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> { public GT_MetaTileEntity_Hatch_CreativeData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), + translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_CreativeData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_CreativeData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -122,15 +129,4 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc } } } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), // Quantum - // Data - // Output - translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") // Must be painted - // to work - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index bec0fde90e..1f1f359bb8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -16,7 +16,6 @@ import org.apache.commons.lang3.reflect.FieldUtils; import com.github.technus.tectech.mechanics.dataTransport.DataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; -import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; import cpw.mods.fml.relauncher.Side; @@ -45,12 +44,12 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket public short id = -1; protected GT_MetaTileEntity_Hatch_DataConnector(int aID, String aName, String aNameRegional, int aTier, - String descr) { + String[] descr) { super(aID, aName, aNameRegional, aTier, 0, descr); TT_Utility.setTier(aTier, this); } - protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String aDescription, + protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -194,12 +193,6 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, "Text description shouldn't be seen, report to Tec", - "High speed fibre optics connector.", EnumChatFormatting.AQUA + "Must be painted to work" }; - } - - @Override public byte getColorization() { return getBaseMetaTileEntity().getColorization(); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index b1980e2852..1aca68d6a4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -23,24 +23,27 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch public final int Amperes; public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0")); // Multiple - // Ampere - // Energy - // Extractor - // for - // Multiblocks + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0") }); // Multiple Ampere Energy + // Extractor for Multiblocks Amperes = aAmp; TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); Amperes = aAmp; } public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int i, - String description, int aAmp) { + String[] description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @@ -107,7 +110,7 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_DynamoMulti(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_DynamoMulti(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -119,11 +122,4 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription - // "Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java index bd0882a28a..bebd89bcc6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java @@ -33,12 +33,18 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc aNameRegional, aTier, 0, - translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), + translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(aAmp * V[aTier]) + + EnumChatFormatting.RESET + + " EU/t" }, aAmp); // Energy extracting terminal for Multiblocks TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @@ -110,7 +116,7 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_DynamoTunnel(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_DynamoTunnel(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -124,17 +130,6 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, // TODO NOT PASS DESCRIPTION - translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(Amperes * maxEUOutput()) - + EnumChatFormatting.RESET - + " EU/t" // Throughput - }; - } - - @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { byte Tick = (byte) (aTick % 20); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index e0216a5060..86f5f75de4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -60,11 +60,27 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta protected GT_MetaTileEntity_Hatch_ElementalContainer(int aID, String aName, String aNameRegional, int aTier, String descr) { - super(aID, aName, aNameRegional, aTier, 0, descr); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { TEC_MARK_EM, descr, + translateToLocal("tt.base.emhatch.desc.0") + " " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(aTier * aTier >> 4), + translateToLocal("tt.base.emhatch.desc.1") + " " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(aTier * aTier >> 4), + translateToLocal("tt.base.emhatch.desc.2"), translateToLocal("tt.base.emhatch.desc.3"), + translateToLocal("tt.base.emhatch.desc.4"), translateToLocal("tt.base.emhatch.desc.5"), + translateToLocal("tt.base.emhatch.desc.6"), + EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") }); TT_Utility.setTier(aTier, this); } - protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String aDescription, + protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -324,24 +340,6 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta } @Override - public String[] getDescription() { - return new String[] { TEC_MARK_EM, mDescription, - translateToLocal("tt.base.emhatch.desc.0") + " " - + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(getMaxStacksCount()), // Max stacks amount: - translateToLocal("tt.base.emhatch.desc.1") + " " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(getMaxStackSize()), // Stack capacity: - translateToLocal("tt.base.emhatch.desc.2"), // Place Overflow Hatch behind,on top or below - translateToLocal("tt.base.emhatch.desc.3"), // to provide overflow protection while this block - translateToLocal("tt.base.emhatch.desc.4"), // is not attached to multi block. - translateToLocal("tt.base.emhatch.desc.5"), // Transport range can be extended in straight - translateToLocal("tt.base.emhatch.desc.6"), // line up to 15 blocks with quantum tunnels. - EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") // Must be painted to work - }; - } - - @Override public void onRemoval() { if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) { TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), (overflowMatter + content.getMass()) * 16D); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 659c3843eb..7e12f9b86d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -25,24 +25,30 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch public final int Amperes; public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.energymulti.desc.0")); // Multiple - // Ampere - // Energy - // Injector - // for - // Multiblocks + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"), + translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(aAmp) + + " A" }); // Multiple Ampere Energy Injector for Multiblocks Amperes = aAmp; TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); Amperes = aAmp; } public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, - String description, int aAmp) { + String[] description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @@ -114,7 +120,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_EnergyMulti(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_EnergyMulti(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -126,14 +132,4 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " - + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(maxAmperesIn()) - + " A" // Amperes In - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java index 0107a28fa3..bcfe4fa33e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java @@ -31,12 +31,18 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc aNameRegional, aTier, 0, - translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), + translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(aAmp * V[aTier]) + + EnumChatFormatting.RESET + + " EU/t" }, aAmp); // Energy injecting terminal for Multiblocks TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @@ -108,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_EnergyTunnel(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_EnergyTunnel(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -122,17 +128,6 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, - translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(Amperes * maxEUInput()) - + EnumChatFormatting.RESET - + " EU/t" // Throughput - }; - } - - @Override public boolean canConnect(byte side) { return isInputFacing(side); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java index d830f69b17..3bf191f25a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java @@ -37,11 +37,18 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl private static Textures.BlockIcons.CustomIcon EM_H_ACTIVE; public GT_MetaTileEntity_Hatch_Holder(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 1, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 1, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.holder.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.holder.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Holder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Holder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures); } @@ -65,7 +72,7 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Holder(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Holder(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -118,16 +125,6 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.holder.desc.0"), // For - // Research - // Station - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.holder.desc.1") // Advanced Holding - // Mechanism! - }; - } - - @Override public boolean useModularUI() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java index 804a6d0f9a..564d963737 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java @@ -22,17 +22,24 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D private boolean delDelay = true; public GT_MetaTileEntity_Hatch_InputData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datain.desc.0"), + translateToLocal("gt.blockmachines.hatch.datain.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datain.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_InputData(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -84,19 +91,6 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datain.desc.0"), // Quantum - // Data - // Input - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.datain.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datain.desc.2") // Must be painted to - // work - }; - } - - @Override public void moveAround(IGregTechTileEntity aBaseMetaTileEntity) { if (delDelay) { delDelay = false; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java index 9bc7cd60d5..eb5bc72bb2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java @@ -44,7 +44,7 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -79,7 +79,7 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputDataItems(this.mName, this.mTier, mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_InputDataItems(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override @@ -220,15 +220,9 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), // ItemStack - // Data - // Input - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") // Must be painted - // to work - }; + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), + translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java index 97f6ad358b..b24aacf5c5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java @@ -14,19 +14,18 @@ import gregtech.api.metatileentity.MetaTileEntity; public class GT_MetaTileEntity_Hatch_InputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { public GT_MetaTileEntity_Hatch_InputElemental(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc")); // Elemental Input for - // Multiblocks + super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc")); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputElemental(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputElemental(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java index 0ea3844522..eca97750dd 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java @@ -23,17 +23,25 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> { public GT_MetaTileEntity_Hatch_OutputData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), + translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OutputData(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -82,19 +90,6 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), // Quantum - // Data - // Output - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") // Must be painted - // to work - }; - } - - @Override public IConnectsToDataPipe getNext(IConnectsToDataPipe source /* ==this */) { IGregTechTileEntity base = getBaseMetaTileEntity(); byte color = base.getColorization(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java index ed68426152..83a575f155 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java @@ -22,11 +22,18 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_Hatch_DataConnector<InventoryDataPacket> { public GT_MetaTileEntity_Hatch_OutputDataItems(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -43,7 +50,11 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputDataItems(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_OutputDataItems( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override @@ -124,18 +135,4 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems } return null; } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), // ItemStack - // Data - // Output - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") // Must be - // painted to - // work - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java index 01b52a3649..1a26c6b88a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java @@ -22,14 +22,14 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputElemental(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputElemental(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java index 1ef4097992..fe8af4f2ee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java @@ -54,17 +54,31 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity public GT_MetaTileEntity_Hatch_OverflowElemental(int aID, String aName, String aNameRegional, int aTier, double max) { - super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0")); // Disposes - // excess - // elemental - // Matter + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(max) + + " " + + translateToLocal("tt.keyword.unit.mass"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(max / (float) (30 - aTier)) + + " " + + translateToLocal("tt.keyword.unit.massFlux"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }); overflowMatter = max / 2; overflowMax = max; overflowDisperse = overflowMax / (float) (30 - aTier); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String aDescription, + public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); overflowMatter = max / 2; @@ -101,22 +115,6 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, mDescription, - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowMax) - + " " - + translateToLocal("tt.keyword.unit.mass"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowDisperse) - + " " - + translateToLocal("tt.keyword.unit.massFlux"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }; - } - - @Override public boolean isSimpleMachine() { return true; } @@ -138,7 +136,7 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OverflowElemental(mName, mTier, overflowMax, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OverflowElemental(mName, mTier, overflowMax, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index 03acc689b1..8651c3bb37 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -58,11 +58,21 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple private String clientLocale = "en_US"; public GT_MetaTileEntity_Hatch_Param(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + EnumChatFormatting.DARK_RED + + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", + EnumChatFormatting.DARK_RED + + "If it doesn't work, try removing Parametrizer from multiblock structure." }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Param(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Param(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -86,7 +96,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_Param(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Param(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -212,15 +222,6 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - EnumChatFormatting.DARK_RED - + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", - EnumChatFormatting.DARK_RED - + "If it doesn't work, try removing Parametrizer from multiblock structure.", }; - } - - @Override public boolean useModularUI() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java index 905c912c24..eb6690d0a9 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java @@ -46,13 +46,13 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_ParamText(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_ParamText(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_ParamText(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_ParamText(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index 9b4f0ee12c..e55af0dc60 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -59,11 +59,18 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem private String clientLocale = "en_US"; public GT_MetaTileEntity_Hatch_Rack(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 4, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 4, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.rack.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.rack.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Rack(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Rack(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -103,7 +110,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Rack(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Rack(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -258,16 +265,6 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.rack.desc.0"), // 4 - // Slot - // Rack - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.rack.desc.1") // Holds Computer - // Components - }; - } - - @Override public boolean isGivingInformation() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 13e24b73ad..9dbc33e9e2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -67,7 +67,8 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch regenerate(); } - public GT_MetaTileEntity_Hatch_Uncertainty(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Uncertainty(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); regenerate(); } @@ -106,7 +107,7 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_Uncertainty(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Uncertainty(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java index 1eec70c086..a8900e3f17 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java @@ -8,7 +8,6 @@ import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.GRAY; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.enums.GT_Values.V; -import static net.minecraft.util.StatCollector.translateToLocal; import java.math.BigInteger; @@ -40,17 +39,14 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat aNameRegional, aTier, 0, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"), // Multiple - // Ampere - // Energy - // Injector - // for - // Multiblocks + new String[] { GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.", + GRAY + "Does not connect to wires. This block withdraws EU from the network.", + AuthorColen + GRAY + BOLD + " & " + BLUE + BOLD + "Cloud" }, aAmp); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_WirelessMulti(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_WirelessMulti(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @@ -146,7 +142,7 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_WirelessMulti(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_WirelessMulti(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -160,13 +156,6 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat } @Override - public String[] getDescription() { - return new String[] { GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.", - GRAY + "Does not connect to wires. This block withdraws EU from the network.", - AuthorColen + GRAY + BOLD + " & " + BLUE + BOLD + "Cloud" }; - } - - @Override public ConnectionType getConnectionType() { return ConnectionType.WIRELESS; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index e33cd2e56a..c87e21483e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -45,7 +45,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; -import org.spongepowered.libraries.com.google.common.math.LongMath; import appeng.util.ReadableNumberConverter; @@ -1023,7 +1022,9 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl structureBuild_EM(STRUCTURE_PIECE_MAIN, 16, 16, 0, stackSize, hintsOnly); } - private final Map<FluidStack, Long> validFluidMap = new HashMap<FluidStack, Long>() { + private final Map<FluidStack, Long> validFluidMap = new HashMap<>() { + + private static final long serialVersionUID = -8452610443191188130L; { put(Materials.Hydrogen.getGas(1), 0L); @@ -1341,7 +1342,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + " L"); } long euPerTick = euOutput / maxProgresstime(); - if (euPerTick < LongMath.pow(10, 12)) { + if (euPerTick < Math.pow(10, 12)) { str.add("Estimated EU/t: " + RED + formatNumbers(euOutput / maxProgresstime()) + RESET + " EU/t"); } else { str.add( diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index ec1a9a441d..3821701300 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -3,8 +3,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_INGOT_MASS_DIFF; -import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_MASS_TO_EU_INSTANT; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; @@ -38,14 +36,6 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E private static Textures.BlockIcons.CustomIcon ScreenOFF; private static Textures.BlockIcons.CustomIcon ScreenON; - // todo CHECK VALUES - private static final double NEUTRONIUM_BLOCK_MASS = 4.1E17; - private static final double NEUTRONIUM_BLOCK_ATOM_COUNT = 2.4478671E44; - private static final double NEUTRONIUM_BLOCK_TO_EU_INSTANT = URANIUM_MASS_TO_EU_INSTANT * NEUTRONIUM_BLOCK_MASS - / (URANIUM_INGOT_MASS_DIFF * 1.78266191e-36); // ~ 5.314e40 - private static final double NEUTRON_TO_EU_INSTANT = NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT; // ~ - // 0.00021708694 - public boolean glassDome = false; // endregion @@ -1231,111 +1221,6 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E super(aName); } - /** - * Black hole event horizon radius calculator - * - * @param massKg mass in kg - * @return radius in meters - */ - private static double getSchwarzschildRadius(double massKg) { - return massKg * 1.48523238761875E-27; - } - - /** - * Black hole event horizon surface area calculator - * - * @param massKg mass in kg - * @return area in meters^2 - */ - private static double getSchwarzschildArea(double massKg) { - return Math.pow(getSchwarzschildRadius(massKg), 2) * 12.566370614359172; - } - - /** - * Black hole event horizon temperature calculator - * - * @param massKg mass in kg - * @return temperature in K - */ - private static double getTemperature(double massKg) { - return 2.841438513199716E-9 / (2.3159488515170722E-32 * massKg); - } - - /** - * Black hole luminosity calculator - * - * @param massKg mass in kg - * @return luminosity in watts - */ - private static double getLuminosity(double massKg) { - return getSchwarzschildArea(massKg) * 5.670373e-8 * Math.pow(getTemperature(massKg), 4); - } - - /** - * Black hole acretion disk luminosity calculator - * - * @param massKgPer1s mass injection kg per s - * @return luminosity in watts - */ - private static double getAcretionDiskLuminosity(double massKgPer1s) { - return massKgPer1s * 7.48962648947348E15; - } - - /** - * Black hole gravity field calculator, should be used for gravity blasting - * - * @param massKg mass in kg - * @param distanceSq distance squared in meters - * @return gravity field - */ - private static double getGravityField(double massKg, double distanceSq) { - return massKg * 6.6743015e-11 / distanceSq; - } - - /** - * Black hole containment force calculator - * - * @param massKg mass in kg - * @param radiusSq radius squared in meters - * @return force in newtons - */ - private static double getContainmentForce(double massKg, double radiusSq) { - return Math.pow(massKg, 2) * 6.6743015e-11 / radiusSq; - } - - /** - * Black hole containment pressure calculator F/s, should be used for bhg initial release explosion? - * - * @param massKg mass in kg - * @param radiusSq radius squared in meters - * @return pressure in pascals - */ - private static double getContainmentPressure(double massKg, double radiusSq) { - return getContainmentForce(massKg, radiusSq) / (12.566370614359172 * radiusSq); - } - - /** - * Black hole containment energy calculator, assuming F*s, and 100% efficient gravity force field - * - * @param massKg mass in kg - * @return power in watts - */ - private static double getContainmentPower(double massKg) { - return Math.pow(massKg, 2) * 8.387174624097334E-10; - } - - /** - * Black hole power balance, zero at mass ~= 2.5525e10 (T~=4.8067e12) - * - * @param massKg mass in kg - * @param massKgPer1s mass injection kg per s - * @return power in watts - */ - @Deprecated - private static double getContainmentPowerBalance(double massKg, double massKgPer1s) { - return getLuminosity(massKg) + getAcretionDiskLuminosity(massKgPer1s) - getContainmentPower(massKg); - } - // todo compaction energy 8 * Long.MAx_VALUE? // todo neutronium decay gen? 0.0007186885 mass diff - actually compute hydrogen amount... diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 6a25a3779c..f4f5917d01 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -459,7 +459,6 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - IGregTechTileEntity igt = getBaseMetaTileEntity(); structureBuild_EM("front", 1, 2, 0, stackSize, hintsOnly); structureBuild_EM("cap", 1, 2, -1, stackSize, hintsOnly); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 080481c17f..5278643762 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -69,6 +69,7 @@ import gregtech.api.util.IGT_HatchAdder; /** * Created by danie_000 on 17.12.2016. */ +@SuppressWarnings("unchecked") public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockBase_EM implements ISurvivalConstructable { @@ -187,7 +188,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB static { try { - Class GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); + Class<?> GT_Assemblyline_Server = Class.forName("gregtech.api.util.GT_Assemblyline_Server"); lServerNames = (LinkedHashMap<String, String>) GT_Assemblyline_Server.getField("lServerNames").get(null); } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { lServerNames = null; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index d5b97d3afc..1596f337df 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -218,7 +218,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas // be configured .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo(translateToLocal("gt.blockcasingsTT.1.name"), 0) // 0x Computer Casing (minimum) + .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.1.name"), 0, false) // 0x Computer Casing + // (minimum) .addOtherStructurePart( translateToLocal("gt.blockcasingsTT.3.name"), translateToLocal("tt.keyword.Structure.Center")) // Advanced Computer Casing: Center diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index ff8f3c088a..373edc4f09 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -131,7 +131,8 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo // running .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo(translateToLocal("gt.blockcasingsTT.0.name"), 5) // 5x High Power Casing (minimum) + .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.0.name"), 5, false) // 5x High Power Casing + // (minimum) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.SuperconductingCoilBlock"), translateToLocal("tt.keyword.Structure.Center")) // SuperconductingCoilBlock: Center diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index fe64fa7470..f665c6f975 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -235,8 +235,10 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock // Wither) .addSeparator().beginStructureBlock(5, 4, 5, true) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo(translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), 60) // 60x Stainless Steel - // Casing (minimum) + .addCasingInfoMin(translateToLocal("tt.keyword.Structure.StainlessSteelCasing"), 60, false) // 60x + // Stainless + // Steel + // Casing (minimum) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.DataConnector"), translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"), diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 6f7fc069ac..ab584e72ec 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -940,10 +940,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock return false; } - private boolean addFrameToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return aTileEntity != null && aTileEntity.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame; - } - @Override public IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> getStructure_EM() { return STRUCTURE_DEFINITION; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java index 0d15cb3c2f..bc1f7c7d66 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_GUIContainer_MultiMachineEM.java @@ -315,7 +315,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach } } - protected void hoveringText(List strings, int x, int y, FontRenderer font) { + protected void hoveringText(List<String> strings, int x, int y, FontRenderer font) { if (!strings.isEmpty()) { GL11.glDisable(GL12.GL_RESCALE_NORMAL); // RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index bab42c11e1..cf52d25d34 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -2142,6 +2142,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extraExplosions_EM(); GT_Pollution.addPollution(getBaseMetaTileEntity(), 600000); mInventory[1] = null; + @SuppressWarnings("unchecked") Iterable<MetaTileEntity> allHatches = Iterables.concat( mInputBusses, mOutputBusses, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java index 2e6f0d9839..74491236b6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java @@ -7,8 +7,8 @@ import java.util.ArrayList; */ public class Parameters { - private static final IStatusFunction LED_STATUS_FUNCTION_DEFAULT = (b, p) -> LedStatus.STATUS_UNDEFINED; - private static final INameFunction NAME_FUNCTION_DEFAULT = (b, p) -> "Undefined"; + private static final IStatusFunction<?> LED_STATUS_FUNCTION_DEFAULT = (b, p) -> LedStatus.STATUS_UNDEFINED; + private static final INameFunction<?> NAME_FUNCTION_DEFAULT = (b, p) -> "Undefined"; final Group[] groups = new Group[10]; @@ -159,13 +159,13 @@ public class Parameters { groups[hatchNo] = this; } - public ParameterIn makeInParameter(int paramID, double defaultValue, INameFunction name, - IStatusFunction status) { + public ParameterIn makeInParameter(int paramID, double defaultValue, INameFunction<?> name, + IStatusFunction<?> status) { return new ParameterIn(paramID, defaultValue, name, status); } - public ParameterOut makeOutParameter(int paramID, double defaultValue, INameFunction name, - IStatusFunction status) { + public ParameterOut makeOutParameter(int paramID, double defaultValue, INameFunction<?> name, + IStatusFunction<?> status) { return new ParameterOut(paramID, defaultValue, name, status); } @@ -206,7 +206,7 @@ public class Parameters { IStatusFunction status; INameFunction name; - private ParameterOut(int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + private ParameterOut(int paramID, double defaultValue, INameFunction<?> name, IStatusFunction<?> status) { this.name = name == null ? NAME_FUNCTION_DEFAULT : name; if (paramID < 0 || paramID > 2) { throw new IllegalArgumentException("Parameter id must be in 0 to 1 range"); @@ -284,7 +284,7 @@ public class Parameters { IStatusFunction status; INameFunction name; - private ParameterIn(int paramID, double defaultValue, INameFunction name, IStatusFunction status) { + private ParameterIn(int paramID, double defaultValue, INameFunction<?> name, IStatusFunction<?> status) { this.name = name == null ? NAME_FUNCTION_DEFAULT : name; this.id = hatchNo + 10 * paramID; if (paramID < 0 || paramID > 2) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java index 1cac23e098..baa4f48c84 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java @@ -487,11 +487,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB // bigger // first colliderHandler = FUSE_HANDLERS.get( - (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); + (long) (stack2.getDefinition().getMatterMassType() << 16) + | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { colliderHandler = FUSE_HANDLERS.get( - (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); + (long) (stack.getDefinition().getMatterMassType() << 16) + | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } for (EMInstanceStack newStack : map.valuesToArray()) { @@ -519,11 +521,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB // bigger // first colliderHandler = FUSE_HANDLERS.get( - (stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType()); + (long) (stack2.getDefinition().getMatterMassType() << 16) + | stack.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } else { colliderHandler = FUSE_HANDLERS.get( - (stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType()); + (long) (stack.getDefinition().getMatterMassType() << 16) + | stack2.getDefinition().getMatterMassType()); if (handleRecipe(stack2, map, colliderHandler)) return 0; } outputEM = new EMInstanceStackMap[] { map }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java index 4a687723b1..7e3d360e2e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java @@ -41,7 +41,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo private static Textures.BlockIcons.CustomIcon EMpipe; public byte connectionCount = 0; - private boolean active, lastActive; + private boolean active; public GT_MetaTileEntity_Pipe_Energy(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java index 3572b04d9d..8346361137 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java @@ -44,18 +44,26 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac public int EUT = 0, AMP = 0; public GT_MetaTileEntity_BuckConverter(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.machine.tt.buck.desc.0"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.buck.desc.1"), }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_BuckConverter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_BuckConverter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BuckConverter(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_BuckConverter(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -125,18 +133,6 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.machine.tt.buck.desc.0"), // Electronic voltage regulator - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.buck.desc.1"), // Adjustable - // step down - // transformer - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.buck.desc.2") // Switching power - // supply... - }; - } - - @Override public boolean isElectric() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java index e6533b690d..bc0b9f9880 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java @@ -26,18 +26,28 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine public static GT_RenderedTexture READER_ONLINE, READER_OFFLINE; public GT_MetaTileEntity_DataReader(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 1, "", 1, 1, "dataReader.png", ""); + super( + aID, + aName, + aNameRegional, + aTier, + 1, + new String[] { EnumChatFormatting.DARK_RED + "Deprecated" }, + 1, + 1, + "dataReader.png", + ""); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DataReader(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_DataReader(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, "dataReader.png", ""); TT_Utility.setTier(aTier, this); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_DataReader(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_DataReader(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -100,11 +110,6 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine } @Override - public String[] getDescription() { - return new String[] { EnumChatFormatting.DARK_RED + "Deprecated" }; - } - - @Override public boolean isElectric() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java index 120baad074..834cfdd2ae 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java @@ -47,18 +47,27 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac public float anomaly = 0; public GT_MetaTileEntity_DebugPollutor(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.0"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.1"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DebugPollutor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_DebugPollutor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_DebugPollutor(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_DebugPollutor(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -148,17 +157,6 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.0"), // Shit genny broke! - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.1"), // Infinite - // Producer/Consumer - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.pollutor.desc.2") // Since i - // wanted one? - }; - } - - @Override public boolean isElectric() { return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java index 63513d6842..974a51f23b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java @@ -57,11 +57,21 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie public boolean producing = true; public GT_MetaTileEntity_DebugPowerGenerator(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.debug.tt.genny.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.genny.desc.3"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.1"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DebugPowerGenerator(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_DebugPowerGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); @@ -69,7 +79,7 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_DebugPowerGenerator(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_DebugPowerGenerator(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -172,19 +182,6 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, translateToLocal("gt.blockmachines.debug.tt.genny.desc.0"), // Power - // from - // nothing - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.genny.desc.3"), // - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.1"), // Infinite - // Producer/Consumer - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.genny.desc.2") // Since i wanted - // one... - }; - } - - @Override public boolean isElectric() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java index df2711e6ce..fc81484b5e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -49,11 +49,20 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti public String[] result = new String[] { "Undefined" }; public GT_MetaTileEntity_DebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.debug.tt.writer.desc.0"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.1"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_DebugStructureWriter(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_DebugStructureWriter(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); @@ -61,7 +70,7 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_DebugStructureWriter(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_DebugStructureWriter(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -187,21 +196,6 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.debug.tt.writer.desc.0"), // Scans Blocks Around - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.1"), // Prints - // Multiblock - // NonTE - // structure - // check code - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.debug.tt.writer.desc.2") // ABC axises - // aligned to - // machine front - }; - } - - @Override public boolean isGivingInformation() { return true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java index b8a14763ad..aec478ac30 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java @@ -48,7 +48,7 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_MicroController(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_MicroController(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); core = new AvrCore(); @@ -62,7 +62,7 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_MicroController(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_MicroController(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java index e26459fd2c..61ee236cc2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java @@ -38,18 +38,28 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac private boolean interdimensional = true; public GT_MetaTileEntity_OwnerDetector(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.0"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.1"), + EnumChatFormatting.BLUE + + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_OwnerDetector(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_OwnerDetector(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_OwnerDetector(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_OwnerDetector(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -151,21 +161,6 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac } @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.0"), // Screwdrive to change mode - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.1"), // Looks - // for - // his - // pa - EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.machine.tt.ownerdetector.desc.2") // Emits - // signal - // when - // happy - }; - } - - @Override public boolean isElectric() { return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java index df26a700f6..6f95ac145c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java @@ -22,14 +22,14 @@ public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transfor TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_TT_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_TT_Transformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); TT_Utility.setTier(aTier, this); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TT_Transformer(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_TT_Transformer(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index b72d035d6d..4eeb7e0faf 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -80,7 +80,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_TeslaCoil(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + public GT_MetaTileEntity_TeslaCoil(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int aSlotCount) { super(aName, aTier, aDescription, aTextures, aSlotCount); } @@ -216,7 +216,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TeslaCoil(mName, mTier, mDescription, mTextures, mInventory.length); + return new GT_MetaTileEntity_TeslaCoil(mName, mTier, mDescriptionArray, mTextures, mInventory.length); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java index 3890891d50..febeafd754 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java @@ -15,13 +15,13 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Trans super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/util/TT_Utility.java b/src/main/java/com/github/technus/tectech/util/TT_Utility.java index fb796b870a..eeee29e269 100644 --- a/src/main/java/com/github/technus/tectech/util/TT_Utility.java +++ b/src/main/java/com/github/technus/tectech/util/TT_Utility.java @@ -381,6 +381,7 @@ public final class TT_Utility { return objects; } + @SafeVarargs public static <T> NBTTagCompound packNBT(Function<T, NBTTagCompound> converter, T... info) { NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("i", info.length); diff --git a/src/main/java/com/github/technus/tectech/util/XSTR.java b/src/main/java/com/github/technus/tectech/util/XSTR.java index c2b32e4762..c739eb2e3e 100644 --- a/src/main/java/com/github/technus/tectech/util/XSTR.java +++ b/src/main/java/com/github/technus/tectech/util/XSTR.java @@ -20,14 +20,13 @@ public class XSTR extends Random { private static final long serialVersionUID = 6208727693524452904L; private long seed; - private static final long GAMMA = 0x9e3779b97f4a7c15L; - private static final int PROBE_INCREMENT = 0x9e3779b9; - private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL; private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) private static final AtomicLong seedUniquifier = new AtomicLong(8682522807148012L); public static final XSTR XSTR_INSTANCE = new XSTR() { + private static final long serialVersionUID = 8778284761958251721L; + @Override public synchronized void setSeed(long seed) { if (!Thread.currentThread().getStackTrace()[2].getClassName().equals(Random.class.getName())) { |