enhancement

Renamed `/endermanBlockList type disabled` to `/endermanBlockList type vanilla` & Added `/endermanBlockList type disable_all`

Author: Calboot

README.md

@@ -84,7 +84,9 @@ Mostly based on [Fallen-Breath's template](https://github.com/Fallen-Breath/fabr
             - *Any blocks not listed in the blacklist can be picked up*
         - whitelist
             - *Only blocks listed in the whitelist can be picked up*
-        - disabled
+        - disable_all
+            - *No blocks can be moved*
+        - vanilla
             - *Default state, with no actual impact to the game*
     - whitelist & blacklist
         - add \<block>

README_zh.md

@@ -84,7 +84,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
             - *任何不在黑名单中的方块均可被捡起*
         - whitelist
             - *在白名单里的方块可被捡起*
-        - disabled
+        - disable_all
+            - *阻止末影人拿起任何方块*
+        - vanilla
             - *默认模式，对游戏机制无影响*
     - whitelist & blacklist
         - add \<block>

changelog.md

@@ -0,0 +1,5 @@
+### General
+
+- Renamed `/endermanBlockList type disabled` to `/endermanBlockList type vanilla`
+- Added `/endermanBlockList type disable_all`
+- Support for 26.1-snapshot-3

src/main/java/com/ayakacraft/carpetayakaaddition/commands/endermanblocklist/EndermanBlockListCommand.java

@@ -167,7 +167,7 @@ private static int removeFromWhitelist(CommandContext<CommandSourceStack> contex
     private static int get(CommandContext<CommandSourceStack> context) {
         CommandSourceStack           source = context.getSource();
         EndermanBlockListConfig      config = getConfig(source.getServer());
-        EndermanBlockListConfig.Type type   = config == null ? EndermanBlockListConfig.Type.DISABLED : config.getType();
+        EndermanBlockListConfig.Type type   = config == null ? EndermanBlockListConfig.Type.VANILLA : config.getType();
         sendFeedback(
                 source,
                 TR.tr("type", type.name().toLowerCase(Locale.ROOT)),

src/main/java/com/ayakacraft/carpetayakaaddition/commands/endermanblocklist/EndermanBlockListConfig.java

@@ -24,6 +24,7 @@
 import com.ayakacraft.carpetayakaaddition.utils.IdentifierUtils;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.gson.annotations.SerializedName;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.Contract;
@@ -92,14 +93,14 @@ public static void remove(MinecraftServer server) {
     private TreeSet<String> whitelist;
 
     private EndermanBlockListConfig() {
-        this.type = Type.DISABLED;
+        this.type = Type.VANILLA;
         this.blacklist = Sets.newTreeSet();
         this.whitelist = Sets.newTreeSet();
     }
 
     private void ensureNullSafety() {
         if (this.type == null) {
-            this.type = Type.DISABLED;
+            this.type = Type.VANILLA;
         }
         if (this.blacklist == null) {
             this.blacklist = Sets.newTreeSet();
@@ -114,7 +115,7 @@ public Type getType() {
     }
 
     public void setType(Type type) {
-        this.type = type == null ? Type.DISABLED : type;
+        this.type = type == null ? Type.VANILLA : type;
     }
 
     public TreeSet<String> getWhitelist() {
@@ -128,11 +129,13 @@ public TreeSet<String> getBlacklist() {
     public boolean verifyBlock(Block block) {
         String s = IdentifierUtils.ofBlock(block).toString();
         switch (type) {
+            case DISABLE_ALL:
+                return false;
+            case WHITELIST:
+                return getWhitelist().contains(s);
             case BLACKLIST:
             case BLACKLIST_LOOSE:
                 return !getBlacklist().contains(s);
-            case WHITELIST:
-                return getWhitelist().contains(s);
             default:
                 return true;
         }
@@ -142,7 +145,9 @@ public enum Type {
         BLACKLIST,
         BLACKLIST_LOOSE,
         WHITELIST,
-        DISABLED
+        DISABLE_ALL,
+        @SerializedName(value = "VANILLA", alternate = "DISABLED")
+        VANILLA
     }
 
 }

versions/1.21.11/gradle.properties

@@ -12,7 +12,7 @@ parchment=2025.12.20
 # Mod Dependency
 # check available versions on maven for the given minecraft version you are using
 # https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_core_version=1.21.11-1.4.194+v260107
+carpet_core_version=1.21.11-1.4.193+v251211
 carpet_dependency=>=1.4.193
 # https://maven.fallenbreath.me/#/releases/carpettisaddition/carpet-tis-addition
 tis_version=1.74.3-mc1.21.11