From 58ff2ac6d2771e82969cf1d3c62d13af5463c59d Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sat, 12 Sep 2015 18:53:02 -0700 Subject: [PATCH] Shovel Tweak and Invincibility Tweak Fixes #33 --- .../fox/spiteful/avaritia/LudicrousEvents.java | 17 +++++++++++++++-- .../spiteful/avaritia/crafting/Grinder.java | 18 ++++++++++++++++-- .../items/tools/ItemShovelInfinity.java | 2 +- .../resources/assets/avaritia/lang/en_US.lang | 2 +- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 69532e5..80f64ba 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -205,6 +205,8 @@ public class LudicrousEvents { public void onAttacked(LivingAttackEvent event) { if(!(event.entityLiving instanceof EntityPlayer)) return; + if(event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) + return; EntityPlayer player = (EntityPlayer)event.entityLiving; if(player.getHeldItem() != null && player.getHeldItem().getItem() == LudicrousItems.infinity_sword && player.isUsingItem()) event.setCanceled(true); @@ -266,12 +268,23 @@ public class LudicrousEvents { public void canHarvest(PlayerEvent.HarvestCheck event){ if(event.entityPlayer.getHeldItem() != null){ ItemStack held = event.entityPlayer.getHeldItem(); - if(held.getItem() == LudicrousItems.infinity_shovel){ - event.success = true; + if(held.getItem() == LudicrousItems.infinity_shovel && event.block.getMaterial() == Material.rock){ + if(held.getTagCompound().getBoolean("destroyer") && isGarbageBlock(event.block)) + event.success = true; } } } + private static boolean isGarbageBlock(Block block) { + for(int id : OreDictionary.getOreIDs(new ItemStack(block, 1))) { + String ore = OreDictionary.getOreName(id); + if(ore.equals("cobblestone") || ore.equals("stone") || ore.equals("netherrack")) + return true; + } + + return false; + } + @SubscribeEvent public void onDeath(LivingDeathEvent event){ if(event.entityLiving instanceof EntityPlayer){ diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index a86caec..0d0410b 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -119,7 +119,7 @@ public class Grinder { 'X', new ItemStack(LudicrousBlocks.resource_block, 1, 1), 'N', new ItemStack(LudicrousItems.resource, 1, 4)); - /*ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.infinity_axe), + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.infinity_axe), " I ", "IIIII", "IIII ", @@ -130,7 +130,21 @@ public class Grinder { " N ", " N ", 'I', new ItemStack(LudicrousItems.resource, 1, 6), - 'N', new ItemStack(LudicrousItems.resource, 1, 4));*/ + 'N', new ItemStack(LudicrousItems.resource, 1, 4)); + + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.infinity_bow), + " II", + " I W", + " I W", + "I W", + "X W", + "I W", + " I W", + " I W", + " II", + 'I', new ItemStack(LudicrousItems.resource, 1, 6), + 'X', new ItemStack(LudicrousBlocks.crystal_matrix, 1), + 'W', new ItemStack(Blocks.wool, 1, 0)); ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.infinity_armor), " NN NN ", diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemShovelInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemShovelInfinity.java index 4cd4e97..4b3937b 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemShovelInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemShovelInfinity.java @@ -60,7 +60,7 @@ public class ItemShovelInfinity extends ItemSpade { { return efficiencyOnProperMaterial; } - return Math.max(func_150893_a(stack, block), 6.0F); + return Math.max(func_150893_a(stack, block), 1.0F); } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index e9787a3..cdbbbdd 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -21,7 +21,7 @@ item.singularity_nickel.name=Nickel Singularity item.infinity_pickaxe.name=World Breaker item.infinity_sword.name=Sword of the Cosmos item.infinity_shovel.name=Planet Eater -item.infinity_axe.name=Nature's Ruin (WIP) +item.infinity_axe.name=Nature's Ruin item.infinity_bow.name=Longbow of the Heavens item.skullfire_sword.name=Skullfire Sword item.akashic_record.name=Akashic Records