Move bukkit-only settings into BukkitViaConfig (#3985)

This commit is contained in:
EnZaXD 2024-06-27 09:56:50 +02:00 committed by GitHub
parent a987882132
commit 248da118a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 19 deletions

View File

@ -30,6 +30,9 @@ public class BukkitViaConfig extends AbstractViaConfig {
private String blockConnectionMethod;
private boolean armorToggleFix;
private boolean registerUserConnectionOnJoin;
private boolean useNewDeathMessages;
private boolean itemCache;
private boolean nmsPlayerTicking;
public BukkitViaConfig(final File folder, final Logger logger) {
super(new File(folder, "config.yml"), logger);
@ -44,6 +47,9 @@ public class BukkitViaConfig extends AbstractViaConfig {
hitboxFix1_14 = getBoolean("change-1_14-hitbox", false);
blockConnectionMethod = getString("blockconnection-method", "packet");
armorToggleFix = getBoolean("armor-toggle-fix", true);
useNewDeathMessages = getBoolean("use-new-deathmessages", true);
itemCache = getBoolean("item-cache", true);
nmsPlayerTicking = getBoolean("nms-player-ticking", true);
}
@Override
@ -80,6 +86,21 @@ public class BukkitViaConfig extends AbstractViaConfig {
return armorToggleFix;
}
@Override
public boolean isShowNewDeathMessages() {
return useNewDeathMessages;
}
@Override
public boolean isItemCache() {
return itemCache;
}
@Override
public boolean isNMSPlayerTicking() {
return nmsPlayerTicking;
}
@Override
public List<String> getUnsupportedOptions() {
return VELOCITY_ONLY_OPTIONS;

View File

@ -45,7 +45,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
private boolean checkForUpdates;
private boolean preventCollision;
private boolean useNewEffectIndicator;
private boolean useNewDeathmessages;
private boolean suppressMetadataErrors;
private boolean shieldBlocking;
private boolean noDelayShieldBlocking;
@ -63,8 +62,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
private String maxPPSWarningsKickMessage;
private boolean sendSupportedVersions;
private boolean simulatePlayerTick;
private boolean itemCache;
private boolean nmsPlayerTicking;
private boolean replacePistons;
private int pistonReplacementId;
private boolean chunkBorderFix;
@ -112,7 +109,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
checkForUpdates = getBoolean("check-for-updates", true);
preventCollision = getBoolean("prevent-collision", true);
useNewEffectIndicator = getBoolean("use-new-effect-indicator", true);
useNewDeathmessages = getBoolean("use-new-deathmessages", true);
suppressMetadataErrors = getBoolean("suppress-metadata-errors", false);
shieldBlocking = getBoolean("shield-blocking", true);
noDelayShieldBlocking = getBoolean("no-delay-shield-blocking", false);
@ -130,8 +126,6 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
maxPPSWarningsKickMessage = getString("tracking-max-kick-msg", "You are sending too many packets, :(");
sendSupportedVersions = getBoolean("send-supported-versions", false);
simulatePlayerTick = getBoolean("simulate-pt", true);
itemCache = getBoolean("item-cache", true);
nmsPlayerTicking = getBoolean("nms-player-ticking", true);
replacePistons = getBoolean("replace-pistons", false);
pistonReplacementId = getInt("replacement-piston-id", 0);
chunkBorderFix = getBoolean("chunk-border-fix", false);
@ -260,7 +254,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
@Override
public boolean isShowNewDeathMessages() {
return useNewDeathmessages;
return false;
}
@Override
@ -350,12 +344,12 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
@Override
public boolean isItemCache() {
return itemCache;
return false;
}
@Override
public boolean isNMSPlayerTicking() {
return nmsPlayerTicking;
return false;
}
@Override

View File

@ -86,16 +86,6 @@ public class VelocityViaConfig extends AbstractViaConfig {
return BUKKIT_ONLY_OPTIONS;
}
@Override
public boolean isItemCache() {
return false;
}
@Override
public boolean isNMSPlayerTicking() {
return false;
}
/**
* What is the interval for checking servers via ping
* -1 for disabled