diff --git a/core/src/main/java/org/geysermc/geyser/configuration/ConfigMigrations.java b/core/src/main/java/org/geysermc/geyser/configuration/ConfigMigrations.java index 84511e043..c93ddfd89 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/ConfigMigrations.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/ConfigMigrations.java @@ -112,7 +112,7 @@ public class ConfigMigrations { } if (Objects.equals(previous, "no-emotes")) { value.set(false); - return new Object[]{ "gameplay", "emotes-enabled" }; + return new Object[]{ "gameplay", "show-emotes" }; } return null; }) diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java index 00f401be3..c9fef20c9 100644 --- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java +++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java @@ -287,7 +287,7 @@ public interface GeyserConfig { boolean netherRoofWorkaround(); @Comment(""" - Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. + Whether to show Bedrock Edition emotes to other Bedrock Edition players. """) @DefaultBoolean(true) boolean emotesEnabled(); diff --git a/core/src/test/resources/configuration/all-changed/plugin.yml b/core/src/test/resources/configuration/all-changed/plugin.yml index b33c9ea3d..ea9830cd3 100644 --- a/core/src/test/resources/configuration/all-changed/plugin.yml +++ b/core/src/test/resources/configuration/all-changed/plugin.yml @@ -83,8 +83,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: true - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/all-changed/remote.yml b/core/src/test/resources/configuration/all-changed/remote.yml index e653230c4..144abce08 100644 --- a/core/src/test/resources/configuration/all-changed/remote.yml +++ b/core/src/test/resources/configuration/all-changed/remote.yml @@ -84,8 +84,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: true - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/allow-custom-skulls/plugin.yml b/core/src/test/resources/configuration/allow-custom-skulls/plugin.yml index 915ad2cd0..d311e0353 100644 --- a/core/src/test/resources/configuration/allow-custom-skulls/plugin.yml +++ b/core/src/test/resources/configuration/allow-custom-skulls/plugin.yml @@ -83,8 +83,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/allow-custom-skulls/remote.yml b/core/src/test/resources/configuration/allow-custom-skulls/remote.yml index 6eaaa1ae1..9a91bcedf 100644 --- a/core/src/test/resources/configuration/allow-custom-skulls/remote.yml +++ b/core/src/test/resources/configuration/allow-custom-skulls/remote.yml @@ -84,8 +84,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/default/plugin.yml b/core/src/test/resources/configuration/default/plugin.yml index 1d19cde04..e0acb4825 100644 --- a/core/src/test/resources/configuration/default/plugin.yml +++ b/core/src/test/resources/configuration/default/plugin.yml @@ -83,8 +83,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/default/remote.yml b/core/src/test/resources/configuration/default/remote.yml index 55736256c..0feccca3d 100644 --- a/core/src/test/resources/configuration/default/remote.yml +++ b/core/src/test/resources/configuration/default/remote.yml @@ -84,8 +84,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/legacy/plugin.yml b/core/src/test/resources/configuration/legacy/plugin.yml index 1d19cde04..e0acb4825 100644 --- a/core/src/test/resources/configuration/legacy/plugin.yml +++ b/core/src/test/resources/configuration/legacy/plugin.yml @@ -83,8 +83,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/legacy/remote.yml b/core/src/test/resources/configuration/legacy/remote.yml index 55736256c..0feccca3d 100644 --- a/core/src/test/resources/configuration/legacy/remote.yml +++ b/core/src/test/resources/configuration/legacy/remote.yml @@ -84,8 +84,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: true + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: true # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/migrate-no-emotes/plugin.yml b/core/src/test/resources/configuration/migrate-no-emotes/plugin.yml index f205232d1..d5cd353ad 100644 --- a/core/src/test/resources/configuration/migrate-no-emotes/plugin.yml +++ b/core/src/test/resources/configuration/migrate-no-emotes/plugin.yml @@ -83,8 +83,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: false + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: false # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item. diff --git a/core/src/test/resources/configuration/migrate-no-emotes/remote.yml b/core/src/test/resources/configuration/migrate-no-emotes/remote.yml index 4f440a95b..3ca312663 100644 --- a/core/src/test/resources/configuration/migrate-no-emotes/remote.yml +++ b/core/src/test/resources/configuration/migrate-no-emotes/remote.yml @@ -84,8 +84,8 @@ gameplay: # The main downside to this is that the entire Nether will have the same red fog rather than having different fog for each biome. nether-roof-workaround: false - # Whether to allow Bedrock Edition emotes to be sent to other Bedrock Edition players. - emotes-enabled: false + # Whether to show Bedrock Edition emotes to other Bedrock Edition players. + show-emotes: false # Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, # or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item.