Update to 24w14potato

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -32,7 +32,7 @@ dependencies {
 	}
 	include "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
 
-	modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:14.0.687"
+	modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:14.0.691-alpha"
 }
 
 processResources {

gradle.properties

@@ -4,18 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.3
-yarn_mappings=1.20.3+build.1
-loader_version=0.15.0
+minecraft_version=24w14potato
+yarn_mappings=24w14potato+build.1
+loader_version=0.15.9
 
 #Fabric api
-fabric_version=0.91.1+1.20.3
+fabric_version=0.96.14+24w14potato
 
 # Third-party Properties
-cloth_version=13.0.114
-modmenu_version=9.0.0-pre.1
+cloth_version=14.0.123
+modmenu_version=10.0.0-alpha.3
 
 # Mod Properties
 maven_group = squeek.appleskin
 archives_base_name = appleskin-fabric
-mod_version = 2.5.1
+mod_version = 2.5.1-potato

java/squeek/appleskin/AppleSkinCommon.java

@@ -0,0 +1,13 @@
+package squeek.appleskin;
+
+import net.fabricmc.api.ModInitializer;
+import squeek.appleskin.network.SyncHandler;
+
+public class AppleSkinCommon implements ModInitializer
+{
+	@Override
+	public void onInitialize()
+	{
+		SyncHandler.init();
+	}
+}

java/squeek/appleskin/helpers/FoodHelper.java

@@ -1,12 +1,12 @@
 package squeek.appleskin.helpers;
 
-import com.mojang.datafixers.util.Pair;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.effect.StatusEffectCategory;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.HungerManager;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.FoodComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
@@ -19,7 +19,7 @@ public static boolean isFood(ItemStack itemStack)
 		if (itemStack.getItem() == null)
 			return false;
 
-		return itemStack.getItem().isFood();
+		return itemStack.getItem().getComponents().contains(DataComponentTypes.FOOD);
 	}
 
 	public static boolean canConsume(ItemStack itemStack, PlayerEntity player)
@@ -28,18 +28,18 @@ public static boolean canConsume(ItemStack itemStack, PlayerEntity player)
 		if (!isFood(itemStack))
 			return false;
 
-		FoodComponent itemFood = itemStack.getItem().getFoodComponent();
+		FoodComponent itemFood = itemStack.getItem().getComponents().get(DataComponentTypes.FOOD);
 		if (itemFood == null)
 			return false;
 
-		return player.canConsume(itemFood.isAlwaysEdible());
+		return player.canConsume(itemFood.canAlwaysEat());
 	}
 
 	public static FoodValues getDefaultFoodValues(ItemStack itemStack)
 	{
-		FoodComponent itemFood = itemStack.getItem().getFoodComponent();
-		int hunger = itemFood != null ? itemFood.getHunger() : 0;
-		float saturationModifier = itemFood != null ? itemFood.getSaturationModifier() : 0;
+		FoodComponent itemFood = itemStack.getItem().getComponents().get(DataComponentTypes.FOOD);
+		int hunger = itemFood != null ? itemFood.nutrition() : 0;
+		float saturationModifier = itemFood != null ? itemFood.saturationModifier() : 0;
 		return new FoodValues(hunger, saturationModifier);
 	}
 
@@ -60,9 +60,9 @@ public static boolean isRotten(ItemStack itemStack)
 		if (!isFood(itemStack))
 			return false;
 
-		for (Pair<StatusEffectInstance, Float> effect : itemStack.getItem().getFoodComponent().getStatusEffects())
+		for (FoodComponent.StatusEffectEntry effect : itemStack.getItem().getComponents().get(DataComponentTypes.FOOD).effects())
 		{
-			if (effect.getFirst() != null && effect.getFirst().getEffectType() != null && effect.getFirst().getEffectType().getCategory() == StatusEffectCategory.HARMFUL)
+			if (effect.effect().getEffectType().value().getCategory() == StatusEffectCategory.HARMFUL)
 				return true;
 		}
 		return false;
@@ -91,9 +91,9 @@ public static float getEstimatedHealthIncrement(ItemStack itemStack, FoodValues
 		}
 
 		// health for regeneration effect
