summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-07-11 22:52:10 +0200
committerAizistral2022-07-11 22:52:10 +0200
commite6acfdbed63685627cc169742cbd684becfddb15 (patch)
treeeabed5fb6620d26366b3206f8c232dbc95502026 /src/main
parenta05169d10dbb5dc139cb2be6ddc8a6513255bffe (diff)
Sort mixins by client/server
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java)2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java)2
-rw-r--r--src/main/resources/nochatreports.mixins.json34
19 files changed, 35 insertions, 35 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index ccd931d..7e3b852 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -6,7 +6,7 @@ import com.aizistral.nochatreports.core.NoReportsConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-import com.aizistral.nochatreports.mixins.AccessorDisconnectedScreen;
+import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen;
import com.aizistral.nochatreports.network.ClientChannelHandler;
import com.aizistral.nochatreports.network.ServerChannelHandler;
import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
index 06d2207..1cf76f5 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/AccessorDisconnectedScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
index 5d90beb..ae46f06 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import java.util.Base64;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index da7f390..234a737 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
index 9868eaf..36e1986 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import com.mojang.authlib.minecraft.TelemetrySession;
import com.mojang.authlib.minecraft.UserApiService;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
index b14c9bc..81ed384 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
index 92922b4..a086b28 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index 36993a2..0e7584c 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
index c9f129a..31319e1 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import com.aizistral.nochatreports.core.NoReportsConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
index e1d986b..a9f8929 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import java.time.Instant;
import java.util.UUID;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
index 1bb2bd4..934a503 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import com.google.common.collect.ImmutableList;
import com.mojang.serialization.Codec;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
index b084732..3cf92d8 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayerEntry.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import java.util.List;
import java.util.UUID;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
index 73734e9..a02a952 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
import net.minecraft.client.multiplayer.ProfileKeyPairManager;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
index e514d83..eee3bdd 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.client;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java
index 04748e3..7bb6819 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.server;
import net.minecraft.server.dedicated.DedicatedServer;
import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java
index 0048ade..c97bde5 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayer.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.server;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
index 297982b..75aa7e0 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.server;
import com.aizistral.nochatreports.core.NoReportsConfig;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
index cb8f8ad..93da925 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins;
+package com.aizistral.nochatreports.mixins.server;
import net.minecraft.Util;
import net.minecraft.network.chat.MessageSignature;
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 72c4625..4b7a078 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -5,27 +5,27 @@
"compatibilityLevel": "JAVA_17",
"verbose": true,
"mixins": [
- "MixinPlayer",
- "MixinServerboundChatPacket",
- "MixinServerGamePacketListenerImpl"
+ "server.MixinPlayer",
+ "server.MixinServerboundChatPacket",
+ "server.MixinServerGamePacketListenerImpl"
],
"client": [
- "MixinLocalPlayer",
- "MixinChatListener",
- "MixinOptions",
- "MixinProfileKeyPairManager",
- "MixinClientTelemetryManager",
- "MixinTitleScreen",
- "MixinMinecraft",
- "MixinPlayerEntry",
- "MixinChatScreen",
- "AccessorDisconnectedScreen",
- "MixinConnectScreen",
- "MixinClientboundHelloPacket",
- "MixinJoinMultiplayerScreen"
+ "client.MixinLocalPlayer",
+ "client.MixinChatListener",
+ "client.MixinOptions",
+ "client.MixinProfileKeyPairManager",
+ "client.MixinClientTelemetryManager",
+ "client.MixinTitleScreen",
+ "client.MixinMinecraft",
+ "client.MixinPlayerEntry",
+ "client.MixinChatScreen",
+ "client.AccessorDisconnectedScreen",
+ "client.MixinConnectScreen",
+ "client.MixinClientboundHelloPacket",
+ "client.MixinJoinMultiplayerScreen"
],
"server": [
- "MixinDedicatedServer"
+ "server.MixinDedicatedServer"
],
"injectors": {
"defaultRequire": 1