From d4387ea5bc2237182049dc8cd388458760f06f28 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Sat, 21 Dec 2024 22:36:27 -0300 Subject: [PATCH 1/2] Add Chemical Bath + Thermal Centrifuge mode to IOF (#3539) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../machines/multi/MTEIntegratedOreFactory.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java index 54e81537d32..a169c5cb5a9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java @@ -241,6 +241,7 @@ private static int getTime(int mode) { case 2 -> 10 * SECOND; case 3 -> 20 * SECOND; case 4 -> 17 * SECOND; + case 5 -> 32 * SECOND; default -> // go to hell 1000000000; @@ -396,6 +397,12 @@ public CheckRecipeResult checkProcessing() { doMac(isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); } + case 5 -> { + doMac(isOre); + doChemWash(isCrushedOre, isCrushedPureOre); + doThermal(isCrushedPureOre, isCrushedOre); + doMac(isThermal, isOre, isCrushedOre, isCrushedPureOre); + } default -> { return CheckRecipeResultRegistry.NO_RECIPE; } @@ -433,7 +440,7 @@ public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPla StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.void", sVoidStone)); return; } - sMode = (sMode + 1) % 5; + sMode = (sMode + 1) % 6; List des = getDisplayMode(sMode); GTUtility.sendChatToPlayer(aPlayer, String.join("", des)); } @@ -786,6 +793,12 @@ private static List getDisplayMode(int mode) { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CENTRIFUGE + ' '); } + case 5 -> { + des.add(AQUA + CRUSH + ARROW); + des.add(AQUA + CHEM_WASH + ARROW); + des.add(AQUA + THERMAL + ARROW); + des.add(AQUA + CRUSH + ' '); + } default -> des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.WRONG_MODE")); } From cba549e8e51610da94691c14ee398a689bd934b4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Dec 2024 02:38:00 +0100 Subject: [PATCH 2/2] update --- dependencies.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0788461fa56..36d507f65da 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -42,12 +42,12 @@ dependencies { api("com.github.GTNewHorizons:ModularUI:1.2.17:dev") api("com.github.GTNewHorizons:ModularUI2:2.1.16-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.2:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-503-GTNH:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-504-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.0-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') api("com.github.GTNewHorizons:Postea:1.0.13:dev") - compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.2:dev') + compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.11.0:dev') compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15:dev") implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false} @@ -61,7 +61,7 @@ dependencies { compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.4:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.22:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.0:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.15:dev") { transitive = false } @@ -73,7 +73,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.100-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false } - implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") + implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.0-GTNH:dev") compileOnly("com.github.GTNewHorizons:Chisel:2.16.0-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false } @@ -88,14 +88,14 @@ dependencies { compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.1-GTNH:dev") {transitive = false} // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953') - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.27-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Binnie:2.4.4:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Binnie:2.5.0:dev') {transitive = false} compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false} devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.2.16:dev'){transitive=false} @@ -106,7 +106,7 @@ dependencies { // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.10.0:dev") // runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev') // runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev') - // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.4:dev') + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.5.0:dev') testImplementation(platform('org.junit:junit-bom:5.9.2')) testImplementation('org.junit.jupiter:junit-jupiter') @@ -119,7 +119,7 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-reporting') runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") - runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.22:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.0:dev') // For testing //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.2:dev')