Add donor perks and tweak generalise rendering of healing totem

This commit is contained in:
Electroblob77
2020-07-19 15:56:07 +01:00
parent a831c2ada3
commit 3343385a7c
28 changed files with 490 additions and 3 deletions
@@ -0,0 +1,58 @@
package electroblob.wizardry.packet;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Element;
import electroblob.wizardry.misc.DonationPerksHandler;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
/** <b>[Client -> Server]</b> This packet is sent when a player logs in and whenever the setting changes to set their
* donation perk element. */
public class PacketRequestDonationPerks implements IMessageHandler<PacketRequestDonationPerks.Message, IMessage> {
@Override
public IMessage onMessage(Message message, MessageContext ctx){
// Just to make sure that the side is correct
if(ctx.side.isServer()){
final EntityPlayerMP player = ctx.getServerHandler().player;
// The UUID key set itself is immutable so we can safely access it from the networking thread
if(DonationPerksHandler.isDonor(player)){
player.getServerWorld().addScheduledTask(() -> DonationPerksHandler.setElement(player, message.element));
}else{
Wizardry.logger.warn("Received a donation perk packet from a player that isn't a donor!");
}
}
return null;
}
public static class Message implements IMessage {
private Element element;
// This constructor is required otherwise you'll get errors (used somewhere in fml through reflection)
public Message(){}
public Message(Element element){
this.element = element;
}
@Override
public void fromBytes(ByteBuf buf){
// The order is important
element = Element.values()[buf.readShort()];
}
@Override
public void toBytes(ByteBuf buf){
buf.writeShort(element.ordinal());
}
}
}
@@ -0,0 +1,55 @@
package electroblob.wizardry.packet;
import electroblob.wizardry.constants.Element;
import electroblob.wizardry.misc.DonationPerksHandler;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import java.util.ArrayList;
import java.util.List;
/**
* <b>[Server -> Client]</b> This packet is sent to update the donation perks map for each player that logs in, and for
* all players whenever the map changes.
*/
public class PacketSyncDonationPerks implements IMessageHandler<PacketSyncDonationPerks.Message, IMessage> {
@Override
public IMessage onMessage(Message message, MessageContext ctx){
// Just to make sure that the side is correct
if(ctx.side.isClient()){
// Using a fully qualified name is a good course of action here; we don't really want to clutter the proxy
// methods any more than necessary.
net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(() -> DonationPerksHandler.setElements(message.elements));
}
return null;
}
public static class Message implements IMessage {
public List<Element> elements;
// This constructor is required otherwise you'll get errors (used somewhere in fml through reflection)
public Message(){}
public Message(List<Element> elements){
this.elements = elements;
}
@Override
public void fromBytes(ByteBuf buf){
// The order is important
this.elements = new ArrayList<>();
while(buf.isReadable()) elements.add(Element.values()[buf.readShort()]);
}
@Override
public void toBytes(ByteBuf buf){
for(Element element : elements) buf.writeShort(element.ordinal());
}
}
}
@@ -33,6 +33,8 @@ public class WizardryPacketHandler {
registerMessage(PacketConquerShrine.class, PacketConquerShrine.Message.class);
registerMessage(PacketLectern.class, PacketLectern.Message.class);
registerMessage(PacketSpellQuickAccess.class, PacketSpellQuickAccess.Message.class);
registerMessage(PacketRequestDonationPerks.class, PacketRequestDonationPerks.Message.class);
registerMessage(PacketSyncDonationPerks.class, PacketSyncDonationPerks.Message.class);
}
private static int nextPacketId = 0;