mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Fix compile error, make ColorHelper less awful
This commit is contained in:
1 parent
e5c5a37f27
commit
df11e72db3
9 files changed
+179
-206
No files matched your search
@@ -5,166 +5,154 @@ import com.google.common.collect.HashBiMap;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent;
|
||||
import net.minecraftforge.registries.IRegistryDelegate;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = "botania")
|
||||
public final class ColorHelper {
|
||||
public static final BiMap<DyeColor, Block> STAINED_GLASS_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> STAINED_GLASS_PANE_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> TERRACOTTA_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> GLAZED_TERRACOTTA_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> WOOL_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> CARPET_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> CONCRETE_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, Block> CONCRETE_POWDER_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> STAINED_GLASS_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> STAINED_GLASS_PANE_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> TERRACOTTA_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> GLAZED_TERRACOTTA_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> WOOL_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> CARPET_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> CONCRETE_MAP = HashBiMap.create();
|
||||
public static final BiMap<DyeColor, IRegistryDelegate<Block>> CONCRETE_POWDER_MAP = HashBiMap.create();
|
||||
|
||||
@SubscribeEvent
|
||||
public static void idShift(FMLModIdMappingEvent evt) {
|
||||
STAINED_GLASS_MAP.clear();
|
||||
STAINED_GLASS_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS);
|
||||
STAINED_GLASS_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS);
|
||||
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);
|
||||
|
||||
STAINED_GLASS_PANE_MAP.clear();
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.RED, Blocks.RED_STAINED_GLASS_PANE);
|
||||
STAINED_GLASS_PANE_MAP.put(DyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE);
|
||||
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.clear();
|
||||
TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_TERRACOTTA);
|
||||
TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_TERRACOTTA);
|
||||
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.clear();
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.WHITE, Blocks.WHITE_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.LIME, Blocks.LIME_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.PINK, Blocks.PINK_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.GRAY, Blocks.GRAY_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.CYAN, Blocks.CYAN_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.BLUE, Blocks.BLUE_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.BROWN, Blocks.BROWN_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.GREEN, Blocks.GREEN_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.RED, Blocks.RED_GLAZED_TERRACOTTA);
|
||||
GLAZED_TERRACOTTA_MAP.put(DyeColor.BLACK, Blocks.BLACK_GLAZED_TERRACOTTA);
|
||||
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.clear();
|
||||
WOOL_MAP.put(DyeColor.WHITE, Blocks.WHITE_WOOL);
|
||||
WOOL_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_WOOL);
|
||||
WOOL_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_WOOL);
|
||||
WOOL_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL);
|
||||
WOOL_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_WOOL);
|
||||
WOOL_MAP.put(DyeColor.LIME, Blocks.LIME_WOOL);
|
||||
WOOL_MAP.put(DyeColor.PINK, Blocks.PINK_WOOL);
|
||||
WOOL_MAP.put(DyeColor.GRAY, Blocks.GRAY_WOOL);
|
||||
WOOL_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL);
|
||||
WOOL_MAP.put(DyeColor.CYAN, Blocks.CYAN_WOOL);
|
||||
WOOL_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_WOOL);
|
||||
WOOL_MAP.put(DyeColor.BLUE, Blocks.BLUE_WOOL);
|
||||
WOOL_MAP.put(DyeColor.BROWN, Blocks.BROWN_WOOL);
|
||||
WOOL_MAP.put(DyeColor.GREEN, Blocks.GREEN_WOOL);
|
||||
WOOL_MAP.put(DyeColor.RED, Blocks.RED_WOOL);
|
||||
WOOL_MAP.put(DyeColor.BLACK, Blocks.BLACK_WOOL);
|
||||
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.clear();
|
||||
CARPET_MAP.put(DyeColor.WHITE, Blocks.WHITE_CARPET);
|
||||
CARPET_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CARPET);
|
||||
CARPET_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CARPET);
|
||||
CARPET_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET);
|
||||
CARPET_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CARPET);
|
||||
CARPET_MAP.put(DyeColor.LIME, Blocks.LIME_CARPET);
|
||||
CARPET_MAP.put(DyeColor.PINK, Blocks.PINK_CARPET);
|
||||
CARPET_MAP.put(DyeColor.GRAY, Blocks.GRAY_CARPET);
|
||||
CARPET_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET);
|
||||
CARPET_MAP.put(DyeColor.CYAN, Blocks.CYAN_CARPET);
|
||||
CARPET_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CARPET);
|
||||
CARPET_MAP.put(DyeColor.BLUE, Blocks.BLUE_CARPET);
|
||||
CARPET_MAP.put(DyeColor.BROWN, Blocks.BROWN_CARPET);
|
||||
CARPET_MAP.put(DyeColor.GREEN, Blocks.GREEN_CARPET);
|
||||
CARPET_MAP.put(DyeColor.RED, Blocks.RED_CARPET);
|
||||
CARPET_MAP.put(DyeColor.BLACK, Blocks.BLACK_CARPET);
|
||||
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.clear();
|
||||
CONCRETE_MAP.put(DyeColor.WHITE, Blocks.WHITE_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.LIME, Blocks.LIME_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.PINK, Blocks.PINK_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.GRAY, Blocks.GRAY_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.CYAN, Blocks.CYAN_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.BLUE, Blocks.BLUE_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.BROWN, Blocks.BROWN_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.GREEN, Blocks.GREEN_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.RED, Blocks.RED_CONCRETE);
|
||||
CONCRETE_MAP.put(DyeColor.BLACK, Blocks.BLACK_CONCRETE);
|
||||
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.clear();
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.WHITE, Blocks.WHITE_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.ORANGE, Blocks.ORANGE_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.MAGENTA, Blocks.MAGENTA_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.YELLOW, Blocks.YELLOW_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.LIME, Blocks.LIME_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.PINK, Blocks.PINK_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.GRAY, Blocks.GRAY_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.CYAN, Blocks.CYAN_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.PURPLE, Blocks.PURPLE_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.BLUE, Blocks.BLUE_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.BROWN, Blocks.BROWN_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.GREEN, Blocks.GREEN_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.RED, Blocks.RED_CONCRETE_POWDER);
|
||||
CONCRETE_POWDER_MAP.put(DyeColor.BLACK, Blocks.BLACK_CONCRETE_POWDER);
|
||||
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);
|
||||
}
|
||||
|
||||
private ColorHelper() {}
|
||||
|
||||
@@ -10,12 +10,16 @@ public class PaintableBlockMessage {
|
||||
private final IRegistryDelegate<Block> block;
|
||||
private final Function<DyeColor, Block> transformer;
|
||||
|
||||
public PaintableBlockMessage(Function<DyeColor, Block> transformer, Block block) {
|
||||
this(transformer, block.delegate);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param transformer Lookup function from color to destination block
|
||||
* @param block The block being converted
|
||||
*/
|
||||
public PaintableBlockMessage(Function<DyeColor, Block> transformer, Block block) {
|
||||
this.block = block.delegate;
|
||||
public PaintableBlockMessage(Function<DyeColor, Block> transformer, IRegistryDelegate<Block> block) {
|
||||
this.block = block;
|
||||
this.transformer = transformer;
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public class GuiBaubleBox extends ContainerScreen<ContainerBaubleBox> {
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
Minecraft.getInstance().getTextureManager().bindTexture(texture);
|
||||
blit(guiLeft, guiTop, 0, 0, xSize, ySize);
|
||||
InventoryScreen.drawEntityOnScreen(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player);
|
||||
InventoryScreen.drawEntity(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -102,7 +102,7 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
|
||||
}
|
||||
|
||||
if(spreader.paddingColor != null) {
|
||||
BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).getDefaultState();
|
||||
BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).get().getDefaultState();
|
||||
IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(carpet);
|
||||
buffer = buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(carpet));
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.ColorHelper;
|
||||
import vazkii.botania.api.capability.FloatingFlowerImpl;
|
||||
import vazkii.botania.api.item.IExoflameHeatable;
|
||||
import vazkii.botania.api.item.IFloatingFlower;
|
||||
@@ -146,6 +147,7 @@ public class Botania {
|
||||
new WorldTypeSkyblock();
|
||||
|
||||
ModBanners.init();
|
||||
ColorHelper.init();
|
||||
|
||||
PatchouliAPI.instance.registerMultiblock(ModBlocks.alfPortal.getRegistryName(), TileAlfPortal.MULTIBLOCK.getValue());
|
||||
PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), TileTerraPlate.MULTIBLOCK.getValue());
|
||||
|
||||
@@ -116,7 +116,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir
|
||||
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.values().contains(Block.getBlockFromItem(heldItem.getItem()));
|
||||
boolean wool = !heldItem.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(heldItem.getItem()).delegate);
|
||||
|
||||
if(!heldItem.isEmpty())
|
||||
if(heldItem.getItem() == ModItems.twigWand)
|
||||
@@ -136,12 +136,12 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir
|
||||
|
||||
if(wool && spreader.paddingColor == null) {
|
||||
Block block = Block.getBlockFromItem(heldItem.getItem());
|
||||
spreader.paddingColor = ColorHelper.WOOL_MAP.inverse().get(block);
|
||||
spreader.paddingColor = ColorHelper.WOOL_MAP.inverse().get(block.delegate);
|
||||
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));
|
||||
ItemStack pad = new ItemStack(ColorHelper.WOOL_MAP.get(spreader.paddingColor).get());
|
||||
ItemHandlerHelper.giveItemToPlayer(player, pad);
|
||||
spreader.paddingColor = null;
|
||||
spreader.markDirty();
|
||||
@@ -160,7 +160,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir
|
||||
TileSpreader inv = (TileSpreader) tile;
|
||||
|
||||
if(inv.paddingColor != null) {
|
||||
ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor));
|
||||
ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor).get());
|
||||
world.addEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), padding));
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
|
||||
} else if (target instanceof ItemEntity) {
|
||||
ItemStack stack = ((ItemEntity) target).getItem();
|
||||
|
||||
if(!stack.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(stack.getItem()))) {
|
||||
if(!stack.isEmpty() && ColorHelper.WOOL_MAP.containsValue(Block.getBlockFromItem(stack.getItem()).delegate)) {
|
||||
Block expected = ModBlocks.getWool(nextColor);
|
||||
|
||||
if(expected.asItem() == stack.getItem()) {
|
||||
|
||||
@@ -5,6 +5,7 @@ import net.minecraft.block.Blocks;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.InterModComms;
|
||||
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
|
||||
import net.minecraftforge.registries.IRegistryDelegate;
|
||||
import vazkii.botania.api.ColorHelper;
|
||||
import vazkii.botania.api.imc.IMC;
|
||||
import vazkii.botania.api.imc.OreWeightMessage;
|
||||
@@ -106,65 +107,43 @@ public class IMCSender {
|
||||
addOreWeightNether("oreHaditeCoal", 500); // Hadite haditeCoal, hadite/coal or coal/hadite?
|
||||
*/
|
||||
|
||||
// Can't iterate over ColorHelper map values yet since remap event hasn't fired yet -.-
|
||||
Block[] glass = { Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS,
|
||||
Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS,
|
||||
Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS };
|
||||
for(Block b : glass)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.STAINED_GLASS_MAP::get, b));
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_MAP.get(color).get(), Blocks.GLASS));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.STAINED_GLASS_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_MAP.get(color).get(), b));
|
||||
|
||||
Block[] glassPanes = { Blocks.GLASS_PANE, Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE,
|
||||
Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE,
|
||||
Blocks.CYAN_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS_PANE };
|
||||
for(Block b : glassPanes)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.STAINED_GLASS_PANE_MAP::get, b));
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get(), Blocks.GLASS_PANE));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.STAINED_GLASS_PANE_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get(), b));
|
||||
|
||||
Block[] terracottas = { Blocks.TERRACOTTA, Blocks.WHITE_TERRACOTTA, Blocks.ORANGE_TERRACOTTA, Blocks.MAGENTA_TERRACOTTA, Blocks.LIGHT_BLUE_TERRACOTTA,
|
||||
Blocks.YELLOW_TERRACOTTA, Blocks.LIME_TERRACOTTA, Blocks.PINK_TERRACOTTA, Blocks.GRAY_TERRACOTTA, Blocks.LIGHT_GRAY_TERRACOTTA,
|
||||
Blocks.CYAN_TERRACOTTA, Blocks.PURPLE_TERRACOTTA, Blocks.BLUE_TERRACOTTA, Blocks.BROWN_TERRACOTTA, Blocks.GREEN_TERRACOTTA, Blocks.RED_TERRACOTTA, Blocks.BLACK_TERRACOTTA };
|
||||
for(Block b : terracottas)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.TERRACOTTA_MAP::get, b));
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.TERRACOTTA_MAP.get(color).get(), Blocks.TERRACOTTA));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.TERRACOTTA_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.TERRACOTTA_MAP.get(color).get(), b.get()));
|
||||
|
||||
Block[] glazedTerracottas = { Blocks.WHITE_GLAZED_TERRACOTTA, Blocks.ORANGE_GLAZED_TERRACOTTA, Blocks.MAGENTA_GLAZED_TERRACOTTA, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA,
|
||||
Blocks.YELLOW_GLAZED_TERRACOTTA, Blocks.LIME_GLAZED_TERRACOTTA, Blocks.PINK_GLAZED_TERRACOTTA, Blocks.GRAY_GLAZED_TERRACOTTA, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA,
|
||||
Blocks.CYAN_GLAZED_TERRACOTTA, Blocks.PURPLE_GLAZED_TERRACOTTA, Blocks.BLUE_GLAZED_TERRACOTTA, Blocks.BROWN_GLAZED_TERRACOTTA, Blocks.GREEN_GLAZED_TERRACOTTA, Blocks.RED_GLAZED_TERRACOTTA, Blocks.BLACK_GLAZED_TERRACOTTA };
|
||||
for(Block b : glazedTerracottas)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.GLAZED_TERRACOTTA_MAP::get, b));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.GLAZED_TERRACOTTA_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.GLAZED_TERRACOTTA_MAP.get(color).get(), b));
|
||||
|
||||
Block[] wools = { Blocks.WHITE_WOOL, Blocks.ORANGE_WOOL, Blocks.MAGENTA_WOOL, Blocks.LIGHT_BLUE_WOOL,
|
||||
Blocks.YELLOW_WOOL, Blocks.LIME_WOOL, Blocks.PINK_WOOL, Blocks.GRAY_WOOL, Blocks.LIGHT_GRAY_WOOL,
|
||||
Blocks.CYAN_WOOL, Blocks.PURPLE_WOOL, Blocks.BLUE_WOOL, Blocks.BROWN_WOOL, Blocks.GREEN_WOOL, Blocks.RED_WOOL, Blocks.BLACK_WOOL };
|
||||
for(Block b : wools)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.WOOL_MAP::get, b));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.WOOL_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.WOOL_MAP.get(color).get(), b));
|
||||
|
||||
Block[] carpets = { Blocks.WHITE_CARPET, Blocks.ORANGE_CARPET, Blocks.MAGENTA_CARPET, Blocks.LIGHT_BLUE_CARPET,
|
||||
Blocks.YELLOW_CARPET, Blocks.LIME_CARPET, Blocks.PINK_CARPET, Blocks.GRAY_CARPET, Blocks.LIGHT_GRAY_CARPET,
|
||||
Blocks.CYAN_CARPET, Blocks.PURPLE_CARPET, Blocks.BLUE_CARPET, Blocks.BROWN_CARPET, Blocks.GREEN_CARPET, Blocks.RED_CARPET, Blocks.BLACK_CARPET };
|
||||
for(Block b : carpets)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.CARPET_MAP::get, b));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.CARPET_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CARPET_MAP.get(color).get(), b));
|
||||
|
||||
Block[] concretes = { Blocks.WHITE_CONCRETE, Blocks.ORANGE_CONCRETE, Blocks.MAGENTA_CONCRETE, Blocks.LIGHT_BLUE_CONCRETE,
|
||||
Blocks.YELLOW_CONCRETE, Blocks.LIME_CONCRETE, Blocks.PINK_CONCRETE, Blocks.GRAY_CONCRETE, Blocks.LIGHT_GRAY_CONCRETE,
|
||||
Blocks.CYAN_CONCRETE, Blocks.PURPLE_CONCRETE, Blocks.BLUE_CONCRETE, Blocks.BROWN_CONCRETE, Blocks.GREEN_CONCRETE, Blocks.RED_CONCRETE, Blocks.BLACK_CONCRETE};
|
||||
for(Block b : concretes)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.CONCRETE_MAP::get, b));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.CONCRETE_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CONCRETE_MAP.get(color).get(), b));
|
||||
|
||||
Block[] concretePowders = { Blocks.WHITE_CONCRETE_POWDER, Blocks.ORANGE_CONCRETE_POWDER, Blocks.MAGENTA_CONCRETE_POWDER, Blocks.LIGHT_BLUE_CONCRETE_POWDER,
|
||||
Blocks.YELLOW_CONCRETE_POWDER, Blocks.LIME_CONCRETE_POWDER, Blocks.PINK_CONCRETE_POWDER, Blocks.GRAY_CONCRETE_POWDER, Blocks.LIGHT_GRAY_CONCRETE_POWDER,
|
||||
Blocks.CYAN_CONCRETE_POWDER, Blocks.PURPLE_CONCRETE_POWDER, Blocks.BLUE_CONCRETE_POWDER, Blocks.BROWN_CONCRETE_POWDER, Blocks.GREEN_CONCRETE_POWDER, Blocks.RED_CONCRETE_POWDER, Blocks.BLACK_CONCRETE_POWDER};
|
||||
for(Block b : concretePowders)
|
||||
send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.CONCRETE_POWDER_MAP::get, b));
|
||||
for(IRegistryDelegate<Block> b : ColorHelper.CONCRETE_POWDER_MAP.values())
|
||||
sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CONCRETE_POWDER_MAP.get(color).get(), b));
|
||||
}
|
||||
|
||||
public static void send(String method, Object thing) {
|
||||
public static void sendToSelf(String method, Object thing) {
|
||||
InterModComms.sendTo(LibMisc.MOD_ID, method, () -> thing);
|
||||
}
|
||||
|
||||
private static void addOreWeight(String oreTag, int weight) {
|
||||
send(IMC.REGISTER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight));
|
||||
sendToSelf(IMC.REGISTER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight));
|
||||
}
|
||||
|
||||
private static void addOreWeightNether(String oreTag, int weight) {
|
||||
send(IMC.REGISTER_NETHER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight));
|
||||
sendToSelf(IMC.REGISTER_NETHER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight));
|
||||
}
|
||||
}
|
||||
@@ -79,11 +79,11 @@ public class ItemDye extends Item16Colors {
|
||||
}
|
||||
|
||||
private boolean shouldRecolor(Block block) {
|
||||
DyeColor woolColor = ColorHelper.WOOL_MAP.inverse().get(block);
|
||||
DyeColor woolColor = ColorHelper.WOOL_MAP.inverse().get(block.delegate);
|
||||
if(woolColor != null)
|
||||
return woolColor != this.color;
|
||||
|
||||
DyeColor carpetColor = ColorHelper.CARPET_MAP.inverse().get(block);
|
||||
DyeColor carpetColor = ColorHelper.CARPET_MAP.inverse().get(block.delegate);
|
||||
if(carpetColor != null)
|
||||
return carpetColor != this.color;
|
||||
|
||||
@@ -91,7 +91,7 @@ public class ItemDye extends Item16Colors {
|
||||
}
|
||||
|
||||
private BlockState recolor(Block original, DyeColor color) {
|
||||
if (ColorHelper.CARPET_MAP.values().contains(original)) {
|
||||
if (ColorHelper.CARPET_MAP.containsValue(original.delegate)) {
|
||||
return ModBlocks.getCarpet(color).getDefaultState();
|
||||
} else {
|
||||
return ModBlocks.getWool(color).getDefaultState();
|
||||
|
||||
Reference in new issue
Block a user