Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed I18n crash on servers.

Browse source
This commit is contained in:
bconlon 2020-09-07 16:27:56 -07:00
parent eeabae123e
commit 303f077089
4 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/gildedgames/the_aether/inventory/slots/SlotLore.java
View file

@ -1,6 +1,9 @@
package com.gildedgames.the_aether.inventory.slots;
import com.gildedgames.the_aether.network.AetherNetwork;
import com.gildedgames.the_aether.network.packets.PacketCheckKey;
import com.gildedgames.the_aether.registry.AetherLore;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.client.resources.I18n;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
@ -14,6 +17,20 @@ public class SlotLore extends Slot
public boolean isItemValid(ItemStack stack)
{
return !I18n.format(AetherLore.getLoreEntryKey(stack)).contains("lore.");
if (FMLCommonHandler.instance().getSide().isClient())
{
if (!I18n.format(AetherLore.getLoreEntryKey(stack)).contains("lore."))
{
AetherLore.hasKey = true;
AetherNetwork.sendToServer(new PacketCheckKey(true));
}
else
{
AetherLore.hasKey = false;
AetherNetwork.sendToServer(new PacketCheckKey(false));
}
}
return AetherLore.hasKey;
}
}

2
src/main/java/com/gildedgames/the_aether/network/AetherNetwork.java
View file

@ -52,6 +52,8 @@ public class AetherNetwork {
INSTANCE.registerMessage(PacketSendSeenDialogue.class, PacketSendSeenDialogue.class, discriminant++, Side.CLIENT);
INSTANCE.registerMessage(PacketPortalItem.class, PacketPortalItem.class, discriminant++, Side.CLIENT);
INSTANCE.registerMessage(PacketCheckKey.class, PacketCheckKey.class, discriminant++, Side.SERVER);
}
public static void sendToAll(IMessage message) {

44
src/main/java/com/gildedgames/the_aether/network/packets/PacketCheckKey.java Normal file
View file

@ -0,0 +1,44 @@
package com.gildedgames.the_aether.network.packets;
import com.gildedgames.the_aether.registry.AetherLore;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
public class PacketCheckKey extends AetherPacket<PacketCheckKey>
{
private boolean bool;
public PacketCheckKey()
{
}
public PacketCheckKey(boolean bool)
{
this.bool = bool;
}
@Override
public void fromBytes(ByteBuf buf)
{
this.bool = buf.readBoolean();
}
@Override
public void toBytes(ByteBuf buf)
{
buf.writeBoolean(this.bool);
}
@Override
public void handleClient(PacketCheckKey message, EntityPlayer player)
{
}
@Override
public void handleServer(PacketCheckKey message, EntityPlayer player)
{
AetherLore.hasKey = message.bool;
}
}

2
src/main/java/com/gildedgames/the_aether/registry/AetherLore.java
View file

@ -7,6 +7,8 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class AetherLore {
public static boolean hasKey;
public static String getLoreEntryKey(ItemStack stack) {
if (stack.getItem() instanceof ItemBlockEnchanter)