diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 5ec591a98..ee86d059a 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -37,6 +37,7 @@ import net.minecraft.util.registry.RegistryNamespaced; import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.DummySubTile; @@ -60,6 +61,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -88,12 +90,11 @@ public final class BotaniaAPI { public static final ResourceLocation DUMMY_SUBTILE_NAME = new ResourceLocation("botania", "dummy"); - public static final Map oreWeights = new HashMap<>(); - public static final Map oreWeightsNether = new HashMap<>(); + public static volatile Map oreWeights = Collections.emptyMap(); + public static volatile Map oreWeightsNether = Collections.emptyMap(); - public static final Map> paintableBlocks = new LinkedHashMap<>(); + public static volatile Map, Function> paintableBlocks = Collections.emptyMap(); public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static final Set gaiaBreakBlacklist = new HashSet<>(); private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; public static final IArmorMaterial MANASTEEL_ARMOR_MAT = new IArmorMaterial() { @@ -376,110 +377,6 @@ public final class BotaniaAPI { basicKnowledge = registerKnowledgeType("minecraft", TextFormatting.RESET, true); elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false); relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false); - - /* todo 1.13 - addOreWeight("oreAluminum", 3940); // Tinkers' Construct - addOreWeight("oreAmber", 2075); // Thaumcraft - addOreWeight("oreApatite", 1595); // Forestry - addOreWeight("oreBlueTopaz", 3195); // Ars Magica - addOreWeight("oreCertusQuartz", 3975); // Applied Energistics - addOreWeight("oreChimerite", 3970); // Ars Magica - addOreWeight("oreCinnabar", 2585); // Thaumcraft - addOreWeight("oreCoal", 46525); // Vanilla - addOreWeight("oreCopper", 8325); // IC2, Thermal Expansion, Tinkers' Construct, etc. - addOreWeight("oreDark", 1350); // EvilCraft - addOreWeight("oreDarkIron", 1700); // Factorization (older versions) - addOreWeight("oreFzDarkIron", 1700); // Factorization (newer versions) - addOreWeight("oreDiamond", 1265); // Vanilla - addOreWeight("oreEmerald", 780); // Vanilla - addOreWeight("oreGalena", 1000); // Factorization - addOreWeight("oreGold", 2970); // Vanilla - addOreWeight("oreInfusedAir", 925); // Thaumcraft - addOreWeight("oreInfusedEarth", 925); // Thaumcraft - addOreWeight("oreInfusedEntropy", 925); // Thaumcraft - addOreWeight("oreInfusedFire", 925); // Thaumcraft - addOreWeight("oreInfusedOrder", 925); // Thaumcraft - addOreWeight("oreInfusedWater", 925); // Thaumcraft - addOreWeight("oreIron", 20665); // Vanilla - addOreWeight("oreLapis", 1285); // Vanilla - addOreWeight("oreLead", 7985); // IC2, Thermal Expansion, Factorization, etc. - addOreWeight("oreMCropsEssence", 3085); // Magical Crops - addOreWeight("oreMithril", 8); // Thermal Expansion - addOreWeight("oreNickel", 2275); // Thermal Expansion - addOreWeight("oreOlivine", 1100); // Project RED - addOreWeight("orePlatinum", 365); // Thermal Expansion - addOreWeight("oreRedstone", 6885); // Vanilla - addOreWeight("oreRuby", 1100); // Project RED - addOreWeight("oreSapphire", 1100); // Project RED - addOreWeight("oreSilver", 6300); // Thermal Expansion, Factorization, etc. - addOreWeight("oreSulfur", 1105); // Railcraft - addOreWeight("oreTin", 9450); // IC2, Thermal Expansion, etc. - addOreWeight("oreUranium", 1337); // IC2 - addOreWeight("oreVinteum", 5925); // Ars Magica - addOreWeight("oreYellorite", 3520); // Big Reactors - addOreWeight("oreZinc", 6485); // Flaxbeard's Steam Power - addOreWeight("oreMythril", 6485); // Simple Ores2 - addOreWeight("oreAdamantium", 2275); // Simple Ores2 - addOreWeight("oreTungsten", 3520); // Simple Tungsten - addOreWeight("oreOsmium", 6915); // Mekanism - addOreWeight("oreQuartzBlack", 5535); // Actually Additions - - addOreWeightNether("oreQuartz", 19600); // Vanilla - addOreWeightNether("oreCobalt", 500); // Tinker's Construct - addOreWeightNether("oreArdite", 500); // Tinker's Construct - addOreWeightNether("oreFirestone", 5); // Railcraft - addOreWeightNether("oreNetherCoal", 17000); // Nether Ores - addOreWeightNether("oreNetherCopper", 4700); // Nether Ores - addOreWeightNether("oreNetherDiamond", 175); // Nether Ores - addOreWeightNether("oreNetherEssence", 2460); // Magical Crops - addOreWeightNether("oreNetherGold", 3635); // Nether Ores - addOreWeightNether("oreNetherIron", 5790); // Nether Ores - addOreWeightNether("oreNetherLapis", 3250); // Nether Ores - addOreWeightNether("oreNetherLead", 2790); // Nether Ores - addOreWeightNether("oreNetherNickel", 1790); // Nether Ores - addOreWeightNether("oreNetherPlatinum", 170); // Nether Ores - addOreWeightNether("oreNetherRedstone", 5600); // Nether Ores - addOreWeightNether("oreNetherSilver", 1550); // Nether Ores - addOreWeightNether("oreNetherSteel", 1690); // Nether Ores - addOreWeightNether("oreNetherTin", 3750); // Nether Ores - addOreWeightNether("oreFyrite", 1000); // Netherrocks - addOreWeightNether("oreAshstone", 1000); // Netherrocks - addOreWeightNether("oreDragonstone", 175); // Netherrocks - addOreWeightNether("oreArgonite", 1000); // Netherrocks - addOreWeightNether("oreOnyx", 500); // SimpleOres 2 - addOreWeightNether("oreHaditeCoal", 500); // Hadite - */ - - registerModWiki("minecraft", new SimpleWikiProvider("Minecraft Wiki", "https://minecraft.gamepedia.com/%s")); - - IWikiProvider technicWiki = new SimpleWikiProvider("Technic Wiki", "http://wiki.technicpack.net/%s"); - IWikiProvider mekanismWiki = new SimpleWikiProvider("Mekanism Wiki", "http://wiki.aidancbrady.com/wiki/%s"); - - registerModWiki("mekanism", mekanismWiki); - registerModWiki("mekanismgenerators", mekanismWiki); - registerModWiki("mekanismtools", mekanismWiki); - registerModWiki("enderio", new SimpleWikiProvider("EnderIO Wiki", "http://wiki.enderio.com/%s")); - registerModWiki("tropicraft", new SimpleWikiProvider("Tropicraft Wiki", "http://wiki.tropicraft.net/wiki/%s")); - registerModWiki("randomthings", new SimpleWikiProvider("Random Things Wiki", "https://lumien.net/rtwiki/blocks/%s/", "-", true)); - registerModWiki("appliedenergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s")); - registerModWiki("bigreactors", technicWiki); - - 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_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_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_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_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); } /** @@ -519,15 +416,6 @@ public final class BotaniaAPI { return fallbackBrew; } - /** - * Registers a block as paintable under the paint lens - */ - public static void registerPaintableBlock(Function transformer, Block... paintables) { - for(Block b : paintables) { - paintableBlocks.put(b, transformer); - } - } - /** * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. * Pass in the class for the Entity, e.g. EntityCow.class @@ -709,28 +597,6 @@ public final class BotaniaAPI { category.entries.add(entry); } - /** - * Maps a block tag to it's weight on the world generation. This - * is used for the Orechid flower. Check the static block in the BotaniaAPI class - * to get the weights for the vanilla blocks.
- * Alternatively get the values with the OreDetector mod:
- * https://gist.github.com/Vazkii/9493322 - */ - public static void addOreWeight(ResourceLocation tag, int weight) { - oreWeights.put(tag, weight); - } - - /** - * Maps a block tag to it's weight on the nether world generation. This - * is used for the Orechid Ignem flower. Check the static block in the BotaniaAPI class - * to get the weights for the vanilla blocks.
- * Alternatively get the values with the OreDetector mod:
- * https://gist.github.com/Vazkii/9493322 - */ - public static void addOreWeightNether(ResourceLocation tag, int weight) { - oreWeightsNether.put(tag, weight); - } - public static int getOreWeight(ResourceLocation tag) { return oreWeights.get(tag); } @@ -738,16 +604,4 @@ public final class BotaniaAPI { public static int getOreWeightNether(ResourceLocation tag) { return oreWeightsNether.get(tag); } - - /** - * Registers a Wiki provider for a mod so it uses that instead of the fallback - * FTB wiki. - */ - public static void registerModWiki(String mod, IWikiProvider provider) { - WikiHooks.registerModWiki(mod, provider); - } - - public static void blacklistBlockFromGaiaGuardian(Block block) { - gaiaBreakBlacklist.add(block); - } } diff --git a/src/main/java/vazkii/botania/api/imc/IMC.java b/src/main/java/vazkii/botania/api/imc/IMC.java new file mode 100644 index 000000000..f2559e830 --- /dev/null +++ b/src/main/java/vazkii/botania/api/imc/IMC.java @@ -0,0 +1,45 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Apr 06, 2019] + */ +package vazkii.botania.api.imc; + +/** + * This class defines the IMC methods accepted by Botania and their expected argument types + * @see net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent + * @see net.minecraftforge.fml.event.lifecycle.InterModProcessEvent + * @see net.minecraftforge.fml.InterModComms + */ +public class IMC { + /** + * Maps a block tag to its weight in world generation. This is used for the Orechid flower.
+ * The argument should be a {@link OreWeightMessage}, any other types are ignored.
+ * Check the Botania source to see default values.
+ */ + public static final String REGISTER_ORE_WEIGHT = "register_ore_weight"; + + /** + * Maps a block tag to its weight in nether world generation. This is used for the Orechid flower.
+ * The argument should be a {@link OreWeightMessage}, any other types are ignored.
+ * Check the Botania source to see default values.
+ */ + public static final String REGISTER_NETHER_ORE_WEIGHT = "register_nether_ore_weight"; + + /** + * Registers a Wiki provider for a mod so it uses that instead of the fallback FTB wiki.
+ * The argument should be a {@link ModWikiMessage}, any other types are ignored. + */ + public static final String REGISTER_MOD_WIKI = "register_mod_wiki"; + + /** + * Registers a block as paintable under the paint lens.
+ * The argument should be a {@link PaintableBlockMessage}, any other types are ignored. + */ + public static final String REGISTER_PAINTABLE_BLOCK = "register_paintable_block"; +} diff --git a/src/main/java/vazkii/botania/api/imc/ModWikiMessage.java b/src/main/java/vazkii/botania/api/imc/ModWikiMessage.java new file mode 100644 index 000000000..dd98d23f6 --- /dev/null +++ b/src/main/java/vazkii/botania/api/imc/ModWikiMessage.java @@ -0,0 +1,21 @@ +package vazkii.botania.api.imc; + +import vazkii.botania.api.wiki.IWikiProvider; + +public class ModWikiMessage { + private final String modid; + private final IWikiProvider wiki; + + public ModWikiMessage(String modid, IWikiProvider wiki) { + this.modid = modid; + this.wiki = wiki; + } + + public String getModId() { + return modid; + } + + public IWikiProvider getWiki() { + return wiki; + } +} diff --git a/src/main/java/vazkii/botania/api/imc/OreWeightMessage.java b/src/main/java/vazkii/botania/api/imc/OreWeightMessage.java new file mode 100644 index 000000000..cbffbec8d --- /dev/null +++ b/src/main/java/vazkii/botania/api/imc/OreWeightMessage.java @@ -0,0 +1,25 @@ +package vazkii.botania.api.imc; + +import net.minecraft.util.ResourceLocation; + +public class OreWeightMessage { + private final ResourceLocation blockTag; + private final Integer weight; + + /** + * @param blockTag ID of a block tag to register + * @param weight Weight of the tag + */ + public OreWeightMessage(ResourceLocation blockTag, Integer weight) { + this.blockTag = blockTag; + this.weight = weight; + } + + public ResourceLocation getOre() { + return blockTag; + } + + public Integer getWeight() { + return weight; + } +} diff --git a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java new file mode 100644 index 000000000..6182fb544 --- /dev/null +++ b/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java @@ -0,0 +1,27 @@ +package vazkii.botania.api.imc; + +import net.minecraft.block.Block; +import net.minecraft.item.EnumDyeColor; +import net.minecraftforge.registries.IRegistryDelegate; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +public class PaintableBlockMessage { + private final IRegistryDelegate block; + private final Function transformer; + + public PaintableBlockMessage(Function transformer, Block block) { + this.block = block.delegate; + this.transformer = transformer; + } + + public IRegistryDelegate getBlock() { + return block; + } + + public Function getTransformer() { + return transformer; + } +} diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index bbbe86152..ee063eb0a 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -13,6 +13,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -20,7 +21,7 @@ public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "https://ftb.gamepedia.com/%s"); - private static final Map modWikis = new HashMap<>(); + public static Map modWikis = Collections.emptyMap(); public static IWikiProvider getWikiFor(Block block) { ResourceLocation mod = block.getRegistryName(); @@ -31,8 +32,4 @@ public class WikiHooks { return modWikis.getOrDefault(mod, FALLBACK_PROVIDER); } - public static void registerModWiki(String mod, IWikiProvider provider) { - modWikis.put(mod.toLowerCase(), provider); - } - } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index f1d1d2c66..b9f925491 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -56,6 +56,7 @@ import vazkii.botania.common.core.command.CommandShare; import vazkii.botania.common.core.command.CommandSkyblockSpread; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.IMCSender; import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.loot.BindUuid; @@ -127,6 +128,7 @@ public class Botania { proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); proxy.registerHandlers(); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(IMCSender::enqueue); FMLJavaModLoadingContext.get().getModEventBus().addListener(IMCHandler::handle); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigHandler.CLIENT_SPEC); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigHandler.COMMON_SPEC); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 38a68f518..d4cf18b7d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -51,7 +51,6 @@ public class BlockPylon extends BlockMod implements ILexiconable { public BlockPylon(Variant v, Properties builder) { super(builder); this.variant = v; - BotaniaAPI.blacklistBlockFromGaiaGuardian(this); } @Nonnull 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 8212e93a0..1424bf447 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,10 +1,54 @@ package vazkii.botania.common.core.handler; +import com.google.common.collect.ImmutableMap; +import net.minecraft.block.Block; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.registries.IRegistryDelegate; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.imc.IMC; +import vazkii.botania.api.imc.ModWikiMessage; +import vazkii.botania.api.imc.OreWeightMessage; +import vazkii.botania.api.imc.PaintableBlockMessage; +import vazkii.botania.api.wiki.IWikiProvider; +import vazkii.botania.api.wiki.WikiHooks; + +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; public final class IMCHandler { public static void handle(InterModProcessEvent evt) { - evt.getIMCStream().forEach(message -> { - }); + BotaniaAPI.oreWeights = handleOreWeights(evt.getIMCStream(IMC.REGISTER_ORE_WEIGHT::equals)); + BotaniaAPI.oreWeightsNether = handleOreWeights(evt.getIMCStream(IMC.REGISTER_NETHER_ORE_WEIGHT::equals)); + WikiHooks.modWikis = handleWikis(evt.getIMCStream(IMC.REGISTER_MOD_WIKI::equals)); + BotaniaAPI.paintableBlocks = handlePaintable(evt.getIMCStream(IMC.REGISTER_PAINTABLE_BLOCK::equals)); + } + + private static Map handleWikis(Stream msgs) { + Map map = msgs + .filter(msg -> msg.getMessageSupplier().get() instanceof ModWikiMessage) + .map(msg -> (ModWikiMessage) msg.getMessageSupplier().get()) + .collect(Collectors.toMap(ModWikiMessage::getModId, ModWikiMessage::getWiki)); + return ImmutableMap.copyOf(map); + } + + private static Map handleOreWeights(Stream msgs) { + Map map = msgs + .filter(msg -> msg.getMessageSupplier().get() instanceof OreWeightMessage) + .map(msg -> (OreWeightMessage) msg.getMessageSupplier().get()) + .collect(Collectors.toMap(OreWeightMessage::getOre, OreWeightMessage::getWeight)); + return ImmutableMap.copyOf(map); + } + + private static Map, Function> handlePaintable(Stream msgs) { + Map, Function> map = msgs + .filter(msg -> msg.getMessageSupplier().get() instanceof PaintableBlockMessage) + .map(msg -> (PaintableBlockMessage) msg.getMessageSupplier().get()) + .collect(Collectors.toMap(PaintableBlockMessage::getBlock, PaintableBlockMessage::getTransformer)); + return ImmutableMap.copyOf(map); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java new file mode 100644 index 000000000..7e4b12e4c --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java @@ -0,0 +1,137 @@ +package vazkii.botania.common.core.handler; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraftforge.fml.InterModComms; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import vazkii.botania.api.ColorHelper; +import vazkii.botania.api.imc.IMC; +import vazkii.botania.api.imc.ModWikiMessage; +import vazkii.botania.api.imc.PaintableBlockMessage; +import vazkii.botania.api.wiki.IWikiProvider; +import vazkii.botania.api.wiki.SimpleWikiProvider; +import vazkii.botania.common.lib.LibMisc; + +public class IMCSender { + public static void enqueue(InterModEnqueueEvent evt) { + /* Ore weights todo 1.13 + addOreWeight("oreAluminum", 3940); // Tinkers' Construct + addOreWeight("oreAmber", 2075); // Thaumcraft + addOreWeight("oreApatite", 1595); // Forestry + addOreWeight("oreBlueTopaz", 3195); // Ars Magica + addOreWeight("oreCertusQuartz", 3975); // Applied Energistics + addOreWeight("oreChimerite", 3970); // Ars Magica + addOreWeight("oreCinnabar", 2585); // Thaumcraft + addOreWeight("oreCoal", 46525); // Vanilla + addOreWeight("oreCopper", 8325); // IC2, Thermal Expansion, Tinkers' Construct, etc. + addOreWeight("oreDark", 1350); // EvilCraft + addOreWeight("oreDarkIron", 1700); // Factorization (older versions) + addOreWeight("oreFzDarkIron", 1700); // Factorization (newer versions) + addOreWeight("oreDiamond", 1265); // Vanilla + addOreWeight("oreEmerald", 780); // Vanilla + addOreWeight("oreGalena", 1000); // Factorization + addOreWeight("oreGold", 2970); // Vanilla + addOreWeight("oreInfusedAir", 925); // Thaumcraft + addOreWeight("oreInfusedEarth", 925); // Thaumcraft + addOreWeight("oreInfusedEntropy", 925); // Thaumcraft + addOreWeight("oreInfusedFire", 925); // Thaumcraft + addOreWeight("oreInfusedOrder", 925); // Thaumcraft + addOreWeight("oreInfusedWater", 925); // Thaumcraft + addOreWeight("oreIron", 20665); // Vanilla + addOreWeight("oreLapis", 1285); // Vanilla + addOreWeight("oreLead", 7985); // IC2, Thermal Expansion, Factorization, etc. + addOreWeight("oreMCropsEssence", 3085); // Magical Crops + addOreWeight("oreMithril", 8); // Thermal Expansion + addOreWeight("oreNickel", 2275); // Thermal Expansion + addOreWeight("oreOlivine", 1100); // Project RED + addOreWeight("orePlatinum", 365); // Thermal Expansion + addOreWeight("oreRedstone", 6885); // Vanilla + addOreWeight("oreRuby", 1100); // Project RED + addOreWeight("oreSapphire", 1100); // Project RED + addOreWeight("oreSilver", 6300); // Thermal Expansion, Factorization, etc. + addOreWeight("oreSulfur", 1105); // Railcraft + addOreWeight("oreTin", 9450); // IC2, Thermal Expansion, etc. + addOreWeight("oreUranium", 1337); // IC2 + addOreWeight("oreVinteum", 5925); // Ars Magica + addOreWeight("oreYellorite", 3520); // Big Reactors + addOreWeight("oreZinc", 6485); // Flaxbeard's Steam Power + addOreWeight("oreMythril", 6485); // Simple Ores2 + addOreWeight("oreAdamantium", 2275); // Simple Ores2 + addOreWeight("oreTungsten", 3520); // Simple Tungsten + addOreWeight("oreOsmium", 6915); // Mekanism + addOreWeight("oreQuartzBlack", 5535); // Actually Additions + + addOreWeightNether("oreQuartz", 19600); // Vanilla + addOreWeightNether("oreCobalt", 500); // Tinker's Construct + addOreWeightNether("oreArdite", 500); // Tinker's Construct + addOreWeightNether("oreFirestone", 5); // Railcraft + addOreWeightNether("oreNetherCoal", 17000); // Nether Ores + addOreWeightNether("oreNetherCopper", 4700); // Nether Ores + addOreWeightNether("oreNetherDiamond", 175); // Nether Ores + addOreWeightNether("oreNetherEssence", 2460); // Magical Crops + addOreWeightNether("oreNetherGold", 3635); // Nether Ores + addOreWeightNether("oreNetherIron", 5790); // Nether Ores + addOreWeightNether("oreNetherLapis", 3250); // Nether Ores + addOreWeightNether("oreNetherLead", 2790); // Nether Ores + addOreWeightNether("oreNetherNickel", 1790); // Nether Ores + addOreWeightNether("oreNetherPlatinum", 170); // Nether Ores + addOreWeightNether("oreNetherRedstone", 5600); // Nether Ores + addOreWeightNether("oreNetherSilver", 1550); // Nether Ores + addOreWeightNether("oreNetherSteel", 1690); // Nether Ores + addOreWeightNether("oreNetherTin", 3750); // Nether Ores + addOreWeightNether("oreFyrite", 1000); // Netherrocks + addOreWeightNether("oreAshstone", 1000); // Netherrocks + addOreWeightNether("oreDragonstone", 175); // Netherrocks + addOreWeightNether("oreArgonite", 1000); // Netherrocks + addOreWeightNether("oreOnyx", 500); // SimpleOres 2 + addOreWeightNether("oreHaditeCoal", 500); // Hadite + */ + + IWikiProvider technicWiki = new SimpleWikiProvider("Technic Wiki", "http://wiki.technicpack.net/%s"); + IWikiProvider mekanismWiki = new SimpleWikiProvider("Mekanism Wiki", "http://wiki.aidancbrady.com/wiki/%s"); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("minecraft", new SimpleWikiProvider("Minecraft Wiki", "https://minecraft.gamepedia.com/%s"))); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("mekanism", mekanismWiki)); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("mekanismgenerators", mekanismWiki)); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("mekanismtools", mekanismWiki)); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("enderio", new SimpleWikiProvider("EnderIO Wiki", "http://wiki.enderio.com/%s"))); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("tropicraft", new SimpleWikiProvider("Tropicraft Wiki", "http://wiki.tropicraft.net/wiki/%s"))); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("randomthings", new SimpleWikiProvider("Random Things Wiki", "https://lumien.net/rtwiki/blocks/%s/", "-", true))); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("appliedenergistics2", new SimpleWikiProvider("AE2 Wiki", "http://ae-mod.info/%s"))); + send(IMC.REGISTER_MOD_WIKI, new ModWikiMessage("bigreactors", technicWiki)); + + // Can't iterate over ColorHelper map values yet since remap event hasn't fired yet -.- + Block[] stainedGlass = { 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 : stainedGlass) + send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.STAINED_GLASS_MAP::get, b)); + + Block[] sgPanes = { 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 : sgPanes) + send(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(ColorHelper.STAINED_GLASS_PANE_MAP::get, b)); + + Block[] terracottas = { 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)); + + 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)); + + 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)); + } + + private static void send(String method, Object thing) { + InterModComms.sendTo(LibMisc.MOD_ID, method, () -> thing); + } +} diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index e2c0ad6ad..26aa73d41 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -37,6 +37,8 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.network.play.server.SPacketRemoveEntityEffect; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; @@ -122,6 +124,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss, IE private static final String TAG_MOB_SPAWN_TICKS = "mobSpawnTicks"; private static final String TAG_HARD_MODE = "hardMode"; private static final String TAG_PLAYER_COUNT = "playerCount"; + private static final Tag BLACKLIST = new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "gaia_break_blacklist")); private static final DataParameter INVUL_TIME = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); @@ -551,7 +554,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss, IE world.destroyBlock(pos, true); } else { //don't break blacklisted blocks - if(BotaniaAPI.gaiaBreakBlacklist.contains(block)) continue; + if(BLACKLIST.contains(block)) continue; //don't break the floor if(y == source.getY() - 1) continue; //don't break blocks in pylon columns diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index f33c69cce..2251123c8 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -47,7 +47,7 @@ public class LensPaint extends Lens { } else { IBlockState state = entity.world.getBlockState(pos.getBlockPos()); Block block = state.getBlock(); - if(BotaniaAPI.paintableBlocks.containsKey(block)) { + if(BotaniaAPI.paintableBlocks.containsKey(block.delegate)) { List coordsToPaint = new ArrayList<>(); List coordsFound = new ArrayList<>(); coordsFound.add(pos.getBlockPos()); @@ -71,7 +71,7 @@ public class LensPaint extends Lens { EnumDyeColor placeColor = EnumDyeColor.byId(storedColor == 16 ? entity.world.rand.nextInt(16) : storedColor); IBlockState stateThere = entity.world.getBlockState(coords); - Function f = BotaniaAPI.paintableBlocks.get(block); + Function f = BotaniaAPI.paintableBlocks.get(block.delegate); Block newBlock = f.apply(placeColor); if(newBlock != stateThere.getBlock()) { entity.world.setBlockState(coords, newBlock.getDefaultState()); diff --git a/src/main/resources/data/botania/tags/blocks/gaia_break_blacklist.json b/src/main/resources/data/botania/tags/blocks/gaia_break_blacklist.json new file mode 100644 index 000000000..6e0a8f393 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/gaia_break_blacklist.json @@ -0,0 +1,10 @@ +{ + "__comment": "Blocks in this tag will not be broken by the Gaia Guardian", + "replace": false, + "values": [ + "minecraft:beacon", + "botania:mana_pylon", + "botania:natura_pylon", + "botania:gaia_pylon" + ] +} \ No newline at end of file