less netty is always a good day

MrNavaStar · MrNavaStar · commit 18ec547e4e34 · 2026-01-05T15:21:25.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -22,10 +22,12 @@ allprojects {
         maven { url "https://repo.papermc.io/repository/maven-public/" }    // Paper + Velocity
         maven { url "https://api.modrinth.com/maven/" }                     // Modrinth
     }
-    
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = project.javaVersion as Integer
+
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            options.encoding = "UTF-8"
+            options.release = project.javaVersion as Integer
+        }
     }
 }
 
@@ -39,16 +41,14 @@ subprojects {
         compileOnly "io.netty:netty-buffer:${project.netty_version}"
         compileOnly "io.netty:netty-transport:${project.netty_version}"
         compileOnly "io.netty:netty-handler:${project.netty_version}"
-        compileOnly "io.netty:netty-codec-http:${project.netty_version}"
-        compileOnly "io.netty:netty-codec-http2:${project.netty_version}"
         compileOnly "org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}"
         compileOnly "me.mrnavastar:r:${project.r_version}"
 
         compileOnly "org.projectlombok:lombok:${project.lombok_version}"
 	    annotationProcessor "org.projectlombok:lombok:${project.lombok_version}"
     }
 
-    task jarSources(type:Jar){
+    tasks.register('jarSources', Jar) {
         archiveBaseName.set("protoweaver")
         archiveClassifier.set("sources")
         exclude {
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -30,7 +30,6 @@ dependencies {
     include implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")
     include implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}")
     include implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}")
-    include implementation("io.netty:netty-codec-http2:${project.netty_version}")
     include implementation("me.mrnavastar:r:${project.r_version}")
 
     // Mod Compat
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -33,7 +33,6 @@ dependencies {
     include forgeRuntimeLibrary(implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}"))
     include forgeRuntimeLibrary(implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}"))
     include forgeRuntimeLibrary(implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}"))
-    include forgeRuntimeLibrary(implementation("io.netty:netty-codec-http2:${project.netty_version}"))
     include forgeRuntimeLibrary(implementation("me.mrnavastar:r:${project.r_version}"))
 
     // Mod Compat
diff --git a/loader-common/build.gradle b/loader-common/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "dev.architectury.loom"
 
 architectury {
-    common("fabric", "forge")
+    common("fabric")
 }
 
 loom {
diff --git a/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/Http2ServerResponseHandler.java b/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/Http2ServerResponseHandler.java
diff --git a/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/Http2Util.java b/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/Http2Util.java
diff --git a/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/HttpHandler.java b/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/HttpHandler.java
diff --git a/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/SSLContext.java b/loader-common/src/main/java/me/mrnavastar/protoweaver/loader/netty/SSLContext.java
@@ -1,6 +1,5 @@
 package me.mrnavastar.protoweaver.loader.netty;
 
-import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.*;
 import lombok.Cleanup;
 import lombok.Getter;
@@ -23,30 +22,41 @@
 import java.security.*;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Optional;
+import java.util.*;
 
 public class SSLContext {
 
     @Getter
     private static io.netty.handler.ssl.SslContext context;
     private static InputStream privateKey;
     private static InputStream cert;
+    private static final Provider provider = new BouncyCastleProvider();
+
+    // These https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
+    // Minus These https://datatracker.ietf.org/doc/html/rfc7540#appendix-A
+    private static final List<String> CIPHERS = List.of(
+            "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+            "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+            "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+            "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+            "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
+            "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+            "TLS_AES_128_GCM_SHA256",
+            "TLS_AES_256_GCM_SHA384",
+            "TLS_CHACHA20_POLY1305_SHA256"
+    );
 
     @SneakyThrows
     public static void init(String dir) {
-
-
-        Security.addProvider(new BouncyCastleProvider());
+        Security.addProvider(provider);
 
         Optional.ofNullable(System.getenv("PROTOWEAVER_PRIVATE_KEY")).ifPresent(value -> privateKey = new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
         Optional.ofNullable(System.getenv("PROTOWEAVER_CERT")).ifPresent(value -> cert = new ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8)));
 
         genKeys(dir);
         context = SslContextBuilder.forServer(cert, privateKey)
                 .sslProvider(OpenSsl.isAvailable() ? SslProvider.OPENSSL : SslProvider.JDK)
-                .ciphers(Http2SecurityUtil.CIPHERS, SupportedCipherSuiteFilter.INSTANCE)
+                .ciphers(CIPHERS, SupportedCipherSuiteFilter.INSTANCE)
                 .applicationProtocolConfig(new ApplicationProtocolConfig(
                         ApplicationProtocolConfig.Protocol.ALPN,
                         ApplicationProtocolConfig.SelectorFailureBehavior.NO_ADVERTISE,
@@ -82,22 +92,18 @@ private static void genKeys(String dir) throws NoSuchAlgorithmException, Certifi
 
     // From https://stackoverflow.com/questions/29852290/self-signed-x509-certificate-with-bouncy-castle-in-java
     private static X509Certificate genCert(KeyPair keyPair) throws OperatorCreationException, CertificateException, IOException {
-        Provider bcProvider = new BouncyCastleProvider();
-        Security.addProvider(bcProvider);
-        X500Name dnName = new X500Name("CN=PROTOWEAVER");
-
         long now = System.currentTimeMillis();
         Date startDate = new Date(now);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(startDate);
         calendar.add(Calendar.YEAR, 999);
         Date endDate = calendar.getTime();
 
+        X500Name dnName = new X500Name("CN=PROTOWEAVER");
         ContentSigner contentSigner = new JcaContentSignerBuilder("SHA256WithRSA").build(keyPair.getPrivate());
         JcaX509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder(dnName, new BigInteger(Long.toString(now)), startDate, endDate, dnName, keyPair.getPublic());
-        BasicConstraints basicConstraints = new BasicConstraints(true);
-        certBuilder.addExtension(new ASN1ObjectIdentifier("2.5.29.19"), true, basicConstraints);
+        certBuilder.addExtension(new ASN1ObjectIdentifier("2.5.29.19"), true, new BasicConstraints(true));
 
-        return new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(contentSigner));
+        return new JcaX509CertificateConverter().setProvider(provider).getCertificate(certBuilder.build(contentSigner));
     }
 }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -30,7 +30,6 @@ dependencies {
     jarJar implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")
     jarJar implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}")
     jarJar implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}")
-    jarJar implementation("io.netty:netty-codec-http2:${project.netty_version}")
     jarJar implementation("me.mrnavastar:r:${project.r_version}")
 
     // Mod Compat
diff --git a/paper/build.gradle b/paper/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     shadow implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")
     shadow implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}")
     shadow implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}")
-    shadow implementation("io.netty:netty-codec-http2:${project.netty_version}")
 }
 
 shadowJar {
@@ -27,7 +26,6 @@ shadowJar {
     relocate 'me.mrnavastar.r', 'me.mrnavastar.protoweaver.libs.me.mrnavastar.r'
     relocate 'org.apache.fory', 'me.mrnavastar.protoweaver.libs.org.apache.fory'
     relocate 'org.bouncycastle', 'me.mrnavastar.protoweaver.libs.org.bouncycastle'
-    relocate 'io.netty', "me.mrnavastar.protoweaver.libs.io.netty"
 }
 
 jar.finalizedBy(shadowJar)
diff --git a/paper/src/main/java/me/mrnavastar/protoweaver/loader/Paper.java b/paper/src/main/java/me/mrnavastar/protoweaver/loader/Paper.java
@@ -2,7 +2,6 @@
 
 import io.netty.channel.Channel;
 import me.mrnavastar.protoweaver.api.ProtoWeaver;
-import me.mrnavastar.protoweaver.api.protocol.protomessage.ProtoMessage;
 import me.mrnavastar.protoweaver.api.protocol.velocity.VelocityAuth;
 import me.mrnavastar.protoweaver.core.util.ProtoLogger;
 import me.mrnavastar.protoweaver.loader.netty.ProtoDeterminer;
@@ -24,8 +23,6 @@ public class Paper extends JavaPlugin implements ProtoLogger.IProtoLogger {
     public void onEnable() {
         if (!ProtoWeaver.getLoadedProtocols().isEmpty()) setup();
         else ProtoWeaver.PROTOCOL_LOADED.register(protocol -> setup());
-
-        ProtoWeaver.load(ProtoMessage.getProtocol());
     }
 
     private void setup() {
diff --git a/settings.gradle b/settings.gradle
@@ -9,4 +9,4 @@ pluginManagement {
 }
 
 rootProject.name = 'protoweaver'
-include ':common', ':client', 'loader-common', ':fabric', ':forge', ':paper', ':proxy' // ':neoforge',
+include ':common', ':client', 'loader-common', ':fabric',  ':paper', ':proxy' //':forge', ':neoforge',

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`apply plugin: "dev.architectury.loom"`
`2`	`2`
`3`	`3`	`architectury {`
`4`		`- common("fabric", "forge")`
	`4`	`+ common("fabric")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`loom {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ dependencies {`
`13`	`13`	`shadow implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")`
`14`	`14`	`shadow implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}")`
`15`	`15`	`shadow implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}")`
`16`		`- shadow implementation("io.netty:netty-codec-http2:${project.netty_version}")`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`shadowJar {`
`@@ -27,7 +26,6 @@ shadowJar {`
`27`	`26`	`relocate 'me.mrnavastar.r', 'me.mrnavastar.protoweaver.libs.me.mrnavastar.r'`
`28`	`27`	`relocate 'org.apache.fory', 'me.mrnavastar.protoweaver.libs.org.apache.fory'`
`29`	`28`	`relocate 'org.bouncycastle', 'me.mrnavastar.protoweaver.libs.org.bouncycastle'`
`30`		`- relocate 'io.netty', "me.mrnavastar.protoweaver.libs.io.netty"`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`jar.finalizedBy(shadowJar)`