these options should be off by default

This commit is contained in:
granny
2024-10-06 16:08:45 -07:00
parent 2eaea6a060
commit 4565f410fe
8 changed files with 20 additions and 20 deletions

View File

@@ -95,16 +95,16 @@ index 5f57f3494705ca1664dbca395c1af3280a50cad8..8c14f8c9f61baf1842e42b62bcd73717
return (ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY); return (ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY);
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 6fcb2db92a38e862da288518ce34d16aa4b856e0..e3371ff562b09f05ba0b865b5e301d03e398eee6 100644 index 6fcb2db92a38e862da288518ce34d16aa4b856e0..b37daca2ca99d79210ec5e8e9d589e27702a57e5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -285,6 +285,36 @@ public class PurpurConfig { @@ -285,6 +285,36 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame); cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
} }
+ public static boolean allowInapplicableEnchants = true; + public static boolean allowInapplicableEnchants = false;
+ public static boolean allowIncompatibleEnchants = true; + public static boolean allowIncompatibleEnchants = false;
+ public static boolean allowHigherEnchantsLevels = true; + public static boolean allowHigherEnchantsLevels = false;
+ public static boolean allowUnsafeEnchantCommand = false; + public static boolean allowUnsafeEnchantCommand = false;
+ public static boolean replaceIncompatibleEnchants = false; + public static boolean replaceIncompatibleEnchants = false;
+ private static void enchantmentSettings() { + private static void enchantmentSettings() {

View File

@@ -18,7 +18,7 @@ index f933fa419a4b55b0096ff42caf1b071d027b8e7e..fb84af3b1709101fa572d11a1c27970a
public BeehiveBlockEntity(BlockPos pos, BlockState state) { public BeehiveBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.BEEHIVE, pos, state); super(BlockEntityType.BEEHIVE, pos, state);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index e3371ff562b09f05ba0b865b5e301d03e398eee6..b0c3135d8af0fd73d6445bdbea91d51527f180b8 100644 index b37daca2ca99d79210ec5e8e9d589e27702a57e5..24e3148c51c3d558a3945827842c414d9cdc2e40 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -252,6 +252,7 @@ public class PurpurConfig { @@ -252,6 +252,7 @@ public class PurpurConfig {
@@ -36,4 +36,4 @@ index e3371ff562b09f05ba0b865b5e301d03e398eee6..b0c3135d8af0fd73d6445bdbea91d515
+ beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive); + beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
} }
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;

View File

@@ -18,7 +18,7 @@ index e3c74f30eabfcbeef43a7a8096191e4bf4349c9a..6c2e2c929810c60009f121b9a505cb9f
public boolean setItemName(String newItemName) { public boolean setItemName(String newItemName) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 35d86953ea87c5977acf1c83c2071bc622996510..7b6366f12109c9a40d96c0f0f5b9f3d167dc8b97 100644 index a106b462b3739ecb19db991faffc348f60ff03df..ebbaa21dbaff140818fad10accd05721451b37cb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -271,6 +271,7 @@ public class PurpurConfig { @@ -271,6 +271,7 @@ public class PurpurConfig {
@@ -36,4 +36,4 @@ index 35d86953ea87c5977acf1c83c2071bc622996510..7b6366f12109c9a40d96c0f0f5b9f3d1
+ anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost); + anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
} }
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;

View File

@@ -18,7 +18,7 @@ index 40a5107d37e908d13bd0307fc41d9a6e3faf1217..277a0b6f38b1ce00fd06066b43ac634f
return optional.map((blockposition1) -> { return optional.map((blockposition1) -> {
return blockposition1.above(1); return blockposition1.above(1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 7b6366f12109c9a40d96c0f0f5b9f3d167dc8b97..3ec02424c0c9a9210cbcbd5f2a0c388d344f1019 100644 index ebbaa21dbaff140818fad10accd05721451b37cb..e654169f6a290aa52a4e0f647dc7ec6698489729 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -272,6 +272,7 @@ public class PurpurConfig { @@ -272,6 +272,7 @@ public class PurpurConfig {
@@ -36,4 +36,4 @@ index 7b6366f12109c9a40d96c0f0f5b9f3d167dc8b97..3ec02424c0c9a9210cbcbd5f2a0c388d
+ lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange); + lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
} }
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;

View File

@@ -123,7 +123,7 @@ index 138f77d13dda574def523d74fa55bc71b5bfa01b..57c9e636a10e5845f197cae39d4f885a
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 37b802a1de4ade72d53463819d7774436d68be51..f4c8dd204943f77760f0a7f73838776bf2f85b63 100644 index 275078b6b4940fbc771fb1aad0990135d37b51f3..9c5348fd18c2943ce39346dd19fa194d9c31d7ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -311,6 +311,9 @@ public class PurpurConfig { @@ -311,6 +311,9 @@ public class PurpurConfig {
@@ -157,4 +157,4 @@ index 37b802a1de4ade72d53463819d7774436d68be51..f4c8dd204943f77760f0a7f73838776b
+ grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay); + grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);
} }
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;

View File

@@ -135,7 +135,7 @@ index 3dec5a082606ee35a8c8d7f746480262d6a189c5..b2f6ccae9576c176263e51a232e17a08
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3351f1aad470e27501dd60436756fada434b9e25..569b8e21c2afd88fff1820307d75350b405a88e5 100644 index ce8181b0527406a54569779d453b227f6b693f0d..0d899125bd89b23d6b5f1fa6bdb25d3b76a62783 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -314,6 +314,10 @@ public class PurpurConfig { @@ -314,6 +314,10 @@ public class PurpurConfig {
@@ -179,4 +179,4 @@ index 3351f1aad470e27501dd60436756fada434b9e25..569b8e21c2afd88fff1820307d75350b
+ } + }
} }
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;

View File

@@ -194,7 +194,7 @@ index 71efea7a6bfb5662890dae5faae27a3c80afad2b..f3aae2c50d05a05ad4aef36d432b87b4
} }
// Paper end - shear drops API // Paper end - shear drops API
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ccf4d068b4cd11ad666b01bba9cbed1d428e6af3..29b07c04c23772da1b29499e4db9c678ebbd2180 100644 index 7ad309e81ec61a6f2553e9ffeb9a986f4d569b37..3d5c89238ee3fbd3c9b33107995ae47733539960 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -393,6 +393,7 @@ public class PurpurConfig { @@ -393,6 +393,7 @@ public class PurpurConfig {
@@ -202,9 +202,9 @@ index ccf4d068b4cd11ad666b01bba9cbed1d428e6af3..29b07c04c23772da1b29499e4db9c678
} }
+ public static boolean allowShearsLooting = false; + public static boolean allowShearsLooting = false;
public static boolean allowInapplicableEnchants = true; public static boolean allowInapplicableEnchants = false;
public static boolean allowIncompatibleEnchants = true; public static boolean allowIncompatibleEnchants = false;
public static boolean allowHigherEnchantsLevels = true; public static boolean allowHigherEnchantsLevels = false;
@@ -416,6 +417,7 @@ public class PurpurConfig { @@ -416,6 +417,7 @@ public class PurpurConfig {
} }
set("settings.enchantment.anvil.allow-unsafe-enchants", null); set("settings.enchantment.anvil.allow-unsafe-enchants", null);

View File

@@ -59,11 +59,11 @@ index 8ac485d82c2d2b32f4d54e02c18c2cb2c3df4fa4..9ebe6a5f31ceacd33d9c111966ad941b
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 96b50d5f4e3f51f40e57a4061229f09aaa49eb94..94da1ade7a7ee4df42532feb4443513d0d15026a 100644 index 2acc947aa944cee92b7cccfb4aeac507c7dea9eb..dd6b60bcd5b1555437575283f6f89904bfa47741 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -399,6 +399,7 @@ public class PurpurConfig { @@ -399,6 +399,7 @@ public class PurpurConfig {
public static boolean allowHigherEnchantsLevels = true; public static boolean allowHigherEnchantsLevels = false;
public static boolean allowUnsafeEnchantCommand = false; public static boolean allowUnsafeEnchantCommand = false;
public static boolean replaceIncompatibleEnchants = false; public static boolean replaceIncompatibleEnchants = false;
+ public static boolean clampEnchantLevels = true; + public static boolean clampEnchantLevels = true;