From 948b31867a19d1fc963baf3b1f2b97bc0d640301 Mon Sep 17 00:00:00 2001 From: Disy Date: Tue, 25 Jun 2024 00:33:10 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=A0=87=E6=B3=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carpetslsaddition/SLSCarpetSettings.java | 56 +++++++++++++------ .../zly2006/carpetslsaddition/ServerMain.java | 2 - 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/SLSCarpetSettings.java b/src/main/java/com/github/zly2006/carpetslsaddition/SLSCarpetSettings.java index dc4d5de..7d75dff 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/SLSCarpetSettings.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/SLSCarpetSettings.java @@ -3,56 +3,76 @@ package com.github.zly2006.carpetslsaddition; import carpet.api.settings.Rule; import carpet.api.settings.RuleCategory; -import static com.github.zly2006.carpetslsaddition.ServerMain.CARPET_ID; - public class SLSCarpetSettings { public static final String NEED_CLIENT = "needClient"; // 需要客户端安装SLS-Addition或实现相关支持 + public static final String FROM_AMS = "AMS"; + public static final String SLSA = "SLS"; - @Rule(categories = {CARPET_ID, RuleCategory.SURVIVAL}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.SURVIVAL}) public static boolean obtainableReinforcedDeepSlate = false; - @Rule(categories = {CARPET_ID, RuleCategory.OPTIMIZATION}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.OPTIMIZATION}) public static int skipTicksForJoblessVillager = 0; - @Rule(categories = {CARPET_ID, RuleCategory.CREATIVE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.CREATIVE}) public static boolean creativeNoInfinitePickup = false; - @Rule(categories = {CARPET_ID, RuleCategory.OPTIMIZATION}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.OPTIMIZATION}) public static boolean noBatSpawning = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean canUseHatCommand = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean canUseSitCommand = false; - @Rule(categories = {CARPET_ID}, strict = false, options = {"#none"}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA}, strict = false, options = {"#none"}) public static String botPrefix = "#none"; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean creativeObeyEnchantmentRule = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean fakePlayersNotOccupiedSleepQuota = false; - @Rule(categories = {CARPET_ID, RuleCategory.CREATIVE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.CREATIVE}) public static int maxUpdateQueueSize = -1; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE, NEED_CLIENT}) + /** From Plusls Carpet Addition **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE, NEED_CLIENT}) public static boolean emptyShulkerBoxStack = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** From Plusls Carpet Addition **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean playerSit = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean endermanCanPickUpMushroom = true; - @Rule(categories = {CARPET_ID, RuleCategory.CREATIVE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.CREATIVE}) public static boolean oldRedstoneConnectionLogic = false; - @Rule(categories = {CARPET_ID, RuleCategory.OPTIMIZATION}) + /** From Carpet AMS Addition **/ + @Rule(categories = {SLSA, FROM_AMS, RuleCategory.OPTIMIZATION}) public static boolean optimizedOnDragonRespawn = false; - @Rule(categories = {CARPET_ID, RuleCategory.FEATURE}) + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) + public static boolean printStackTraceOnVillagerSpawn = false; + + /** Carpet SLS Addition original **/ + @Rule(categories = {SLSA, RuleCategory.FEATURE}) public static boolean elytraCraftable = false; } diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java b/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java index 50e37b7..11e6922 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java @@ -31,8 +31,6 @@ public class ServerMain implements ModInitializer, CarpetExtension { public static final String MOD_NAME = "Carpet SLS Addition"; public static final Version MOD_VERSION = FabricLoader.getInstance().getModContainer(MOD_ID).get().getMetadata().getVersion(); - public static final String CARPET_ID = "SLS"; - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); static final Gson GSON = new GsonBuilder().setLenient().create(); // 使用宽容模式，避免部分开发者在书写JSON时不遵守RFC 4627规范