From 4a21e6cbf0d746ff95e8c36ed193c5da9f26b27e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 31 Aug 2016 11:45:25 -0400 Subject: [PATCH] Updated the toggleable sigils so they drain the user's LP based on the user's total ticks existed instead of the world time. This is to solve the doDaylightCycle glitch in this scenario. Also further tweaked the Routing Node GUI --- changelog.txt | 1 + .../api/impl/ItemSigilToggleable.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 6 +++--- .../bloodmagic/textures/gui/routingNode.png | Bin 1707 -> 1686 bytes 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index b1d01239..3ec6ac45 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ Version 2.0.4-57 - Implemented a bit of framework for some T5 shenanigans. - Fixed the Incense Altar so it properly detected the south sides of the altar. - Updated the Filtered Item Routing Nodes' GUI so that it behaved less like ass. Also added the necessary nbt porting code. +- Updated the toggleable sigils so they drain the user's LP based on the user's total ticks existed instead of the world time. This is to solve the doDaylightCycle glitch in this scenario. ------------------------------------------------------ Version 2.0.4-56 diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java index 1bef8555..f635297d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java @@ -73,7 +73,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable { if (!worldIn.isRemote && entityIn instanceof EntityPlayerMP && getActivated(stack)) { - if (worldIn.getWorldTime() % 100 == 0) + if (entityIn.ticksExisted % 100 == 0) { if (!NetworkHelper.getSoulNetwork((EntityPlayerMP) entityIn).syphonAndDamage((EntityPlayer) entityIn, getLpUsed())) { diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 6e5c099f..c4a0f5f5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -78,8 +78,8 @@ public class GuiItemRoutingNode extends GuiContainer this.buttonList.add(this.southButton = new GuiButton(3, left + 176, top + 68, 18, 18, "S")); this.buttonList.add(this.westButton = new GuiButton(4, left + 176, top + 86, 18, 18, "W")); this.buttonList.add(this.eastButton = new GuiButton(5, left + 176, top + 104, 18, 18, "E")); - this.buttonList.add(this.incrementButton = new GuiButton(6, left + 97, top + 14, 18, 17, "^")); - this.buttonList.add(this.decrementButton = new GuiButton(7, left + 97, top + 50, 18, 17, "v")); + this.buttonList.add(this.incrementButton = new GuiButton(6, left + 160, top + 50, 9, 18, ">")); + this.buttonList.add(this.decrementButton = new GuiButton(7, left + 133, top + 50, 9, 18, "<")); disableDirectionalButton(inventory.currentActiveSlot); this.textBox = new GuiTextField(0, this.fontRendererObj, left + 90, top + 73, 64, 12); @@ -172,7 +172,7 @@ public class GuiItemRoutingNode extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString("" + getCurrentActiveSlotPriority(), 98 + 5, 33 + 4, 0xFFFFFF); + this.fontRendererObj.drawString("" + getCurrentActiveSlotPriority(), 143 + 5, 51 + 4, 0xFFFFFF); String s = ""; if (container.lastGhostSlotClicked != -1) { diff --git a/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png b/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png index 86790120436be76f62348e1bdc8f7f1b1f36bf6f..32c94387f7849064317d9ec5ed2ce16f2b956e66 100644 GIT binary patch literal 1686 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