feat: 1.21 forge

plasmoapp · Jul 9, 2024 · d704490 · d704490
1 parent 94bc507
commit d704490
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 40 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -26,6 +26,8 @@ dependencies {
 tasks {
     shadowJar {
         archiveClassifier = "all"
+
+        exclude("classpath.index")
         relocate("net.kyori", "su.plo.slib.libs.adventure")
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,7 +17,7 @@ pluginManagement {
     }
 
     plugins {
-        val egtVersion = "0.6.0-SNAPSHOT"
+        val egtVersion = "0.7.0-SNAPSHOT"
         id("gg.essential.defaults") version egtVersion
         id("gg.essential.multi-version.root") version egtVersion
     }

diff --git a/versions/1.20.6-fabric/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayCodec.kt b/versions/1.20.6-fabric/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayCodec.kt
diff --git a/versions/1.20.6-fabric/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayPayload.kt b/versions/1.20.6-fabric/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayPayload.kt
diff --git a/versions/1.21-forge/gradle.properties b/versions/1.21-forge/gradle.properties
@@ -0,0 +1 @@
+essential.defaults.loom.forge=net.minecraftforge:forge:1.21-51.0.22
diff --git a/versions/root.gradle.kts b/versions/root.gradle.kts
@@ -8,6 +8,7 @@ preprocess {
 
     val fabric12100 = createNode("1.21-fabric", 12100, "official")
     val neoForge12100 = createNode("1.21-neoforge", 12100, "official")
+    val forge12100 = createNode("1.21-forge", 12100, "official")
 
     val fabric12006 = createNode("1.20.6-fabric", 12006, "official")
 
@@ -37,6 +38,7 @@ preprocess {
 
     neoForge12100.link(fabric12006)
     fabric12100.link(fabric12006)
+    forge12100.link(forge12004)
 
     fabric12006.link(fabric12004)
 

diff --git a/versions/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayCodec.kt b/versions/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayCodec.kt
@@ -0,0 +1,28 @@
+//#if MC>=12005
+//$$ package su.plo.slib.mod.channel
+//$$
+//$$ import net.minecraft.network.RegistryFriendlyByteBuf
+//$$ import net.minecraft.network.codec.StreamCodec
+//$$ import net.minecraft.network.protocol.common.custom.CustomPacketPayload
+//$$ import net.minecraft.resources.ResourceLocation
+//$$
+//$$ class ByteArrayCodec(
+//$$     channelKey: ResourceLocation
+//$$ ) : StreamCodec<RegistryFriendlyByteBuf, ByteArrayPayload> {
+//$$
+//$$     val type = CustomPacketPayload.Type<ByteArrayPayload>(channelKey)
+//$$
+//$$     override fun decode(buf: RegistryFriendlyByteBuf): ByteArrayPayload {
+//$$         val length = buf.readableBytes()
+//$$
+//$$         val data = ByteArray(length)
+//$$         buf.readBytes(data)
+//$$
+//$$         return ByteArrayPayload(type, data)
+//$$     }
+//$$
+//$$     override fun encode(buf: RegistryFriendlyByteBuf, payload: ByteArrayPayload) {
+//$$         buf.writeBytes(payload.data)
+//$$     }
+//$$ }
+//#endif
diff --git a/versions/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayPayload.kt b/versions/src/main/kotlin/su/plo/slib/mod/channel/ByteArrayPayload.kt
@@ -0,0 +1,13 @@
+//#if MC>=12005
+//$$ package su.plo.slib.mod.channel
+//$$
+//$$ import net.minecraft.network.protocol.common.custom.CustomPacketPayload
+//$$
+//$$ class ByteArrayPayload(
+//$$     private val type: CustomPacketPayload.Type<ByteArrayPayload>,
+//$$     val data: ByteArray
+//$$ ) : CustomPacketPayload {
+//$$
+//$$     override fun type(): CustomPacketPayload.Type<ByteArrayPayload> = type
+//$$ }
+//#endif
diff --git a/versions/src/main/kotlin/su/plo/slib/mod/channel/ModChannelManager.kt b/versions/src/main/kotlin/su/plo/slib/mod/channel/ModChannelManager.kt
@@ -165,7 +165,6 @@ class ModChannelManager : McServerChannelManager {
         //$$ private val codecs: MutableMap<ResourceLocation, ByteArrayCodec> = HashMap()
         //$$
         //$$ fun getOrRegisterCodec(channelKey: ResourceLocation): ByteArrayCodec = codecs.computeIfAbsent(channelKey) {
-        //$$     println("Register $channelKey")
         //$$     ByteArrayCodec(channelKey)
         //#if FABRIC
         //$$         .also {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		essential.defaults.loom.forge=net.minecraftforge:forge:1.21-51.0.22