From 38f38a991e433f6eff30476b87a71eeadee228ce Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Wed, 22 May 2024 22:29:07 +0200 Subject: Add RawOre items and processing (#879) * Add RawOre items and processing * Added textures * Change to a switch instead of elseif and add shouldFortune check Removed isNatural check since GT++ Ores aren't TileEntities * update * update * Fixed the controller texture for the turbines. * The file is not called anywhere? This file doesn't seem to be used anywhere. Maybe it's worth removing? * update * update * Update random code * fixed * Add Silk Touch * Update dependencies.gradle * Update dependencies.gradle --------- Co-authored-by: Ethryan <3237986+Ethryan@users.noreply.github.com> Co-authored-by: Pilad --- .../gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java | 10 ++++++++++ .../java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java | 9 +++++++++ 2 files changed, 19 insertions(+) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java index c8f87d7cb3..7a1404caae 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java @@ -168,6 +168,16 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); } + // Macerate raw ore to Crushed + if (GT_Values.RA.addPulveriserRecipe( + material.getRawOre(1), + new ItemStack[] { material.getCrushed(2) }, + new int[] { 10000 }, + 20 * 20, + tVoltageMultiplier / 2)) { + Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate raw ore to Crushed ore'"); + } + // Macerate Centrifuged to Pure Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushedCentrifuged(1), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index 10c2066997..035f3a4220 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -181,6 +181,15 @@ public class RecipeGen_Ore extends RecipeGen_Base { tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); } + // Macerate raw ore to Crushed + if (GT_Values.RA.addPulveriserRecipe( + material.getRawOre(1), + new ItemStack[] { material.getCrushed(2) }, + new int[] { 10000 }, + 20 * 20, + tVoltageMultiplier / 2)) { + Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate raw ore to Crushed ore'"); + } // Macerate Crushed to Impure Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushed(1), -- cgit