revert funny diamond hud stuff

add ExcludeType again
fix INSTANCE field stuff

1 files changed, 8 insertions, 3 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/config/gson/ProfileExclusionStrategy.java b/src/main/java/cc/polyfrost/oneconfig/config/gson/ProfileExclusionStrategy.java
index c94e8bd..45f3a04 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/gson/ProfileExclusionStrategy.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/gson/ProfileExclusionStrategy.java
@@ -1,18 +1,22 @@
 package cc.polyfrost.oneconfig.config.gson;
 
+import cc.polyfrost.oneconfig.config.Config;
 import cc.polyfrost.oneconfig.config.annotations.Exclude;
 import cc.polyfrost.oneconfig.config.annotations.NonProfileSpecific;
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 
-public class ProfileExclusionStrategy implements ExclusionStrategy {
+public class ProfileExclusionStrategy extends ExclusionUtils implements ExclusionStrategy {
     /**
      * @param f the field object that is under test
      * @return true if the field should be ignored; otherwise false
      */
     @Override
     public boolean shouldSkipField(FieldAttributes f) {
-        return f.getAnnotation(NonProfileSpecific.class) != null || f.getAnnotation(Exclude.class) != null;
+        if (isSuperClassOf(f.getDeclaredClass(), Config.class)) return true;
+        if (f.getAnnotation(NonProfileSpecific.class) != null) return true;
+        Exclude exclude = f.getAnnotation(Exclude.class);
+        return exclude != null && exclude.type() != Exclude.ExcludeType.HUD;
     }
 
     /**
@@ -21,6 +25,7 @@ public class ProfileExclusionStrategy implements ExclusionStrategy {
      */
     @Override
     public boolean shouldSkipClass(Class<?> clazz) {
-        return clazz.getAnnotation(NonProfileSpecific.class) != null || clazz.getAnnotation(Exclude.class) != null;
+        Exclude exclude = clazz.getAnnotation(Exclude.class);
+        return exclude != null && exclude.type() != Exclude.ExcludeType.HUD;
     }
 }