Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-10-22 20:30:41 +02:00
Code Issues Projects Releases Wiki Activity

CompatibleMaterial: Adds missing materials to some property methods

Browse Source 
For `#isFuel`, `#isItem`, and `#isInteractable`
This commit is contained in:
Christian Koop 2021-11-21 22:52:11 +01:00
parent 7d255685ed
commit f8d218ff3d
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
1 changed files with 115 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
View File

@ -1419,6 +1419,7 @@ public enum CompatibleMaterial {
if (usesCompatibility()) {
return compatibleMaterial.getItem();
}
return data != null ? new ItemStack(material, amount, data) : new ItemStack(material);
}
@ -1470,7 +1471,7 @@ public enum CompatibleMaterial {
* @return LegacyMaterial or null if none found
*/
public static CompatibleMaterial getMaterial(String name) {
return name == null ? null : lookupMap.get(name.toUpperCase());
return getMaterial(name, null);
}
/**
@ -1495,18 +1496,22 @@ public enum CompatibleMaterial {
* @return LegacyMaterial or null if none found
*/
public static CompatibleMaterial getMaterial(Material mat) {
if (mat == null)
if (mat == null) {
return null;
}
if (useLegacy) {
CompatibleMaterial compatibleMaterial = lookupMap.get(mat.name() + ":0");
if (compatibleMaterial != null)
if (compatibleMaterial != null) {
return compatibleMaterial;
}
}
return lookupMap.get(mat.name());
}
/**
* Lookup a Material by Itemstack.
* Lookup a Material by ItemStack.
*
* @param item item to lookup
*
@ -1802,6 +1807,7 @@ public enum CompatibleMaterial {
switch (this) {
case STRING:
return true;
case ACACIA_DOOR:
case BIRCH_DOOR:
case DARK_OAK_DOOR:
@ -1853,6 +1859,7 @@ public enum CompatibleMaterial {
case CAKE:
case COMPARATOR:
return usesLegacy();
default:
return false;
}
@ -1881,7 +1888,14 @@ public enum CompatibleMaterial {
/**
* Check if the material is a block and does not block any light
*
* @return True if this material is a block and does not block any light
*
* @see Material#isTransparent()
* @deprecated currently does not have an implementation which is well
* linked to the underlying server. Contributions welcome.
*/
@Deprecated
public boolean isTransparent() {
return material != null && material.isTransparent();
}
@ -1920,6 +1934,7 @@ public enum CompatibleMaterial {
case ACACIA_STAIRS:
case ACACIA_TRAPDOOR:
case ACACIA_WOOD:
case AZALEA:
case BAMBOO:
case BARREL:
case BIRCH_BOAT:
@ -1979,6 +1994,7 @@ public enum CompatibleMaterial {
case DRIED_KELP_BLOCK:
case FISHING_ROD:
case FLETCHING_TABLE:
case FLOWERING_AZALEA:
case GRAY_BANNER:
case GRAY_CARPET:
case GRAY_WOOL:
@ -2320,23 +2336,31 @@ public enum CompatibleMaterial {
public boolean isItem() {
// this function is not implemented in some older versions, so we need this here...
switch (this) {
case CAVE_AIR:
case VOID_AIR:
case ACACIA_WALL_SIGN:
case ATTACHED_MELON_STEM:
case ATTACHED_PUMPKIN_STEM:
case BAMBOO_SAPLING:
case BEETROOTS:
case BIG_DRIPLEAF_STEM:
case BIRCH_WALL_SIGN:
case BLACK_CANDLE_CAKE:
case BLACK_WALL_BANNER:
case BLUE_CANDLE_CAKE:
case BLUE_WALL_BANNER:
case BRAIN_CORAL_WALL_FAN:
case BROWN_CANDLE_CAKE:
case BROWN_WALL_BANNER:
case BUBBLE_COLUMN:
case BUBBLE_CORAL_WALL_FAN:
case CANDLE_CAKE:
case CARROTS:
case CAVE_AIR:
case CAVE_VINES:
case CAVE_VINES_PLANT:
case COCOA:
case CREEPER_WALL_HEAD:
case CRIMSON_WALL_SIGN:
case CYAN_CANDLE_CAKE:
case CYAN_WALL_BANNER:
case DARK_OAK_WALL_SIGN:
case DEAD_BRAIN_CORAL_WALL_FAN:
@ -2350,27 +2374,37 @@ public enum CompatibleMaterial {
case FIRE:
case FIRE_CORAL_WALL_FAN:
case FROSTED_ICE:
case GRAY_CANDLE_CAKE:
case GRAY_WALL_BANNER:
case GREEN_CANDLE_CAKE:
case GREEN_WALL_BANNER:
case HORN_CORAL_WALL_FAN:
case JUNGLE_WALL_SIGN:
case KELP_PLANT:
case LAVA:
case LAVA_CAULDRON:
case LIGHT_BLUE_CANDLE_CAKE:
case LIGHT_BLUE_WALL_BANNER:
case LIGHT_GRAY_CANDLE_CAKE:
case LIGHT_GRAY_WALL_BANNER:
case LIME_CANDLE_CAKE:
case LIME_WALL_BANNER:
case MAGENTA_CANDLE_CAKE:
case MAGENTA_WALL_BANNER:
case MELON_STEM:
case MOVING_PISTON:
case NETHER_PORTAL:
case OAK_WALL_SIGN:
case ORANGE_CANDLE_CAKE:
case ORANGE_WALL_BANNER:
case PINK_CANDLE_CAKE:
case PINK_WALL_BANNER:
case PISTON_HEAD:
case PLAYER_WALL_HEAD:
case POTATOES:
case POTTED_ACACIA_SAPLING:
case POTTED_ALLIUM:
case POTTED_AZALEA_BUSH:
case POTTED_AZURE_BLUET:
case POTTED_BAMBOO:
case POTTED_BIRCH_SAPLING:
@ -2378,10 +2412,13 @@ public enum CompatibleMaterial {
case POTTED_BROWN_MUSHROOM:
case POTTED_CACTUS:
case POTTED_CORNFLOWER:
case POTTED_CRIMSON_FUNGUS:
case POTTED_CRIMSON_ROOTS:
case POTTED_DANDELION:
case POTTED_DARK_OAK_SAPLING:
case POTTED_DEAD_BUSH:
case POTTED_FERN:
case POTTED_FLOWERING_AZALEA_BUSH:
case POTTED_JUNGLE_SAPLING:
case POTTED_LILY_OF_THE_VALLEY:
case POTTED_OAK_SAPLING:
@ -2392,26 +2429,42 @@ public enum CompatibleMaterial {
case POTTED_RED_MUSHROOM:
case POTTED_RED_TULIP:
case POTTED_SPRUCE_SAPLING:
case POTTED_WARPED_FUNGUS:
case POTTED_WARPED_ROOTS:
case POTTED_WHITE_TULIP:
case POTTED_WITHER_ROSE:
case POWDER_SNOW:
case POWDER_SNOW_CAULDRON:
case PUMPKIN_STEM:
case PURPLE_CANDLE_CAKE:
case PURPLE_WALL_BANNER:
case REDSTONE_WALL_TORCH:
case REDSTONE_WIRE:
case RED_CANDLE_CAKE:
case RED_WALL_BANNER:
case SKELETON_WALL_SKULL:
case SOUL_FIRE:
case SOUL_WALL_TORCH:
case SPRUCE_WALL_SIGN:
case SWEET_BERRY_BUSH:
case TALL_SEAGRASS:
case TRIPWIRE:
case TUBE_CORAL_WALL_FAN:
case TWISTING_VINES_PLANT:
case VOID_AIR:
case WALL_TORCH:
case WARPED_WALL_SIGN:
case WATER:
case WATER_CAULDRON:
case WEEPING_VINES_PLANT:
case WHITE_CANDLE_CAKE:
case WHITE_WALL_BANNER:
case WITHER_SKELETON_WALL_SKULL:
case YELLOW_CANDLE_CAKE:
case YELLOW_WALL_BANNER:
case ZOMBIE_WALL_HEAD:
return false;
default:
return true;
}
@ -2450,21 +2503,32 @@ public enum CompatibleMaterial {
case BIRCH_WALL_SIGN:
case BLACKSTONE_STAIRS:
case BLACK_BED:
case BLACK_CANDLE:
case BLACK_CANDLE_CAKE:
case BLACK_SHULKER_BOX:
case BLAST_FURNACE:
case BLUE_BED:
case BLUE_CANDLE:
case BLUE_CANDLE_CAKE:
case BLUE_SHULKER_BOX:
case BREWING_STAND:
case BRICK_STAIRS:
case BROWN_BED:
case BROWN_CANDLE:
case BROWN_CANDLE_CAKE:
case BROWN_SHULKER_BOX:
case CAKE:
case CAMPFIRE:
case CANDLE:
case CANDLE_CAKE:
case CARTOGRAPHY_TABLE:
case CAULDRON:
case CAVE_VINES:
case CAVE_VINES_PLANT:
case CHAIN_COMMAND_BLOCK:
case CHEST:
case CHIPPED_ANVIL:
case COBBLED_DEEPSLATE_STAIRS:
case COBBLESTONE_STAIRS:
case COMMAND_BLOCK:
case COMPARATOR:
@ -2478,7 +2542,10 @@ public enum CompatibleMaterial {
case CRIMSON_STAIRS:
case CRIMSON_TRAPDOOR:
case CRIMSON_WALL_SIGN:
case CUT_COPPER_STAIRS:
case CYAN_BED:
case CYAN_CANDLE:
case CYAN_CANDLE_CAKE:
case CYAN_SHULKER_BOX:
case DAMAGED_ANVIL:
case DARK_OAK_BUTTON:
@ -2491,6 +2558,9 @@ public enum CompatibleMaterial {
case DARK_OAK_WALL_SIGN:
case DARK_PRISMARINE_STAIRS:
case DAYLIGHT_DETECTOR:
case DEEPSLATE_BRICK_STAIRS:
case DEEPSLATE_REDSTONE_ORE:
case DEEPSLATE_TILE_STAIRS:
case DIORITE_STAIRS:
case DISPENSER:
case DRAGON_EGG:
@ -2498,13 +2568,18 @@ public enum CompatibleMaterial {
case ENCHANTING_TABLE:
case ENDER_CHEST:
case END_STONE_BRICK_STAIRS:
case EXPOSED_CUT_COPPER_STAIRS:
case FLETCHING_TABLE:
case FLOWER_POT:
case FURNACE:
case GRANITE_STAIRS:
case GRAY_BED:
case GRAY_CANDLE:
case GRAY_CANDLE_CAKE:
case GRAY_SHULKER_BOX:
case GREEN_BED:
case GREEN_CANDLE:
case GREEN_CANDLE_CAKE:
case GREEN_SHULKER_BOX:
case GRINDSTONE:
case HOPPER:
@ -2520,16 +2595,26 @@ public enum CompatibleMaterial {
case JUNGLE_STAIRS:
case JUNGLE_TRAPDOOR:
case JUNGLE_WALL_SIGN:
case LAVA_CAULDRON:
case LECTERN:
case LEVER:
case LIGHT:
case LIGHT_BLUE_BED:
case LIGHT_BLUE_CANDLE:
case LIGHT_BLUE_CANDLE_CAKE:
case LIGHT_BLUE_SHULKER_BOX:
case LIGHT_GRAY_BED:
case LIGHT_GRAY_CANDLE:
case LIGHT_GRAY_CANDLE_CAKE:
case LIGHT_GRAY_SHULKER_BOX:
case LIME_BED:
case LIME_CANDLE:
case LIME_CANDLE_CAKE:
case LIME_SHULKER_BOX:
case LOOM:
case MAGENTA_BED:
case MAGENTA_CANDLE:
case MAGENTA_CANDLE_CAKE:
case MAGENTA_SHULKER_BOX:
case MOSSY_COBBLESTONE_STAIRS:
case MOSSY_STONE_BRICK_STAIRS:
@ -2546,17 +2631,24 @@ public enum CompatibleMaterial {
case OAK_TRAPDOOR:
case OAK_WALL_SIGN:
case ORANGE_BED:
case ORANGE_CANDLE:
case ORANGE_CANDLE_CAKE:
case ORANGE_SHULKER_BOX:
case OXIDIZED_CUT_COPPER_STAIRS:
case PINK_BED:
case PINK_CANDLE:
case PINK_CANDLE_CAKE:
case PINK_SHULKER_BOX:
case POLISHED_ANDESITE_STAIRS:
case POLISHED_BLACKSTONE_BRICK_STAIRS:
case POLISHED_BLACKSTONE_BUTTON:
case POLISHED_BLACKSTONE_STAIRS:
case POLISHED_DEEPSLATE_STAIRS:
case POLISHED_DIORITE_STAIRS:
case POLISHED_GRANITE_STAIRS:
case POTTED_ACACIA_SAPLING:
case POTTED_ALLIUM:
case POTTED_AZALEA_BUSH:
case POTTED_AZURE_BLUET:
case POTTED_BAMBOO:
case POTTED_BIRCH_SAPLING:
@ -2570,6 +2662,7 @@ public enum CompatibleMaterial {
case POTTED_DARK_OAK_SAPLING:
case POTTED_DEAD_BUSH:
case POTTED_FERN:
case POTTED_FLOWERING_AZALEA_BUSH:
case POTTED_JUNGLE_SAPLING:
case POTTED_LILY_OF_THE_VALLEY:
case POTTED_OAK_SAPLING:
@ -2584,16 +2677,21 @@ public enum CompatibleMaterial {
case POTTED_WARPED_ROOTS:
case POTTED_WHITE_TULIP:
case POTTED_WITHER_ROSE:
case POWDER_SNOW_CAULDRON:
case PRISMARINE_BRICK_STAIRS:
case PRISMARINE_STAIRS:
case PUMPKIN:
case PURPLE_BED:
case PURPLE_CANDLE:
case PURPLE_CANDLE_CAKE:
case PURPLE_SHULKER_BOX:
case PURPUR_STAIRS:
case QUARTZ_STAIRS:
case REDSTONE_ORE:
case REDSTONE_WIRE:
case RED_BED:
case RED_CANDLE:
case RED_CANDLE_CAKE:
case RED_NETHER_BRICK_STAIRS:
case RED_SANDSTONE_STAIRS:
case RED_SHULKER_BOX:
@ -2632,11 +2730,22 @@ public enum CompatibleMaterial {
case WARPED_STAIRS:
case WARPED_TRAPDOOR:
case WARPED_WALL_SIGN:
case WATER_CAULDRON:
case WAXED_CUT_COPPER_STAIRS:
case WAXED_EXPOSED_CUT_COPPER_STAIRS:
case WAXED_OXIDIZED_CUT_COPPER_STAIRS:
case WAXED_WEATHERED_CUT_COPPER_STAIRS:
case WEATHERED_CUT_COPPER_STAIRS:
case WHITE_BED:
case WHITE_CANDLE:
case WHITE_CANDLE_CAKE:
case WHITE_SHULKER_BOX:
case YELLOW_BED:
case YELLOW_CANDLE:
case YELLOW_CANDLE_CAKE:
case YELLOW_SHULKER_BOX:
return true;
default:
return false;
}