misc fixes

Author: Omena0

build.gradle

@@ -45,6 +45,12 @@ tasks.withType(JavaCompile).configureEach {
     options.release = 21
 }
 
+tasks.named('processResources') {
+    filesMatching('plugin.yml') {
+        expand(version: project.version)
+    }
+}
+
 tasks.named('jar') {
     archiveFileName = "${project.name}-${project.version}.jar"
 }

changelog.md

@@ -54,6 +54,7 @@ Feature update
 #### Misc
 
 - Added dev versioning for non-release commits
+- Added wiki site
 
 ## 1D
 

docs/site/config.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Config — PyJavaBridge</title>
   <meta property="og:title" content="Config — PyJavaBridge">
-  <meta property="og:description" content="YAML configuration files">
+  <meta property="og:description" content="Configuration files (TOML, JSON, properties)">
   <meta property="og:type" content="website">
   <meta property="og:site_name" content="PyJavaBridge Docs">
   <meta name="theme-color" content="#6366f1">
@@ -153,25 +153,33 @@
   <!-- Main -->
   <main class="main">
     <div class="content">
-      <p class="subtitle">YAML configuration files</p>
+      <p class="subtitle">Configuration files (TOML, JSON, properties)</p>
       <h1 id="config">Config</h1>
-<p><code>Config</code> provides a simple interface for reading and writing YAML configuration files. Config files are stored in the plugin's data folder and persist across server restarts.</p>
+<p><code>Config</code> provides a simple interface for reading and writing configuration files. Config files are stored in the plugin's data folder and persist across server restarts.</p>
+<p>Supported formats: <strong>TOML</strong> (default), <strong>JSON</strong>, and <strong>properties</strong>.</p>
 <hr />
 <h2 id="constructor">Constructor</h2>
-<pre><code class="language-python">Config(name=<span class="kw">None</span>, defaults=<span class="kw">None</span>)
+<pre><code class="language-python">Config(name=<span class="kw">None</span>, defaults=<span class="kw">None</span>, format=<span class="st">&quot;toml&quot;</span>)
 </code></pre>
 <p>Load or create a configuration file.</p>
 <ul>
 <li><strong>Parameters:</strong></li>
-<li><code>name</code> (<code>str | None</code>) — File name (without <code>.yml</code> extension). If <code>None</code>, uses the default <code>config.yml</code>.</li>
+<li><code>name</code> (<code>str | None</code>) — File name (without extension). If <code>None</code>, uses the script name.</li>
 <li><code>defaults</code> (<code>dict[str, Any] | None</code>) — Default values to merge into the config if they don't already exist.</li>
+<li><code>format</code> (<code>str</code>) — File format: <code>"toml"</code> (default), <code>"json"</code>, or <code>"properties"</code>.</li>
 </ul>
-<pre><code class="language-python"><span class="cm"># Default config.yml</span>
+<pre><code class="language-python"><span class="cm"># Default config.toml</span>
 config = Config()
 
 <span class="cm"># Named config</span>
 bans = Config(<span class="st">&quot;bans&quot;</span>)
 
