Merge branch 'master' into incorrect-casing-textures

GTNewHorizons · Jan 13, 2025 · 7a4e4a2 · 7a4e4a2
2 parents 76cccd5 + 14ed53e
commit 7a4e4a2
Show file tree

Hide file tree

Showing 59 changed files with 393 additions and 3,960 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -43,7 +43,7 @@ dependencies {
     api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.2:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-518-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.16-gtnh:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.19-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 
@@ -72,7 +72,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:VisualProspecting:1.4.0:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.106-GTNH:dev") { transitive = false }
 
-    compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false }
     implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev")
 
     compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false }
@@ -97,7 +97,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:SC2:2.3.0:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Binnie:2.5.2:dev') {transitive = false}
     compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
-    devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.0:dev'){transitive=false}
+    devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.1: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")

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java
@@ -129,7 +129,7 @@ public CheckRecipeResult process() {
                 mFloor = (lastRecipe.mSpecialValue % 10000) * 1000000;
                 mCeil = (lastRecipe.mSpecialValue / 10000) * 1000000;
                 if (eV > mCeil || eV < mFloor) {
-                    setOutputItems(ItemRefer.Radioactive_Waste.get(4));
+                    overwriteOutputItems(ItemRefer.Radioactive_Waste.get(4));
                 }
                 // NA does not consume power, its hatches do. Set it to 0 to be sure
                 calculatedEut = 0;

diff --git a/src/main/java/gregtech/GTMod.java b/src/main/java/gregtech/GTMod.java
@@ -66,6 +66,7 @@
 import gregtech.api.interfaces.internal.IGTMod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.implementations.MTEHatchNonConsumableBase;
+import gregtech.api.objects.GTItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.XSTR;
 import gregtech.api.registries.LHECoolantRegistry;
@@ -80,7 +81,6 @@
 import gregtech.api.util.GTRecipeRegistrator;
 import gregtech.api.util.GTSpawnEventHandler;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.item.ItemHolder;
 import gregtech.common.GTDummyWorld;
 import gregtech.common.GTNetwork;
 import gregtech.common.GTProxy;
@@ -800,7 +800,7 @@ public void onIDChangingEvent(FMLModIdMappingEvent aEvent) {
             for (Map<?, ?> gt_itemStackMap : GregTechAPI.sItemStackMappings) {
                 GTUtility.reMap(gt_itemStackMap);
             }
-            for (SetMultimap<? extends ItemHolder, ?> gt_itemStackMap : GregTechAPI.itemStackMultiMaps) {
+            for (SetMultimap<GTItemStack, ?> gt_itemStackMap : GregTechAPI.itemStackMultiMaps) {
                 GTUtility.reMap(gt_itemStackMap);
             }
         } catch (Throwable e) {

diff --git a/src/main/java/gregtech/api/GregTechAPI.java b/src/main/java/gregtech/api/GregTechAPI.java
@@ -61,7 +61,6 @@
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
-import gregtech.api.util.item.ItemHolder;
 import gregtech.api.world.GTWorldgen;
 import gregtech.common.GTDummyWorld;
 import gregtech.common.items.ItemIntegratedCircuit;
@@ -93,7 +92,7 @@ public class GregTechAPI {
      * {@link GTItemStack}
      */
     public static final Collection<Map<?, ?>> sItemStackMappings = new ArrayList<>();
-    public static final Collection<SetMultimap<? extends ItemHolder, ?>> itemStackMultiMaps = new ArrayList<>();
+    public static final Collection<SetMultimap<GTItemStack, ?>> itemStackMultiMaps = new ArrayList<>();
 
     /**
      * The MetaTileEntity-ID-List-Length
@@ -150,17 +149,16 @@ public class GregTechAPI {
     /**
      * The List of Tools, which can be used. Accepts regular damageable Items and Electric Items
      */
-    public static final GTHashSet<GTItemStack> sToolList = new GTHashSet<>(), sCrowbarList = new GTHashSet<>(),
-        sScrewdriverList = new GTHashSet<>(), sWrenchList = new GTHashSet<>(), sSoftHammerList = new GTHashSet<>(),
-        sHardHammerList = new GTHashSet<>(), sWireCutterList = new GTHashSet<>(),
-        sSolderingToolList = new GTHashSet<>(), sSolderingMetalList = new GTHashSet<>(),
-        sJackhammerList = new GTHashSet<>();
+    public static final GTHashSet sToolList = new GTHashSet(), sCrowbarList = new GTHashSet(),
+        sScrewdriverList = new GTHashSet(), sWrenchList = new GTHashSet(), sSoftHammerList = new GTHashSet(),
+        sHardHammerList = new GTHashSet(), sWireCutterList = new GTHashSet(), sSolderingToolList = new GTHashSet(),
+        sSolderingMetalList = new GTHashSet(), sJackhammerList = new GTHashSet();
     /**
      * The List of Hazmat Armors
      */
-    public static final GTHashSet<GTItemStack> sGasHazmatList = new GTHashSet<>(), sBioHazmatList = new GTHashSet<>(),
-        sFrostHazmatList = new GTHashSet<>(), sHeatHazmatList = new GTHashSet<>(), sRadioHazmatList = new GTHashSet<>(),
-        sElectroHazmatList = new GTHashSet<>();
+    public static final GTHashSet sGasHazmatList = new GTHashSet(), sBioHazmatList = new GTHashSet(),
+        sFrostHazmatList = new GTHashSet(), sHeatHazmatList = new GTHashSet(), sRadioHazmatList = new GTHashSet(),
+        sElectroHazmatList = new GTHashSet();
 
     private static final Multimap<Integer, ItemStack> sRealConfigurationList = Multimaps
         .newListMultimap(new TreeMap<>(), ArrayList::new);

diff --git a/src/main/java/gregtech/api/enums/GTValues.java b/src/main/java/gregtech/api/enums/GTValues.java
@@ -230,79 +230,7 @@ public class GTValues {
      */
     public static final class NBT {
 
-        public static final String COLOR = "gt.color", // Integer
-            COVERS = "gt.covers", // String
-            CUSTOM_NAME = "name", // String
-            DISPLAY = "gt.display", // String
-            TIER = "gt.tier", // Number
-            FACING = "gt.facing", // Byte
-            LOCK_UPGRADE = "gt.locked", // Boolean
-            MATERIAL = "gt.material", // String containing the Material Name.
-            MODE = "gt.mode", // Number
-            ALLOWED_MODES = "gt.amode", // Number
-            MTE_ID = "gt.mte.id", // Containing the MTE ID
-            MTE_REG = "gt.mte.reg", // Containing the MTE Registry ID
-            OWNER = "gt.owner", // String
-            OWNER_UUID = "gt.ownerUuid", // UUID (String)
-
-            // Machines
-            ACTIVE = "gt.active", // Boolean
-            FLUID_OUT = "gt.fluidout", // Output Fluid
-            ITEM_OUT = "gt.itemout", // Output Item
-            PARALLEL = "gt.parallel", // Number
-            TANK_CAPACITY = "gt.tankcap", // Number
-            TANK_IN = "gt.tank.in.", // FluidStack
-            TANK_OUT = "gt.tank.out.", // FluidStack
-            TEXTURE_FOLDER = "gt.texture.folder", // String
-            INV_INPUT_SIZE = "gt.invsize.in", // Number
-            INV_OUTPUT_SIZE = "gt.invsize.out", // Number
-            INV_INPUT_LIST = "gt.invlist.in", // NBT List
-            INV_OUTPUT_LIST = "gt.invlist.out", // NBT List
-            VOLTAGE = "gt.voltage", // Number
-            AMPERAGE = "gt.amperage", // Number
-            STORED_ENERGY = "gt.stored.energy", // Number
-            MAXIMUM_ENERGY = "gt.maximum.energy", // Number
-            EUT_CONSUMPTION = "gt.eut.consumption", // Number
-            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
-            TARGET_X = "gt.target.x", // Number
-            TARGET_Y = "gt.target.y", // Number
-            TARGET_Z = "gt.target.z", // Number
-            LOCKED_FLUID = "gt.locked.fluid", // String
-            LOCKED_INVENTORY = "gt.locked.inv", // String
-            LOCKED_INVENTORY_INDEX = "gt.locked.inv.index", // Number
-            UPGRADE_INVENTORY_SIZE = "gt.invsize.upg", // String
-            UPGRADE_INVENTORY_UUID = "gt.invuuid.upg", // String
-            UPGRADE_INVENTORY_NAME = "gt.invname.upg", // String
-            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_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
-            RECIPE_LOCK = "gt.recipe.lock", // Boolean
-
-            // Logic
-            POWER_LOGIC = "gt.pow.logic", // NBT Tag
-            POWER_LOGIC_STORED_ENERGY = "gt.pow.energy", // Number
-            POWER_LOGIC_ENERGY_CAPACITY = "gt.pow.energy.cap", // Number
-            POWER_LOGIC_VOLTAGE = "gt.pow.volt", // Number
-            POWER_LOGIC_AMPERAGE = "gt.pow.amp", // Number
-            POWER_LOGIC_TYPE = "gt.pow.type", // Number
-            empty_ = "";
+        public static final String COVERS = "gt.covers"; // String
     }
 
     /** The Color White as RGB Short Array. */
@@ -435,11 +363,6 @@ public static final class NBT {
      * Debug parameter for {@link GTChunkAssociatedData}
      */
     public static boolean debugWorldData = false;
-    /**
-     * Parameter if multi tile entities (MuTEs) should be enabled in the pack. Turned off by default until
-     * implementation is done.
-     */
-    public static boolean enableMultiTileEntities = false;
     /**
      * Number of ticks between sending sound packets to clients for electric machines. Default is 1.5 seconds. Trying to
      * mitigate lag and FPS drops.

diff --git a/src/main/java/gregtech/api/enums/InventoryType.java b/src/main/java/gregtech/api/enums/InventoryType.java
diff --git a/src/main/java/gregtech/api/gui/GUIHost.java b/src/main/java/gregtech/api/gui/GUIHost.java
diff --git a/src/main/java/gregtech/api/gui/GUIProvider.java b/src/main/java/gregtech/api/gui/GUIProvider.java