From 5b37b6b246a90d2eb9ca3fa3c2457f49d489828c Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Sun, 19 Jul 2015 10:10:38 +0100 Subject: [PATCH 1/3] Fix lens being consume in creative when attached to a prism Closes #1164 --- .../java/vazkii/botania/common/block/mana/BlockPrism.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index d591494c8..4b45341af 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -97,7 +97,9 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi int meta = par1World.getBlockMetadata(par2, par3, par4); if(lens == null && isHeldItemLens) { - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + if(!par5EntityPlayer.capabilities.isCreativeMode) + par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + prism.setInventorySlotContents(0, heldItem.copy()); prism.markDirty(); par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2); From d073294334a22dc0daf2c8d6c23fcdc3a2a72e98 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Sun, 19 Jul 2015 22:49:52 +0100 Subject: [PATCH 2/3] Fix torches not being able to be placed on walls --- .../botania/common/block/decor/walls/BlockModWall.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index e0666b652..1edda5914 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -39,6 +39,11 @@ public class BlockModWall extends BlockWall implements ILexiconable { setBlockName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"); } + @Override + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { + return true; + } + @Override public Block setBlockName(String par1Str) { register(par1Str); From 266b6356885bc3a492b0336f2e1908c009a275a0 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Sun, 19 Jul 2015 23:07:33 +0100 Subject: [PATCH 3/3] doubled the pebble drop rate --- .../java/vazkii/botania/common/world/SkyblockWorldEvents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index a2f5908a8..8c9d52909 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -77,7 +77,7 @@ public final class SkyblockWorldEvents { event.entityPlayer.swingItem(); else { event.world.playSoundEffect(event.x + 0.5, event.y + 0.5, event.z + 0.5, block.stepSound.getBreakSound(), block.stepSound.getVolume() * 0.4F, block.stepSound.getPitch() + (float) (Math.random() * 0.2 - 0.1)); - if(Math.random() < 0.4) + if(Math.random() < 0.8) event.entityPlayer.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.manaResource, 1, 21), false); } }