New flower Reiujia

dependencies.gradle

@@ -9,6 +9,7 @@ dependencies {
 
     compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
     compileOnly("com.github.GTNewHorizons:Chisel:2.17.14-GTNH:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:twilightforest:2.7.23:dev") { transitive = false }
 
     runtimeOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev')
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }

src/main/java/net/fuzzycraft/botanichorizons/addons/BHBlocks.java

@@ -1,6 +1,7 @@
 package net.fuzzycraft.botanichorizons.addons;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+
 import net.fuzzycraft.botanichorizons.addons.block.BlockAdvancedAlchemyPool;
 import net.fuzzycraft.botanichorizons.addons.block.BlockAdvancedAlfPortal;
 import net.fuzzycraft.botanichorizons.addons.block.BlockAdvancedConjurationPool;
@@ -9,20 +10,34 @@
 import net.fuzzycraft.botanichorizons.addons.tileentity.TileAdvancedAlfPortal;
 import net.fuzzycraft.botanichorizons.addons.tileentity.TileAdvancedConjurationPool;
 import net.fuzzycraft.botanichorizons.addons.tileentity.TileAdvancedCraftingPool;
+import net.fuzzycraft.botanichorizons.addons.block.BlockFloatingSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.block.BlockSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.block.subtile.generating.SubTileReiujia;
+import net.fuzzycraft.botanichorizons.addons.block.tile.TileFloatingSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.block.tile.TileSparkFlower;
 import net.fuzzycraft.botanichorizons.mod.ForgeMod;
