Add support for Minecraft 1.21.6

PseudoKnight · PseudoKnight · commit 103f5fce8eb0 · 2025-06-17T18:21:28.000-07:00
diff --git a/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java b/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java
@@ -1748,7 +1748,28 @@ public enum MCVanillaMaterial {
 		TALL_DRY_GRASS(MCVersion.MC1_21_5),
 		TEST_BLOCK(MCVersion.MC1_21_5),
 		TEST_INSTANCE_BLOCK(MCVersion.MC1_21_5),
-		WILDFLOWERS(MCVersion.MC1_21_5);
+		WILDFLOWERS(MCVersion.MC1_21_5),
+
+		// 1.21.6 additions
+		BLACK_HARNESS(MCVersion.MC1_21_6),
+		BLUE_HARNESS(MCVersion.MC1_21_6),
+		BROWN_HARNESS(MCVersion.MC1_21_6),
+		CYAN_HARNESS(MCVersion.MC1_21_6),
+		GRAY_HARNESS(MCVersion.MC1_21_6),
+		GREEN_HARNESS(MCVersion.MC1_21_6),
+		LIGHT_BLUE_HARNESS(MCVersion.MC1_21_6),
+		LIGHT_GRAY_HARNESS(MCVersion.MC1_21_6),
+		LIME_HARNESS(MCVersion.MC1_21_6),
+		MAGENTA_HARNESS(MCVersion.MC1_21_6),
+		ORANGE_HARNESS(MCVersion.MC1_21_6),
+		PINK_HARNESS(MCVersion.MC1_21_6),
+		PURPLE_HARNESS(MCVersion.MC1_21_6),
+		RED_HARNESS(MCVersion.MC1_21_6),
+		WHITE_HARNESS(MCVersion.MC1_21_6),
+		YELLOW_HARNESS(MCVersion.MC1_21_6),
+		DRIED_GHAST(MCVersion.MC1_21_6),
+		HAPPY_GHAST_SPAWN_EGG(MCVersion.MC1_21_6),
+		MUSIC_DISC_TEARS(MCVersion.MC1_21_6);
 
 		private final MCVersion since;
 		private final MCVersion until;
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java
@@ -439,7 +439,7 @@ private static void SetupTempOp() throws ClassNotFoundException {
 		// Get some version specific mappings
 		String nms = "net.minecraft.server";
 		String playersPackage = nms + ".players";
-		String ops = "p";
+		String ops = isPaper ? "ops" : "p";
 		String getPlayerList = isPaper ? "getPlayerList" : "ag";
 		MCVersion mcversion = Static.getServer().getMinecraftVersion();
 		if(mcversion.lt(MCVersion.MC1_21_3)) {
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCAttribute.java b/src/main/java/com/laytonsmith/abstraction/enums/MCAttribute.java
@@ -101,6 +101,9 @@ public enum MCVanillaAttribute {
 		PLAYER_SUBMERGED_MINING_SPEED(MCVersion.MC1_21),
 		PLAYER_SWEEPING_DAMAGE_RATIO(MCVersion.MC1_21),
 		TEMPT_RANGE(MCVersion.MC1_21_3),
+		CAMERA_DISTANCE(MCVersion.MC1_21_6),
+		WAYPOINT_TRANSMIT_RANGE(MCVersion.MC1_21_6),
+		WAYPOINT_RECEIVE_RANGE(MCVersion.MC1_21_6),
 
 		UNKNOWN(MCVersion.NEVER);
 
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java b/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java
@@ -206,6 +206,7 @@ public enum MCVanillaEntityType {
 		GLOW_SQUID(true, MCVersion.MC1_17),
 		GOAT(true, MCVersion.MC1_17),
 		GUARDIAN,
+		HAPPY_GHAST(true, MCVersion.MC1_21_6),
 		HOGLIN(true, MCVersion.MC1_16),
 		HORSE,
 		HUSK,
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCGameRule.java b/src/main/java/com/laytonsmith/abstraction/enums/MCGameRule.java
@@ -42,6 +42,7 @@ public enum MCGameRule {
 	GLOBALSOUNDEVENTS("globalSoundEvents"),
 	KEEPINVENTORY("keepInventory"),
 	LAVASOURCECONVERSION("lavaSourceConversion"),
+	LOCATORBAR("locatorBar"),
 	LOGADMINCOMMANDS("logAdminCommands"),
 	MAXCOMMANDCHAINLENGTH("maxCommandChainLength", CInt.class),
 	MAXCOMMANDFORKCOUNT("maxCommandForkCount", CInt.class),
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCPlayerStatistic.java b/src/main/java/com/laytonsmith/abstraction/enums/MCPlayerStatistic.java
@@ -87,7 +87,8 @@ public enum MCPlayerStatistic {
 	INTERACT_WITH_GRINDSTONE(Type.NONE, MCVersion.MC1_15),
 	TARGET_HIT(Type.NONE, MCVersion.MC1_16),
 	INTERACT_WITH_SMITHING_TABLE(Type.NONE, MCVersion.MC1_16),
-	STRIDER_ONE_CM(Type.NONE, MCVersion.MC1_16);
+	STRIDER_ONE_CM(Type.NONE, MCVersion.MC1_16),
+	HAPPY_GHAST_ONE_CM(Type.NONE, MCVersion.MC1_21_6);
 
 	private final Type type;
 	private final MCVersion since;
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCSound.java b/src/main/java/com/laytonsmith/abstraction/enums/MCSound.java
@@ -560,8 +560,8 @@ public enum MCVanillaSound {
 		ENTITY_ITEM_FRAME_PLACE,
 		ENTITY_ITEM_FRAME_REMOVE_ITEM,
 		ENTITY_ITEM_FRAME_ROTATE_ITEM,
-		ENTITY_LEASH_KNOT_BREAK,
-		ENTITY_LEASH_KNOT_PLACE,
+		ENTITY_LEASH_KNOT_BREAK(MCVersion.MC1_9, MCVersion.MC1_21_5),
+		ENTITY_LEASH_KNOT_PLACE(MCVersion.MC1_9, MCVersion.MC1_21_5),
 		ENTITY_LIGHTNING_BOLT_IMPACT,
 		ENTITY_LIGHTNING_BOLT_THUNDER,
 		ENTITY_LINGERING_POTION_THROW,
@@ -671,7 +671,7 @@ public enum MCVanillaSound {
 		ENTITY_PHANTOM_HURT,
 		ENTITY_PHANTOM_SWOOP,
 		ENTITY_PLAYER_SPLASH_HIGH_SPEED,
-		ENTITY_PUFFER_FISH_AMBIENT,
+		ENTITY_PUFFER_FISH_AMBIENT(MCVersion.MC1_13, MCVersion.MC1_21_5),
 		ENTITY_PUFFER_FISH_BLOW_OUT,
 		ENTITY_PUFFER_FISH_BLOW_UP,
 		ENTITY_PUFFER_FISH_DEATH,
@@ -1772,7 +1772,7 @@ public enum MCVanillaSound {
 		BLOCK_LEAF_LITTER_HIT(MCVersion.MC1_21_5),
 		BLOCK_LEAF_LITTER_FALL(MCVersion.MC1_21_5),
 		BLOCK_SAND_IDLE(MCVersion.MC1_21_5),
-		BLOCK_SAND_WIND(MCVersion.MC1_21_5),
+		BLOCK_SAND_WIND(MCVersion.MC1_21_5, MCVersion.MC1_21_5),
 		ENTITY_WOLF_ANGRY_AMBIENT(MCVersion.MC1_21_5),
 		ENTITY_WOLF_ANGRY_DEATH(MCVersion.MC1_21_5),
 		ENTITY_WOLF_ANGRY_GROWL(MCVersion.MC1_21_5),
@@ -1810,6 +1810,37 @@ public enum MCVanillaSound {
 		ENTITY_WOLF_SAD_PANT(MCVersion.MC1_21_5),
 		ENTITY_WOLF_SAD_WHINE(MCVersion.MC1_21_5),
 
+		// 1.21.6 additions
+		BLOCK_DRIED_GHAST_AMBIENT(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_AMBIENT_WATER(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_BREAK(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_FALL(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_PLACE(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_PLACE_IN_WATER(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_STEP(MCVersion.MC1_21_6),
+		BLOCK_DRIED_GHAST_TRANSITION(MCVersion.MC1_21_6),
+		BLOCK_DRY_GRASS_AMBIENT(MCVersion.MC1_21_6),
+		ENTITY_GHASTLING_AMBIENT(MCVersion.MC1_21_6),
+		ENTITY_GHASTLING_DEATH(MCVersion.MC1_21_6),
+		ENTITY_GHASTLING_HURT(MCVersion.MC1_21_6),
+		ENTITY_GHASTLING_SPAWN(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_AMBIENT(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_DEATH(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_EQUIP(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_HURT(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_RIDING(MCVersion.MC1_21_6),
+		ENTITY_HAPPY_GHAST_UNEQUIP(MCVersion.MC1_21_6),
+		ITEM_HORSE_ARMOR_UNEQUIP(MCVersion.MC1_21_6),
+		ITEM_LEAD_BREAK(MCVersion.MC1_21_6),
+		ITEM_LEAD_TIED(MCVersion.MC1_21_6),
+		ITEM_LEAD_UNTIED(MCVersion.MC1_21_6),
+		ITEM_LLAMA_CARPET_UNEQUIP(MCVersion.MC1_21_6),
+		ITEM_SADDLE_UNEQUIP(MCVersion.MC1_21_6),
+		ITEM_SHEARS_SNIP(MCVersion.MC1_21_6),
+		MUSIC_DISC_TEARS(MCVersion.MC1_21_6),
+
 		UNKNOWN(MCVersion.NEVER);
 
 		private final MCVersion since;
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCSoundCategory.java b/src/main/java/com/laytonsmith/abstraction/enums/MCSoundCategory.java
@@ -13,5 +13,6 @@ public enum MCSoundCategory {
 	NEUTRAL,
 	PLAYERS,
 	AMBIENT,
-	VOICE
+	VOICE,
+	UI
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCUnleashReason.java b/src/main/java/com/laytonsmith/abstraction/enums/MCUnleashReason.java
@@ -4,5 +4,7 @@ public enum MCUnleashReason {
 	HOLDER_GONE,
 	PLAYER_UNLEASH,
 	DISTANCE,
+	SHEAR,
+	FIREWORK,
 	UNKNOWN
 }
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCVersion.java b/src/main/java/com/laytonsmith/abstraction/enums/MCVersion.java
@@ -76,6 +76,7 @@ public enum MCVersion implements Version {
 	MC1_21_3,
 	MC1_21_4,
 	MC1_21_5,
+	MC1_21_6,
 	MC1_21_X,
 	MC1_X,
 	MC2_X,
diff --git a/src/main/resources/docs/Compatibility b/src/main/resources/docs/Compatibility
@@ -3,7 +3,7 @@ In general, the compatibility requirements, if not listed, are the same as the p
 The minimum requirements for the current builds are:
 
 * Java 16
-* Spigot or Paper 1.16.5 - 1.21.5 (when used as a plugin)
+* Spigot or Paper 1.16.5 - 1.21.6 (when used as a plugin)
 
 CommandHelper may still be backwards and forward compatible to a large degree. Many of the advanced features that
 normally have hard dependencies on certain versions of external dependencies have been configured to "soft" fail.
@@ -15,11 +15,16 @@ Regardless, only the most current builds are officially supported.
 |-
 ! scope="col" width="11%" | Build
 ! scope="col" width="8%" | Source
-! scope="col" width="60%" | Milestone
-! scope="col" width="21%" | Compatibility
+! scope="col" width="63%" | Milestone
+! scope="col" width="18%" | Compatibility
 |-
-| 3.3.5 build-552
+| 3.3.5 build-564
 |
+| Added support for Spigot 1.21.6
+| Spigot 1.16.5 - 1.21.6
+|-
+| 3.3.5 build-552
+| [https://github.com/EngineHub/CommandHelper/commit/c6a961e1c02e2a24fe9994468b0076a10bb8a536 c6a961e]
 | Added support for Spigot 1.21.5
 | Spigot 1.16.5 - 1.21.5
 |-

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ public enum MCSoundCategory {`
`13`	`13`	`NEUTRAL,`
`14`	`14`	`PLAYERS,`
`15`	`15`	`AMBIENT,`
`16`		`- VOICE`
	`16`	`+ VOICE,`
	`17`	`+ UI`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@ public enum MCUnleashReason {`
`4`	`4`	`HOLDER_GONE,`
`5`	`5`	`PLAYER_UNLEASH,`
`6`	`6`	`DISTANCE,`
	`7`	`+ SHEAR,`
	`8`	`+ FIREWORK,`
`7`	`9`	`UNKNOWN`
`8`	`10`	`}`