From 0e1630dd2afd2eb2f23d47ab89d646b81744fc9e Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Sun, 9 Jul 2023 00:29:49 +0200 Subject: a lot of various things --- .gitignore | 4 +- run/config/indium-renderer.properties | 2 +- run/config/iris.properties | 2 +- run/mods/chat-notify-1.3.0-beta.3+mc1.20.jar | Bin 115493 -> 0 bytes run/servers.dat | Bin 15780 -> 23366 bytes run/servers.dat_old | Bin 91 -> 23366 bytes .../de/hype/bbsentials/api/FromChatSocket.java | 91 --------------------- .../hype/bbsentials/mixins/SimpleOptionMixin.java | 1 + src/main/resources/modid.mixins.json | 2 + 9 files changed, 8 insertions(+), 94 deletions(-) delete mode 100644 run/mods/chat-notify-1.3.0-beta.3+mc1.20.jar delete mode 100644 src/main/java/de/hype/bbsentials/api/FromChatSocket.java diff --git a/.gitignore b/.gitignore index 18bd6d7..1a99b58 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ *.zip /run/config/NoChatReports/README.md /run/config/citresewn-defaults.json +/run/config/Hype_Client_settings.json +/run/config/BBsential_settings.json +/run/.fabric/ /run/config/capes.json5 /run/config/chatnotify.json /run/config/citresewn.json @@ -22,7 +25,6 @@ /run/config/fabrishot.properties /run/config/fsb-interop.json /run/config/gamecontrollerdatabase.txt -/run/config/Hype_Client_settings.json /run/config/immediatelyfast.json /run/config/fabric/indigo-renderer.properties /run/config/isxander-main-menu-credits.json diff --git a/run/config/indium-renderer.properties b/run/config/indium-renderer.properties index 7c79010..28779fd 100644 --- a/run/config/indium-renderer.properties +++ b/run/config/indium-renderer.properties @@ -1,5 +1,5 @@ #Indium properties file -#Sat Jul 08 17:30:18 CEST 2023 +#Sun Jul 09 11:13:03 CEST 2023 fix-exterior-vertex-lighting=auto ambient-occlusion-mode=auto always-tesselate-blocks=auto diff --git a/run/config/iris.properties b/run/config/iris.properties index 2c00160..77377f4 100644 --- a/run/config/iris.properties +++ b/run/config/iris.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Sat Jul 08 17:30:18 CEST 2023 +#Sun Jul 09 11:13:04 CEST 2023 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/run/mods/chat-notify-1.3.0-beta.3+mc1.20.jar b/run/mods/chat-notify-1.3.0-beta.3+mc1.20.jar deleted file mode 100644 index d086e54..0000000 Binary files a/run/mods/chat-notify-1.3.0-beta.3+mc1.20.jar and /dev/null differ diff --git a/run/servers.dat b/run/servers.dat index bc22c1c..f7df290 100644 Binary files a/run/servers.dat and b/run/servers.dat differ diff --git a/run/servers.dat_old b/run/servers.dat_old index cc733d8..f7df290 100644 Binary files a/run/servers.dat_old and b/run/servers.dat_old differ diff --git a/src/main/java/de/hype/bbsentials/api/FromChatSocket.java b/src/main/java/de/hype/bbsentials/api/FromChatSocket.java deleted file mode 100644 index 2af25a6..0000000 --- a/src/main/java/de/hype/bbsentials/api/FromChatSocket.java +++ /dev/null @@ -1,91 +0,0 @@ -package de.hype.bbsentials.api; - -import net.minecraft.client.MinecraftClient; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.Socket; - -public class FromChatSocket implements Runnable { - private Socket socket; - private Thread thread; - private PrintWriter out; - - // Konstruktor, um den Client-Thread zu starten - public FromChatSocket() { - // Starte den Client-Thread - /*thread = new Thread(this); - thread.start(); - System.out.println("Thread started");*/ - } - - // Implementierung der run() Methode des Runnable-Interfaces - public void run() { - try { - boolean connected = false; - // Endlosschleife, um auf Verbindung zum Server zu warten - while (true) { - try { - // Verbinden zum Server auf Port 8001 - socket = new Socket("localhost", 8001); - connected = true; - } catch (IOException e) { - System.out.println("Waiting for server on port 8001..."); - Thread.sleep(1000); // Warte 1 Sekunde, bevor erneut versucht wird, eine Verbindung aufzubauen - } - } - /*if (socket != null) { - // Erstelle einen BufferedReader, um Daten vom Socket zu lesen - BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream())); - boolean notNull = true; - // Endlosschleife, um auf eingehende Nachrichten zu warten - while (MinecraftClient.getInstance().isRunning() && socket.isConnected() && notNull) { - - } - - // Schließen des BufferedReader und des Sockets - in.close(); - socket.close(); - }*/ - } catch (Exception e) { - e.printStackTrace(); - } - } - - public boolean isInGame() { - MinecraftClient minecraft = MinecraftClient.getInstance(); - if (minecraft.world != null || minecraft.getNetworkHandler() != null) { - // Das Spiel befindet sich in einer Welt oder auf einem Server - return true; - } else { - // Das Spiel befindet sich im Hauptmenü oder in einem anderen Menü - return false; - } - } -} -/* -* try { - Thread.sleep(500); - } catch (InterruptedException e) { - } - String plOutput = mc.getNetworkHandler().onChat.getChatGUI().getChatComponent(0).getUnformattedText(); - List partyMembers = Arrays.asList(plOutput.split("\\r?\\n")).stream() - .filter(s -> s.startsWith("Party Members:")) - .map(s -> s.substring(16).replaceAll(" ●", "")) - .collect(Collectors.toList()); - - mc.player.networkHandler.sendChatMessage("/p disband"); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - } - String currentPlayer = String.valueOf(mc.player.getName()); - partyMembers.stream() - .filter(s -> !s.equals(currentPlayer)) - .forEach(s -> { - mc.player.networkHandler.sendChatMessage("/p invite " + s); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - } - });*/ \ No newline at end of file diff --git a/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java b/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java index 7444788..50cbac5 100644 --- a/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java +++ b/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java @@ -25,6 +25,7 @@ public class SimpleOptionMixin implements ISimpleOption { } else { if (!Objects.equals(this.value, value)) { + System.out.println("used mixin"); this.value = value; this.changeCallback.accept(this.value); } diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json index 13719d7..980aedc 100644 --- a/src/main/resources/modid.mixins.json +++ b/src/main/resources/modid.mixins.json @@ -4,6 +4,8 @@ "package": "de.hype.bbsentials.mixins", "compatibilityLevel": "JAVA_8", "mixins": [ + "SimpleOptionMixin", + "ClientCommandSourceMixin" ], "client": [ "SimpleOptionMixin", -- cgit