diff --git a/dependencies.gradle b/dependencies.gradle index f4fe51d..fc40fb3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,8 +29,8 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.68:dev') - implementation('com.github.GTNewHorizons:GTNH-Intergalactic:1.3.5:dev') - implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.11:dev') - implementation('com.github.GTNewHorizons:Avaritia:1.49:dev') + implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.103:dev') + implementation('com.github.GTNewHorizons:GTNH-Intergalactic:1.4.30:dev') + implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.88:dev') + implementation('com.github.GTNewHorizons:Avaritia:1.56:dev') } diff --git a/gradle.properties b/gradle.properties index 56ca9a3..8f88ad7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,77 +1,109 @@ +# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable. +# LOCAL to test local config updates. +gtnh.settings.blowdryerTag = 0.2.2 + +# Human-readable mod name, available for mcmod.info population. modName = BoxPlusPlus -# This is a case-sensitive string to identify your mod. Convention is to use lower case. +# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation. +# Conventionally lowercase. modId = boxplusplus +# Root package of the mod, used to find various classes in other properties, +# mcmod.info substitution, enabling assertions in run tasks, etc. modGroup = com.silvermoon.boxplusplus -# WHY is there no version field? -# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the -# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/ +# Whether to use modGroup as the maven publishing group. +# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +useModGroupForPublishing = false -# Will update your build.gradle automatically whenever an update is available +# Updates your build.gradle and settings.gradle automatically whenever an update is available. autoUpdateBuildScript = true +# Version of Minecraft to target minecraftVersion = 1.7.10 + +# Version of Minecraft Forge to target forgeVersion = 10.13.4.1614 -# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task. +# Specify an MCP channel for dependency deobfuscation and the deobfParams task. channel = stable + +# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task. mappingsVersion = 12 -# Define other MCP mappings for dependency deobfuscation -remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ +# Defines 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 +# Select a default username for testing your mod. You can always override this per-run by running +# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. developmentEnvironmentUserName = SilverMoon -# Enables using modern java syntax (up to version 17) via Jabel, while still targetting JVM 8. +# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting 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, Map types +# Enables injecting missing generics into the decompiled source code for a better coding experience. +# Turns most publicly visible List, Map, etc. into proper List, Map types. enableGenericInjection = false -# Generate a class with String fields for the mod id, name, version and group name named with the fields below +# Generate a class with a String field for the mod version named as defined below. +# If generateGradleTokenClass is empty or not missing, no such class will be generated. +# If gradleTokenVersion is empty or missing, the field will not be present in the class. generateGradleTokenClass = com.silvermoon.boxplusplus.Tags + +# Name of the token containing the project's current version to generate/replace. +gradleTokenVersion = VERSION + +# [DEPRECATED] Mod ID replacement token. gradleTokenModId = MODID + +# [DEPRECATED] Mod name replacement token. gradleTokenModName = MODNAME -gradleTokenVersion = VERSION + +# [DEPRECATED] Mod Group replacement token. gradleTokenGroupName = GROUPNAME + # [DEPRECATED] -# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java +# Multiple source files can be defined here by providing a comma-separated 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 +# 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 # leave this property empty. -# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api +# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api apiPackage = # 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 +# There can be multiple files in a space-separated list. +# Example value: mymodid_at.cfg nei_at.cfg accessTransformersFile = # 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 + +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + +# Adds some debug arguments like verbose output and class 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 compatibility only -# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin +# 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 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! containsMixinsAndOrCoreModOnly = false @@ -79,22 +111,38 @@ containsMixinsAndOrCoreModOnly = false # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. forceEnableMixins = false -# 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. +# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your +# responsibility to check the license and request permission for distribution if required. usesShadowedDependencies = false -# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access + +# If disabled, won't remove unused classes from shadowed 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 +# Adds CurseMaven, Modrinth, 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. +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + +# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. +# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. +# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. +usesMavenPublishing = true +# Maven repository to publish the mod to. +# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ + +# 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. +# Leave this empty if you don't want to publish to Modrinth. modrinthProjectId = # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. @@ -106,9 +154,8 @@ modrinthProjectId = # 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 = @@ -118,24 +165,40 @@ curseForgeProjectId = # 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 +# Note: UniMixins 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 +# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older # projects. New projects should not use this parameter. # customArchiveBaseName = -# Optional parameter to prevent the source code from being published -# noPublishedSources = -# Uncomment this to disable spotless checks -#disableSpotless=true + +# Optional parameter to have the build automatically fail if an illegal version is used. +# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. +# The check is ONLY performed if the version is a git tag. +# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+ +# versionPattern = + +# Uncomment to prevent the source code from being published. +# noPublishedSources = true + +# 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. -disableCheckstyle=true -# Override the IDEA build type. Valid value is "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" +# disableSpotless = true + +# Uncomment this to disable Checkstyle checks (currently wildcard import check). +disableCheckstyle = true + +# Override the IDEA build type. Valid values are: "" (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. +# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be 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 + +# Whether IDEA should run spotless checks when pressing the Build button. +# This is meant to be set in $HOME/.gradle/gradle.properties. +# ideaCheckSpotlessOnBuild = true + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/settings.gradle b/settings.gradle index 1d2270a..46c0569 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' } \ No newline at end of file diff --git a/src/main/java/com/silvermoon/boxplusplus/api/IBoxable.java b/src/main/java/com/silvermoon/boxplusplus/api/IBoxable.java index 3b28307..3702691 100644 --- a/src/main/java/com/silvermoon/boxplusplus/api/IBoxable.java +++ b/src/main/java/com/silvermoon/boxplusplus/api/IBoxable.java @@ -1,14 +1,14 @@ package com.silvermoon.boxplusplus.api; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; import gregtech.api.recipe.RecipeMap; /** - * Implements this on GT_MetaTileEntity_MultiBlockBase to allow your machine encapsulating in Box System. + * Implements this on MTEMultiBlockBase to allow your machine encapsulating in Box System. * If you don't have a standard getRecipeMap(), override getRealRecipeMap(). * Do remember to call boxRegister.registerMachineToBox() on postInit! *

