Food fix and some PlayerData changes (#3996)

SpongePowered · Apr 28, 2024 · d31a2f7 · d31a2f7
1 parent b9e3cab
commit d31a2f7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/src/accessors/java/org/spongepowered/common/accessor/world/food/FoodDataAccessor.java b/src/accessors/java/org/spongepowered/common/accessor/world/food/FoodDataAccessor.java
@@ -31,9 +31,9 @@
 @Mixin(FoodData.class)
 public interface FoodDataAccessor {
 
-    @Accessor("saturationLevel") void accessor$saturationLevel(final float saturationLevel);
+    @Accessor("foodLevel") void accessor$foodLevel(final int foodLevel);
 
-    @Accessor("exhaustionLevel") float accessor$exhaustionLevel();
+    @Accessor("saturationLevel") void accessor$saturationLevel(final float saturationLevel);
 
     @Accessor("exhaustionLevel") void accessor$exhaustionLevel(final float exhaustionLevel);
 

diff --git a/src/main/java/org/spongepowered/common/data/provider/entity/PlayerData.java b/src/main/java/org/spongepowered/common/data/provider/entity/PlayerData.java
@@ -60,14 +60,8 @@ public static void register(final DataProviderRegistrator registrator) {
                         .get(h -> (HandPreference) (Object) h.getMainArm())
                         .set((h, v) -> h.setMainArm((HumanoidArm) (Object) v))
                     .create(Keys.EXHAUSTION)
-                        .get(h -> (double) ((FoodDataAccessor) h.getFoodData()).accessor$exhaustionLevel())
-                        .setAnd((h, v) -> {
-                            if (v < 0 || v > PlayerData.EXHAUSTION_MAX) {
-                                return false;
-                            }
-                            ((FoodDataAccessor) h.getFoodData()).accessor$exhaustionLevel(v.floatValue());
-                            return true;
-                        })
+                        .get(h -> (double) h.getFoodData().getExhaustionLevel())
+                        .set((h, v) -> ((FoodDataAccessor) h.getFoodData()).accessor$exhaustionLevel(v.floatValue()))
                     .create(Keys.EXPERIENCE)
                         .get(h -> h.totalExperience)
                         .set(ExperienceHolderUtil::setExperience)
@@ -98,23 +92,13 @@ public static void register(final DataProviderRegistrator registrator) {
                         .delete(h -> ExperienceHolderUtil.setExperience(h, 0))
                     .create(Keys.FLYING_SPEED)
                         .get(h -> (double) h.getAbilities().getFlyingSpeed())
-                        .setAnd((h, v) -> {
-                            if (v < 0) {
-                                return false;
-                            }
+                        .set((h, v) -> {
                             ((AbilitiesAccessor) h.getAbilities()).accessor$flyingSpeed(v.floatValue());
                             h.onUpdateAbilities();
-                            return true;
                         })
                     .create(Keys.FOOD_LEVEL)
                         .get(h -> h.getFoodData().getFoodLevel())
-                        .setAnd((h, v) -> {
-                            if (v < 0 || v > PlayerData.FOOD_LEVEL_MAX) {
-                                return false;
-                            }
-                            h.getFoodData().setFoodLevel(v);
-                            return true;
-                        })
+                        .set((h, v) -> ((FoodDataAccessor) h.getFoodData()).accessor$foodLevel(v))
                     .create(Keys.IS_FLYING)
                         .get(h -> h.getAbilities().flying)
                         .set((h, v) -> {
@@ -131,13 +115,7 @@ public static void register(final DataProviderRegistrator registrator) {
                         .get(h -> PlayerData.SATURATION_MAX)
                     .create(Keys.SATURATION)
                         .get(h -> (double) h.getFoodData().getSaturationLevel())
-                        .setAnd((h, v) -> {
-                            if (v < 0 || v > PlayerData.SATURATION_MAX) {
-                                return false;
-                            }
-                            ((FoodDataAccessor) h.getFoodData()).accessor$saturationLevel(v.floatValue());
-                            return true;
-                        })
+                        .set((h, v) -> ((FoodDataAccessor) h.getFoodData()).accessor$saturationLevel(v.floatValue()))
                     .create(Keys.SLEEP_TIMER)
                         .get(Player::getSleepTimer)
                         .set((p, i) -> ((PlayerAccessor) p).accessor$sleepCounter(i))

diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/world/food/FoodDataMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/world/food/FoodDataMixin.java
@@ -76,6 +76,11 @@ public abstract class FoodDataMixin implements FoodDataBridge {
         this.foodLevel = this.impl$fireEventAndGetValue(Keys.FOOD_LEVEL, this.foodLevel, value);
     }
 
+    @Redirect(method = "setSaturation", at = @At(value = "FIELD", target = "Lnet/minecraft/world/food/FoodData;saturationLevel:F", opcode = Opcodes.PUTFIELD))
+    private void impl$setSaturationLevel(final FoodData self, final float value) {
+        this.saturationLevel = this.impl$fireEventAndGetValue(Keys.SATURATION, (double) this.saturationLevel, (double) value).floatValue();
+    }
+
     @Redirect(method = "eat(IF)V", at = @At(value = "FIELD", target = "Lnet/minecraft/world/food/FoodData;saturationLevel:F", opcode = Opcodes.PUTFIELD))
     private void impl$eatSetSaturationLevel(final FoodData self, final float value) {
         this.saturationLevel = this.impl$fireEventAndGetValue(Keys.SATURATION, (double) this.saturationLevel, (double) value).floatValue();
@@ -86,6 +91,11 @@ public abstract class FoodDataMixin implements FoodDataBridge {
         this.saturationLevel = this.impl$fireEventAndGetValue(Keys.SATURATION, (double) this.saturationLevel, (double) value).floatValue();
     }
 
+    @Redirect(method = "setExhaustion", at = @At(value = "FIELD", target = "Lnet/minecraft/world/food/FoodData;exhaustionLevel:F", opcode = Opcodes.PUTFIELD))
+    private void impl$setExhaustion(final FoodData self, final float value) {
+        this.exhaustionLevel = this.impl$fireEventAndGetValue(Keys.EXHAUSTION, (double) this.exhaustionLevel, (double) value).floatValue();
+    }
+
     @Redirect(method = "addExhaustion", at = @At(value = "FIELD", target = "Lnet/minecraft/world/food/FoodData;exhaustionLevel:F", opcode = Opcodes.PUTFIELD))
     private void impl$addExhaustion(final FoodData self, final float value) {
         this.exhaustionLevel = this.impl$fireEventAndGetValue(Keys.EXHAUSTION, (double) this.exhaustionLevel, (double) value).floatValue();