允许水晶石矿石被精准采集挖掘，以及通过假玩家挖掘

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/handler/OreHandler.java

@@ -6,14 +6,10 @@
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -113,8 +109,6 @@ public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent event) {
                         drops.add(ore);
                     }
                     return;
-                } else if (registryName != null && registryName.getNamespace().equals("astralsorcery") && hasSilkTouch(event.getHarvester())) {
-                    return;
                 }
 
                 int fortune = event.getFortuneLevel();
@@ -128,12 +122,6 @@ public void onHarvestDropsEvent(BlockEvent.HarvestDropsEvent event) {
         }
     }
 
-    public static boolean hasSilkTouch(EntityPlayer player) {
-        if (player instanceof FakePlayer)return false;
-        ItemStack mainHandStack = player.getHeldItemMainhand();
-        return EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, mainHandStack) != 0;
-    }
-
     private final static class OreKey {
         private final ResourceLocation rl;
         private final int meta;

src/main/java/github/kasuminova/novaeng/mixin/astralsorcery/MixinBlockCustomOre.java

@@ -0,0 +1,31 @@
+package github.kasuminova.novaeng.mixin.astralsorcery;
+
+import hellfirepvp.astralsorcery.common.block.BlockCustomOre;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = BlockCustomOre.class,remap = false)
+public class MixinBlockCustomOre {
+
+    @Inject(method = "canSilkHarvest",at = @At("HEAD"), cancellable = true)
+    public void canSilkHarvest(World world, BlockPos pos, IBlockState state, EntityPlayer player, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
+
+    @Inject(method = "securityCheck",at = @At("HEAD"), cancellable = true)
+    private void securityCheck(World world, EntityPlayer player, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(!world.isRemote);
+    }
+
+    @Inject(method = "checkSafety",at = @At("HEAD"), cancellable = true)
+    private void checkSafety(World world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(true);
+    }
+
+}

src/main/java/github/kasuminova/novaeng/mixin/minecraft/MixinRecipeBookServer.java

@@ -7,8 +7,11 @@
 import net.minecraft.stats.RecipeBookServer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Mixin(value = RecipeBookServer.class)
@@ -55,9 +58,9 @@ public void read(NBTTagCompound tag) {}
      * @author circulation
      * @reason 废弃原版配方书
      */
-    @Overwrite
-    private List<IRecipe> getRecipes() {
-        return new ArrayList<>();
+    @Inject(method = "getRecipes",at = @At("HEAD"), cancellable = true)
+    public void getRecipes(CallbackInfoReturnable<List<IRecipe>> cir) {
+        cir.setReturnValue(Collections.emptyList());
     }
 
     /**
@@ -66,7 +69,7 @@ private List<IRecipe> getRecipes() {
      */
     @Overwrite
     private List<IRecipe> getDisplayedRecipes() {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     /**

src/main/resources/mixins.novaeng_core_astralsorcery.json

@@ -1,15 +1,16 @@
 {
-    "package": "github.kasuminova.novaeng.mixin.astralsorcery",
-    "refmap": "mixins.novaeng_core.refmap.json",
-    "target": "@env(DEFAULT)",
-    "minVersion": "0.8",
-    "compatibilityLevel": "JAVA_8",
-    "mixins": [
-        "MixinPlayerAttributeMap"
-    ],
-    "server": [
-        "AccessorResearchManager",
-        "InvokerPerkEffectHelper",
-        "MixinPlayerProgress"
-    ]
+  "package": "github.kasuminova.novaeng.mixin.astralsorcery",
+  "refmap": "mixins.novaeng_core.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "MixinBlockCustomOre",
+    "MixinPlayerAttributeMap"
+  ],
+  "server": [
+    "AccessorResearchManager",
+    "InvokerPerkEffectHelper",
+    "MixinPlayerProgress"
+  ]
 }