Skip to content

Commit 6721bca

Browse files
NathanWolfNathanWolf
committed
Drop support for legacy schematics
1 parent 60c5ba9 commit 6721bca

File tree

10 files changed

+15
-561
lines changed

10 files changed

+15
-561
lines changed

‎CompatibilityLib/base/src/main/java/com/elmakers/mine/bukkit/utility/platform/base/CompatibilityUtilsBase.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2791,11 +2791,6 @@ public boolean setColor(PotionMeta meta, Color color) {
27912791
return true;
27922792
}
27932793

2794-
@Override
2795-
public boolean hasBlockDataSupport() {
2796-
return true;
2797-
}
2798-
27992794
@Override
28002795
public byte getLegacyBlockData(FallingBlock falling) {
28012796
return 0;

‎CompatibilityLib/common/src/main/java/com/elmakers/mine/bukkit/utility/platform/CompatibilityUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,6 @@ public interface CompatibilityUtils {
379379

380380
boolean setBlockData(Block block, String data);
381381

382-
boolean hasBlockDataSupport();
383-
384382
boolean isTopBlock(Block block);
385383

386384
boolean applyPhysics(Block block);

‎CompatibilityLib/v1_20_5/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_20_5/CompatibilityUtils.java

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,58 +1036,6 @@ public boolean applyBonemeal(Location location) {
10361036
return BoneMealItem.growCrop(itemStack, nmsWorld, blockPosition);
10371037
}
10381038

1039-
@Override
1040-
public Color getColor(PotionMeta meta) {
1041-
return meta.getColor();
1042-
}
1043-
1044-
@Override
1045-
public boolean setColor(PotionMeta meta, Color color) {
1046-
meta.setColor(color);
1047-
return true;
1048-
}
1049-
1050-
@Override
1051-
public boolean hasBlockDataSupport() {
1052-
return true;
1053-
}
1054-
1055-
@Override
1056-
public byte getLegacyBlockData(FallingBlock falling) {
1057-
return 0;
1058-
}
1059-
1060-
@Override
1061-
public Material getMaterial(FallingBlock falling) {
1062-
return falling.getBlockData().getMaterial();
1063-
}
1064-
1065-
@Override
1066-
public String getBlockData(FallingBlock fallingBlock) {
1067-
BlockData blockData = fallingBlock.getBlockData();
1068-
return blockData.getAsString();
1069-
}
1070-
1071-
@Override
1072-
public String getBlockData(Material material, byte data) {
1073-
@SuppressWarnings("deprecation")
1074-
BlockData blockData = platform.getDeprecatedUtils().getUnsafe().fromLegacy(material, data);
1075-
return blockData == null ? null : blockData.getAsString();
1076-
}
1077-
1078-
@Override
1079-
public String getBlockData(Block block) {
1080-
BlockData blockData = block.getBlockData();
1081-
return blockData == null ? null : blockData.getAsString();
1082-
}
1083-
1084-
@Override
1085-
public boolean setBlockData(Block block, String data) {
1086-
BlockData blockData = platform.getPlugin().getServer().createBlockData(data);
1087-
block.setBlockData(blockData, false);
1088-
return true;
1089-
}
1090-
10911039
@Override
10921040
public boolean applyPhysics(Block block) {
10931041
ServerLevel nmsWorld = ((CraftWorld)block.getWorld()).getHandle();
@@ -1098,47 +1046,6 @@ public boolean applyPhysics(Block block) {
10981046
return nmsWorld.setBlock(blockLocation, blockState, 3);
10991047
}
11001048

1101-
@Override
1102-
public boolean addRecipeToBook(ItemStack book, Plugin plugin, String recipeKey) {
1103-
if (book == null) return false;
1104-
ItemMeta meta = book.getItemMeta();
1105-
if (!(meta instanceof KnowledgeBookMeta)) return false;
1106-
KnowledgeBookMeta bookMeta = (KnowledgeBookMeta)meta;
1107-
NamespacedKey key = new NamespacedKey(plugin, recipeKey.toLowerCase());
1108-
bookMeta.addRecipe(key);
1109-
book.setItemMeta(bookMeta);
1110-
return true;
1111-
}
1112-
1113-
@Override
1114-
public boolean stopSound(Player player, Sound sound) {
1115-
player.stopSound(sound);
1116-
return true;
1117-
}
1118-
1119-
@Override
1120-
public boolean stopSound(Player player, String sound) {
1121-
player.stopSound(sound);
1122-
return true;
1123-
}
1124-
1125-
@Override
1126-
public boolean lockChunk(Chunk chunk) {
1127-
if (!platform.getPlugin().isEnabled()) return false;
1128-
if (!chunk.isLoaded()) {
1129-
platform.getLogger().info("Locking unloaded chunk");
1130-
}
1131-
chunk.addPluginChunkTicket(platform.getPlugin());
1132-
return true;
1133-
}
1134-
1135-
@Override
1136-
public boolean unlockChunk(Chunk chunk) {
1137-
if (!platform.getPlugin().isEnabled()) return false;
1138-
chunk.removePluginChunkTicket(platform.getPlugin());
1139-
return true;
1140-
}
1141-
11421049
@Override
11431050
public Location getHangingLocation(Entity entity) {
11441051
Location location = entity.getLocation();

‎CompatibilityLib/v1_20_6/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_20_6/CompatibilityUtils.java

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,58 +1033,6 @@ public boolean applyBonemeal(Location location) {
10331033
return BoneMealItem.growCrop(itemStack, nmsWorld, blockPosition);
10341034
}
10351035

1036-
@Override
1037-
public Color getColor(PotionMeta meta) {
1038-
return meta.getColor();
1039-
}
1040-
1041-
@Override
1042-
public boolean setColor(PotionMeta meta, Color color) {
1043-
meta.setColor(color);
1044-
return true;
1045-
}
1046-
1047-
@Override
1048-
public boolean hasBlockDataSupport() {
1049-
return true;
1050-
}
1051-
1052-
@Override
1053-
public byte getLegacyBlockData(FallingBlock falling) {
1054-
return 0;
1055-
}
1056-
1057-
@Override
1058-
public Material getMaterial(FallingBlock falling) {
1059-
return falling.getBlockData().getMaterial();
1060-
}
1061-
1062-
@Override
1063-
public String getBlockData(FallingBlock fallingBlock) {
1064-
BlockData blockData = fallingBlock.getBlockData();
1065-
return blockData.getAsString();
1066-
}
1067-
1068-
@Override
1069-
public String getBlockData(Material material, byte data) {
1070-
@SuppressWarnings("deprecation")
1071-
BlockData blockData = platform.getDeprecatedUtils().getUnsafe().fromLegacy(material, data);
1072-
return blockData == null ? null : blockData.getAsString();
1073-
}
1074-
1075-
@Override
1076-
public String getBlockData(Block block) {
1077-
BlockData blockData = block.getBlockData();
1078-
return blockData == null ? null : blockData.getAsString();
1079-
}
1080-
1081-
@Override
1082-
public boolean setBlockData(Block block, String data) {
1083-
BlockData blockData = platform.getPlugin().getServer().createBlockData(data);
1084-
block.setBlockData(blockData, false);
1085-
return true;
1086-
}
1087-
10881036
@Override
10891037
public boolean applyPhysics(Block block) {
10901038
ServerLevel nmsWorld = ((CraftWorld)block.getWorld()).getHandle();
@@ -1095,47 +1043,6 @@ public boolean applyPhysics(Block block) {
10951043
return nmsWorld.setBlock(blockLocation, blockState, 3);
10961044
}
10971045

1098-
@Override
1099-
public boolean addRecipeToBook(ItemStack book, Plugin plugin, String recipeKey) {
1100-
if (book == null) return false;
1101-
ItemMeta meta = book.getItemMeta();
1102-
if (!(meta instanceof KnowledgeBookMeta)) return false;
1103-
KnowledgeBookMeta bookMeta = (KnowledgeBookMeta)meta;
1104-
NamespacedKey key = new NamespacedKey(plugin, recipeKey.toLowerCase());
1105-
bookMeta.addRecipe(key);
1106-
book.setItemMeta(bookMeta);
1107-
return true;
1108-
}
1109-
1110-
@Override
1111-
public boolean stopSound(Player player, Sound sound) {
1112-
player.stopSound(sound);
1113-
return true;
1114-
}
1115-
1116-
@Override
1117-
public boolean stopSound(Player player, String sound) {
1118-
player.stopSound(sound);
1119-
return true;
1120-
}
1121-
1122-
@Override
1123-
public boolean lockChunk(Chunk chunk) {
1124-
if (!platform.getPlugin().isEnabled()) return false;
1125-
if (!chunk.isLoaded()) {
1126-
platform.getLogger().info("Locking unloaded chunk");
1127-
}
1128-
chunk.addPluginChunkTicket(platform.getPlugin());
1129-
return true;
1130-
}
1131-
1132-
@Override
1133-
public boolean unlockChunk(Chunk chunk) {
1134-
if (!platform.getPlugin().isEnabled()) return false;
1135-
chunk.removePluginChunkTicket(platform.getPlugin());
1136-
return true;
1137-
}
1138-
11391046
@Override
11401047
public Location getHangingLocation(Entity entity) {
11411048
Location location = entity.getLocation();

‎CompatibilityLib/v1_21_0/src/main/java/com/elmakers/mine/bukkit/utility/platform/v1_21_0/CompatibilityUtils.java

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,58 +1046,6 @@ public boolean applyBonemeal(Location location) {
10461046
return BoneMealItem.growCrop(itemStack, nmsWorld, blockPosition);
10471047
}
10481048

1049-
@Override
1050-
public Color getColor(PotionMeta meta) {
1051-
return meta.getColor();
1052-
}
1053-
1054-
@Override
1055-
public boolean setColor(PotionMeta meta, Color color) {
1056-
meta.setColor(color);
1057-
return true;
1058-
}
1059-
1060-
@Override
1061-
public boolean hasBlockDataSupport() {
1062-
return true;
1063-
}
1064-
1065-
@Override
1066-
public byte getLegacyBlockData(FallingBlock falling) {
1067-
return 0;
1068-
}
1069-
1070-
@Override
1071-
public Material getMaterial(FallingBlock falling) {
1072-
return falling.getBlockData().getMaterial();
1073-
}
1074-
1075-
@Override
1076-
public String getBlockData(FallingBlock fallingBlock) {
1077-
BlockData blockData = fallingBlock.getBlockData();
1078-
return blockData.getAsString();
1079-
}
1080-
1081-
@Override
1082-
public String getBlockData(Material material, byte data) {
1083-
@SuppressWarnings("deprecation")
1084-
BlockData blockData = platform.getDeprecatedUtils().getUnsafe().fromLegacy(material, data);
1085-
return blockData == null ? null : blockData.getAsString();
1086-
}
1087-
1088-
@Override
1089-
public String getBlockData(Block block) {
1090-
BlockData blockData = block.getBlockData();
1091-
return blockData == null ? null : blockData.getAsString();
1092-
}
1093-
1094-
@Override
1095-
public boolean setBlockData(Block block, String data) {
1096-
BlockData blockData = platform.getPlugin().getServer().createBlockData(data);
1097-
block.setBlockData(blockData, false);
1098-
return true;
1099-
}
1100-
11011049
@Override
11021050
public boolean applyPhysics(Block block) {
11031051
ServerLevel nmsWorld = ((CraftWorld)block.getWorld()).getHandle();
@@ -1108,47 +1056,6 @@ public boolean applyPhysics(Block block) {
11081056
return nmsWorld.setBlock(blockLocation, blockState, 3);
11091057
}
11101058

1111-
@Override
1112-
public boolean addRecipeToBook(ItemStack book, Plugin plugin, String recipeKey) {
1113-
if (book == null) return false;
1114-
ItemMeta meta = book.getItemMeta();
1115-
if (!(meta instanceof KnowledgeBookMeta)) return false;
1116-
KnowledgeBookMeta bookMeta = (KnowledgeBookMeta)meta;
1117-
NamespacedKey key = new NamespacedKey(plugin, recipeKey.toLowerCase());
1118-
bookMeta.addRecipe(key);
1119-
book.setItemMeta(bookMeta);
1120-
return true;
1121-
}
1122-
1123-
@Override
1124-
public boolean stopSound(Player player, Sound sound) {
1125-
player.stopSound(sound);
1126-
return true;
1127-
}
1128-
1129-
@Override
1130-
public boolean stopSound(Player player, String sound) {
1131-
player.stopSound(sound);
1132-
return true;
1133-
}
1134-
1135-
@Override
1136-
public boolean lockChunk(Chunk chunk) {
1137-
if (!platform.getPlugin().isEnabled()) return false;
1138-
if (!chunk.isLoaded()) {
1139-
platform.getLogger().info("Locking unloaded chunk");
1140-
}
1141-
chunk.addPluginChunkTicket(platform.getPlugin());
1142-
return true;
1143-
}
1144-
1145-
@Override
1146-
public boolean unlockChunk(Chunk chunk) {
1147-
if (!platform.getPlugin().isEnabled()) return false;
1148-
chunk.removePluginChunkTicket(platform.getPlugin());
1149-
return true;
1150-
}
1151-
11521059
@Override
11531060
public Location getHangingLocation(Entity entity) {
11541061
Location location = entity.getLocation();

0 commit comments

Comments
 (0)