Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add null type annotations to MaterialConverter.

This commit is contained in:
Jeremy Wood 2019-01-30 00:19:26 -05:00
parent 0f14ee557d
commit 43ecdc913a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/onarandombox/MultiverseCore/utils/MaterialConverter.java
View File

@ -3,6 +3,8 @@ package com.onarandombox.MultiverseCore.utils;
import de.themoep.idconverter.IdMappings; import de.themoep.idconverter.IdMappings;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** /**
* A tool for converting values which may be an old type ID to a Material. * A tool for converting values which may be an old type ID to a Material.
@ -17,7 +19,8 @@ public class MaterialConverter {
* @param path The path of the value in the config. * @param path The path of the value in the config.
* @return The converted Material type or null if no matching type. * @return The converted Material type or null if no matching type.
*/ */
public static Material convertConfigType(ConfigurationSection config, String path) { @Nullable
public static Material convertConfigType(@NotNull ConfigurationSection config, @NotNull String path) {
return convertTypeString(config.getString(path)); return convertTypeString(config.getString(path));
} }
@ -27,7 +30,8 @@ public class MaterialConverter {
* @param value The value to convert. * @param value The value to convert.
* @return The converted Material type or null if no matching type. * @return The converted Material type or null if no matching type.
*/ */
public static Material convertTypeString(String value) { @Nullable
public static Material convertTypeString(@Nullable String value) {
IdMappings.Mapping mapping = IdMappings.getById(value); IdMappings.Mapping mapping = IdMappings.getById(value);
if (mapping != null) { if (mapping != null) {
return Material.matchMaterial(mapping.getFlatteningType()); return Material.matchMaterial(mapping.getFlatteningType());