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 86790120..32c94387 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png and b/src/main/resources/assets/bloodmagic/textures/gui/routingNode.png differ