From 4de7ef8190f21437baef73bb82cdee9e48a24cf5 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 18 Jan 2015 16:17:04 -0500 Subject: [PATCH] IChiselItem items no longer need to worry about playing the sound fx. Remove ChiselMode from API packages --- .../com/cricketcraft/chisel/client/gui/GuiChisel.java | 3 +-- .../chisel/inventory/SlotChiselSelection.java | 9 +++++++++ .../chisel/item/chisel/ChiselController.java | 1 - .../chisel/{api => item/chisel}/ChiselMode.java | 3 ++- .../com/cricketcraft/chisel/item/chisel/ItemChisel.java | 7 ------- .../chisel/network/message/MessageChiselMode.java | 2 +- src/main/java/com/cricketcraft/chisel/utils/General.java | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) rename src/main/java/com/cricketcraft/chisel/{api => item/chisel}/ChiselMode.java (97%) diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java index a7c4e765..3eab093c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java @@ -6,14 +6,13 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; -import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.inventory.ContainerChisel; import com.cricketcraft.chisel.inventory.InventoryChiselSelection; import com.cricketcraft.chisel.inventory.SlotChiselInput; +import com.cricketcraft.chisel.item.chisel.ChiselMode; import com.cricketcraft.chisel.network.PacketHandler; import com.cricketcraft.chisel.network.message.MessageChiselMode; import com.cricketcraft.chisel.utils.General; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java index 6a476c37..481ba578 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java @@ -4,9 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.utils.General; +import com.cricketcraft.chisel.utils.GeneralClient; public class SlotChiselSelection extends Slot { @@ -58,6 +62,11 @@ public class SlotChiselSelection extends Slot { ((IChiselItem)container.chisel.getItem()).onChisel(player.worldObj, player.inventory, player.inventory.currentItem, container.chisel, General.getVariation(crafted)); + if (player.worldObj.isRemote) { + String sound = Carving.chisel.getVariationSound(crafted.getItem(), crafted.getItemDamage()); + GeneralClient.playChiselSound(player.worldObj, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), sound); + } + /* * ItemStack stack=player.inventory.getItemStack(); * diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java index 08b575ce..eb4770fd 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java @@ -10,7 +10,6 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.carving.Carving; diff --git a/src/main/java/com/cricketcraft/chisel/api/ChiselMode.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/api/ChiselMode.java rename to src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java index a0da6f00..43bf16b2 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ChiselMode.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.api; +package com.cricketcraft.chisel.item.chisel; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -7,6 +7,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.network.PacketHandler; import com.cricketcraft.chisel.network.message.MessageChiselSound; diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java index a05a8766..f740e6e0 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java @@ -13,7 +13,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.carving.Carving; @@ -96,12 +95,6 @@ public class ItemChisel extends Item implements IChiselItem { inv.decrStackSize(slot, 1); } } - - if (world.isRemote) { - String sound = carving.getVariationSound(target.getBlock(), target.getItemMeta()); - EntityPlayer player = Chisel.proxy.getClientPlayer(); - GeneralClient.playChiselSound(world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), sound); - } } @Override diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java index 0bde806e..db2ab62f 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java @@ -3,8 +3,8 @@ package com.cricketcraft.chisel.network.message; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.item.chisel.ChiselMode; import com.cricketcraft.chisel.utils.General; import cpw.mods.fml.common.network.ByteBufUtils; diff --git a/src/main/java/com/cricketcraft/chisel/utils/General.java b/src/main/java/com/cricketcraft/chisel/utils/General.java index 1671284d..99ab77ac 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/General.java +++ b/src/main/java/com/cricketcraft/chisel/utils/General.java @@ -15,9 +15,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.item.chisel.ChiselMode; public class General {