summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral/nochatreports
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
-rw-r--r--src/main/java/com/aizistral/nochatreports/MixinConnector.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java79
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java35
-rw-r--r--src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java26
-rw-r--r--src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java22
6 files changed, 111 insertions, 70 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/MixinConnector.java b/src/main/java/com/aizistral/nochatreports/MixinConnector.java
deleted file mode 100644
index dc2b9a6..0000000
--- a/src/main/java/com/aizistral/nochatreports/MixinConnector.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aizistral.nochatreports;
-
-import org.spongepowered.asm.mixin.Mixins;
-import org.spongepowered.asm.mixin.connect.IMixinConnector;
-
-public class MixinConnector implements IMixinConnector {
-
- @Override
- public void connect() {
- Mixins.addConfigurations("nochatreports.mixins.json");
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index adaf08b..d45c5e8 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -1,70 +1,41 @@
package com.aizistral.nochatreports;
-import java.util.function.Predicate;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.aizistral.nochatreports.handlers.NoReportsConfig;
-
+import com.aizistral.nochatreports.network.ServerChannelHandler;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
-@Mod(NoChatReports.MODID)
-public class NoChatReports {
- public static final String MODID = "nochatreports";
+public class NoChatReports implements ModInitializer {
public static final Logger LOGGER = LogManager.getLogger();
- private static final String PTC_VERSION = "1";
- private static final Predicate<String> ANY = obj -> true;
- private static SimpleChannel packetInstance;
-
- public NoChatReports() {
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
- FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete);
+ protected static final ResourceLocation CHANNEL = new ResourceLocation("nochatreports", "sync");
- MinecraftForge.EVENT_BUS.register(this);
+ @Override
+ public void onInitialize() {
+ LOGGER.info("KONNICHIWA ZA WARUDO!");
+ ServerPlayNetworking.registerGlobalReceiver(CHANNEL, ServerChannelHandler.INSTANCE);
+ ServerPlayConnectionEvents.JOIN.register(this::onPlayReady);
NoReportsConfig.loadConfig();
}
- private void onLoadComplete(final FMLLoadCompleteEvent event) {
- // NO-OP
- }
-
- private void setup(final FMLCommonSetupEvent event) {
- packetInstance = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main"))
- .networkProtocolVersion(() -> PTC_VERSION)
- .clientAcceptedVersions(NoReportsConfig.demandsOnServer() ? PTC_VERSION::equals : ANY)
- .serverAcceptedVersions(NoReportsConfig.demandsOnClient() ? PTC_VERSION::equals : ANY)
- .simpleChannel();
- }
-
- private void doClientStuff(final FMLClientSetupEvent event) {
- // NO-OP
- }
-
- private void enqueueIMC(final InterModEnqueueEvent event) {
- // NO-OP
+ private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) {
+ server.execute(() -> {
+ if (!ServerPlayNetworking.canSend(handler, CHANNEL)) {
+ handler.disconnect(Component.translatable("disconnect.nochatreports.server"));
+ }
+ });
}
-
- private void processIMC(final InterModProcessEvent event) {
- // NO-OP
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
new file mode 100644
index 0000000..3899a5c
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -0,0 +1,35 @@
+package com.aizistral.nochatreports;
+
+import com.aizistral.nochatreports.network.ClientChannelHandler;
+import com.aizistral.nochatreports.network.ServerChannelHandler;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.chat.Component;
+
+@Environment(EnvType.CLIENT)
+public class NoChatReportsClient implements ClientModInitializer {
+
+ @Override
+ public void onInitializeClient() {
+ NoChatReports.LOGGER.info("Client initialization...");
+ ClientPlayNetworking.registerGlobalReceiver(NoChatReports.CHANNEL, ClientChannelHandler.INSTANCE);
+ ClientPlayConnectionEvents.JOIN.register(this::onPlayReady);
+ }
+
+ private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) {
+ client.execute(() -> {
+ if (!ClientPlayNetworking.canSend(NoChatReports.CHANNEL)) {
+ handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client"));
+ }
+ });
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
index 2a9068a..bfc77bf 100644
--- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java
@@ -11,11 +11,11 @@ import javax.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.fml.loading.FMLPaths;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.Minecraft;
public class NoReportsConfig {
- private static final File CONFIG_FOLDER = FMLPaths.CONFIGDIR.get().toFile();
+ private static final File CONFIG_FOLDER = FabricLoader.getInstance().getConfigDir().toFile();
private static final File CONFIG_FILE = new File(CONFIG_FOLDER, "NoChatReports.json");
private static NoReportsConfig INSTANCE;
private boolean demandOnClient, demandOnServer;
diff --git a/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java b/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java
new file mode 100644
index 0000000..179a090
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java
@@ -0,0 +1,26 @@
+package com.aizistral.nochatreports.network;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking.PlayChannelHandler;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+@Environment(EnvType.CLIENT)
+public class ClientChannelHandler implements PlayChannelHandler {
+ public static final ClientChannelHandler INSTANCE = new ClientChannelHandler();
+
+ private ClientChannelHandler() {
+ // Can't touch this
+ }
+
+ @Override
+ public void receive(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender) {
+ // NO-OP
+ }
+}
diff --git a/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java b/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java
new file mode 100644
index 0000000..c649e71
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java
@@ -0,0 +1,22 @@
+package com.aizistral.nochatreports.network;
+
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking.PlayChannelHandler;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+public class ServerChannelHandler implements PlayChannelHandler {
+ public static final ServerChannelHandler INSTANCE = new ServerChannelHandler();
+
+ private ServerChannelHandler() {
+ // Can't touch this
+ }
+
+ @Override
+ public void receive(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender) {
+ // NO-OP
+ }
+
+}