That's one heck of a commit you've got there...

I may have got a bit behind with version control. A lot behind, in fact. Maybe I'll go back and split this sometime - then again, I probably won't. But hey, at least it's here!
2019-08-18 00:04:18 +01:00
parent 2680d02304
commit f37812be3e
1564 changed files with 47652 additions and 12984 deletions
@@ -0,0 +1,81 @@
+package electroblob.wizardry.potion;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.play.server.SPacketEntityEffect;
+import net.minecraft.network.play.server.SPacketRemoveEntityEffect;
+import net.minecraftforge.event.entity.living.PotionEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+/**
+ * Interface for potion effects that need syncing to ensure client and server side are consistent. Simply implement
+ * this interface and the potion will be synced automatically.
+ * 
+ * @author Electroblob
+ * @since Wizardry 1.2
+ */
+@Mod.EventBusSubscriber
+public interface ISyncedPotion {
+
+	/** The distance from an entity with this effect within which players will receive potion update packets. */
+	double SYNC_RADIUS = 64;
+
+	/** Returns true if this potion should sync with nearby clients when added to / removed from an entity and on
+	 * expiry, false if not. The host entity is provided in case syncing is entity-dependent. Defaults to true. */
+	default boolean shouldSync(EntityLivingBase host){
+		return true;
+	}
+
+	// The following event handlers fix the inconsistencies caused by clients not syncing correctly
+	// These packets are only sent for players with potion effects in vanilla, and only to that player's client
+
+	// This one is only actually necessary if the effect gets added via a server-side method e.g. commands
+	// Unfortunately there's no way of checking that, so we'll just have to live with the extra packets
+	@SubscribeEvent
+	public static void onPotionAddedEvent(PotionEvent.PotionAddedEvent event){
+
+		if(event.getPotionEffect().getPotion() instanceof ISyncedPotion
+		&& ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){
+
+			if(!event.getEntityLiving().world.isRemote){
+				event.getEntityLiving().world.playerEntities.stream()
+						.filter(p -> p.getDistanceSq(event.getEntityLiving()) < SYNC_RADIUS * SYNC_RADIUS)
+						// Apparently unchecked casting in a lambda expression doesn't generate a warning. Who knew?
+						// (We know this cast is safe though)
+						.forEach(p -> ((EntityPlayerMP)p).connection.sendPacket(new SPacketEntityEffect(
+								event.getEntity().getEntityId(), event.getPotionEffect())));
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public static void onPotionExpiryEvent(PotionEvent.PotionExpiryEvent event){
+
+		if(event.getPotionEffect().getPotion() instanceof ISyncedPotion
+				&& ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){
+
+			if(!event.getEntityLiving().world.isRemote){
+				event.getEntityLiving().world.playerEntities.stream()
+						.filter(p -> p.getDistanceSq(event.getEntityLiving()) < SYNC_RADIUS * SYNC_RADIUS)
+						.forEach(p -> ((EntityPlayerMP)p).connection.sendPacket(new SPacketRemoveEntityEffect(
+								event.getEntity().getEntityId(), event.getPotionEffect().getPotion())));
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public static void onPotionRemoveEvent(PotionEvent.PotionRemoveEvent event){
+
+		if(event.getPotionEffect().getPotion() instanceof ISyncedPotion
+				&& ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){
+
+			if(!event.getEntityLiving().world.isRemote){
+				event.getEntityLiving().world.playerEntities.stream()
+						.filter(p -> p.getDistanceSq(event.getEntityLiving()) < SYNC_RADIUS * SYNC_RADIUS)
+						.forEach(p -> ((EntityPlayerMP)p).connection.sendPacket(new SPacketRemoveEntityEffect(
+								event.getEntity().getEntityId(), event.getPotionEffect().getPotion())));
+			}
+		}
+	}
+}