From 38782204d65de20b765051ef3756d9f51e2204eb Mon Sep 17 00:00:00 2001
From: Kevin Cooney <kcooney@gmail.com>
Date: Fri, 26 Dec 2025 08:25:17 -0800
Subject: [PATCH]  PersistedConfiguration now registers classes under the temp
 NTInstance

---
 .../lib2813/preferences/PersistedConfiguration.java         | 2 +-
 .../lib2813/preferences/PersistedConfigurationTest.java     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/com/team2813/lib2813/preferences/PersistedConfiguration.java b/lib/src/main/java/com/team2813/lib2813/preferences/PersistedConfiguration.java
index 2ead7d7e..636bc1c3 100644
--- a/lib/src/main/java/com/team2813/lib2813/preferences/PersistedConfiguration.java
+++ b/lib/src/main/java/com/team2813/lib2813/preferences/PersistedConfiguration.java
@@ -191,7 +191,7 @@ private static <T extends Record> T fromPreferences(
     validatePreferenceName(preferenceName);
 
     // TODO: Use Preferences.getNetworkTable() once there is a release of WPILib that includes it.
-    NetworkTableInstance ntInstance = NetworkTableInstance.getDefault();
+    NetworkTableInstance ntInstance = Preferences.getNetworkTable().getInstance();
     verifyNotRegisteredToAnotherClass(ntInstance, preferenceName, recordClass);
 
     try {
diff --git a/lib/src/test/java/com/team2813/lib2813/preferences/PersistedConfigurationTest.java b/lib/src/test/java/com/team2813/lib2813/preferences/PersistedConfigurationTest.java
index 231557c7..f54c32a8 100644
--- a/lib/src/test/java/com/team2813/lib2813/preferences/PersistedConfigurationTest.java
+++ b/lib/src/test/java/com/team2813/lib2813/preferences/PersistedConfigurationTest.java
@@ -23,7 +23,6 @@
 
 import edu.wpi.first.networktables.NetworkTable;
 import edu.wpi.first.networktables.NetworkTableEntry;
-import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.networktables.NetworkTableType;
 import edu.wpi.first.networktables.Topic;
 import edu.wpi.first.wpilibj.DataLogManager;
@@ -173,7 +172,10 @@ public void preferenceNameMapsToOnlyOneRecordType() {
 
       // Assert: topic added under "/PersistedConfiguration", and is not persistent
       NetworkTable table =
-          NetworkTableInstance.getDefault().getTable(REGISTERED_CLASSES_NETWORK_TABLE_KEY);
+          isolatedPreferences
+              .getPreferencesTable()
+              .getInstance()
+              .getTable(REGISTERED_CLASSES_NETWORK_TABLE_KEY);
       NetworkTableEntry entry = table.getEntry(preferenceName);
       assertThat(entry.exists()).isTrue();
       assertThat(entry.isPersistent()).isFalse();