Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Chemical Bath + Thermal Centrifuge mode to IOF #3539

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add Chemical Bath + Thermal Centrifuge mode to IOF #3539

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ef3ffe
Add mctm mode
Nockyx Nov 23, 2024
a0d1b3d
Merge branch 'master' into iof-mode
Dream-Master Nov 24, 2024
52c7219
Merge branch 'master' into iof-mode
Dream-Master Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/gregtech/common/tileentities/machines/multi/MTEIntegratedOreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,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;
Expand Down Expand Up @@ -395,6 +396,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;
}
Expand Down Expand Up @@ -432,7 +439,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<String> des = getDisplayMode(sMode);
GTUtility.sendChatToPlayer(aPlayer, String.join("", des));
}
Expand Down Expand Up @@ -785,6 +792,12 @@ private static List<String> 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"));
}

Expand Down
Loading