From 8e4666918ffb12f940e8e567a4ab8482c5249880 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Apr 2020 18:58:42 -0500 Subject: [PATCH] Migrate botaniaAPI and botaniaAPIClient to interface. Rework IMC to not rely on API. --- .../java/vazkii/botania/api/BotaniaAPI.java | 388 ++++++------------ .../vazkii/botania/api/BotaniaAPIClient.java | 27 +- src/main/java/vazkii/botania/api/imc/IMC.java | 15 +- .../botania/api/imc/OreWeightMessage.java | 33 -- .../api/imc/PaintableBlockMessage.java | 41 -- .../botania/api/mana/ManaItemHandler.java | 2 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 8 +- .../subtile/TileEntityFunctionalFlower.java | 8 +- .../subtile/TileEntityGeneratingFlower.java | 10 +- .../api/subtile/TileEntitySpecialFlower.java | 8 +- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/ColorHandler.java | 4 +- .../client/core/handler/HUDHandler.java | 2 +- .../client/core/handler/ModelHandler.java | 20 +- .../client/impl/BotaniaAPIClientImpl.java | 23 ++ .../integration/jei/JEIBotaniaPlugin.java | 4 +- .../orechid/OrechidIgnemRecipeCategory.java | 2 +- .../jei/orechid/OrechidRecipeCategory.java | 2 +- .../client/model/FloatingFlowerModel.java | 2 +- .../java/vazkii/botania/common/Botania.java | 4 +- .../block/decor/BlockFloatingFlower.java | 4 +- .../functional/BergamuteEventHandler.java | 2 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../subtile/functional/SubTileOrechid.java | 2 +- .../functional/SubTileOrechidIgnem.java | 2 +- .../common/block/tile/TileBrewery.java | 4 +- .../common/block/tile/TileFloatingFlower.java | 6 +- .../common/block/tile/TileIncensePlate.java | 4 +- .../vazkii/botania/common/brew/ModBrews.java | 11 +- .../core/handler/ExoflameFurnaceHandler.java | 2 +- .../common/core/handler/IMCHandler.java | 34 +- .../common/core/handler/IMCSender.java | 30 +- .../botania/common/entity/EntitySpark.java | 2 +- .../botania/common/impl/BotaniaAPIImpl.java | 232 +++++++++++ .../impl/corporea/CorporeaHelperImpl.java | 4 +- .../impl/{ => mana}/ManaItemHandlerImpl.java | 4 +- .../integration/thaumcraft/TCAspects.java | 6 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- .../common/item/brew/ItemBrewBase.java | 7 +- .../common/item/brew/ItemIncenseStick.java | 7 +- .../armor/elementium/ItemElementiumArmor.java | 2 +- .../armor/manasteel/ItemManasteelArmor.java | 2 +- .../armor/manaweave/ItemManaweaveArmor.java | 2 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 11 +- .../item/equipment/tool/ItemEnderDagger.java | 2 +- .../item/equipment/tool/ItemStarSword.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../item/equipment/tool/ToolCommons.java | 6 +- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/elementium/ItemElementiumShovel.java | 2 +- .../tool/elementium/ItemElementiumSword.java | 2 +- .../tool/manasteel/ItemManasteelAxe.java | 2 +- .../tool/manasteel/ItemManasteelPick.java | 2 +- .../tool/manasteel/ItemManasteelShovel.java | 2 +- .../tool/manasteel/ItemManasteelSword.java | 2 +- .../tool/terrasteel/ItemTerraAxe.java | 2 +- .../tool/terrasteel/ItemTerraPick.java | 2 +- .../tool/terrasteel/ItemTerraSword.java | 4 +- .../botania/common/item/lens/LensPaint.java | 4 +- .../botania/common/item/relic/ItemRelic.java | 2 +- .../common/item/relic/ItemRelicBauble.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 4 +- .../java/vazkii/botania/test/APITest.java | 16 +- 65 files changed, 555 insertions(+), 500 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/imc/OreWeightMessage.java delete mode 100644 src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java create mode 100644 src/main/java/vazkii/botania/client/impl/BotaniaAPIClientImpl.java create mode 100644 src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java rename src/main/java/vazkii/botania/common/impl/{ => mana}/ManaItemHandlerImpl.java (98%) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index e9dd326c2..5a6e923e0 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,335 +10,195 @@ package vazkii.botania.api; import net.minecraft.block.Block; import net.minecraft.entity.ai.attributes.IAttribute; +import net.minecraft.entity.ai.attributes.RangedAttribute; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.DyeColor; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.IItemTier; -import net.minecraft.item.Item; import net.minecraft.item.Rarity; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; -import net.minecraft.util.registry.DefaultedRegistry; -import net.minecraft.util.registry.MutableRegistry; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; -import net.minecraftforge.registries.*; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.IRegistryDelegate; +import org.apache.logging.log4j.LogManager; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.IInternalMethodHandler; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.common.core.handler.PixieHandler; import javax.annotation.Nonnull; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; -public final class BotaniaAPI { - public static final String NO_MOD_MESSAGE = "Botania not present"; +public interface BotaniaAPI { + LazyValue INSTANCE = new LazyValue<>(() -> { + try { + return (BotaniaAPI) Class.forName("vazkii.botania.common.impl.BotaniaAPIImpl").newInstance(); + } catch (ReflectiveOperationException e) { + LogManager.getLogger().warn("Unable to find BotaniaAPIImpl, using a dummy"); + return new BotaniaAPI() {}; + } + }); - public static int apiVersion() { - return 94; + static BotaniaAPI instance() { + return INSTANCE.getValue(); } - @CapabilityInject(IFloatingFlower.class) public static Capability FLOATING_FLOWER_CAP; + default int apiVersion() { + return 0; + } - @CapabilityInject(IExoflameHeatable.class) public static Capability EXOFLAME_HEATABLE_CAP; + @CapabilityInject(IFloatingFlower.class) public static Capability FLOATING_FLOWER_CAP = null; - // TODO 1.15 MOVE THIS - public static IForgeRegistry brewRegistry; + @CapabilityInject(IExoflameHeatable.class) public static Capability EXOFLAME_HEATABLE_CAP = null; - public static Map oreWeights = Collections.emptyMap(); - public static Map oreWeightsNether = Collections.emptyMap(); + default IForgeRegistry getBrewRegistry() { + return null; + } - public static Map, Function> paintableBlocks = Collections.emptyMap(); + default Map getOreWeights() { + return Collections.emptyMap(); + } - private static final int[] MAX_DAMAGE_ARRAY = new int[] { 13, 15, 16, 11 }; - public static final IArmorMaterial MANASTEEL_ARMOR_MAT = new IArmorMaterial() { - private final int[] damageReduction = { 2, 5, 6, 2 }; + default Map getNetherOreWeights() { + return Collections.emptyMap(); + } + default Map, Function> getPaintableBlocks() { + return Collections.emptyMap(); + } + + default void registerPaintableBlock(Block block, Function transformer) { + registerPaintableBlock(block.delegate, transformer); + } + + /** + * Make Botania aware of how to transform between different colors of a block, for use in the paint lens. + * This method can be safely called during parallel mod initialization + * @param block The block + * @param transformer Function from color to a new block + */ + default void registerPaintableBlock(IRegistryDelegate block, Function transformer) { + + } + + IArmorMaterial DUMMY_ARMOR_MATERIAL = new IArmorMaterial() { @Override - public int getDurability(EquipmentSlotType slotIn) { - return 16 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; - } - - @Override - public int getDamageReductionAmount(EquipmentSlotType slotIn) { - return damageReduction[slotIn.getIndex()]; - } - - @Override - public int getEnchantability() { - return 18; - } - - @Override - public SoundEvent getSoundEvent() { - return SoundEvents.ITEM_ARMOR_EQUIP_IRON; - } - - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "manasteel_ingot")); - return Ingredient.fromItems(item); - } - - @Override - public String getName() { - return "manasteel"; - } - - @Override - public float getToughness() { + public int getDurability(@Nonnull EquipmentSlotType slot) { return 0; } - }; - public static final IItemTier MANASTEEL_ITEM_TIER = new IItemTier() { - @Override - public int getMaxUses() { - return 300; - } @Override - public float getEfficiency() { - return 6.2F; - } - - @Override - public float getAttackDamage() { - return 2; - } - - @Override - public int getHarvestLevel() { - return 3; - } - - @Override - public int getEnchantability() { - return 20; - } - - @Nonnull - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "manasteel_ingot")); - return Ingredient.fromItems(item); - } - }; - - public static final IArmorMaterial ELEMENTIUM_ARMOR_MAT = new IArmorMaterial() { - private final int[] damageReduction = { 2, 5, 6, 2 }; - - @Override - public int getDurability(EquipmentSlotType slotIn) { - return 18 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; - } - - @Override - public int getDamageReductionAmount(EquipmentSlotType slotIn) { - return damageReduction[slotIn.getIndex()]; - } - - @Override - public int getEnchantability() { - return 18; - } - - @Override - public SoundEvent getSoundEvent() { - return SoundEvents.ITEM_ARMOR_EQUIP_IRON; - } - - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "elementium_ingot")); - return Ingredient.fromItems(item); - } - - @Override - public String getName() { - return "elementium"; - } - - @Override - public float getToughness() { + public int getDamageReductionAmount(@Nonnull EquipmentSlotType slot) { return 0; } - }; - public static final IItemTier ELEMENTIUM_ITEM_TIER = new IItemTier() { - @Override - public int getMaxUses() { - return 720; - } - - @Override - public float getEfficiency() { - return 6.2F; - } - - @Override - public float getAttackDamage() { - return 2; - } - - @Override - public int getHarvestLevel() { - return 3; - } @Override public int getEnchantability() { - return 20; + return 0; } @Nonnull - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "manasteel_ingot")); - return Ingredient.fromItems(item); - } - }; - - public static final IArmorMaterial TERRASTEEL_ARMOR_MAT = new IArmorMaterial() { - private final int[] damageReduction = { 3, 6, 8, 3 }; - - @Override - public int getDurability(EquipmentSlotType slotIn) { - return 34 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; - } - - @Override - public int getDamageReductionAmount(EquipmentSlotType slotIn) { - return damageReduction[slotIn.getIndex()]; - } - - @Override - public int getEnchantability() { - return 26; - } - - @Override - public SoundEvent getSoundEvent() { - return SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND; - } - - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "terrasteel_ingot")); - return Ingredient.fromItems(item); - } - - @Override - public String getName() { - return "terrasteel"; - } - - @Override - public float getToughness() { - return 3; - } - }; - public static final IItemTier TERRASTEEL_ITEM_TIER = new IItemTier() { - @Override - public int getMaxUses() { - return 2300; - } - - @Override - public float getEfficiency() { - return 9; - } - - @Override - public float getAttackDamage() { - return 3; - } - - @Override - public int getHarvestLevel() { - return 4; - } - - @Override - public int getEnchantability() { - return 26; - } - - @Nonnull - @Override - public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "terrasteel_ingot")); - return Ingredient.fromItems(item); - } - }; - public static final IArmorMaterial MANAWEAVE_ARMOR_MAT = new IArmorMaterial() { - private final int[] damageReduction = { 1, 2, 2, 1 }; - - @Override - public int getDurability(EquipmentSlotType slotIn) { - return 5 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; - } - - @Override - public int getDamageReductionAmount(EquipmentSlotType slotIn) { - return damageReduction[slotIn.getIndex()]; - } - - @Override - public int getEnchantability() { - return 18; - } - @Override public SoundEvent getSoundEvent() { return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER; } + @Nonnull @Override public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "manaweave_cloth")); - return Ingredient.fromItems(item); + return Ingredient.EMPTY; } @Override public String getName() { - return "manaweave"; + return "missingno"; } - @Override - public float getToughness() { + @Override public float getToughness() { return 0; } }; - public static final Rarity rarityRelic = Rarity.create("RELIC", TextFormatting.GOLD); + IItemTier DUMMY_ITEM_TIER = new IItemTier() { + @Override + public int getMaxUses() { + return 0; + } - // todo 1.15 move this too - @ObjectHolder("botania:fallback") public static Brew fallbackBrew; + @Override + public float getEfficiency() { + return 0; + } - /** - * The internal method handler in use. - * DO NOT OVERWRITE THIS OR YOU'RE GOING TO FEEL MY WRATH WHEN I UPDATE THE API. - * The fact I have to write that means some moron already tried, don't be that moron. - * - * @see IInternalMethodHandler - */ - public static volatile IInternalMethodHandler internalHandler = new DummyMethodHandler(); + @Override + public float getAttackDamage() { + return 0; + } - // todo 1.15 this is temporary, move when moving API to interface - public static IAttribute getPixieSpawnChanceAttribute() { - return PixieHandler.PIXIE_SPAWN_CHANCE; + @Override + public int getHarvestLevel() { + return 0; + } + + @Override + public int getEnchantability() { + return 0; + } + + @Nonnull + @Override public Ingredient getRepairMaterial() { + return Ingredient.EMPTY; + } + }; + + default IArmorMaterial getManasteelArmorMaterial() { + return DUMMY_ARMOR_MATERIAL; + } + + default IArmorMaterial getElementiumArmorMaterial() { + return DUMMY_ARMOR_MATERIAL; + } + + default IArmorMaterial getManaweaveArmorMaterial() { + return DUMMY_ARMOR_MATERIAL; + } + + default IArmorMaterial getTerrasteelArmorMaterial() { + return DUMMY_ARMOR_MATERIAL; + } + + default IItemTier getManasteelItemTier() { + return DUMMY_ITEM_TIER; + } + + default IItemTier getElementiumItemTier() { + return DUMMY_ITEM_TIER; + } + + default IItemTier getTerrasteelItemTier() { + return DUMMY_ITEM_TIER; + } + + default Rarity getRelicRarity() { + return Rarity.EPIC; + } + + // todo 1.15 combine with this and BotaniaAPIClient + default IInternalMethodHandler internalHandler() { + return new DummyMethodHandler(); + } + + default IAttribute getPixieSpawnChanceAttribute() { + return new RangedAttribute(null, "missingno", 0, 0, 0); } } diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 7b4ea01a6..531827825 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -8,13 +8,13 @@ */ package vazkii.botania.api; -import com.google.common.collect.Maps; - import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import org.apache.logging.log4j.LogManager; import vazkii.botania.api.item.IFloatingFlower; import java.util.Collections; @@ -24,11 +24,19 @@ import java.util.Map; * Class for API calls that must be made clientside */ @OnlyIn(Dist.CLIENT) -public final class BotaniaAPIClient { +public interface BotaniaAPIClient { + LazyValue INSTANCE = new LazyValue<>(() -> { + try { + return (BotaniaAPIClient) Class.forName("vazkii.botania.client.impl.BotaniaAPIClientImpl").newInstance(); + } catch (ReflectiveOperationException e) { + LogManager.getLogger().warn("Unable to find BotaniaAPIClientImpl, using a dummy"); + return new BotaniaAPIClient() {}; + } + }); - private static final Map islandTypeModels = Maps.newHashMap(); - - private BotaniaAPIClient() {} + static BotaniaAPIClient instance() { + return INSTANCE.getValue(); + } /** * Registers your model for island type islandType here. @@ -37,15 +45,14 @@ public final class BotaniaAPIClient { * @param islandType The islandtype to register * @param model The model, only {@link ResourceLocation} allowed, no {@link ModelResourceLocation} allowed. */ - public static void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ResourceLocation model) { - islandTypeModels.put(islandType, model); + default void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ResourceLocation model) { } /** * @return An immutable and live view of the registered island type model map */ - public static Map getRegisteredIslandTypeModels() { - return Collections.unmodifiableMap(islandTypeModels); + default Map getRegisteredIslandTypeModels() { + return Collections.emptyMap(); } } diff --git a/src/main/java/vazkii/botania/api/imc/IMC.java b/src/main/java/vazkii/botania/api/imc/IMC.java index d9b9ef89b..86ec27332 100644 --- a/src/main/java/vazkii/botania/api/imc/IMC.java +++ b/src/main/java/vazkii/botania/api/imc/IMC.java @@ -9,7 +9,8 @@ package vazkii.botania.api.imc; /** - * This class defines the IMC methods accepted by Botania and their expected argument types + * This class defines the IMC methods accepted by Botania and their expected argument types. + * This is just for documentation purposes, IMC is meant to be sent when you don't want to depend on the Botania API classes. * * @see net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent * @see net.minecraftforge.fml.event.lifecycle.InterModProcessEvent @@ -18,21 +19,15 @@ package vazkii.botania.api.imc; 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.
+ * The argument should be a {@link com.mojang.datafixers.util.Pair}, 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.
+ * Maps a block tag to its weight in nether world generation. This is used for the Orechid Ignem flower.
+ * The argument should be a {@link com.mojang.datafixers.util.Pair}, 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 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/OreWeightMessage.java b/src/main/java/vazkii/botania/api/imc/OreWeightMessage.java deleted file mode 100644 index 08b02cefc..000000000 --- a/src/main/java/vazkii/botania/api/imc/OreWeightMessage.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This class is 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 - */ -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 deleted file mode 100644 index a1117d584..000000000 --- a/src/main/java/vazkii/botania/api/imc/PaintableBlockMessage.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This class is 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 - */ -package vazkii.botania.api.imc; - -import net.minecraft.block.Block; -import net.minecraft.item.DyeColor; -import net.minecraftforge.registries.IRegistryDelegate; - -import java.util.function.Function; - -public class PaintableBlockMessage { - private final IRegistryDelegate block; - private final Function transformer; - - public PaintableBlockMessage(Function 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 transformer, IRegistryDelegate block) { - this.block = block; - this.transformer = transformer; - } - - public IRegistryDelegate getBlock() { - return block; - } - - public Function getTransformer() { - return transformer; - } -} diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 97e0fbccc..ae8dc44de 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -20,7 +20,7 @@ import java.util.List; public interface ManaItemHandler { LazyValue INSTANCE = new LazyValue<>(() -> { try { - return (ManaItemHandler) Class.forName("vazkii.botania.common.impl.ManaItemHandlerImpl").newInstance(); + return (ManaItemHandler) Class.forName("vazkii.botania.common.impl.mana.ManaItemHandlerImpl").newInstance(); } catch (ReflectiveOperationException e) { LogManager.getLogger().warn("Unable to find ManaItemHandlerImpl, using a dummy"); return new ManaItemHandler() {}; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 5c143fdee..2fdbc89e8 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -170,10 +170,10 @@ public class RecipeBrew implements IRecipe { public RecipeBrew read(@Nonnull ResourceLocation id, @Nonnull JsonObject json) { String brewStr = JSONUtils.getString(json, "brew"); ResourceLocation brewId = ResourceLocation.tryCreate(brewStr); - if (brewId == null || !BotaniaAPI.brewRegistry.containsKey(brewId)) { + if (brewId == null || !BotaniaAPI.instance().getBrewRegistry().containsKey(brewId)) { throw new JsonParseException("Unknown brew " + brewStr); } - Brew brew = BotaniaAPI.brewRegistry.getValue(brewId); + Brew brew = BotaniaAPI.instance().getBrewRegistry().getValue(brewId); JsonArray ingrs = JSONUtils.getJsonArray(json, "ingredients"); List inputs = new ArrayList<>(); @@ -185,7 +185,7 @@ public class RecipeBrew implements IRecipe { @Override public RecipeBrew read(@Nonnull ResourceLocation id, @Nonnull PacketBuffer buf) { - Brew brew = buf.readRegistryIdUnsafe(BotaniaAPI.brewRegistry); + Brew brew = buf.readRegistryIdUnsafe(BotaniaAPI.instance().getBrewRegistry()); Ingredient[] inputs = new Ingredient[buf.readVarInt()]; for (int i = 0; i < inputs.length; i++) { inputs[i] = Ingredient.read(buf); @@ -195,7 +195,7 @@ public class RecipeBrew implements IRecipe { @Override public void write(@Nonnull PacketBuffer buf, @Nonnull RecipeBrew recipe) { - buf.writeRegistryIdUnsafe(BotaniaAPI.brewRegistry, recipe.getBrew()); + buf.writeRegistryIdUnsafe(BotaniaAPI.instance().getBrewRegistry(), recipe.getBrew()); buf.writeVarInt(recipe.getIngredients().size()); for (Ingredient input : recipe.getIngredients()) { input.write(buf); diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index 5d4513c01..01bad0248 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -90,7 +90,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { float green = (color >> 8 & 0xFF) / 255F; float blue = (color & 0xFF) / 255F; if (Math.random() > particleChance) { - BotaniaAPI.internalHandler.sparkleFX(getWorld(), getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() + 0.5 + Math.random() * 0.5, getPos().getZ() + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); + BotaniaAPI.instance().internalHandler().sparkleFX(getWorld(), getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() + 0.5 + Math.random() * 0.5, getPos().getZ() + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); } } } @@ -120,9 +120,9 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { } if (needsNew && ticksExisted == 1) { // Only for new flowers - IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); + IManaNetwork network = BotaniaAPI.instance().internalHandler().getManaNetworkInstance(); int size = network.getAllPoolsInWorld(getWorld()).size(); - if (BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { + if (BotaniaAPI.instance().internalHandler().shouldForceCheck() || size != sizeLastCheck) { linkedPool = network.getClosestPool(getPos(), getWorld(), LINK_RANGE); sizeLastCheck = size; } @@ -242,7 +242,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { public void renderHUD(Minecraft mc) { String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); - BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); + BotaniaAPI.instance().internalHandler().drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.instance().internalHandler().getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index 62e6b268a..8fbd26ccb 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -100,13 +100,13 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { double x = getPos().getX() + offset.x; double y = getPos().getY() + offset.y; double z = getPos().getZ() + offset.z; - BotaniaAPI.internalHandler.sparkleFX(getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); + BotaniaAPI.instance().internalHandler().sparkleFX(getWorld(), x + 0.3 + Math.random() * 0.5, y + 0.5 + Math.random() * 0.5, z + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); } } boolean passive = isPassiveFlower(); if (!getWorld().isRemote) { - int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); + int muhBalance = BotaniaAPI.instance().internalHandler().getPassiveFlowerDecay(); if (passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { getWorld().destroyBlock(getPos(), false); @@ -146,9 +146,9 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { } if (needsNew && ticksExisted == 1) { // New flowers only - IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); + IManaNetwork network = BotaniaAPI.instance().internalHandler().getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(getWorld()).size(); - if (BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { + if (BotaniaAPI.instance().internalHandler().shouldForceCheck() || size != sizeLastCheck) { linkedCollector = network.getClosestCollector(getPos(), getWorld(), LINK_RANGE); sizeLastCheck = size; } @@ -295,7 +295,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { public void renderHUD(Minecraft mc) { String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); - BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); + BotaniaAPI.instance().internalHandler().drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.instance().internalHandler().getBindDisplayForFlowerType(this), isValidBinding()); } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 9b5a3e324..72e5bfac0 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -125,7 +125,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - if (cap == BotaniaAPI.FLOATING_FLOWER_CAP) { + if (cap == BotaniaAPI.instance().FLOATING_FLOWER_CAP) { if (hasWorld() && getBlockState().isIn(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) { return floatingDataCap.cast(); } @@ -134,7 +134,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile } public boolean isFloating() { - return getCapability(BotaniaAPI.FLOATING_FLOWER_CAP).isPresent(); + return getCapability(BotaniaAPI.instance().FLOATING_FLOWER_CAP).isPresent(); } private boolean isOnSpecialSoil() { @@ -206,7 +206,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile */ public void writeToPacketNBT(CompoundNBT cmp) { if (isFloating()) { - cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + cmp.put(TAG_FLOATING_DATA, BotaniaAPI.instance().FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); } } @@ -217,7 +217,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile */ public void readFromPacketNBT(CompoundNBT cmp) { if (cmp.contains(TAG_FLOATING_DATA)) { - BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); + BotaniaAPI.instance().FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index e6d280271..31a443e99 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -93,7 +93,7 @@ public final class BoundTileRenderer { LazyOptional mainInvCap = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP); mainInvCap.ifPresent(mainInv -> { - IItemHandlerModifiable acc = BotaniaAPI.internalHandler.getAccessoriesInventory(player); + IItemHandlerModifiable acc = BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player); IItemHandler joined = acc != null ? new CombinedInvWrapper((IItemHandlerModifiable) mainInv, acc) : mainInv; for (int i = 0; i < joined.getSlots(); i++) { diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index d55640e99..23ebfef09 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.FoliageColors; import net.minecraft.world.biome.BiomeColors; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.mana.BurstProperties; @@ -35,6 +34,7 @@ import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemManaMirror; @@ -150,7 +150,7 @@ public final class ColorHandler { } Brew brew = ((IBrewItem) s.getItem()).getBrew(s); - if (brew == BotaniaAPI.fallbackBrew) { + if (brew == ModBrews.fallbackBrew) { return s.getItem() instanceof ItemBloodPendant ? 0xC6000E : 0x989898; } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index f351c8c74..887536328 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -178,7 +178,7 @@ public final class HUDHandler { boolean creative = false; IItemHandler mainInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(EmptyHandler.INSTANCE); - IItemHandler accInv = BotaniaAPI.internalHandler.getAccessoriesInventory(player); + IItemHandler accInv = BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player); int invSize = mainInv.getSlots(); int size = invSize; diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 539dd9c96..897d17afb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -173,16 +173,16 @@ public final class ModelHandler { } private static void registerSubtiles() { - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, prefix("block/islands/island_grass")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, prefix("block/islands/island_podzol")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, prefix("block/islands/island_mycel")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, prefix("block/islands/island_snow")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, prefix("block/islands/island_dry")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, prefix("block/islands/island_golden")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, prefix("block/islands/island_vivid")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, prefix("block/islands/island_scorched")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, prefix("block/islands/island_infused")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, prefix("block/islands/island_mutated")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, prefix("block/islands/island_grass")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, prefix("block/islands/island_podzol")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, prefix("block/islands/island_mycel")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, prefix("block/islands/island_snow")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.DRY, prefix("block/islands/island_dry")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, prefix("block/islands/island_golden")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, prefix("block/islands/island_vivid")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, prefix("block/islands/island_scorched")); + BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, prefix("block/islands/island_infused")); + } private ModelHandler() {} diff --git a/src/main/java/vazkii/botania/client/impl/BotaniaAPIClientImpl.java b/src/main/java/vazkii/botania/client/impl/BotaniaAPIClientImpl.java new file mode 100644 index 000000000..de2a96631 --- /dev/null +++ b/src/main/java/vazkii/botania/client/impl/BotaniaAPIClientImpl.java @@ -0,0 +1,23 @@ +package vazkii.botania.client.impl; + +import com.google.common.collect.Maps; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.BotaniaAPIClient; +import vazkii.botania.api.item.IFloatingFlower; + +import java.util.Collections; +import java.util.Map; + +public class BotaniaAPIClientImpl implements BotaniaAPIClient { + private final Map islandTypeModels = Maps.newHashMap(); + + @Override + public void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ResourceLocation model) { + islandTypeModels.put(islandType, model); + } + + @Override + public Map getRegisteredIslandTypeModels() { + return Collections.unmodifiableMap(islandTypeModels); + } +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index d246deb86..9e4594b53 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -129,7 +129,7 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipes(TilePool.manaInfusionRecipes(Minecraft.getInstance().world.getRecipeManager()), ManaPoolRecipeCategory.UID); registry.addRecipes( - BotaniaAPI.oreWeights.entrySet().stream() + BotaniaAPI.instance().getOreWeights().entrySet().stream() .filter(e -> doesOreExist(e.getKey())) .map(OrechidRecipeWrapper::new) .sorted() @@ -137,7 +137,7 @@ public class JEIBotaniaPlugin implements IModPlugin { OrechidRecipeCategory.UID); registry.addRecipes( - BotaniaAPI.oreWeightsNether.entrySet().stream() + BotaniaAPI.instance().getNetherOreWeights().entrySet().stream() .filter(e -> doesOreExist(e.getKey())) .map(OrechidIgnemRecipeWrapper::new) .sorted() diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java index ed5d05e6d..0cdb00306 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java @@ -46,6 +46,6 @@ public class OrechidIgnemRecipeCategory extends OrechidRecipeCategoryBase getOreWeights() { - return BotaniaAPI.oreWeightsNether; + return BotaniaAPI.instance().getNetherOreWeights(); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java index 296be0f6c..31c744fe9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java @@ -45,7 +45,7 @@ public class OrechidRecipeCategory extends OrechidRecipeCategoryBase getOreWeights() { - return BotaniaAPI.oreWeights; + return BotaniaAPI.instance().getOreWeights(); } } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 511957697..7d1efa883 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -70,7 +70,7 @@ public class FloatingFlowerModel implements IModelGeometry @Override public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { Set ret = new HashSet<>(); - for (Map.Entry e : BotaniaAPIClient.getRegisteredIslandTypeModels().entrySet()) { + for (Map.Entry e : BotaniaAPIClient.instance().getRegisteredIslandTypeModels().entrySet()) { IUnbakedModel unbakedIsland = modelGetter.apply(e.getValue()); ret.addAll(unbakedIsland.getTextureDependencies(modelGetter, missingTextureErrors)); unbakedIslands.put(e.getKey(), unbakedIsland); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 06cd78766..1a7711d43 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -126,8 +126,6 @@ public class Botania { coloredLightsLoaded = ModList.get().isLoaded("easycoloredlights"); curiosLoaded = ModList.get().isLoaded("curios"); - BotaniaAPI.internalHandler = new InternalMethodHandler(); - PacketHandler.init(); if (Botania.thaumcraftLoaded) { @@ -249,7 +247,7 @@ public class Botania { // Overriding the internal method handler will break everything as it changes regularly. // So just don't be a moron and don't override it. Thanks. private void serverAboutToStart(FMLServerAboutToStartEvent event) { - String clname = BotaniaAPI.internalHandler.getClass().getName(); + String clname = BotaniaAPI.instance().internalHandler().getClass().getName(); String expect = "vazkii.botania.common.core.handler.InternalMethodHandler"; if (!clname.equals(expect)) { throw new IllegalAccessError("The Botania API internal method handler has been overriden. " diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 0ea52cbe3..e31b7a13e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -80,8 +80,8 @@ public class BlockFloatingFlower extends BlockMod { public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); TileEntity te = world.getTileEntity(pos); - if (!stack.isEmpty() && te != null && te.getCapability(BotaniaAPI.FLOATING_FLOWER_CAP).isPresent()) { - IFloatingFlower flower = te.getCapability(BotaniaAPI.FLOATING_FLOWER_CAP).orElseThrow(IllegalStateException::new); + if (!stack.isEmpty() && te != null && te.getCapability(BotaniaAPI.instance().FLOATING_FLOWER_CAP).isPresent()) { + IFloatingFlower flower = te.getCapability(BotaniaAPI.instance().FLOATING_FLOWER_CAP).orElseThrow(IllegalStateException::new); IslandType type = null; if (stack.getItem() == Items.SNOWBALL) { type = IslandType.SNOW; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 02307c5b7..ff042ef18 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -58,7 +58,7 @@ public class BergamuteEventHandler { float red = (color >> 16 & 0xFF) / 255F; float green = (color >> 8 & 0xFF) / 255F; float blue = (color & 0xFF) / 255F; - BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getEffectivePos().getX() + 0.3 + Math.random() * 0.5, berg.getEffectivePos().getY() + 0.5 + Math.random() * 0.5, berg.getEffectivePos().getZ() + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); + BotaniaAPI.instance().internalHandler().sparkleFX(berg.getWorld(), berg.getEffectivePos().getX() + 0.3 + Math.random() * 0.5, berg.getEffectivePos().getY() + 0.5 + Math.random() * 0.5, berg.getEffectivePos().getZ() + 0.3 + Math.random() * 0.5, red, green, blue, (float) Math.random(), 5); } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 55da40a2b..057d47cfb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -45,7 +45,7 @@ public class SubTileExoflame extends TileEntityFunctionalFlower { getEffectivePos().add(RANGE, RANGE_Y, RANGE))) { TileEntity tile = getWorld().getTileEntity(pos); if (tile != null) { - LazyOptional cap = tile.getCapability(BotaniaAPI.EXOFLAME_HEATABLE_CAP); + LazyOptional cap = tile.getCapability(BotaniaAPI.instance().EXOFLAME_HEATABLE_CAP); if (cap.isPresent()) { IExoflameHeatable heatable = cap.orElseThrow(NullPointerException::new); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 88c480b7e..86f9e84eb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -126,7 +126,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { } public Map getOreMap() { - return BotaniaAPI.oreWeights; + return BotaniaAPI.instance().getOreWeights(); } public Predicate getReplaceMatcher() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 174cb302e..9f3d0f1fa 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -36,7 +36,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public Map getOreMap() { - return BotaniaAPI.oreWeightsNether; + return BotaniaAPI.instance().getNetherOreWeights(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 101907844..d0d8a3957 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -22,7 +22,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -32,6 +31,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.lib.LibBlockNames; @@ -59,7 +59,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I } public boolean addItem(@Nullable PlayerEntity player, ItemStack stack, @Nullable Hand hand) { - if (recipe != null || stack.isEmpty() || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0).isEmpty() != stack.getItem() instanceof IBrewContainer) { + if (recipe != null || stack.isEmpty() || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != ModBrews.fallbackBrew || itemHandler.getStackInSlot(0).isEmpty() != stack.getItem() instanceof IBrewContainer) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index dc876ab4f..2e9974503 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -58,7 +58,7 @@ public class TileFloatingFlower extends TileMod { @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - if (cap == BotaniaAPI.FLOATING_FLOWER_CAP) { + if (cap == BotaniaAPI.instance().FLOATING_FLOWER_CAP) { return floatingDataCap.cast(); } return super.getCapability(cap, side); @@ -76,12 +76,12 @@ public class TileFloatingFlower extends TileMod { @Override public void writePacketNBT(CompoundNBT cmp) { - cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + cmp.put(TAG_FLOATING_DATA, BotaniaAPI.instance().FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); } @Override public void readPacketNBT(CompoundNBT cmp) { - BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); + BotaniaAPI.instance().FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index a230d6f4b..62b26f1a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -20,10 +20,10 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.client.fx.WispParticleData; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; @@ -137,7 +137,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ITickableTi } public boolean acceptsItem(ItemStack stack) { - return !stack.isEmpty() && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != BotaniaAPI.fallbackBrew; + return !stack.isEmpty() && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != ModBrews.fallbackBrew; } @Override diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 08658c486..d78fc10c5 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -17,6 +17,8 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.ObjectHolder; import net.minecraftforge.registries.RegistryBuilder; import vazkii.botania.api.BotaniaAPI; @@ -31,7 +33,8 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = LibMisc.MOD_ID) public class ModBrews { - public static Brew fallback; + public static IForgeRegistry registry; + public static Brew fallbackBrew; public static Brew speed; public static Brew strength; public static Brew haste; @@ -58,7 +61,7 @@ public class ModBrews { @SubscribeEvent public static void registerRegistry(RegistryEvent.NewRegistry evt) { - BotaniaAPI.brewRegistry = new RegistryBuilder() + registry = new RegistryBuilder() .setName(prefix("brews")) .setType(Brew.class) .setDefaultKey(prefix("fallback")) @@ -68,7 +71,7 @@ public class ModBrews { @SubscribeEvent public static void register(RegistryEvent.Register evt) { - fallback = make("fallback", 0, 0); + fallbackBrew = make("fallback", 0, 0); speed = make(LibBrewNames.SPEED, 0x59B7FF, 4000, new EffectInstance(Effects.SPEED, 1800, 1)); strength = make(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new EffectInstance(Effects.STRENGTH, 1800, 1)); haste = make(LibBrewNames.HASTE, 0xF4A432, 4000, new EffectInstance(Effects.HASTE, 1800, 1)); @@ -90,7 +93,7 @@ public class ModBrews { bloodthirst = make(LibBrewNames.BLOODTHIRST, 20000, new EffectInstance(ModPotions.bloodthrst, 7200, 0)); allure = make(LibBrewNames.ALLURE, 2000, new EffectInstance(ModPotions.allure, 4800, 0)); clear = make(LibBrewNames.CLEAR, 4000, new EffectInstance(ModPotions.clear, 0, 0)); - evt.getRegistry().registerAll(fallback, speed, strength, haste, healing, jumpBoost, regen, regenWeak, resistance, + evt.getRegistry().registerAll(fallbackBrew, speed, strength, haste, healing, jumpBoost, regen, regenWeak, resistance, fireResistance, waterBreathing, invisibility, nightVision, absorption, overload, soulCross, featherfeet, emptiness, bloodthirst, allure, clear); diff --git a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java index ebfbf7933..0e553af69 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -43,7 +43,7 @@ public class ExoflameFurnaceHandler { TileEntity te = event.getObject(); if (te instanceof AbstractFurnaceTileEntity) { AbstractFurnaceTileEntity furnace = (AbstractFurnaceTileEntity) te; - SimpleCapProvider.attach(event, ID, BotaniaAPI.EXOFLAME_HEATABLE_CAP, new FurnaceExoflameHeatable(furnace)); + SimpleCapProvider.attach(event, ID, BotaniaAPI.instance().EXOFLAME_HEATABLE_CAP, new FurnaceExoflameHeatable(furnace)); } } 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 77da6621f..5d7c0fd98 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -10,43 +10,37 @@ package vazkii.botania.common.core.handler; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.Block; -import net.minecraft.item.DyeColor; +import com.mojang.datafixers.util.Pair; 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.OreWeightMessage; -import vazkii.botania.api.imc.PaintableBlockMessage; +import vazkii.botania.common.impl.BotaniaAPIImpl; 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) { - BotaniaAPI.oreWeights = handleOreWeights(evt.getIMCStream(IMC.REGISTER_ORE_WEIGHT::equals)); - BotaniaAPI.oreWeightsNether = handleOreWeights(evt.getIMCStream(IMC.REGISTER_NETHER_ORE_WEIGHT::equals)); - BotaniaAPI.paintableBlocks = handlePaintable(evt.getIMCStream(IMC.REGISTER_PAINTABLE_BLOCK::equals)); + ((BotaniaAPIImpl) BotaniaAPI.instance()).oreWeights = handleOreWeights(evt.getIMCStream(IMC.REGISTER_ORE_WEIGHT::equals)); + ((BotaniaAPIImpl) BotaniaAPI.instance()).netherOreWeights = handleOreWeights(evt.getIMCStream(IMC.REGISTER_NETHER_ORE_WEIGHT::equals)); } 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)); + .filter(msg -> { + Object thing = msg.getMessageSupplier().get(); + if (thing instanceof Pair) { + return ((Pair) thing).getFirst() instanceof ResourceLocation + && ((Pair) thing).getSecond() instanceof Integer; + } + return false; + }) + .map(msg -> (Pair) msg.getMessageSupplier().get()) + .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)); 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 index 317970697..ff35dc73f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.core.handler; +import com.mojang.datafixers.util.Pair; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.util.ResourceLocation; @@ -15,9 +16,8 @@ import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.registries.IRegistryDelegate; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.imc.IMC; -import vazkii.botania.api.imc.OreWeightMessage; -import vazkii.botania.api.imc.PaintableBlockMessage; import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.common.lib.LibMisc; @@ -116,39 +116,39 @@ public class IMCSender { addOreWeightNether("oreHaditeCoal", 500); // Hadite haditeCoal, hadite/coal or coal/hadite? */ - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_MAP.get(color).get(), Blocks.GLASS)); + BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS, color -> ColorHelper.STAINED_GLASS_MAP.get(color).get()); for (IRegistryDelegate b : ColorHelper.STAINED_GLASS_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.STAINED_GLASS_MAP.get(color).get()); } - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get(), Blocks.GLASS_PANE)); + BotaniaAPI.instance().registerPaintableBlock(Blocks.GLASS_PANE, color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get()); for (IRegistryDelegate b : ColorHelper.STAINED_GLASS_PANE_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.STAINED_GLASS_PANE_MAP.get(color).get()); } - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.TERRACOTTA_MAP.get(color).get(), Blocks.TERRACOTTA)); + BotaniaAPI.instance().registerPaintableBlock(Blocks.TERRACOTTA, color -> ColorHelper.TERRACOTTA_MAP.get(color).get()); for (IRegistryDelegate b : ColorHelper.TERRACOTTA_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.TERRACOTTA_MAP.get(color).get(), b.get())); + BotaniaAPI.instance().registerPaintableBlock(b.get(), color -> ColorHelper.TERRACOTTA_MAP.get(color).get()); } for (IRegistryDelegate b : ColorHelper.GLAZED_TERRACOTTA_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.GLAZED_TERRACOTTA_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.GLAZED_TERRACOTTA_MAP.get(color).get()); } for (IRegistryDelegate b : ColorHelper.WOOL_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.WOOL_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.WOOL_MAP.get(color).get()); } for (IRegistryDelegate b : ColorHelper.CARPET_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CARPET_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.CARPET_MAP.get(color).get()); } for (IRegistryDelegate b : ColorHelper.CONCRETE_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CONCRETE_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.CONCRETE_MAP.get(color).get()); } for (IRegistryDelegate b : ColorHelper.CONCRETE_POWDER_MAP.values()) { - sendToSelf(IMC.REGISTER_PAINTABLE_BLOCK, new PaintableBlockMessage(color -> ColorHelper.CONCRETE_POWDER_MAP.get(color).get(), b)); + BotaniaAPI.instance().registerPaintableBlock(b, color -> ColorHelper.CONCRETE_POWDER_MAP.get(color).get()); } } @@ -157,10 +157,10 @@ public class IMCSender { } private static void addOreWeight(String oreTag, int weight) { - sendToSelf(IMC.REGISTER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight)); + sendToSelf(IMC.REGISTER_ORE_WEIGHT, new Pair<>(new ResourceLocation("forge", "ores/" + oreTag), weight)); } private static void addOreWeightNether(String oreTag, int weight) { - sendToSelf(IMC.REGISTER_NETHER_ORE_WEIGHT, new OreWeightMessage(new ResourceLocation("forge", "ores/" + oreTag), weight)); + sendToSelf(IMC.REGISTER_NETHER_ORE_WEIGHT, new Pair<>(new ResourceLocation("forge", "ores/" + oreTag), weight)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 90f5e2191..d9e69d1aa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -115,7 +115,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { stacks.addAll(player.inventory.mainInventory); stacks.addAll(player.inventory.armorInventory); - IItemHandler inv = BotaniaAPI.internalHandler.getAccessoriesInventory(player); + IItemHandler inv = BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player); for (int i = 0; i < inv.getSlots(); i++) { stacks.add(inv.getStackInSlot(i)); } diff --git a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java new file mode 100644 index 000000000..2c026cc63 --- /dev/null +++ b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -0,0 +1,232 @@ +package vazkii.botania.common.impl; + +import net.minecraft.block.Block; +import net.minecraft.entity.ai.attributes.IAttribute; +import net.minecraft.inventory.EquipmentSlotType; +import net.minecraft.item.*; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.LazyValue; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraft.util.SoundEvents; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.IRegistryDelegate; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.Brew; +import vazkii.botania.api.internal.IInternalMethodHandler; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.core.handler.InternalMethodHandler; +import vazkii.botania.common.core.handler.PixieHandler; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Supplier; + +public class BotaniaAPIImpl implements BotaniaAPI { + private static final LazyValue RELIC_RARITY = new LazyValue<>(() -> Rarity.create("RELIC", TextFormatting.GOLD)); + private enum ArmorMaterial implements IArmorMaterial { + MANASTEEL("manasteel", 16, new int[]{ 2, 5, 6, 2 }, 18, () -> SoundEvents.ITEM_ARMOR_EQUIP_IRON, () -> ModItems.manaSteel, 0), + MANAWEAVE("manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, () -> SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, () -> ModItems.manaweaveCloth, 0), + ELEMENTIUM("elementium", 18, new int[] { 2, 5, 6, 2 }, 18, () -> SoundEvents.ITEM_ARMOR_EQUIP_IRON, () -> ModItems.elementium, 0), + TERRASTEEL("terrasteel", 34, new int[] { 3, 6, 8, 3 }, 26, () -> SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, () -> ModItems.terrasteel, 3); + + private final String name; + private final int durabilityMultiplier; + private final int[] damageReduction; + private final int enchantability; + private final Supplier equipSound; + private final Supplier repairItem; + private final float toughness; + private static final int[] MAX_DAMAGE_ARRAY = new int[] { 13, 15, 16, 11 }; + + ArmorMaterial(String name, int durabilityMultiplier, int[] damageReduction, int enchantability, Supplier equipSound, Supplier repairItem, float toughness) { + this.name = name; + this.durabilityMultiplier = durabilityMultiplier; + this.damageReduction = damageReduction; + this.enchantability = enchantability; + this.equipSound = equipSound; + this.repairItem = repairItem; + this.toughness = toughness; + } + + @Override + public int getDurability(EquipmentSlotType slot) { + return durabilityMultiplier * MAX_DAMAGE_ARRAY[slot.getIndex()]; + } + + @Override + public int getDamageReductionAmount(EquipmentSlotType slot) { + return damageReduction[slot.getIndex()]; + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Nonnull + @Override + public SoundEvent getSoundEvent() { + return equipSound.get(); + } + + @Nonnull + @Override public Ingredient getRepairMaterial() { + return Ingredient.fromItems(repairItem.get()); + } + + @Nonnull + @Override + public String getName() { + return name; + } + + @Override + public float getToughness() { + return toughness; + } + } + + private enum ItemTier implements IItemTier { + MANASTEEL(300, 6.2F, 2, 3, 20, () -> ModItems.manaSteel), + ELEMENTIUM(720, 6.2F, 2, 3, 20, () -> ModItems.elementium), + TERRASTEEL(2300, 9, 3, 4, 26, () -> ModItems.terrasteel) + ; + + private final int maxUses; + private final float efficiency; + private final float attackDamage; + private final int harvestLevel; + private final int enchantability; + private final Supplier repairItem; + + ItemTier(int maxUses, float efficiency, float attackDamage, int harvestLevel, int enchantability, Supplier repairItem) { + this.maxUses = maxUses; + this.efficiency = efficiency; + this.attackDamage = attackDamage; + this.harvestLevel = harvestLevel; + this.enchantability = enchantability; + this.repairItem = repairItem; + } + + @Override + public int getMaxUses() { + return maxUses; + } + + @Override + public float getEfficiency() { + return efficiency; + } + + @Override + public float getAttackDamage() { + return attackDamage; + } + + @Override + public int getHarvestLevel() { + return harvestLevel; + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public Ingredient getRepairMaterial() { + return Ingredient.fromItems(repairItem.get()); + } + } + + @Override + public int apiVersion() { + return 94; + } + + @Override + public IForgeRegistry getBrewRegistry() { + return ModBrews.registry; + } + + @Override + public IArmorMaterial getManasteelArmorMaterial() { + return ArmorMaterial.MANASTEEL; + } + + @Override + public IArmorMaterial getElementiumArmorMaterial() { + return ArmorMaterial.ELEMENTIUM; + } + + @Override + public IArmorMaterial getManaweaveArmorMaterial() { + return ArmorMaterial.MANAWEAVE; + } + + @Override + public IArmorMaterial getTerrasteelArmorMaterial() { + return ArmorMaterial.TERRASTEEL; + } + + @Override + public IItemTier getManasteelItemTier() { + return ItemTier.MANASTEEL; + } + + @Override + public IItemTier getElementiumItemTier() { + return ItemTier.ELEMENTIUM; + } + + @Override + public IItemTier getTerrasteelItemTier() { + return ItemTier.TERRASTEEL; + } + + @Override + public Rarity getRelicRarity() { + return RELIC_RARITY.getValue(); + } + + private final InternalMethodHandler tmp = new InternalMethodHandler(); + @Override + public IInternalMethodHandler internalHandler() { + return tmp; + } + + @Override + public IAttribute getPixieSpawnChanceAttribute() { + return PixieHandler.PIXIE_SPAWN_CHANCE; + } + + public Map oreWeights = Collections.emptyMap(); + public Map netherOreWeights = Collections.emptyMap(); + private Map, Function> paintableBlocks = new ConcurrentHashMap<>(); + + @Override + public Map getOreWeights() { + return Collections.unmodifiableMap(oreWeights); + } + + @Override + public Map getNetherOreWeights() { + return Collections.unmodifiableMap(netherOreWeights); + } + + @Override + public Map, Function> getPaintableBlocks() { + return Collections.unmodifiableMap(paintableBlocks); + } + + @Override + public void registerPaintableBlock(IRegistryDelegate block, Function transformer) { + paintableBlocks.put(block, transformer); + } +} diff --git a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java index 0a8801374..38aee8b03 100644 --- a/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java +++ b/src/main/java/vazkii/botania/common/impl/corporea/CorporeaHelperImpl.java @@ -94,7 +94,7 @@ public class CorporeaHelperImpl implements CorporeaHelper { @Override public Map getInventoriesWithMatchInNetwork(ICorporeaRequestMatcher matcher, List inventories) { Map countMap = new HashMap<>(); - List wrappedInventories = BotaniaAPI.internalHandler.wrapInventory(inventories); + List wrappedInventories = BotaniaAPI.instance().internalHandler().wrapInventory(inventories); for (IWrappedInventory inv : wrappedInventories) { ICorporeaRequest request = new CorporeaRequest(matcher, -1); inv.countItems(request); @@ -127,7 +127,7 @@ public class CorporeaHelperImpl implements CorporeaHelper { List inventories = getInventoriesOnNetwork(spark); - List inventoriesW = BotaniaAPI.internalHandler.wrapInventory(inventories); + List inventoriesW = BotaniaAPI.instance().internalHandler().wrapInventory(inventories); Map interceptors = new HashMap<>(); ICorporeaRequest request = new CorporeaRequest(matcher, itemCount); diff --git a/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java b/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java similarity index 98% rename from src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java rename to src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java index 003f68694..383993c7a 100644 --- a/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java +++ b/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.common.impl; +package vazkii.botania.common.impl.mana; import com.google.common.collect.Iterables; @@ -54,7 +54,7 @@ public class ManaItemHandlerImpl implements ManaItemHandler { return Collections.emptyList(); } - IItemHandler acc = BotaniaAPI.internalHandler.getAccessoriesInventory(player); + IItemHandler acc = BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player); if (acc == null) { return Collections.emptyList(); } diff --git a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java index 9d650d24a..220915531 100644 --- a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java +++ b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java @@ -421,7 +421,7 @@ public class TCAspects { new ItemStack(ModItems.vial, 1, 1), new ItemStack(ModItems.incenseStick), new ItemStack(ModItems.bloodPendant)); private void registerBrewAspects() { - for(RecipeBrew brewRecipe : BotaniaAPI.brewRecipes) { + for(RecipeBrew brewRecipe : BotaniaAPI.instance().brewRecipes) { AspectList aspects = new AspectList(); for(Object input : brewRecipe.getInputs()) { @@ -470,8 +470,8 @@ public class TCAspects { proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(flowerId), aspects); proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), flowerId), floatingAspects); - if (BotaniaAPI.miniFlowers.containsKey(flowerId)) { - ResourceLocation miniFlowerId = BotaniaAPI.miniFlowers.get(flowerId); + if (BotaniaAPI.instance().miniFlowers.containsKey(flowerId)) { + ResourceLocation miniFlowerId = BotaniaAPI.instance().miniFlowers.get(flowerId); proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(miniFlowerId), petiteAspects(aspects)); proxy.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), miniFlowerId), petiteAspects(floatingAspects)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index fbbcdbb43..0f166cb74 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -75,7 +75,7 @@ public class ItemBlockSpecialFlower extends BlockItem { public double getDurabilityForDisplay(ItemStack stack) { CompoundNBT tag = stack.getChildTag("BlockEntityTag"); if (tag != null) { - return tag.getInt(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS) / (double) BotaniaAPI.internalHandler.getPassiveFlowerDecay(); + return tag.getInt(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS) / (double) BotaniaAPI.instance().internalHandler().getPassiveFlowerDecay(); } return 0; } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 40581836f..dfaec7a81 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -40,6 +40,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibMisc; @@ -122,7 +123,7 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public void fillItemGroup(ItemGroup tab, NonNullList list) { if (isInGroup(tab)) { - for (ResourceLocation id : BotaniaAPI.brewRegistry.getKeys()) { + for (ResourceLocation id : BotaniaAPI.instance().getBrewRegistry().getKeys()) { ItemStack stack = new ItemStack(this); setBrew(stack, id); list.add(stack); @@ -201,11 +202,11 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.brewRegistry.getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); } public static void setBrew(ItemStack stack, Brew brew) { - setBrew(stack, (brew == null ? BotaniaAPI.fallbackBrew : brew).getRegistryName()); + setBrew(stack, (brew == null ? ModBrews.fallbackBrew : brew).getRegistryName()); } public static void setBrew(ItemStack stack, ResourceLocation brew) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index d8188d103..c53cdf0f0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -25,6 +25,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.helper.ItemNBTHelper; import javax.annotation.Nonnull; @@ -44,7 +45,7 @@ public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer public void fillItemGroup(@Nonnull ItemGroup tab, @Nonnull NonNullList list) { super.fillItemGroup(tab, list); if (isInGroup(tab)) { - for (Brew brew : BotaniaAPI.brewRegistry) { + for (Brew brew : BotaniaAPI.instance().getBrewRegistry()) { ItemStack brewStack = getItemForBrew(brew, new ItemStack(this)); if (!brewStack.isEmpty()) { list.add(brewStack); @@ -57,7 +58,7 @@ public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { Brew brew = getBrew(stack); - if (brew == BotaniaAPI.fallbackBrew) { + if (brew == ModBrews.fallbackBrew) { list.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); return; } @@ -69,7 +70,7 @@ public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.brewRegistry.getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); } public static void setBrew(ItemStack stack, Brew brew) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index c4168f284..ea6bbe1af 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -31,7 +31,7 @@ import java.util.List; public abstract class ItemElementiumArmor extends ItemManasteelArmor { public ItemElementiumArmor(EquipmentSlotType type, Properties props) { - super(type, BotaniaAPI.ELEMENTIUM_ARMOR_MAT, props); + super(type, BotaniaAPI.instance().getElementiumArmorMaterial(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 1807d9730..df94509cd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -55,7 +55,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh public final EquipmentSlotType type; public ItemManasteelArmor(EquipmentSlotType type, Properties props) { - this(type, BotaniaAPI.MANASTEEL_ARMOR_MAT, props); + this(type, BotaniaAPI.instance().getManasteelArmorMaterial(), props); } public ItemManasteelArmor(EquipmentSlotType type, IArmorMaterial mat, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index b289335b9..b957190e3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -38,7 +38,7 @@ import java.util.List; public class ItemManaweaveArmor extends ItemManasteelArmor { public ItemManaweaveArmor(EquipmentSlotType type, Properties props) { - super(type, BotaniaAPI.MANAWEAVE_ARMOR_MAT, props); + super(type, BotaniaAPI.instance().getManaweaveArmorMaterial(), props); addPropertyOverride(new ResourceLocation("botania", "holiday"), (stack, worldIn, entityIn) -> ClientProxy.jingleTheBells ? 1 : 0); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index e99da1793..f044e71d1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -38,7 +38,7 @@ import java.util.UUID; public class ItemTerrasteelArmor extends ItemManasteelArmor { public ItemTerrasteelArmor(EquipmentSlotType type, Properties props) { - super(type, BotaniaAPI.TERRASTEEL_ARMOR_MAT, props); + super(type, BotaniaAPI.instance().getTerrasteelArmorMaterial(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 92cf07820..ba6248295 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -42,6 +42,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.helper.ItemNBTHelper; import java.util.List; @@ -58,7 +59,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre public void fillItemGroup(ItemGroup tab, NonNullList list) { super.fillItemGroup(tab, list); if (isInGroup(tab)) { - for (Brew brew : BotaniaAPI.brewRegistry) { + for (Brew brew : BotaniaAPI.instance().getBrewRegistry()) { ItemStack brewStack = getItemForBrew(brew, new ItemStack(this)); if (!brewStack.isEmpty()) { list.add(brewStack); @@ -73,7 +74,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre super.addHiddenTooltip(stack, world, list, adv); Brew brew = getBrew(stack); - if (brew == BotaniaAPI.fallbackBrew) { + if (brew == ModBrews.fallbackBrew) { list.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); return; } @@ -93,7 +94,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public void onWornTick(ItemStack stack, LivingEntity player) { Brew brew = ((IBrewItem) stack.getItem()).getBrew(stack); - if (brew != BotaniaAPI.fallbackBrew && player instanceof PlayerEntity && !player.world.isRemote) { + if (brew != ModBrews.fallbackBrew && player instanceof PlayerEntity && !player.world.isRemote) { PlayerEntity eplayer = (PlayerEntity) player; EffectInstance effect = brew.getPotionEffects(stack).get(0); float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; @@ -138,7 +139,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.brewRegistry.getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); } public static void setBrew(ItemStack stack, Brew brew) { @@ -167,7 +168,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public boolean usesMana(ItemStack stack) { - return getBrew(stack) != BotaniaAPI.fallbackBrew; + return getBrew(stack) != ModBrews.fallbackBrew; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 1a2ee1fe5..336a31db4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -32,7 +32,7 @@ import java.util.function.Consumer; public class ItemEnderDagger extends ItemManasteelSword { public ItemEnderDagger(Properties props) { - super(BotaniaAPI.MANASTEEL_ITEM_TIER, props); + super(BotaniaAPI.instance().getManasteelItemTier(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index 198325e6b..3adcf4544 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -29,7 +29,7 @@ public class ItemStarSword extends ItemManasteelSword { private static final int MANA_PER_DAMAGE = 120; public ItemStarSword(Properties props) { - super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props); + super(BotaniaAPI.instance().getTerrasteelItemTier(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index bbf752f95..0d89ccf94 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -39,7 +39,7 @@ public class ItemThunderSword extends ItemManasteelSword { private static final String TAG_LIGHTNING_SEED = "lightningSeed"; public ItemThunderSword(Properties props) { - super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props); + super(BotaniaAPI.instance().getTerrasteelItemTier(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index e955ce46e..f07552fa1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -149,13 +149,13 @@ public final class ToolCommons { ToolItem tool = (ToolItem) item; IItemTier material = tool.getTier(); int materialLevel = 0; - if (material == BotaniaAPI.MANASTEEL_ITEM_TIER) { + if (material == BotaniaAPI.instance().getManasteelItemTier()) { materialLevel = 10; } - if (material == BotaniaAPI.ELEMENTIUM_ITEM_TIER) { + if (material == BotaniaAPI.instance().getElementiumItemTier()) { materialLevel = 11; } - if (material == BotaniaAPI.TERRASTEEL_ITEM_TIER) { + if (material == BotaniaAPI.instance().getTerrasteelItemTier()) { materialLevel = 20; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 6a2cc747a..e6306155b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -33,7 +33,7 @@ import java.util.Random; public class ItemElementiumAxe extends ItemManasteelAxe { public ItemElementiumAxe(Properties props) { - super(BotaniaAPI.ELEMENTIUM_ITEM_TIER, props); + super(BotaniaAPI.instance().getElementiumItemTier(), props); MinecraftForge.EVENT_BUS.addListener(this::onEntityDrops); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 911c50d09..94770dcaa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -25,7 +25,7 @@ import java.util.List; public class ItemElementiumPick extends ItemManasteelPick { public ItemElementiumPick(Properties props) { - super(BotaniaAPI.ELEMENTIUM_ITEM_TIER, props, -2.8F); + super(BotaniaAPI.instance().getElementiumItemTier(), props, -2.8F); } public static void filterDisposable(List drops, Entity e, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index 71bdbdd61..d783ea0b0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -24,7 +24,7 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; public class ItemElementiumShovel extends ItemManasteelShovel { public ItemElementiumShovel(Properties props) { - super(BotaniaAPI.ELEMENTIUM_ITEM_TIER, props); + super(BotaniaAPI.instance().getElementiumItemTier(), props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java index 665d62cd7..03e9e3134 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java @@ -22,7 +22,7 @@ import javax.annotation.Nonnull; public class ItemElementiumSword extends ItemManasteelSword { public ItemElementiumSword(Properties props) { - super(BotaniaAPI.ELEMENTIUM_ITEM_TIER, props); + super(BotaniaAPI.instance().getElementiumItemTier(), props); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 29df85661..87a27bc22 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -38,7 +38,7 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab private static final int MANA_PER_DAMAGE = 60; public ItemManasteelAxe(Properties props) { - this(BotaniaAPI.MANASTEEL_ITEM_TIER, props); + this(BotaniaAPI.instance().getManasteelItemTier(), props); } public ItemManasteelAxe(IItemTier mat, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 574b6df93..61d442ff3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -38,7 +38,7 @@ public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, IS private static final int MANA_PER_DAMAGE = 60; public ItemManasteelPick(Properties props) { - this(BotaniaAPI.MANASTEEL_ITEM_TIER, props, -2.8F); + this(BotaniaAPI.instance().getManasteelItemTier(), props, -2.8F); } public ItemManasteelPick(IItemTier mat, Properties props, float attackSpeed) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 720d39acf..7e17e64a1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -46,7 +46,7 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I private static final int MANA_PER_DAMAGE = 60; public ItemManasteelShovel(Properties props) { - this(BotaniaAPI.MANASTEEL_ITEM_TIER, props); + this(BotaniaAPI.instance().getManasteelItemTier(), props); } public ItemManasteelShovel(IItemTier mat, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index f8bc7ff61..19a983f00 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -29,7 +29,7 @@ public class ItemManasteelSword extends SwordItem implements IManaUsingItem { public static final int MANA_PER_DAMAGE = 60; public ItemManasteelSword(Properties props) { - this(BotaniaAPI.MANASTEEL_ITEM_TIER, props); + this(BotaniaAPI.instance().getManasteelItemTier(), props); } public ItemManasteelSword(IItemTier mat, Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index ca4348e17..60e208264 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -73,7 +73,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker private static final Map> blockSwappers = new HashMap<>(); public ItemTerraAxe(Properties props) { - super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props); + super(BotaniaAPI.instance().getTerrasteelItemTier(), props); MinecraftForge.EVENT_BUS.addListener(this::onTickEnd); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), (stack, world, entity) -> { if (entity instanceof PlayerEntity && !shouldBreak((PlayerEntity) entity)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 934305bfd..f4a24d285 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -76,7 +76,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ }; public ItemTerraPick(Properties props) { - super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props, -2.8F); + super(BotaniaAPI.instance().getTerrasteelItemTier(), props, -2.8F); addPropertyOverride(new ResourceLocation("botania", TAG_TIPPED), (itemStack, world, entityLivingBase) -> isTipped(itemStack) ? 1 : 0); addPropertyOverride(new ResourceLocation("botania", TAG_ENABLED), (itemStack, world, entityLivingBase) -> isEnabled(itemStack) ? 1 : 0); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 82a6673c2..77671c263 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -38,7 +38,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { private static final int MANA_PER_DAMAGE = 100; public ItemTerraSword(Properties props) { - super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props); + super(BotaniaAPI.instance().getTerrasteelItemTier(), props); MinecraftForge.EVENT_BUS.addListener(this::leftClick); MinecraftForge.EVENT_BUS.addListener(this::attackEntity); } @@ -116,7 +116,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { int mana = burst.getMana(); if (mana >= cost) { burst.setMana(mana - cost); - float damage = 4F + BotaniaAPI.TERRASTEEL_ITEM_TIER.getAttackDamage(); + float damage = 4F + BotaniaAPI.instance().getTerrasteelItemTier().getAttackDamage(); if (!burst.isFake() && !entity.world.isRemote) { DamageSource source = DamageSource.MAGIC; if (thrower instanceof PlayerEntity) { 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 47c356424..fbe705fd4 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -54,7 +54,7 @@ public class LensPaint extends Lens { BlockPos hit = ((BlockRayTraceResult) pos).getPos(); BlockState state = entity.world.getBlockState(hit); Block block = state.getBlock(); - if (BotaniaAPI.paintableBlocks.containsKey(block.delegate)) { + if (BotaniaAPI.instance().getPaintableBlocks().containsKey(block.delegate)) { List coordsToPaint = new ArrayList<>(); List coordsFound = new ArrayList<>(); coordsFound.add(hit); @@ -79,7 +79,7 @@ public class LensPaint extends Lens { DyeColor placeColor = DyeColor.byId(storedColor == 16 ? entity.world.rand.nextInt(16) : storedColor); BlockState stateThere = entity.world.getBlockState(coords); - Function f = BotaniaAPI.paintableBlocks.get(block.delegate); + Function f = BotaniaAPI.instance().getPaintableBlocks().get(block.delegate); Block newBlock = f.apply(placeColor); if (newBlock != stateThere.getBlock()) { entity.world.setBlockState(coords, newBlock.getDefaultState()); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index a0326cd10..64c2ecaba 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -147,7 +147,7 @@ public class ItemRelic extends Item implements IRelic { @Nonnull @Override public Rarity getRarity(ItemStack stack) { - return BotaniaAPI.rarityRelic; + return BotaniaAPI.instance().getRelicRarity(); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 9a227862a..13ffaf184 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -72,7 +72,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Nonnull @Override public Rarity getRarity(ItemStack stack) { - return BotaniaAPI.rarityRelic; + return BotaniaAPI.instance().getRelicRarity(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 5da401b30..f197eaa08 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -268,7 +268,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC return new ItemStack(block); } - ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getAccessoriesInventory(player), stack, block, doit); + ItemStack outStack = removeFromInventory(player, BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player), stack, block, doit); if (outStack.isEmpty()) { outStack = removeFromInventory(player, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY), stack, block, doit); } @@ -280,7 +280,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC return -1; } - int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getAccessoriesInventory(player), stack, block); + int baubleCount = getInventoryItemCount(player, BotaniaAPI.instance().internalHandler().getAccessoriesInventory(player), stack, block); if (baubleCount == -1) { return -1; } diff --git a/src/test/java/vazkii/botania/test/APITest.java b/src/test/java/vazkii/botania/test/APITest.java index ceab95fe0..02cef5ff2 100644 --- a/src/test/java/vazkii/botania/test/APITest.java +++ b/src/test/java/vazkii/botania/test/APITest.java @@ -10,9 +10,13 @@ package vazkii.botania.test; import org.junit.jupiter.api.Test; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.impl.ManaItemHandlerImpl; +import vazkii.botania.client.impl.BotaniaAPIClientImpl; +import vazkii.botania.common.impl.BotaniaAPIImpl; +import vazkii.botania.common.impl.mana.ManaItemHandlerImpl; import vazkii.botania.common.impl.corporea.CorporeaHelperImpl; import static org.junit.jupiter.api.Assertions.*; @@ -30,4 +34,14 @@ public class APITest { public void testCorporeaHelper() { assertEquals(CorporeaHelper.instance().getClass(), CorporeaHelperImpl.class); } + + @Test + public void testMainAPI() { + assertEquals(BotaniaAPI.instance().getClass(), BotaniaAPIImpl.class); + } + + @Test + public void testClientAPI() { + assertEquals(BotaniaAPIClient.instance().getClass(), BotaniaAPIClientImpl.class); + } }