Implementation: Raw Ore Items as Ore Drops (#2502)

* testing

* Fix textures

* Adding Drops, still need to add furnace recipe

* Need to fix the multiple smelting recipes. otherwise stuff works.

* part 2

* Remove wip block code I added

* Moved it to a new processing file

* Fix Oredict and add a stone dust chance output. And added a config option for fortune bonus.

* Finally got Spotless to work

* fix config system set it in gregtech config with oredropbehaviour in gregtech.cfg

* Added new option and an option that returns it to the old behaviour.

* Moved the raw ores to meta3 since meta1 was full. (MetaID range fix)

* Fixing the MBM to only process small ores with fortune.

* New config option

* try to fix the recipes not working on Zeta

* Implement Caedis Fortune fix

* Added comment

* Spotless

* Fix stone dust amount from macerator

* Adding Raw ore to the OreFactory (Untested)

* spotless

* Update this to actually drop the amount number of stack, instead of the stack set to the amount

* New Random function for fortune

and shapeless crushing recipes for the raw ores.

* Fix

* Actually make the block per dimension.

* Fix an () issue. And make this actually work ingame. and not just randomly.

* Change back drops

Ned to look into Silk Touch more

* Enable Silk Touch

* Wth Spotless?, THIS made you complain?

2 files changed, 20 insertions, 2 deletions

diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
index fd19cd6ab8..116b6928e4 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
@@ -34,6 +34,7 @@ import gregtech.loaders.oreprocessing.ProcessingPipe;
 import gregtech.loaders.oreprocessing.ProcessingPlank;
 import gregtech.loaders.oreprocessing.ProcessingPlate;
 import gregtech.loaders.oreprocessing.ProcessingPure;
+import gregtech.loaders.oreprocessing.ProcessingRawOre;
 import gregtech.loaders.oreprocessing.ProcessingRecycling;
 import gregtech.loaders.oreprocessing.ProcessingRotor;
 import gregtech.loaders.oreprocessing.ProcessingRound;
@@ -89,6 +90,7 @@ public class GT_Loader_OreProcessing implements Runnable {
         new ProcessingOre();
         new ProcessingOrePoor();
         new ProcessingOreSmelting();
+        new ProcessingRawOre();
         new ProcessingPipe();
         new ProcessingPlank();
         new ProcessingPlate();
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
index ba1edbd0e2..bbbb9af59d 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
@@ -55,6 +55,7 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_RecipeBuilder;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.GT_Proxy;
 import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase;
 import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom;
 
@@ -280,7 +281,7 @@ public class GT_PreLoad {
                                     null, "ingot", "ingotHot", "ingotDouble", "ingotTriple", "ingotQuadruple",
                                     "ingotQuintuple", "plate", "plateDouble", "plateTriple", "plateQuadruple",
                                     "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", "ring",
-                                    "foil", "cell", "cellPlasma", "cellMolten" };
+                                    "foil", "cell", "cellPlasma", "cellMolten", "rawOre" };
                                 if (mIt == 2) tags = new String[] { "toolHeadSword", "toolHeadPickaxe",
                                     "toolHeadShovel", "toolHeadAxe", "toolHeadHoe", "toolHeadHammer", "toolHeadFile",
                                     "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", "toolHeadWrench",
@@ -313,7 +314,7 @@ public class GT_PreLoad {
             "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", "toolHeadBuzzSaw",
             "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood",
             "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "crateGtDust",
-            "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten" };
+            "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten", "rawOre" };
 
         List<String> mMTTags = new ArrayList<>();
         oreTags.stream()
@@ -761,6 +762,21 @@ public class GT_PreLoad {
         GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = tMainConfig
             .get("general", "LongDistancePipelineMinimalDistancePoints", 64)
             .getInt(64);
+        try {
+            String setting_string = tMainConfig.get(
+                "OreDropBehaviour",
+                "general",
+                "FortuneItem",
+                "Settings: \n'PerDimBlock': Sets the drop to the block variant of the ore block based on dimension, defaults to stone type, \n'UnifiedBlock': Sets the drop to the stone variant of the ore block, \n'Block': Sets the drop to the ore  mined, \n'FortuneItem': Sets the drop to the new ore item and makes it affected by fortune, \n'Item': Sets the drop to the new ore item, \nDefaults to: 'FortuneItem'")
+                .getString();
+            GT_Log.out.println("Trying to set it to: " + setting_string);
+            GT_Proxy.OreDropSystem setting = GT_Proxy.OreDropSystem.valueOf(setting_string);
+            GT_Mod.gregtechproxy.oreDropSystem = setting;
+
+        } catch (IllegalArgumentException e) {
+            GT_Log.err.println(e);
+            GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.FortuneItem;
+        }
 
         GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties
             .get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK