Fixed some typos in the GUI, added logging for false positive editing, fixed auto-similarity based blocking, and fixed logging related to such.

obf/config-new.json

@@ -0,0 +1,291 @@
+{
+  "Settings": {
+    "Input": "../build/libs/CleanSentinel-0.2.9.jar",
+    "Output": "out/Sentinel-0.2.9.jar",
+    "Libraries": [
+      "../deps/adventure-api-4.17.0.jar",
+      "../deps/adventure-key-4.17.0.jar",
+      "../deps/adventure-text-logger-slf4j-4.17.0.jar",
+      "../deps/adventure-text-minimessage-4.17.0.jar",
+      "../deps/adventure-text-serializer-gson-4.17.0.jar",
+      "../deps/adventure-text-serializer-json-4.17.0.jar",
+      "../deps/adventure-text-serializer-legacy-4.17.0.jar",
+      "../deps/adventure-text-serializer-plain-4.17.0.jar",
+      "../deps/annotations-24.1.0.jar",
+      "../deps/auto-service-annotations-1.1.1.jar",
+      "../deps/brigadier-1.2.9.jar",
+      "../deps/bungeecord-chat-1.20-R0.2-deprecated+build.18.jar",
+      "../deps/error_prone_annotations-2.18.0.jar",
+      "../deps/examination-api-1.3.0.jar",
+      "../deps/examination-string-1.3.0.jar",
+      "../deps/failureaccess-1.0.1.jar",
+      "../deps/fastutil-8.5.6.jar",
+      "../deps/gson-2.10.1.jar",
+      "../deps/guava-32.1.2-jre.jar",
+      "../deps/j2objc-annotations-2.8.jar",
+      "../deps/javax.inject-1.jar",
+      "../deps/joml-1.10.5.jar",
+      "../deps/json-simple-1.1.1.jar",
+      "../deps/jsr305-3.0.2.jar",
+      "../deps/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
+      "../deps/option-1.0.0.jar",
+      "../deps/paper-api-1.20.6-R0.1-SNAPSHOT.jar",
+      "../deps/ProtocolLib-5.1.0.jar",
+      "../deps/slf4j-api-2.0.9.jar",
+      "../deps/snakeyaml-2.2.jar"
+    ],
+    "Exclusions": [
+      "com/google/gson/",
+      "io/github/itzispyder/",
+      "me/trouper/sentinel/data/"
+    ],
+    "MixinPackage": [
+      "net/spartanb312/client/mixins/"
+    ],
+    "DumpMappings": true,
+    "UseComputeMax": true,
+    "CustomDictionary": [],
+    "DictionaryStartIndex": 0,
+    "CorruptOutput": false,
+    "FileRemovePrefix": [],
+    "FileRemoveSuffix": []
+  },
+  "SourceDebugRemove": {
+    "Enabled": true,
+    "SourceDebug": true,
+    "LineDebug": true,
+    "RenameSourceDebug": true,
+    "SourceNames": [
+      "AhAhAhYouDidntSayTheMagicWord.java",
+      "SentinelIsClosedSource.java",
+      "YourHonor-FreeBirdWasPlaying.kt",
+      "Officer-IDropKickedThatChildInSelfDefense.kt",
+      "NotTheBees.java",
+      "YouveBeenTrolled.kt",
+      "SlideToTheLeft.java",
+      "TwoHopsThisTime.kt"
+    ],
+    "Exclusion": []
+  },
+  "Shrinking": {
+    "Enabled": true,
+    "RemoveInnerClass": true,
+    "RemoveUnusedLabel": true,
+    "RemoveNOP": false,
+    "Exclusion": []
+  },
+  "KotlinOptimizer": {
+    "Enabled": false,
+    "Annotations": true,
+    "Intrinsics": true,
+    "IntrinsicsRemoval": [
+      "checkExpressionValueIsNotNull",
+      "checkNotNullExpressionValue",
+      "checkReturnedValueIsNotNull",
+      "checkFieldIsNotNull",
+      "checkParameterIsNotNull",
+      "checkNotNullParameter"
+    ],
+    "ReplaceLdc": true,
+    "IntrinsicsExclusion": [],
+    "MetadataExclusion": []
+  },
+  "EnumOptimize": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "DeadCodeRemove": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "ClonedClass": {
+    "Enabled": true,
+    "Count": 2048,
+    "Suffix": "-on-top",
+    "RemoveAnnotations": true,
+    "Exclusion": []
+  },
+  "TrashClass": {
+    "Enabled": true,
+    "Package": "sentinel/",
+    "Prefix": "NUKE_",
+    "Count": 2048
+  },
+  "ImplicitJump": {
+    "Enabled": false,
+    "ExecuteBeforeEncrypt": false,
+    "ReplaceGoto": true,
+    "ReplaceIf": true,
+    "UseLocalVar": true,
+    "JunkCode": true,
+    "ExpandedJunkCode": true,
+    "Exclusion": []
+  },
+  "StringEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "Exclusion": []
+  },
+  "NumberEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "MaxInsnSize": 16384,
+    "Exclusion": []
+  },
+  "FloatingPointEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "MaxInsnSize": 16384,
+    "Exclusion": []
+  },
+  "ArithmeticEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "MaxInsnSize": 16384,
+    "Exclusion": []
+  },
+  "RedirectStringEquals": {
+    "Enabled": true,
+    "IgnoreCase": true,
+    "Exclusion": []
+  },
+  "FieldScramble": {
+    "Enabled": false,
+    "Intensity": 1,
+    "RandomName": false,
+    "RedirectGetStatic": true,
+    "RedirectSetStatic": true,
+    "RedirectGetValue": true,
+    "RedirectSetField": true,
+    "GenerateOuterClass": false,
+    "ExcludedClasses": [],
+    "ExcludedFieldName": [],
+    "NativeDownCalls": true,
+    "NativeUpCalls": false
+  },
+  "MethodScramble": {
+    "Enabled": false,
+    "GenerateOuterClass": true,
+    "RandomCall": true,
+    "ExcludedClasses": [],
+    "ExcludedMethodName": [],
+    "NativeDownCall": false,
+    "NativeUpCall": false
+  },
+  "NativeCandidate": {
+    "Enabled": false,
+    "NativeAnnotation": "Lnet/spartanb312/example/Native;",
+    "UpCallLimit": 0,
+    "Exclusion": []
+  },
+  "SyntheticBridge": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "LocalVariableRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "ThisReference": false,
+    "Exclusion": []
+  },
+  "MethodRename": {
+    "Enabled": true,
+    "Enums": true,
+    "Interfaces": false,
+    "Dictionary": "Alphabet",
+    "HeavyOverloads": false,
+    "RandomKeywordPrefix": false,
+    "Prefix": "ANTI_",
+    "Exclusion": [],
+    "ExcludedName": []
+  },
+  "FieldRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "RandomKeywordPrefix": false,
+    "Prefix": "INEL_",
+    "Exclusion": [],
+    "ExcludedName": [
+      "INSTANCE",
+      "Companion"
+    ]
+  },
+  "ClassRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "Parent": "sentinel/",
+    "Prefix": "SENT_",
+    "Shuffled": true,
+    "CorruptedName": false,
+    "CorruptedNameExclusion": [],
+    "Exclusion": []
+  },
+  "MixinFieldRename": {
+    "Enabled": false,
+    "Dictionary": "Alphabet",
+    "Prefix": "",
+    "Exclusion": [],
+    "ExcludedName": [
+      "INSTANCE",
+      "Companion"
+    ]
+  },
+  "MixinClassRename": {
+    "Enabled": false,
+    "MixinDictionary": "Alphabet",
+    "TargetMixinPackage": "net/spartanb312/obf/mixins/",
+    "MixinFile": "mixins.example.json",
+    "RefmapFile": "mixins.example.refmap.json",
+    "Exclusion": []
+  },
+  "InvokeDynamic": {
+    "Enabled": false,
+    "ReplacePercentage": 10,
+    "MassiveRandomBlank": true,
+    "Exclusion": []
+  },
+  "ShuffleMembers": {
+    "Enabled": true,
+    "Methods": true,
+    "Fields": true,
+    "Annotations": true,
+    "Exceptions": true,
+    "Exclusion": []
+  },
+  "Watermark": {
+    "Enabled": true,
+    "Names": [
+      "Copyright_SentinelAntiNuke2024",
+      "obvWolf",
+      "thetrouper"
+    ],
+    "Messages": [
+      "Ah_Ah_Ah_You_Didnt_Say_The_Magic_Word",
+      "%%__USERNAME__%%",
+      "%%__USER__%%"
+    ],
+    "FieldMark": true,
+    "MethodMark": true,
+    "AnnotationMark": false,
+    "Annotations": [
+      "ProtectedByGrunt",
+      "JvavMetadata"
+    ],
+    "Versions": [
+      "1993"
+    ],
+    "InterfaceMark": false,
+    "FatherOfJava": "linus/torvalds/thegoat/",
+    "Exclusion": []
+  },
+  "PostProcess": {
+    "Enabled": true,
+    "Manifest": true,
+    "Plugin YML": true,
+    "Bungee YML": true,
+    "Fabric JSON": true,
+    "ManifestPrefix": [
+      "Main-Class:"
+    ]
+  }
+}

obf/config-old.json

@@ -0,0 +1,284 @@
+{
+  "Settings": {
+    "Input": "../build/libs/CleanSentinel-0.2.8.jar",
+    "Output": "../build/libs/Sentinel-0.2.8-beta.jar",
+    "Libraries": [
+      "../deps/adventure-api-4.17.0.jar",
+      "../deps/adventure-key-4.17.0.jar",
+      "../deps/adventure-text-logger-slf4j-4.17.0.jar",
+      "../deps/adventure-text-minimessage-4.17.0.jar",
+      "../deps/adventure-text-serializer-gson-4.17.0.jar",
+      "../deps/adventure-text-serializer-json-4.17.0.jar",
+      "../deps/adventure-text-serializer-legacy-4.17.0.jar",
+      "../deps/adventure-text-serializer-plain-4.17.0.jar",
+      "../deps/annotations-24.1.0.jar",
+      "../deps/auto-service-annotations-1.1.1.jar",
+      "../deps/brigadier-1.2.9.jar",
+      "../deps/bungeecord-chat-1.20-R0.2-deprecated+build.18.jar",
+      "../deps/error_prone_annotations-2.18.0.jar",
+      "../deps/examination-api-1.3.0.jar",
+      "../deps/examination-string-1.3.0.jar",
+      "../deps/failureaccess-1.0.1.jar",
+      "../deps/fastutil-8.5.6.jar",
+      "../deps/gson-2.10.1.jar",
+      "../deps/guava-32.1.2-jre.jar",
+      "../deps/j2objc-annotations-2.8.jar",
+      "../deps/javax.inject-1.jar",
+      "../deps/joml-1.10.5.jar",
+      "../deps/json-simple-1.1.1.jar",
+      "../deps/jsr305-3.0.2.jar",
+      "../deps/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
+      "../deps/option-1.0.0.jar",
+      "../deps/paper-api-1.20.6-R0.1-SNAPSHOT.jar",
+      "../deps/ProtocolLib-5.1.0.jar",
+      "../deps/slf4j-api-2.0.9.jar",
+      "../deps/snakeyaml-2.2.jar"
+    ],
+    "Exclusions": [
+      "com/google/gson/",
+      "io/github/itzispyder/",
+      "me/trouper/sentinel/data/"
+    ],
+    "MixinPackage": [
+      "net/spartanb312/client/mixins/"
+    ],
+    "DumpMappings": true,
+    "UseComputeMax": true,
+    "CustomDictionary": [],
+    "DictionaryStartIndex": 0,
+    "CorruptOutput": false,
+    "FileRemovePrefix": [],
+    "FileRemoveSuffix": []
+  },
+  "SourceDebugRemove": {
+    "Enabled": true,
+    "SourceDebug": true,
+    "LineDebug": true,
+    "RenameSourceDebug": true,
+    "SourceNames": [
+      "AhAhAhYouDidntSayTheMajicWord.java",
+      "SentinelIsClosedSource.java"
+    ],
+    "Exclusion": []
+  },
+  "Shrinking": {
+    "Enabled": true,
+    "RemoveInnerClass": true,
+    "RemoveUnusedLabel": true,
+    "RemoveNOP": false,
+    "Exclusion": []
+  },
+  "KotlinOptimizer": {
+    "Enabled": false,
+    "Annotations": true,
+    "Intrinsics": true,
+    "IntrinsicsRemoval": [
+      "checkExpressionValueIsNotNull",
+      "checkNotNullExpressionValue",
+      "checkReturnedValueIsNotNull",
+      "checkFieldIsNotNull",
+      "checkParameterIsNotNull",
+      "checkNotNullParameter"
+    ],
+    "ReplaceLdc": true,
+    "IntrinsicsExclusion": [],
+    "MetadataExclusion": []
+  },
+  "EnumOptimize": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "DeadCodeRemove": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "ClonedClass": {
+    "Enabled": true,
+    "Count": 256,
+    "Suffix": "-on-top",
+    "RemoveAnnotations": true,
+    "Exclusion": []
+  },
+  "TrashClass": {
+    "Enabled": true,
+    "Package": "sentinel/",
+    "Prefix": "NUKE_",
+    "Count": 1048
+  },
+  "ImplicitJump": {
+    "Enabled": false,
+    "ExecuteBeforeEncrypt": false,
+    "ReplaceGoto": true,
+    "ReplaceIf": true,
+    "UseLocalVar": true,
+    "JunkCode": true,
+    "ExpandedJunkCode": true,
+    "Exclusion": []
+  },
+  "StringEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "Exclusion": []
+  },
+  "NumberEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "Exclusion": []
+  },
+  "FloatingPointEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "Exclusion": []
+  },
+  "ArithmeticEncrypt": {
+    "Enabled": true,
+    "Intensity": 1,
+    "MaxInsnSize": 16384,
+    "Exclusion": []
+  },
+  "RedirectStringEquals": {
+    "Enabled": true,
+    "IgnoreCase": true,
+    "Exclusion": []
+  },
+  "FieldScramble": {
+    "Enabled": false,
+    "Intensity": 1,
+    "RandomName": false,
+    "RedirectGetStatic": true,
+    "RedirectSetStatic": true,
+    "RedirectGetValue": true,
+    "RedirectSetField": true,
+    "GenerateOuterClass": false,
+    "ExcludedClasses": [],
+    "ExcludedFieldName": [],
+    "NativeDownCalls": true,
+    "NativeUpCalls": false
+  },
+  "MethodScramble": {
+    "Enabled": false,
+    "GenerateOuterClass": true,
+    "RandomCall": true,
+    "ExcludedClasses": [],
+    "ExcludedMethodName": [],
+    "NativeDownCall": false,
+    "NativeUpCall": false
+  },
+  "NativeCandidate": {
+    "Enabled": false,
+    "NativeAnnotation": "Lnet/spartanb312/example/Native;",
+    "UpCallLimit": 0,
+    "Exclusion": []
+  },
+  "SyntheticBridge": {
+    "Enabled": false,
+    "Exclusion": []
+  },
+  "LocalVariableRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "ThisReference": false,
+    "Exclusion": []
+  },
+  "MethodRename": {
+    "Enabled": true,
+    "Enums": true,
+    "Interfaces": false,
+    "Dictionary": "Alphabet",
+    "HeavyOverloads": false,
+    "RandomKeywordPrefix": false,
+    "Prefix": "ANTI_",
+    "Exclusion": [],
+    "ExcludedName": []
+  },
+  "FieldRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "RandomKeywordPrefix": false,
+    "Prefix": "INEL_",
+    "Exclusion": [],
+    "ExcludedName": [
+      "INSTANCE",
+      "Companion"
+    ]
+  },
+  "ClassRename": {
+    "Enabled": true,
+    "Dictionary": "Alphabet",
+    "Parent": "sentinel/",
+    "Prefix": "SENT_",
+    "Shuffled": true,
+    "CorruptedName": false,
+    "CorruptedNameExclusions": [],
+    "Exclusion": []
+  },
+  "MixinFieldRename": {
+    "Enabled": false,
+    "Dictionary": "Alphabet",
+    "Prefix": "",
+    "Exclusion": [],
+    "ExcludedName": [
+      "INSTANCE",
+      "Companion"
+    ]
+  },
+  "MixinClassRename": {
+    "Enabled": false,
+    "MixinDictionary": "Alphabet",
+    "TargetMixinPackage": "net/spartanb312/obf/mixins/",
+    "MixinFile": "mixins.example.json",
+    "RefmapFile": "mixins.example.refmap.json",
+    "Exclusion": []
+  },
+  "InvokeDynamic": {
+    "Enabled": false,
+    "ReplacePercentage": 10,
+    "MassiveRandomBlank": true,
+    "Exclusion": []
+  },
+  "ShuffleMembers": {
+    "Enabled": true,
+    "Methods": true,
+    "Fields": true,
+    "Annotations": true,
+    "Exceptions": true,
+    "Exclusion": []
+  },
+  "Watermark": {
+    "Enabled": true,
+    "Names": [
+      "Copyright_SentinelAntiNuke2024",
+      "obvWolf",
+      "thetrouper"
+    ],
+    "Messages": [
+      "Copyright (C) Sentinel Anti Nuke | 2024",
+      "Ah_Ah_Ah_You_Didnt_Say_The_Magic_Word",
+      "%%__USERNAME__%%",
+      "%%__USER__%%"
+    ],
+    "FieldMark": true,
+    "MethodMark": true,
+    "AnnotationMark": false,
+    "Annotations": [
+      "ProtectedByGrunt",
+      "JvavMetadata"
+    ],
+    "Versions": [
+      "1993"
+    ],
+    "InterfaceMark": false,
+    "FatherOfJava": "linus/torvalds/thegoat/",
+    "Exclusion": []
+  },
+  "PostProcess": {
+    "Enabled": true,
+    "Manifest": true,
+    "Plugin YML": true,
+    "Bungee YML": true,
+    "Fabric JSON": true,
+    "ManifestPrefix": [
+      "Main-Class:"
+    ]
+  }
+}