Merge pull request #51 from FTBTeam/dev

Dev

Author: desht

.github/workflows/build.yml

@@ -18,6 +18,7 @@ jobs:
     with:
       curse-publish-task: ""
       maven-snapshots: true
+      java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
       saps-token: ${{ secrets.SAPS_TOKEN }}

.github/workflows/release.yml

@@ -11,6 +11,7 @@ jobs:
     uses: FTBTeam/mods-meta/.github/workflows/standard-release.yml@main
     with:
       curse-publish-task: curseforge
+      java-version: 21
     secrets:
       ftb-maven-token: ${{ secrets.FTB_MAVEN_TOKEN }}
       saps-token: ${{ secrets.SAPS_TOKEN }}

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
@@ -33,7 +33,7 @@ allprojects {
 	// needs to be done AFTER version is set
 	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
 
-	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17
+	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 21
 
 	compileJava {
 		options.encoding = "UTF-8"

common/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 def ENV = System.getenv()
 
 architectury {
-	common("forge", "fabric", "neoforge")
+	common(/*"forge",*/ "fabric", "neoforge")
 }
 
 publishing {

common/src/main/java/dev/ftb/mods/ftbteams/FTBTeams.java

@@ -40,7 +40,7 @@ public FTBTeams() {
 
 		EnvExecutor.runInEnv(Env.CLIENT, () -> FTBTeamsClient::init);
 
-		FTBTeamsNet.init();
+		FTBTeamsNet.register();
 	}
 
 	private void serverAboutToStart(MinecraftServer server) {

common/src/main/java/dev/ftb/mods/ftbteams/api/property/BooleanProperty.java

@@ -5,6 +5,7 @@
 import net.minecraft.nbt.NumericTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Optional;
@@ -44,7 +45,7 @@ public Optional<Boolean> fromString(String string) {
 	}
 
 	@Override
-	public void write(FriendlyByteBuf buf) {
+	public void write(RegistryFriendlyByteBuf buf) {
 		buf.writeBoolean(getDefaultValue());
 	}
 

common/src/main/java/dev/ftb/mods/ftbteams/api/property/ColorProperty.java

@@ -3,6 +3,7 @@
 import dev.ftb.mods.ftblibrary.config.ConfigGroup;
 import dev.ftb.mods.ftblibrary.icon.Color4I;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Optional;
@@ -33,7 +34,7 @@ public Optional<Color4I> fromString(String string) {
 	}
 
 	@Override
-	public void write(FriendlyByteBuf buf) {
+	public void write(RegistryFriendlyByteBuf buf) {
 		buf.writeVarInt(getDefaultValue().rgb());
 	}
 

common/src/main/java/dev/ftb/mods/ftbteams/api/property/DoubleProperty.java

@@ -5,6 +5,7 @@
 import net.minecraft.nbt.NumericTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
@@ -49,7 +50,7 @@ public Optional<Double> fromString(String string) {
 	}
 
 	@Override
-	public void write(FriendlyByteBuf buf) {
+	public void write(RegistryFriendlyByteBuf buf) {
 		buf.writeDouble(getDefaultValue());
 		buf.writeDouble(minValue);
 		buf.writeDouble(maxValue);

common/src/main/java/dev/ftb/mods/ftbteams/api/property/EnumProperty.java

@@ -5,7 +5,9 @@
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.*;
@@ -31,10 +33,14 @@ private static <T> Map<String,Component> buildMap(NameMap<T> nameMap) {
 		return res;
 	}
 
-	static EnumProperty fromNetwork(ResourceLocation id, FriendlyByteBuf buf) {
+	static EnumProperty fromNetwork(ResourceLocation id, RegistryFriendlyByteBuf buf) {
 		String def = buf.readUtf(Short.MAX_VALUE);
 		List<String> values = buf.readList(b -> b.readUtf(Short.MAX_VALUE));
-		Map<String,Component> names = buf.readMap(b -> b.readUtf(Short.MAX_VALUE), FriendlyByteBuf::readComponent);
+		int len = buf.readVarInt();
+		Map<String,Component> names = new HashMap<>();
+		for (int i = 0; i < len; i++) {
+			names.put(buf.readUtf(), ComponentSerialization.STREAM_CODEC.decode(buf));
+		}
 		return new EnumProperty(id, () -> def, values, names);
 	}
 
@@ -49,10 +55,15 @@ public Optional<String> fromString(String string) {
 	}
 
 	@Override
-	public void write(FriendlyByteBuf buf) {
+	public void write(RegistryFriendlyByteBuf buf) {
 		buf.writeUtf(getDefaultValue(), Short.MAX_VALUE);
 		buf.writeCollection(values, FriendlyByteBuf::writeUtf);
-		buf.writeMap(names, FriendlyByteBuf::writeUtf, FriendlyByteBuf::writeComponent);
+
+		buf.writeVarInt(names.size());
+		names.forEach((k, v) -> {
+			buf.writeUtf(k);
+			ComponentSerialization.STREAM_CODEC.encode(buf, v);
+		});
 	}
 
 	@Override

common/src/main/java/dev/ftb/mods/ftbteams/api/property/IntProperty.java

@@ -5,6 +5,7 @@
 import net.minecraft.nbt.NumericTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
@@ -53,7 +54,7 @@ public Optional<Integer> fromString(String string) {
 	}
 
 	@Override
-	public void write(FriendlyByteBuf buf) {
+	public void write(RegistryFriendlyByteBuf buf) {
 		buf.writeVarInt(getDefaultValue());
 		buf.writeVarInt(minValue);
 		buf.writeVarInt(maxValue);