Reduce duplicated code in config classes

bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java

@@ -1,9 +1,8 @@
 package us.myles.ViaVersion.bukkit.platform;
 
+import us.myles.ViaVersion.AbstractViaConfig;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.Via;
-import us.myles.ViaVersion.api.ViaVersionConfig;
-import us.myles.ViaVersion.util.Config;
 
 import java.io.File;
 import java.net.URL;
@@ -11,8 +10,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-public class BukkitViaConfig extends Config implements ViaVersionConfig {
-    private static List<String> UNSUPPORTED = Arrays.asList("bungee-ping-interval", "bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers");
+public class BukkitViaConfig extends AbstractViaConfig {
+    private static final List<String> UNSUPPORTED = Arrays.asList("bungee-ping-interval", "bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers");
 
     public BukkitViaConfig() {
         super(new File(((ViaVersionPlugin) Via.getPlatform()).getDataFolder(), "config.yml"));
@@ -20,176 +19,6 @@ public class BukkitViaConfig extends Config implements ViaVersionConfig {
         reloadConfig();
     }
 
-    @Override
-    public boolean isCheckForUpdates() {
-        return getBoolean("checkforupdates", true);
-    }
-
-    @Override
-    public boolean isPreventCollision() {
-        return getBoolean("prevent-collision", true);
-    }
-
-    @Override
-    public boolean isNewEffectIndicator() {
-        return getBoolean("use-new-effect-indicator", true);
-    }
-
-    @Override
-    public boolean isShowNewDeathMessages() {
-        return getBoolean("use-new-deathmessages", true);
-    }
-
-    @Override
-    public boolean isSuppressMetadataErrors() {
-        return getBoolean("suppress-metadata-errors", false);
-    }
-
-    @Override
-    public boolean isShieldBlocking() {
-        return getBoolean("shield-blocking", true);
-    }
-
-    @Override
-    public boolean isHologramPatch() {
-        return getBoolean("hologram-patch", false);
-    }
-
-    @Override
-    public boolean isPistonAnimationPatch() {
-        return getBoolean("piston-animation-patch", false);
-    }
-
-    @Override
-    public boolean isBossbarPatch() {
-        return getBoolean("bossbar-patch", true);
-    }
-
-    @Override
-    public boolean isBossbarAntiflicker() {
-        return getBoolean("bossbar-anti-flicker", false);
-    }
-
-    @Override
-    public boolean isUnknownEntitiesSuppressed() {
-        return false;
-    }
-
-    @Override
-    public double getHologramYOffset() {
-        return getDouble("hologram-y", -0.96D);
-    }
-
-    @Override
-    public boolean isBlockBreakPatch() {
-        return false;
-    }
-
-    @Override
-    public int getMaxPPS() {
-        return getInt("max-pps", 800);
-    }
-
-    @Override
-    public String getMaxPPSKickMessage() {
-        return getString("max-pps-kick-msg", "Sending packets too fast? lag?");
-    }
-
-    @Override
-    public int getTrackingPeriod() {
-        return getInt("tracking-period", 6);
-    }
-
-    @Override
-    public int getWarningPPS() {
-        return getInt("tracking-warning-pps", 120);
-    }
-
-    @Override
-    public int getMaxWarnings() {
-        return getInt("tracking-max-warnings", 3);
-    }
-
-    @Override
-    public String getMaxWarningsKickMessage() {
-        return getString("tracking-max-kick-msg", "You are sending too many packets, :(");
-    }
-
-    @Override
-    public boolean isAntiXRay() {
-        return getBoolean("anti-xray-patch", true);
-    }
-
-    @Override
-    public boolean isSendSupportedVersions() {
-        return getBoolean("send-supported-versions", false);
-    }
-
-    @Override
-    public boolean isStimulatePlayerTick() {
-        return getBoolean("simulate-pt", true);
-    }
-
-    @Override
-    public boolean isItemCache() {
-        return getBoolean("item-cache", true);
-    }
-
-    @Override
-    public boolean isNMSPlayerTicking() {
-        return getBoolean("nms-player-ticking", true);
-    }
-
-    @Override
-    public boolean isReplacePistons() {
-        return getBoolean("replace-pistons", false);
-    }
-
-    @Override
-    public int getPistonReplacementId() {
-        return getInt("replacement-piston-id", 0);
-    }
-
-    public boolean isAutoTeam() {
-        // Collision has to be enabled first
-        return isPreventCollision() && getBoolean("auto-team", true);
-    }
-
-    @Override
-    public boolean isForceJsonTransform() {
-        return getBoolean("force-json-transform", false);
-    }
-
-    @Override
-    public boolean is1_12NBTArrayFix() {
-        return getBoolean("chat-nbt-fix", true);
-    }
-
-    @Override
-    public boolean is1_12QuickMoveActionFix() {
-        return getBoolean("quick-move-action-fix", false);
-    }
-
-    @Override
-    public List<Integer> getBlockedProtocols() {
-        return getIntegerList("block-protocols");
-    }
-
-    @Override
-    public String getBlockedDisconnectMsg() {
-        return getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
-    }
-
-    @Override
-    public String getReloadDisconnectMsg() {
-        return getString("reload-disconnect-msg", "Server reload, please rejoin!");
-    }
-
-    @Override
-    public boolean isMinimizeCooldown() {
-        return getBoolean("minimize-cooldown", true);
-    }
-
     @Override
     public URL getDefaultConfigURL() {
         return BukkitViaConfig.class.getClassLoader().getResource("assets/viaversion/config.yml");
@@ -197,76 +26,10 @@ public class BukkitViaConfig extends Config implements ViaVersionConfig {
 
     @Override
     protected void handleConfig(Map<String, Object> config) {
-        // Nothing currently
     }
 
     @Override
     public List<String> getUnsupportedOptions() {
         return UNSUPPORTED;
     }
-
-    @Override
-    public boolean is1_13TeamColourFix() {
-        return getBoolean("team-colour-fix", true);
-    }
-
-    @Override
-    public boolean isSuppress1_13ConversionErrors() {
-        return getBoolean("suppress-1_13-conversion-errors", false);
-    }
-
-    @Override
-    public boolean isDisable1_13AutoComplete() {
-        return getBoolean("disable-1_13-auto-complete", false);
-    }
-
-    @Override
-    public boolean isServersideBlockConnections() {
-        return getBoolean("serverside-blockconnections", false);
-    }
-
-    @Override
-    public String getBlockConnectionMethod() {
-        return getString("blockconnection-method", "packet");
-    }
-
-    @Override
-    public boolean isReduceBlockStorageMemory() {
-        return getBoolean("reduce-blockstorage-memory", false);
-    }
-
-    @Override
-    public boolean isStemWhenBlockAbove() {
-        return getBoolean("flowerstem-when-block-above", false);
-    }
-
-    @Override
-    public boolean isSnowCollisionFix() {
-        return getBoolean("fix-low-snow-collision", false);
-    }
-
-    @Override
-    public int get1_13TabCompleteDelay() {
-        return getInt("1_13-tab-complete-delay", 0);
-    }
-
-    @Override
-    public boolean isTruncate1_14Books() {
-        return getBoolean("truncate-1_14-books", false);
-    }
-
-    @Override
-    public boolean isLeftHandedHandling() {
-        return getBoolean("left-handed-handling", true);
-    }
-
-    @Override
-    public boolean is1_9HitboxFix() {
-        return getBoolean("change-1_9-hitbox", false);
-    }
-
-    @Override
-    public boolean is1_14HitboxFix() {
-        return getBoolean("change-1_14-hitbox", false);
-    }
 }

bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java

@@ -1,16 +1,15 @@
 package us.myles.ViaVersion.bungee.platform;
 
-import us.myles.ViaVersion.api.ViaVersionConfig;
+import us.myles.ViaVersion.AbstractViaConfig;
 import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.bungee.providers.BungeeVersionProvider;
-import us.myles.ViaVersion.util.Config;
 
 import java.io.File;
 import java.net.URL;
 import java.util.*;
 
-public class BungeeViaConfig extends Config implements ViaVersionConfig {
-    private static List<String> UNSUPPORTED = Arrays.asList("nms-player-ticking", "item-cache", "anti-xray-patch", "quick-move-action-fix", "velocity-ping-interval", "velocity-ping-save", "velocity-servers", "blockconnection-method", "change-1_9-hitbox", "change-1_14-hitbox");
+public class BungeeViaConfig extends AbstractViaConfig {
+    private static final List<String> UNSUPPORTED = Arrays.asList("nms-player-ticking", "item-cache", "anti-xray-patch", "quick-move-action-fix", "velocity-ping-interval", "velocity-ping-save", "velocity-servers", "blockconnection-method", "change-1_9-hitbox", "change-1_14-hitbox");
 
     public BungeeViaConfig(File configFile) {
         super(new File(configFile, "config.yml"));
@@ -60,115 +59,11 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
         return UNSUPPORTED;
     }
 
-    public boolean isCheckForUpdates() {
-        return getBoolean("checkforupdates", true);
-    }
-
-    @Override
-    public boolean isPreventCollision() {
-        return getBoolean("prevent-collision", true);
-    }
-
-    @Override
-    public boolean isNewEffectIndicator() {
-        return getBoolean("use-new-effect-indicator", true);
-    }
-
-    @Override
-    public boolean isShowNewDeathMessages() {
-        return getBoolean("use-new-deathmessages", true);
-    }
-
-    @Override
-    public boolean isSuppressMetadataErrors() {
-        return getBoolean("suppress-metadata-errors", false);
-    }
-
-    @Override
-    public boolean isShieldBlocking() {
-        return getBoolean("shield-blocking", true);
-    }
-
-    @Override
-    public boolean isHologramPatch() {
-        return getBoolean("hologram-patch", false);
-    }
-
-    @Override
-    public boolean isPistonAnimationPatch() {
-        return getBoolean("piston-animation-patch", false);
-    }
-
-    @Override
-    public boolean isBossbarPatch() {
-        return getBoolean("bossbar-patch", true);
-    }
-
-    @Override
-    public boolean isBossbarAntiflicker() {
-        return getBoolean("bossbar-anti-flicker", false);
-    }
-
-    @Override
-    public boolean isUnknownEntitiesSuppressed() {
-        return false;
-    }
-
-    @Override
-    public double getHologramYOffset() {
-        return getDouble("hologram-y", -0.96D);
-    }
-
-    @Override
-    public boolean isBlockBreakPatch() {
-        return false;
-    }
-
-    @Override
-    public int getMaxPPS() {
-        return getInt("max-pps", 800);
-    }
-
-    @Override
-    public String getMaxPPSKickMessage() {
-        return getString("max-pps-kick-msg", "Sending packets too fast? lag?");
-    }
-
-    @Override
-    public int getTrackingPeriod() {
-        return getInt("tracking-period", 6);
-    }
-
-    @Override
-    public int getWarningPPS() {
-        return getInt("tracking-warning-pps", 120);
-    }
-
-    @Override
-    public int getMaxWarnings() {
-        return getInt("tracking-max-warnings", 3);
-    }
-
-    @Override
-    public String getMaxWarningsKickMessage() {
-        return getString("tracking-max-kick-msg", "You are sending too many packets, :(");
-    }
-
     @Override
     public boolean isAntiXRay() {
         return false;
     }
 
-    @Override
-    public boolean isSendSupportedVersions() {
-        return getBoolean("send-supported-versions", false);
-    }
-
-    @Override
-    public boolean isStimulatePlayerTick() {
-        return getBoolean("simulate-pt", true);
-    }
-
     @Override
     public boolean isItemCache() {
         return false;
@@ -179,54 +74,24 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
         return false;
     }
 
-    @Override
-    public boolean isReplacePistons() {
-        return getBoolean("replace-pistons", false);
-    }
-
-    @Override
-    public int getPistonReplacementId() {
-        return getInt("replacement-piston-id", 0);
-    }
-
-    public boolean isAutoTeam() {
-        // Collision has to be enabled first
-        return isPreventCollision() && getBoolean("auto-team", true);
-    }
-
-    @Override
-    public boolean isForceJsonTransform() {
-        return getBoolean("force-json-transform", false);
-    }
-
-    @Override
-    public boolean is1_12NBTArrayFix() {
-        return getBoolean("chat-nbt-fix", true);
-    }
-
     @Override
     public boolean is1_12QuickMoveActionFix() {
         return false;
     }
 
     @Override
-    public List<Integer> getBlockedProtocols() {
-        return getIntegerList("block-protocols");
+    public String getBlockConnectionMethod() {
+        return "packet";
     }
 
     @Override
-    public String getBlockedDisconnectMsg() {
-        return getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
+    public boolean is1_9HitboxFix() {
+        return false;
     }
 
     @Override
-    public String getReloadDisconnectMsg() {
-        return getString("reload-disconnect-msg", "Server reload, please rejoin!");
-    }
-
-    @Override
-    public boolean isMinimizeCooldown() {
-        return getBoolean("minimize-cooldown", true);
+    public boolean is1_14HitboxFix() {
+        return false;
     }
 
     /**
@@ -257,69 +122,4 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
     public Map<String, Integer> getBungeeServerProtocols() {
         return get("bungee-servers", Map.class, new HashMap<>());
     }
-
-    @Override
-    public boolean is1_13TeamColourFix() {
-        return getBoolean("team-colour-fix", true);
-    }
-
-    @Override
-    public boolean isSuppress1_13ConversionErrors() {
-        return getBoolean("suppress-1_13-conversion-errors", false);
-    }
-
-    @Override
-    public boolean isDisable1_13AutoComplete() {
-        return getBoolean("disable-1_13-auto-complete", false);
-    }
-
-    @Override
-    public boolean isServersideBlockConnections() {
-        return getBoolean("serverside-blockconnections", false);
-    }
-
-    @Override
-    public String getBlockConnectionMethod() {
-        return "packet";
-    }
-
-    @Override
-    public boolean isReduceBlockStorageMemory() {
-        return getBoolean("reduce-blockstorage-memory", false);
-    }
-
-    @Override
-    public boolean isStemWhenBlockAbove() {
-        return getBoolean("flowerstem-when-block-above", false);
-    }
-
-    @Override
-    public boolean isSnowCollisionFix() {
-        return getBoolean("fix-low-snow-collision", false);
-    }
-
-    @Override
-    public int get1_13TabCompleteDelay() {
-        return getInt("1_13-tab-complete-delay", 0);
-    }
-
-    @Override
-    public boolean isTruncate1_14Books() {
-        return getBoolean("truncate-1_14-books", false);
-    }
-
-    @Override
-    public boolean isLeftHandedHandling() {
-        return getBoolean("left-handed-handling", true);
-    }
-
-    @Override
-    public boolean is1_9HitboxFix() {
-        return false;
-    }
-
-    @Override
-    public boolean is1_14HitboxFix() {
-        return false;
-    }
 }

common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java

@@ -0,0 +1,240 @@
+package us.myles.ViaVersion;
+
+import us.myles.ViaVersion.api.ViaVersionConfig;
+import us.myles.ViaVersion.util.Config;
+
+import java.io.File;
+import java.util.List;
+
+public abstract class AbstractViaConfig extends Config implements ViaVersionConfig {
+
+    public AbstractViaConfig(File configFile) {
+        super(configFile);
+    }
+
+    @Override
+    public boolean isCheckForUpdates() {
+        return getBoolean("checkforupdates", true);
+    }
+
+    @Override
+    public boolean isPreventCollision() {
+        return getBoolean("prevent-collision", true);
+    }
+
+    @Override
+    public boolean isNewEffectIndicator() {
+        return getBoolean("use-new-effect-indicator", true);
+    }
+
+    @Override
+    public boolean isShowNewDeathMessages() {
+        return getBoolean("use-new-deathmessages", true);
+    }
+
+    @Override
+    public boolean isSuppressMetadataErrors() {
+        return getBoolean("suppress-metadata-errors", false);
+    }
+
+    @Override
+    public boolean isShieldBlocking() {
+        return getBoolean("shield-blocking", true);
+    }
+
+    @Override
+    public boolean isHologramPatch() {
+        return getBoolean("hologram-patch", false);
+    }
+
+    @Override
+    public boolean isPistonAnimationPatch() {
+        return getBoolean("piston-animation-patch", false);
+    }
+
+    @Override
+    public boolean isBossbarPatch() {
+        return getBoolean("bossbar-patch", true);
+    }
+
+    @Override
+    public boolean isBossbarAntiflicker() {
+        return getBoolean("bossbar-anti-flicker", false);
+    }
+
+    @Override
+    public double getHologramYOffset() {
+        return getDouble("hologram-y", -0.96D);
+    }
+
+    @Override
+    public int getMaxPPS() {
+        return getInt("max-pps", 800);
+    }
+
+    @Override
+    public String getMaxPPSKickMessage() {
+        return getString("max-pps-kick-msg", "Sending packets too fast? lag?");
+    }
+
+    @Override
+    public int getTrackingPeriod() {
+        return getInt("tracking-period", 6);
+    }
+
+    @Override
+    public int getWarningPPS() {
+        return getInt("tracking-warning-pps", 120);
+    }
+
+    @Override
+    public int getMaxWarnings() {
+        return getInt("tracking-max-warnings", 3);
+    }
+
+    @Override
+    public String getMaxWarningsKickMessage() {
+        return getString("tracking-max-kick-msg", "You are sending too many packets, :(");
+    }
+
+    @Override
+    public boolean isAntiXRay() {
+        return getBoolean("anti-xray-patch", true);
+    }
+
+    @Override
+    public boolean isSendSupportedVersions() {
+        return getBoolean("send-supported-versions", false);
+    }
+
+    @Override
+    public boolean isStimulatePlayerTick() {
+        return getBoolean("simulate-pt", true);
+    }
+
+    @Override
+    public boolean isItemCache() {
+        return getBoolean("item-cache", true);
+    }
+
+    @Override
+    public boolean isNMSPlayerTicking() {
+        return getBoolean("nms-player-ticking", true);
+    }
+
+    @Override
+    public boolean isReplacePistons() {
+        return getBoolean("replace-pistons", false);
+    }
+
+    @Override
+    public int getPistonReplacementId() {
+        return getInt("replacement-piston-id", 0);
+    }
+
+    @Override
+    public boolean isAutoTeam() {
+        // Collision has to be enabled first
+        return isPreventCollision() && getBoolean("auto-team", true);
+    }
+
+    @Override
+    public boolean isForceJsonTransform() {
+        return getBoolean("force-json-transform", false);
+    }
+
+    @Override
+    public boolean is1_12NBTArrayFix() {
+        return getBoolean("chat-nbt-fix", true);
+    }
+
+    @Override
+    public boolean is1_12QuickMoveActionFix() {
+        return getBoolean("quick-move-action-fix", false);
+    }
+
+    @Override
+    public List<Integer> getBlockedProtocols() {
+        return getIntegerList("block-protocols");
+    }
+
+    @Override
+    public String getBlockedDisconnectMsg() {
+        return getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
+    }
+
+    @Override
+    public String getReloadDisconnectMsg() {
+        return getString("reload-disconnect-msg", "Server reload, please rejoin!");
+    }
+
+    @Override
+    public boolean isMinimizeCooldown() {
+        return getBoolean("minimize-cooldown", true);
+    }
+
+    @Override
+    public boolean is1_13TeamColourFix() {
+        return getBoolean("team-colour-fix", true);
+    }
+
+    @Override
+    public boolean isSuppress1_13ConversionErrors() {
+        return getBoolean("suppress-1_13-conversion-errors", false);
+    }
+
+    @Override
+    public boolean isDisable1_13AutoComplete() {
+        return getBoolean("disable-1_13-auto-complete", false);
+    }
+
+    @Override
+    public boolean isServersideBlockConnections() {
+        return getBoolean("serverside-blockconnections", false);
+    }
+
+    @Override
+    public String getBlockConnectionMethod() {
+        return getString("blockconnection-method", "packet");
+    }
+
+    @Override
+    public boolean isReduceBlockStorageMemory() {
+        return getBoolean("reduce-blockstorage-memory", false);
+    }
+
+    @Override
+    public boolean isStemWhenBlockAbove() {
+        return getBoolean("flowerstem-when-block-above", false);
+    }
+
+    @Override
+    public boolean isSnowCollisionFix() {
+        return getBoolean("fix-low-snow-collision", false);
+    }
+
+    @Override
+    public int get1_13TabCompleteDelay() {
+        return getInt("1_13-tab-complete-delay", 0);
+    }
+
+    @Override
+    public boolean isTruncate1_14Books() {
+        return getBoolean("truncate-1_14-books", false);
+    }
+
+    @Override
+    public boolean isLeftHandedHandling() {
+        return getBoolean("left-handed-handling", true);
+    }
+
+    @Override
+    public boolean is1_9HitboxFix() {
+        return getBoolean("change-1_9-hitbox", false);
+    }
+
+    @Override
+    public boolean is1_14HitboxFix() {
+        return getBoolean("change-1_14-hitbox", false);
+    }
+}

common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java

@@ -81,7 +81,9 @@ public interface ViaVersionConfig {
      * @return true if boss bar patching is enabled
      */
     @Deprecated
-    boolean isUnknownEntitiesSuppressed();
+    default boolean isUnknownEntitiesSuppressed() {
+        return false;
+    }
 
     /**
      * Get the vertical offset armor stands are being moved with when the hologram patch is enabled
@@ -103,7 +105,9 @@ public interface ViaVersionConfig {
      * @return true if it is enabled.
      */
     @Deprecated
-    boolean isBlockBreakPatch();
+    default boolean isBlockBreakPatch() {
+        return false;
+    }
 
     /**
      * Get the maximum number of packets a client can send per second.

sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java

@@ -2,8 +2,7 @@ package us.myles.ViaVersion.sponge.platform;
 
 import org.spongepowered.api.asset.Asset;
 import org.spongepowered.api.plugin.PluginContainer;
-import us.myles.ViaVersion.api.ViaVersionConfig;
-import us.myles.ViaVersion.util.Config;
+import us.myles.ViaVersion.AbstractViaConfig;
 
 import java.io.File;
 import java.net.URL;
@@ -12,8 +11,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class SpongeViaConfig extends Config implements ViaVersionConfig {
-    private static List<String> UNSUPPORTED = Arrays.asList("anti-xray-patch", "bungee-ping-interval", "bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers", "quick-move-action-fix", "change-1_9-hitbox", "change-1_14-hitbox");
+public class SpongeViaConfig extends AbstractViaConfig {
+    private static final List<String> UNSUPPORTED = Arrays.asList("anti-xray-patch", "bungee-ping-interval", "bungee-ping-save", "bungee-servers", "velocity-ping-interval", "velocity-ping-save", "velocity-servers", "quick-move-action-fix", "change-1_9-hitbox", "change-1_14-hitbox");
     private final PluginContainer pluginContainer;
 
     public SpongeViaConfig(PluginContainer pluginContainer, File configFile) {
@@ -34,7 +33,6 @@ public class SpongeViaConfig extends Config implements ViaVersionConfig {
 
     @Override
     protected void handleConfig(Map<String, Object> config) {
-        // Nothing Currently
     }
 
     @Override
@@ -42,230 +40,16 @@ public class SpongeViaConfig extends Config implements ViaVersionConfig {
         return UNSUPPORTED;
     }
 
-    public boolean isCheckForUpdates() {
-        return getBoolean("checkforupdates", true);
-    }
-
-    @Override
-    public boolean isPreventCollision() {
-        return getBoolean("prevent-collision", true);
-    }
-
-    @Override
-    public boolean isNewEffectIndicator() {
-        return getBoolean("use-new-effect-indicator", true);
-    }
-
-    @Override
-    public boolean isShowNewDeathMessages() {
-        return getBoolean("use-new-deathmessages", true);
-    }
-
-    @Override
-    public boolean isSuppressMetadataErrors() {
-        return getBoolean("suppress-metadata-errors", false);
-    }
-
-    @Override
-    public boolean isShieldBlocking() {
-        return getBoolean("shield-blocking", true);
-    }
-
-    @Override
-    public boolean isHologramPatch() {
-        return getBoolean("hologram-patch", false);
-    }
-
-    @Override
-    public boolean isPistonAnimationPatch() {
-        return getBoolean("piston-animation-patch", false);
-    }
-
-    @Override
-    public boolean isBossbarPatch() {
-        return getBoolean("bossbar-patch", true);
-    }
-
-    @Override
-    public boolean isBossbarAntiflicker() {
-        return getBoolean("bossbar-anti-flicker", false);
-    }
-
-    @Override
-    public boolean isUnknownEntitiesSuppressed() {
-        return false;
-    }
-
-    @Override
-    public double getHologramYOffset() {
-        return getDouble("hologram-y", -0.96D);
-    }
-
-    @Override
-    public boolean isBlockBreakPatch() {
-        return false;
-    }
-
-    @Override
-    public int getMaxPPS() {
-        return getInt("max-pps", 800);
-    }
-
-    @Override
-    public String getMaxPPSKickMessage() {
-        return getString("max-pps-kick-msg", "Sending packets too fast? lag?");
-    }
-
-    @Override
-    public int getTrackingPeriod() {
-        return getInt("tracking-period", 6);
-    }
-
-    @Override
-    public int getWarningPPS() {
-        return getInt("tracking-warning-pps", 120);
-    }
-
-    @Override
-    public int getMaxWarnings() {
-        return getInt("tracking-max-warnings", 3);
-    }
-
-    @Override
-    public String getMaxWarningsKickMessage() {
-        return getString("tracking-max-kick-msg", "You are sending too many packets, :(");
-    }
-
     @Override
     public boolean isAntiXRay() {
         return false;
     }
 
-    @Override
-    public boolean isSendSupportedVersions() {
-        return getBoolean("send-supported-versions", false);
-    }
-
-    @Override
-    public boolean isStimulatePlayerTick() {
-        return getBoolean("simulate-pt", true);
-    }
-
-    @Override
-    public boolean isItemCache() {
-        return getBoolean("item-cache", true);
-    }
-
-    @Override
-    public boolean isNMSPlayerTicking() {
-        return getBoolean("nms-player-ticking", true);
-    }
-
-    @Override
-    public boolean isReplacePistons() {
-        return getBoolean("replace-pistons", false);
-    }
-
-    @Override
-    public int getPistonReplacementId() {
-        return getInt("replacement-piston-id", 0);
-    }
-
-    public boolean isAutoTeam() {
-        // Collision has to be enabled first
-        return isPreventCollision() && getBoolean("auto-team", true);
-    }
-
-    @Override
-    public boolean isForceJsonTransform() {
-        return getBoolean("force-json-transform", false);
-    }
-
-    @Override
-    public boolean is1_12NBTArrayFix() {
-        return getBoolean("chat-nbt-fix", true);
-    }
-
     @Override
     public boolean is1_12QuickMoveActionFix() {
         return false;
     }
 
-    @Override
-    public List<Integer> getBlockedProtocols() {
-        return getIntegerList("block-protocols");
-    }
-
-    @Override
-    public String getBlockedDisconnectMsg() {
-        return getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
-    }
-
-    @Override
-    public String getReloadDisconnectMsg() {
-        return getString("reload-disconnect-msg", "Server reload, please rejoin!");
-    }
-
-    @Override
-    public boolean isMinimizeCooldown() {
-        return getBoolean("minimize-cooldown", true);
-    }
-
-    @Override
-    public boolean is1_13TeamColourFix() {
-        return getBoolean("team-colour-fix", true);
-    }
-
-    @Override
-    public boolean isSuppress1_13ConversionErrors() {
-        return getBoolean("suppress-1_13-conversion-errors", false);
-    }
-
-    @Override
-    public boolean isDisable1_13AutoComplete() {
-        return getBoolean("disable-1_13-auto-complete", false);
-    }
-
-    @Override
-    public boolean isServersideBlockConnections() {
-        return getBoolean("serverside-blockconnections", false);
-    }
-
-    @Override
-    public String getBlockConnectionMethod() {
-        return getString("blockconnection-method", "packet");
-    }
-
-    @Override
-    public boolean isReduceBlockStorageMemory() {
-        return getBoolean("reduce-blockstorage-memory", false);
-    }
-
-    @Override
-    public boolean isStemWhenBlockAbove() {
-        return getBoolean("flowerstem-when-block-above", false);
-    }
-
-    @Override
-    public boolean isSnowCollisionFix() {
-        return getBoolean("fix-low-snow-collision", false);
-    }
-
-    @Override
-    public int get1_13TabCompleteDelay() {
-        return getInt("1_13-tab-complete-delay", 0);
-    }
-
-    @Override
-    public boolean isTruncate1_14Books() {
-        return getBoolean("truncate-1_14-books", false);
-    }
-
-    @Override
-    public boolean isLeftHandedHandling() {
-        return getBoolean("left-handed-handling", true);
-    }
-
     @Override
     public boolean is1_9HitboxFix() {
         return false;

velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java

@@ -1,15 +1,14 @@
 package us.myles.ViaVersion.velocity.platform;
 
-import us.myles.ViaVersion.api.ViaVersionConfig;
+import us.myles.ViaVersion.AbstractViaConfig;
 import us.myles.ViaVersion.api.protocol.ProtocolVersion;
-import us.myles.ViaVersion.util.Config;
 
 import java.io.File;
 import java.net.URL;
 import java.util.*;
 
-public class VelocityViaConfig extends Config implements ViaVersionConfig {
-    private static List<String> UNSUPPORTED = Arrays.asList("nms-player-ticking", "item-cache", "anti-xray-patch", "quick-move-action-fix", "bungee-ping-interval", "bungee-ping-save", "bungee-servers", "blockconnection-method", "change-1_9-hitbox", "change-1_14-hitbox");
+public class VelocityViaConfig extends AbstractViaConfig {
+    private static final List<String> UNSUPPORTED = Arrays.asList("nms-player-ticking", "item-cache", "anti-xray-patch", "quick-move-action-fix", "bungee-ping-interval", "bungee-ping-save", "bungee-servers", "blockconnection-method", "change-1_9-hitbox", "change-1_14-hitbox");
 
     public VelocityViaConfig(File configFile) {
         super(new File(configFile, "config.yml"));
@@ -65,115 +64,11 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
         return UNSUPPORTED;
     }
 
-    public boolean isCheckForUpdates() {
-        return getBoolean("checkforupdates", true);
-    }
-
-    @Override
-    public boolean isPreventCollision() {
-        return getBoolean("prevent-collision", true);
-    }
-
-    @Override
-    public boolean isNewEffectIndicator() {
-        return getBoolean("use-new-effect-indicator", true);
-    }
-
-    @Override
-    public boolean isShowNewDeathMessages() {
-        return getBoolean("use-new-deathmessages", true);
-    }
-
-    @Override
-    public boolean isSuppressMetadataErrors() {
-        return getBoolean("suppress-metadata-errors", false);
-    }
-
-    @Override
-    public boolean isShieldBlocking() {
-        return getBoolean("shield-blocking", true);
-    }
-
-    @Override
-    public boolean isHologramPatch() {
-        return getBoolean("hologram-patch", false);
-    }
-
-    @Override
-    public boolean isPistonAnimationPatch() {
-        return getBoolean("piston-animation-patch", false);
-    }
-
-    @Override
-    public boolean isBossbarPatch() {
-        return getBoolean("bossbar-patch", true);
-    }
-
-    @Override
-    public boolean isBossbarAntiflicker() {
-        return getBoolean("bossbar-anti-flicker", false);
-    }
-
-    @Override
-    public boolean isUnknownEntitiesSuppressed() {
-        return false;
-    }
-
-    @Override
-    public double getHologramYOffset() {
-        return getDouble("hologram-y", -0.96D);
-    }
-
-    @Override
-    public boolean isBlockBreakPatch() {
-        return false;
-    }
-
-    @Override
-    public int getMaxPPS() {
-        return getInt("max-pps", 800);
-    }
-
-    @Override
-    public String getMaxPPSKickMessage() {
-        return getString("max-pps-kick-msg", "Sending packets too fast? lag?");
-    }
-
-    @Override
-    public int getTrackingPeriod() {
-        return getInt("tracking-period", 6);
-    }
-
-    @Override
-    public int getWarningPPS() {
-        return getInt("tracking-warning-pps", 120);
-    }
-
-    @Override
-    public int getMaxWarnings() {
-        return getInt("tracking-max-warnings", 3);
-    }
-
-    @Override
-    public String getMaxWarningsKickMessage() {
-        return getString("tracking-max-kick-msg", "You are sending too many packets, :(");
-    }
-
     @Override
     public boolean isAntiXRay() {
         return false;
     }
 
-    @Override
-    public boolean isSendSupportedVersions() {
-        return getBoolean("send-supported-versions", false);
-    }
-
-    @Override
-    public boolean isStimulatePlayerTick() {
-        return getBoolean("simulate-pt", true);
-    }
-
     @Override
     public boolean isItemCache() {
         return false;
@@ -184,54 +79,24 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
         return false;
     }
 
-    @Override
-    public boolean isReplacePistons() {
-        return getBoolean("replace-pistons", false);
-    }
-
-    @Override
-    public int getPistonReplacementId() {
-        return getInt("replacement-piston-id", 0);
-    }
-
-    public boolean isAutoTeam() {
-        // Collision has to be enabled first
-        return isPreventCollision() && getBoolean("auto-team", true);
-    }
-
-    @Override
-    public boolean isForceJsonTransform() {
-        return getBoolean("force-json-transform", false);
-    }
-
-    @Override
-    public boolean is1_12NBTArrayFix() {
-        return getBoolean("chat-nbt-fix", true);
-    }
-
     @Override
     public boolean is1_12QuickMoveActionFix() {
         return false;
     }
 
     @Override
-    public List<Integer> getBlockedProtocols() {
-        return getIntegerList("block-protocols");
+    public String getBlockConnectionMethod() {
+        return "packet";
     }
 
     @Override
-    public String getBlockedDisconnectMsg() {
-        return getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
+    public boolean is1_9HitboxFix() {
+        return false;
     }
 
     @Override
-    public String getReloadDisconnectMsg() {
-        return getString("reload-disconnect-msg", "Server reload, please rejoin!");
-    }
-
-    @Override
-    public boolean isMinimizeCooldown() {
-        return getBoolean("minimize-cooldown", true);
+    public boolean is1_14HitboxFix() {
+        return false;
     }
 
     /**
@@ -262,70 +127,4 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
     public Map<String, Integer> getVelocityServerProtocols() {
         return get("velocity-servers", Map.class, new HashMap<>());
     }
-
-    @Override
-    public boolean is1_13TeamColourFix() {
-        return getBoolean("team-colour-fix", true);
-    }
-
-    @Override
-    public boolean isSuppress1_13ConversionErrors() {
-        return getBoolean("suppress-1_13-conversion-errors", false);
-    }
-
-    @Override
-    public boolean isDisable1_13AutoComplete() {
-        return getBoolean("disable-1_13-auto-complete", false);
-    }
-
-    @Override
-    public boolean isServersideBlockConnections() {
-        return getBoolean("serverside-blockconnections", false);
-    }
-
-    @Override
-    public String getBlockConnectionMethod() {
-        return "packet";
-    }
-
-    @Override
-    public boolean isReduceBlockStorageMemory() {
-        return getBoolean("reduce-blockstorage-memory", false);
-    }
-
-    @Override
-    public boolean isStemWhenBlockAbove() {
-        return getBoolean("flowerstem-when-block-above", false);
-    }
-
-    @Override
-    public boolean isSnowCollisionFix() {
-        return getBoolean("fix-low-snow-collision", false);
-    }
-
-    @Override
-    public int get1_13TabCompleteDelay() {
-        return getInt("1_13-tab-complete-delay", 0);
-    }
-
-    @Override
-    public boolean isTruncate1_14Books() {
-        return getBoolean("truncate-1_14-books", false);
-    }
-
-    @Override
-    public boolean isLeftHandedHandling() {
-        return getBoolean("left-handed-handling", true);
-    }
-
-
-    @Override
-    public boolean is1_9HitboxFix() {
-        return false;
-    }
-
-    @Override
-    public boolean is1_14HitboxFix() {
-        return false;
-    }
 }