Fix crashing when updating; comment out unused settings

NiChrosia · Aug 19, 2021 · 9ef43e7 · 9ef43e7
1 parent d4798e2
commit 9ef43e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/main/kotlin/nichrosia/nobreak/content/NBSettings.kt b/src/main/kotlin/nichrosia/nobreak/content/NBSettings.kt
@@ -11,7 +11,6 @@ import nichrosia.nobreak.util.DataStreams.str
 import org.apache.logging.log4j.LogManager
 import java.io.DataInputStream
 import java.io.DataOutputStream
-import java.io.EOFException
 import java.io.File
 import kotlin.io.path.pathString
 import kotlin.properties.Delegates
@@ -109,7 +108,7 @@ object NBSettings {
 
             customBlacklist.addItems(rawCustomBlacklist.split("|").map { Registry.ITEM.get(Identifier(it)) })
             blacklists.addAll(PresetScreenDescription.BlacklistPreset.types.filter { rawBlacklists.split("|").contains(it.translationKey) })
-        } catch(e: EOFException) {
+        } catch(e: Exception) {
             log.warn("Invalid config, setting values to default.")
         }
     }

diff --git a/src/main/kotlin/nichrosia/nobreak/ext/NBClothConfigSettings.kt b/src/main/kotlin/nichrosia/nobreak/ext/NBClothConfigSettings.kt
@@ -35,16 +35,16 @@ object NBClothConfigSettings {
             .setSaveConsumer { NBSettings.notifyUser = it }
             .build())
 
-        general.addEntry(entryBuilder.startBooleanToggle(
-            TranslatableText("setting.nobreak.allow_attacking_own_pets"),
-            NBSettings.allowAttackingOwnPets)
-            .setSaveConsumer { NBSettings.allowAttackingOwnPets = it }
-            .build())
-
-        general.addEntry(entryBuilder.startBooleanToggle(
-            TranslatableText("setting.nobreak.allow_attacking_neutral_mobs"),
-            NBSettings.allowAttackingNeutralMobs)
-            .setSaveConsumer { NBSettings.allowAttackingNeutralMobs = it }
-            .build())
+//        general.addEntry(entryBuilder.startBooleanToggle(
+//            TranslatableText("setting.nobreak.allow_attacking_own_pets"),
+//            NBSettings.allowAttackingOwnPets)
+//            .setSaveConsumer { NBSettings.allowAttackingOwnPets = it }
+//            .build())
+//
+//        general.addEntry(entryBuilder.startBooleanToggle(
+//            TranslatableText("setting.nobreak.allow_attacking_neutral_mobs"),
+//            NBSettings.allowAttackingNeutralMobs)
+//            .setSaveConsumer { NBSettings.allowAttackingNeutralMobs = it }
+//            .build())
     }
 }