move max-growth-age to global config

This commit is contained in:
BillyGalbreath
2022-09-28 17:52:06 -05:00
parent 88f90be370
commit aa5e794e87
69 changed files with 428 additions and 428 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add uptime command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 2b61c6fb67141234708707eb07621681f7d8e9b2..dc76507dd19e263cc3a0d566c0ea237ad1203a63 100644
index 14b12cb6967c1c2735cf6a0eafdf6e23889a528c..6a044a9c97db9bba75f8dbbaa8515e3167841855 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -210,6 +210,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 2b61c6fb67141234708707eb07621681f7d8e9b2..dc76507dd19e263cc3a0d566c0ea237a
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4fbc86086d085681918dc9e6ddfbcad647137948..6767bf0dfc55092144f2c24139ab65fcc274d045 100644
index 03d0cc6c69164e196d5db2bf56a7136a9e4a5c79..fa2812d94045e5d49fdd9990eac918975c9fcee5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,10 +29,10 @@ index 4fbc86086d085681918dc9e6ddfbcad647137948..6767bf0dfc55092144f2c24139ab65fc
public int autosavePeriod;
public Commands vanillaCommandDispatcher;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 61d3055e0cd541c3e0197daed15c831ee7dbb7ff..ec1e02ece9e15860fbf1321d932829a4a4dd8e1a 100644
index 9d6e1e62b4a2754826ab58c9eafe2d03e538a940..c845ad46d8741f38ee88422aff26cb6cc98550a9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -178,6 +178,7 @@ public class PurpurConfig {
@@ -181,6 +181,7 @@ public class PurpurConfig {
public static String pingCommandOutput = "<green>%s's ping is %sms";
public static String tpsbarCommandOutput = "<green>Tpsbar toggled <onoff> for <target>";
public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
@@ -40,7 +40,7 @@ index 61d3055e0cd541c3e0197daed15c831ee7dbb7ff..ec1e02ece9e15860fbf1321d932829a4
public static String unverifiedUsername = "default";
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
@@ -190,6 +191,7 @@ public class PurpurConfig {
@@ -193,6 +194,7 @@ public class PurpurConfig {
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
tpsbarCommandOutput = getString("settings.messages.tpsbar-command-output", tpsbarCommandOutput);
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
@@ -48,7 +48,7 @@ index 61d3055e0cd541c3e0197daed15c831ee7dbb7ff..ec1e02ece9e15860fbf1321d932829a4
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}
@@ -242,6 +244,15 @@ public class PurpurConfig {
@@ -245,6 +247,15 @@ public class PurpurConfig {
public static int commandTPSBarTickInterval = 20;
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index 61d3055e0cd541c3e0197daed15c831ee7dbb7ff..ec1e02ece9e15860fbf1321d932829a4
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -255,6 +266,15 @@ public class PurpurConfig {
@@ -258,6 +269,15 @@ public class PurpurConfig {
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);