Fix LOGGER conflict

java.lang.IllegalAccessError: class net.minecraft.entity.mob.ZombieVillagerEntity tried to access private field net.minecraft.entity.LivingEntity.LOGGER (net.minecraft.entity.mob.ZombieVillagerEntity and net.minecraft.entity.LivingEntity are in unnamed module of loader net.fabricmc.loader.impl.launch.knot.KnotClassLoader @3e77a1ed)
  at net.minecraft.entity.mob.ZombieVillagerEntity.writeCustomDataToNbt(ZombieVillagerEntity.java:83)
  at net.minecraft.entity.Entity.writeNbt(Entity.java:1506)
  at net.minecraft.entity.Entity.saveSelfNbt(Entity.java:1447)
  at net.minecraft.entity.Entity.saveNbt(Entity.java:1455)
  at net.minecraft.world.storage.EntityChunkDataAccess.method_31734(EntityChunkDataAccess.java:102)
  at java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1625)
  at java.base/java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:762)
  at net.minecraft.world.storage.EntityChunkDataAccess.writeChunkData(EntityChunkDataAccess.java:100)
  at net.minecraft.server.world.ServerEntityManager.trySave(ServerEntityManager.java:248)
  at net.minecraft.server.world.ServerEntityManager.method_31846(ServerEntityManager.java:314)
  at it.unimi.dsi.fastutil.longs.LongIterable.forEach(LongIterable.java:74)
  at net.minecraft.server.world.ServerEntityManager.save(ServerEntityManager.java:308)
  at net.minecraft.server.world.ServerWorld.save(ServerWorld.java:600)
  at net.minecraft.server.MinecraftServer.save(MinecraftServer.java:577)
  at net.minecraft.server.MinecraftServer.tick(MinecraftServer.java:823)
  at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:685)
  at net.minecraft.server.MinecraftServer.method_29739(MinecraftServer.java:290)
  at java.base/java.lang.Thread.run(Thread.java:833)

Signed-off-by: Trumeet <yuuta@yuuta.moe>

8 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/moe/ymc/acron/mixin/CommandManagerMixin.java b/src/main/java/moe/ymc/acron/mixin/CommandManagerMixin.java
index 8fa71e7..9aaed2e 100644
--- a/src/main/java/moe/ymc/acron/mixin/CommandManagerMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/CommandManagerMixin.java
@@ -18,7 +18,7 @@ import static net.minecraft.server.command.CommandManager.literal;
 
 @Mixin(CommandManager.class)
 public abstract class CommandManagerMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Shadow
     @Final
