From 13c923add7f9933676128889c0c377974bf04c18 Mon Sep 17 00:00:00 2001 From: PseudoKnight Date: Wed, 7 Feb 2024 21:32:15 -0800 Subject: [PATCH] Fix MC 1.19.4 / 1.20.4 compat after last commit --- .../abstraction/blocks/MCMaterial.java | 202 +++++++-------- .../bukkit/BukkitMCPotionMeta.java | 2 +- .../bukkit/BukkitMCSuspiciousStewMeta.java | 2 +- .../entities/BukkitMCAreaEffectCloud.java | 2 +- .../bukkit/entities/BukkitMCArrow.java | 2 +- .../bukkit/entities/BukkitMCLivingEntity.java | 2 +- .../bukkit/entities/BukkitMCPlayer.java | 2 +- .../abstraction/enums/MCBiomeType.java | 2 +- .../abstraction/enums/MCEntityType.java | 14 +- .../abstraction/enums/MCParticle.java | 18 +- .../abstraction/enums/MCSound.java | 234 +++++++++--------- .../enums/bukkit/BukkitMCLegacyMaterial.java | 2 +- .../com/laytonsmith/core/ObjectGenerator.java | 4 +- .../core/events/drivers/PlayerEvents.java | 4 +- 14 files changed, 246 insertions(+), 246 deletions(-) diff --git a/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java b/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java index 244713343..6f7365f1b 100644 --- a/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java +++ b/src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java @@ -259,7 +259,7 @@ public enum MCVanillaMaterial { CUT_SANDSTONE, COBWEB, GRASS(MCVersion.MC1_0, MCVersion.MC1_20_2), - SHORT_GRASS(MCVersion.MC1_20_X), // changed from GRASS + SHORT_GRASS(MCVersion.MC1_20_4), // changed from GRASS FERN, DEAD_BUSH, SEAGRASS, @@ -1505,49 +1505,49 @@ public enum MCVanillaMaterial { CAMEL_SPAWN_EGG(MCVersion.MC1_19_3), // 1.19.4 experimental additions for 1.20 (enabled with feature flag on this version) - BRUSH(MCVersion.MC1_19_X), - CHERRY_BOAT(MCVersion.MC1_19_X), - CHERRY_BUTTON(MCVersion.MC1_19_X), - CHERRY_CHEST_BOAT(MCVersion.MC1_19_X), - CHERRY_DOOR(MCVersion.MC1_19_X), - CHERRY_FENCE(MCVersion.MC1_19_X), - CHERRY_FENCE_GATE(MCVersion.MC1_19_X), - CHERRY_HANGING_SIGN(MCVersion.MC1_19_X), - CHERRY_LEAVES(MCVersion.MC1_19_X), - CHERRY_LOG(MCVersion.MC1_19_X), - CHERRY_PLANKS(MCVersion.MC1_19_X), - CHERRY_PRESSURE_PLATE(MCVersion.MC1_19_X), - CHERRY_SAPLING(MCVersion.MC1_19_X), - CHERRY_SIGN(MCVersion.MC1_19_X), - CHERRY_SLAB(MCVersion.MC1_19_X), - CHERRY_STAIRS(MCVersion.MC1_19_X), - CHERRY_TRAPDOOR(MCVersion.MC1_19_X), - CHERRY_WALL_HANGING_SIGN(MCVersion.MC1_19_X), - CHERRY_WALL_SIGN(MCVersion.MC1_19_X), - CHERRY_WOOD(MCVersion.MC1_19_X), - STRIPPED_CHERRY_LOG(MCVersion.MC1_19_X), - STRIPPED_CHERRY_WOOD(MCVersion.MC1_19_X), - PINK_PETALS(MCVersion.MC1_19_X), - DECORATED_POT(MCVersion.MC1_19_X), - SNIFFER_SPAWN_EGG(MCVersion.MC1_19_X), - SUSPICIOUS_SAND(MCVersion.MC1_19_X), - TORCHFLOWER(MCVersion.MC1_19_X), - TORCHFLOWER_CROP(MCVersion.MC1_19_X), - TORCHFLOWER_SEEDS(MCVersion.MC1_19_X), - POTTED_CHERRY_SAPLING(MCVersion.MC1_19_X), - POTTED_TORCHFLOWER(MCVersion.MC1_19_X), - COAST_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - DUNE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - EYE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - NETHERITE_UPGRADE_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - RIB_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - TIDE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - VEX_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - WARD_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), - WILD_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_X), + BRUSH(MCVersion.MC1_19_4), + CHERRY_BOAT(MCVersion.MC1_19_4), + CHERRY_BUTTON(MCVersion.MC1_19_4), + CHERRY_CHEST_BOAT(MCVersion.MC1_19_4), + CHERRY_DOOR(MCVersion.MC1_19_4), + CHERRY_FENCE(MCVersion.MC1_19_4), + CHERRY_FENCE_GATE(MCVersion.MC1_19_4), + CHERRY_HANGING_SIGN(MCVersion.MC1_19_4), + CHERRY_LEAVES(MCVersion.MC1_19_4), + CHERRY_LOG(MCVersion.MC1_19_4), + CHERRY_PLANKS(MCVersion.MC1_19_4), + CHERRY_PRESSURE_PLATE(MCVersion.MC1_19_4), + CHERRY_SAPLING(MCVersion.MC1_19_4), + CHERRY_SIGN(MCVersion.MC1_19_4), + CHERRY_SLAB(MCVersion.MC1_19_4), + CHERRY_STAIRS(MCVersion.MC1_19_4), + CHERRY_TRAPDOOR(MCVersion.MC1_19_4), + CHERRY_WALL_HANGING_SIGN(MCVersion.MC1_19_4), + CHERRY_WALL_SIGN(MCVersion.MC1_19_4), + CHERRY_WOOD(MCVersion.MC1_19_4), + STRIPPED_CHERRY_LOG(MCVersion.MC1_19_4), + STRIPPED_CHERRY_WOOD(MCVersion.MC1_19_4), + PINK_PETALS(MCVersion.MC1_19_4), + DECORATED_POT(MCVersion.MC1_19_4), + SNIFFER_SPAWN_EGG(MCVersion.MC1_19_4), + SUSPICIOUS_SAND(MCVersion.MC1_19_4), + TORCHFLOWER(MCVersion.MC1_19_4), + TORCHFLOWER_CROP(MCVersion.MC1_19_4), + TORCHFLOWER_SEEDS(MCVersion.MC1_19_4), + POTTED_CHERRY_SAPLING(MCVersion.MC1_19_4), + POTTED_TORCHFLOWER(MCVersion.MC1_19_4), + COAST_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + DUNE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + EYE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + NETHERITE_UPGRADE_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + RIB_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + TIDE_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + VEX_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + WARD_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), + WILD_ARMOR_TRIM_SMITHING_TEMPLATE(MCVersion.MC1_19_4), // Other 1.20 additions SUSPICIOUS_GRAVEL(MCVersion.MC1_20), @@ -1584,63 +1584,63 @@ public enum MCVanillaMaterial { SNORT_POTTERY_SHERD(MCVersion.MC1_20), // 1.20.3 experimental additions for 1.21 - CRAFTER(MCVersion.MC1_20_X), - CHISELED_COPPER(MCVersion.MC1_20_X), - EXPOSED_CHISELED_COPPER(MCVersion.MC1_20_X), - WEATHERED_CHISELED_COPPER(MCVersion.MC1_20_X), - OXIDIZED_CHISELED_COPPER(MCVersion.MC1_20_X), - WAXED_CHISELED_COPPER(MCVersion.MC1_20_X), - WAXED_EXPOSED_CHISELED_COPPER(MCVersion.MC1_20_X), - WAXED_WEATHERED_CHISELED_COPPER(MCVersion.MC1_20_X), - WAXED_OXIDIZED_CHISELED_COPPER(MCVersion.MC1_20_X), - COPPER_BULB(MCVersion.MC1_20_X), - EXPOSED_COPPER_BULB(MCVersion.MC1_20_X), - WEATHERED_COPPER_BULB(MCVersion.MC1_20_X), - OXIDIZED_COPPER_BULB(MCVersion.MC1_20_X), - WAXED_COPPER_BULB(MCVersion.MC1_20_X), - WAXED_EXPOSED_COPPER_BULB(MCVersion.MC1_20_X), - WAXED_WEATHERED_COPPER_BULB(MCVersion.MC1_20_X), - WAXED_OXIDIZED_COPPER_BULB(MCVersion.MC1_20_X), - COPPER_DOOR(MCVersion.MC1_20_X), - EXPOSED_COPPER_DOOR(MCVersion.MC1_20_X), - WEATHERED_COPPER_DOOR(MCVersion.MC1_20_X), - OXIDIZED_COPPER_DOOR(MCVersion.MC1_20_X), - WAXED_COPPER_DOOR(MCVersion.MC1_20_X), - WAXED_EXPOSED_COPPER_DOOR(MCVersion.MC1_20_X), - WAXED_WEATHERED_COPPER_DOOR(MCVersion.MC1_20_X), - WAXED_OXIDIZED_COPPER_DOOR(MCVersion.MC1_20_X), - COPPER_GRATE(MCVersion.MC1_20_X), - EXPOSED_COPPER_GRATE(MCVersion.MC1_20_X), - WEATHERED_COPPER_GRATE(MCVersion.MC1_20_X), - OXIDIZED_COPPER_GRATE(MCVersion.MC1_20_X), - WAXED_COPPER_GRATE(MCVersion.MC1_20_X), - WAXED_EXPOSED_COPPER_GRATE(MCVersion.MC1_20_X), - WAXED_WEATHERED_COPPER_GRATE(MCVersion.MC1_20_X), - WAXED_OXIDIZED_COPPER_GRATE(MCVersion.MC1_20_X), - COPPER_TRAPDOOR(MCVersion.MC1_20_X), - EXPOSED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - WEATHERED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - OXIDIZED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - WAXED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - WAXED_EXPOSED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - WAXED_WEATHERED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - WAXED_OXIDIZED_COPPER_TRAPDOOR(MCVersion.MC1_20_X), - BREEZE_SPAWN_EGG(MCVersion.MC1_20_X), - TRIAL_SPAWNER(MCVersion.MC1_20_X), - TRIAL_KEY(MCVersion.MC1_20_X), - TUFF_BRICKS(MCVersion.MC1_20_X), - TUFF_BRICK_SLAB(MCVersion.MC1_20_X), - TUFF_BRICK_STAIRS(MCVersion.MC1_20_X), - TUFF_BRICK_WALL(MCVersion.MC1_20_X), - TUFF_SLAB(MCVersion.MC1_20_X), - TUFF_STAIRS(MCVersion.MC1_20_X), - TUFF_WALL(MCVersion.MC1_20_X), - CHISELED_TUFF(MCVersion.MC1_20_X), - POLISHED_TUFF(MCVersion.MC1_20_X), - CHISELED_TUFF_BRICKS(MCVersion.MC1_20_X), - POLISHED_TUFF_SLAB(MCVersion.MC1_20_X), - POLISHED_TUFF_STAIRS(MCVersion.MC1_20_X), - POLISHED_TUFF_WALL(MCVersion.MC1_20_X); + CRAFTER(MCVersion.MC1_20_4), + CHISELED_COPPER(MCVersion.MC1_20_4), + EXPOSED_CHISELED_COPPER(MCVersion.MC1_20_4), + WEATHERED_CHISELED_COPPER(MCVersion.MC1_20_4), + OXIDIZED_CHISELED_COPPER(MCVersion.MC1_20_4), + WAXED_CHISELED_COPPER(MCVersion.MC1_20_4), + WAXED_EXPOSED_CHISELED_COPPER(MCVersion.MC1_20_4), + WAXED_WEATHERED_CHISELED_COPPER(MCVersion.MC1_20_4), + WAXED_OXIDIZED_CHISELED_COPPER(MCVersion.MC1_20_4), + COPPER_BULB(MCVersion.MC1_20_4), + EXPOSED_COPPER_BULB(MCVersion.MC1_20_4), + WEATHERED_COPPER_BULB(MCVersion.MC1_20_4), + OXIDIZED_COPPER_BULB(MCVersion.MC1_20_4), + WAXED_COPPER_BULB(MCVersion.MC1_20_4), + WAXED_EXPOSED_COPPER_BULB(MCVersion.MC1_20_4), + WAXED_WEATHERED_COPPER_BULB(MCVersion.MC1_20_4), + WAXED_OXIDIZED_COPPER_BULB(MCVersion.MC1_20_4), + COPPER_DOOR(MCVersion.MC1_20_4), + EXPOSED_COPPER_DOOR(MCVersion.MC1_20_4), + WEATHERED_COPPER_DOOR(MCVersion.MC1_20_4), + OXIDIZED_COPPER_DOOR(MCVersion.MC1_20_4), + WAXED_COPPER_DOOR(MCVersion.MC1_20_4), + WAXED_EXPOSED_COPPER_DOOR(MCVersion.MC1_20_4), + WAXED_WEATHERED_COPPER_DOOR(MCVersion.MC1_20_4), + WAXED_OXIDIZED_COPPER_DOOR(MCVersion.MC1_20_4), + COPPER_GRATE(MCVersion.MC1_20_4), + EXPOSED_COPPER_GRATE(MCVersion.MC1_20_4), + WEATHERED_COPPER_GRATE(MCVersion.MC1_20_4), + OXIDIZED_COPPER_GRATE(MCVersion.MC1_20_4), + WAXED_COPPER_GRATE(MCVersion.MC1_20_4), + WAXED_EXPOSED_COPPER_GRATE(MCVersion.MC1_20_4), + WAXED_WEATHERED_COPPER_GRATE(MCVersion.MC1_20_4), + WAXED_OXIDIZED_COPPER_GRATE(MCVersion.MC1_20_4), + COPPER_TRAPDOOR(MCVersion.MC1_20_4), + EXPOSED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + WEATHERED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + OXIDIZED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + WAXED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + WAXED_EXPOSED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + WAXED_WEATHERED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + WAXED_OXIDIZED_COPPER_TRAPDOOR(MCVersion.MC1_20_4), + BREEZE_SPAWN_EGG(MCVersion.MC1_20_4), + TRIAL_SPAWNER(MCVersion.MC1_20_4), + TRIAL_KEY(MCVersion.MC1_20_4), + TUFF_BRICKS(MCVersion.MC1_20_4), + TUFF_BRICK_SLAB(MCVersion.MC1_20_4), + TUFF_BRICK_STAIRS(MCVersion.MC1_20_4), + TUFF_BRICK_WALL(MCVersion.MC1_20_4), + TUFF_SLAB(MCVersion.MC1_20_4), + TUFF_STAIRS(MCVersion.MC1_20_4), + TUFF_WALL(MCVersion.MC1_20_4), + CHISELED_TUFF(MCVersion.MC1_20_4), + POLISHED_TUFF(MCVersion.MC1_20_4), + CHISELED_TUFF_BRICKS(MCVersion.MC1_20_4), + POLISHED_TUFF_SLAB(MCVersion.MC1_20_4), + POLISHED_TUFF_STAIRS(MCVersion.MC1_20_4), + POLISHED_TUFF_WALL(MCVersion.MC1_20_4); private final MCVersion since; private final MCVersion until; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java index 6add518cb..25b01128c 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java @@ -39,7 +39,7 @@ public void setBasePotionData(MCPotionData bpd) { @Override public boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t) { if(ticks < 0) { - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { ticks = -1; } else { ticks = Integer.MAX_VALUE; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java index a618189df..aa629a898 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSuspiciousStewMeta.java @@ -26,7 +26,7 @@ public BukkitMCSuspiciousStewMeta(SuspiciousStewMeta ssm) { @Override public boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t) { if(ticks < 0) { - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { ticks = -1; } else { ticks = Integer.MAX_VALUE; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java index fe1ea6351..1cee96150 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java @@ -114,7 +114,7 @@ public int getWaitTime() { public void addCustomEffect(MCLivingEntity.MCEffect effect) { int ticks = effect.getTicksRemaining(); if(ticks < 0) { - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { ticks = -1; } else { ticks = Integer.MAX_VALUE; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java index 23fab15a0..479457839 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArrow.java @@ -75,7 +75,7 @@ public List getCustomEffects() { public void addCustomEffect(MCLivingEntity.MCEffect effect) { int ticks = effect.getTicksRemaining(); if(ticks < 0) { - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { ticks = -1; } else { ticks = Integer.MAX_VALUE; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java index 6e7ec2c87..963a8897f 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java @@ -225,7 +225,7 @@ public boolean hasAI() { @Override public boolean addEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon) { if(ticks < 0) { - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { ticks = -1; } else { ticks = Integer.MAX_VALUE; diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java index 49f616168..aba579440 100644 --- a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java +++ b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java @@ -412,7 +412,7 @@ public void setTempOp(Boolean value) throws ClassNotFoundException, NoSuchFieldE String ops = "p"; String getPlayerList = "ae"; MCVersion mcversion = Static.getServer().getMinecraftVersion(); - if(mcversion.lt(MCVersion.MC1_20_X)) { + if(mcversion.lt(MCVersion.MC1_20_4)) { getPlayerList = "ac"; if(mcversion.lt(MCVersion.MC1_20_2)) { ops = "o"; diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCBiomeType.java b/src/main/java/com/laytonsmith/abstraction/enums/MCBiomeType.java index 23f7c66fd..909bfafaa 100644 --- a/src/main/java/com/laytonsmith/abstraction/enums/MCBiomeType.java +++ b/src/main/java/com/laytonsmith/abstraction/enums/MCBiomeType.java @@ -176,7 +176,7 @@ public enum MCVanillaBiomeType { WOODED_BADLANDS(MCVersion.MC1_18), MANGROVE_SWAMP(MCVersion.MC1_19), DEEP_DARK(MCVersion.MC1_19), - CHERRY_GROVE(MCVersion.MC1_19_X), + CHERRY_GROVE(MCVersion.MC1_19_4), UNKNOWN(MCVersion.NEVER); private final MCVersion since; diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java b/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java index 3d81b1c3d..e3ee5ed21 100644 --- a/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java +++ b/src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java @@ -129,9 +129,9 @@ public enum MCVanillaEntityType { BAT, BEE(true, false, MCVersion.MC1_15), BLAZE, - BLOCK_DISPLAY(true, false, MCVersion.MC1_19_X), + BLOCK_DISPLAY(true, false, MCVersion.MC1_19_4), BOAT, - BREEZE(true, false, MCVersion.MC1_20_X), + BREEZE(true, false, MCVersion.MC1_20_4), CAMEL(true, false, MCVersion.MC1_19_3), CAT(true, false, MCVersion.MC1_14), CAVE_SPIDER, @@ -172,9 +172,9 @@ public enum MCVanillaEntityType { HORSE, HUSK, ILLUSIONER, - INTERACTION(true, false, MCVersion.MC1_19_X), + INTERACTION(true, false, MCVersion.MC1_19_4), IRON_GOLEM, - ITEM_DISPLAY(true, false, MCVersion.MC1_19_X), + ITEM_DISPLAY(true, false, MCVersion.MC1_19_4), ITEM_FRAME, LLAMA, LLAMA_SPIT(true, true), @@ -215,7 +215,7 @@ public enum MCVanillaEntityType { SKELETON_HORSE, SLIME, SMALL_FIREBALL, - SNIFFER(true, false, MCVersion.MC1_19_X), + SNIFFER(true, false, MCVersion.MC1_19_4), SNOWBALL, SNOWMAN, SQUID, @@ -225,7 +225,7 @@ public enum MCVanillaEntityType { STRAY, STRIDER(true, false, MCVersion.MC1_16), TADPOLE(true, false, MCVersion.MC1_19), - TEXT_DISPLAY(true, false, MCVersion.MC1_19_X), + TEXT_DISPLAY(true, false, MCVersion.MC1_19_4), THROWN_EXP_BOTTLE, TRADER_LLAMA(true, false, MCVersion.MC1_14), TRIDENT, @@ -236,7 +236,7 @@ public enum MCVanillaEntityType { VINDICATOR, WANDERING_TRADER(true, false, MCVersion.MC1_14), WARDEN(true, false, MCVersion.MC1_19), - WIND_CHARGE(true, true, MCVersion.MC1_20_X), + WIND_CHARGE(true, true, MCVersion.MC1_20_4), WITCH, WITHER, WITHER_SKELETON, diff --git a/src/main/java/com/laytonsmith/abstraction/enums/MCParticle.java b/src/main/java/com/laytonsmith/abstraction/enums/MCParticle.java index 7897df9e8..2d1aeb08d 100644 --- a/src/main/java/com/laytonsmith/abstraction/enums/MCParticle.java +++ b/src/main/java/com/laytonsmith/abstraction/enums/MCParticle.java @@ -179,17 +179,17 @@ public enum MCVanillaParticle { SCULK_CHARGE_POP(MCVersion.MC1_19), SCULK_SOUL(MCVersion.MC1_19), SONIC_BOOM(MCVersion.MC1_19), - DRIPPING_CHERRY_LEAVES(MCVersion.MC1_19_X, MCVersion.MC1_19_X), - FALLING_CHERRY_LEAVES(MCVersion.MC1_19_X, MCVersion.MC1_19_X), - LANDING_CHERRY_LEAVES(MCVersion.MC1_19_X, MCVersion.MC1_19_X), + DRIPPING_CHERRY_LEAVES(MCVersion.MC1_19_4, MCVersion.MC1_19_4), + FALLING_CHERRY_LEAVES(MCVersion.MC1_19_4, MCVersion.MC1_19_4), + LANDING_CHERRY_LEAVES(MCVersion.MC1_19_4, MCVersion.MC1_19_4), CHERRY_LEAVES(MCVersion.MC1_20), EGG_CRACK(MCVersion.MC1_20), - DUST_PLUME(MCVersion.MC1_20_X), - WHITE_SMOKE(MCVersion.MC1_20_X), - GUST(MCVersion.MC1_20_X), - GUST_EMITTER(MCVersion.MC1_20_X), - GUST_DUST(MCVersion.MC1_20_X), - TRIAL_SPAWNER_DETECTION(MCVersion.MC1_20_X), + DUST_PLUME(MCVersion.MC1_20_4), + WHITE_SMOKE(MCVersion.MC1_20_4), + GUST(MCVersion.MC1_20_4), + GUST_EMITTER(MCVersion.MC1_20_4), + GUST_DUST(MCVersion.MC1_20_4), + TRIAL_SPAWNER_DETECTION(MCVersion.MC1_20_4), UNKNOWN(MCVersion.NEVER); 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 index 618d40a6f..eac4c78d7 100644 --- a/src/main/java/com/laytonsmith/abstraction/enums/MCSound.java +++ b/src/main/java/com/laytonsmith/abstraction/enums/MCSound.java @@ -1402,7 +1402,7 @@ public enum MCVanillaSound { ITEM_GOAT_HORN_SOUND_7(MCVersion.MC1_19), MUSIC_DISC_5(MCVersion.MC1_19), MUSIC_OVERWORLD_DEEP_DARK(MCVersion.MC1_19), - MUSIC_OVERWORLD_JUNGLE_AND_FOREST(MCVersion.MC1_19, MCVersion.MC1_19_X), + MUSIC_OVERWORLD_JUNGLE_AND_FOREST(MCVersion.MC1_19, MCVersion.MC1_19_4), MUSIC_OVERWORLD_OLD_GROWTH_TAIGA(MCVersion.MC1_19), MUSIC_OVERWORLD_SWAMP(MCVersion.MC1_19), @@ -1480,68 +1480,68 @@ public enum MCVanillaSound { ENTITY_CAMEL_STEP_SAND(MCVersion.MC1_19_3), // 1.19.4 additions - BLOCK_CHERRY_LEAVES_BREAK(MCVersion.MC1_19_X), - BLOCK_CHERRY_LEAVES_FALL(MCVersion.MC1_19_X), - BLOCK_CHERRY_LEAVES_HIT(MCVersion.MC1_19_X), - BLOCK_CHERRY_LEAVES_PLACE(MCVersion.MC1_19_X), - BLOCK_CHERRY_LEAVES_STEP(MCVersion.MC1_19_X), - BLOCK_CHERRY_SAPLING_BREAK(MCVersion.MC1_19_X), - BLOCK_CHERRY_SAPLING_FALL(MCVersion.MC1_19_X), - BLOCK_CHERRY_SAPLING_HIT(MCVersion.MC1_19_X), - BLOCK_CHERRY_SAPLING_PLACE(MCVersion.MC1_19_X), - BLOCK_CHERRY_SAPLING_STEP(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_BREAK(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_DOOR_CLOSE(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_DOOR_OPEN(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_FALL(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HANGING_SIGN_BREAK(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HANGING_SIGN_FALL(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HANGING_SIGN_HIT(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HANGING_SIGN_PLACE(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_HIT(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_PLACE(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_STEP(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE(MCVersion.MC1_19_X), - BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_BREAK(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_FALL(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_HIT(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_PLACE(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_SHATTER(MCVersion.MC1_19_X), - BLOCK_DECORATED_POT_STEP(MCVersion.MC1_19_X), - BLOCK_PINK_PETALS_BREAK(MCVersion.MC1_19_X), - BLOCK_PINK_PETALS_FALL(MCVersion.MC1_19_X), - BLOCK_PINK_PETALS_HIT(MCVersion.MC1_19_X), - BLOCK_PINK_PETALS_PLACE(MCVersion.MC1_19_X), - BLOCK_PINK_PETALS_STEP(MCVersion.MC1_19_X), - BLOCK_SUSPICIOUS_SAND_BREAK(MCVersion.MC1_19_X), - BLOCK_SUSPICIOUS_SAND_FALL(MCVersion.MC1_19_X), - BLOCK_SUSPICIOUS_SAND_HIT(MCVersion.MC1_19_X), - BLOCK_SUSPICIOUS_SAND_PLACE(MCVersion.MC1_19_X), - BLOCK_SUSPICIOUS_SAND_STEP(MCVersion.MC1_19_X), - ENTITY_SNIFFER_DEATH(MCVersion.MC1_19_X), - ENTITY_SNIFFER_DIGGING(MCVersion.MC1_19_X), - ENTITY_SNIFFER_DIGGING_STOP(MCVersion.MC1_19_X), - ENTITY_SNIFFER_DROP_SEED(MCVersion.MC1_19_X), - ENTITY_SNIFFER_EAT(MCVersion.MC1_19_X), - ENTITY_SNIFFER_HAPPY(MCVersion.MC1_19_X), - ENTITY_SNIFFER_HURT(MCVersion.MC1_19_X), - ENTITY_SNIFFER_IDLE(MCVersion.MC1_19_X), - ENTITY_SNIFFER_SCENTING(MCVersion.MC1_19_X), - ENTITY_SNIFFER_SEARCHING(MCVersion.MC1_19_X), - ENTITY_SNIFFER_SNIFFING(MCVersion.MC1_19_X), - ENTITY_SNIFFER_STEP(MCVersion.MC1_19_X), - INTENTIONALLY_EMPTY(MCVersion.MC1_19_X), - ITEM_BRUSH_BRUSHING(MCVersion.MC1_19_X, MCVersion.MC1_19_X), - ITEM_BRUSH_BRUSH_SAND_COMPLETED(MCVersion.MC1_19_X, MCVersion.MC1_19_X), - MUSIC_OVERWORLD_CHERRY_GROVE(MCVersion.MC1_19_X), + BLOCK_CHERRY_LEAVES_BREAK(MCVersion.MC1_19_4), + BLOCK_CHERRY_LEAVES_FALL(MCVersion.MC1_19_4), + BLOCK_CHERRY_LEAVES_HIT(MCVersion.MC1_19_4), + BLOCK_CHERRY_LEAVES_PLACE(MCVersion.MC1_19_4), + BLOCK_CHERRY_LEAVES_STEP(MCVersion.MC1_19_4), + BLOCK_CHERRY_SAPLING_BREAK(MCVersion.MC1_19_4), + BLOCK_CHERRY_SAPLING_FALL(MCVersion.MC1_19_4), + BLOCK_CHERRY_SAPLING_HIT(MCVersion.MC1_19_4), + BLOCK_CHERRY_SAPLING_PLACE(MCVersion.MC1_19_4), + BLOCK_CHERRY_SAPLING_STEP(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_BREAK(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_DOOR_CLOSE(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_DOOR_OPEN(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_FALL(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HANGING_SIGN_BREAK(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HANGING_SIGN_FALL(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HANGING_SIGN_HIT(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HANGING_SIGN_PLACE(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_HIT(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_PLACE(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_STEP(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE(MCVersion.MC1_19_4), + BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_BREAK(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_FALL(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_HIT(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_PLACE(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_SHATTER(MCVersion.MC1_19_4), + BLOCK_DECORATED_POT_STEP(MCVersion.MC1_19_4), + BLOCK_PINK_PETALS_BREAK(MCVersion.MC1_19_4), + BLOCK_PINK_PETALS_FALL(MCVersion.MC1_19_4), + BLOCK_PINK_PETALS_HIT(MCVersion.MC1_19_4), + BLOCK_PINK_PETALS_PLACE(MCVersion.MC1_19_4), + BLOCK_PINK_PETALS_STEP(MCVersion.MC1_19_4), + BLOCK_SUSPICIOUS_SAND_BREAK(MCVersion.MC1_19_4), + BLOCK_SUSPICIOUS_SAND_FALL(MCVersion.MC1_19_4), + BLOCK_SUSPICIOUS_SAND_HIT(MCVersion.MC1_19_4), + BLOCK_SUSPICIOUS_SAND_PLACE(MCVersion.MC1_19_4), + BLOCK_SUSPICIOUS_SAND_STEP(MCVersion.MC1_19_4), + ENTITY_SNIFFER_DEATH(MCVersion.MC1_19_4), + ENTITY_SNIFFER_DIGGING(MCVersion.MC1_19_4), + ENTITY_SNIFFER_DIGGING_STOP(MCVersion.MC1_19_4), + ENTITY_SNIFFER_DROP_SEED(MCVersion.MC1_19_4), + ENTITY_SNIFFER_EAT(MCVersion.MC1_19_4), + ENTITY_SNIFFER_HAPPY(MCVersion.MC1_19_4), + ENTITY_SNIFFER_HURT(MCVersion.MC1_19_4), + ENTITY_SNIFFER_IDLE(MCVersion.MC1_19_4), + ENTITY_SNIFFER_SCENTING(MCVersion.MC1_19_4), + ENTITY_SNIFFER_SEARCHING(MCVersion.MC1_19_4), + ENTITY_SNIFFER_SNIFFING(MCVersion.MC1_19_4), + ENTITY_SNIFFER_STEP(MCVersion.MC1_19_4), + INTENTIONALLY_EMPTY(MCVersion.MC1_19_4), + ITEM_BRUSH_BRUSHING(MCVersion.MC1_19_4, MCVersion.MC1_19_4), + ITEM_BRUSH_BRUSH_SAND_COMPLETED(MCVersion.MC1_19_4, MCVersion.MC1_19_4), + MUSIC_OVERWORLD_CHERRY_GROVE(MCVersion.MC1_19_4), // 1.20 additions BLOCK_AMETHYST_BLOCK_RESONATE(MCVersion.MC1_20), @@ -1582,60 +1582,60 @@ public enum MCVanillaSound { BLOCK_WET_SPONGE_STEP(MCVersion.MC1_20_2), // 1.20.3 additions - BLOCK_COPPER_BULB_BREAK(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_FALL(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_HIT(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_PLACE(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_STEP(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_TURN_OFF(MCVersion.MC1_20_X), - BLOCK_COPPER_BULB_TURN_ON(MCVersion.MC1_20_X), - BLOCK_COPPER_DOOR_CLOSE(MCVersion.MC1_20_X), - BLOCK_COPPER_DOOR_OPEN(MCVersion.MC1_20_X), - BLOCK_COPPER_GRATE_BREAK(MCVersion.MC1_20_X), - BLOCK_COPPER_GRATE_FALL(MCVersion.MC1_20_X), - BLOCK_COPPER_GRATE_HIT(MCVersion.MC1_20_X), - BLOCK_COPPER_GRATE_PLACE(MCVersion.MC1_20_X), - BLOCK_COPPER_GRATE_STEP(MCVersion.MC1_20_X), - BLOCK_COPPER_TRAPDOOR_CLOSE(MCVersion.MC1_20_X), - BLOCK_COPPER_TRAPDOOR_OPEN(MCVersion.MC1_20_X), - BLOCK_CRAFTER_CRAFT(MCVersion.MC1_20_X), - BLOCK_CRAFTER_FAIL(MCVersion.MC1_20_X), - BLOCK_DECORATED_POT_INSERT(MCVersion.MC1_20_X), - BLOCK_DECORATED_POT_INSERT_FAIL(MCVersion.MC1_20_X), - BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL(MCVersion.MC1_20_X), - BLOCK_POLISHED_TUFF_BREAK(MCVersion.MC1_20_X), - BLOCK_POLISHED_TUFF_FALL(MCVersion.MC1_20_X), - BLOCK_POLISHED_TUFF_HIT(MCVersion.MC1_20_X), - BLOCK_POLISHED_TUFF_PLACE(MCVersion.MC1_20_X), - BLOCK_POLISHED_TUFF_STEP(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_AMBIENT(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_BREAK(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_DETECT_PLAYER(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_EJECT_ITEM(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_FALL(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_HIT(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_PLACE(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_SPAWN_MOB(MCVersion.MC1_20_X), - BLOCK_TRIAL_SPAWNER_STEP(MCVersion.MC1_20_X), - BLOCK_TUFF_BRICKS_BREAK(MCVersion.MC1_20_X), - BLOCK_TUFF_BRICKS_FALL(MCVersion.MC1_20_X), - BLOCK_TUFF_BRICKS_HIT(MCVersion.MC1_20_X), - BLOCK_TUFF_BRICKS_PLACE(MCVersion.MC1_20_X), - BLOCK_TUFF_BRICKS_STEP(MCVersion.MC1_20_X), - ENTITY_BREEZE_DEATH(MCVersion.MC1_20_X), - ENTITY_BREEZE_HURT(MCVersion.MC1_20_X), - ENTITY_BREEZE_IDLE_AIR(MCVersion.MC1_20_X), - ENTITY_BREEZE_IDLE_GROUND(MCVersion.MC1_20_X), - ENTITY_BREEZE_INHALE(MCVersion.MC1_20_X), - ENTITY_BREEZE_JUMP(MCVersion.MC1_20_X), - ENTITY_BREEZE_LAND(MCVersion.MC1_20_X), - ENTITY_BREEZE_SHOOT(MCVersion.MC1_20_X), - ENTITY_BREEZE_SLIDE(MCVersion.MC1_20_X), - ENTITY_GENERIC_WIND_BURST(MCVersion.MC1_20_X), - ENTITY_PARROT_IMITATE_BREEZE(MCVersion.MC1_20_X), - ENTITY_PLAYER_TELEPORT(MCVersion.MC1_20_X), + BLOCK_COPPER_BULB_BREAK(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_FALL(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_HIT(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_PLACE(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_STEP(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_TURN_OFF(MCVersion.MC1_20_4), + BLOCK_COPPER_BULB_TURN_ON(MCVersion.MC1_20_4), + BLOCK_COPPER_DOOR_CLOSE(MCVersion.MC1_20_4), + BLOCK_COPPER_DOOR_OPEN(MCVersion.MC1_20_4), + BLOCK_COPPER_GRATE_BREAK(MCVersion.MC1_20_4), + BLOCK_COPPER_GRATE_FALL(MCVersion.MC1_20_4), + BLOCK_COPPER_GRATE_HIT(MCVersion.MC1_20_4), + BLOCK_COPPER_GRATE_PLACE(MCVersion.MC1_20_4), + BLOCK_COPPER_GRATE_STEP(MCVersion.MC1_20_4), + BLOCK_COPPER_TRAPDOOR_CLOSE(MCVersion.MC1_20_4), + BLOCK_COPPER_TRAPDOOR_OPEN(MCVersion.MC1_20_4), + BLOCK_CRAFTER_CRAFT(MCVersion.MC1_20_4), + BLOCK_CRAFTER_FAIL(MCVersion.MC1_20_4), + BLOCK_DECORATED_POT_INSERT(MCVersion.MC1_20_4), + BLOCK_DECORATED_POT_INSERT_FAIL(MCVersion.MC1_20_4), + BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL(MCVersion.MC1_20_4), + BLOCK_POLISHED_TUFF_BREAK(MCVersion.MC1_20_4), + BLOCK_POLISHED_TUFF_FALL(MCVersion.MC1_20_4), + BLOCK_POLISHED_TUFF_HIT(MCVersion.MC1_20_4), + BLOCK_POLISHED_TUFF_PLACE(MCVersion.MC1_20_4), + BLOCK_POLISHED_TUFF_STEP(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_AMBIENT(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_BREAK(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_DETECT_PLAYER(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_EJECT_ITEM(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_FALL(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_HIT(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_PLACE(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_SPAWN_MOB(MCVersion.MC1_20_4), + BLOCK_TRIAL_SPAWNER_STEP(MCVersion.MC1_20_4), + BLOCK_TUFF_BRICKS_BREAK(MCVersion.MC1_20_4), + BLOCK_TUFF_BRICKS_FALL(MCVersion.MC1_20_4), + BLOCK_TUFF_BRICKS_HIT(MCVersion.MC1_20_4), + BLOCK_TUFF_BRICKS_PLACE(MCVersion.MC1_20_4), + BLOCK_TUFF_BRICKS_STEP(MCVersion.MC1_20_4), + ENTITY_BREEZE_DEATH(MCVersion.MC1_20_4), + ENTITY_BREEZE_HURT(MCVersion.MC1_20_4), + ENTITY_BREEZE_IDLE_AIR(MCVersion.MC1_20_4), + ENTITY_BREEZE_IDLE_GROUND(MCVersion.MC1_20_4), + ENTITY_BREEZE_INHALE(MCVersion.MC1_20_4), + ENTITY_BREEZE_JUMP(MCVersion.MC1_20_4), + ENTITY_BREEZE_LAND(MCVersion.MC1_20_4), + ENTITY_BREEZE_SHOOT(MCVersion.MC1_20_4), + ENTITY_BREEZE_SLIDE(MCVersion.MC1_20_4), + ENTITY_GENERIC_WIND_BURST(MCVersion.MC1_20_4), + ENTITY_PARROT_IMITATE_BREEZE(MCVersion.MC1_20_4), + ENTITY_PLAYER_TELEPORT(MCVersion.MC1_20_4), UNKNOWN(MCVersion.NEVER); diff --git a/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java b/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java index 0963361df..f5a240d22 100644 --- a/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java +++ b/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java @@ -501,7 +501,7 @@ public enum LegacyMaterialName { POTTERY_SHARD_ARMS_UP("ARMS_UP_POTTERY_SHERD", MCVersion.MC1_20), POTTERY_SHARD_PRIZE("PRIZE_POTTERY_SHERD", MCVersion.MC1_20), POTTERY_SHARD_SKULL("SKULL_POTTERY_SHERD", MCVersion.MC1_20), - GRASS("SHORT_GRASS", MCVersion.MC1_20_X); + GRASS("SHORT_GRASS", MCVersion.MC1_20_4); private final String mat; private final MCVersion version; diff --git a/src/main/java/com/laytonsmith/core/ObjectGenerator.java b/src/main/java/com/laytonsmith/core/ObjectGenerator.java index b2dbf0d1b..85cbe67eb 100644 --- a/src/main/java/com/laytonsmith/core/ObjectGenerator.java +++ b/src/main/java/com/laytonsmith/core/ObjectGenerator.java @@ -569,7 +569,7 @@ public Construct itemMeta(MCItemStack is, Target t) { sherds.set(side.getKey().name().toLowerCase(), side.getValue().name()); } ma.set("sherds", sherds, t); - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_4)) { ma.set("item", item(decoratedPot.getItemStack(), t), t); } } else if(bs instanceof MCInventoryHolder) { @@ -1078,7 +1078,7 @@ public MCItemMeta itemMeta(Mixed c, MCMaterial mat, Target t) throws ConfigRunti throw new CREFormatException("Expected associative array for decorated pot meta.", t); } } - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_4)) { if(ma.containsKey("item")) { decoratedPot.setItemStack(item(ma.get("item", t), t)); } diff --git a/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java b/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java index fd01716b9..1f7a7186f 100644 --- a/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java +++ b/src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java @@ -1258,7 +1258,7 @@ public Map evaluate(BindableEvent e) throws EventException { map.put("location", location); map.put("bed_spawn", CBoolean.get(event.isBedSpawn())); map.put("anchor_spawn", CBoolean.get(event.isAnchorSpawn())); - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_19_4)) { map.put("reason", new CString(event.getReason().name(), Target.UNKNOWN)); } return map; @@ -2763,7 +2763,7 @@ protected Enum getEnum(MCPlayerResourcePackEvent event) { public Map evaluate(BindableEvent event) throws EventException { Map map = evaluate_helper(event); map.put("status", new CString(((MCPlayerResourcePackEvent) event).getStatus().name(), Target.UNKNOWN)); - if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_X)) { + if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_20_4)) { map.put("id", new CString(((MCPlayerResourcePackEvent) event).getId().toString(), Target.UNKNOWN)); } return map;