From e003cddca9a3ac0a2d7b5a0b7be79f3cf6e03481 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:18:46 +0100 Subject: prioritize gt ores for unification (#3166) Co-authored-by: Martin Robertz --- .../java/gregtech/common/blocks/BlockOresAbstract.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java index f147c1c41d..358ae50e7f 100644 --- a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java +++ b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java @@ -82,11 +82,18 @@ public abstract class BlockOresAbstract extends GTGenericBlock implements ITileE GregTechAPI.sGeneratedMaterials[i].getToolTip()); if ((GregTechAPI.sGeneratedMaterials[i].mTypes & 0x8) != 0 && !aBlockedOres.contains(GregTechAPI.sGeneratedMaterials[i])) { - GTOreDictUnificator.registerOre( - this.getProcessingPrefix()[j] != null - ? this.getProcessingPrefix()[j].get(GregTechAPI.sGeneratedMaterials[i]) - : "", - new ItemStack(this, 1, i + (j * 1000))); + if (this.getProcessingPrefix()[j] != null && this.getProcessingPrefix()[j].mIsUnificatable) { + GTOreDictUnificator.set( + this.getProcessingPrefix()[j], + GregTechAPI.sGeneratedMaterials[i], + new ItemStack(this, 1, i + (j * 1000))); + } else { + GTOreDictUnificator.registerOre( + this.getProcessingPrefix()[j] != null + ? this.getProcessingPrefix()[j].get(GregTechAPI.sGeneratedMaterials[i]) + : "", + new ItemStack(this, 1, i + (j * 1000))); + } if (tHideOres) { if (!(j == 0 && !aHideFirstMeta)) { codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000))); -- cgit