From e7dbec0a774e04bf5b021f377a570d63244deaed Mon Sep 17 00:00:00 2001
From: JFronny <33260128+JFronny@users.noreply.github.com>
Date: Mon, 7 Sep 2020 17:29:19 +0200
Subject: [PATCH] Remove unneeded attempt at fixing an issue

---
 .../mixin/ServerPropertiesLoaderMixin.java    | 38 -------------------
 .../jfronny/dynres/web/RequestHandler.java    |  2 +-
 src/main/resources/dynres.mixins.json         |  3 +-
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesLoaderMixin.java

diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesLoaderMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesLoaderMixin.java
deleted file mode 100644
index bdb226b..0000000
--- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesLoaderMixin.java
+++ /dev/null
@@ -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);
-    }
-}
diff --git a/src/main/java/io/gitlab/jfronny/dynres/web/RequestHandler.java b/src/main/java/io/gitlab/jfronny/dynres/web/RequestHandler.java
index c3d93ef..e795071 100644
--- a/src/main/java/io/gitlab/jfronny/dynres/web/RequestHandler.java
+++ b/src/main/java/io/gitlab/jfronny/dynres/web/RequestHandler.java
@@ -17,7 +17,7 @@ public class RequestHandler implements HttpRequestHandler {
     public HttpResponse handle(HttpRequest request) {
         try {
             //TODO remove debug statement
-            DynRes.logger.info("Got connection from " + request.getGETParamString());
+            DynRes.logger.info("Got connection");
             String method = request.getMethod().toUpperCase();
             if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
                 DynRes.logger.error("Invalid method: " + method);
diff --git a/src/main/resources/dynres.mixins.json b/src/main/resources/dynres.mixins.json
index 7752adf..3479b77 100644
--- a/src/main/resources/dynres.mixins.json
+++ b/src/main/resources/dynres.mixins.json
@@ -6,8 +6,7 @@
   "mixins": [
   ],
   "server": [
-    "ServerPropertiesHandlerMixin",
-    "ServerPropertiesLoaderMixin"
+    "ServerPropertiesHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1