Skip to content

Commit

Permalink
fix jar not booting outside dev on fabric/forge
Browse files Browse the repository at this point in the history
  • Loading branch information
MrNavaStar committed May 30, 2024
1 parent e0fc928 commit e36c41d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ subprojects {

dependencies {
compileOnly "com.esotericsoftware:kryo5:${project.kyro_version}"
compileOnly "de.javakaffee:kryo-serializers:${project.kyro_ser_version}"
compileOnly "io.netty:netty-buffer:${project.netty_version}"
compileOnly "io.netty:netty-transport:${project.netty_version}"
compileOnly "io.netty:netty-handler:${project.netty_version}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.esotericsoftware.kryo.kryo5.io.Input;
import com.esotericsoftware.kryo.kryo5.io.Output;
import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy;
import com.esotericsoftware.kryo.kryo5.serializers.DefaultSerializers;
import com.esotericsoftware.kryo.kryo5.util.DefaultInstantiatorStrategy;
import lombok.*;
import me.mrnavastar.protoweaver.api.ProtoConnectionHandler;
Expand All @@ -12,10 +13,9 @@
import me.mrnavastar.protoweaver.api.auth.ServerAuthHandler;
import me.mrnavastar.protoweaver.api.netty.ProtoConnection;

import java.lang.reflect.Field;
import java.lang.reflect.InaccessibleObjectException;
import java.lang.reflect.Modifier;
import java.util.Objects;
import java.util.UUID;

/**
* Stores all the registered packets, settings and additional configuration of a {@link ProtoWeaver} protocol.
Expand All @@ -41,6 +41,8 @@ private Protocol(String namespace, String name) {
this.name = name;
kryo.setRegistrationRequired(false);
kryo.setInstantiatorStrategy(new DefaultInstantiatorStrategy(new StdInstantiatorStrategy()));

kryo.addDefaultSerializer(UUID.class, new DefaultSerializers.UUIDSerializer());
}

/**
Expand Down
2 changes: 2 additions & 0 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ dependencies {
// Libs
include implementation("com.esotericsoftware:kryo5:${project.kyro_version}")
include implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")
include "org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}"
include "org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}"
include implementation("io.netty:netty-codec-http:${project.netty_version}")
include implementation("io.netty:netty-codec-http2:${project.netty_version}")

Expand Down
2 changes: 2 additions & 0 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ dependencies {
// Libs
include forgeRuntimeLibrary(implementation("com.esotericsoftware:kryo5:${project.kyro_version}"))
include forgeRuntimeLibrary(implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}"))
include "org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}"
include "org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}"
include forgeRuntimeLibrary(implementation("io.netty:netty-codec-http:${project.netty_version}"))
include forgeRuntimeLibrary(implementation("io.netty:netty-codec-http2:${project.netty_version}"))

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ waterfall_version=1.20-R0.3-SNAPSHOT
# Dependencies
# https://github.com/EsotericSoftware/kryo/releases
kyro_version=5.6.0
kyro_ser_version=0.45
# should always match the netty version in (latest) minecraft release
netty_version=4.1.97.Final
# https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on
Expand Down

0 comments on commit e36c41d

Please sign in to comment.