diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f4f9b0304..0ec05f589 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -465,19 +465,19 @@ public final class BotaniaAPI { registerModWiki("appliedenergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s")); registerModWiki("bigreactors", technicWiki); - registerPaintableBlock(ColorHelper.STAINED_GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, + registerPaintableBlock(ColorHelper.STAINED_GLASS_MAP::get, 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); - registerPaintableBlock(ColorHelper.STAINED_GLASS_PANE, Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, + registerPaintableBlock(ColorHelper.STAINED_GLASS_PANE_MAP::get, 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); - registerPaintableBlock(ColorHelper.TERRACOTTA, Blocks.WHITE_TERRACOTTA, Blocks.ORANGE_TERRACOTTA, Blocks.MAGENTA_TERRACOTTA, Blocks.LIGHT_BLUE_TERRACOTTA, + registerPaintableBlock(ColorHelper.TERRACOTTA_MAP::get, 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); - registerPaintableBlock(ColorHelper.WOOL, Blocks.WHITE_WOOL, Blocks.ORANGE_WOOL, Blocks.MAGENTA_WOOL, Blocks.LIGHT_BLUE_WOOL, + registerPaintableBlock(ColorHelper.WOOL_MAP::get, 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); - registerPaintableBlock(ColorHelper.CARPET, Blocks.WHITE_CARPET, Blocks.ORANGE_CARPET, Blocks.MAGENTA_CARPET, Blocks.LIGHT_BLUE_CARPET, + registerPaintableBlock(ColorHelper.CARPET_MAP::get, 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); blacklistBlockFromGaiaGuardian(Blocks.BEACON); diff --git a/src/main/java/vazkii/botania/api/ColorHelper.java b/src/main/java/vazkii/botania/api/ColorHelper.java index 89d5e13b8..2ef52538a 100644 --- a/src/main/java/vazkii/botania/api/ColorHelper.java +++ b/src/main/java/vazkii/botania/api/ColorHelper.java @@ -1,121 +1,116 @@ package vazkii.botania.api; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent; import java.util.function.Function; +@Mod.EventBusSubscriber(modid = "botania") public final class ColorHelper { - public static final Function STAINED_GLASS = e -> { - switch (e) { - default: - case WHITE: return Blocks.WHITE_STAINED_GLASS; - case ORANGE: return Blocks.ORANGE_STAINED_GLASS; - case MAGENTA: return Blocks.MAGENTA_STAINED_GLASS; - case LIGHT_BLUE: return Blocks.LIGHT_BLUE_STAINED_GLASS; - case YELLOW: return Blocks.YELLOW_STAINED_GLASS; - case LIME: return Blocks.LIME_STAINED_GLASS; - case PINK: return Blocks.PINK_STAINED_GLASS; - case GRAY: return Blocks.GRAY_STAINED_GLASS; - case LIGHT_GRAY: return Blocks.LIGHT_GRAY_STAINED_GLASS; - case CYAN: return Blocks.CYAN_STAINED_GLASS; - case PURPLE: return Blocks.PURPLE_STAINED_GLASS; - case BLUE: return Blocks.BLUE_STAINED_GLASS; - case BROWN: return Blocks.BROWN_STAINED_GLASS; - case GREEN: return Blocks.GREEN_STAINED_GLASS; - case RED: return Blocks.RED_STAINED_GLASS; - case BLACK: return Blocks.BLACK_STAINED_GLASS; - } - }; - - public static final Function STAINED_GLASS_PANE = e -> { - switch (e) { - default: - case WHITE: return Blocks.WHITE_STAINED_GLASS_PANE; - case ORANGE: return Blocks.ORANGE_STAINED_GLASS_PANE; - case MAGENTA: return Blocks.MAGENTA_STAINED_GLASS_PANE; - case LIGHT_BLUE: return Blocks.LIGHT_BLUE_STAINED_GLASS_PANE; - case YELLOW: return Blocks.YELLOW_STAINED_GLASS_PANE; - case LIME: return Blocks.LIME_STAINED_GLASS_PANE; - case PINK: return Blocks.PINK_STAINED_GLASS_PANE; - case GRAY: return Blocks.GRAY_STAINED_GLASS_PANE; - case LIGHT_GRAY: return Blocks.LIGHT_GRAY_STAINED_GLASS_PANE; - case CYAN: return Blocks.CYAN_STAINED_GLASS_PANE; - case PURPLE: return Blocks.PURPLE_STAINED_GLASS_PANE; - case BLUE: return Blocks.BLUE_STAINED_GLASS_PANE; - case BROWN: return Blocks.BROWN_STAINED_GLASS_PANE; - case GREEN: return Blocks.GREEN_STAINED_GLASS_PANE; - case RED: return Blocks.RED_STAINED_GLASS_PANE; - case BLACK: return Blocks.BLACK_STAINED_GLASS_PANE; - } - }; - - public static final Function TERRACOTTA = e -> { - switch (e) { - default: - case WHITE: return Blocks.WHITE_TERRACOTTA; - case ORANGE: return Blocks.ORANGE_TERRACOTTA; - case MAGENTA: return Blocks.MAGENTA_TERRACOTTA; - case LIGHT_BLUE: return Blocks.LIGHT_BLUE_TERRACOTTA; - case YELLOW: return Blocks.YELLOW_TERRACOTTA; - case LIME: return Blocks.LIME_TERRACOTTA; - case PINK: return Blocks.PINK_TERRACOTTA; - case GRAY: return Blocks.GRAY_TERRACOTTA; - case LIGHT_GRAY: return Blocks.LIGHT_GRAY_TERRACOTTA; - case CYAN: return Blocks.CYAN_TERRACOTTA; - case PURPLE: return Blocks.PURPLE_TERRACOTTA; - case BLUE: return Blocks.BLUE_TERRACOTTA; - case BROWN: return Blocks.BROWN_TERRACOTTA; - case GREEN: return Blocks.GREEN_TERRACOTTA; - case RED: return Blocks.RED_TERRACOTTA; - case BLACK: return Blocks.BLACK_TERRACOTTA; - } - }; - - public static final Function WOOL = e -> { - switch (e) { - default: - case WHITE: return Blocks.WHITE_WOOL; - case ORANGE: return Blocks.ORANGE_WOOL; - case MAGENTA: return Blocks.MAGENTA_WOOL; - case LIGHT_BLUE: return Blocks.LIGHT_BLUE_WOOL; - case YELLOW: return Blocks.YELLOW_WOOL; - case LIME: return Blocks.LIME_WOOL; - case PINK: return Blocks.PINK_WOOL; - case GRAY: return Blocks.GRAY_WOOL; - case LIGHT_GRAY: return Blocks.LIGHT_GRAY_WOOL; - case CYAN: return Blocks.CYAN_WOOL; - case PURPLE: return Blocks.PURPLE_WOOL; - case BLUE: return Blocks.BLUE_WOOL; - case BROWN: return Blocks.BROWN_WOOL; - case GREEN: return Blocks.GREEN_WOOL; - case RED: return Blocks.RED_WOOL; - case BLACK: return Blocks.BLACK_WOOL; - } - }; - - public static final Function CARPET = e -> { - switch (e) { - default: - case WHITE: return Blocks.WHITE_CARPET; - case ORANGE: return Blocks.ORANGE_CARPET; - case MAGENTA: return Blocks.MAGENTA_CARPET; - case LIGHT_BLUE: return Blocks.LIGHT_BLUE_CARPET; - case YELLOW: return Blocks.YELLOW_CARPET; - case LIME: return Blocks.LIME_CARPET; - case PINK: return Blocks.PINK_CARPET; - case GRAY: return Blocks.GRAY_CARPET; - case LIGHT_GRAY: return Blocks.LIGHT_GRAY_CARPET; - case CYAN: return Blocks.CYAN_CARPET; - case PURPLE: return Blocks.PURPLE_CARPET; - case BLUE: return Blocks.BLUE_CARPET; - case BROWN: return Blocks.BROWN_CARPET; - case GREEN: return Blocks.GREEN_CARPET; - case RED: return Blocks.RED_CARPET; - case BLACK: return Blocks.BLACK_CARPET; - } - }; + 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 WOOL_MAP = HashBiMap.create(); + public static final BiMap CARPET_MAP = HashBiMap.create(); + @SubscribeEvent + public static void idShift(FMLModIdMappingEvent evt) { + STAINED_GLASS_MAP.clear(); + STAINED_GLASS_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS); + STAINED_GLASS_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS); + + STAINED_GLASS_PANE_MAP.clear(); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIME, Blocks.LIME_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PINK, Blocks.PINK_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.RED, Blocks.RED_STAINED_GLASS_PANE); + STAINED_GLASS_PANE_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_STAINED_GLASS_PANE); + + TERRACOTTA_MAP.clear(); + TERRACOTTA_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.LIME, Blocks.LIME_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.PINK, Blocks.PINK_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.RED, Blocks.RED_TERRACOTTA); + TERRACOTTA_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_TERRACOTTA); + + WOOL_MAP.clear(); + WOOL_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_WOOL); + WOOL_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_WOOL); + WOOL_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_WOOL); + WOOL_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_WOOL); + WOOL_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_WOOL); + WOOL_MAP.put(EnumDyeColor.LIME, Blocks.LIME_WOOL); + WOOL_MAP.put(EnumDyeColor.PINK, Blocks.PINK_WOOL); + WOOL_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_WOOL); + WOOL_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_WOOL); + WOOL_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_WOOL); + WOOL_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_WOOL); + WOOL_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_WOOL); + WOOL_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_WOOL); + WOOL_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_WOOL); + WOOL_MAP.put(EnumDyeColor.RED, Blocks.RED_WOOL); + WOOL_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_WOOL); + + CARPET_MAP.clear(); + CARPET_MAP.put(EnumDyeColor.WHITE, Blocks.WHITE_CARPET); + CARPET_MAP.put(EnumDyeColor.ORANGE, Blocks.ORANGE_CARPET); + CARPET_MAP.put(EnumDyeColor.MAGENTA, Blocks.MAGENTA_CARPET); + CARPET_MAP.put(EnumDyeColor.LIGHT_BLUE, Blocks.LIGHT_BLUE_CARPET); + CARPET_MAP.put(EnumDyeColor.YELLOW, Blocks.YELLOW_CARPET); + CARPET_MAP.put(EnumDyeColor.LIME, Blocks.LIME_CARPET); + CARPET_MAP.put(EnumDyeColor.PINK, Blocks.PINK_CARPET); + CARPET_MAP.put(EnumDyeColor.GRAY, Blocks.GRAY_CARPET); + CARPET_MAP.put(EnumDyeColor.LIGHT_GRAY, Blocks.LIGHT_GRAY_CARPET); + CARPET_MAP.put(EnumDyeColor.CYAN, Blocks.CYAN_CARPET); + CARPET_MAP.put(EnumDyeColor.PURPLE, Blocks.PURPLE_CARPET); + CARPET_MAP.put(EnumDyeColor.BLUE, Blocks.BLUE_CARPET); + CARPET_MAP.put(EnumDyeColor.BROWN, Blocks.BROWN_CARPET); + CARPET_MAP.put(EnumDyeColor.GREEN, Blocks.GREEN_CARPET); + CARPET_MAP.put(EnumDyeColor.RED, Blocks.RED_CARPET); + CARPET_MAP.put(EnumDyeColor.BLACK, Blocks.BLACK_CARPET); + } + private ColorHelper() {} } 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 559990b6e..6435ba49a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -27,6 +27,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.ColorHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; @@ -98,10 +99,10 @@ public class RenderTileSpreader extends TileEntityRenderer { GlStateManager.popMatrix(); } - if(spreader.paddingColor != -1) { + if(spreader.paddingColor != null) { Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - IBlockState carpet = carpetFor(spreader.paddingColor).getDefaultState(); + IBlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).getDefaultState(); GlStateManager.translatef(-0.5F, -0.5F, 0.5F); float f = 1 / 16F; @@ -136,27 +137,4 @@ public class RenderTileSpreader extends TileEntityRenderer { GlStateManager.enableRescaleNormal(); GlStateManager.popMatrix(); } - - private static Block carpetFor(int color) { - switch (EnumDyeColor.byId(color)) { - default: - case WHITE: return Blocks.WHITE_CARPET; - case ORANGE: return Blocks.ORANGE_CARPET; - case MAGENTA: return Blocks.ORANGE_CARPET; - case LIGHT_BLUE: return Blocks.ORANGE_CARPET; - case YELLOW: return Blocks.ORANGE_CARPET; - case LIME: return Blocks.ORANGE_CARPET; - case PINK: return Blocks.ORANGE_CARPET; - case GRAY: return Blocks.ORANGE_CARPET; - case LIGHT_GRAY: return Blocks.ORANGE_CARPET; - case CYAN: return Blocks.ORANGE_CARPET; - case PURPLE: return Blocks.ORANGE_CARPET; - case BLUE: return Blocks.ORANGE_CARPET; - case BROWN: return Blocks.ORANGE_CARPET; - case GREEN: return Blocks.ORANGE_CARPET; - case RED: return Blocks.ORANGE_CARPET; - case BLACK: return Blocks.ORANGE_CARPET; - } - } - } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index f5630e435..5c8c7ee45 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -29,6 +29,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent; import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent; import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; @@ -36,6 +37,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.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; @@ -96,6 +98,8 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; +import java.util.Collections; + @Mod(LibMisc.MOD_ID) public class Botania { @@ -116,6 +120,7 @@ public class Botania { proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); proxy.registerHandlers(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(IMCHandler::handle); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigHandler.CLIENT_SPEC); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigHandler.COMMON_SPEC); MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart); @@ -132,6 +137,9 @@ public class Botania { BotaniaAPI.internalHandler = new InternalMethodHandler(); + // todo 1.13 remove when event is fired + ColorHelper.idShift(new FMLModIdMappingEvent(Collections.emptyMap(), false)); + PacketHandler.init(); ModBrews.init(); ModMultiblocks.init(); 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 f5a31b161..6f93cdb16 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -11,12 +11,14 @@ package vazkii.botania.common.block.mana; import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -34,6 +36,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; +import vazkii.botania.api.ColorHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -115,7 +118,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex ItemStack lens = spreader.getItemHandler().getStackInSlot(0); ItemStack heldItem = player.getHeldItem(hand); boolean isHeldItemLens = !heldItem.isEmpty() && heldItem.getItem() instanceof ILens; - boolean wool = !heldItem.isEmpty() && heldItem.getItem() == Item.getItemFromBlock(Blocks.WOOL); + boolean wool = !heldItem.isEmpty() && ColorHelper.WOOL_MAP.values().contains(Block.getBlockFromItem(heldItem.getItem())); if(!heldItem.isEmpty()) if(heldItem.getItem() == ModItems.twigWand) @@ -133,15 +136,16 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex spreader.markDirty(); } - if(wool && spreader.paddingColor == -1) { - spreader.paddingColor = heldItem.getItemDamage(); + if(wool && spreader.paddingColor == null) { + Block block = Block.getBlockFromItem(heldItem.getItem()); + spreader.paddingColor = ColorHelper.WOOL_MAP.inverse().get(block); heldItem.shrink(1); if(heldItem.isEmpty()) player.setHeldItem(hand, ItemStack.EMPTY); - } else if(heldItem.isEmpty() && spreader.paddingColor != -1 && lens.isEmpty()) { - ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); + } else if(heldItem.isEmpty() && spreader.paddingColor != null && lens.isEmpty()) { + ItemStack pad = new ItemStack(ColorHelper.WOOL_MAP.get(spreader.paddingColor)); ItemHandlerHelper.giveItemToPlayer(player, pad); - spreader.paddingColor = -1; + spreader.paddingColor = null; spreader.markDirty(); } @@ -156,8 +160,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex TileSpreader inv = (TileSpreader) tile; - if(inv.paddingColor != -1) { - net.minecraft.inventory.InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Blocks.WOOL, 1, inv.paddingColor)); + if(inv.paddingColor != null) { + ItemStack padding = new ItemStack(ColorHelper.WOOL_MAP.get(inv.paddingColor)); + world.spawnEntity(new EntityItem(world, pos.getX(), pos.getY(), pos.getZ(), padding)); } InventoryHelper.dropInventory(inv, world, state, pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 250f4811c..8f700022f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -20,6 +20,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.SPacketUpdateTileEntity; @@ -138,7 +139,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int mana; private int knownMana = -1; public float rotationX, rotationY; - public int paddingColor = -1; + + @Nullable + public EnumDyeColor paddingColor = null; private boolean requestsClientUpdate = false; private boolean hasReceivedInitialPacket = false; @@ -286,7 +289,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, cmp.putFloat(TAG_ROTATION_X, rotationX); cmp.putFloat(TAG_ROTATION_Y, rotationY); cmp.putBoolean(TAG_REQUEST_UPDATE, requestsClientUpdate); - cmp.putInt(TAG_PADDING_COLOR, paddingColor); + cmp.putInt(TAG_PADDING_COLOR, paddingColor == null ? -1 : paddingColor.getId()); cmp.putBoolean(TAG_CAN_SHOOT_BURST, canShootBurst); cmp.putInt(TAG_PINGBACK_TICKS, pingbackTicks); @@ -345,7 +348,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(cmp.contains(TAG_KNOWN_MANA)) knownMana = cmp.getInt(TAG_KNOWN_MANA); if(cmp.contains(TAG_PADDING_COLOR)) - paddingColor = cmp.getInt(TAG_PADDING_COLOR); + paddingColor = cmp.getInt(TAG_PADDING_COLOR) == -1 ? null : EnumDyeColor.byId(cmp.getInt(TAG_PADDING_COLOR)); if(cmp.contains(TAG_CAN_SHOOT_BURST)) canShootBurst = cmp.getBoolean(TAG_CAN_SHOOT_BURST); @@ -447,7 +450,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, world.spawnEntity(burst); burst.ping(); if(!ConfigHandler.COMMON.silentSpreaders.get()) - world.playSound(null, pos, ModSounds.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); + world.playSound(null, pos, ModSounds.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != null ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); } } } diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index c8f289e8b..8212e93a0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,18 +1,10 @@ package vazkii.botania.common.core.handler; -import com.google.common.collect.ImmutableList; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; -import vazkii.botania.common.lib.LibMisc; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; public final class IMCHandler { - - public static void processMessages(ImmutableList messageList) { - for (IMCMessage message : messageList) { - if (message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { - String value = message.getStringValue(); - ItemMagnetRing.addItemToBlackList(value); - } - } + public static void handle(InterModProcessEvent evt) { + evt.getIMCStream().forEach(message -> { + }); } }