Bugfix : Fix Silk Touch Behaviors

Author: Ghostipedia

src/main/java/com/ghostipedia/cosmiccore/common/glm/NoSilkTouchOreLootModifier.java

@@ -1,15 +1,16 @@
 package com.ghostipedia.cosmiccore.common.glm;
 
 import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
-import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
-import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
 
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantments;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.loot.IGlobalLootModifier;
 import net.minecraftforge.common.loot.LootModifier;
 
@@ -35,38 +36,46 @@ protected NoSilkTouchOreLootModifier(LootItemCondition[] conditionsIn) {
             return generatedLoot;
         }
 
-        Material material = null;
-        for (ItemStack stack : generatedLoot) {
-            var materialStack = ChemicalHelper.getMaterialStack(stack);
-            if (materialStack != null && materialStack.material() != null) {
-                Material mat = materialStack.material();
-                if (mat.hasProperty(PropertyKey.ORE)) {
-                    material = mat;
-                    break;
-                }
-            }
+        BlockState state = context.getParamOrNull(LootContextParams.BLOCK_STATE);
+        if (state == null || !state.is(Tags.Blocks.ORES)) {
+            return generatedLoot;
         }
 
-        if (material == null) {
+        ItemStack blockItem = new ItemStack(state.getBlock());
+        var materialStack = ChemicalHelper.getMaterialStack(blockItem);
+        if (materialStack == null || materialStack.material() == null) {
             return generatedLoot;
         }
 
-        ItemStack rawOre = ChemicalHelper.get(TagPrefix.rawOre, material);
-        if (rawOre.isEmpty()) {
+        if (!materialStack.material().hasProperty(PropertyKey.ORE)) {
             return generatedLoot;
         }
 
-        int dropCount = 1;
-        var oreProperty = material.getProperty(PropertyKey.ORE);
-        if (oreProperty != null) {
-            dropCount = oreProperty.getOreMultiplier();
+        ItemStack fakeTool = tool.copy();
+        fakeTool.getEnchantmentTags().clear();
+        for (var entry : tool.getAllEnchantments().entrySet()) {
+            if (entry.getKey() != Enchantments.SILK_TOUCH) {
+                fakeTool.enchant(entry.getKey(), entry.getValue());
+            }
         }
 
-        generatedLoot.clear();
-        ItemStack drop = rawOre.copy();
-        drop.setCount(dropCount);
-        generatedLoot.add(drop);
+        LootParams.Builder builder = new LootParams.Builder(context.getLevel())
+                .withParameter(LootContextParams.BLOCK_STATE, state)
+                .withParameter(LootContextParams.ORIGIN, context.getParam(LootContextParams.ORIGIN))
+                .withParameter(LootContextParams.TOOL, fakeTool);
 
+        var entity = context.getParamOrNull(LootContextParams.THIS_ENTITY);
+        if (entity != null) {
+            builder.withOptionalParameter(LootContextParams.THIS_ENTITY, entity);
+        }
+
+        var explosionRadius = context.getParamOrNull(LootContextParams.EXPLOSION_RADIUS);
+        if (explosionRadius != null) {
+            builder.withOptionalParameter(LootContextParams.EXPLOSION_RADIUS, explosionRadius);
+        }
+
+        generatedLoot.clear();
+        generatedLoot.addAll(state.getDrops(builder));
         return generatedLoot;
     }