From 162519dba3f86ac9e98460300bdd8dfede19fed8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 15 Feb 2020 19:37:52 -0600 Subject: [PATCH] Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179 --- .../common/core/helper/PlayerHelper.java | 1 + .../common/item/relic/ItemLokiRing.java | 53 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index 760593c6c..e92c284b1 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -130,6 +130,7 @@ public final class PlayerHelper { if(ctx.getPlayer() != null) { save = ctx.getPlayer().getHeldItem(ctx.getHand()); ctx.getPlayer().setHeldItem(ctx.getHand(), toUse); + // Need to construct a new one still to refresh the itemstack newCtx = new ItemUseContext(ctx.getPlayer(), ctx.getHand(), hit); } else { newCtx = new ItemUseContext(ctx.getWorld(), null, ctx.getHand(), toUse, hit); 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 962dc4d90..153138d2a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,8 +24,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -37,6 +38,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; @@ -63,13 +65,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { - PlayerEntity player = event.getEntityPlayer(); + PlayerEntity player = event.getPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing.isEmpty() || !player.isSneaking()) return; - ItemStack heldItemStack = event.getItemStack(); - BlockPos originCoords = getOriginPos(lokiRing); + ItemStack stack = event.getItemStack(); BlockRayTraceResult lookPos = ToolCommons.raytraceFromEntity(player, 10F, true); List cursors = getCursorList(lokiRing); int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25)); @@ -78,25 +79,24 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat return; BlockPos hit = lookPos.getPos(); - if(heldItemStack.isEmpty()) { + if(stack.isEmpty()) { + BlockPos originCoords = getOriginPos(lokiRing); if(!event.getWorld().isRemote) { if(originCoords.getY() == -1) { + // Initiate a new pending list of positions setOriginPos(lokiRing, hit); setCursorList(lokiRing, null); } else { if(originCoords.equals(hit)) { + // Finalize the pending list of positions setOriginPos(lokiRing, new BlockPos(0, -1, 0)); } else { - addCursor : { - BlockPos relPos = hit.subtract(originCoords); - - for(BlockPos cursor : cursors) - if(cursor.equals(relPos)) { - cursors.remove(cursor); - setCursorList(lokiRing, cursors); - break addCursor; - } + // Toggle offsets on or off from the pending list of positions + BlockPos relPos = hit.subtract(originCoords); + if (cursors.remove(relPos)) { + setCursorList(lokiRing, cursors); + } else { addCursor(lokiRing, relPos); } } @@ -106,16 +106,25 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat event.setCanceled(true); event.setCancellationResult(ActionResultType.SUCCESS); } else { + ItemStack original = stack.copy(); for(BlockPos cursor : cursors) { BlockPos pos = hit.add(cursor); - if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - ItemStack saveHeld = heldItemStack.copy(); - BlockRayTraceResult newHit = new BlockRayTraceResult( - lookPos.getHitVec().add(pos.getX(), pos.getY(), pos.getZ()), - ((BlockRayTraceResult) lookPos).getFace(), pos, false); - heldItemStack.onItemUse(new ItemUseContext(player, event.getHand(), newHit)); - if(player.isCreative()) - player.setHeldItem(event.getHand(), saveHeld); + if(ManaItemHandler.requestManaExact(lokiRing, player, cost, false)) { + Vec3d lookHit = lookPos.getHitVec(); + Vec3d newHitVec = new Vec3d(pos.getX() + MathHelper.frac(lookHit.getX()), pos.getY() + MathHelper.frac(lookHit.getY()), pos.getZ() + MathHelper.frac(lookHit.getZ())); + BlockRayTraceResult newHit = new BlockRayTraceResult(newHitVec, lookPos.getFace(), pos, false); + ItemUseContext ctx = new ItemUseContext(player, event.getHand(), newHit); + + ActionResultType result; + if (player.isCreative()) { + result = PlayerHelper.substituteUse(ctx, original.copy()); + } else { + result = stack.onItemUse(ctx); + } + + if (result == ActionResultType.SUCCESS) { + ManaItemHandler.requestManaExact(lokiRing, player, cost, true); + } } } }