-		for (Pair<StatusEffectInstance, Float> effect : itemStack.getItem().getFoodComponent().getStatusEffects())
+		for (FoodComponent.StatusEffectEntry effect : itemStack.getItem().getComponents().get(DataComponentTypes.FOOD).effects())
 		{
-			StatusEffectInstance effectInstance = effect.getFirst();
+			StatusEffectInstance effectInstance = effect.effect();
 			if (effectInstance != null && effectInstance.getEffectType() == StatusEffects.REGENERATION)
 			{
 				int amplifier = effectInstance.getAmplifier();

java/squeek/appleskin/network/ClientSyncHandler.java

@@ -9,16 +9,14 @@ public class ClientSyncHandler
 	@Environment(EnvType.CLIENT)
 	public static void init()
 	{
-		ClientPlayNetworking.registerGlobalReceiver(SyncHandler.EXHAUSTION_SYNC, (client, handler, buf, responseSender) -> {
-			float exhaustion = buf.readFloat();
-			client.execute(() -> {
-				client.player.getHungerManager().setExhaustion(exhaustion);
+		ClientPlayNetworking.registerGlobalReceiver(ExhaustionSyncPayload.ID, (payload, context) -> {
+			context.client().execute(() -> {
+				context.client().player.getHungerManager().setExhaustion(payload.getExhaustion());
 			});
 		});
-		ClientPlayNetworking.registerGlobalReceiver(SyncHandler.SATURATION_SYNC, (client, handler, buf, responseSender) -> {
-			float saturation = buf.readFloat();
-			client.execute(() -> {
-				client.player.getHungerManager().setSaturationLevel(saturation);
+		ClientPlayNetworking.registerGlobalReceiver(SaturationSyncPayload.ID, (payload, context) -> {
+			context.client().execute(() -> {
+				context.client().player.getHungerManager().setSaturationLevel(payload.getSaturation());
 			});
 		});
 	}

java/squeek/appleskin/network/ExhaustionSyncPayload.java

@@ -0,0 +1,33 @@
+package squeek.appleskin.network;
+
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
+
+public record ExhaustionSyncPayload(float exhaustion) implements CustomPayload
+{
+	public static final PacketCodec<PacketByteBuf, ExhaustionSyncPayload> CODEC = CustomPayload.codecOf(ExhaustionSyncPayload::write, ExhaustionSyncPayload::new);
+	public static final CustomPayload.Id<ExhaustionSyncPayload> ID = new Id<>(new Identifier("appleskin", "exhaustion"));
+
+	public ExhaustionSyncPayload(PacketByteBuf buf)
+	{
+		this(buf.readFloat());
+	}
+
+	public void write(PacketByteBuf buf)
+	{
+		buf.writeFloat(exhaustion);
+	}
+
+	public float getExhaustion()
+	{
+		return exhaustion;
+	}
+
+	@Override
+	public Id<? extends CustomPayload> getId()
+	{
+		return ID;
+	}
+}

java/squeek/appleskin/network/SaturationSyncPayload.java

@@ -0,0 +1,33 @@
+package squeek.appleskin.network;
+
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
+
+public record SaturationSyncPayload(float saturation) implements CustomPayload
+{
+	public static final PacketCodec<PacketByteBuf, SaturationSyncPayload> CODEC = CustomPayload.codecOf(SaturationSyncPayload::write, SaturationSyncPayload::new);
+	public static final CustomPayload.Id<SaturationSyncPayload> ID = new Id<>(new Identifier("appleskin", "saturation"));
+
+	public SaturationSyncPayload(PacketByteBuf buf)
+	{
+		this(buf.readFloat());
+	}
+
+	public void write(PacketByteBuf buf)
+	{
+		buf.writeFloat(saturation);
+	}
+
+	public float getSaturation()
+	{
+		return saturation;
+	}
+
+	@Override
+	public Id<? extends CustomPayload> getId()
+	{
+		return ID;
+	}
+}

java/squeek/appleskin/network/SyncHandler.java

@@ -1,25 +1,19 @@
 package squeek.appleskin.network;
 
-import io.netty.buffer.Unpooled;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.Identifier;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 public class SyncHandler
 {
-	public static final Identifier EXHAUSTION_SYNC = new Identifier("appleskin", "exhaustion_sync");
-	public static final Identifier SATURATION_SYNC = new Identifier("appleskin", "saturation_sync");
-
-	private static PacketByteBuf makePacketBuf(float val)
+	public static void init()
 	{
-		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
-		buf.writeFloat(val);
-		return buf;
+		PayloadTypeRegistry.playS2C().register(ExhaustionSyncPayload.ID, ExhaustionSyncPayload.CODEC);
+		PayloadTypeRegistry.playS2C().register(SaturationSyncPayload.ID, SaturationSyncPayload.CODEC);
 	}
 
 	/*
@@ -37,14 +31,14 @@ public static void onPlayerUpdate(ServerPlayerEntity player)
 		float saturation = player.getHungerManager().getSaturationLevel();
 		if (lastSaturationLevel == null || lastSaturationLevel != saturation)
 		{
-			ServerPlayNetworking.send(player, SATURATION_SYNC, makePacketBuf(saturation));
+			ServerPlayNetworking.send(player, new SaturationSyncPayload(saturation));
 			lastSaturationLevels.put(player.getUuid(), saturation);
 		}
 
 		float exhaustionLevel = player.getHungerManager().getExhaustion();
 		if (lastExhaustionLevel == null || Math.abs(lastExhaustionLevel - exhaustionLevel) >= 0.01f)
 		{
-			ServerPlayNetworking.send(player, EXHAUSTION_SYNC, makePacketBuf(exhaustionLevel));
+			ServerPlayNetworking.send(player, new ExhaustionSyncPayload(exhaustionLevel));
 			lastExhaustionLevels.put(player.getUuid(), exhaustionLevel);
 		}
 	}

resources/fabric.mod.json

@@ -22,6 +22,9 @@
     "client": [
       "squeek.appleskin.AppleSkin"
     ],
+    "main": [
+      "squeek.appleskin.AppleSkinCommon"
+    ],
     "modmenu": [
       "squeek.appleskin.gui.ModMenuIntegration"
     ],