+import net.fuzzycraft.botanichorizons.util.Signature;
+
+import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 
+import vazkii.botania.api.BotaniaAPI;
+
 public final class BHBlocks {
     public static BlockAdvancedCraftingPool autoPoolInfusion;
     public static BlockAdvancedAlchemyPool autoPoolAlchemy;
     public static BlockAdvancedConjurationPool autoPoolConjuration;
     public static BlockAdvancedAlfPortal autoPortal;
+    public static Block sparkFlower;
+    public static Block floatingSparkFlower;
 
     public static void initBlocks() {
         autoPoolInfusion = new BlockAdvancedCraftingPool();
         autoPoolAlchemy = new BlockAdvancedAlchemyPool();
         autoPoolConjuration = new BlockAdvancedConjurationPool();
         autoPortal = new BlockAdvancedAlfPortal();
+        sparkFlower = new BlockSparkFlower();
+        floatingSparkFlower = new BlockFloatingSparkFlower();
 
         registerTileEntities();
     }
@@ -32,6 +47,12 @@ public static void registerTileEntities() {
         registerTile(TileAdvancedAlchemyPool.class, BlockAdvancedAlchemyPool.NAME);
         registerTile(TileAdvancedConjurationPool.class, BlockAdvancedConjurationPool.NAME);
         registerTile(TileAdvancedAlfPortal.class, BlockAdvancedAlfPortal.NAME);
+		registerTile(TileSparkFlower.class, BlockSparkFlower.NAME);
+		registerTile(TileFloatingSparkFlower.class, BlockFloatingSparkFlower.NAME);
+
+        BotaniaAPI.registerSubTile(SubTileReiujia.NAME, SubTileReiujia.class);
+        BotaniaAPI.registerSubTileSignature(SubTileReiujia.class, new Signature(SubTileReiujia.NAME));
+        BotaniaAPI.addSubTileToCreativeMenu(SubTileReiujia.NAME);
     }
 
     private static void registerTile(Class<? extends TileEntity> clazz, String key) {

src/main/java/net/fuzzycraft/botanichorizons/addons/block/BlockFloatingSparkFlower.java

@@ -0,0 +1,174 @@
+package net.fuzzycraft.botanichorizons.addons.block;
+
+// Mirrors BlockFloatingSpecialFlower
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import net.fuzzycraft.botanichorizons.addons.item.ItemBlockFloatingSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.item.ItemBlockSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.block.tile.TileFloatingSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.block.tile.TileSparkFlower;
+import net.fuzzycraft.botanichorizons.addons.crafting.recipe.SparkFloatingFlowerRecipe;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.oredict.RecipeSorter;
+import net.minecraftforge.oredict.RecipeSorter.Category;
+
+import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.api.subtile.ISpecialFlower;
+import vazkii.botania.api.wand.IWandHUD;
+import vazkii.botania.api.wand.IWandable;
+import vazkii.botania.common.block.decor.BlockFloatingFlower;
+import vazkii.botania.common.block.tile.TileMod;
+import vazkii.botania.common.integration.coloredlights.LightHelper;
+import vazkii.botania.common.lib.LibBlockNames;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BlockFloatingSparkFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD {
+
+    public static String NAME = "blockFloatingSparkFlower";
+
+	public BlockFloatingSparkFlower() {
+		super(NAME);
+
+		GameRegistry.addRecipe(new SparkFloatingFlowerRecipe());
+		RecipeSorter.register("botania:floatingSparkFlower", SparkFloatingFlowerRecipe.class, Category.SHAPELESS, "");
+	}
+
+	@Override
+	public int getLightValue(IBlockAccess world, int x, int y, int z) {
+		int currentLight = ((TileSparkFlower) world.getTileEntity(x, y, z)).getLightValue();
+		if(currentLight == -1)
+			currentLight = originalLight;
+		return LightHelper.getPackedColor(world.getBlockMetadata(x, y, z), currentLight);
+	}
+
+	@Override
+	public boolean hasComparatorInputOverride() {
+		return true;
+	}
+
+	@Override
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
+		return ((TileSparkFlower) world.getTileEntity(x, y, z)).getComparatorInputOverride(side);
+	}
+
+	@Override
+	public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side) {
+		return ((TileSparkFlower) world.getTileEntity(x, y, z)).getPowerLevel(side);
+	}
+
+	@Override
+	public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side) {
+		return isProvidingWeakPower(world, x, y, z, side);
+	}
+
+	@Override
+	public boolean canProvidePower() {
+		return true;
+	}
+
+	@Override
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		// NO-OP
+	}
+
+	@Override
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
+		for(String s : BotaniaAPI.subtilesForCreativeMenu) {
+			list.add(ItemBlockSparkFlower.ofType(new ItemStack(item), s));
+			if(BotaniaAPI.miniFlowers.containsKey(s))
+				list.add(ItemBlockSparkFlower.ofType(new ItemStack(item), BotaniaAPI.miniFlowers.get(s)));
+		}
+	}
+
+	@Override
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
+		String name = ((TileSparkFlower) world.getTileEntity(x, y, z)).subTileName;
+		return ItemBlockSparkFlower.ofType(new ItemStack(world.getBlock(x, y, z)), name);
+	}
+
+	@Override
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode) {
+			dropBlockAsItem(world, x, y, z, meta, 0);
+			((TileSparkFlower) world.getTileEntity(x, y, z)).onBlockHarvested(world, x, y, z, meta, player);
+		}
+	}
+
+	@Override
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
+		ArrayList<ItemStack> list = new ArrayList<>();
+		TileEntity tile = world.getTileEntity(x, y, z);
+
+		if(tile != null) {
+			String name = ((TileSparkFlower) tile).subTileName;
+			list.add(ItemBlockSparkFlower.ofType(new ItemStack(world.getBlock(x, y, z)), name));
+			((TileSparkFlower) tile).getDrops(list);
+		}
+
+		return list;
+	}
+
+	@Override
+	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventData) {
+		super.onBlockEventReceived(world, x, y, z, eventId, eventData);
+		TileEntity tileentity = world.getTileEntity(x, y, z);
+		return tileentity != null ? tileentity.receiveClientEvent(eventId, eventData) : false;
+	}
+
+	@Override
+	public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) {
+		return ((TileSparkFlower) world.getTileEntity(x, y, z)).onWanded(stack, player);
+	}
+
+	@Override
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
+		((TileSparkFlower) world.getTileEntity(x, y, z)).onBlockPlacedBy(world, x, y, z, entity, stack);
+	}
+
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		return ((TileSparkFlower) world.getTileEntity(x, y, z)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ);
+	}
+
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) {
+		((TileSparkFlower) world.getTileEntity(x, y, z)).onBlockAdded(world, x, y, z);
+	}
+
+	@Override
+	public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) {
+		((TileSparkFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res);
+	}
+
+	@Override
+	protected void register(String name) {
+		GameRegistry.registerBlock(this, ItemBlockFloatingSparkFlower.class, name);
+	}
+
+	@Override
+	public TileMod createNewTileEntity(World world, int meta) {
+		return new TileFloatingSparkFlower();
+	}
+
+	@Override
+	public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
+		return ((TileSparkFlower) world.getTileEntity(x, y, z)).getEntry();
+	}
+}