- * 为GT_MetaTileEntity_MultiBlockBase实现此接口,将允许Box封装你的机器。如果你的机器有多种模式，重写getRealRecipeMap()来返回你期望封装的那个。 + * 为MTEMultiBlockBase实现此接口,将允许Box封装你的机器。如果你的机器有多种模式，重写getRealRecipeMap()来返回你期望封装的那个。 * 记得在postInit调用一次boxRegister.registerMachineToBox()！ */ public interface IBoxable { @@ -17,7 +17,7 @@ public interface IBoxable { * Set which module your machine will be. *

* 设定模块ID。模块ID可以从模块核心的meta值获取，范围：0-11 - * + * * @return Module ID, refers to the meta of the module core block. Range: 0-11 */ @@ -27,7 +27,7 @@ public interface IBoxable { * Should use update module *

* 是否使用升级模块 - * + * * @return true - updated */ boolean isUpdateModule(); @@ -38,7 +38,7 @@ public interface IBoxable { * @param machine normally "this" * @return GT_Recipe_Map - the real recipeMap */ - default RecipeMap getRealRecipeMap(GT_MetaTileEntity_MultiBlockBase machine) { + default RecipeMap getRealRecipeMap(MTEMultiBlockBase machine) { return machine.getRecipeMap(); } diff --git a/src/main/java/com/silvermoon/boxplusplus/api/boxRegister.java b/src/main/java/com/silvermoon/boxplusplus/api/boxRegister.java index 8a16af8..ad54c75 100644 --- a/src/main/java/com/silvermoon/boxplusplus/api/boxRegister.java +++ b/src/main/java/com/silvermoon/boxplusplus/api/boxRegister.java @@ -6,25 +6,25 @@ import com.google.common.collect.*; import com.silvermoon.boxplusplus.boxplusplus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; public class boxRegister { - public static final List customerMachineList = new ArrayList<>(); + public static final List customerMachineList = new ArrayList<>(); public static final Multimap customModuleList = HashMultimap.create(); public static final Multimap customUpdatedModuleList = HashMultimap.create(); /** * Use this to register your boxable machine. **Should be called on CommonProxy.postInit().** *

- * 在CommonProxy.postInit()阶段调用本方法。确保传入的GT_MetaTileEntity_MultiBlockBase已经实现了IBoxable。 - * + * 在CommonProxy.postInit()阶段调用本方法。确保传入的MTEMultiBlockBase已经实现了IBoxable。 + * * @param machineList You can put multi-GTMultiMachines in this parameter. *

* 可以接受多个参数 */ - public static void registerMachineToBox(GT_MetaTileEntity_MultiBlockBase... machineList) { - for (GT_MetaTileEntity_MultiBlockBase machine : machineList) { + public static void registerMachineToBox(MTEMultiBlockBase... machineList) { + for (MTEMultiBlockBase machine : machineList) { if (machine instanceof IBoxable boxable) { customerMachineList.add(machine); if (boxable.isUpdateModule()) { diff --git a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java index f548d84..6c9f8b4 100644 --- a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java +++ b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java @@ -8,6 +8,7 @@ import com.silvermoon.boxplusplus.common.CommonProxy; import com.silvermoon.boxplusplus.common.loader.BlockRegister; +import com.silvermoon.boxplusplus.common.loader.RecipeLoader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -64,6 +65,7 @@ public void postInit(FMLPostInitializationEvent event) { // register server commands in this event handler (Remove if not needed) public void serverStarting(FMLServerStartingEvent event) { proxy.serverStarting(event); + new RecipeLoader().run(); } public static final CreativeTabs BoxTab = new CreativeTabs("BoxPlusPlus") { diff --git a/src/main/java/com/silvermoon/boxplusplus/client/BoxNEIHandler.java b/src/main/java/com/silvermoon/boxplusplus/client/BoxNEIHandler.java index 5b198b6..98d00b0 100644 --- a/src/main/java/com/silvermoon/boxplusplus/client/BoxNEIHandler.java +++ b/src/main/java/com/silvermoon/boxplusplus/client/BoxNEIHandler.java @@ -20,7 +20,7 @@ import codechicken.nei.recipe.*; import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.nei.GT_NEI_DefaultHandler; +import gregtech.nei.GTNEIDefaultHandler; public class BoxNEIHandler { @@ -76,7 +76,7 @@ public void onDrawScreen(GuiScreenEvent.DrawScreenEvent.Post event) { GuiPatternTermEx.class, gui.getHandler() .getOverlayIdentifier()) - && gui.getHandler() instanceof GT_NEI_DefaultHandler; + && gui.getHandler() instanceof GTNEIDefaultHandler; } } Collections.addAll(buttonList, buttons); @@ -100,7 +100,7 @@ public void onActionPerformedEventPre(GuiScreenEvent.ActionPerformedEvent.Pre ev if (recipesPerPage >= 0 && handler != null) { int recipe = gui.page * recipesPerPage + event.button.id - OVERLAY_BUTTON_ID_START; BoxRoutings - .makeRouting((GT_NEI_DefaultHandler) gui.currenthandlers.get(gui.recipetype), recipe, player); + .makeRouting((GTNEIDefaultHandler) gui.currenthandlers.get(gui.recipetype), recipe, player); event.setCanceled(true); } } diff --git a/src/main/java/com/silvermoon/boxplusplus/common/BoxModule.java b/src/main/java/com/silvermoon/boxplusplus/common/BoxModule.java index c8c3cc1..14d7cb0 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/BoxModule.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/BoxModule.java @@ -5,8 +5,8 @@ import com.silvermoon.boxplusplus.api.IBoxable; import com.silvermoon.boxplusplus.util.BoxRoutings; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; +import gregtech.api.util.GTUtility; public class BoxModule { @@ -151,8 +151,8 @@ public static int[] transMachinesToModule(BoxRoutings routing) { case "quantumforcetransformer.controller.tier.single", "frf", "industrialmassfab.controller.tier.single" -> new int[] { 10, 1 }; default -> { - for (GT_MetaTileEntity_MultiBlockBase machine : customerMachineList) { - if (GT_Utility.areStacksEqual(machine.getStackForm(1), routing.RoutingMachine, true)) { + for (MTEMultiBlockBase machine : customerMachineList) { + if (GTUtility.areStacksEqual(machine.getStackForm(1), routing.RoutingMachine, true)) { yield new int[] { ((IBoxable) machine).getModuleIDSafely(), ((IBoxable) machine).isUpdateModule() ? 1 : 0 }; } diff --git a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java index bf449f4..98e45a4 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java @@ -2,7 +2,6 @@ import com.silvermoon.boxplusplus.common.config.Config; import com.silvermoon.boxplusplus.common.loader.BlockRegister; -import com.silvermoon.boxplusplus.common.loader.RecipeLoader; import com.silvermoon.boxplusplus.common.loader.TileEntitiesLoader; import com.silvermoon.boxplusplus.network.NetworkLoader; import com.silvermoon.boxplusplus.util.ResultModuleRequirement; @@ -31,7 +30,7 @@ public void init(FMLInitializationEvent event) { // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed) public void postInit(FMLPostInitializationEvent event) { - new RecipeLoader().run(); + } // register server commands in this event handler (Remove if not needed) diff --git a/src/main/java/com/silvermoon/boxplusplus/common/block/BlockBoxModuleCore.java b/src/main/java/com/silvermoon/boxplusplus/common/block/BlockBoxModuleCore.java index 6de8a62..1019632 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/block/BlockBoxModuleCore.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/block/BlockBoxModuleCore.java @@ -19,7 +19,7 @@ import com.silvermoon.boxplusplus.common.items.IB_BoxModule; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; public class BlockBoxModuleCore extends Block { @@ -30,7 +30,7 @@ public BlockBoxModuleCore(String name, Material material, Boolean isUpdate) { super(material); this.isUpdate = isUpdate; setBlockName(name); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } public void registerBlock() { @@ -78,15 +78,15 @@ public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } } diff --git a/src/main/java/com/silvermoon/boxplusplus/common/block/BlockMachineBase.java b/src/main/java/com/silvermoon/boxplusplus/common/block/BlockMachineBase.java index dc17e0b..68c2d96 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/block/BlockMachineBase.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/block/BlockMachineBase.java @@ -13,17 +13,17 @@ import com.silvermoon.boxplusplus.Tags; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Textures; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class BlockMachineBase extends Block { private IIcon BoxIcon; private final int value; static { - GT_Utility.addTexturePage((byte) 114); + GTUtility.addTexturePage((byte) 114); } public BlockMachineBase(String name, Material material, int value) { @@ -37,7 +37,7 @@ public void registerBlock() { super.setHardness(5); super.setCreativeTab(BoxTab); GameRegistry.registerBlock(this, getUnlocalizedName()); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } @Override @@ -69,15 +69,15 @@ public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } } diff --git a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java index ded5a4b..8c3f43a 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/loader/RecipeLoader.java @@ -3,20 +3,19 @@ import static gregtech.api.enums.Mods.*; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GT_RecipeConstants.*; +import static gregtech.api.util.GTRecipeConstants.*; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.recipe.TT_recipeAdder; - import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import tectech.recipe.TTRecipeAdder; public class RecipeLoader implements Runnable { @@ -29,25 +28,25 @@ public void run() { } public void addBoxRecipe() { - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 13532)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 13532)) .metadata(RESEARCH_TIME, 64000) .itemOutputs(TileEntitiesLoader.Box.getStackForm(1)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 1, 0), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4, 59), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8, 58), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 16, 57), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 32, 38), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 37), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4, 59), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8, 58), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 16, 57), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 32, 38), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 37), new ItemStack(BlockRegister.SpaceExtend, 64, 0), new ItemStack(BlockRegister.SpaceExtend, 64, 0), new ItemStack(BlockRegister.SpaceExtend, 64, 0), new ItemStack(BlockRegister.SpaceExtend, 64, 0), ItemList.Field_Generator_IV.get(4), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15470), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15470), ItemList.Tool_DataOrb.get(16), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360), ItemList.Casing_Pipe_Titanium.get(64)) .fluidInputs( FluidRegistry.getFluidStack("molten.titanium", 16416), @@ -59,18 +58,18 @@ public void addBoxRecipe() { } public void addMachineBlockRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.SpaceExtend, 32, 0)) .itemInputs( ItemList.Casing_StableTitanium.get(64), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 2, 32), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 2, 32), ItemList.Electric_Motor_LuV.get(16), ItemList.Electric_Piston_LuV.get(16), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IrradiantReinforcedTitaniumPlate", 4)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IrradiantReinforcedTitaniumPlate", 4)) .eut(TierEU.RECIPE_LuV) .duration(400) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.SpaceExtend)) .metadata(RESEARCH_TIME, 24000) .itemOutputs(new ItemStack(BlockRegister.SpaceCompress, 16, 0)) @@ -79,15 +78,15 @@ public void addMachineBlockRecipe() { ItemList.Casing_StableTitanium.get(64), ItemList.Super_Tank_LV.get(1), ItemList.Super_Chest_LV.get(1), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4, 33), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.TitaniumPlatedReinforcedStone", 64)) + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4, 33), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.TitaniumPlatedReinforcedStone", 64)) .fluidInputs( FluidRegistry.getFluidStack("ic2coolant", 10000), FluidRegistry.getFluidStack("molten.indalloy140", 1440)) .eut(TierEU.RECIPE_LuV) .duration(1600) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.SpaceCompress)) .metadata(RESEARCH_TIME, 48000) .itemOutputs(new ItemStack(BlockRegister.SpaceConstraint, 2, 0)) @@ -96,8 +95,8 @@ public void addMachineBlockRecipe() { ItemList.Casing_StableTitanium.get(64), ItemList.Casing_StableTitanium.get(64), ItemList.Casing_StableTitanium.get(64), - GT_OreDictUnificator.get("plateDoubleAdvancedNitinol", 8), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 16, 34), + GTOreDictUnificator.get("plateDoubleAdvancedNitinol", 8), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 16, 34), ItemList.Quantum_Tank_LV.get(1), ItemList.Quantum_Chest_LV.get(1)) .fluidInputs( @@ -106,18 +105,18 @@ public void addMachineBlockRecipe() { .eut(TierEU.RECIPE_UV) .duration(6400) .addTo(AssemblyLine); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.SpaceConstraint), 480000, 128, 2000000, 8, - new ItemStack[] { GT_ModHandler.getModItem(GTNHIntergalactic.ID, "gt.blockcasingsSE", 64), - GT_OreDictUnificator.get("blockAstralTitanium", 48), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 32, 34), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), + new ItemStack[] { GTModHandler.getModItem(GTNHIntergalactic.ID, "gt.blockcasingsSE", 64), + GTOreDictUnificator.get("blockAstralTitanium", 48), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 32, 34), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), ItemList.Quantum_Tank_IV.get(1), ItemList.Quantum_Chest_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, "Titanium", 1) }, + GTOreDictUnificator.get(OrePrefixes.pipeHuge, "Titanium", 1) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.radoxpoly", 576), FluidRegistry.getFluidStack("molten.chromaticglass", 1440), FluidRegistry.getFluidStack("molten.metastable oganesson", 1000), @@ -128,31 +127,31 @@ public void addMachineBlockRecipe() { } public void addRingRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.BoxRing, 1, 0)) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 64), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 64), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 64), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 64), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 64), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 64), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 64), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 64), ItemList.Field_Generator_IV.get(4), new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }) .fluidInputs(FluidRegistry.getFluidStack("molten.tanmolyium beta-c", 51840)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.BoxRing)) .metadata(RESEARCH_TIME, 48000) .itemOutputs(new ItemStack(BlockRegister.BoxRing2, 1, 0)) .itemInputs( - GT_OreDictUnificator.get("ringLaurenium", 64), - GT_OreDictUnificator.get("ringLaurenium", 64), - GT_OreDictUnificator.get("ringLaurenium", 64), - GT_OreDictUnificator.get("ringLaurenium", 64), - GT_OreDictUnificator.get("blockAdvancedNitinol", 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Tritanium, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Tritanium, 64), + GTOreDictUnificator.get("ringLaurenium", 64), + GTOreDictUnificator.get("ringLaurenium", 64), + GTOreDictUnificator.get("ringLaurenium", 64), + GTOreDictUnificator.get("ringLaurenium", 64), + GTOreDictUnificator.get("blockAdvancedNitinol", 16), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Tritanium, 64), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Tritanium, 64), ItemList.Field_Generator_UV.get(4), ItemList.ZPM_Coil.get(48)) .fluidInputs( @@ -161,26 +160,26 @@ public void addRingRecipe() { .eut(TierEU.RECIPE_UV) .duration(2000) .addTo(AssemblyLine); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxRing2), 48000000, 10240, 8000000, 32, - new Object[] { GT_OreDictUnificator.get("ringAstralTitanium", 64), - GT_OreDictUnificator.get("ringAstralTitanium", 64), GT_OreDictUnificator.get("ringAstralTitanium", 64), - GT_OreDictUnificator.get("ringAstralTitanium", 64), - GT_OreDictUnificator.get("plateDenseAstralTitanium", 64), + new Object[] { GTOreDictUnificator.get("ringAstralTitanium", 64), + GTOreDictUnificator.get("ringAstralTitanium", 64), GTOreDictUnificator.get("ringAstralTitanium", 64), + GTOreDictUnificator.get("ringAstralTitanium", 64), + GTOreDictUnificator.get("plateDenseAstralTitanium", 64), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 32 }, - GT_OreDictUnificator.get("batteryUMV", 4), ItemList.Field_Generator_UEV.get(4), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, "Titanium", 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, "Titanium", 1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, "Titanium", 1), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, "Titanium", 1) }, + GTOreDictUnificator.get("batteryUMV", 4), ItemList.Field_Generator_UEV.get(4), + GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), + GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), + GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), + GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 64, 12), + GTOreDictUnificator.get(OrePrefixes.pipeSmall, "Titanium", 1), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, "Titanium", 1), + GTOreDictUnificator.get(OrePrefixes.pipeLarge, "Titanium", 1), + GTOreDictUnificator.get(OrePrefixes.pipeHuge, "Titanium", 1) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.radoxpoly", 640000), FluidRegistry.getFluidStack("molten.chromaticglass", 14400), FluidRegistry.getFluidStack("molten.metastable oganesson", 32000), @@ -192,32 +191,32 @@ public void addRingRecipe() { // Normally - R1-Assembler; R2-AssemblyLine; R3-ResearchAssemblyLine public void addModuleRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 0)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 1), ItemList.Machine_Multi_LargeChemicalReactor.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 811), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 16)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 811), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 16)) .fluidInputs( FluidRegistry.getFluidStack("glue", 8000), FluidRegistry.getFluidStack("tetrafluoroethylene", 128000)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 1)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 876), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 14101), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 43), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 44)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 876), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 14101), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 43), + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 64, 44)) .fluidInputs(FluidRegistry.getFluidStack("glue", 16000)) .eut(TierEU.RECIPE_LuV) .duration(1200) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 2)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 1), @@ -230,14 +229,14 @@ public void addModuleRecipe() { .eut(TierEU.RECIPE_LuV) .duration(2400) .addTo(GTPPRecipeMaps.chemicalPlantRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 3)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 1), ItemList.Machine_Multi_Furnace.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 849), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 862), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31023), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 849), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 862), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31023), ItemList.Casing_Coil_Cupronickel.get(64), ItemList.LuV_Coil.get(64), ItemList.Casing_Firebox_Titanium.get(64), @@ -246,37 +245,37 @@ public void addModuleRecipe() { .eut(TierEU.RECIPE_LuV) .duration(2400) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 860)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 860)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 4)) .itemInputs( new ItemStack(BlockRegister.BoxRing2, 2), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 860), - GT_ModHandler.getModItem(GregTech.ID, "gt.metaitem.01", 64, 32764), - GT_ModHandler.getModItem(OpenComputers.ID, "item", 9, 103), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 9, 15470), - GT_ModHandler.getModItem(OpenComputers.ID, "item", 1, 69), - GT_ModHandler.getModItem(TecTech.ID, "gt.blockcasingsTT", 9, 3), - GT_OreDictUnificator.get("wireGt01SuperconductorUV", 9)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 860), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.01", 64, 32764), + GTModHandler.getModItem(OpenComputers.ID, "item", 9, 103), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 9, 15470), + GTModHandler.getModItem(OpenComputers.ID, "item", 1, 69), + GTModHandler.getModItem(TecTech.ID, "gt.blockcasingsTT", 9, 3), + GTOreDictUnificator.get("wireGt01SuperconductorUV", 9)) .fluidInputs(FluidRegistry.getFluidStack("refinedglue", 8000)) .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 31077)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 31077)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 5)) .itemInputs( new ItemStack(BlockRegister.BoxRing2, 2), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31077), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31065), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4), - GT_ModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 16, 32044), - GT_ModHandler.getModItem(ExtraUtilities.ID, "nodeUpgrade", 64, 2), - GT_ModHandler.getModItem(GTPlusPlus.ID, "dummyResearch", 1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockcasings9", 4, 1), - GT_ModHandler.getModItem(Chisel.ID, "netherStarChisel", 1)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31077), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31065), + GTModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4), + GTModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 16, 32044), + GTModHandler.getModItem(ExtraUtilities.ID, "nodeUpgrade", 64, 2), + GTModHandler.getModItem(GTPlusPlus.ID, "dummyResearch", 1), + GTModHandler.getModItem(GregTech.ID, "gt.blockcasings9", 4, 1), + GTModHandler.getModItem(Chisel.ID, "netherStarChisel", 1)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), FluidRegistry.getFluidStack("ic2pahoehoelava", 128000), @@ -284,44 +283,44 @@ public void addModuleRecipe() { .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 992)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 992)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 6)) .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 792), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 992), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 859), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 797), - GT_ModHandler.getModItem(AE2Stuff.ID, "Inscriber", 1), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 792), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 992), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 859), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 797), + GTModHandler.getModItem(AE2Stuff.ID, "Inscriber", 1), ItemList.Component_Sawblade_Diamond.get(1), ItemList.Shape_Extruder_Ingot.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32152), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 798), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31075), - GT_OreDictUnificator.get("wireGt01SuperconductorUV", 6), - GT_ModHandler.getModItem(ThaumicBases.ID, "voidAnvil", 16), + GTModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32152), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 798), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31075), + GTOreDictUnificator.get("wireGt01SuperconductorUV", 6), + GTModHandler.getModItem(ThaumicBases.ID, "voidAnvil", 16), new ItemStack(BlockRegister.BoxRing2, 2)) .fluidInputs(FluidRegistry.getFluidStack("refinedglue", 8000)) .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 850)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 850)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModule, 1, 7)) .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 850), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 796), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 790), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 840), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 850), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 796), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 790), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 840), GregtechItemList.SimpleDustWasher_UV.get(1), - GT_OreDictUnificator.get("stickLongNeutronium", 2), + GTOreDictUnificator.get("stickLongNeutronium", 2), ItemList.Electric_Motor_UV.get(16), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.2", 64, 6), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10862), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10500), - GT_OreDictUnificator.get("dustCooledMonaziteRareEarthConcentrate", 64), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.2", 64, 6), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10862), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10500), + GTOreDictUnificator.get("dustCooledMonaziteRareEarthConcentrate", 64), new ItemStack(BlockRegister.BoxRing2, 2)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), @@ -329,37 +328,37 @@ public void addModuleRecipe() { .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 12730), + TTRecipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 12730), 25600, 64, 8000000, 16, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 791), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12730), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12731), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 791), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12730), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12731), ItemList.Casing_Coil_Cupronickel.get(64), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.QuintupleCompressedCoalCoke", 2), - GT_OreDictUnificator.get("dustDarkAsh", 64), ItemList.Reactor_Coolant_Sp_6.get(1), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.QuintupleCompressedCoalCoke", 2), + GTOreDictUnificator.get("dustDarkAsh", 64), ItemList.Reactor_Coolant_Sp_6.get(1), new ItemStack(BlockRegister.BoxRing3, 4), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000), FluidRegistry.getFluidStack("cryotheum", 256000), FluidRegistry.getFluidStack("pyrotheum", 256000) }, new ItemStack(BlockRegister.BoxModule, 1, 8), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 17001), + TTRecipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 17001), 102400, 256, 8000000, 64, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15145), ItemList.Casing_Grate.get(64), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15145), ItemList.Casing_Grate.get(64), ItemList.Casing_Grate.get(64), ItemList.Casing_Assembler.get(64), ItemList.Casing_Assembler.get(64), ItemList.Casing_Assembler.get(64), ItemList.Casing_Assembler.get(64), ItemList.Machine_Multi_Assemblyline.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 13532), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 13532), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 13532), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 13532), new ItemStack(BlockRegister.BoxRing3, 4), ItemList.Hatch_Input_Multi_2x2_UEV.get(4), ItemList.Casing_SolidSteel.get(64), ItemList.Casing_SolidSteel.get(64), ItemList.Hatch_Output_Bus_ME.get(1) }, @@ -368,58 +367,58 @@ public void addModuleRecipe() { new ItemStack(BlockRegister.BoxModule, 1, 9), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 31150), + TTRecipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 31150), 51200, 128, 8000000, 32, new ItemStack[] { new ItemStack(BlockRegister.BoxRing3, 4), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31150), - GT_OreDictUnificator.get("blockGlassUMV", 64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15497), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31150), + GTOreDictUnificator.get("blockGlassUMV", 64), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15497), ItemList.Casing_Coil_AwakenedDraconium.get(16), ItemList.Casing_Coil_Infinity.get(8), ItemList.Casing_Coil_Hypogen.get(4), ItemList.Casing_Coil_Eternal.get(2), - GT_OreDictUnificator.get("wireGt01SuperconductorUIV", 30) }, + GTOreDictUnificator.get("wireGt01SuperconductorUIV", 30) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.mutatedlivingsolder", 256000), FluidRegistry.getFluidStack("lubricant", 256000) }, new ItemStack(BlockRegister.BoxModule, 1, 10), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15472), + TTRecipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15472), 100000, 100, 10000000, 10, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), ItemList.Sensor_UEV.get(32), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LaserEmitter", 1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15165), ItemList.Emitter_UEV.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15265), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), ItemList.Sensor_UEV.get(32), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), ItemList.Sensor_UEV.get(32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LaserEmitter", 1), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15165), ItemList.Emitter_UEV.get(64), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15265), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 15465), ItemList.Sensor_UEV.get(32), new ItemStack(BlockRegister.BoxRing3, 16), }, new FluidStack[] { FluidRegistry.getFluidStack("supercoolant", 256000) }, new ItemStack(BlockRegister.BoxModule, 1, 12), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 1, 3), + TTRecipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 1, 3), (int) TierEU.RECIPE_UEV, 512, (int) TierEU.RECIPE_UIV, 64, - new ItemStack[] { GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockreinforced", 1, 12), - GT_OreDictUnificator.get("compressedDirt4x", 1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 1, 4), - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 1, 10), + new ItemStack[] { GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 64, 3), + GTModHandler.getModItem(GregTech.ID, "gt.blockreinforced", 1, 12), + GTOreDictUnificator.get("compressedDirt4x", 1), + GTModHandler.getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 1, 4), + GTModHandler.getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 1, 10), new ItemStack(BlockRegister.BoxRing3, 32), }, new FluidStack[] { FluidRegistry.getFluidStack("grade8purifiedwater", 256000) }, new ItemStack(BlockRegister.BoxModule, 1, 13), @@ -429,149 +428,149 @@ public void addModuleRecipe() { // All - ResearchAssemblyLine public void addUpgradeModuleRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.BoxModule, 1, 0)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 0)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 8), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31072), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31050), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31051), - GT_ModHandler.getModItem(GTPlusPlus.ID, "miscutils.blockcasings", 48, 8), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockspecialcasings.1", 56, 13)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31072), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31050), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31051), + GTModHandler.getModItem(GTPlusPlus.ID, "miscutils.blockcasings", 48, 8), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockspecialcasings.1", 56, 13)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), FluidRegistry.getFluidStack("ic2uumatter", 128000)) .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.BoxModule, 1, 1)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 1)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 8), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 32018), - GT_ModHandler.getModItem(GoodGenerator.ID, "preciseUnitCasing", 64, 2), - GT_ModHandler.getModItem(Avaritia.ID, "Dire_Crafting", 64), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 64, 1), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 32, 2), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 16, 3), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 8, 4)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 32018), + GTModHandler.getModItem(GoodGenerator.ID, "preciseUnitCasing", 64, 2), + GTModHandler.getModItem(Avaritia.ID, "Dire_Crafting", 64), + GTModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 64, 1), + GTModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 32, 2), + GTModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 16, 3), + GTModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 8, 4)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), FluidRegistry.getFluidStack("naquadah based liquid fuel mkii (depleted)", 128000)) .eut(TierEU.RECIPE_UHV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.BoxModule, 1, 2)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 2)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 8), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 998), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockspecialcasings.2", 64, 3), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blocktieredcasings.1", 16, 9), - GT_ModHandler.getModItem(GalacticraftCore.ID, "item.buggy", 1)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 998), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockspecialcasings.2", 64, 3), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blocktieredcasings.1", 16, 9), + GTModHandler.getModItem(GalacticraftCore.ID, "item.buggy", 1)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), FluidRegistry.getFluidStack("fluid.rocketfuelmixa", 128000)) .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, new ItemStack(BlockRegister.BoxModule, 1, 3)) .metadata(RESEARCH_TIME, 12000) .itemOutputs(new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 3)) .itemInputs( new ItemStack(BlockRegister.BoxRing, 8), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 828), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.2", 32, 9), - GT_ModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 4, 32105), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustRadioactiveMineralMix", 1)) + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 828), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.2", 32, 9), + GTModHandler.getModItem(GTPlusPlus.ID, "MU-metaitem.01", 4, 32105), + GTModHandler.getModItem(GTPlusPlus.ID, "itemDustRadioactiveMineralMix", 1)) .fluidInputs( FluidRegistry.getFluidStack("refinedglue", 8000), FluidRegistry.getFluidStack("plasma.hydrogen", 12800)) .eut(TierEU.RECIPE_UV) .duration(1200) .addTo(AssemblyLine); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 4), 256000, 512, 8000000, 16, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 356), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12735), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 64, 3), - GT_OreDictUnificator.get("gemExquisitePrasiolite", 64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 8, 14), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 16, 10), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 32, 12), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 64, 13), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 356), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12735), + GTModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 64, 3), + GTOreDictUnificator.get("gemExquisitePrasiolite", 64), + GTModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 8, 14), + GTModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 16, 10), + GTModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 32, 12), + GTModHandler.getModItem(GregTech.ID, "gt.blockcasings8", 64, 13), ItemList.Circuit_Parts_ResistorXSMD.get(64), ItemList.Circuit_Parts_CapacitorXSMD.get(64), ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_TransistorXSMD.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32728), - GT_ModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32107), - GT_ModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32105), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32728), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32107), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.03", 64, 32105), new ItemStack(BlockRegister.BoxRing2, 16) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000), FluidRegistry.getFluidStack("supercoolant", 320000) }, new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 4), 2000, (int) TierEU.RECIPE_UIV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 5), 128000, 256, 8000000, 4, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 965), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 975), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 8, 32022), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 8, 32023), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.3", 64, 13), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.6", 64, 1), - GT_ModHandler.getModItem(GoodGenerator.ID, "compactFusionCoil", 24, 2), - GT_ModHandler.getModItem(GoodGenerator.ID, "compactFusionCoil", 24, 4), - GT_OreDictUnificator.get("batteryMAX", 1), new ItemStack(BlockRegister.BoxRing2, 16) }, + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 965), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 975), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 8, 32022), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 8, 32023), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.3", 64, 13), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.6", 64, 1), + GTModHandler.getModItem(GoodGenerator.ID, "compactFusionCoil", 24, 2), + GTModHandler.getModItem(GoodGenerator.ID, "compactFusionCoil", 24, 4), + GTOreDictUnificator.get("batteryMAX", 1), new ItemStack(BlockRegister.BoxRing2, 16) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000), FluidRegistry.getFluidStack("molten.metastable oganesson", 64000), FluidRegistry.getFluidStack("plasma.radon", 288000) }, new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 5), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 6), 64000, 128, 8000000, 1, - new Object[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1132), + new Object[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1132), ItemList.Electric_Motor_UEV.get(32), ItemList.Electric_Piston_UEV.get(8), ItemList.Electric_Pump_UEV.get(16), ItemList.Conveyor_Module_UEV.get(8), ItemList.Robot_Arm_UEV.get(8), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4 }, - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 32), - GT_OreDictUnificator.get("rotorAstralTitanium", 16), new ItemStack(BlockRegister.BoxRing2, 16), }, + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Titanium, 32), + GTOreDictUnificator.get("rotorAstralTitanium", 16), new ItemStack(BlockRegister.BoxRing2, 16), }, new FluidStack[] { FluidRegistry.getFluidStack("lubricant", 128000), FluidRegistry.getFluidStack("grade7purifiedwater", 256000) }, new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 6), 2000, (int) TierEU.RECIPE_UEV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 7), 10240, 16, 2000000, 1, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10501), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12712), - GT_OreDictUnificator.get("blockGlassUEV", 64), GT_OreDictUnificator.get("slabWood", 1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12718), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 4, 26), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 10501), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12712), + GTOreDictUnificator.get("blockGlassUEV", 64), GTOreDictUnificator.get("slabWood", 1), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12718), + GTModHandler.getModItem(UniversalSingularities.ID, "universal.general.singularity", 4, 26), new ItemStack(BlockRegister.BoxRing2, 16), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 128000), FluidRegistry.getFluidStack("grade6purifiedwater", 256000), @@ -580,23 +579,22 @@ public void addUpgradeModuleRecipe() { new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 7), 2000, (int) TierEU.RECIPE_UHV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 8), 81920000, 32768, (int) TierEU.RECIPE_UMV, 16, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 357), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1006), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1004), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15310), - GT_OreDictUnificator.get("naniteWhiteDwarfMatter", 1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 581), - ItemList.Casing_Coil_Eternal.get(64), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 3, 15470), - GT_ModHandler.getModItem(TecTech.ID, "gt.blockcasingsBA0", 32, 10), - GT_ModHandler.getModItem(TecTech.ID, "gt.blockcasingsBA0", 32, 11), - GT_ModHandler.getModItem(TecTech.ID, "gt.stabilisation_field_generator", 1), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 357), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1006), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1004), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 15310), + GTOreDictUnificator.get("naniteWhiteDwarfMatter", 1), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 581), ItemList.Casing_Coil_Eternal.get(64), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 3, 15470), + GTModHandler.getModItem(TecTech.ID, "gt.blockcasingsBA0", 32, 10), + GTModHandler.getModItem(TecTech.ID, "gt.blockcasingsBA0", 32, 11), + GTModHandler.getModItem(TecTech.ID, "gt.stabilisation_field_generator", 1), new ItemStack(BlockRegister.BoxRing3, 32), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 10240000), FluidRegistry.getFluidStack("primordialmatter", 8000), FluidRegistry.getFluidStack("exciteddtsc", 8000), @@ -604,22 +602,22 @@ public void addUpgradeModuleRecipe() { new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 8), 2000, (int) TierEU.RECIPE_UXV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 9), 10240000, 6144, (int) TierEU.RECIPE_UIV, 16, - new ItemStack[] { GT_ModHandler.getModItem(GoodGenerator.ID, "componentAssemblylineCasing", 16, 10), - GT_ModHandler.getModItem(GoodGenerator.ID, "componentAssemblylineCasing", 16, 10), - GT_OreDictUnificator.get("blockSpaceTime", 4), GT_OreDictUnificator.get("blockSpaceTime", 8), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 32026), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12734), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 14006), - GT_OreDictUnificator.get("blockSpaceTime", 16), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockTinyTNT", 1), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockTinyTNT", 1), - GT_OreDictUnificator.get("blockSpaceTime", 4), GT_OreDictUnificator.get("blockSpaceTime", 8), + new ItemStack[] { GTModHandler.getModItem(GoodGenerator.ID, "componentAssemblylineCasing", 16, 10), + GTModHandler.getModItem(GoodGenerator.ID, "componentAssemblylineCasing", 16, 10), + GTOreDictUnificator.get("blockSpaceTime", 4), GTOreDictUnificator.get("blockSpaceTime", 8), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 32026), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 12734), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 14006), + GTOreDictUnificator.get("blockSpaceTime", 16), + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockTinyTNT", 1), + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockTinyTNT", 1), + GTOreDictUnificator.get("blockSpaceTime", 4), GTOreDictUnificator.get("blockSpaceTime", 8), new ItemStack(BlockRegister.BoxRing3, 32), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 10240000), FluidRegistry.getFluidStack("glyceryl", 128000), @@ -628,21 +626,20 @@ public void addUpgradeModuleRecipe() { new ItemStack(BlockRegister.BoxModuleUpgrad, 1, 9), 2000, (int) TierEU.RECIPE_UIV); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 10), 20480000, 10240, (int) TierEU.RECIPE_UMV, 16, - new ItemStack[] { GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31151), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 16999), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 799), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", 64, 14), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", 64, 10), - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.4", 64, 4), - GT_ModHandler.getModItem(GoodGenerator.ID, "FRF_Coil_3", 64), - GT_OreDictUnificator.get("lensOrundum", 1), - GT_OreDictUnificator.get("rotorExtremelyUnstableNaquadah", 16), ItemList.Timepiece.get(1), + new ItemStack[] { GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 31151), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 16999), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 799), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", 64, 14), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", 64, 10), + GTModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.4", 64, 4), + GTModHandler.getModItem(GoodGenerator.ID, "FRF_Coil_3", 64), GTOreDictUnificator.get("lensOrundum", 1), + GTOreDictUnificator.get("rotorExtremelyUnstableNaquadah", 16), ItemList.Timepiece.get(1), ItemList.NaquadriaSupersolid.get(1), ItemList.SuperconductorComposite.get(1), ItemList.StableAdhesive.get(1), new ItemStack(BlockRegister.BoxRing3, 32), }, new FluidStack[] { FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 10240000), @@ -659,18 +656,18 @@ public void addUpgradeModuleRecipe() { "FCF", "DED", 'A', - GT_ModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1), + GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1), 'B', - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 14001), + GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 14001), 'C', - GT_ModHandler.getModItem(GalacticraftMars.ID, "tile.marsMachine", 1, 4), + GTModHandler.getModItem(GalacticraftMars.ID, "tile.marsMachine", 1, 4), 'F', - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StargateShieldingFoil", 1), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StargateShieldingFoil", 1), 'E', new ItemStack(BlockRegister.BoxModule, 1, 10), 'D', - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 1)); - TT_recipeAdder.addResearchableAssemblylineRecipe( + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 1)); + TTRecipeAdder.addResearchableAssemblylineRecipe( new ItemStack(BlockRegister.BoxModule, 1, 13), (int) TierEU.UXV, 32767, @@ -680,9 +677,9 @@ public void addUpgradeModuleRecipe() { ItemList.Electric_Motor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), ItemList.Emitter_UXV.get(64), ItemList.Electric_Piston_UXV.get(64), ItemList.Sensor_UXV.get(64), ItemList.Robot_Arm_UXV.get(64), ItemList.GigaChad.get(1), - GT_ModHandler.getModItem(TecTech.ID, "gt.stabilisation_field_generator", 48, 8), - GT_OreDictUnificator.get("batteryERV", 16), GT_OreDictUnificator.get("ingotTitanium", 1), - GT_OreDictUnificator.get("ingotSilver", 1) }, + GTModHandler.getModItem(TecTech.ID, "gt.stabilisation_field_generator", 48, 8), + GTOreDictUnificator.get("batteryERV", 16), GTOreDictUnificator.get("ingotTitanium", 1), + GTOreDictUnificator.get("ingotSilver", 1) }, new FluidStack[] { FluidRegistry.getFluidStack("molten.magnetohydrodynamicallyconstrainedstarmatter", 20000000), FluidRegistry.getFluidStack("molten.shirabon", 20000000), @@ -693,14 +690,14 @@ public void addUpgradeModuleRecipe() { Integer.MAX_VALUE - 1); // This is the debug test module recipe, maybe oneday we can re-add it... /* - * TT_recipeAdder.addResearchableAssemblylineRecipe( - * GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 1145), + * TTRecipeAdder.addResearchableAssemblylineRecipe( + * GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 1145), * Integer.MAX_VALUE - 1, * 32767, * Integer.MAX_VALUE - 1, * 96, * new ItemStack[]{ - * GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 4, 1145), + * GTModHandler.getModItem(GregTech.ID, "gt.blockmachines", 4, 1145), * ItemList.Electric_Motor_UXV.get(64), * ItemList.Electric_Pump_UXV.get(64), * ItemList.Emitter_UXV.get(64), @@ -708,14 +705,14 @@ public void addUpgradeModuleRecipe() { * ItemList.Sensor_UXV.get(64), * ItemList.Robot_Arm_UXV.get(64), * ItemList.GigaChad.get(1), - * GT_ModHandler.getModItem(SGCraft.ID, "stargateRing", 8, 0), - * GT_ModHandler.getModItem(SGCraft.ID, "stargateRing", 4, 1), - * GT_ModHandler.getModItem(SGCraft.ID, "stargateBase", 1), - * GT_OreDictUnificator.get("batteryERV", 64), + * GTModHandler.getModItem(SGCraft.ID, "stargateRing", 8, 0), + * GTModHandler.getModItem(SGCraft.ID, "stargateRing", 4, 1), + * GTModHandler.getModItem(SGCraft.ID, "stargateBase", 1), + * GTOreDictUnificator.get("batteryERV", 64), * new ItemStack(BlockRegister.BoxRing3, 64), * new ItemStack(BlockRegister.BoxRing3, 64), - * GT_OreDictUnificator.get("ingotTitanium", 1), - * GT_OreDictUnificator.get("ingotSilver", 1) + * GTOreDictUnificator.get("ingotTitanium", 1), + * GTOreDictUnificator.get("ingotSilver", 1) * }, * new FluidStack[]{ * FluidRegistry.getFluidStack("molten.magnetohydrodynamicallyconstrainedstarmatter", 2000000000), diff --git a/src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineBox.java b/src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineBox.java index cd9859b..1586041 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineBox.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/tileentities/GTMachineBox.java @@ -6,9 +6,9 @@ import static com.silvermoon.boxplusplus.common.BoxModule.getModuleByIndex; import static com.silvermoon.boxplusplus.common.BoxModule.transMachinesToModule; import static com.silvermoon.boxplusplus.util.Util.*; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.io.IOException; import java.util.*; @@ -26,8 +26,6 @@ import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.util.FluidPatternDetails; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -54,26 +52,27 @@ import appeng.api.AEApi; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gregtech.common.misc.WirelessNetworkManager; import gregtech.common.tileentities.machines.IDualInputHatch; import gregtech.common.tileentities.machines.IDualInputInventory; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyTunnel; -public class GTMachineBox extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase - implements ISurvivalConstructable { +public class GTMachineBox extends MTEExtendedPowerMultiBlockBase implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MainFrames = "Mainframes"; private static final String STRUCTURE_PIECE_FirstRing = "FirstRing"; @@ -954,8 +953,8 @@ public IStructureDefinition getStructureDefinition() { } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(i18n("tile.boxplusplus.boxtype")) .addInfo(i18n("tile.boxplusplus.boxinfo.02")) .addInfo(i18n("tile.boxplusplus.boxinfo.03")) @@ -1324,12 +1323,12 @@ && checkPiece(STRUCTURE_PIECE_Final, 23, 5, 20)) { } } // If you want it, then you'll have to take it. - for (GT_MetaTileEntity_Hatch hatch : getExoticEnergyHatches()) { - if (hatch instanceof GT_MetaTileEntity_Hatch_EnergyMulti && ringCount == 1) { + for (MTEHatch hatch : getExoticEnergyHatches()) { + if (hatch instanceof MTEHatchEnergyMulti && ringCount == 1) { machineError[0] = 5; return false; } - if (hatch instanceof GT_MetaTileEntity_Hatch_EnergyTunnel && !moduleActive[12]) { + if (hatch instanceof MTEHatchEnergyTunnel && !moduleActive[12]) { machineError[0] = 6; return false; } @@ -1432,7 +1431,7 @@ private void calTime() { mMaxProgresstime = Math.max((int) Math.pow(recipe.FinalTime, 0.2), 10); return; } - GT_OverclockCalculator cal = new GT_OverclockCalculator().setRecipeEUt(recipe.FinalVoteage) + OverclockCalculator cal = new OverclockCalculator().setRecipeEUt(recipe.FinalVoteage) .setDuration((int) recipe.FinalTime) .setEUt(getMaxInputEu()); switch (ringCount) { @@ -1695,8 +1694,8 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_WHITELIST); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_WHITELIST); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.01")) @@ -1712,8 +1711,8 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_CYCLIC); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_CYCLIC); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.02")) @@ -1732,8 +1731,8 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_IMPORT); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_IMPORT); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.03")) @@ -1747,8 +1746,8 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.1")) @@ -1782,8 +1781,8 @@ protected ModularWindow createModuleWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module.20")) @@ -1806,8 +1805,8 @@ protected ModularWindow createModuleWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module.21")) @@ -1826,8 +1825,8 @@ protected ModularWindow createModuleWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module.22")) @@ -2081,7 +2080,7 @@ protected ModularWindow createModuleWindow(final EntityPlayer player) { */ protected ModularWindow createSingleModuleWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(150, 200); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); builder.widget( ButtonWidget.closeWindowButton(true) @@ -2122,8 +2121,8 @@ protected ModularWindow createSingleModuleWindow(final EntityPlayer player) { .setSize(20, 20) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_CHECKMARK); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_CHECKMARK); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module.16")) @@ -2141,8 +2140,8 @@ protected ModularWindow createSingleModuleWindow(final EntityPlayer player) { .setSize(20, 20) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_CROSS); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_CROSS); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module.16a")) @@ -2158,7 +2157,7 @@ protected ModularWindow createSingleModuleWindow(final EntityPlayer player) { */ protected ModularWindow createInitialingWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(260, 215); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); randomSN = new ArrayList<>(); @@ -2166,7 +2165,7 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { randomSN.add(new Random().nextInt(5) + 1); } builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_ARROW_GREEN_UP) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_ARROW_GREEN_UP) .setPos(5, 5) .setSize(16, 16)) .widget( @@ -2186,8 +2185,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.30")) @@ -2212,8 +2211,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.31")) @@ -2242,8 +2241,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.09")) @@ -2262,8 +2261,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.26")) @@ -2280,14 +2279,14 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { BoxRoutings.checkRouting(this); if (!widget.isClient()) { player.closeScreen(); - GT_UIInfos.openGTTileEntityUI(getBaseMetaTileEntity(), player); + GTUIInfos.openGTTileEntityUI(getBaseMetaTileEntity(), player); } }) .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.08") + (routingMap.size() + 1)) @@ -2302,13 +2301,13 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(110, 180)); // Error X builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CROSS) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CROSS) .setPos(140, 71) .setSize(24, 24) .addTooltip(i18n("tile.boxplusplus.boxUI.ErrorCode." + routingStatus)) .setEnabled(routingStatus != 0 && !recipe.islocked)) .widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CHECKMARK) .setPos(140, 71) .setSize(36, 36) .addTooltip(i18n("tile.boxplusplus.boxUI.19")) @@ -2324,8 +2323,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(32, 32) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.20")) @@ -2344,7 +2343,7 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(14, 14) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); + UI.add(GTUITextures.BUTTON_STANDARD); UI.add(AdaptableUITexture.of(Tags.MODID, "textures/gui/double.png", 16, 16, 1)); return UI.toArray(new IDrawable[0]); }) @@ -2364,7 +2363,7 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(14, 14) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); + UI.add(GTUITextures.BUTTON_STANDARD); UI.add(AdaptableUITexture.of(Tags.MODID, "textures/gui/halve.png", 16, 16, 1)); return UI.toArray(new IDrawable[0]); }) @@ -2381,7 +2380,7 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(14, 14) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); + UI.add(GTUITextures.BUTTON_STANDARD); UI.add(AdaptableUITexture.of(Tags.MODID, "textures/gui/AE.png", 16, 16, 1)); return UI.toArray(new IDrawable[0]); }) @@ -2398,7 +2397,7 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(14, 14) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); + UI.add(GTUITextures.BUTTON_STANDARD); UI.add(AdaptableUITexture.of(Tags.MODID, "textures/gui/clear.png", 16, 16, 1)); return UI.toArray(new IDrawable[0]); }) @@ -2414,8 +2413,8 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { .setSize(32, 32) .setBackground(() -> { List ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - ret.add(GT_UITextures.OVERLAY_BUTTON_WHITELIST); + ret.add(GTUITextures.BUTTON_STANDARD); + ret.add(GTUITextures.OVERLAY_BUTTON_WHITELIST); return ret.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.21")) @@ -2431,11 +2430,11 @@ protected ModularWindow createInitialingWindow(final EntityPlayer player) { */ protected ModularWindow createRoutingWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(220, 200); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) .setPos(5, 5) .setSize(16, 16)) .widget(new TextWidget(i18n("tile.boxplusplus.boxUI.10") + moduleSN).setPos(25, 9)) @@ -2566,7 +2565,7 @@ protected ModularWindow createRoutingWindow(final EntityPlayer player) { .setTextColor(Color.WHITE.normal) .setTextAlignment(Alignment.Center) .addTooltip(i18n("tile.boxplusplus.boxUI.24")) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD) .setSize(60, 12) .setPos(50, 171) .setEnabled(!recipe.islocked)) @@ -2584,7 +2583,7 @@ protected ModularWindow createRoutingWindow(final EntityPlayer player) { */ protected ModularWindow createImportWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(300, 48); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); TextFieldWidget textField = new TextFieldWidget() { @@ -2600,7 +2599,7 @@ public boolean onKeyPressed(char character, int keyCode) { return super.onKeyPressed(character, keyCode); } - @NotNull + @org.jetbrains.annotations.NotNull public String getText() { if (handler.getText() .isEmpty()) { @@ -2631,7 +2630,7 @@ public void onRemoveFocus() { .setTextAlignment(Alignment.CenterLeft) .setTextColor(Color.WHITE.dark(1)) .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) .setPos(5, 16) .setSize(250, 16)) .widget(new ButtonWidget().setOnClick((clickData, widget) -> { @@ -2666,8 +2665,8 @@ public void onRemoveFocus() { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.30")) @@ -2677,7 +2676,7 @@ public void onRemoveFocus() { protected ModularWindow createExportPatternWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(168, 125); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); TextFieldWidget inputItem = new TextFieldWidget().setValidator(var -> Util.validator(recipe, var, false)); @@ -2687,7 +2686,7 @@ protected ModularWindow createExportPatternWindow(final EntityPlayer player) { inputItem.setTextAlignment(Alignment.CenterLeft) .setTextColor(Color.WHITE.dark(1)) .setFocusOnGuiOpen(false) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) .setPos(12, 10) .addTooltip(i18n("tile.boxplusplus.boxUI.13")) .setSize(60, 12)) @@ -2695,7 +2694,7 @@ protected ModularWindow createExportPatternWindow(final EntityPlayer player) { inputFluid.setTextAlignment(Alignment.CenterLeft) .setTextColor(Color.WHITE.dark(1)) .setFocusOnGuiOpen(false) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) .setPos(96, 10) .addTooltip(i18n("tile.boxplusplus.boxUI.14")) .setSize(60, 12)) @@ -2710,8 +2709,8 @@ protected ModularWindow createExportPatternWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.36")) @@ -2724,7 +2723,7 @@ protected ModularWindow createExportPatternWindow(final EntityPlayer player) { */ protected ModularWindow createClearWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(146, 60 + (randomSN.size() == 1 ? 15 : 0)); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); builder @@ -2768,7 +2767,7 @@ protected ModularWindow createClearWindow(final EntityPlayer player) { .setSize(24, 24) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); + UI.add(GTUITextures.BUTTON_STANDARD); UI.add( AdaptableUITexture.of( Tags.MODID, @@ -2790,10 +2789,10 @@ protected ModularWindow createClearWindow(final EntityPlayer player) { */ protected ModularWindow createFinalRecipeWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(360, 220); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) .setPos(5, 5) .setSize(16, 16)) .widget(new TextWidget(i18n("tile.boxplusplus.boxUI.22")).setPos(25, 9)) @@ -2952,14 +2951,14 @@ protected ModularWindow createFinalRecipeWindow(final EntityPlayer player) { recipe.islocked = true; if (!widget.isClient()) { player.closeScreen(); - GT_UIInfos.openGTTileEntityUI(getBaseMetaTileEntity(), player); + GTUIInfos.openGTTileEntityUI(getBaseMetaTileEntity(), player); } }) .setSize(20, 20) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_CHECKMARK); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_CHECKMARK); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.25")) @@ -2973,11 +2972,11 @@ protected ModularWindow createFinalRecipeWindow(final EntityPlayer player) { */ protected ModularWindow createWikiWindow(final EntityPlayer player) { ModularWindow.Builder builder = ModularWindow.builder(300, 210); - builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); Synchronize(builder); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_NEI) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_NEI) .setPos(5, 5) .setSize(16, 16)) .widget(new TextWidget(i18n("tile.boxplusplus.boxwiki.1")).setPos(25, 9)) @@ -2997,8 +2996,8 @@ protected ModularWindow createWikiWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.3")) @@ -3015,8 +3014,8 @@ protected ModularWindow createWikiWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_BATCH_MODE_ON); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.4")) @@ -3033,8 +3032,8 @@ protected ModularWindow createWikiWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.5")) @@ -3051,8 +3050,8 @@ protected ModularWindow createWikiWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_PROGRESS); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_PROGRESS); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.6")) @@ -3069,8 +3068,8 @@ protected ModularWindow createWikiWindow(final EntityPlayer player) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_WHITELIST); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_WHITELIST); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.7")) @@ -3131,8 +3130,8 @@ private void getwikiByIndex(ModularWindow.Builder builder) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_ARROW_GREEN_DOWN); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_ARROW_GREEN_DOWN); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.0")) @@ -3169,8 +3168,8 @@ private void getwikiByIndex(ModularWindow.Builder builder) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_ARROW_GREEN_DOWN); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_ARROW_GREEN_DOWN); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxwiki.0")) @@ -3193,8 +3192,8 @@ private void getwikiByIndex(ModularWindow.Builder builder) { .setSize(16, 16) .setBackground(() -> { List UI = new ArrayList<>(); - UI.add(GT_UITextures.BUTTON_STANDARD); - UI.add(GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE); + UI.add(GTUITextures.BUTTON_STANDARD); + UI.add(GTUITextures.OVERLAY_BUTTON_EMIT_REDSTONE); return UI.toArray(new IDrawable[0]); }) .addTooltip(i18n("tile.boxplusplus.boxUI.module." + i)) diff --git a/src/main/java/com/silvermoon/boxplusplus/network/MessageRouting.java b/src/main/java/com/silvermoon/boxplusplus/network/MessageRouting.java index 9a55de7..8b46c99 100644 --- a/src/main/java/com/silvermoon/boxplusplus/network/MessageRouting.java +++ b/src/main/java/com/silvermoon/boxplusplus/network/MessageRouting.java @@ -12,7 +12,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; -import gregtech.api.gui.modularui.GT_UIInfos; +import gregtech.api.gui.modularui.GTUIInfos; import io.netty.buffer.ByteBuf; public class MessageRouting implements IMessage { @@ -51,7 +51,7 @@ public IMessage onMessage(MessageRouting message, MessageContext ctx) { GTMachineBox box = Util.boxMap.get(player); box.routingMap.add(new BoxRoutings(message.nbt)); player.openContainer.detectAndSendChanges(); - GT_UIInfos.openGTTileEntityUI(box.getBaseMetaTileEntity(), player); + GTUIInfos.openGTTileEntityUI(box.getBaseMetaTileEntity(), player); } } return null; diff --git a/src/main/java/com/silvermoon/boxplusplus/util/BoxRecipe.java b/src/main/java/com/silvermoon/boxplusplus/util/BoxRecipe.java index 6789e5a..4873ecb 100644 --- a/src/main/java/com/silvermoon/boxplusplus/util/BoxRecipe.java +++ b/src/main/java/com/silvermoon/boxplusplus/util/BoxRecipe.java @@ -17,8 +17,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.util.item.AEItemStack; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class BoxRecipe { @@ -69,9 +69,9 @@ public BoxRecipe(NBTTagCompound nbt) { public static void ItemOnBox(List input, List output) { for (ItemStack iItem : input) { for (ItemStack oItem : output) { - if (GT_Utility.areStacksEqual(oItem, iItem, true) || (oItem.getUnlocalizedName() + if (GTUtility.areStacksEqual(oItem, iItem, true) || (oItem.getUnlocalizedName() .startsWith("item.Circuit") - && GT_OreDictUnificator.isInputStackEqual(iItem, GT_OreDictUnificator.get(oItem)))) { + && GTOreDictUnificator.isInputStackEqual(iItem, GTOreDictUnificator.get(oItem)))) { if (iItem.stackSize == oItem.stackSize) { iItem.stackSize = 0; oItem.stackSize = 0; diff --git a/src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java b/src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java index 4e0d940..9bfd267 100644 --- a/src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java +++ b/src/main/java/com/silvermoon/boxplusplus/util/BoxRoutings.java @@ -1,7 +1,7 @@ package com.silvermoon.boxplusplus.util; import static com.silvermoon.boxplusplus.util.Util.*; -import static gregtech.common.blocks.GT_Item_Machines.getMetaTileEntity; +import static gregtech.common.blocks.ItemMachines.getMetaTileEntity; import java.util.ArrayList; import java.util.Arrays; @@ -19,7 +19,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps; import com.silvermoon.boxplusplus.api.IBoxable; import com.silvermoon.boxplusplus.boxplusplus; import com.silvermoon.boxplusplus.common.tileentities.GTMachineBox; @@ -27,19 +26,20 @@ import com.silvermoon.boxplusplus.network.NetworkLoader; import appeng.container.ContainerNull; +import bartworks.API.recipe.BartWorksRecipeMaps; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeCatalysts; import fox.spiteful.avaritia.crafting.ExtremeShapedOreRecipe; import fox.spiteful.avaritia.crafting.ExtremeShapedRecipe; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; import gregtech.api.enums.*; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.*; -import gregtech.common.items.behaviors.Behaviour_DataOrb; -import gregtech.nei.GT_NEI_DefaultHandler; +import gregtech.common.items.behaviors.BehaviourDataOrb; +import gregtech.nei.GTNEIDefaultHandler; import gtPlusPlus.core.util.minecraft.ItemUtils; public class BoxRoutings { @@ -55,7 +55,7 @@ public class BoxRoutings { public int time; public Long voltage; - public BoxRoutings(GT_Recipe recipe, ItemStack machine) { + public BoxRoutings(GTRecipe recipe, ItemStack machine) { InputItem.addAll(Arrays.asList(recipe.mInputs)); InputItem.removeAll(Collections.singleton(null)); OutputItem.addAll(Arrays.asList(recipe.mOutputs)); @@ -240,9 +240,9 @@ public static void checkRouting(GTMachineBox box) { return; } RecipeMap recipeMap; - GT_Recipe routingRecipe = null; + GTRecipe routingRecipe = null; List allInputItems = box.getStoredInputs(); - for (GT_MetaTileEntity_Hatch_InputBus inputBus : box.mInputBusses) { + for (MTEHatchInputBus inputBus : box.mInputBusses) { for (int i = inputBus.getSizeInventory() - 1; i >= 0; i--) { if (inputBus.getStackInSlot(i) != null) { { @@ -251,14 +251,18 @@ public static void checkRouting(GTMachineBox box) { .getUnlocalizedName() .equals("gt.blockmachines.basicmachine.electromagneticseparator.tier.06")) { recipeMap = RecipeMaps.electroMagneticSeparatorRecipes; - routingRecipe = recipeMap.findRecipe( - box.getBaseMetaTileEntity(), - true, - true, - Long.MAX_VALUE / 10, - box.getStoredFluids() - .toArray(new FluidStack[0]), - allInputItems.toArray(new ItemStack[0])); + routingRecipe = recipeMap.findRecipeQuery() + .items(allInputItems.toArray(new ItemStack[0])) + .fluids( + box.getStoredFluids() + .toArray(new FluidStack[0])) + .voltage(Long.MAX_VALUE / 10) + .dontCheckStackSizes(true) + .notUnificated(true) + .find(); + + // box.getBaseMetaTileEntity(), + if (routingRecipe != null) { box.routingMap.add(new BoxRoutings(routingRecipe.copy(), inputBus.getStackInSlot(i))); box.routingStatus = 0; @@ -297,9 +301,9 @@ public static void checkRouting(GTMachineBox box) { .getRecipeList(); for (Object recipe : recipeList) { if (recipe instanceof ExtremeShapedRecipe exRecipe) { - if (GT_OreDictUnificator.isInputStackEqual( + if (GTOreDictUnificator.isInputStackEqual( item, - GT_OreDictUnificator.get(exRecipe.getRecipeOutput()))) { + GTOreDictUnificator.get(exRecipe.getRecipeOutput()))) { ItemStack[] in = exRecipe.recipeItems; ItemContainer var = new ItemContainer(); for (ItemStack itemIn : in) { @@ -322,15 +326,15 @@ public static void checkRouting(GTMachineBox box) { return; } } else if (recipe instanceof ExtremeShapedOreRecipe exRecipe) { - if (GT_OreDictUnificator.isInputStackEqual(item, exRecipe.getRecipeOutput())) { + if (GTOreDictUnificator.isInputStackEqual(item, exRecipe.getRecipeOutput())) { Object[] in = exRecipe.getInput(); ItemContainer var = new ItemContainer(); for (Object ObjtecIn : in) { if (ObjtecIn == null) continue; if (ObjtecIn instanceof ItemStack itemIn) - var.addItemStack(GT_OreDictUnificator.get(itemIn), 1, 10000); + var.addItemStack(GTOreDictUnificator.get(itemIn), 1, 10000); if (ObjtecIn instanceof ArrayList listIn) var.addItemStack( - GT_OreDictUnificator.get((ItemStack) listIn.get(0)), + GTOreDictUnificator.get((ItemStack) listIn.get(0)), 1, 10000); } @@ -356,8 +360,7 @@ public static void checkRouting(GTMachineBox box) { return; } } - if (getMetaTileEntity( - inputBus.getStackInSlot(i)) instanceof GT_MetaTileEntity_MultiBlockBase RoutingMachine) { + if (getMetaTileEntity(inputBus.getStackInSlot(i)) instanceof MTEMultiBlockBase RoutingMachine) { boxplusplus.LOG.debug(RoutingMachine.mName); List ItemInputs = deepCopyItemList(box.getStoredInputs()); List FluidInputs = deepCopyFluidList(box.getStoredFluids()); @@ -373,7 +376,7 @@ public static void checkRouting(GTMachineBox box) { } case "multimachine.multifurnace" -> { for (ItemStack input : ItemInputs) { - ItemStack output = GT_OreDictUnificator.get( + ItemStack output = GTOreDictUnificator.get( FurnaceRecipes.smelting() .getSmeltingResult(input)); if (output != null) { @@ -482,20 +485,20 @@ public static void checkRouting(GTMachineBox box) { } // We can find assemblyline recipe using the original method, but no need to update it, // nor check it - GT_AssemblyLineUtils.LookupResult tLookupResult = GT_AssemblyLineUtils + AssemblyLineUtils.LookupResult tLookupResult = AssemblyLineUtils .findAssemblyLineRecipeFromDataStick(data, false); - if (tLookupResult.getType() == GT_AssemblyLineUtils.LookupResultType.INVALID_STICK) { + if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) { box.routingStatus = 5; return; } - GT_Recipe.GT_Recipe_AssemblyLine tRecipe = tLookupResult.getRecipe(); + GTRecipe.RecipeAssemblyLine tRecipe = tLookupResult.getRecipe(); ItemStack[] in = Arrays.copyOf(tRecipe.mInputs, tRecipe.mInputs.length); for (int j = 0; j < tRecipe.mOreDictAlt.length; j++) { if (tRecipe.mOreDictAlt[j] == null) continue; - in[j] = GT_OreDictUnificator.get(false, in[j]); + in[j] = GTOreDictUnificator.get(false, in[j]); for (ItemStack replace : ItemInputs) { - if (GT_OreDictUnificator.getAssociation(replace) != null - && GT_OreDictUnificator.isInputStackEqual(replace, in[j])) { + if (GTOreDictUnificator.getAssociation(replace) != null + && GTOreDictUnificator.isInputStackEqual(replace, in[j])) { in[j] = new ItemStack( replace.getItem(), in[j].stackSize, @@ -524,12 +527,13 @@ public static void checkRouting(GTMachineBox box) { // it. // But not anymore. routingRecipe = RoutingMachine.getRecipeMap() - .findRecipe( - box.getBaseMetaTileEntity(), - true, - Long.MAX_VALUE / 10, - FluidInputs.toArray(new FluidStack[0]), - ItemInputs.toArray(new ItemStack[0])); + .findRecipeQuery() + .notUnificated(true) + .voltage(Long.MAX_VALUE / 10) + .fluids(FluidInputs.toArray(new FluidStack[0])) + .items(ItemInputs.toArray(new ItemStack[0])) + .find(); + if (routingRecipe == null) { box.routingStatus = 3; return; @@ -553,8 +557,8 @@ public static void checkRouting(GTMachineBox box) { box.routingStatus = 6; return; } - for (GT_Recipe recipe : recipeMap.getAllRecipes()) { - if (GT_Utility.areStacksEqual( + for (GTRecipe recipe : recipeMap.getAllRecipes()) { + if (GTUtility.areStacksEqual( recipe.mOutputs[0], ItemStack.loadItemStackFromNBT( inputBus.getStackInSlot(i) @@ -592,9 +596,9 @@ public static void checkRouting(GTMachineBox box) { recipeMap = RecipeMaps.replicatorRecipes; Materials replicatorItem = null; for (ItemStack item : ItemInputs) { - if (Behaviour_DataOrb.getDataName(item) + if (BehaviourDataOrb.getDataName(item) .isEmpty()) continue; - replicatorItem = Element.get(Behaviour_DataOrb.getDataName(item)).mLinkedMaterials + replicatorItem = Element.get(BehaviourDataOrb.getDataName(item)).mLinkedMaterials .get(0); break; } @@ -602,12 +606,12 @@ public static void checkRouting(GTMachineBox box) { box.routingStatus = 7; return; } - for (GT_Recipe recipe : recipeMap.getAllRecipes()) { + for (GTRecipe recipe : recipeMap.getAllRecipes()) { if (!(recipe.mSpecialItems instanceof ItemStack[]var1)) { continue; } if (replicatorItem.equals( - Element.get(Behaviour_DataOrb.getDataName(var1[0])).mLinkedMaterials.get(0))) { + Element.get(BehaviourDataOrb.getDataName(var1[0])).mLinkedMaterials.get(0))) { box.routingMap.add(new BoxRoutings(recipe, RoutingMachine.getStackForm(1))); box.routingStatus = 0; return; @@ -638,22 +642,23 @@ public static void checkRouting(GTMachineBox box) { } } ItemInputs.remove(inputBus.getStackInSlot(i)); - if (routingRecipe == null) routingRecipe = recipeMap.findRecipe( - box.getBaseMetaTileEntity(), - true, - true, - Long.MAX_VALUE / 10, - FluidInputs.toArray(new FluidStack[0]), - ItemInputs.toArray(new ItemStack[0])); + if (routingRecipe == null) routingRecipe = recipeMap.findRecipeQuery() + .notUnificated(true) + .dontCheckStackSizes(true) + .voltage(Long.MAX_VALUE / 10) + .items(ItemInputs.toArray(new ItemStack[0])) + .fluids(FluidInputs.toArray(new FluidStack[0])) + .find(); + if (routingRecipe != null) { - GT_Recipe tempRecipe = routingRecipe.copy(); + GTRecipe tempRecipe = routingRecipe.copy(); for (int j = 0; j < tempRecipe.mInputs.length; j++) { if (tempRecipe.mInputs[j] == null) continue; - if (GT_OreDictUnificator.getAssociation(tempRecipe.mInputs[j]) != null) { + if (GTOreDictUnificator.getAssociation(tempRecipe.mInputs[j]) != null) { for (ItemStack si : box.getStoredInputs()) { - if (GT_OreDictUnificator.isInputStackEqual( + if (GTOreDictUnificator.isInputStackEqual( tempRecipe.mInputs[j], - GT_OreDictUnificator.get(false, si))) { + GTOreDictUnificator.get(false, si))) { tempRecipe.mInputs[j] = new ItemStack( si.getItem(), tempRecipe.mInputs[j].stackSize, @@ -675,19 +680,18 @@ public static void checkRouting(GTMachineBox box) { box.routingStatus = 2; } - public static void makeRouting(GT_NEI_DefaultHandler recipe, int recipeIndex, EntityPlayer player) { + public static void makeRouting(GTNEIDefaultHandler recipe, int recipeIndex, EntityPlayer player) { List machineListWithPos = RecipeCatalysts.getRecipeCatalysts(recipe); List machineList = machineListWithPos.stream() .map(v -> v.item) .collect(Collectors.toList()); for (ItemStack machine : machineList) { - if (getMetaTileEntity(machine) instanceof GT_MetaTileEntity_MultiBlockBase mte - && !mte.mName.startsWith("TST") + if (getMetaTileEntity(machine) instanceof MTEMultiBlockBase mte && !mte.mName.startsWith("TST") && !mte.mName.startsWith("name")) { NetworkLoader.instance.sendToServer( new MessageRouting( new BoxRoutings( - ((GT_NEI_DefaultHandler.CachedDefaultRecipe) recipe.arecipes.get(recipeIndex)).mRecipe, + ((GTNEIDefaultHandler.CachedDefaultRecipe) recipe.arecipes.get(recipeIndex)).mRecipe, machine).routingToNbt(), player)); break; diff --git a/src/main/java/com/silvermoon/boxplusplus/util/ResultModuleRequirement.java b/src/main/java/com/silvermoon/boxplusplus/util/ResultModuleRequirement.java index af3943a..24c98ab 100644 --- a/src/main/java/com/silvermoon/boxplusplus/util/ResultModuleRequirement.java +++ b/src/main/java/com/silvermoon/boxplusplus/util/ResultModuleRequirement.java @@ -2,9 +2,14 @@ import static com.silvermoon.boxplusplus.util.Util.i18n; +import javax.annotation.Nonnull; + +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumChatFormatting; +import org.jetbrains.annotations.NotNull; + import gregtech.api.recipe.check.CheckRecipeResult; public class ResultModuleRequirement implements CheckRecipeResult { @@ -33,6 +38,17 @@ public String getDisplayString() { + i18n("tile.boxplusplus_" + (isUpdated ? "boxmoduleplus." : "boxmodule." + required + ".name")); } + @NotNull + @Override + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound tag) { + return null; + } + + @Override + public void readFromNBT(@Nonnull NBTTagCompound tag) { + + } + @Override public CheckRecipeResult newInstance() { return new ResultModuleRequirement(0, false); diff --git a/src/main/java/com/silvermoon/boxplusplus/util/Util.java b/src/main/java/com/silvermoon/boxplusplus/util/Util.java index 74a16b6..64fe5d4 100644 --- a/src/main/java/com/silvermoon/boxplusplus/util/Util.java +++ b/src/main/java/com/silvermoon/boxplusplus/util/Util.java @@ -34,7 +34,7 @@ import appeng.api.definitions.IDefinitions; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; public class Util { @@ -130,7 +130,7 @@ public static ItemStack readBoxItemFromUNBT(NBTTagCompound nbt) { if (itemDamage < 0) { itemDamage = 0; } - ItemStack boxItem = GT_ModHandler + ItemStack boxItem = GTModHandler .getModItem(nbt.getString("modID"), nbt.getString("name"), stackSize, itemDamage); if (nbt.hasKey("tag", 10)) { boxItem.stackTagCompound = nbt.getCompoundTag("tag");