Skip to content

Commit 9272e9f

Browse files
authored
Merge branch 'GregTechCEu:1.20.1' into 1.20.1
2 parents 6afa375 + acf0ab6 commit 9272e9f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/com/gregtechceu/gtceu/data/recipe/generated/OreRecipeHandler.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
44
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
5+
import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag;
6+
import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags;
57
import com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty;
68
import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
79
import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack;
@@ -54,7 +56,7 @@ private static void processMetalSmelting(TagPrefix crushedPrefix, Material mater
5456
if (smeltingResult.hasProperty(PropertyKey.INGOT)) {
5557
ItemStack ingotStack = ChemicalHelper.get(ingot, smeltingResult);
5658

57-
if (!ingotStack.isEmpty() && doesMaterialUseNormalFurnace(smeltingResult)) {
59+
if (!ingotStack.isEmpty() && doesMaterialUseNormalFurnace(smeltingResult) && !crushedPrefix.isIgnored(material)) {
5860
VanillaRecipeHelper.addSmeltingRecipe(provider, "smelt_" + crushedPrefix.name + "_" + material.getName() + "_to_ingot",
5961
ChemicalHelper.getTag(crushedPrefix, material), ingotStack, 0.5f);
6062
}
@@ -161,7 +163,7 @@ public static void processRawOre(TagPrefix orePrefix, Material material, OreProp
161163
.save(provider);
162164
}
163165

164-
//do not try to add smelting recipes for materials which require blast furnace
166+
//do not try to add smelting recipes for materials which require blast furnace, or don't have smelting recipes at all.
165167
if (!ingotStack.isEmpty() && doesMaterialUseNormalFurnace(smeltingMaterial) && !orePrefix.isIgnored(material)) {
166168
float xp = Math.round(((1 + property.getOreMultiplier() * 0.33f) / 3) * 10f) / 10f;
167169
VanillaRecipeHelper.addSmeltingRecipe(provider, "smelt_" + orePrefix.name + "_" + material.getName() + "_ore_to_ingot",
@@ -429,7 +431,7 @@ public static void processPureDust(TagPrefix purePrefix, Material material, OreP
429431
}
430432

431433
private static boolean doesMaterialUseNormalFurnace(Material material) {
432-
return !material.hasProperty(PropertyKey.BLAST);
434+
return !material.hasProperty(PropertyKey.BLAST) && !material.hasFlag(MaterialFlags.NO_SMELTING);
433435
}
434436

435437

0 commit comments

Comments
 (0)