aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2024-08-27 20:50:30 +0200
committerGitHub <noreply@github.com>2024-08-27 18:50:30 +0000
commit4908d5967c3dfeff5616c65144e701859b9e30a2 (patch)
tree3e58a4b8ebd8b70745e81c4c71c765980e4ec4f4 /src/main/java/gregtech/loaders/oreprocessing
parent3c574facfb224029c0b69865e281023da6170ce0 (diff)
downloadGT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.tar.gz
GT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.tar.bz2
GT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.zip
Config/gregtech.cfg (#2939)
* first pass on config migration * second pass on config migration * removing bad configs * rename config classes and register them * move debug options to its own debug category * migrate pollution * finish migrating general config * removing useless config * finish GregTech.cfg port to GTNHLib * don't accidentally force panic mode in dev env * typo * defaults are now handled by the confg handler * remove dead config * force config save after defaults are being written * stop messing with the GregTech.cfg externally * removing comments * new underground fluid builder and porting default underground fluids to code * move config handlers of gregtech.cfg in their own package * process MachineStats.cfg * yeeted MaterialProperties.cfg * remove unused compat in GTNH * process OverpoweredStuff.cfg * process Other.cfg * ungregify some config variables * remove unused variables * fix Ids.cfg not being populated * delete duplicate printing of MTE IDs in GT5U clients * bump hodgepodge version to get mod phase timers * process Client.cfg * fix bad category naming * registering all the config handlers in gui * bump GTNHLib version * actually only registering client configs * use proper double arrays now * move GT ore mixes to patternbuilders * dead code * fix multifiles config not being handled properly * import class from NHCore * removing reflection * use enums for registration * yeet config for Asteroid dimensions * remove unused since 2015 enum entry * todo * rework oremix enums * imported dimension data in enums * convert old dirty predicate into proper one * hook gagreg onto the OreMixes enum * finally nuke worldgen.ore.mix config category! * hook gagreg small ores onto the SmallOres enum * imported dim values in enum * fix dirty work around in vm predicate * yeet unused classes * hook GT stones to GTStones enum * yeet all the remaining booleans in the worldgen category * port endasteroids category * port general category * deprecated * yeet unused bw compat * finish worldgen config migration * hardcode config into code * remove not generated config entry * remove Unification.cfg * fix build * migrate oreveins away from config * migrate small ores away from config * delete config parser * forgotten * fix EoH recipe crash in dev * fix GT NEI Ore Plugin config and csv paths * shade opencsv * rewrite csv generator * spotless apply
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java12
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java11
2 files changed, 2 insertions, 21 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
index 945ffae386..79342a460d 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
@@ -63,17 +63,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
.eut(TierEU.RECIPE_LV)
.addTo(centrifugeRecipes);
} else {
- registerStandardOreRecipes(
- aPrefix,
- aMaterial,
- GT_Utility.copyAmount(1, aStack),
- Math.max(
- 1,
- gregtech.api.GregTech_API.sOPStuff.get(
- gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier,
- aMaterial.toString(),
- 1))
- * (tIsRich ? 2 : 1));
+ registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), tIsRich ? 2 : 1);
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
index 5ece6f5315..2da9f4b865 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java
@@ -40,16 +40,7 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis
.eut(TierEU.RECIPE_LV)
.addTo(centrifugeRecipes);
} else {
- registerStandardOreRecipes(
- aPrefix,
- aMaterial,
- GT_Utility.copyAmount(1, aStack),
- Math.max(
- 1,
- gregtech.api.GregTech_API.sOPStuff.get(
- gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier,
- aMaterial.toString(),
- 1)));
+ registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), 1);
}
}