Implement Tier formula

addon.gradle

@@ -29,8 +29,8 @@ minecraft {
             def err = "Cannot automatically determine NBT version. Using defaults hardcoded in buildscript. This could break your world!"
             project.logger.error(err)
             vMajor = 509
-            vMinor = 42
-            vPatch = 55
+            vMinor = 44
+            vPatch = 0
             logLevel = LogLevel.WARN
         }
     }

build.gradle

@@ -1,4 +1,4 @@
-//version: 1690104383
+//version: 1692122114
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -69,7 +69,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -401,9 +401,13 @@ if (identifiedVersion == versionOverride) {
 
 group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
+    base {
+        archivesName = customArchiveBaseName
+    }
 } else {
-    archivesBaseName = modId
+    base {
+        archivesName = modId
+    }
 }
 
 
@@ -558,9 +562,6 @@ repositories {
     maven {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
-        mavenContent {
-            excludeGroup("net.minecraftforge") // missing the `universal` artefact
-        }
     }
     maven {
         name = "GTNH Maven"
@@ -627,6 +628,8 @@ def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
 
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+
 dependencies {
     if (usesMixins.toBoolean()) {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
@@ -638,7 +641,7 @@ dependencies {
         }
     }
     if (usesMixins.toBoolean()) {
-        implementation(modUtils.enableMixins(mixinProviderSpec))
+        implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
     } else if (forceEnableMixins.toBoolean()) {
         runtimeOnlyNonPublishable(mixinProviderSpec)
     }
@@ -691,8 +694,6 @@ if (file('dependencies.gradle.kts').exists()) {
     throw new RuntimeException("Missing dependencies.gradle[.kts]")
 }
 
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-
 tasks.register('generateAssets') {
     group = "GTNH Buildscript"
     description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed"
@@ -775,10 +776,10 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
     }
 
-    java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
+    java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
     java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
     java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
     java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
@@ -1148,7 +1149,10 @@ tasks.named("processIdeaSettings").configure {
 
 tasks.named("ideVirtualMainClasses").configure {
     // Make IntelliJ "Build project" build the mod jars
-    dependsOn("jar", "reobfJar", "spotlessCheck")
+    dependsOn("jar", "reobfJar")
+    if (!disableSpotless) {
+        dependsOn("spotlessCheck")
+    }
 }
 
 // workaround variable hiding in pom processing

dependencies.gradle

@@ -34,33 +34,33 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    api("com.github.GTNewHorizons:StructureLib:1.2.7:dev")
+    api("com.github.GTNewHorizons:StructureLib:1.2.8:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.3.70-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.3.83-GTNH:dev")
     api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
     api("com.github.GTNewHorizons:ModularUI:1.1.16:dev")
     api("com.github.GTNewHorizons:waila:1.6.0:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-235-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.29-gtnh-pre:dev")
-    implementation("com.github.GTNewHorizons:Eternal-Singularity:1.1.0:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-252-GTNH:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.42-gtnh:dev")
+    implementation("com.github.GTNewHorizons:Eternal-Singularity:1.1.2:dev")
 
-    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.2.10:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.34:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.4.21:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.6.10:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.7.10-GTNH:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.14.5:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.2.11:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.36:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.4.24:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.6.14:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.7.12-GTNH:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.14.9:dev") { transitive = false }
 
-    compileOnly("com.github.GTNewHorizons:EnderCore:0.2.16:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.71-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.38-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Chisel:2.11.3-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:EnderCore:0.2.17:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.73-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.39-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.11.4-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.1.2.21:dev") { transitive = false }
     compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.4.19:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.23:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:Botania:1.9.23-GTNH:dev') { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.31:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Botania:1.9.24-GTNH:dev') { transitive = false }
 
     compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
     annotationProcessor("com.google.auto.value:auto-value:1.10.1")

docs/ResourcePacks_Guide.md

@@ -2,15 +2,16 @@ This is a guide for resource packs to set up advanced configurations for GUI.
 
 ## Override text color with mcmeta files
 
-You might want to change color of text if your texture has similar color to text. You can place mcmeta files at the following locations:
-- `gregtech/textures/gui/background/singleblock_default.mcmeta` (most of the machines)
-- `gregtech/textures/gui/background/bronze.mcmeta` (steam bronze machines)
-- `gregtech/textures/gui/background/steel.mcmeta` (steam steel machines)
-- `gregtech/textures/gui/background/primitive.mcmeta` (steam primitive machines)
-- `gregtech/textures/gui/background/fusion_computer.mcmeta` (fusion reactor controller)
-- `modularui/textures/gui/background/vanilla_background.mcmeta` (NEI)
+You might want to change color of text displayed on GUI. You can place mcmeta files at the following locations:
+- `gregtech/textures/gui/background/singleblock_default.png.mcmeta` (most of the machines)
+- `gregtech/textures/gui/background/bronze.png.mcmeta` (steam bronze machines)
+- `gregtech/textures/gui/background/steel.png.mcmeta` (steam steel machines)
+- `gregtech/textures/gui/background/primitive.png.mcmeta` (steam primitive machines)
+- `gregtech/textures/gui/background/fusion_computer.png.mcmeta` (fusion reactor controller)
+- `modularui/textures/gui/background/vanilla_background.png.mcmeta` (NEI)
 
 (and there might be more in the future, but currently these are exhaustive.)
+You also need to place png file corresponding to mcmeta file, even if it's unchanged from the mod's default one.
 
 Here is an example of the file:
 ```json

src/main/java/gregtech/GT_Mod.java

@@ -33,6 +33,7 @@
 import com.google.common.base.Stopwatch;
 
 import appeng.api.AEApi;
+import appeng.helpers.InterfaceTerminalSupportedClassProvider;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
@@ -60,7 +61,6 @@
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.interfaces.internal.IGT_Mod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.XSTR;
 import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
@@ -74,6 +74,7 @@
 import gregtech.api.util.GT_RecipeRegistrator;
 import gregtech.api.util.GT_SpawnEventHandler;
 import gregtech.api.util.GT_Utility;
+import gregtech.api.util.item.ItemHolder;
 import gregtech.common.GT_DummyWorld;
 import gregtech.common.GT_Network;
 import gregtech.common.GT_Proxy;
@@ -84,6 +85,7 @@
 import gregtech.common.misc.GT_Command;
 import gregtech.common.misc.spaceprojects.commands.SPM_Command;
 import gregtech.common.misc.spaceprojects.commands.SP_Command;
+import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME;
 import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
 import gregtech.crossmod.Waila;
 import gregtech.loaders.load.GT_CoverBehaviorLoader;
@@ -272,6 +274,7 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) {
         EntityRegistry.registerModEntity(GT_Entity_Arrow.class, "GT_Entity_Arrow", 1, GT_Values.GT, 160, 1, true);
         EntityRegistry
             .registerModEntity(GT_Entity_Arrow_Potion.class, "GT_Entity_Arrow_Potion", 2, GT_Values.GT, 160, 1, true);
+        InterfaceTerminalSupportedClassProvider.register(GT_MetaTileEntity_Hatch_CraftingInput_ME.class);
 
         GT_PreLoad.runMineTweakerCompat();
 
@@ -804,7 +807,7 @@ public void onIDChangingEvent(FMLModIdMappingEvent aEvent) {
         GT_Utility.reInit();
         GT_Recipe.reInit();
         try {
-            for (Map<? extends GT_ItemStack, ?> gt_itemStackMap : GregTech_API.sItemStackMappings) {
+            for (Map<? extends ItemHolder, ?> gt_itemStackMap : GregTech_API.sItemStackMappings) {
                 GT_Utility.reMap(gt_itemStackMap);
             }
         } catch (Throwable e) {

src/main/java/gregtech/api/GregTech_API.java

@@ -70,6 +70,7 @@
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import gregtech.api.util.item.ItemHolder;
 import gregtech.api.world.GT_Worldgen;
 import gregtech.common.GT_DummyWorld;
 import gregtech.common.items.GT_IntegratedCircuit_Item;
@@ -106,7 +107,7 @@ public class GregTech_API {
     /**
      * Fixes the HashMap Mappings for ItemStacks once the Server started
      */
-    public static final Collection<Map<? extends GT_ItemStack, ?>> sItemStackMappings = new ArrayList<>();
+    public static final Collection<Map<? extends ItemHolder, ?>> sItemStackMappings = new ArrayList<>();
 
     /**
      * The MetaTileEntity-ID-List-Length

src/main/java/gregtech/api/enums/GT_Values.java

@@ -289,7 +289,7 @@ public static final class NBT {
         public static final String COLOR = "gt.color", // Integer
             COVERS = "gt.covers", // String
             CUSTOM_NAME = "name", // String
-            DISPAY = "gt.display", // String
+            DISPLAY = "gt.display", // String
             TIER = "gt.tier", // Number
             FACING = "gt.facing", // Byte
             LOCK_UPGRADE = "gt.locked", // Boolean
@@ -322,6 +322,7 @@ public static final class NBT {
             BURN_TIME_LEFT = "gt.burn.time.left", // Number
             TOTAL_BURN_TIME = "gt.total.burn.time", // Number
             ALLOWED_WORK = "gt.allowed.work", // Boolean
+            TASKS = "gt.tasks", // Compound
 
             // MultiBlock
             STRUCTURE_OK = "gt.structure.ok", ROTATION = "gt.eRotation", FLIP = "gt.eFlip", TARGET = "gt.target", // Boolean
@@ -337,13 +338,14 @@ public static final class NBT {
             UPGRADE_INVENTORIES_INPUT = "gt.invlist.upg.in", // NBT List
             UPGRADE_INVENTORIES_OUTPUT = "gt.invlist.upg.out", // NBT List
             UPGRADE_TANK_CAPACITY = "gt.tank.cap.upg", // Long
+            UPGRADE_TANK_COUNT = "gt.tank.ct.upg", // Int
             UPGRADE_TANK_CAPACITY_MULTIPLIER = "gt.tank.cap.mult.upg", // Long
             UPGRADE_TANK_UUID = "gt.tankuuid.upg", // String
             UPGRADE_TANK_NAME = "gt.tankname.upg", // String
             UPGRADE_TANKS_INPUT = "gt.tanklist.upg.in", // NBT List
             UPGRADE_TANKS_OUTPUT = "gt.tanklist.upg.out", // NBT List
-            UPGRADE_TANKS_COUNT = "gt.tankcount.upg", // Int
             UPGRADE_TANKS_PREFIX = "gt.tank.upg", // NBT Tag
+            UPGRADE_AMPERAGE = "gt.amp.upg", // Long
             SEPARATE_INPUTS = "gt.separate.inputs", // Boolean
             VOIDING_MODE = "gt.voiding.mode", // String
             BATCH_MODE = "gt.batch.mode", // Boolean
@@ -605,6 +607,8 @@ public static final class NBT {
         + EnumChatFormatting.LIGHT_PURPLE
         + "minecraft7771";
 
+    public static final String AuthorTheEpicGamer274 = "Author: " + "TheEpicGamer274";
+
     // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now.
     public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) {
         return (5F + (7.5F + material.mToolQuality)) / 10.0;

src/main/java/gregtech/api/enums/InventoryType.java

@@ -0,0 +1,7 @@
+package gregtech.api.enums;
+
+public enum InventoryType {
+    Input,
+    Output,
+    Both;
+}