upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix accidental double toggle of ring of loki (#20)

Browse Source
This commit is contained in:
Maxim authored and GitHub committed 2022-12-30 00:17:34 +01:00
1 parent 54f79398b1
commit 09ccf50fde
3 files changed
+13 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java
+2 -2
View File
@@ -141,8 +141,8 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC
}
}
}
public static void toggleMode(ItemStack stack) {
stack.stackTagCompound.setBoolean(TAG_MODE, !isRingEnabled(stack));
public static void setMode(ItemStack stack, boolean state) {
stack.stackTagCompound.setBoolean(TAG_MODE, state);
}
@SideOnly(Side.CLIENT)
public static void renderHUDNotification(){
src/main/java/vazkii/botania/common/network/PacketLokiToggle.java
+5 -3
View File
@@ -10,7 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
public class PacketLokiToggle implements IMessage, IMessageHandler<PacketLokiToggle, IMessage> {
@Override
public void fromBytes(ByteBuf byteBuf) {
// not needed
@@ -26,8 +25,11 @@ public class PacketLokiToggle implements IMessage, IMessageHandler<PacketLokiTog
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
final ItemStack aRing = ItemLokiRing.getLokiRing(player);
if (aRing != null) {
ItemLokiRing.toggleMode(aRing);
PacketHandler.INSTANCE.sendTo(new PacketLokiToggleAck(), player);
boolean ringState = !ItemLokiRing.isRingEnabled(aRing);
ItemLokiRing.setMode(aRing, ringState);
PacketLokiToggleAck ackMessage = new PacketLokiToggleAck();
ackMessage.state = ringState;
PacketHandler.INSTANCE.sendTo(ackMessage, player);
}
return null;
}
src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java
+6 -3
View File
@@ -1,5 +1,6 @@
package vazkii.botania.common.network;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
@@ -13,14 +14,16 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PacketLokiToggleAck implements IMessage, IMessageHandler<PacketLokiToggleAck, IMessage> {
public boolean state;
@Override
public void fromBytes(ByteBuf byteBuf) {
// not needed
state = byteBuf.readBoolean();
}
@Override
public void toBytes(ByteBuf byteBuf) {
// not needed
byteBuf.writeBoolean(state);
}
@SideOnly(Side.CLIENT)
@@ -29,7 +32,7 @@ public class PacketLokiToggleAck implements IMessage, IMessageHandler<PacketLoki
Minecraft mc = Minecraft.getMinecraft();
final ItemStack aRing = ItemLokiRing.getLokiRing(mc.thePlayer) ;
if (aRing != null) {
ItemLokiRing.toggleMode(aRing);
ItemLokiRing.setMode(aRing, message.state);
ItemLokiRing.renderHUDNotification();
}