fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reflect into Block#getSilkTouchDrop instead of copying it, fixes #418

Browse Source
This commit is contained in:
Electroblob77
2020-04-22 17:13:55 +01:00
parent 53f545caad
commit ee96ff3ddd
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/Mine.java
+19 -9
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell; package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants; import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.ISpellCastingItem; import electroblob.wizardry.item.ISpellCastingItem;
import electroblob.wizardry.item.ItemArtefact; import electroblob.wizardry.item.ItemArtefact;
@@ -15,7 +16,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction; import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
@@ -24,11 +24,20 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List; import java.util.List;
public class Mine extends SpellRay { public class Mine extends SpellRay {
private static final Method getSilkTouchDrop;
static {
getSilkTouchDrop = ObfuscationReflectionHelper.findMethod(Block.class, "func_180643_i", ItemStack.class, IBlockState.class);
}
public Mine(){ public Mine(){
super("mine", false, EnumAction.NONE); super("mine", false, EnumAction.NONE);
this.ignoreLivingEntities(true); this.ignoreLivingEntities(true);
@@ -108,7 +117,10 @@ public class Mine extends SpellRay {
if(silkTouch){ if(silkTouch){
flag = world.destroyBlock(pos1, false); flag = world.destroyBlock(pos1, false);
if(flag) Block.spawnAsEntity(world, pos1, getSilkTouchDrop(state1)); if(flag){
ItemStack stack = getSilkTouchDrop(state1);
if(stack != null) Block.spawnAsEntity(world, pos1, stack);
}
}else{ }else{
flag = world.destroyBlock(pos1, true); flag = world.destroyBlock(pos1, true);
if(flag) state1.getBlock().dropXpOnBlockBreak(world, pos1, xp); if(flag) state1.getBlock().dropXpOnBlockBreak(world, pos1, xp);
@@ -141,17 +153,15 @@ public class Mine extends SpellRay {
.shaded(false).spawn(world); .shaded(false).spawn(world);
} }
// Copied from Block, where (for some reason) it's protected
private static ItemStack getSilkTouchDrop(IBlockState state){ private static ItemStack getSilkTouchDrop(IBlockState state){
Item item = Item.getItemFromBlock(state.getBlock()); try {
int i = 0; return (ItemStack)getSilkTouchDrop.invoke(state.getBlock(), state);
}catch(IllegalAccessException | InvocationTargetException e){
if(item.getHasSubtypes()){ Wizardry.logger.error("Error while reflectively retrieving silk touch drop", e);
i = state.getBlock().getMetaFromState(state);
} }
return new ItemStack(item, 1, i); return null;
} }
} }