From ec55bbb8ea4244673a920cc9e20b870441c40b35 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 21 Jul 2020 08:50:34 -0500 Subject: [PATCH] Make ColorHelper KISS --- .../render/tile/RenderTileSpreader.java | 2 +- .../java/vazkii/botania/common/Botania.java | 1 - .../common/block/mana/BlockSpreader.java | 8 +- .../subtile/generating/SubTileSpectrolus.java | 8 +- .../common/core/handler/IMCSender.java | 39 ++-- .../common/core/helper/ColorHelper.java | 168 +++--------------- 6 files changed, 54 insertions(+), 172 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 225d206a7..40e958fc8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -93,7 +93,7 @@ public class RenderTileSpreader extends TileEntityRenderer { } if (spreader.paddingColor != null) { - BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).get().getDefaultState(); + BlockState carpet = ColorHelper.CARPET_MAP.apply(spreader.paddingColor).getDefaultState(); IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(carpet); buffer = buffers.getBuffer(RenderTypeLookup.func_239220_a_(carpet, false)); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 280f1b7c0..3c6946fd5 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -221,7 +221,6 @@ public class Botania { .func_233813_a_()); GlobalEntityTypeAttributes.put(ModEntities.PINK_WITHER, WitherEntity.func_234258_eI_().func_233813_a_()); ModBanners.init(); - ColorHelper.init(); PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.alfPortal), TileAlfPortal.MULTIBLOCK.getValue()); PatchouliAPI.instance.registerMultiblock(Registry.BLOCK.getKey(ModBlocks.terraPlate), TileTerraPlate.MULTIBLOCK.getValue()); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 6c23cc8d2..060d3ec99 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -132,7 +132,7 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP ItemStack lens = spreader.getItemHandler().getStackInSlot(0); ItemStack heldItem = player.getHeldItem(hand); boolean isHeldItemLens = !heldItem.isEmpty() && heldItem.getItem() instanceof ILens; - boolean wool = !heldItem.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(heldItem.getItem()).delegate); + boolean wool = !heldItem.isEmpty() && ColorHelper.isWool(Block.getBlockFromItem(heldItem.getItem())); if (!heldItem.isEmpty()) { if (heldItem.getItem() == ModItems.twigWand) { @@ -153,13 +153,13 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP if (wool && spreader.paddingColor == null) { Block block = Block.getBlockFromItem(heldItem.getItem()); - spreader.paddingColor = ColorHelper.WOOL_MAP.inverse().get(block.delegate); + spreader.paddingColor = ColorHelper.getWoolColor(block); heldItem.shrink(1); if (heldItem.isEmpty()) { player.setHeldItem(hand, ItemStack.EMPTY); } } else if (heldItem.isEmpty() && spreader.paddingColor != null && lens.isEmpty()) { - ItemStack pad = new ItemStack(ColorHelper.WOOL_MAP.get(spreader.paddingColor).get()); + ItemStack pad = new ItemStack(ColorHelper.WOOL_MAP.apply(spreader.paddingColor)); player.inventory.placeItemBackInInventory(player.world, pad); spreader.paddingColor = null; spreader.markDirty(); @@ -179,7 +179,7 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP TileSpreader inv = (TileSpreader) tile; if (inv.paddingColor != null) { - ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor).get()); + ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.apply(inv.paddingColor)); world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), padding)); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index fead90b93..41d8ff2e2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -81,15 +81,15 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { ItemStack morbid = new ItemStack(sheep.isBurning() ? Items.COOKED_MUTTON : Items.MUTTON); ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, morbid), target.getPosX(), target.getPosY() + target.getEyeHeight(), target.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); - ItemStack wool = new ItemStack(ColorHelper.WOOL_MAP.get(sheep.getFleeceColor()).get()); + ItemStack wool = new ItemStack(ColorHelper.WOOL_MAP.apply(sheep.getFleeceColor())); ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, wool), target.getPosX(), target.getPosY() + target.getEyeHeight(), target.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); } sheep.setHealth(0); } else if (target instanceof ItemEntity) { ItemStack stack = ((ItemEntity) target).getItem(); - if (!stack.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(stack.getItem()).delegate)) { - Block expected = ColorHelper.WOOL_MAP.get(nextColor).get(); + if (!stack.isEmpty() && ColorHelper.isWool(Block.getBlockFromItem(stack.getItem()))) { + Block expected = ColorHelper.WOOL_MAP.apply(nextColor); if (expected.asItem() == stack.getItem()) { addManaAndCycle(WOOL_GEN); @@ -128,7 +128,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { public void renderHUD(MatrixStack ms, Minecraft mc) { super.renderHUD(ms, mc); - ItemStack stack = new ItemStack(ColorHelper.WOOL_MAP.get(nextColor).get()); + ItemStack stack = new ItemStack(ColorHelper.WOOL_MAP.apply(nextColor)); int color = getColor(); if (!stack.isEmpty()) { diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java index 28fb862b0..fc12839c3 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java @@ -12,6 +12,7 @@ import com.mojang.datafixers.util.Pair; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.item.DyeColor; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; @@ -111,39 +112,39 @@ public class IMCSender { addOreWeightNether("ardite", 500); addOreWeightNether("cobalt", 500); - BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS, color -> ColorHelper.STAINED_GLASS_MAP.get(color).get()); - for (IRegistryDelegate b : ColorHelper.STAINED_GLASS_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.STAINED_GLASS_MAP.get(color).get()); + BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS, ColorHelper.STAINED_GLASS_MAP); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.STAINED_GLASS_MAP.apply(color), ColorHelper.STAINED_GLASS_MAP); } - BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS_PANE, color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get()); - for (IRegistryDelegate b : ColorHelper.STAINED_GLASS_PANE_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get()); + BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS_PANE, ColorHelper.STAINED_GLASS_PANE_MAP); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.STAINED_GLASS_PANE_MAP.apply(color), ColorHelper.STAINED_GLASS_PANE_MAP); } - BotaniaAPI.instance().registerPaintableBlock(Blocks.TERRACOTTA, color -> ColorHelper.TERRACOTTA_MAP.get(color).get()); - for (IRegistryDelegate b : ColorHelper.TERRACOTTA_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.TERRACOTTA_MAP.get(color).get()); + BotaniaAPI.instance().registerPaintableBlock(Blocks.TERRACOTTA, ColorHelper.TERRACOTTA_MAP); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.TERRACOTTA_MAP.apply(color), ColorHelper.TERRACOTTA_MAP); } - for (IRegistryDelegate b : ColorHelper.GLAZED_TERRACOTTA_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.GLAZED_TERRACOTTA_MAP.get(color).get()); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.GLAZED_TERRACOTTA_MAP.apply(color), ColorHelper.GLAZED_TERRACOTTA_MAP); } - for (IRegistryDelegate b : ColorHelper.WOOL_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.WOOL_MAP.get(color).get()); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.WOOL_MAP.apply(color), ColorHelper.WOOL_MAP); } - for (IRegistryDelegate b : ColorHelper.CARPET_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.CARPET_MAP.get(color).get()); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.CARPET_MAP.apply(color), ColorHelper.CARPET_MAP); } - for (IRegistryDelegate b : ColorHelper.CONCRETE_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.CONCRETE_MAP.get(color).get()); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.CONCRETE_MAP.apply(color), ColorHelper.CONCRETE_MAP); } - for (IRegistryDelegate b : ColorHelper.CONCRETE_POWDER_MAP.values()) { - BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.CONCRETE_POWDER_MAP.get(color).get()); + for (DyeColor color : DyeColor.values()) { + BotaniaAPI.instance().registerPaintableBlock(ColorHelper.CONCRETE_POWDER_MAP.apply(color), ColorHelper.CONCRETE_POWDER_MAP); } } diff --git a/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java b/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java index 4091faf09..d9676b32b 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java @@ -14,154 +14,36 @@ import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.DyeColor; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; import net.minecraftforge.registries.IRegistryDelegate; +import javax.annotation.Nullable; +import java.util.Locale; +import java.util.function.Function; + public final class ColorHelper { - public static final BiMap> STAINED_GLASS_MAP = HashBiMap.create(); - public static final BiMap> STAINED_GLASS_PANE_MAP = HashBiMap.create(); - public static final BiMap> TERRACOTTA_MAP = HashBiMap.create(); - public static final BiMap> GLAZED_TERRACOTTA_MAP = HashBiMap.create(); - public static final BiMap> WOOL_MAP = HashBiMap.create(); - public static final BiMap> CARPET_MAP = HashBiMap.create(); - public static final BiMap> CONCRETE_MAP = HashBiMap.create(); - public static final BiMap> CONCRETE_POWDER_MAP = HashBiMap.create(); + public static final Function STAINED_GLASS_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_stained_glass")).get(); + public static final Function STAINED_GLASS_PANE_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_stained_glass_pane")).get(); + public static final Function TERRACOTTA_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_terracotta")).get(); + public static final Function GLAZED_TERRACOTTA_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_glazed_terracotta")).get(); + public static final Function WOOL_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_wool")).get(); + public static final Function CARPET_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_carpet")).get(); + public static final Function CONCRETE_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_concrete")).get(); + public static final Function CONCRETE_POWDER_MAP = color -> Registry.BLOCK.getValue(new ResourceLocation(color.getString() + "_concrete_powder")).get(); - public static void init() { - STAINED_GLASS_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS.delegate); - STAINED_GLASS_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS.delegate); + @Nullable + public static DyeColor getWoolColor(Block b) { + ResourceLocation name = Registry.BLOCK.getKey(b); + if ("minecraft".equals(name.getNamespace()) && name.getPath().endsWith("_wool")) { + String color = name.getPath().substring(0, name.getPath().length() - "_wool".length()); + return DyeColor.valueOf(color.toUpperCase(Locale.ROOT)); + } + return null; + } - STAINED_GLASS_PANE_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS_PANE.delegate); - STAINED_GLASS_PANE_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE.delegate); - - TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_TERRACOTTA.delegate); - TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_TERRACOTTA.delegate); - - GLAZED_TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_GLAZED_TERRACOTTA.delegate); - GLAZED_TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_GLAZED_TERRACOTTA.delegate); - - WOOL_MAP.put(DyeColor.WHITE, Blocks.WHITE_WOOL.delegate); - WOOL_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_WOOL.delegate); - WOOL_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_WOOL.delegate); - WOOL_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL.delegate); - WOOL_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_WOOL.delegate); - WOOL_MAP.put(DyeColor.LIME, Blocks.LIME_WOOL.delegate); - WOOL_MAP.put(DyeColor.PINK, Blocks.PINK_WOOL.delegate); - WOOL_MAP.put(DyeColor.GRAY, Blocks.GRAY_WOOL.delegate); - WOOL_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL.delegate); - WOOL_MAP.put(DyeColor.CYAN, Blocks.CYAN_WOOL.delegate); - WOOL_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_WOOL.delegate); - WOOL_MAP.put(DyeColor.BLUE, Blocks.BLUE_WOOL.delegate); - WOOL_MAP.put(DyeColor.BROWN, Blocks.BROWN_WOOL.delegate); - WOOL_MAP.put(DyeColor.GREEN, Blocks.GREEN_WOOL.delegate); - WOOL_MAP.put(DyeColor.RED, Blocks.RED_WOOL.delegate); - WOOL_MAP.put(DyeColor.BLACK, Blocks.BLACK_WOOL.delegate); - - CARPET_MAP.put(DyeColor.WHITE, Blocks.WHITE_CARPET.delegate); - CARPET_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CARPET.delegate); - CARPET_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CARPET.delegate); - CARPET_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET.delegate); - CARPET_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CARPET.delegate); - CARPET_MAP.put(DyeColor.LIME, Blocks.LIME_CARPET.delegate); - CARPET_MAP.put(DyeColor.PINK, Blocks.PINK_CARPET.delegate); - CARPET_MAP.put(DyeColor.GRAY, Blocks.GRAY_CARPET.delegate); - CARPET_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET.delegate); - CARPET_MAP.put(DyeColor.CYAN, Blocks.CYAN_CARPET.delegate); - CARPET_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CARPET.delegate); - CARPET_MAP.put(DyeColor.BLUE, Blocks.BLUE_CARPET.delegate); - CARPET_MAP.put(DyeColor.BROWN, Blocks.BROWN_CARPET.delegate); - CARPET_MAP.put(DyeColor.GREEN, Blocks.GREEN_CARPET.delegate); - CARPET_MAP.put(DyeColor.RED, Blocks.RED_CARPET.delegate); - CARPET_MAP.put(DyeColor.BLACK, Blocks.BLACK_CARPET.delegate); - - CONCRETE_MAP.put(DyeColor.WHITE, Blocks.WHITE_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.LIME, Blocks.LIME_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.PINK, Blocks.PINK_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.GRAY, Blocks.GRAY_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.CYAN, Blocks.CYAN_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.BLUE, Blocks.BLUE_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.BROWN, Blocks.BROWN_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.GREEN, Blocks.GREEN_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.RED, Blocks.RED_CONCRETE.delegate); - CONCRETE_MAP.put(DyeColor.BLACK, Blocks.BLACK_CONCRETE.delegate); - - CONCRETE_POWDER_MAP.put(DyeColor.WHITE, Blocks.WHITE_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.LIME, Blocks.LIME_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.PINK, Blocks.PINK_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.GRAY, Blocks.GRAY_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.CYAN, Blocks.CYAN_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.BLUE, Blocks.BLUE_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.BROWN, Blocks.BROWN_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.GREEN, Blocks.GREEN_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.RED, Blocks.RED_CONCRETE_POWDER.delegate); - CONCRETE_POWDER_MAP.put(DyeColor.BLACK, Blocks.BLACK_CONCRETE_POWDER.delegate); + public static boolean isWool(Block b) { + return getWoolColor(b) != null; } private ColorHelper() {}