Config Option for Ore Variant Unification with Silk Touch Override (#16)

Added a configuration option that unifies broken stone-variant ores to the basic stone type, unless you are holding a Silk Touch tool (disabled by default).

Author: leetftw

src/main/java/gregtech/common/ConfigHolder.java

@@ -112,6 +112,9 @@ public class ConfigHolder {
     @Config.Comment("If false, machines will not make noise. Default: true")
     public static boolean doMachinesHaveSounds = true;
 
+    @Config.Comment("If true, all rock variants of ores will drop the stone variant unless the player uses Silk Touch. Default: false")
+    public static boolean requireSilkTouchForRockVariants = false;
+
     public static class VanillaRecipes {
 
         @Config.Comment("Whether to nerf the paper crafting recipe. Default: true")

src/main/java/gregtech/common/blocks/BlockOre.java

@@ -5,14 +5,18 @@
 import gregtech.api.unification.ore.StoneType;
 import gregtech.api.util.IBlockOre;
 import gregtech.common.blocks.properties.PropertyStoneType;
+import gregtech.common.ConfigHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Enchantments;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.NonNullList;
@@ -65,7 +69,18 @@ protected void initBlockState() {
 
     @Override
     public int damageDropped(IBlockState state) {
-        return getMetaFromState(state);
+        // Only drop the variants meta ID if:
+        // - The config option for requiring silk touch is disabled
+        // - OR The function was called without a harvester (needed for mod compatibility)
+        // - OR The harvester has an item with silk touch in their main hand
+        if (!ConfigHolder.requireSilkTouchForRockVariants ||
+                harvesters.get() == null ||
+                EnchantmentHelper.getEnchantments(harvesters.get().getHeldItemMainhand())
+                        .containsKey(Enchantments.SILK_TOUCH))
+            return getMetaFromState(state);
+
+        // otherwise, return the id of StoneType.STONE
+        return 0;
     }
 
     @Override