+<span class="cm"># JSON format</span>
+data = Config(<span class="st">&quot;data&quot;</span>, format=<span class="st">&quot;json&quot;</span>)
+
+<span class="cm"># Properties format</span>
+props = Config(<span class="st">&quot;server&quot;</span>, format=<span class="st">&quot;properties&quot;</span>)
+
 <span class="cm"># With defaults</span>
 settings = Config(<span class="st">&quot;settings&quot;</span>, defaults={
     <span class="st">&quot;spawn_protection_radius&quot;</span>: <span class="nb">16</span>,
@@ -190,7 +198,7 @@ <h3 id="path">path</h3>
 <ul>
 <li><strong>Type:</strong> <code>str</code></li>
 </ul>
-<p>Absolute file path to the YAML file.</p>
+<p>Absolute file path to the config file.</p>
 <hr />
 <h2 id="methods">Methods</h2>
 <h3 id="get">get</h3>

docs/site/index.html

@@ -350,7 +350,7 @@ <h3 id="helpers">Helpers</h3>
 <tbody>
 <tr>
 <td><a href="config.html">Config</a></td>
-<td>YAML configuration files</td>
+<td>Configuration files (TOML, JSON, properties)</td>
 </tr>
 <tr>
 <td><a href="cooldown.html">Cooldown</a></td>

docs/src/config.md

@@ -1,33 +1,42 @@
 ---
 title: Config
-subtitle: YAML configuration files
+subtitle: Configuration files (TOML, JSON, properties)
 ---
 
 # Config
 
-`Config` provides a simple interface for reading and writing YAML configuration files. Config files are stored in the plugin's data folder and persist across server restarts.
+`Config` provides a simple interface for reading and writing configuration files. Config files are stored in the plugin's data folder and persist across server restarts.
+
+Supported formats: **TOML** (default), **JSON**, and **properties**.
 
 ---
 
 ## Constructor
 
 ```python
-Config(name=None, defaults=None)
+Config(name=None, defaults=None, format="toml")
 ```
 
 Load or create a configuration file.
 
 - **Parameters:**
-  - `name` (`str | None`) — File name (without `.yml` extension). If `None`, uses the default `config.yml`.
+  - `name` (`str | None`) — File name (without extension). If `None`, uses the script name.
   - `defaults` (`dict[str, Any] | None`) — Default values to merge into the config if they don't already exist.
+  - `format` (`str`) — File format: `"toml"` (default), `"json"`, or `"properties"`.
 
 ```python
-# Default config.yml
+# Default config.toml
 config = Config()
 
 # Named config
 bans = Config("bans")
 
+# JSON format
+data = Config("data", format="json")
+
+# Properties format
+props = Config("server", format="properties")
+
 # With defaults
 settings = Config("settings", defaults={
     "spawn_protection_radius": 16,
@@ -50,7 +59,7 @@ The entire config as a dictionary.
 
 - **Type:** `str`
 
-Absolute file path to the YAML file.
+Absolute file path to the config file.
 
 ---
 

docs/src/index.md

@@ -93,7 +93,7 @@ Drop your `.py` file into the server's `scripts/` folder and reload. The bridge
 
 | Page | Description |
 |------|-------------|
-| [Config](config.md) | YAML configuration files |
+| [Config](config.md) | Configuration files (TOML, JSON, properties) |
 | [Cooldown](cooldown.md) | Per-player cooldowns |
 | [Hologram](hologram.md) | Floating text entities |
 | [Menu](menu.md) | Chest GUI builder |

releases/pyjavabridge-dev.jar

@@ -77,15 +77,23 @@ public class BridgeInstance {
 
     private static final Object UNHANDLED = new Object();
 
-    @SuppressWarnings("unused")
-    private final AtomicInteger requestId = new AtomicInteger(1);
     private final Map<Integer, PendingEvent> pendingEvents = new ConcurrentHashMap<>();
     private final Object writeLock = new Object();
 
     private final BridgeSerializer serializer;
     private final EventDispatcher eventDispatcher;
     private final EntitySpawner entitySpawner;
 
+    private final ChatFacade chatFacade = new ChatFacade();
+    private final RaycastFacade raycastFacade = new RaycastFacade();
+    private final ReflectFacade reflectFacade = new ReflectFacade();
+    private final RegionFacade regionFacade = new RegionFacade();
+    private final ParticleFacade particleFacade = new ParticleFacade();
+    private PermissionsFacade permissionsFacade;
+    private MetricsFacade metricsFacade;
+    private RefFacade refFacade;
+    private CommandsFacade commandsFacade;
+
     private ServerSocket serverSocket;
     private Socket socket;
     private DataInputStream reader;
@@ -105,6 +113,10 @@ public class BridgeInstance {
         this.serializer = new BridgeSerializer(registry, gson, plugin);
         this.entitySpawner = new EntitySpawner(plugin.getLogger(), name);
         this.eventDispatcher = new EventDispatcher(plugin, serializer, name, pendingEvents, this::send, gson);
+        this.permissionsFacade = new PermissionsFacade(plugin, permissionAttachments);
+        this.metricsFacade = new MetricsFacade(plugin);
+        this.refFacade = new RefFacade(this);
+        this.commandsFacade = new CommandsFacade(plugin, this);
     }
 
     public boolean isRunning() {
@@ -145,10 +157,15 @@ void start() {
         bridgeThread.start();
     }
 
+    private volatile boolean shutdownStarted = false;
+
     void shutdown() {
+        synchronized (writeLock) {
+            if (shutdownStarted) return;
+            shutdownStarted = true;
+        }
         if (Bukkit.isPrimaryThread()) {
             new Thread(this::shutdownInternal, "PyJavaBridge-Shutdown-" + name).start();
-
         } else {
             shutdownInternal();
         }
@@ -216,8 +233,8 @@ private void bridgeLoop() {
                 } catch (IOException eof) {
                     break;
                 }
-                if (length <= 0 || length > 1_073_741_824) {
-                    logError("Invalid message length: " + length, null);
+                if (length <= 0 || length > 16_777_216) {
+                    plugin.getLogger().severe("[" + name + "] Invalid message length: " + length);
                     break;
                 }
                 byte[] payload = new byte[length];
@@ -950,15 +967,15 @@ private Object invokeReflective(Object target, String method, List<Object> args)
     private Object resolveTarget(String targetName, JsonObject argsObj) throws Exception {
         return switch (targetName) {
             case "server" -> Bukkit.getServer();
-            case "chat" -> new ChatFacade();
-            case "raycast" -> new RaycastFacade();
-            case "permissions" -> new PermissionsFacade(plugin, permissionAttachments);
-            case "metrics" -> new MetricsFacade(plugin);
-            case "ref" -> new RefFacade(this);
-            case "reflect" -> new ReflectFacade();
-            case "commands" -> new CommandsFacade(plugin, this);
-            case "region" -> new RegionFacade();
-            case "particle" -> new ParticleFacade();
+            case "chat" -> chatFacade;
+            case "raycast" -> raycastFacade;
+            case "permissions" -> permissionsFacade;
+            case "metrics" -> metricsFacade;
+            case "ref" -> refFacade;
+            case "reflect" -> reflectFacade;
+            case "commands" -> commandsFacade;
+            case "region" -> regionFacade;
+            case "particle" -> particleFacade;
             default -> throw new IllegalArgumentException("Unknown target: " + targetName);
         };
     }
@@ -1211,8 +1228,9 @@ private void sendError(int id, String error, Throwable ex, String code) {
     }
 
     void logError(String message, Throwable ex) {
-        plugin.getLogger().severe("[" + name + "] " + message + ": " + ex.getMessage());
-        plugin.broadcastErrorToDebugPlayers("[" + name + "] " + message + ": " + ex.getMessage());
+        String detail = ex != null ? ex.getMessage() : "unknown";
+        plugin.getLogger().severe("[" + name + "] " + message + ": " + detail);
+        plugin.broadcastErrorToDebugPlayers("[" + name + "] " + message + ": " + detail);
     }
 
     private void startPythonProcess(int port) {

src/main/java/com/pyjavabridge/BridgeInstance.java

@@ -1,34 +1,49 @@
 package com.pyjavabridge.util;
 
 import java.util.Collection;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class ObjectRegistry {
     private final Map<Integer, Object> objects = new ConcurrentHashMap<>();
+    private final IdentityHashMap<Object, Integer> reverseMap = new IdentityHashMap<>();
+    private final Object reverseLock = new Object();
     private final AtomicInteger counter = new AtomicInteger(1);
 
     public int register(Object obj) {
         if (obj == null) {
             return 0;
         }
-        int id = counter.getAndIncrement();
-        objects.put(id, obj);
-        return id;
+        synchronized (reverseLock) {
+            Integer existing = reverseMap.get(obj);
+            if (existing != null && objects.containsKey(existing)) {
+                return existing;
+            }
+            int id = counter.getAndIncrement();
+            objects.put(id, obj);
+            reverseMap.put(obj, id);
+            return id;
+        }
     }
 
     public Object get(int id) {
         return objects.get(id);
     }
 
     public void release(int id) {
-        objects.remove(id);
+        Object removed = objects.remove(id);
+        if (removed != null) {
+            synchronized (reverseLock) {
+                reverseMap.remove(removed);
+            }
+        }
     }
 
     public void releaseAll(Collection<Integer> ids) {
         for (int id : ids) {
-            objects.remove(id);
+            release(id);
         }
     }
 }

src/main/java/com/pyjavabridge/util/ObjectRegistry.java

@@ -1,6 +1,6 @@
 name: PyJavaBridge
 main: com.pyjavabridge.PyJavaBridgePlugin
-version: 0.1.0
+version: '${version}'
 api: '1.21'
 api-version: '1.21'
 author: Omena0