@@ -26,7 +26,7 @@ public abstract class CommandManagerMixin {
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void onRegister(CommandManager.RegistrationEnvironment arg, CallbackInfo ci) {
-        LOGGER.debug("onRegister");
+        AC_LOGGER.debug("onRegister");
         dispatcher.register(
                 literal("acron").requires(player -> player.hasPermissionLevel(4)).then(
                         literal("rule").then(
diff --git a/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java b/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java
index 41807f2..9e16569 100644
--- a/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/LivingEntityMixin.java
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends net.minecraft.entity.Entity {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Shadow public abstract DamageTracker getDamageTracker();
 
@@ -33,7 +33,7 @@ public abstract class LivingEntityMixin extends net.minecraft.entity.Entity {
     // before it does anything else.
     @Inject(at = @At("HEAD"), method = "onDeath")
     public void onDeath(DamageSource source, CallbackInfo ci) {
-        LOGGER.debug("onDeath[{}]",
+        AC_LOGGER.debug("onDeath[{}]",
                 getUuid());
         EventQueue.enqueue(new EventEntityDeath(new Entity(this),
                 getDamageTracker().getDeathMessage().getString()));
diff --git a/src/main/java/moe/ymc/acron/mixin/MinecraftDedicatedServerMixin.java b/src/main/java/moe/ymc/acron/mixin/MinecraftDedicatedServerMixin.java
index 50af0b4..32d2fbf 100644
--- a/src/main/java/moe/ymc/acron/mixin/MinecraftDedicatedServerMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/MinecraftDedicatedServerMixin.java
@@ -11,11 +11,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftDedicatedServer.class)
 public class MinecraftDedicatedServerMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Inject(at = @At("RETURN"), method = "<init>")
     private void init(CallbackInfo info) {
-        LOGGER.debug("init");
+        AC_LOGGER.debug("init");
         MinecraftServerHolder.setServer((MinecraftDedicatedServer) (Object) this);
     }
 }
diff --git a/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java b/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java
index 297c3c1..b602d95 100644
--- a/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/MinecraftServerMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Redirect(method = "runServer()V",
             at = @At(value = "INVOKE",
@@ -23,7 +23,7 @@ public class MinecraftServerMixin {
                 "Running {}ms or {} ticks behind") &&
         o1 instanceof Long &&
         o2 instanceof Long) {
-            LOGGER.debug("Lag: {}ms, {} ticks",
+            AC_LOGGER.debug("Lag: {}ms, {} ticks",
                     o1,
                     o2);
             EventQueue.enqueue(new EventLagging((long) o1, (long) o2));
diff --git a/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java
index 7a24493..94a48b5 100644
--- a/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/ServerLoginNetworkHandlerMixin.java
@@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerLoginNetworkHandler.class)
 public class ServerLoginNetworkHandlerMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Shadow
     @Nullable
@@ -40,7 +40,7 @@ public class ServerLoginNetworkHandlerMixin {
 
     @Inject(at = @At("RETURN"), method = "addToServer")
     private void addToServer(ServerPlayerEntity entity, CallbackInfo ci) {
-        LOGGER.debug("addToServer: {}",
+        AC_LOGGER.debug("addToServer: {}",
                 entity.getUuid());
         EventQueue.enqueue(new EventPlayerJoined(new Entity(entity)));
     }
diff --git a/src/main/java/moe/ymc/acron/mixin/ServerNetworkIoMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerNetworkIoMixin.java
index 7c9b60b..f49914e 100644
--- a/src/main/java/moe/ymc/acron/mixin/ServerNetworkIoMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/ServerNetworkIoMixin.java
@@ -27,7 +27,7 @@ import static net.minecraft.server.ServerNetworkIo.EPOLL_CHANNEL;
 
 @Mixin(ServerNetworkIo.class)
 public class ServerNetworkIoMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Shadow
     @Final
@@ -39,17 +39,17 @@ public class ServerNetworkIoMixin {
 
     @Inject(at = @At("RETURN"), method = "<init>")
     private void init(CallbackInfo info) {
-        LOGGER.debug("Adding Acron channel.");
+        AC_LOGGER.debug("Adding Acron channel.");
         Lazy<? extends MultithreadEventLoopGroup> group;
         Class<? extends ServerChannel> channel;
         if (Epoll.isAvailable() && Config.getGlobalConfig().useNativeTransport()) {
             channel = EpollServerSocketChannel.class;
             group = EPOLL_CHANNEL;
-            LOGGER.info("Using native transport.");
+            AC_LOGGER.info("Using native transport.");
         } else {
             channel = NioServerSocketChannel.class;
             group = DEFAULT_CHANNEL;
-            LOGGER.info("Not using native transport due to " +
+            AC_LOGGER.info("Not using native transport due to " +
                     "it is either disabled in acron.json or not available.");
         }
         channels.add(new ServerBootstrap()
diff --git a/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java
index 54d5ead..58bef78 100644
--- a/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/ServerPlayNetworkHandlerMixin.java
@@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerPlayNetworkHandler.class)
 public class ServerPlayNetworkHandlerMixin {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     @Shadow
     public ServerPlayerEntity player;
diff --git a/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java b/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java
index fe1c764..4c6758b 100644
--- a/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/moe/ymc/acron/mixin/ServerPlayerEntityMixin.java
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends LivingEntity {
-    private static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger AC_LOGGER = LogManager.getLogger();
 
     public ServerPlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World world) {
         super(entityType, world);
@@ -24,7 +24,7 @@ public abstract class ServerPlayerEntityMixin extends LivingEntity {
 
     @Inject(at = @At("HEAD"), method = "onDeath")
     public void onDeath(DamageSource source, CallbackInfo ci) {
-        LOGGER.debug("onDeath: {}",
+        AC_LOGGER.debug("onDeath: {}",
                 getUuid());
         EventQueue.enqueue(new EventEntityDeath(new moe.ymc.acron.s2c.Entity(this),
                 getDamageTracker().getDeathMessage().getString()));