Add support for Minecraft 1.21.5

Author: PseudoKnight

pom.xml

@@ -173,7 +173,7 @@
 		<dependency>
 			<groupId>io.papermc.paper</groupId>
 			<artifactId>paper-api</artifactId>
-			<version>1.21.4-R0.1-SNAPSHOT</version>
+			<version>1.21.5-R0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->

src/main/java/com/laytonsmith/abstraction/MCItemMeta.java

@@ -158,10 +158,6 @@ public interface MCItemMeta extends AbstractionObject {
 
 	void setEnchantmentGlintOverride(boolean glint);
 
-	boolean isFireResistant();
-
-	void setFireResistant(boolean fireResistant);
-
 	boolean hasMaxStackSize();
 
 	int getMaxStackSize();

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

@@ -1735,7 +1735,20 @@ public enum MCVanillaMaterial {
 		RESIN_BRICK_STAIRS(MCVersion.MC1_21_4),
 		RESIN_BRICK_WALL(MCVersion.MC1_21_4),
 		RESIN_CLUMP(MCVersion.MC1_21_4),
-		CHISELED_RESIN_BRICKS(MCVersion.MC1_21_4);
+		CHISELED_RESIN_BRICKS(MCVersion.MC1_21_4),
+
+		// 1.21.5 additions
+		BLUE_EGG(MCVersion.MC1_21_5),
+		BROWN_EGG(MCVersion.MC1_21_5),
+		BUSH(MCVersion.MC1_21_5),
+		CACTUS_FLOWER(MCVersion.MC1_21_5),
+		FIREFLY_BUSH(MCVersion.MC1_21_5),
+		LEAF_LITTER(MCVersion.MC1_21_5),
+		SHORT_DRY_GRASS(MCVersion.MC1_21_5),
+		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);
 
 		private final MCVersion since;
 		private final MCVersion until;

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCAttributeModifier.java

@@ -67,6 +67,8 @@ public MCEquipmentSlotGroup getEquipmentSlotGroup() {
 			return MCEquipmentSlotGroup.HAND;
 		} else if(slotGroup.toString().equals("body")) { // BODY slot group is missing from Spigot
 			return MCEquipmentSlotGroup.BODY;
+		} else if(slotGroup.toString().equals("saddle")) { // 1.21.5
+			return MCEquipmentSlotGroup.SADDLE;
 		}
 		return null;
 	}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCItemMeta.java

@@ -156,7 +156,9 @@ public Set<MCItemFlag> getItemFlags() {
 		Set<ItemFlag> flags = im.getItemFlags();
 		Set<MCItemFlag> ret = new HashSet<>(flags.size());
 		for(ItemFlag flag : flags) {
-			ret.add(MCItemFlag.valueOf(flag.name()));
+			try {
+				ret.add(MCItemFlag.valueOf(flag.name()));
+			} catch(IllegalArgumentException ignore) {}
 		}
 		return ret;
 	}
@@ -311,16 +313,6 @@ public void setEnchantmentGlintOverride(boolean glint) {
 		im.setEnchantmentGlintOverride(glint);
 	}
 
-	@Override
-	public boolean isFireResistant() {
-		return im.isFireResistant();
-	}
-
-	@Override
-	public void setFireResistant(boolean fireResistant) {
-		im.setFireResistant(fireResistant);
-	}
-
 	@Override
 	public boolean hasMaxStackSize() {
 		return im.hasMaxStackSize();

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java

@@ -350,7 +350,7 @@ public MCCommandMap getCommandMap() {
 	@Override
 	public MCPlayerProfile getPlayerProfile(UUID id, String name) {
 		if(isPaper()) {
-			return new BukkitMCPlayerProfile(ReflectionUtils.invokeMethod(s, "createProfile", id, name));
+			return new BukkitMCPlayerProfile(this.s.createProfile(id, name));
 		}
 		return null;
 	}

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java

@@ -68,6 +68,7 @@
 import org.bukkit.entity.Firework;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.inventory.meta.FireworkMeta;
 import org.bukkit.util.Consumer;
 
@@ -211,11 +212,11 @@ public MCWorldEnvironment getEnvironment() {
 
 	@Override
 	public String getGenerator() {
-		try {
-			return w.getGenerator().toString();
-		} catch (NullPointerException npe) {
+		ChunkGenerator generator = w.getGenerator();
+		if(generator == null) {
 			return "default";
 		}
+		return generator.toString();
 	}
 
 	@Override

src/main/java/com/laytonsmith/abstraction/enums/MCEntityEffect.java

@@ -28,8 +28,8 @@ public enum MCEntityEffect {
 	SQUID_ROTATE,
 	ENTITY_POOF,
 	GUARDIAN_TARGET,
-	SHIELD_BLOCK,
-	SHIELD_BREAK,
+	SHIELD_BLOCK, // deprecated 1.21.5
+	SHIELD_BREAK, // deprecated 1.21.5
 	ARMOR_STAND_HIT,
 	THORNS_HURT,
 	IRON_GOLEM_SHEATH,

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

@@ -55,7 +55,7 @@ public static MCEntityType valueOf(String test) throws IllegalArgumentException
 					return MAP.get("ARROW");
 				case "LINGERING_POTION":
 					MSLog.GetLogger().e(MSLog.Tags.GENERAL,
-							"LINGERING_POTION entity type was removed in 1.14. Converted to SPLASH_POTION.",
+							"LINGERING_POTION entity type was removed from 1.14 to 1.21.4. Converted to SPLASH_POTION.",
 							Target.UNKNOWN);
 					return MAP.get("SPLASH_POTION");
 				case "PIG_ZOMBIE":
@@ -65,12 +65,12 @@ public static MCEntityType valueOf(String test) throws IllegalArgumentException
 					return MAP.get("ZOMBIFIED_PIGLIN");
 				case "BOAT":
 					MSLog.GetLogger().e(Tags.GENERAL,
-							"BOAT entity type was split into wood types. Converted to OAK_BOAT.",
+							"BOAT entity type was split by wood types in 1.21.3. Converted to OAK_BOAT.",
 							Target.UNKNOWN);
 					return MAP.get("OAK_BOAT");
 				case "CHEST_BOAT":
 					MSLog.GetLogger().e(Tags.GENERAL,
-							"CHEST_BOAT entity type was split into wood types. Converted to OAK_CHEST_BOAT.",
+							"CHEST_BOAT entity type was split by wood types in 1.21.3. Converted to OAK_CHEST_BOAT.",
 							Target.UNKNOWN);
 					return MAP.get("OAK_CHEST_BOAT");
 			}
@@ -218,6 +218,7 @@ public enum MCVanillaEntityType {
 		LLAMA_SPIT,
 		LEASH_HITCH,
 		LIGHTNING,
+		LINGERING_POTION(true, MCVersion.MC1_21_5),
 		MAGMA_CUBE,
 		MARKER(true, MCVersion.MC1_17),
 		MINECART,

src/main/java/com/laytonsmith/abstraction/enums/MCEquipmentSlotGroup.java

@@ -4,5 +4,6 @@ public enum MCEquipmentSlotGroup {
 	ANY,
 	HAND,
 	ARMOR,
-	BODY
+	BODY,
+	SADDLE,
 }