wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove IConfigEntry.setWithoutSaving()

Browse Source 
It wasn't implemented and was causing confusion since the listeners weren't being fired
This commit is contained in:
James Seibel
2023-06-04 21:07:25 -05:00
parent ed935f6a0f
commit d992bd05f4
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java
-3
View File
@@ -23,9 +23,6 @@ public interface IConfigEntry<T>
T get();
T getTrueValue();
/** Sets the value without saving */
void setWithoutSaving(T newValue);
/** Gets the min value */
T getMin();
/** Sets the min value */
core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java
+5 -5
View File
@@ -124,16 +124,16 @@ public class ConfigFileHandling {
if (workConfig.contains(entry.getNameWCategory())) {
try {
if (entry.getType().isEnum()) {
entry.setWithoutSaving((T) ( workConfig.getEnum(entry.getNameWCategory(), (Class<? extends Enum>) entry.getType()) ));
entry.set((T) ( workConfig.getEnum(entry.getNameWCategory(), (Class<? extends Enum>) entry.getType()) ));
} else if (ConfigTypeConverters.convertObjects.containsKey(entry.getType())) {
entry.setWithoutSaving((T) ConfigTypeConverters.convertFromString(entry.getType(), workConfig.get(entry.getNameWCategory())));
entry.set((T) ConfigTypeConverters.convertFromString(entry.getType(), workConfig.get(entry.getNameWCategory())));
} else {
if (entry.getType() == workConfig.get(entry.getNameWCategory()).getClass()) { // If the types are the same
entry.setWithoutSaving((T) workConfig.get(entry.getNameWCategory()));
entry.set((T) workConfig.get(entry.getNameWCategory()));
if (entry.isValid() == 0) return;
else if (entry.isValid() == -1) entry.setWithoutSaving(entry.getMin());
else if (entry.isValid() == 1) entry.setWithoutSaving(entry.getMax());
else if (entry.isValid() == -1) entry.set(entry.getMin());
else if (entry.isValid() == 1) entry.set(entry.getMax());
} else {
LOGGER.warn("Entry ["+ entry.getNameWCategory() +"] is invalid. Expected " + entry.getType() + " but got " + workConfig.get(entry.getNameWCategory()).getClass() + ". Using default value.");
saveEntry(entry, workConfig);
core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java
+1 -7
View File
@@ -89,13 +89,7 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
public T getTrueValue() {
return super.get();
}
/** Sets the value without saving */
@Override
public void setWithoutSaving(T newValue) {
super.set(newValue);
}
/** Gets the min value */
@Override
public T getMin() {