Update INIConfig.java

Adjust the ini configuration format.
FRC-3539 · Feb 4, 2023 · 4cba88a · 4cba88a
1 parent 40866dd
commit 4cba88a
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/src/main/java/org/bytingbulldogs/bulldoglibrary/INIConfiguration/INIConfig.java b/src/main/java/org/bytingbulldogs/bulldoglibrary/INIConfiguration/INIConfig.java
@@ -30,24 +30,23 @@ public INIConfig(String filename) {
 	public void autoPopulate(Object o) {
 		if (ini != null) {
 			Field[] fields = o.getClass().getFields();
+			String className = o.getClass().getSimpleName();
+
 			for (Field field : fields) {
-				String[] split = field.getName().split("_");
-				int length = split.length;
-				if (length >= 2) {
-					try {
-
-						if(getOrDefault(split[split.length - 2], split[split.length - 1], null, field.getType())!=null)
-						{
-							field.set(o,
-								getOrDefault(split[split.length - 2], split[split.length - 1], null, field.getType()));
-						}
-
-					} catch (IllegalArgumentException | IllegalAccessException e) {
-						DriverStation.reportWarning("Could not load item " + field.getName() + " from file " + filename,
-								e.getStackTrace());
+				String fieldName = field.getName();
+
+				try {
+					if (getOrDefault(className, fieldName, null, field.getType()) != null) {
+						field.setAccessible(true);
+
+						field.set(o, getOrDefault(className, fieldName, null, field.getType()));
+
 					}
+
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					DriverStation.reportWarning("Could not load item " + field.getName() + " from file " + filename,
+							e.getStackTrace());
 				}
-				field.getType();
 			}
 		}
 	}