General cleanup / organization

LostLuma · Nov 10, 2023 · b3784d3 · b3784d3
1 parent 6eb1419
commit b3784d3
Show file tree

Hide file tree

Showing 29 changed files with 164 additions and 230 deletions.
diff --git a/.../1.0.0-client/src/main/java/net/lostluma/server_stats/mixin/common/PlayerEntityMixin.java b/.../1.0.0-client/src/main/java/net/lostluma/server_stats/mixin/common/PlayerEntityMixin.java
@@ -28,10 +28,9 @@ private PlayerEntity getPlayer() {
     @Override
     public void server_stats$incrementStat(Stat stat, int amount) {
         var stats = this.server_stats$getStats();
-        var player = (PlayerEntity)(Object)this;
 
         if (stats != null) {
-            stats.increment(player, stat, amount);
+            stats.increment(this.getPlayer(), stat, amount);
         }
     }
 
@@ -46,7 +45,7 @@ private PlayerEntity getPlayer() {
 
     @Override
     public @Nullable ServerPlayerStats server_stats$getStats() {
-        var player = (PlayerEntity)(Object)this;
+        var player = this.getPlayer();
 
         // Unmapped method returns true when the server is multiplayer
         if (Minecraft.INSTANCE.m_2812472()) {

diff --git a/versions/1.0.0-client/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java b/versions/1.0.0-client/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java
@@ -60,11 +60,7 @@ public int get(Stat stat) {
     }
 
     public void load() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
 
         if (Files.exists(path)) {
             try {
@@ -78,16 +74,13 @@ public void load() {
     }
 
     public void save() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path base = getStatsDirectory();
+        Path path = base.resolve(this.name + ".json");
 
         try {
-            Files.createDirectories(STATS);
+            Files.createDirectories(base);
 
-            Path temp = Files.createTempFile(STATS, this.name, ".json", DEFAULT_ATTRIBUTES);
+            Path temp = Files.createTempFile(base, this.name, ".json", DEFAULT_ATTRIBUTES);
             Files.writeString(temp, this.serialize(), StandardCharsets.UTF_8);
 
             Files.move(temp, path, StandardCopyOption.ATOMIC_MOVE); // Prevent issues on server crash
@@ -97,11 +90,7 @@ public void save() {
     }
 
     public void deserialize() throws IOException {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
         JsonElement root = JsonParser.parseString(Files.readString(path, StandardCharsets.UTF_8));
 
         if (!root.isJsonObject()) {
@@ -118,7 +107,7 @@ public void deserialize() throws IOException {
                 this.counters.put(stat, value.getAsInt());
             } else {
                 LOGGER.warning(String.format("Failed to read stat %s in %s! It's either unknown or has invalid data.",
-                        entry.getKey(), path));
+                    entry.getKey(), path));
             }
         }
     }
@@ -133,6 +122,11 @@ public String serialize() {
         return result.toString();
     }
 
+    private static Path getStatsDirectory() {
+        Objects.requireNonNull(STATS, "Stats directory unset.");
+        return STATS;
+    }
+
     private static FileAttribute<?>[] getDefaultFileAttributes() {
         if (!System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
             return new FileAttribute[0];

diff --git a/...ver_stats/mixin/server/EntitiesMixin.java → ...ver_stats/mixin/common/EntitiesMixin.java b/...ver_stats/mixin/server/EntitiesMixin.java → ...ver_stats/mixin/common/EntitiesMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/...stats/mixin/server/PlayerEntityMixin.java → ...stats/mixin/common/PlayerEntityMixin.java b/...stats/mixin/server/PlayerEntityMixin.java → ...stats/mixin/common/PlayerEntityMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import net.lostluma.server_stats.stats.Stats;
 import net.lostluma.server_stats.types.StatsPlayer;
@@ -26,10 +26,9 @@ private PlayerEntity getPlayer() {
     @Override
     public void server_stats$incrementStat(Stat stat, int amount) {
         var stats = this.server_stats$getStats();
-        var player = (PlayerEntity)(Object)this;
 
         if (stats != null) {
-            stats.increment(player, stat, amount);
+            stats.increment(this.getPlayer(), stat, amount);
         }
     }
 
@@ -44,7 +43,7 @@ private PlayerEntity getPlayer() {
 
     @Override
     public @Nullable ServerPlayerStats server_stats$getStats() {
-        var player = (PlayerEntity)(Object)this;
+        var player = this.getPlayer();
 
         if (this.server_stats$serverPlayerStats == null) {
             this.server_stats$serverPlayerStats = new ServerPlayerStats(player);

diff --git a/...tats/mixin/server/PlayerManagerMixin.java → ...tats/mixin/common/PlayerManagerMixin.java b/...tats/mixin/server/PlayerManagerMixin.java → ...tats/mixin/common/PlayerManagerMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/versions/1.0.1-server/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java b/versions/1.0.1-server/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java
@@ -60,11 +60,7 @@ public int get(Stat stat) {
     }
 
     public void load() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
 
         if (Files.exists(path)) {
             try {
@@ -78,16 +74,13 @@ public void load() {
     }
 
     public void save() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path base = getStatsDirectory();
+        Path path = base.resolve(this.name + ".json");
 
         try {
-            Files.createDirectories(STATS);
+            Files.createDirectories(base);
 
-            Path temp = Files.createTempFile(STATS, this.name, ".json", DEFAULT_ATTRIBUTES);
+            Path temp = Files.createTempFile(base, this.name, ".json", DEFAULT_ATTRIBUTES);
             Files.writeString(temp, this.serialize(), StandardCharsets.UTF_8);
 
             Files.move(temp, path, StandardCopyOption.ATOMIC_MOVE); // Prevent issues on server crash
@@ -97,11 +90,7 @@ public void save() {
     }
 
     public void deserialize() throws IOException {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
         JsonElement root = JsonParser.parseString(Files.readString(path, StandardCharsets.UTF_8));
 
         if (!root.isJsonObject()) {
@@ -118,7 +107,7 @@ public void deserialize() throws IOException {
                 this.counters.put(stat, value.getAsInt());
             } else {
                 LOGGER.warning(String.format("Failed to read stat %s in %s! It's either unknown or has invalid data.",
-                        entry.getKey(), path));
+                    entry.getKey(), path));
             }
         }
     }
@@ -133,6 +122,11 @@ public String serialize() {
         return result.toString();
     }
 
+    private static Path getStatsDirectory() {
+        Objects.requireNonNull(STATS, "Stats directory unset.");
+        return STATS;
+    }
+
     private static FileAttribute<?>[] getDefaultFileAttributes() {
         if (!System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
             return new FileAttribute[0];

diff --git a/versions/1.0.1-server/src/main/resources/server_stats.mixins.json b/versions/1.0.1-server/src/main/resources/server_stats.mixins.json
@@ -3,13 +3,14 @@
     "minVersion": "0.8",
     "package": "net.lostluma.server_stats.mixin",
     "compatibilityLevel": "JAVA_17",
-    "mixins": [],
+    "mixins": [
+        "server.EntitiesMixin",
+        "server.PlayerEntityMixin",
+        "server.PlayerManagerMixin"
+    ],
     "client": [],
     "server": [
-        "server.EntitiesMixin",
         "server.MinecraftServerMixin",
-        "server.PlayerEntityMixin",
-        "server.PlayerManagerMixin",
         "server.ServerPlayerEntityMixin"
     ],
     "injectors": {

diff --git a/.../1.1.0-client/src/main/java/net/lostluma/server_stats/mixin/common/PlayerEntityMixin.java b/.../1.1.0-client/src/main/java/net/lostluma/server_stats/mixin/common/PlayerEntityMixin.java
@@ -28,10 +28,9 @@ private PlayerEntity getPlayer() {
     @Override
     public void server_stats$incrementStat(Stat stat, int amount) {
         var stats = this.server_stats$getStats();
-        var player = (PlayerEntity)(Object)this;
 
         if (stats != null) {
-            stats.increment(player, stat, amount);
+            stats.increment(this.getPlayer(), stat, amount);
         }
     }
 
@@ -46,7 +45,7 @@ private PlayerEntity getPlayer() {
 
     @Override
     public @Nullable ServerPlayerStats server_stats$getStats() {
-        var player = (PlayerEntity)(Object)this;
+        var player = this.getPlayer();
 
         // Unmapped method returns true when the server is multiplayer
         if (Minecraft.INSTANCE.m_2812472()) {

diff --git a/versions/1.1.0-client/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java b/versions/1.1.0-client/src/main/java/net/lostluma/server_stats/stats/ServerPlayerStats.java
@@ -60,11 +60,7 @@ public int get(Stat stat) {
     }
 
     public void load() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
 
         if (Files.exists(path)) {
             try {
@@ -78,16 +74,13 @@ public void load() {
     }
 
     public void save() {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path base = getStatsDirectory();
+        Path path = base.resolve(this.name + ".json");
 
         try {
-            Files.createDirectories(STATS);
+            Files.createDirectories(base);
 
-            Path temp = Files.createTempFile(STATS, this.name, ".json", DEFAULT_ATTRIBUTES);
+            Path temp = Files.createTempFile(base, this.name, ".json", DEFAULT_ATTRIBUTES);
             Files.writeString(temp, this.serialize(), StandardCharsets.UTF_8);
 
             Files.move(temp, path, StandardCopyOption.ATOMIC_MOVE); // Prevent issues on server crash
@@ -97,11 +90,7 @@ public void save() {
     }
 
     public void deserialize() throws IOException {
-        if (Objects.isNull(STATS)) {
-            throw new RuntimeException("Stats directory unset.");
-        }
-
-        Path path = STATS.resolve(this.name + ".json");
+        Path path = getStatsDirectory().resolve(this.name + ".json");
         JsonElement root = JsonParser.parseString(Files.readString(path, StandardCharsets.UTF_8));
 
         if (!root.isJsonObject()) {
@@ -118,7 +107,7 @@ public void deserialize() throws IOException {
                 this.counters.put(stat, value.getAsInt());
             } else {
                 LOGGER.warning(String.format("Failed to read stat %s in %s! It's either unknown or has invalid data.",
-                        entry.getKey(), path));
+                    entry.getKey(), path));
             }
         }
     }
@@ -133,6 +122,11 @@ public String serialize() {
         return result.toString();
     }
 
+    private static Path getStatsDirectory() {
+        Objects.requireNonNull(STATS, "Stats directory unset.");
+        return STATS;
+    }
+
     private static FileAttribute<?>[] getDefaultFileAttributes() {
         if (!System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
             return new FileAttribute[0];

diff --git a/...ver_stats/mixin/server/EntitiesMixin.java → ...ver_stats/mixin/common/EntitiesMixin.java b/...ver_stats/mixin/server/EntitiesMixin.java → ...ver_stats/mixin/common/EntitiesMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/...stats/mixin/server/PlayerEntityMixin.java → ...stats/mixin/common/PlayerEntityMixin.java b/...stats/mixin/server/PlayerEntityMixin.java → ...stats/mixin/common/PlayerEntityMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import net.lostluma.server_stats.stats.Stats;
 import net.lostluma.server_stats.types.StatsPlayer;
@@ -26,10 +26,9 @@ private PlayerEntity getPlayer() {
     @Override
     public void server_stats$incrementStat(Stat stat, int amount) {
         var stats = this.server_stats$getStats();
-        var player = (PlayerEntity)(Object)this;
 
         if (stats != null) {
-            stats.increment(player, stat, amount);
+            stats.increment(this.getPlayer(), stat, amount);
         }
     }
 
@@ -44,7 +43,7 @@ private PlayerEntity getPlayer() {
 
     @Override
     public @Nullable ServerPlayerStats server_stats$getStats() {
-        var player = (PlayerEntity)(Object)this;
+        var player = this.getPlayer();
 
         if (this.server_stats$serverPlayerStats == null) {
             this.server_stats$serverPlayerStats = new ServerPlayerStats(player);

diff --git a/...tats/mixin/server/PlayerManagerMixin.java → ...tats/mixin/common/PlayerManagerMixin.java b/...tats/mixin/server/PlayerManagerMixin.java → ...tats/mixin/common/PlayerManagerMixin.java
@@ -1,4 +1,4 @@
-package net.lostluma.server_stats.mixin.server;
+package net.lostluma.server_stats.mixin.common;
 
 import net.lostluma.server_stats.Constants;
 import net.minecraft.network.Connection;