Make TileAlveary extensible

src/main/java/forestry/api/multiblock/IAlvearyComponent.java

@@ -24,21 +24,21 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
 	/**
 	 * Implemented by alveary parts to apply a beeListener to the completed structure.
 	 */
-	interface BeeListener extends IAlvearyComponent {
+	interface BeeListener<T extends IMultiblockLogicAlveary> extends IAlvearyComponent<T> {
 		IBeeListener getBeeListener();
 	}
 
 	/**
 	 * Implemented by alveary parts to apply a beeModifier to the completed structure.
 	 */
-	interface BeeModifier extends IAlvearyComponent {
+	interface BeeModifier<T extends IMultiblockLogicAlveary> extends IAlvearyComponent<T> {
 		IBeeModifier getBeeModifier();
 	}
 
 	/**
 	 * Implemented by alveary parts to apply a climate change to the completed structure.
 	 */
-	interface Climatiser extends IAlvearyComponent {
+	interface Climatiser<T extends IMultiblockLogicAlveary> extends IAlvearyComponent<T> {
 		/**
 		 * Called every tick by the alveary.
 		 *
@@ -51,7 +51,7 @@ interface Climatiser extends IAlvearyComponent {
 	/**
 	 * Implemented by alveary parts to receive ticks from the completed structure.
 	 */
-	interface Active extends IAlvearyComponent {
+	interface Active<T extends IMultiblockLogicAlveary> extends IAlvearyComponent<T> {
 		void updateServer(int tickCount);
 
 		void updateClient(int tickCount);

src/main/java/forestry/apiculture/multiblock/TileAlveary.java

@@ -22,6 +22,7 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 
@@ -55,12 +56,19 @@
 import forestry.core.owner.IOwnerHandler;
 import forestry.core.tiles.ITitled;
 
-public class TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements IBeeHousing, IAlvearyComponent, IOwnedTile, IStreamableGui, ITitled, IClimateProvider {
-	private final String unlocalizedTitle;
+public class TileAlveary extends MultiblockTileEntityForestry<MultiblockLogicAlveary> implements IBeeHousing, IAlvearyComponent<MultiblockLogicAlveary>, IOwnedTile, IStreamableGui, ITitled, IClimateProvider {
+	private final String translationKey;
 
+	// For Forestry only
 	public TileAlveary(BlockAlvearyType type, BlockPos pos, BlockState state) {
-		super(type.getTileType().tileType(), pos, state, new MultiblockLogicAlveary());
-		this.unlocalizedTitle = ApicultureBlocks.ALVEARY.get(type).getTranslationKey();
+		this(type.getTileType().tileType(), ApicultureBlocks.ALVEARY.get(type).getTranslationKey(), pos, state);
+	}
+
+	// For addons
+	public TileAlveary(BlockEntityType<?> type, String translationKey, BlockPos pos, BlockState state) {
+		super(type, pos, state, new MultiblockLogicAlveary());
+
+		this.translationKey = translationKey;
 	}
 
 	@Override
@@ -168,7 +176,7 @@ public IInventoryAdapter getInternalInventory() {
 
 	@Override
 	public Component getTitle() {
-		return Component.translatable(this.unlocalizedTitle);
+		return Component.translatable(this.translationKey);
 	}
 
 	/* IStreamableGui */

src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java

@@ -31,7 +31,7 @@
 import forestry.energy.ForestryEnergyStorage;
 
 // Used by Heater and Fan, which increase and decrease Temperature, respectively
-public abstract class TileAlvearyClimatiser extends TileAlveary implements IActivatable, IAlvearyComponent.Climatiser {
+public abstract class TileAlvearyClimatiser extends TileAlveary implements IActivatable, IAlvearyComponent.Climatiser<MultiblockLogicAlveary> {
 	private static final int TICKS_PER_CYCLE = 1;
 	private static final int FE_PER_OPERATION = 50;
 

src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java

@@ -42,7 +42,7 @@
 import forestry.core.tiles.ILiquidTankTile;
 import forestry.core.utils.RecipeUtils;
 
-public class TileAlvearyHygroregulator extends TileAlveary implements Container, ILiquidTankTile, IAlvearyComponent.Climatiser {
+public class TileAlvearyHygroregulator extends TileAlveary implements Container, ILiquidTankTile, IAlvearyComponent.Climatiser<MultiblockLogicAlveary> {
 	private final TankManager tankManager;
 	private final FilteredTank liquidTank;
 	private final IInventoryAdapter inventory;

src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java

@@ -26,7 +26,7 @@
 import forestry.core.inventory.IInventoryAdapter;
 import forestry.core.inventory.watchers.ISlotPickupWatcher;
 
-public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener {
+public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.BeeListener<MultiblockLogicAlveary> {
 	private final IBeeListener beeListener;
 	private final InventoryAlvearySieve inventory;
 

src/main/java/forestry/apiculture/multiblock/TileAlvearyStabiliser.java

@@ -20,7 +20,7 @@
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.apiculture.blocks.BlockAlvearyType;
 
-public class TileAlvearyStabiliser extends TileAlveary implements IAlvearyComponent.BeeModifier {
+public class TileAlvearyStabiliser extends TileAlveary implements IAlvearyComponent.BeeModifier<MultiblockLogicAlveary> {
 	private static final IBeeModifier MODIFIER = new IBeeModifier() {
 		@Override
 		public float modifyMutationChance(IGenome genome, IGenome mate, IMutation<IBeeSpecies> mutation, float currentChance) {

src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java

@@ -41,7 +41,7 @@
 import forestry.core.tiles.IActivatable;
 import forestry.core.utils.SpeciesUtil;
 
-public class TileAlvearySwarmer extends TileAlveary implements WorldlyContainer, IActivatable, IAlvearyComponent.Active {
+public class TileAlvearySwarmer extends TileAlveary implements WorldlyContainer, IActivatable, IAlvearyComponent.Active<MultiblockLogicAlveary> {
 	private final InventorySwarmer inventory;
 	private final ArrayDeque<ItemStack> pendingSpawns = new ArrayDeque<>();