Merge branch 'SammySemicolon:1.21.1' into 1.21.1

Author: ChuijkYahus

src/main/java/com/sammy/malum/common/data/attachment/AvariceMarkData.java

@@ -8,7 +8,7 @@
 public class AvariceMarkData {
 
     public static Codec<AvariceMarkData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.BOOL.fieldOf("hasProspectorMark").forGetter(AvariceMarkData::hasProspectorMark)
+            Codec.BOOL.optionalFieldOf("hasProspectorMark", false).forGetter(AvariceMarkData::hasProspectorMark)
     ).apply(obj, AvariceMarkData::new));
 
     public static StreamCodec<ByteBuf, AvariceMarkData> STREAM_CODEC = ByteBufCodecs.fromCodec(AvariceMarkData.CODEC);

src/main/java/com/sammy/malum/common/data/attachment/CurioData.java

@@ -9,8 +9,8 @@
 public class CurioData {
 
     public static Codec<CurioData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.INT.fieldOf("watcherNecklaceCooldown").forGetter(c -> c.watcherNecklaceCooldown),
-            Codec.INT.fieldOf("hiddenBladeNecklaceCooldown").forGetter(c -> c.hiddenBladeNecklaceCooldown)
+            Codec.INT.optionalFieldOf("watcherNecklaceCooldown", 0).forGetter(c -> c.watcherNecklaceCooldown),
+            Codec.INT.optionalFieldOf("hiddenBladeNecklaceCooldown", 0).forGetter(c -> c.hiddenBladeNecklaceCooldown)
     ).apply(obj, CurioData::new));
 
     public static StreamCodec<ByteBuf, CurioData> STREAM_CODEC = ByteBufCodecs.fromCodec(CurioData.CODEC);

src/main/java/com/sammy/malum/common/data/attachment/MalignantInfluenceData.java

@@ -18,8 +18,8 @@
 public class MalignantInfluenceData {
 
     public static Codec<MalignantInfluenceData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.INT.fieldOf("malignantAegis").forGetter(MalignantInfluenceData::getMalignantAegis),
-            Codec.INT.fieldOf("aegisCooldown").forGetter(MalignantInfluenceData::getMalignantAegis)
+            Codec.INT.optionalFieldOf("malignantAegis", 0).forGetter(MalignantInfluenceData::getMalignantAegis),
+            Codec.INT.optionalFieldOf("aegisCooldown", 0).forGetter(MalignantInfluenceData::getMalignantAegis)
     ).apply(obj, MalignantInfluenceData::new));
 
     public static StreamCodec<ByteBuf, MalignantInfluenceData> STREAM_CODEC = ByteBufCodecs.fromCodec(MalignantInfluenceData.CODEC);

src/main/java/com/sammy/malum/common/data/attachment/ProgressionData.java

@@ -6,8 +6,8 @@
 public class ProgressionData {
 
     public static Codec<ProgressionData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.BOOL.fieldOf("obtainedEncyclopedia").forGetter(c -> c.obtainedEncyclopedia),
-            Codec.BOOL.fieldOf("hasBeenRejected").forGetter(c -> c.hasBeenRejected)
+            Codec.BOOL.optionalFieldOf("obtainedEncyclopedia", false).forGetter(c -> c.obtainedEncyclopedia),
+            Codec.BOOL.optionalFieldOf("hasBeenRejected", false).forGetter(c -> c.hasBeenRejected)
     ).apply(obj, ProgressionData::new));
 
     public boolean obtainedEncyclopedia;

src/main/java/com/sammy/malum/common/data/attachment/SoulWardData.java

@@ -17,9 +17,9 @@
 public class SoulWardData {
 
     public static Codec<SoulWardData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.DOUBLE.fieldOf("soulWard").forGetter(SoulWardData::getSoulWard),
-            Codec.INT.fieldOf("soulWardProgress").forGetter(SoulWardData::getSoulWardCooldown),
-            Codec.FLOAT.fieldOf("appliedCooldownMultiplier").forGetter(SoulWardData::getAppliedCooldownMultiplier)
+            Codec.DOUBLE.optionalFieldOf("soulWard", 0d).forGetter(SoulWardData::getSoulWard),
+            Codec.INT.optionalFieldOf("soulWardProgress", 0).forGetter(SoulWardData::getSoulWardCooldown),
+            Codec.FLOAT.optionalFieldOf("appliedCooldownMultiplier", 1f).forGetter(SoulWardData::getAppliedCooldownMultiplier)
     ).apply(obj, SoulWardData::new));
 
     public static StreamCodec<ByteBuf, SoulWardData> STREAM_CODEC = ByteBufCodecs.fromCodec(SoulWardData.CODEC);

