Upstream
/
addon-challenges
mirror of https://github.com/BentoBoxWorld/Challenges.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update missing icons for blocks. 

Some blocks cannot be displayed in GUI's, and were leaving empty spaces.
This replaces their icon with a close representative.

Fixes #286
This commit is contained in:
BONNe 2021-09-20 11:49:39 +03:00
parent 7f3a1f3e5e
commit aa4bb3d8e4
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/world/bentobox/challenges/utils/GuiUtils.java
View File

@ -254,12 +254,27 @@ public class GuiUtils
if (material.name().contains("WALL_"))
{
// Materials that is attached to wall cannot be showed in GUI. But they should be in list.
itemStack = new ItemStack(Material.getMaterial(material.name().replace("WALL_", "")));
Material newMaterial = Material.getMaterial(material.name().replace("WALL_", ""));
itemStack = new ItemStack(Objects.requireNonNullElse(newMaterial, material));
}
else if (material.equals(Material.POTTED_AZALEA_BUSH))
{
return new ItemStack(Material.AZALEA);
}
else if (material.equals(Material.POTTED_FLOWERING_AZALEA_BUSH))
{
return new ItemStack(Material.FLOWERING_AZALEA);
}
else if (material.name().startsWith("POTTED_"))
{
// Materials Potted elements cannot be in inventory.
itemStack = new ItemStack(Material.getMaterial(material.name().replace("POTTED_", "")));
Material newMaterial = Material.getMaterial(material.name().replace("POTTED_", ""));
itemStack = new ItemStack(Objects.requireNonNullElse(newMaterial, material));
}
else if (material.name().endsWith("CAULDRON"))
{
itemStack = new ItemStack(Material.CAULDRON);
}
else if (material.equals(Material.MELON_STEM) || material.equals(Material.ATTACHED_MELON_STEM))
{
@ -289,9 +304,16 @@ public class GuiUtils
{
itemStack = new ItemStack(Material.COCOA_BEANS);
}
else if (material.equals(Material.KELP_PLANT))
else if (material.equals(Material.CAVE_VINES) || material.equals(Material.CAVE_VINES_PLANT))
{
itemStack = new ItemStack(Material.KELP);
// Process cave vines as they are glow berries
itemStack = new ItemStack(Material.GLOW_BERRIES);
}
else if (material.name().endsWith("_PLANT"))
{
// Plants cannot be displayed in GUI's.
Material newMaterial = Material.getMaterial(material.name().replace("_PLANT", ""));
itemStack = new ItemStack(Objects.requireNonNullElse(newMaterial, material));
}
else if (material.equals(Material.REDSTONE_WIRE))
{
@ -329,6 +351,26 @@ public class GuiUtils
{
itemStack = new ItemStack(Material.PISTON);
}
else if (material.equals(Material.BAMBOO_SAPLING))
{
itemStack = new ItemStack(Material.BAMBOO);
}
else if (material.equals(Material.SWEET_BERRY_BUSH))
{
itemStack = new ItemStack(Material.SWEET_BERRIES);
}
else if (material.name().contains("CANDLE_CAKE"))
{
itemStack = new ItemStack(Material.CAKE);
}
else if (material.equals(Material.POWDER_SNOW))
{
itemStack = new ItemStack(Material.POWDER_SNOW_BUCKET);
}
else if (material.equals(Material.BIG_DRIPLEAF_STEM))
{
itemStack = new ItemStack(Material.BIG_DRIPLEAF);
}
else
{
itemStack = new ItemStack(material);