From 0664de5de54942b106d0c6cb931af870b8fb2365 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Fri, 27 Mar 2020 14:07:47 -0400
Subject: [PATCH] Use @Unique

---
 .../mixin/MixinClientPlayNetworkHandler.java     |  1 -
 .../mixin/MixinClientPlayerEntity.java           |  4 +++-
 .../sorcerycraft/mixin/MixinPlayerEntity.java    | 16 +++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayNetworkHandler.java
index 24a27e2..89684f6 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayNetworkHandler.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayNetworkHandler.java
@@ -22,7 +22,6 @@ public class MixinClientPlayNetworkHandler {
     @Shadow
     private ClientWorld world;
 
-    @Environment(EnvType.CLIENT)
     @Inject(method = "onEntitySpawn", at = @At(value = "TAIL"))
     public void onEntitySpawn(EntitySpawnS2CPacket packet, CallbackInfo info) {
         EntityType<?> entityType = packet.getEntityTypeId();
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayerEntity.java b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayerEntity.java
index 36a6a00..3930580 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayerEntity.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinClientPlayerEntity.java
@@ -16,7 +16,9 @@ import java.util.Map;
 @Mixin(ClientPlayerEntity.class)
 @Environment(EnvType.CLIENT)
 public class MixinClientPlayerEntity extends MixinPlayerEntity {
-    @Shadow @Final protected MinecraftClient client;
+    @Shadow
+    @Final
+    protected MinecraftClient client;
 
     @Override
     public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinPlayerEntity.java b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinPlayerEntity.java
index 34417b1..1fcb71c 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinPlayerEntity.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/mixin/MixinPlayerEntity.java
@@ -9,6 +9,7 @@ import net.minecraft.screen.ScreenHandler;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -19,23 +20,24 @@ import java.util.Map;
 @SuppressWarnings("unused")
 @Mixin(PlayerEntity.class)
 public class MixinPlayerEntity implements SpellPlayerEntity {
-    @Shadow public ScreenHandler currentScreenHandler;
-    // Namespace Fields
-    private Map<Identifier, Integer> sorceryCraftDiscoveredSpells = new HashMap<>();
+    @Shadow
+    public ScreenHandler currentScreenHandler;
+    @Unique
+    private Map<Identifier, Integer> discoveredSpells = new HashMap<>();
 
     @Inject(at = @At("HEAD"), method = "readCustomDataFromTag")
     public void readCustomDataFromTag(CompoundTag tag, CallbackInfo info) {
-        sorceryCraftDiscoveredSpells = SpellHelper.getSpells(tag);
+        discoveredSpells = SpellHelper.getSpells(tag);
     }
 
     @Inject(at = @At("HEAD"), method = "writeCustomDataToTag")
     public void writeCustomDataToTag(CompoundTag tag, CallbackInfo info) {
-        tag.put(SpellHelper.SPELL_TAG, SpellHelper.createSpellsTag(sorceryCraftDiscoveredSpells));
+        tag.put(SpellHelper.SPELL_TAG, SpellHelper.createSpellsTag(discoveredSpells));
     }
 
     @Override
     public void setDiscoveredSpells(Map<Identifier, Integer> spells) {
-        this.sorceryCraftDiscoveredSpells = spells;
+        discoveredSpells = spells;
         if (currentScreenHandler instanceof CastingTableScreenHandler) {
             //noinspection ConstantConditions
             ((CastingTableScreenHandler) currentScreenHandler).setSpells((PlayerEntity) (Object) this);
@@ -44,6 +46,6 @@ public class MixinPlayerEntity implements SpellPlayerEntity {
 
     @Override
     public Map<Identifier, Integer> getDiscoveredSpells() {
-        return sorceryCraftDiscoveredSpells;
+        return discoveredSpells;
     }
 }