diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 5a6e923e0..34ee475a2 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -21,8 +21,6 @@ import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IRegistryDelegate; @@ -30,8 +28,6 @@ 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 javax.annotation.Nonnull; @@ -57,10 +53,6 @@ public interface BotaniaAPI { return 0; } - @CapabilityInject(IFloatingFlower.class) public static Capability FLOATING_FLOWER_CAP = null; - - @CapabilityInject(IExoflameHeatable.class) public static Capability EXOFLAME_HEATABLE_CAP = null; - default IForgeRegistry getBrewRegistry() { return null; } diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 72e5bfac0..7b66c6d01 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -37,6 +37,7 @@ import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.registries.ForgeRegistries; @@ -59,6 +60,8 @@ import java.util.List; * Common superclass of all magical flower TE's */ public class TileEntitySpecialFlower extends TileEntity implements ITickableTileEntity, IWandBindable { + @CapabilityInject(IFloatingFlower.class) + public static Capability FLOATING_FLOWER_CAP; public static final ResourceLocation DING_SOUND_EVENT = new ResourceLocation("botania", "ding"); public static final int SLOWDOWN_FACTOR_PODZOL = 5; public static final int SLOWDOWN_FACTOR_MYCEL = 10; @@ -125,7 +128,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - if (cap == BotaniaAPI.instance().FLOATING_FLOWER_CAP) { + if (cap == FLOATING_FLOWER_CAP) { if (hasWorld() && getBlockState().isIn(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) { return floatingDataCap.cast(); } @@ -134,7 +137,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile } public boolean isFloating() { - return getCapability(BotaniaAPI.instance().FLOATING_FLOWER_CAP).isPresent(); + return getCapability(FLOATING_FLOWER_CAP).isPresent(); } private boolean isOnSpecialSoil() { @@ -206,7 +209,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile */ public void writeToPacketNBT(CompoundNBT cmp) { if (isFloating()) { - cmp.put(TAG_FLOATING_DATA, BotaniaAPI.instance().FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + cmp.put(TAG_FLOATING_DATA, FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); } } @@ -217,7 +220,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile */ public void readFromPacketNBT(CompoundNBT cmp) { if (cmp.contains(TAG_FLOATING_DATA)) { - BotaniaAPI.instance().FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); + FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); } } 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 e31b7a13e..196bbcb87 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -30,6 +30,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFloatingFlower.IslandType; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileFloatingFlower; @@ -80,8 +81,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.instance().FLOATING_FLOWER_CAP).isPresent()) { - IFloatingFlower flower = te.getCapability(BotaniaAPI.instance().FLOATING_FLOWER_CAP).orElseThrow(IllegalStateException::new); + if (!stack.isEmpty() && te != null && te.getCapability(TileEntitySpecialFlower.FLOATING_FLOWER_CAP).isPresent()) { + IFloatingFlower flower = te.getCapability(TileEntitySpecialFlower.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/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 057d47cfb..143abd147 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 @@ -18,6 +18,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; +import vazkii.botania.common.core.handler.ExoflameFurnaceHandler; import vazkii.botania.common.lib.LibMisc; public class SubTileExoflame extends TileEntityFunctionalFlower { @@ -45,7 +46,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.instance().EXOFLAME_HEATABLE_CAP); + LazyOptional cap = tile.getCapability(ExoflameFurnaceHandler.CAPABILITY); if (cap.isPresent()) { IExoflameHeatable heatable = cap.orElseThrow(NullPointerException::new); 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 2e9974503..236d0f2de 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -26,6 +26,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -58,7 +59,7 @@ public class TileFloatingFlower extends TileMod { @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - if (cap == BotaniaAPI.instance().FLOATING_FLOWER_CAP) { + if (cap == TileEntitySpecialFlower.FLOATING_FLOWER_CAP) { return floatingDataCap.cast(); } return super.getCapability(cap, side); @@ -76,12 +77,12 @@ public class TileFloatingFlower extends TileMod { @Override public void writePacketNBT(CompoundNBT cmp) { - cmp.put(TAG_FLOATING_DATA, BotaniaAPI.instance().FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + cmp.put(TAG_FLOATING_DATA, TileEntitySpecialFlower.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); } @Override public void readPacketNBT(CompoundNBT cmp) { - BotaniaAPI.instance().FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); + TileEntitySpecialFlower.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); } @Nonnull 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 0e553af69..b0d740329 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -17,6 +17,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -33,6 +35,8 @@ import java.lang.invoke.MethodHandle; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ExoflameFurnaceHandler { + @CapabilityInject(IExoflameHeatable.class) + public static Capability CAPABILITY; public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "exoflame_heatable"); private static final MethodHandle CAN_SMELT = LibObfuscation.getMethod(AbstractFurnaceTileEntity.class, "func_214008_b", IRecipe.class); @@ -43,7 +47,7 @@ public class ExoflameFurnaceHandler { TileEntity te = event.getObject(); if (te instanceof AbstractFurnaceTileEntity) { AbstractFurnaceTileEntity furnace = (AbstractFurnaceTileEntity) te; - SimpleCapProvider.attach(event, ID, BotaniaAPI.instance().EXOFLAME_HEATABLE_CAP, new FurnaceExoflameHeatable(furnace)); + SimpleCapProvider.attach(event, ID, CAPABILITY, new FurnaceExoflameHeatable(furnace)); } }