From 04fc77b25f437320c0a7e9f4e70d4f1ad70be222 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 May 2017 18:34:45 -0500 Subject: [PATCH] Bump forge to fix PIE issues. Closes #2091, unofficial repo #472 --- build.properties | 2 +- .../core/handler/MultiblockRenderHandler.java | 2 + .../botania/client/core/proxy/GuiFactory.java | 12 +++- .../botania/common/block/BlockAltar.java | 5 +- .../common/block/mana/BlockRuneAltar.java | 2 + .../item/material/ItemManaResource.java | 4 +- .../common/item/relic/ItemLokiRing.java | 59 ++++++++++--------- .../common/world/SkyblockWorldEvents.java | 29 +++++---- 8 files changed, 73 insertions(+), 42 deletions(-) diff --git a/build.properties b/build.properties index 3417d37a3..701bf9367 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Mon Apr 24 22:12:57 BST 2017 mod_name=Botania cf_meta_version=1.11.2 -forge_version=13.20.0.2206 +forge_version=13.20.0.2286 dir_repo=./ mc_mappings=snapshot_20161227 version=r1.9 diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 7f427e658..d335aef4f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.core.handler; +import net.minecraft.util.EnumActionResult; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; @@ -95,6 +96,7 @@ public final class MultiblockRenderHandler { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); event.setCanceled(true); + event.setCancellationResult(EnumActionResult.SUCCESS); } } diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 0536cdb93..deec83cfb 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -22,9 +22,19 @@ public class GuiFactory implements IModGuiFactory { @Override public void initialize(Minecraft minecraftInstance) {} + @Override + public boolean hasConfigGui() { + return true; + } + + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new GuiBotaniaConfig(parentScreen); + } + @Override public Class mainConfigGuiClass() { - return GuiBotaniaConfig.class; + return null; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 01a93efc1..524f16fae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -162,8 +162,11 @@ public class BlockAltar extends BlockMod implements ILexiconable { if(player.isSneaking()) { InventoryHelper.withdrawFromInventory(tile, player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); - } else if(tile.isEmpty() && tile.hasWater && stack.isEmpty()) + return true; + } else if(tile.isEmpty() && tile.hasWater && stack.isEmpty()) { tile.trySetLastRecipe(player); + return true; + } else { if(!stack.isEmpty() && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { if(!tile.hasWater) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 1b656a55a..2353b0e4e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -76,10 +76,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable if(altar.manaToGet == 0) { InventoryHelper.withdrawFromInventory(altar, player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); + return true; } } else if(altar.isEmpty() && stack.isEmpty()) { altar.trySetLastRecipe(player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); + return true; } else if(!stack.isEmpty()) { boolean result = altar.addItem(player, stack, hand); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 6212976d9..6aa609780 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -76,8 +76,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve stack.shrink(1); event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); - event.setCanceled(true); } + + event.setCanceled(true); + event.setCancellationResult(EnumActionResult.SUCCESS); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 3cac0a8ee..d12d73bf3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -29,6 +29,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -71,7 +72,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); - if(lokiRing.isEmpty() || player.world.isRemote || event.getHand() == EnumHand.OFF_HAND) + if(lokiRing.isEmpty() || !player.isSneaking()) return; int slot = -1; @@ -88,49 +89,51 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat BlockPos originCoords = getOriginPos(lokiRing); RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, true, 10F); List cursors = getCursorList(lokiRing); - int cursorCount = cursors.size(); + int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25)); - int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); + if(lookPos == null || lookPos.getBlockPos() == null) + return; - if(heldItemStack.isEmpty() && player.isSneaking()) { - if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) { - setOriginPos(lokiRing, lookPos.getBlockPos()); - setCursorList(lokiRing, null); - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); - } else if(lookPos != null && lookPos.getBlockPos() != null) { - if(originCoords.equals(lookPos.getBlockPos())) { - setOriginPos(lokiRing, new BlockPos(0, -1, 0)); + if(heldItemStack.isEmpty()) { + if(!event.getWorld().isRemote) { + if(originCoords.getY() == -1) { + setOriginPos(lokiRing, lookPos.getBlockPos()); + setCursorList(lokiRing, null); BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); } else { - addCursor : { - BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ())); + if(originCoords.equals(lookPos.getBlockPos())) { + setOriginPos(lokiRing, new BlockPos(0, -1, 0)); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); + } else { + addCursor : { + BlockPos relPos = lookPos.getBlockPos().add(new BlockPos(-originCoords.getX(), -originCoords.getY(), -originCoords.getZ())); - for(BlockPos cursor : cursors) - if(cursor.equals(relPos)) { - cursors.remove(cursor); - setCursorList(lokiRing, cursors); + for(BlockPos cursor : cursors) + if(cursor.equals(relPos)) { + cursors.remove(cursor); + setCursorList(lokiRing, cursors); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); + break addCursor; + } + + addCursor(lokiRing, relPos); BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); - break addCursor; } - - addCursor(lokiRing, relPos); - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, slot); - } + } } } - } else if(!heldItemStack.isEmpty() && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { + + event.setCanceled(true); + event.setCancellationResult(EnumActionResult.SUCCESS); + } else { for(BlockPos cursor : cursors) { BlockPos pos = lookPos.getBlockPos().add(cursor); Item item = heldItemStack.getItem(); - if(!player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { + if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { ItemStack saveHeld = heldItemStack.copy(); item.onItemUse(player, player.world, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); if (player.isCreative()) player.setHeldItem(event.getHand(), saveHeld); - if(heldItemStack.isEmpty()) { - event.setCanceled(true); - return; - } } } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 829617233..d1527de67 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -84,17 +85,25 @@ public final class SkyblockWorldEvents { if(Math.random() < 0.8) event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false); } - } - } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL && !event.getWorld().isRemote) { - RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); - if(RayTraceResult != null) { - if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { - if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.WATER) { - equipped.shrink(1); - if(equipped.isEmpty()) - event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); - else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl)); + event.setCanceled(true); + event.setCancellationResult(EnumActionResult.SUCCESS); + } + } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) { + RayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); + if(rtr != null) { + if (rtr.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { + if(event.getWorld().getBlockState(rtr.getBlockPos()).getMaterial() == Material.WATER) { + if(!event.getWorld().isRemote) { + equipped.shrink(1); + + if(equipped.isEmpty()) + event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); + else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl)); + } + + event.setCanceled(true); + event.setCancellationResult(EnumActionResult.SUCCESS); } } }