aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-10-22 19:53:51 +0200
committerGitHub <noreply@github.com>2024-10-22 19:53:51 +0200
commitb587aa19b34d7cfab3f8886a359b84fc2229b74f (patch)
treeb5a3e6cd0cf59a850be0eb8dea3f17de3734900f /src/main/java/gregtech/common
parentabdd147222b44685abfa79a87e2f104dc699af67 (diff)
downloadGT5-Unofficial-b587aa19b34d7cfab3f8886a359b84fc2229b74f.tar.gz
GT5-Unofficial-b587aa19b34d7cfab3f8886a359b84fc2229b74f.tar.bz2
GT5-Unofficial-b587aa19b34d7cfab3f8886a359b84fc2229b74f.zip
Fix NPE on IC2 recycler blacklist (#3403)
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GTProxy.java13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java
index e7cb627c91..8b2c153591 100644
--- a/src/main/java/gregtech/common/GTProxy.java
+++ b/src/main/java/gregtech/common/GTProxy.java
@@ -814,22 +814,15 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
.getRegisteredFluidContainerData()) {
onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData));
}
- try {
- for (String tOreName : OreDictionary.getOreNames()) {
- ItemStack tOreStack;
- for (Iterator<ItemStack> i$ = OreDictionary.getOres(tOreName)
- .iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) {
- tOreStack = i$.next();
- }
+ for (String tOreName : OreDictionary.getOreNames()) {
+ for (ItemStack itemStack : OreDictionary.getOres(tOreName)) {
+ registerOre(new OreDictionary.OreRegisterEvent(tOreName, itemStack));
}
- } catch (Throwable e) {
- e.printStackTrace(GTLog.err);
}
}
public void onPreLoad() {
GTLog.out.println("GTMod: Preload-Phase started!");
- GTLog.ore.println("GTMod: Preload-Phase started!");
GregTechAPI.sPreloadStarted = true;
this.mIgnoreTcon = OPStuff.ignoreTinkerConstruct;