diff options
| author | Aizistral | 2022-08-18 01:01:34 +0200 |
|---|---|---|
| committer | Aizistral | 2022-08-18 01:01:34 +0200 |
| commit | aff7d576873a7cf21bc3573c0d63c6f265972c12 (patch) | |
| tree | 2b1542a8894e8712431dc2b49726f55fb07cc439 /src/main/java/com/aizistral | |
| parent | d7dbf9426d9a84683927a18030f894e59de87e17 (diff) | |
Relocate config classes into own package
Diffstat (limited to 'src/main/java/com/aizistral')
18 files changed, 25 insertions, 19 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 7ea17d2..42a3159 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.mojang.authlib.minecraft.UserApiService; import com.mojang.patchy.MojangBlockListSupplier; diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index e94e9b1..7cd88e3 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -2,8 +2,8 @@ package com.aizistral.nochatreports; import java.util.List; -import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.gui.UnsafeServerScreen; import com.aizistral.nochatreports.mixins.client.AccessorDisconnectedScreen; diff --git a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index c7724bb..b2948c1 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.config; import java.util.List; @@ -9,6 +9,8 @@ import com.terraformersmc.modmenu.api.ModMenuApi; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.resources.language.I18n; @@ -25,6 +27,7 @@ import net.minecraft.network.chat.Component; * @author MODKILLER1001 */ +@Environment(EnvType.CLIENT) public class ModMenuIntegration implements ModMenuApi { private Component[] makeTooltip(String key) { @@ -167,4 +170,5 @@ public class ModMenuIntegration implements ModMenuApi { return builder.build(); }; } -}
\ No newline at end of file + +} diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java index 97c8ade..90059c1 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.config; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -12,6 +12,7 @@ import java.util.List; import javax.annotation.Nullable; import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.gui.UnsafeServerScreen; import com.aizistral.nochatreports.mixins.client.MixinChatListener; import com.aizistral.nochatreports.mixins.client.MixinToastComponent; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 2897c5a..db0485f 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -1,6 +1,7 @@ package com.aizistral.nochatreports.core; import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.config.NoReportsConfig; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java index a7ce28a..bf52fcd 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports.gui; import javax.print.attribute.standard.MediaSize.NA; import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; import net.fabricmc.api.EnvType; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 654d44a..331c4b5 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.multiplayer.chat.ChatListener; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java index f0b4b34..81ccdab 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -8,8 +8,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java index dc6f0e0..f7f7366 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java @@ -1,6 +1,6 @@ package com.aizistral.nochatreports.mixins.client; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.mojang.authlib.minecraft.TelemetrySession; import com.mojang.authlib.minecraft.UserApiService; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java index 6b3fcf1..fc15928 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java index 1edcf7e..083d5f6 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import net.minecraft.client.GuiMessageTag; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java index e9f6395..3dd4a66 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferUploader; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java index 57ce4bb..a88c3da 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java @@ -1,6 +1,6 @@ package com.aizistral.nochatreports.mixins.client; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; import com.mojang.brigadier.ParseResults; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java index 4610f4d..ac98ce0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java index 36cfe7e..8e67459 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.client.gui.components.toasts.SystemToast.SystemToastIds; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java index 2226193..7726c1c 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -1,7 +1,5 @@ package com.aizistral.nochatreports.mixins.server; -import com.aizistral.nochatreports.core.NoReportsConfig; - import net.minecraft.core.Registry; import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.ChatTypeDecoration; @@ -21,6 +19,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.aizistral.nochatreports.config.NoReportsConfig; + @Mixin(ServerGamePacketListenerImpl.class) public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerConnection { @Shadow diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java index 3a544d3..125f7ce 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import net.minecraft.network.protocol.game.ClientboundServerDataPacket; import net.minecraft.network.protocol.status.ServerStatus; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java index 15cca37..54b297e 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.config.NoReportsConfig; import java.util.UUID; |
