Skip to content

Commit 103f5fc

Browse files
PseudoKnightPseudoKnight
committed
Add support for Minecraft 1.21.6
1 parent a1c5a26 commit 103f5fc

11 files changed

Lines changed: 79 additions & 12 deletions

File tree

‎src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,28 @@ public enum MCVanillaMaterial {
17481748
TALL_DRY_GRASS(MCVersion.MC1_21_5),
17491749
TEST_BLOCK(MCVersion.MC1_21_5),
17501750
TEST_INSTANCE_BLOCK(MCVersion.MC1_21_5),
1751-
WILDFLOWERS(MCVersion.MC1_21_5);
1751+
WILDFLOWERS(MCVersion.MC1_21_5),
1752+
1753+
// 1.21.6 additions
1754+
BLACK_HARNESS(MCVersion.MC1_21_6),
1755+
BLUE_HARNESS(MCVersion.MC1_21_6),
1756+
BROWN_HARNESS(MCVersion.MC1_21_6),
1757+
CYAN_HARNESS(MCVersion.MC1_21_6),
1758+
GRAY_HARNESS(MCVersion.MC1_21_6),
1759+
GREEN_HARNESS(MCVersion.MC1_21_6),
1760+
LIGHT_BLUE_HARNESS(MCVersion.MC1_21_6),
1761+
LIGHT_GRAY_HARNESS(MCVersion.MC1_21_6),
1762+
LIME_HARNESS(MCVersion.MC1_21_6),
1763+
MAGENTA_HARNESS(MCVersion.MC1_21_6),
1764+
ORANGE_HARNESS(MCVersion.MC1_21_6),
1765+
PINK_HARNESS(MCVersion.MC1_21_6),
1766+
PURPLE_HARNESS(MCVersion.MC1_21_6),
1767+
RED_HARNESS(MCVersion.MC1_21_6),
1768+
WHITE_HARNESS(MCVersion.MC1_21_6),
1769+
YELLOW_HARNESS(MCVersion.MC1_21_6),
1770+
DRIED_GHAST(MCVersion.MC1_21_6),
1771+
HAPPY_GHAST_SPAWN_EGG(MCVersion.MC1_21_6),
1772+
MUSIC_DISC_TEARS(MCVersion.MC1_21_6);
17521773

17531774
private final MCVersion since;
17541775
private final MCVersion until;

‎src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ private static void SetupTempOp() throws ClassNotFoundException {
439439
// Get some version specific mappings
440440
String nms = "net.minecraft.server";
441441
String playersPackage = nms + ".players";
442-
String ops = "p";
442+
String ops = isPaper ? "ops" : "p";
443443
String getPlayerList = isPaper ? "getPlayerList" : "ag";
444444
MCVersion mcversion = Static.getServer().getMinecraftVersion();
445445
if(mcversion.lt(MCVersion.MC1_21_3)) {

‎src/main/java/com/laytonsmith/abstraction/enums/MCAttribute.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ public enum MCVanillaAttribute {
101101
PLAYER_SUBMERGED_MINING_SPEED(MCVersion.MC1_21),
102102
PLAYER_SWEEPING_DAMAGE_RATIO(MCVersion.MC1_21),
103103
TEMPT_RANGE(MCVersion.MC1_21_3),
104+
CAMERA_DISTANCE(MCVersion.MC1_21_6),
105+
WAYPOINT_TRANSMIT_RANGE(MCVersion.MC1_21_6),
106+
WAYPOINT_RECEIVE_RANGE(MCVersion.MC1_21_6),
104107

105108
UNKNOWN(MCVersion.NEVER);
106109

‎src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ public enum MCVanillaEntityType {
206206
GLOW_SQUID(true, MCVersion.MC1_17),
207207
GOAT(true, MCVersion.MC1_17),
208208
GUARDIAN,
209+
HAPPY_GHAST(true, MCVersion.MC1_21_6),
209210
HOGLIN(true, MCVersion.MC1_16),
210211
HORSE,
211212
HUSK,

‎src/main/java/com/laytonsmith/abstraction/enums/MCGameRule.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public enum MCGameRule {
4242
GLOBALSOUNDEVENTS("globalSoundEvents"),
4343
KEEPINVENTORY("keepInventory"),
4444
LAVASOURCECONVERSION("lavaSourceConversion"),
45+
LOCATORBAR("locatorBar"),
4546
LOGADMINCOMMANDS("logAdminCommands"),
4647
MAXCOMMANDCHAINLENGTH("maxCommandChainLength", CInt.class),
4748
MAXCOMMANDFORKCOUNT("maxCommandForkCount", CInt.class),

‎src/main/java/com/laytonsmith/abstraction/enums/MCPlayerStatistic.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public enum MCPlayerStatistic {
8787
INTERACT_WITH_GRINDSTONE(Type.NONE, MCVersion.MC1_15),
8888
TARGET_HIT(Type.NONE, MCVersion.MC1_16),
8989
INTERACT_WITH_SMITHING_TABLE(Type.NONE, MCVersion.MC1_16),
90-
STRIDER_ONE_CM(Type.NONE, MCVersion.MC1_16);
90+
STRIDER_ONE_CM(Type.NONE, MCVersion.MC1_16),
91+
HAPPY_GHAST_ONE_CM(Type.NONE, MCVersion.MC1_21_6);
9192

9293
private final Type type;
9394
private final MCVersion since;

‎src/main/java/com/laytonsmith/abstraction/enums/MCSound.java‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ public enum MCVanillaSound {
560560
ENTITY_ITEM_FRAME_PLACE,
561561
ENTITY_ITEM_FRAME_REMOVE_ITEM,
562562
ENTITY_ITEM_FRAME_ROTATE_ITEM,
563-
ENTITY_LEASH_KNOT_BREAK,
564-
ENTITY_LEASH_KNOT_PLACE,
563+
ENTITY_LEASH_KNOT_BREAK(MCVersion.MC1_9, MCVersion.MC1_21_5),
564+
ENTITY_LEASH_KNOT_PLACE(MCVersion.MC1_9, MCVersion.MC1_21_5),
565565
ENTITY_LIGHTNING_BOLT_IMPACT,
566566
ENTITY_LIGHTNING_BOLT_THUNDER,
567567
ENTITY_LINGERING_POTION_THROW,
@@ -671,7 +671,7 @@ public enum MCVanillaSound {
671671
ENTITY_PHANTOM_HURT,
672672
ENTITY_PHANTOM_SWOOP,
673673
ENTITY_PLAYER_SPLASH_HIGH_SPEED,
674-
ENTITY_PUFFER_FISH_AMBIENT,
674+
ENTITY_PUFFER_FISH_AMBIENT(MCVersion.MC1_13, MCVersion.MC1_21_5),
675675
ENTITY_PUFFER_FISH_BLOW_OUT,
676676
ENTITY_PUFFER_FISH_BLOW_UP,
677677
ENTITY_PUFFER_FISH_DEATH,
@@ -1772,7 +1772,7 @@ public enum MCVanillaSound {
17721772
BLOCK_LEAF_LITTER_HIT(MCVersion.MC1_21_5),
17731773
BLOCK_LEAF_LITTER_FALL(MCVersion.MC1_21_5),
17741774
BLOCK_SAND_IDLE(MCVersion.MC1_21_5),
1775-
BLOCK_SAND_WIND(MCVersion.MC1_21_5),
1775+
BLOCK_SAND_WIND(MCVersion.MC1_21_5, MCVersion.MC1_21_5),
17761776
ENTITY_WOLF_ANGRY_AMBIENT(MCVersion.MC1_21_5),
17771777
ENTITY_WOLF_ANGRY_DEATH(MCVersion.MC1_21_5),
17781778
ENTITY_WOLF_ANGRY_GROWL(MCVersion.MC1_21_5),
@@ -1810,6 +1810,37 @@ public enum MCVanillaSound {
18101810
ENTITY_WOLF_SAD_PANT(MCVersion.MC1_21_5),
18111811
ENTITY_WOLF_SAD_WHINE(MCVersion.MC1_21_5),
18121812

1813+
// 1.21.6 additions
1814+
BLOCK_DRIED_GHAST_AMBIENT(MCVersion.MC1_21_6),
1815+
BLOCK_DRIED_GHAST_AMBIENT_WATER(MCVersion.MC1_21_6),
1816+
BLOCK_DRIED_GHAST_BREAK(MCVersion.MC1_21_6),
1817+
BLOCK_DRIED_GHAST_FALL(MCVersion.MC1_21_6),
1818+
BLOCK_DRIED_GHAST_PLACE(MCVersion.MC1_21_6),
1819+
BLOCK_DRIED_GHAST_PLACE_IN_WATER(MCVersion.MC1_21_6),
1820+
BLOCK_DRIED_GHAST_STEP(MCVersion.MC1_21_6),
1821+
BLOCK_DRIED_GHAST_TRANSITION(MCVersion.MC1_21_6),
1822+
BLOCK_DRY_GRASS_AMBIENT(MCVersion.MC1_21_6),
1823+
ENTITY_GHASTLING_AMBIENT(MCVersion.MC1_21_6),
1824+
ENTITY_GHASTLING_DEATH(MCVersion.MC1_21_6),
1825+
ENTITY_GHASTLING_HURT(MCVersion.MC1_21_6),
1826+
ENTITY_GHASTLING_SPAWN(MCVersion.MC1_21_6),
1827+
ENTITY_HAPPY_GHAST_AMBIENT(MCVersion.MC1_21_6),
1828+
ENTITY_HAPPY_GHAST_DEATH(MCVersion.MC1_21_6),
1829+
ENTITY_HAPPY_GHAST_EQUIP(MCVersion.MC1_21_6),
1830+
ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN(MCVersion.MC1_21_6),
1831+
ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP(MCVersion.MC1_21_6),
1832+
ENTITY_HAPPY_GHAST_HURT(MCVersion.MC1_21_6),
1833+
ENTITY_HAPPY_GHAST_RIDING(MCVersion.MC1_21_6),
1834+
ENTITY_HAPPY_GHAST_UNEQUIP(MCVersion.MC1_21_6),
1835+
ITEM_HORSE_ARMOR_UNEQUIP(MCVersion.MC1_21_6),
1836+
ITEM_LEAD_BREAK(MCVersion.MC1_21_6),
1837+
ITEM_LEAD_TIED(MCVersion.MC1_21_6),
1838+
ITEM_LEAD_UNTIED(MCVersion.MC1_21_6),
1839+
ITEM_LLAMA_CARPET_UNEQUIP(MCVersion.MC1_21_6),
1840+
ITEM_SADDLE_UNEQUIP(MCVersion.MC1_21_6),
1841+
ITEM_SHEARS_SNIP(MCVersion.MC1_21_6),
1842+
MUSIC_DISC_TEARS(MCVersion.MC1_21_6),
1843+
18131844
UNKNOWN(MCVersion.NEVER);
18141845

18151846
private final MCVersion since;

‎src/main/java/com/laytonsmith/abstraction/enums/MCSoundCategory.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ public enum MCSoundCategory {
1313
NEUTRAL,
1414
PLAYERS,
1515
AMBIENT,
16-
VOICE
16+
VOICE,
17+
UI
1718
}

‎src/main/java/com/laytonsmith/abstraction/enums/MCUnleashReason.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ public enum MCUnleashReason {
44
HOLDER_GONE,
55
PLAYER_UNLEASH,
66
DISTANCE,
7+
SHEAR,
8+
FIREWORK,
79
UNKNOWN
810
}

‎src/main/java/com/laytonsmith/abstraction/enums/MCVersion.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public enum MCVersion implements Version {
7676
MC1_21_3,
7777
MC1_21_4,
7878
MC1_21_5,
79+
MC1_21_6,
7980
MC1_21_X,
8081
MC1_X,
8182
MC2_X,

0 commit comments

Comments
 (0)