remove 3x3 mining

10 files changed, 0 insertions, 511 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index c97a9a1528..6b8736034c 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -2,7 +2,6 @@ package com.detrav;
 
 import com.detrav.commands.DetravBiomeScannerCommand;
 import com.detrav.commands.DetravLevelUpCommand;
-import com.detrav.events.DetravBlockBreakEventHandler;
 import com.detrav.events.DetravLoginEventHandler;
 import com.detrav.proxies.CommonProxy;
 import com.detrav.utils.DetravCreativeTab;
diff --git a/src/main/java/com/detrav/events/DetravBlockBreakEvent.java b/src/main/java/com/detrav/events/DetravBlockBreakEvent.java
deleted file mode 100644
index ac0c4d873c..0000000000
--- a/src/main/java/com/detrav/events/DetravBlockBreakEvent.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.detrav.events;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-
-/**
- * Created by wital_000 on 14.04.2016.
- */
-public class DetravBlockBreakEvent extends BlockEvent.BreakEvent {
-    public DetravBlockBreakEvent(int x, int y, int z, World world, Block block, int blockMetadata, EntityPlayer player) {
-        super(x, y, z, world, block, blockMetadata, player);
-    }
-}
diff --git a/src/main/java/com/detrav/events/DetravBlockBreakEventHandler.java b/src/main/java/com/detrav/events/DetravBlockBreakEventHandler.java
deleted file mode 100644
index c903b50b20..0000000000
--- a/src/main/java/com/detrav/events/DetravBlockBreakEventHandler.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.detrav.events;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.items.GT_Generic_Item;
-import net.minecraft.block.Block;
-//import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S23PacketBlockChange;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldSettings;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.BlockEvent;
-
-/**
- * Created by wital_000 on 13.04.2016.
- */
-public class DetravBlockBreakEventHandler {
-    @SubscribeEvent
-    public void onBreakBlock(BlockEvent.BreakEvent ev) {
-        if (ev.isCanceled())
-            return;
-        if (ev instanceof DetravBlockBreakEvent)
-            return;
-        if (!ev.world.isRemote) {
-            EntityPlayer player = ev.getPlayer();
-            if ((player instanceof EntityPlayerMP) && ((EntityPlayerMP) player).theItemInWorldManager.getGameType() != WorldSettings.GameType.SURVIVAL)
-                return;
-            if (player.capabilities.isCreativeMode)
-                return;
-            NBTTagCompound entityData = player.getEntityData();
-            long minningMode = entityData.getLong("detrav.minning.mode");
-            if (minningMode == 0) return;
-            int side = 0;
-            switch ((int) minningMode) {
-                case 1:
-                    Vec3 vec3 = Vec3.createVectorHelper(player.posX, player.posY + 1.62f, player.posZ);
-                    Vec3 vec31 = ev.getPlayer().getLook(1.0F);
-                    Vec3 vec32 = vec3.addVector(vec31.xCoord * 4.5F, vec31.yCoord * 4.5F, vec31.zCoord * 4.5F);
-                    side = rayTrace(ev.world, ev.block, ev.blockMetadata, vec3, vec32, ev.x, ev.y, ev.z, false, false, true);
-                    break;
-                case 2:
-                    side = 0;
-                    break;
-                case 3:
-                    float rotationYaw = ev.getPlayer().rotationYaw;
-                    while (rotationYaw > 0) rotationYaw -= 360F;
-                    while (rotationYaw < -360) rotationYaw += 360F;
-                    if ((-135 <= rotationYaw && rotationYaw <= -45) || (-315 <= rotationYaw && rotationYaw <= -225))
-                        side = 4;
-                    else if ((-225 <= rotationYaw && rotationYaw <= -135) || -45 <= rotationYaw || rotationYaw <= -315)
-                        side = 2;
-                    else side = -1;
-                    break;
-            }
-            //ev.getPlayer().addChatMessage(new ChatComponentText(ev.block.getLocalizedName() + " | " + ev.getPlayer().rotationYaw + " | " + ev.getPlayer().rotationPitch));
-            //ev.getPlayer().addChatMessage(new ChatComponentText(ev.block.getLocalizedName() + " | " + side));
-            if (minningMode < 4)
-                switch (side) {
-                    case 0:
-                    case 1:
-                        //    if (ev.getPlayer().rotationPitch > 45 || ev.getPlayer().rotationPitch < -45) {
-                        for (int i = ev.x - 1; i <= ev.x + 1; i++)
-                            for (int j = ev.z - 1; j <= ev.z + 1; j++)
-                                if (i != ev.x || j != ev.z)
-                                    tryHarvestBlock(i, ev.y, j, ev);
-                        break;
-                    // and (-45 > x > -135) and (-135 > x > -225) and (-225 > x > -315) or (-315 > x > -45)
-                    //    } else if ((-135 <= ev.getPlayer().rotationYaw && ev.getPlayer().rotationYaw <= -45) || (-315 <= ev.getPlayer().rotationYaw && ev.getPlayer().rotationYaw <= -225)) {
-                    case 4:
-                    case 5:
-                        for (int i = ev.z - 1; i <= ev.z + 1; i++)
-                            for (int j = ev.y - 1; j <= ev.y + 1; j++)
-                                if (i != ev.z || j != ev.y)
-                                    tryHarvestBlock(ev.x, j, i, ev);
-                        break;
-                    //    } else if ((-225 <= ev.getPlayer().rotationYaw && ev.getPlayer().rotationYaw <= -135) || -45 <= ev.getPlayer().rotationYaw || ev.getPlayer().rotationYaw <= -315) {
-                    case 2:
-                    case 3:
-                        for (int i = ev.x - 1; i <= ev.x + 1; i++)
-                            for (int j = ev.y - 1; j <= ev.y + 1; j++)
-                                if (i != ev.x || j != ev.y)
-                                    tryHarvestBlock(i, j, ev.z, ev);
-                        break;
-                    //    } else
-                    //        ev.getPlayer().addChatMessage(new ChatComponentText("Unknown | yaw = " + ev.getPlayer().rotationYaw + " | pitch = " + ev.getPlayer().rotationPitch));
-                }
-            else {
-                //    if (ev.getPlayer().rotationPitch > 45 || ev.getPlayer().rotationPitch < -45) {
-                for (int i = ev.x - 1; i <= ev.x + 1; i++)
-                    for (int j = ev.y - 1; j <= ev.y + 1; j++)
-                        for (int k = ev.z - 1; k <= ev.z + 1; k++)
-                            if (i != ev.x || j != ev.y || k != ev.z)
-                                if (ev.block == ev.world.getBlock(i, j, k) && (ev.blockMetadata == ev.world.getBlockMetadata(i, j, k)))
-                                    tryHarvestBlock(i, j, k, ev);
-            }
-        }
-    }
-
-    static private boolean tryHarvestBlock(int x, int y, int z, BlockEvent.BreakEvent event2) {
-        if (!(event2.getPlayer() instanceof EntityPlayerMP))
-            return false;//если это не игрок то выходим
-        EntityPlayer thisPlayerMP = event2.getPlayer();
-        ItemStack stack = thisPlayerMP.getCurrentEquippedItem();
-        //получаем текущий тулс
-        if (stack == null) return false;
-        //выходим если в руках ничего нет
-        World theWorld = event2.world;
-        Block block = theWorld.getBlock(x, y, z);
-        //int blockMetadata = theWorld.getBlockMetadata(x, y, z);
-        // dirt and pickaxe -> if(true && false) -> exit
-        // dirt and shovel -> if(true && false) -> exit
-
-        //чекаем может ли предмет добыть блок
-        //херня какаято с этими названиями функций
-
-        //thisPlayerMP.addChatMessage(new ChatComponentText("Mining Speed: " + stack.getItem().getDigSpeed(stack,block,blockMetadata)));
-        if (!isToolEffective(stack, theWorld, x, y, z))
-            return false;
-        int blockMetadata = theWorld.getBlockMetadata(x, y, z);
-        if ((stack.getItem() instanceof GT_Generic_Item) && !(stack.getItem().getDigSpeed(stack, block, blockMetadata) > 0.0F))
-            return false;
-
-        BlockEvent.BreakEvent event = onDetravBlockBreakEvent(event2.world, WorldSettings.GameType.SURVIVAL, (EntityPlayerMP) event2.getPlayer(), x, y, z);
-        if (event.isCanceled())
-            return false;
-
-        if (stack != null && stack.getItem().onBlockStartBreak(stack, x, y, z, thisPlayerMP)) {
-            return false;
-        }
-
-        theWorld.playAuxSFXAtEntity(thisPlayerMP, 2001, x, y, z, Block.getIdFromBlock(block) + (theWorld.getBlockMetadata(x, y, z) << 12));
-        boolean flag = false;
-        ItemStack itemstack = thisPlayerMP.getCurrentEquippedItem();
-        boolean flag1 = block.canHarvestBlock(thisPlayerMP, blockMetadata);
-
-        if (itemstack != null) {
-            itemstack.func_150999_a(theWorld, block, x, y, z, thisPlayerMP);
-            if (itemstack.stackSize == 0) {
-                thisPlayerMP.destroyCurrentEquippedItem();
-            }
-        }
-        flag = removeBlock(x, y, z, flag1, event);
-        if (flag && flag1) {
-            block.harvestBlock(theWorld, thisPlayerMP, x, y, z, blockMetadata);
-        }
-        if (flag && event != null) {
-            block.dropXpOnBlockBreak(theWorld, x, y, z, event.getExpToDrop());
-        }
-        return flag;
-    }
-
-    static private boolean removeBlock(int x, int y, int z, boolean canHarvest, BlockEvent.BreakEvent event) {
-        World theWorld = event.world;
-        EntityPlayer thisPlayerMP = event.getPlayer();
-        Block block = theWorld.getBlock(x, y, z);
-        int l = theWorld.getBlockMetadata(x, y, z);
-        block.onBlockHarvested(theWorld, x, y, z, l, thisPlayerMP);
-        boolean flag = block.removedByPlayer(theWorld, thisPlayerMP, x, y, z, canHarvest);
-
-        if (flag) {
-            block.onBlockDestroyedByPlayer(theWorld, x, y, z, l);
-        }
-
-        return flag;
-    }
-
-    public static BlockEvent.BreakEvent onDetravBlockBreakEvent(World world, WorldSettings.GameType gameType, EntityPlayerMP entityPlayer, int x, int y, int z) {
-        // Logic from tryHarvestBlock for pre-canceling the event
-        boolean preCancelEvent = false;
-        if (gameType.isAdventure() && !entityPlayer.isCurrentToolAdventureModeExempt(x, y, z)) {
-            preCancelEvent = true;
-        } else if (gameType.isCreative() && entityPlayer.getHeldItem() != null && entityPlayer.getHeldItem().getItem() instanceof ItemSword) {
-            preCancelEvent = true;
-        }
-
-        // Tell client the block is gone immediately then process events
-        if (world.getTileEntity(x, y, z) == null) {
-            S23PacketBlockChange packet = new S23PacketBlockChange(x, y, z, world);
-            packet.field_148883_d = Blocks.air;
-            packet.field_148884_e = 0;
-            entityPlayer.playerNetServerHandler.sendPacket(packet);
-        }
-
-        // Post the block break event
-        Block block = world.getBlock(x, y, z);
-        int blockMetadata = world.getBlockMetadata(x, y, z);
-        BlockEvent.BreakEvent event = new DetravBlockBreakEvent(x, y, z, world, block, blockMetadata, entityPlayer);
-        event.setCanceled(preCancelEvent);
-        MinecraftForge.EVENT_BUS.post(event);
-
-        // Handle if the event is canceled
-        if (event.isCanceled()) {
-            // Let the client know the block still exists
-            entityPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
-
-            // Update any tile entity data for this block
-            TileEntity tileentity = world.getTileEntity(x, y, z);
-            if (tileentity != null) {
-                Packet pkt = tileentity.getDescriptionPacket();
-                if (pkt != null) {
-                    entityPlayer.playerNetServerHandler.sendPacket(pkt);
-                }
-            }
-        }
-        return event;
-    }
-
-    static int rayTrace(World w, Block block, int blockMetadata, Vec3 playerPos, Vec3 lookAtPos, int xBlock, int yBlock, int zBlock, boolean unknownVar1, boolean unknownVar2, boolean unknownVar3) {
-        if (!Double.isNaN(playerPos.xCoord) && !Double.isNaN(playerPos.yCoord) && !Double.isNaN(playerPos.zCoord))
-            if (!Double.isNaN(lookAtPos.xCoord) && !Double.isNaN(lookAtPos.yCoord) && !Double.isNaN(lookAtPos.zCoord)) {
-
-                if ((!unknownVar2 || block.getCollisionBoundingBoxFromPool(w, xBlock, yBlock, zBlock) != null) && block.canCollideCheck(blockMetadata, unknownVar1)) {
-                    MovingObjectPosition movingobjectposition = block.collisionRayTrace(w, xBlock, yBlock, zBlock, playerPos, lookAtPos);
-
-                    if (movingobjectposition != null) {
-                        return movingobjectposition.sideHit;
-                    }
-                }
-                return -1;
-            }
-        return -1;
-    }
-
-    static boolean inited = false;
-
-    public static void register() {
-        if (!inited) {
-            inited = true;
-            DetravBlockBreakEventHandler handler = new DetravBlockBreakEventHandler();
-            MinecraftForge.EVENT_BUS.register(handler);
-            FMLCommonHandler.instance().bus().register(handler);
-        }
-    }
-
-
-    public static boolean isToolEffective(ItemStack stack, World world, int x, int y, int z) {
-        Block block = world.getBlock(x, y, z);
-        if (block.getBlockHardness(world, x, y, z) < 0) //unbreakable
-            return false;
-        else
-            return isToolEffective(stack, block, world.getBlockMetadata(x, y, z)) || block.getBlockHardness(world, x, y, z) == 0;
-    }
-
-    public static boolean isToolEffective(ItemStack stack, Block block, int meta) {
-        if (block == null)
-            return false;
-
-        if (stack != null) {
-            for (String toolClass : stack.getItem().getToolClasses(stack)) {
-                if (toolClass.equals(block.getHarvestTool(meta)))
-                    return stack.getItem().getHarvestLevel(stack, toolClass) >= block.getHarvestLevel(meta);
-            }
-
-            return stack.getItem().canHarvestBlock(block, stack);
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/events/DetravKeyHandler.java b/src/main/java/com/detrav/events/DetravKeyHandler.java
deleted file mode 100644
index 9a00bf55ab..0000000000
--- a/src/main/java/com/detrav/events/DetravKeyHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.detrav.events;
-
-import com.detrav.net.DetravModeSwitchPacket02;
-import com.detrav.net.DetravNetwork;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.util.ChatComponentText;
-import net.minecraftforge.common.MinecraftForge;
-import org.lwjgl.input.Keyboard;
-
-/**
- * Created by wital_000 on 14.04.2016.
- */
-public class DetravKeyHandler {
-    public static KeyBinding modeSwitchKey;
-
-    @SubscribeEvent
-    public void onKeyInput(InputEvent.KeyInputEvent event) {
-        if (modeSwitchKey.isPressed()) {
-            if (Minecraft.getMinecraft().thePlayer.isSneaking())
-                DetravNetwork.INSTANCE.sendToServer(new DetravModeSwitchPacket02(Minecraft.getMinecraft().thePlayer, true));
-            else
-                DetravNetwork.INSTANCE.sendToServer(new DetravModeSwitchPacket02(Minecraft.getMinecraft().thePlayer, false));
-            //Minecraft.getMinecraft().thePlayer.getEntityData().
-        }
-    }
-
-    static boolean inited = false;
-
-    public static void register() {
-        if (!inited) {
-            inited = true;
-            modeSwitchKey = new KeyBinding("key.detrav.modeSwitch", Keyboard.KEY_GRAVE, "key.categories.misc");
-            ClientRegistry.registerKeyBinding(modeSwitchKey);
-            DetravKeyHandler handler = new DetravKeyHandler();
-            MinecraftForge.EVENT_BUS.register(handler);
-            FMLCommonHandler.instance().bus().register(handler);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/events/DetravLoginEventHandler.java b/src/main/java/com/detrav/events/DetravLoginEventHandler.java
index 0f3be62ba2..09b4390459 100644
--- a/src/main/java/com/detrav/events/DetravLoginEventHandler.java
+++ b/src/main/java/com/detrav/events/DetravLoginEventHandler.java
@@ -1,6 +1,5 @@
 package com.detrav.events;
 
-import com.detrav.net.DetravModePacket03;
 import com.detrav.net.DetravNetwork;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -13,20 +12,6 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent;
  * Created by wital_000 on 18.04.2016.
  */
 public class DetravLoginEventHandler {
-    @SubscribeEvent
-    public void onEntityJoinWorld(EntityJoinWorldEvent event)
-    {
-        if(event.isCanceled()) return;
-        if(!event.world.isRemote)
-        if(event.entity instanceof EntityPlayerMP)
-        {
-            DetravNetwork.INSTANCE.sendToPlayer(new DetravModePacket03((EntityPlayerMP)event.entity),(EntityPlayerMP)event.entity);
-            DetravLevelUpEvent.UpdateHealthAttribute((EntityPlayer) event.entity);
-        }
-        //if(Minecraft.getMinecraft().thePlayer!=null)
-        //Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""+(event.entity instanceof EntityPlayerMP)+" | " + event.world.isRemote));
-    }
-
 
     static boolean inited = false;
 
diff --git a/src/main/java/com/detrav/net/DetravModePacket03.java b/src/main/java/com/detrav/net/DetravModePacket03.java
deleted file mode 100644
index 0d087dedf3..0000000000
--- a/src/main/java/com/detrav/net/DetravModePacket03.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.detrav.net;
-
-import com.detrav.events.DetravDrawBlockHighlightEventHandler;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import net.minecraft.entity.player.EntityPlayer;
-
-/**
- * Created by wital_000 on 18.04.2016.
- */
-public class DetravModePacket03 extends DetravPacket {
-
-    EntityPlayer player;
-    long mode = 0L;
-
-    public DetravModePacket03()
-    {
-        player =null;
-    }
-
-    public DetravModePacket03(EntityPlayer aPlayer)
-    {
-        player = aPlayer;
-    }
-
-    public DetravModePacket03(long aMode)
-    {
-        mode = aMode;
-    }
-
-
-    @Override
-    public int getPacketID() {
-        return 3;
-    }
-
-    @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
-        if (player != null)
-            tOut.writeLong(player.getEntityData().getLong("detrav.minning.mode"));
-        else tOut.writeLong(0L);
-        return tOut.toByteArray();
-    }
-
-    @Override
-    public Object decode(ByteArrayDataInput aData) {
-        long aMode = aData.readLong();
-        return new DetravModePacket03(aMode);
-    }
-
-    @Override
-    public void process() {
-        DetravDrawBlockHighlightEventHandler.modeBlockBreak = mode;
-    }
-}
diff --git a/src/main/java/com/detrav/net/DetravModeSwitchPacket02.java b/src/main/java/com/detrav/net/DetravModeSwitchPacket02.java
deleted file mode 100644
index 0296f6bdab..0000000000
--- a/src/main/java/com/detrav/net/DetravModeSwitchPacket02.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.detrav.net;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
-
-import java.util.ArrayList;
-import java.util.ListIterator;
-
-/**
- * Created by wital_000 on 14.04.2016.
- */
-public class DetravModeSwitchPacket02 extends DetravPacket {
-
-    EntityPlayer player;
-    boolean back;
-
-    public DetravModeSwitchPacket02() {
-        player = null;
-    }
-
-    public DetravModeSwitchPacket02(EntityPlayer aPlayer, boolean aBack) {
-        player = aPlayer;
-        back = aBack;
-    }
-
-    @Override
-    public int getPacketID() {
-        return 2;
-    }
-
-    @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
-        if (player != null)
-            tOut.writeInt(player.getEntityId());
-        else tOut.writeInt(Integer.MIN_VALUE);
-        tOut.writeBoolean(back);
-        return tOut.toByteArray();
-    }
-
-    @Override
-    public Object decode(ByteArrayDataInput aData) {
-        int id = aData.readInt();
-        if (id == Integer.MIN_VALUE)
-            return new DetravModeSwitchPacket02();
-        boolean aBack = aData.readBoolean();
-        //ArrayList<EntityPlayerMP> allp = new ArrayList<EntityPlayerMP>();
-        ListIterator itl;
-        EntityPlayerMP temp = null;
-        for (int i = 0; i < MinecraftServer.getServer().worldServers.length; i++) {
-            itl = MinecraftServer.getServer().worldServers[i].playerEntities.listIterator();
-            while (itl.hasNext()) {
-                temp = (EntityPlayerMP) itl.next();
-                if (temp.getEntityId() == id)
-                    return new DetravModeSwitchPacket02(temp, aBack);
-                temp = null;
-            }
-        }
-        return new DetravModeSwitchPacket02(temp, aBack);
-    }
-
-    @Override
-    public void process() {
-        if (player != null) {
-            NBTTagCompound aData = player.getEntityData();
-            //aData.hasNoTags()
-            long minningMode = aData.getLong("detrav.minning.mode");
-            if (back) {
-                if (--minningMode < 0)
-                    minningMode = 4;
-            } else {
-                if (++minningMode > 4)
-                    minningMode = 0;
-            }
-            switch ((int) minningMode) {
-                case 0:
-                    player.addChatMessage(new ChatComponentText("Mining mode 1x1, just one block"));
-                    break;
-                case 1:
-                    player.addChatMessage(new ChatComponentText("Mining mode 3x3 by side, nine blocks"));
-                    break;
-                case 2:
-                    player.addChatMessage(new ChatComponentText("Mining mode 3x3 horizontal, nine blocks"));
-                    break;
-                case 3:
-                    player.addChatMessage(new ChatComponentText("Mining mode 3x3 vertical, nine blocks"));
-                    break;
-                case 4:
-                    player.addChatMessage(new ChatComponentText("Mining mode 3x3x3 vein, twenty seven blocks by type"));
-                    break;
-            }
-            aData.setLong("detrav.minning.mode", minningMode);
-
-            if (player instanceof EntityPlayerMP)
-                DetravNetwork.INSTANCE.sendToPlayer(new DetravModePacket03(player), (EntityPlayerMP) player);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 892c89e183..988b6c3a69 100644
--- a/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
@@ -35,8 +35,6 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
                 {
                         new DetravProPickPacket00(),
                         new DetravPortableChargerPacket01(),
-                        new DetravModeSwitchPacket02(),
-                        new DetravModePacket03()
                 };
     }
 
diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java
index f5b2bd8497..2140055802 100644
--- a/src/main/java/com/detrav/proxies/ClientProxy.java
+++ b/src/main/java/com/detrav/proxies/ClientProxy.java
@@ -3,7 +3,6 @@ package com.detrav.proxies;
 import com.detrav.DetravScannerMod;
 import com.detrav.enums.Textures01;
 import com.detrav.events.DetravDrawBlockHighlightEventHandler;
-import com.detrav.events.DetravKeyHandler;
 import com.detrav.gui.DetravGuiProPick;
 import gregtech.api.enums.Textures;
 import net.minecraft.client.Minecraft;
@@ -44,7 +43,6 @@ public class ClientProxy extends CommonProxy {
     public void onPreInit()
     {
         super.onPreInit();
-        DetravKeyHandler.register();
     }
 
     @Override
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 6290f57ffb..5c49af00fc 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -4,7 +4,6 @@ import com.detrav.DetravScannerMod;
 
 import com.detrav.enums.DetravItemList;
 import com.detrav.enums.DetravSimpleItems;
-import com.detrav.events.DetravBlockBreakEventHandler;
 import com.detrav.events.DetravEntityDropEvent;
 import com.detrav.events.DetravLevelUpEvent;
 import com.detrav.events.DetravLoginEventHandler;
@@ -73,7 +72,6 @@ public class CommonProxy implements IGuiHandler {
         //DetravCraftingEventHandler.register();
         DetravEntityDropEvent.register();
         DetravLevelUpEvent.register();
-        DetravBlockBreakEventHandler.register();
         DetravLoginEventHandler.register();
     }