Remove unneeded attempt at fixing an issue
This commit is contained in:
parent
d6f1b60705
commit
e7dbec0a77
|
@ -1,38 +0,0 @@
|
||||||
package io.gitlab.jfronny.dynres.mixin;
|
|
||||||
|
|
||||||
import io.gitlab.jfronny.dynres.ServerPropertiesHandlerExt;
|
|
||||||
import net.minecraft.server.dedicated.ServerPropertiesHandler;
|
|
||||||
import net.minecraft.server.dedicated.ServerPropertiesLoader;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
import java.util.function.UnaryOperator;
|
|
||||||
|
|
||||||
@Mixin(ServerPropertiesLoader.class)
|
|
||||||
public class ServerPropertiesLoaderMixin {
|
|
||||||
@Shadow
|
|
||||||
private ServerPropertiesHandler propertiesHandler;
|
|
||||||
@Inject(at = @At("RETURN"), method = "apply(Ljava/util/function/UnaryOperator;)Lnet/minecraft/server/dedicated/ServerPropertiesLoader;")
|
|
||||||
public void apply(UnaryOperator<ServerPropertiesHandler> unaryOperator, CallbackInfoReturnable<ServerPropertiesLoader> info) {
|
|
||||||
applyChanges();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(at = @At("HEAD"), method = "store()V")
|
|
||||||
public void store(CallbackInfo info) {
|
|
||||||
applyChanges();
|
|
||||||
}
|
|
||||||
|
|
||||||
//This caused a stackoverflow
|
|
||||||
//@Inject(at = @At("HEAD"), method = "getPropertiesHandler()Lnet/minecraft/server/dedicated/ServerPropertiesHandler;")
|
|
||||||
//public void getPropertiesHandler(CallbackInfoReturnable<ServerPropertiesHandler> info) {
|
|
||||||
// applyChanges();
|
|
||||||
//}
|
|
||||||
|
|
||||||
public void applyChanges() {
|
|
||||||
((ServerPropertiesHandlerExt)propertiesHandler).applyChanges(false);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -17,7 +17,7 @@ public class RequestHandler implements HttpRequestHandler {
|
||||||
public HttpResponse handle(HttpRequest request) {
|
public HttpResponse handle(HttpRequest request) {
|
||||||
try {
|
try {
|
||||||
//TODO remove debug statement
|
//TODO remove debug statement
|
||||||
DynRes.logger.info("Got connection from " + request.getGETParamString());
|
DynRes.logger.info("Got connection");
|
||||||
String method = request.getMethod().toUpperCase();
|
String method = request.getMethod().toUpperCase();
|
||||||
if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
|
if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
|
||||||
DynRes.logger.error("Invalid method: " + method);
|
DynRes.logger.error("Invalid method: " + method);
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
"mixins": [
|
"mixins": [
|
||||||
],
|
],
|
||||||
"server": [
|
"server": [
|
||||||
"ServerPropertiesHandlerMixin",
|
"ServerPropertiesHandlerMixin"
|
||||||
"ServerPropertiesLoaderMixin"
|
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|
Loading…
Reference in New Issue