diff options
| author | HacktheTime <l4bg0jb7@duck.com> | 2023-12-15 18:27:29 +0100 |
|---|---|---|
| committer | HacktheTime <l4bg0jb7@duck.com> | 2023-12-15 18:27:29 +0100 |
| commit | 595bb1aca851f8ab4eb216fadbd0e15f7831e4f5 (patch) | |
| tree | 761c0bc33101b59682badb488e55f8908246b692 /fabric/src | |
| parent | 64e125ae35ffc42b454b3c9b2bb78605555c51bd (diff) | |
| parent | 8ffaa253eae1b82c12c1e065fc9cc66006c9feab (diff) | |
| download | BBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.tar.gz BBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.tar.bz2 BBsentials-595bb1aca851f8ab4eb216fadbd0e15f7831e4f5.zip | |
Merge remote-tracking branch 'origin/hypeswap' into hypeswap
# Conflicts:
# fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
# forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
Diffstat (limited to 'fabric/src')
| -rw-r--r-- | fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java index a530492..21424fc 100644 --- a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java +++ b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; public class DebugThread implements de.hype.bbsentials.common.client.DebugThread { + public static List<Object> store = new ArrayList<>(); boolean doTest = false; - public static List<Object> store = new ArrayList<>(); @Override public void loop() { if (doTest) { @@ -22,9 +22,9 @@ public class DebugThread implements de.hype.bbsentials.common.client.DebugThread public void doOnce() { doTest = true; } + @Override public List<String> test() { return List.of(""); } - } |