From 6bf493c014e29664d8a1d215c579819a00c11773 Mon Sep 17 00:00:00 2001 From: Dilnu Date: Sat, 22 Oct 2016 19:48:06 -0400 Subject: [PATCH 1/3] Implement Botania compatibility. This allows all Builders Wands to use blocks from The Rod of the Lands, Black Hole Talismans etc. Also fixes a minor null pointer bug in ItemBasicWand. --- .../botania/api/item/IBlockProvider.java | 40 ++++++++++++ .../bbw/core/items/ItemBasicWand.java | 20 +++--- .../bbw/shims/BasicPlayerShim.java | 61 +++++++++++++++++++ 3 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 src/api/java/vazkii/botania/api/item/IBlockProvider.java diff --git a/src/api/java/vazkii/botania/api/item/IBlockProvider.java b/src/api/java/vazkii/botania/api/item/IBlockProvider.java new file mode 100644 index 0000000..4b29178 --- /dev/null +++ b/src/api/java/vazkii/botania/api/item/IBlockProvider.java @@ -0,0 +1,40 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 20, 2015, 10:31:54 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * An Item that implements this can provide blocks to other items that use them. + * For example, the Black Hole Talisman implements this in order to allow for + * the Rod of the Shifting Crust to pull blocks from it. + */ +public interface IBlockProvider { + + /** + * Provides the requested item. The doit paremeter specifies whether this is + * just a test (false) or if the item should actually be removed (true). + * If you need to use calls to ManaItemHandler.requestMana[Exact], use + * the requestor as the ItemStack passed in. + */ + public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit); + + /** + * Gets the amount of blocks of the type passed stored in this item. You must + * check for the block passed in to not give the counter for a wrong block. Returning + * -1 states that the item can provide infinite of the item passed in (for example, + * the Rod of the Lands would return -1 if the block is dirt). + */ + public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta); + +} diff --git a/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java b/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java index b9870ed..2f9b0ba 100644 --- a/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java +++ b/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java @@ -77,16 +77,18 @@ public abstract class ItemBasicWand extends Item implements IWandItem{ placedIntArray[i * 3 + 1] = currentPoint.y; placedIntArray[i * 3 + 2] = currentPoint.z; } - NBTTagCompound itemNBT = itemstack.getTagCompound(); - NBTTagCompound bbwCompond = new NBTTagCompound(); - if(itemNBT.hasKey("bbw", Constants.NBT.TAG_COMPOUND)) { - bbwCompond = itemNBT.getCompoundTag("bbw"); + NBTTagCompound bbwCompound = new NBTTagCompound(); + if(itemstack.hasTagCompound()) { + NBTTagCompound itemNBT = itemstack.getTagCompound(); + if (itemNBT.hasKey("bbw", Constants.NBT.TAG_COMPOUND)) { + bbwCompound = itemNBT.getCompoundTag("bbw"); + } } - bbwCompond.setIntArray("lastPlaced", placedIntArray); - bbwCompond.setString("lastBlock", Item.itemRegistry.getNameForObject(sourceItems.getItem())); - bbwCompond.setInteger("lastDamage", sourceItems.getItemDamage()); - bbwCompond.setInteger("lastPerBlock", sourceItems.stackSize); - itemstack.setTagInfo("bbw", bbwCompond); + bbwCompound.setIntArray("lastPlaced", placedIntArray); + bbwCompound.setString("lastBlock", Item.itemRegistry.getNameForObject(sourceItems.getItem())); + bbwCompound.setInteger("lastDamage", sourceItems.getItemDamage()); + bbwCompound.setInteger("lastPerBlock", sourceItems.stackSize); + itemstack.setTagInfo("bbw", bbwCompound); } } diff --git a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java index 3276300..4b1e4d1 100644 --- a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java +++ b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java @@ -2,19 +2,55 @@ package portablejim.bbw.shims; import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import portablejim.bbw.basics.Point3d; +import vazkii.botania.api.item.IBlockProvider; + +import java.util.ArrayList; +import java.util.List; /** * Wrap a player to provide basic functions. */ public class BasicPlayerShim implements IPlayerShim { private EntityPlayer player; + private boolean providersEnabled; public BasicPlayerShim(EntityPlayer player) { this.player = player; + this.providersEnabled = areProvidersEnabled(); + } + + private static final String TAG_BLOCK_NAME = "blockName"; + private static final String TAG_BLOCK_META = "blockMeta"; + + private static Block getBlock(ItemStack stack) { + String blockName = verifyExistance(stack, TAG_BLOCK_NAME) ? stack.getTagCompound().getString(TAG_BLOCK_NAME) : ""; + Block block = Block.getBlockFromName(blockName); + if (block == null) { + block = Block.getBlockFromItem(stack.getItem()); + } + return block; + } + + private static int getBlockMeta(ItemStack stack) { + return verifyExistance(stack, TAG_BLOCK_META) ? stack.getTagCompound().getInteger(TAG_BLOCK_META) : 0; + } + + private static boolean verifyExistance(ItemStack stack, String tag) { + return stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey(tag); + } + + private static boolean areProvidersEnabled() { + try { + boolean disable = new Object() instanceof IBlockProvider; + return true; + } catch (NoClassDefFoundError e) { + return false; + } } @Override @@ -24,11 +60,20 @@ public class BasicPlayerShim implements IPlayerShim { return 0; } + Block block = getBlock(itemStack); + int meta = getBlockMeta(itemStack); for(ItemStack inventoryStack : player.inventory.mainInventory) { if(inventoryStack != null && itemStack.isItemEqual(inventoryStack)) { total += Math.max(0, inventoryStack.stackSize); } + else if(providersEnabled && inventoryStack != null && inventoryStack.getItem() instanceof IBlockProvider) { + IBlockProvider prov = (IBlockProvider) inventoryStack.getItem(); + int provCount = prov.getBlockCount(player, itemStack, inventoryStack, block, meta); + if(provCount == -1) + return Integer.MAX_VALUE; + total += provCount; + } } return itemStack.stackSize > 0 ? total / itemStack.stackSize : 0; @@ -42,6 +87,7 @@ public class BasicPlayerShim implements IPlayerShim { // Reverse direction to leave hotbar to last. int toUse = itemStack.stackSize; + List providers = new ArrayList(); for(int i = player.inventory.mainInventory.length - 1; i >= 0; i--) { ItemStack inventoryStack = player.inventory.mainInventory[i]; if(inventoryStack != null && itemStack.isItemEqual(inventoryStack)) { @@ -61,7 +107,22 @@ public class BasicPlayerShim implements IPlayerShim { return true; } } + else if(providersEnabled && inventoryStack != null && inventoryStack.getItem() instanceof IBlockProvider) { + providers.add(inventoryStack); + } } + + // IBlockProvider does not support removing more than one item in an atomic operation. + if (toUse == 1) { + Block block = getBlock(itemStack); + int meta = getBlockMeta(itemStack); + for(ItemStack provStack : providers) { + IBlockProvider prov = (IBlockProvider) provStack.getItem(); + if(prov.provideBlock(player, itemStack, provStack, block, meta, true)) + return true; + } + } + return false; } From bc370980f6d56572a88ff4481ab62d22e3a57794 Mon Sep 17 00:00:00 2001 From: Dilnu Date: Sat, 22 Oct 2016 19:48:06 -0400 Subject: [PATCH 2/3] Implement Botania compatibility. This allows all Builders Wands to use blocks from The Rod of the Lands, Black Hole Talismans etc. Also fixes a minor null pointer bug in ItemBasicWand. --- .../botania/api/item/IBlockProvider.java | 40 +++++++++++++++ .../bbw/core/items/ItemBasicWand.java | 20 ++++---- .../bbw/shims/BasicPlayerShim.java | 50 ++++++++++++++++++- 3 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 src/api/java/vazkii/botania/api/item/IBlockProvider.java diff --git a/src/api/java/vazkii/botania/api/item/IBlockProvider.java b/src/api/java/vazkii/botania/api/item/IBlockProvider.java new file mode 100644 index 0000000..4b29178 --- /dev/null +++ b/src/api/java/vazkii/botania/api/item/IBlockProvider.java @@ -0,0 +1,40 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 20, 2015, 10:31:54 PM (GMT)] + */ +package vazkii.botania.api.item; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * An Item that implements this can provide blocks to other items that use them. + * For example, the Black Hole Talisman implements this in order to allow for + * the Rod of the Shifting Crust to pull blocks from it. + */ +public interface IBlockProvider { + + /** + * Provides the requested item. The doit paremeter specifies whether this is + * just a test (false) or if the item should actually be removed (true). + * If you need to use calls to ManaItemHandler.requestMana[Exact], use + * the requestor as the ItemStack passed in. + */ + public boolean provideBlock(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta, boolean doit); + + /** + * Gets the amount of blocks of the type passed stored in this item. You must + * check for the block passed in to not give the counter for a wrong block. Returning + * -1 states that the item can provide infinite of the item passed in (for example, + * the Rod of the Lands would return -1 if the block is dirt). + */ + public int getBlockCount(EntityPlayer player, ItemStack requestor, ItemStack stack, Block block, int meta); + +} diff --git a/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java b/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java index b9870ed..2f9b0ba 100644 --- a/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java +++ b/src/main/java/portablejim/bbw/core/items/ItemBasicWand.java @@ -77,16 +77,18 @@ public abstract class ItemBasicWand extends Item implements IWandItem{ placedIntArray[i * 3 + 1] = currentPoint.y; placedIntArray[i * 3 + 2] = currentPoint.z; } - NBTTagCompound itemNBT = itemstack.getTagCompound(); - NBTTagCompound bbwCompond = new NBTTagCompound(); - if(itemNBT.hasKey("bbw", Constants.NBT.TAG_COMPOUND)) { - bbwCompond = itemNBT.getCompoundTag("bbw"); + NBTTagCompound bbwCompound = new NBTTagCompound(); + if(itemstack.hasTagCompound()) { + NBTTagCompound itemNBT = itemstack.getTagCompound(); + if (itemNBT.hasKey("bbw", Constants.NBT.TAG_COMPOUND)) { + bbwCompound = itemNBT.getCompoundTag("bbw"); + } } - bbwCompond.setIntArray("lastPlaced", placedIntArray); - bbwCompond.setString("lastBlock", Item.itemRegistry.getNameForObject(sourceItems.getItem())); - bbwCompond.setInteger("lastDamage", sourceItems.getItemDamage()); - bbwCompond.setInteger("lastPerBlock", sourceItems.stackSize); - itemstack.setTagInfo("bbw", bbwCompond); + bbwCompound.setIntArray("lastPlaced", placedIntArray); + bbwCompound.setString("lastBlock", Item.itemRegistry.getNameForObject(sourceItems.getItem())); + bbwCompound.setInteger("lastDamage", sourceItems.getItemDamage()); + bbwCompound.setInteger("lastPerBlock", sourceItems.stackSize); + itemstack.setTagInfo("bbw", bbwCompound); } } diff --git a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java index 3276300..7c96888 100644 --- a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java +++ b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java @@ -1,20 +1,41 @@ package portablejim.bbw.shims; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; import portablejim.bbw.basics.Point3d; +import vazkii.botania.api.item.IBlockProvider; + +import java.util.ArrayList; +import java.util.List; /** * Wrap a player to provide basic functions. */ public class BasicPlayerShim implements IPlayerShim { private EntityPlayer player; + private boolean providersEnabled; public BasicPlayerShim(EntityPlayer player) { this.player = player; + this.providersEnabled = areProvidersEnabled(); + } + + private static Block getBlock(ItemStack stack) { + return Block.getBlockFromItem(stack.getItem()); + } + + private static int getBlockMeta(ItemStack stack) { + return stack.getHasSubtypes() ? stack.getItemDamage() : 0; + } + + private static boolean areProvidersEnabled() { + try { + boolean disable = new Object() instanceof IBlockProvider; + return true; + } catch (NoClassDefFoundError e) { + return false; + } } @Override @@ -24,11 +45,20 @@ public class BasicPlayerShim implements IPlayerShim { return 0; } + Block block = getBlock(itemStack); + int meta = getBlockMeta(itemStack); for(ItemStack inventoryStack : player.inventory.mainInventory) { if(inventoryStack != null && itemStack.isItemEqual(inventoryStack)) { total += Math.max(0, inventoryStack.stackSize); } + else if(providersEnabled && inventoryStack != null && inventoryStack.getItem() instanceof IBlockProvider) { + IBlockProvider prov = (IBlockProvider) inventoryStack.getItem(); + int provCount = prov.getBlockCount(player, itemStack, inventoryStack, block, meta); + if(provCount == -1) + return Integer.MAX_VALUE; + total += provCount; + } } return itemStack.stackSize > 0 ? total / itemStack.stackSize : 0; @@ -42,6 +72,7 @@ public class BasicPlayerShim implements IPlayerShim { // Reverse direction to leave hotbar to last. int toUse = itemStack.stackSize; + List providers = new ArrayList(); for(int i = player.inventory.mainInventory.length - 1; i >= 0; i--) { ItemStack inventoryStack = player.inventory.mainInventory[i]; if(inventoryStack != null && itemStack.isItemEqual(inventoryStack)) { @@ -61,7 +92,22 @@ public class BasicPlayerShim implements IPlayerShim { return true; } } + else if(providersEnabled && inventoryStack != null && inventoryStack.getItem() instanceof IBlockProvider) { + providers.add(inventoryStack); + } } + + // IBlockProvider does not support removing more than one item in an atomic operation. + if (toUse == 1) { + Block block = getBlock(itemStack); + int meta = getBlockMeta(itemStack); + for(ItemStack provStack : providers) { + IBlockProvider prov = (IBlockProvider) provStack.getItem(); + if(prov.provideBlock(player, itemStack, provStack, block, meta, true)) + return true; + } + } + return false; } From 4312a65072da137b2bbeca9a1c8bd915e9cf4d25 Mon Sep 17 00:00:00 2001 From: Dilnu Date: Sat, 22 Oct 2016 20:28:14 -0400 Subject: [PATCH 3/3] Fix a messy merge forced by github being weird --- .../portablejim/bbw/shims/BasicPlayerShim.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java index b9b2e7a..f9e5cdb 100644 --- a/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java +++ b/src/main/java/portablejim/bbw/shims/BasicPlayerShim.java @@ -96,7 +96,6 @@ public class BasicPlayerShim implements IPlayerShim { else if(providersEnabled && inventoryStack != null && inventoryStack.getItem() instanceof IBlockProvider) { providers.add(inventoryStack); } -<<<<<<< HEAD } // IBlockProvider does not support removing more than one item in an atomic operation. @@ -110,21 +109,6 @@ public class BasicPlayerShim implements IPlayerShim { } } -======= - } - - // IBlockProvider does not support removing more than one item in an atomic operation. - if (toUse == 1) { - Block block = getBlock(itemStack); - int meta = getBlockMeta(itemStack); - for(ItemStack provStack : providers) { - IBlockProvider prov = (IBlockProvider) provStack.getItem(); - if(prov.provideBlock(player, itemStack, provStack, block, meta, true)) - return true; - } - } - ->>>>>>> origin/master return false; }