From 4dc827f357e1dc84ccba27f8ed756c5278c8beb1 Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Thu, 6 Aug 2015 21:23:20 +0100 Subject: [PATCH] TiCon: DONE. Also updated todo list. --- .../spiteful/avaritia/LudicrousEvents.java | 4 +- .../avaritia/compat/ticon/TonkersEvents.java | 38 +++++++++++++++++++ .../spiteful/avaritia/crafting/Mincer.java | 2 + todo.txt | 2 - 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index d618282..de12f46 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -43,7 +43,7 @@ import static net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; public class LudicrousEvents { - private Random randy = new Random(); + private static Random randy = new Random(); @SubscribeEvent public void onPlayerMine(PlayerInteractEvent event) { @@ -124,7 +124,7 @@ public class LudicrousEvents { } } - private void dropItem(ItemStack drop, World world, int x, int y, int z){ + public static void dropItem(ItemStack drop, World world, int x, int y, int z){ float f = 0.7F; double d0 = (double)(randy.nextFloat() * f) + (double)(1.0F - f) * 0.5D; double d1 = (double)(randy.nextFloat() * f) + (double)(1.0F - f) * 0.5D; diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java index 4b317df..a949a85 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java +++ b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java @@ -2,14 +2,18 @@ package fox.spiteful.avaritia.compat.ticon; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; import tconstruct.library.event.ToolCraftEvent; import tconstruct.library.tools.AbilityHelper; @@ -17,6 +21,8 @@ import tconstruct.library.tools.ToolCore; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import fox.spiteful.avaritia.LudicrousEvents; import fox.spiteful.avaritia.Lumberjack; +import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.items.tools.ToolHelper; public class TonkersEvents { private Random randy = new Random(); @@ -146,4 +152,36 @@ public class TonkersEvents { } } } + + // bedrock SMASH! + @SubscribeEvent + public void onPlayerMine(PlayerInteractEvent event) { + if(event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null || event.entityPlayer.capabilities.isCreativeMode) + return; + Block block = event.world.getBlock(event.x, event.y, event.z); + int meta = event.world.getBlockMetadata(event.x, event.y, event.z); + ItemStack held = event.entityPlayer.getHeldItem(); + if(block.getBlockHardness(event.entityPlayer.worldObj, event.x, event.y, event.z) <= -1 && + held.hasTagCompound() && held.getItem() instanceof ToolCore && + (block.getMaterial() == Material.rock || block.getMaterial() == Material.iron)){ + + NBTTagCompound toolTag = held.getTagCompound().getCompoundTag("InfiTool"); + ToolCore tool = (ToolCore)held.getItem(); + + if (toolTag != null && toolTag.getInteger("Head") == Tonkers.infinityMetalId && tool.canHarvestBlock(Blocks.stone, held)) { + if(block.quantityDropped(randy) == 0) { + ItemStack drop = block.getPickBlock(ToolHelper.raytraceFromEntity(event.world, event.entityPlayer, true, 10), + event.world, event.x, event.y, event.z, event.entityPlayer); + if(drop == null) + drop = new ItemStack(block, 1, meta); + LudicrousEvents.dropItem(drop, event.entityPlayer.worldObj, event.x, event.y, event.z); + } + else { + block.harvestBlock(event.world, event.entityPlayer, event.x, event.y, event.z, meta); + } + event.entityPlayer.worldObj.setBlockToAir(event.x, event.y, event.z); + event.world.playAuxSFX(2001, event.x, event.y, event.z, Block.getIdFromBlock(block) + (meta << 12)); + } + } + } } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java index 485ed4a..398cdce 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java @@ -110,6 +110,8 @@ public class Mincer { //Lumberjack.info("first sort: "+cropSortingList); // sort into size/random order, should be deterministic because previous sort + Collections.shuffle(cropSortingList, randy); + Collections.sort(cropSortingList, new Comparator(){ @Override public int compare(FoodInfo a, FoodInfo b) { diff --git a/todo.txt b/todo.txt index 33d1892..72defe9 100644 --- a/todo.txt +++ b/todo.txt @@ -5,7 +5,6 @@ - Nature's Ruin (Infinity Axe) - Treecapitating? - 17x17 all trees ded on right click -- Dire Crafting Table stores inventory - Neutronium Compressor - 100+ ingredients per singularity - Finish MineTweaker support @@ -13,7 +12,6 @@ - Cross-mod support - Clean up the code - Finish Thaumcraft support - - TiCon Materials - Add configs - Configs for all cross-mod interaction - Config to gut entire mod except for 9x9 crafting, for modpack use