src/main/java/com/sammy/malum/common/data/attachment/StaffAbilityData.java

@@ -14,8 +14,8 @@
 public class StaffAbilityData {
 
     public static Codec<StaffAbilityData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.INT.fieldOf("staffCharge").forGetter(c -> c.staffChargeDebt),
-            Codec.FLOAT.fieldOf("staffChargeProgress").forGetter(c -> c.staffChargeDebtCooldown)
+            Codec.INT.optionalFieldOf("staffCharge", 0).forGetter(c -> c.staffChargeDebt),
+            Codec.FLOAT.optionalFieldOf("staffChargeProgress", 0f).forGetter(c -> c.staffChargeDebtCooldown)
     ).apply(obj, StaffAbilityData::new));
 
     public static StreamCodec<ByteBuf, StaffAbilityData> STREAM_CODEC = ByteBufCodecs.fromCodec(StaffAbilityData.CODEC);

src/main/java/com/sammy/malum/common/data/attachment/TouchOfDarknessData.java

@@ -9,9 +9,9 @@ public class TouchOfDarknessData {
     public static final float MAX_TOUCH_OF_DARKNESS = 100f;
 
     public static final Codec<TouchOfDarknessData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.INT.fieldOf("expectedTouchOfDarkness").forGetter(h -> h.expectedTouchOfDarkness),
-            Codec.INT.fieldOf("touchOfDarknessFalloffDelay").forGetter(h -> h.touchOfDarknessFalloffDelay),
-            Codec.FLOAT.fieldOf("touchOfDarkness").forGetter(h -> h.touchOfDarkness)
+            Codec.INT.optionalFieldOf("expectedTouchOfDarkness", 0).forGetter(h -> h.expectedTouchOfDarkness),
+            Codec.INT.optionalFieldOf("touchOfDarknessFalloffDelay", 0).forGetter(h -> h.touchOfDarknessFalloffDelay),
+            Codec.FLOAT.optionalFieldOf("touchOfDarkness", 0f).forGetter(h -> h.touchOfDarkness)
     ).apply(obj, TouchOfDarknessData::new));
 
     public int expectedTouchOfDarkness;

src/main/java/com/sammy/malum/common/data/attachment/WeepingWellData.java

@@ -14,10 +14,10 @@ public class WeepingWellData {
     public static final float MAX_REJECTION = 60;
 
     public static final Codec<WeepingWellData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.BOOL.fieldOf("isNearWeepingWell").forGetter(h -> h.isNearWeepingWell),
-            Codec.BOOL.fieldOf("isInRejectedState").forGetter(h -> h.isInRejectedState),
-            Codec.INT.fieldOf("voidRejection").forGetter(h -> h.voidRejection),
-            Codec.INT.fieldOf("primordialGoopTimer").forGetter(h -> h.primordialGoopTimer)
+            Codec.BOOL.optionalFieldOf("isNearWeepingWell", false).forGetter(h -> h.isNearWeepingWell),
+            Codec.BOOL.optionalFieldOf("isInRejectedState", false).forGetter(h -> h.isInRejectedState),
+            Codec.INT.optionalFieldOf("voidRejection", 0).forGetter(h -> h.voidRejection),
+            Codec.INT.optionalFieldOf("primordialGoopTimer", 0).forGetter(h -> h.primordialGoopTimer)
     ).apply(obj, WeepingWellData::new));
 
     public boolean isNearWeepingWell;

src/main/java/com/sammy/malum/common/data/attachment/WindTunnelData.java

@@ -23,8 +23,8 @@
 public class WindTunnelData {
 
     public static Codec<WindTunnelData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            WindTunnelMotionData.CODEC.listOf().fieldOf("strength").forGetter(WindTunnelData::getInfluence),
-            Codec.INT.fieldOf("activeTime").forGetter(WindTunnelData::getActiveTime)
+            WindTunnelMotionData.CODEC.listOf().optionalFieldOf("strength", Collections.emptyList()).forGetter(WindTunnelData::getInfluence),
+            Codec.INT.optionalFieldOf("activeTime", 0).forGetter(WindTunnelData::getActiveTime)
     ).apply(obj, WindTunnelData::new));
 
     public static StreamCodec<ByteBuf, WindTunnelData> STREAM_CODEC = ByteBufCodecs.fromCodec(WindTunnelData.CODEC);