refactor: Send FailureInformation instead of the failure effect itself, for more cleanliness

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/shogi/common/effect/failure/Failure.java

@@ -17,15 +17,10 @@ public record Failure(Component message) implements ShogiEffect<Boolean> {
     public static final MapCodec<Failure> MAP_CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
             ComponentSerialization.CODEC.fieldOf("message").orElse(Component.empty()).forGetter(Failure::message)
     ).apply(builder, Failure::new));
-    public static final StreamCodec<RegistryFriendlyByteBuf, Failure> STREAM_CODEC = StreamCodec.composite(
-            ComponentSerialization.STREAM_CODEC,
-            Failure::message,
-            Failure::new
-    );
 
     @Override
     public Either<Boolean, ?> apply(ShogiContext context) {
-        return Either.right(this);
+        return Either.right(new FailureInformation(message));
     }
 
     @Override

common/src/main/java/net/blay09/mods/shogi/common/effect/failure/FailureInformation.java

@@ -0,0 +1,14 @@
+package net.blay09.mods.shogi.common.effect.failure;
+
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.codec.StreamCodec;
+
+public record FailureInformation(Component message) {
+    public static final StreamCodec<RegistryFriendlyByteBuf, FailureInformation> STREAM_CODEC = StreamCodec.composite(
+            ComponentSerialization.STREAM_CODEC,
+            FailureInformation::message,
+            FailureInformation::new
+    );
+}

common/src/main/java/net/blay09/mods/shogi/common/effect/failure/RefusalInformation.java

@@ -0,0 +1,15 @@
+package net.blay09.mods.shogi.common.effect.failure;
+
+import net.blay09.mods.shogi.effect.failure.ShogiFatalFailure;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.codec.StreamCodec;
+
+public record RefusalInformation(Component message) implements ShogiFatalFailure {
+    public static final StreamCodec<RegistryFriendlyByteBuf, RefusalInformation> STREAM_CODEC = StreamCodec.composite(
+            ComponentSerialization.STREAM_CODEC,
+            RefusalInformation::message,
+            RefusalInformation::new
+    );
+}

common/src/main/java/net/blay09/mods/shogi/common/effect/failure/Refuse.java

@@ -5,28 +5,22 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.blay09.mods.shogi.effect.ShogiEffect;
 import net.blay09.mods.shogi.context.ShogiContext;
-import net.blay09.mods.shogi.effect.failure.ShogiFatalFailure;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.Identifier;
 
-public record Refuse(Component message) implements ShogiEffect<Boolean>, ShogiFatalFailure {
+public record Refuse(Component message) implements ShogiEffect<Boolean> {
 
     public static final Identifier IDENTIFIER = Identifier.fromNamespaceAndPath("shogi", "refuse");
     public static final MapCodec<Refuse> MAP_CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
             ComponentSerialization.CODEC.fieldOf("message").orElse(Component.empty()).forGetter(Refuse::message)
     ).apply(builder, Refuse::new));
-    public static final StreamCodec<RegistryFriendlyByteBuf, Refuse> STREAM_CODEC = StreamCodec.composite(
-            ComponentSerialization.STREAM_CODEC,
-            Refuse::message,
-            Refuse::new
-    );
 
     @Override
     public Either<Boolean, ?> apply(ShogiContext context) {
-        return Either.right(this);
+        return Either.right(new RefusalInformation(message));
     }
 
     @Override

common/src/main/java/net/blay09/mods/shogi/common/network/ShogiDefaultStreamCodecs.java

@@ -2,8 +2,8 @@
 
 import com.google.gson.JsonElement;
 import net.blay09.mods.shogi.common.effect.cost.*;
-import net.blay09.mods.shogi.common.effect.failure.Failure;
-import net.blay09.mods.shogi.common.effect.failure.Refuse;
+import net.blay09.mods.shogi.common.effect.failure.FailureInformation;
+import net.blay09.mods.shogi.common.effect.failure.RefusalInformation;
 import net.blay09.mods.shogi.common.effect.server.cooldown.CooldownInformation;
 import net.blay09.mods.shogi.common.effect.variable.MissingVariableFailure;
 import net.blay09.mods.shogi.effect.EmptyEffect;
@@ -43,8 +43,8 @@ public static synchronized void registerDefaults() {
         ShogiStreamCodecs.register(id("component"), Component.class, ComponentSerialization.STREAM_CODEC);
         ShogiStreamCodecs.register(id("throwable"), Throwable.class, THROWABLE_CODEC);
         ShogiStreamCodecs.register(id("list"), List.class, ShogiStreamCodecs.LIST_STREAM_CODEC);
-        ShogiStreamCodecs.register(id("failure"), Failure.class, Failure.STREAM_CODEC);
-        ShogiStreamCodecs.register(id("refuse"), Refuse.class, Refuse.STREAM_CODEC);
+        ShogiStreamCodecs.register(id("failure"), FailureInformation.class, FailureInformation.STREAM_CODEC);
+        ShogiStreamCodecs.register(id("refusal"), RefusalInformation.class, RefusalInformation.STREAM_CODEC);
         ShogiStreamCodecs.register(id("missing_variable_failure"), MissingVariableFailure.class, MissingVariableFailure.STREAM_CODEC);
         ShogiStreamCodecs.register(id("xp_points_cost"), ExperiencePointsCostInformation.class, ExperiencePointsCostInformation.STREAM_CODEC);
         ShogiStreamCodecs.register(id("xp_level_cost"), ExperienceLevelCostInformation.class, ExperienceLevelCostInformation.STREAM_CODEC);