From 6c899dab1fe0f6484d14dab10fa187497c0decf6 Mon Sep 17 00:00:00 2001 From: James McKay Date: Thu, 8 Oct 2015 12:10:42 +1100 Subject: [PATCH] Add some stuff for durability. --- src/main/java/portablejim/bbw/core/WandWorker.java | 3 +++ .../java/portablejim/bbw/core/items/ItemUnbreakableWand.java | 5 ----- src/main/java/portablejim/bbw/shims/BasicPlayerShim.java | 5 +++++ src/main/java/portablejim/bbw/shims/IPlayerShim.java | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/portablejim/bbw/core/WandWorker.java b/src/main/java/portablejim/bbw/core/WandWorker.java index 5a29c36..e69944c 100644 --- a/src/main/java/portablejim/bbw/core/WandWorker.java +++ b/src/main/java/portablejim/bbw/core/WandWorker.java @@ -113,6 +113,9 @@ public class WandWorker { if(blockPlaceSuccess) { world.playPlaceAtBlock(blockPos, world.getBlock(originalBlock)); + if (!player.isCreative()) { + wand.placeBlock(); + } boolean takeFromInventory = player.useItem(getEquivalentItemStack(originalBlock)); if(!takeFromInventory) { world.setBlockToAir(blockPos); diff --git a/src/main/java/portablejim/bbw/core/items/ItemUnbreakableWand.java b/src/main/java/portablejim/bbw/core/items/ItemUnbreakableWand.java index b7f9b15..e63e094 100644 --- a/src/main/java/portablejim/bbw/core/items/ItemUnbreakableWand.java +++ b/src/main/java/portablejim/bbw/core/items/ItemUnbreakableWand.java @@ -1,11 +1,8 @@ package portablejim.bbw.core.items; -import com.sun.jmx.remote.internal.ArrayQueue; import cpw.mods.fml.common.FMLLog; -import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -20,9 +17,7 @@ import portablejim.bbw.shims.CreativePlayerShim; import portablejim.bbw.shims.IPlayerShim; import portablejim.bbw.shims.IWorldShim; -import java.util.HashSet; import java.util.LinkedList; -import java.util.Queue; /** * The actual item: Simple wand with no durability. Similar to current Builder's Wand. diff --git a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java index 397061a..e8330fc 100644 --- a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java +++ b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java @@ -57,4 +57,9 @@ public class BasicPlayerShim implements IPlayerShim { public Point3d getPlayerPosition() { return new Point3d((int)player.posX, (int)player.posY, (int)player.posZ); } + + @Override + public boolean isCreative() { + return player.capabilities.isCreativeMode; + } } diff --git a/src/main/java/portablejim/bbw/shims/IPlayerShim.java b/src/main/java/portablejim/bbw/shims/IPlayerShim.java index 6cb657f..4dafb1e 100644 --- a/src/main/java/portablejim/bbw/shims/IPlayerShim.java +++ b/src/main/java/portablejim/bbw/shims/IPlayerShim.java @@ -10,4 +10,6 @@ public interface IPlayerShim { int countItems(ItemStack itemStack); boolean useItem(ItemStack itemStack); Point3d getPlayerPosition(); + + boolean isCreative(); }