Fix up formatting after objectholder pr

This commit is contained in:
Hubry committed 2020-06-25 00:34:42 +02:00
1 parent c8d6bcd70e
commit fdfc715cef
7 files changed
+149 -143

No files matched your search

@@ -25,6 +25,7 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.state.enums.LuminizerVariant;
import vazkii.botania.client.render.tile.RenderTilePylon;
import vazkii.botania.client.render.tile.TEISR;
@@ -103,7 +104,7 @@ public final class ModBlocks {
public static Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA, Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7));
public static Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA, Block.Properties.from(manaPylon));
public static Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA, Block.Properties.from(manaPylon));
public static Block pistonRelay = new BlockPistonRelay(Block.Properties.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL));
public static Block distributor = new BlockDistributor(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE));
public static Block manaVoid = new BlockManaVoid(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE));
@@ -123,7 +124,7 @@ public final class ModBlocks {
public static Block wildDrum = new BlockForestDrum(BlockForestDrum.Variant.WILD, Block.Properties.from(livingwood));
public static Block gatheringDrum = new BlockForestDrum(BlockForestDrum.Variant.GATHERING, Block.Properties.from(livingwood));
public static Block canopyDrum = new BlockForestDrum(BlockForestDrum.Variant.CANOPY, Block.Properties.from(livingwood));
public static Block whiteShinyFlower = new BlockShinyFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(15));
public static Block orangeShinyFlower = new BlockShinyFlower(DyeColor.ORANGE, Block.Properties.from(whiteShinyFlower));
public static Block magentaShinyFlower = new BlockShinyFlower(DyeColor.MAGENTA, Block.Properties.from(whiteShinyFlower));
@@ -140,7 +141,7 @@ public final class ModBlocks {
public static Block greenShinyFlower = new BlockShinyFlower(DyeColor.GREEN, Block.Properties.from(whiteShinyFlower));
public static Block redShinyFlower = new BlockShinyFlower(DyeColor.RED, Block.Properties.from(whiteShinyFlower));
public static Block blackShinyFlower = new BlockShinyFlower(DyeColor.BLACK, Block.Properties.from(whiteShinyFlower));
public static Block abstrusePlatform = new BlockPlatform(BlockPlatform.Variant.ABSTRUSE, Block.Properties.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD));
public static Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL, Block.Properties.from(abstrusePlatform));
public static Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, Block.Properties.create(Material.WOOD).hardnessAndResistance(-1, Float.MAX_VALUE).sound(SoundType.WOOD));
@@ -171,7 +172,7 @@ public final class ModBlocks {
public static Block greenBuriedPetals = new BlockBuriedPetals(DyeColor.GREEN, Block.Properties.from(whiteBuriedPetals));
public static Block redBuriedPetals = new BlockBuriedPetals(DyeColor.RED, Block.Properties.from(whiteBuriedPetals));
public static Block blackBuriedPetals = new BlockBuriedPetals(DyeColor.BLACK, Block.Properties.from(whiteBuriedPetals));
public static Block whiteFloatingFlower = new BlockFloatingFlower(DyeColor.WHITE, Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15));
public static Block orangeFloatingFlower = new BlockFloatingFlower(DyeColor.ORANGE, Block.Properties.from(whiteFloatingFlower));
public static Block magentaFloatingFlower = new BlockFloatingFlower(DyeColor.MAGENTA, Block.Properties.from(whiteFloatingFlower));
@@ -188,10 +189,10 @@ public final class ModBlocks {
public static Block greenFloatingFlower = new BlockFloatingFlower(DyeColor.GREEN, Block.Properties.from(whiteFloatingFlower));
public static Block redFloatingFlower = new BlockFloatingFlower(DyeColor.RED, Block.Properties.from(whiteFloatingFlower));
public static Block blackFloatingFlower = new BlockFloatingFlower(DyeColor.BLACK, Block.Properties.from(whiteFloatingFlower));
public static Block tinyPotato = new BlockTinyPotato(Block.Properties.create(Material.WOOL).hardnessAndResistance(0.25F));
public static Block spawnerClaw = new BlockSpawnerClaw(Block.Properties.create(Material.IRON).hardnessAndResistance(3));
public static Block azulejo0 = new BlockMod(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE));
public static Block azulejo1 = new BlockMod(Block.Properties.from(azulejo0));
public static Block azulejo2 = new BlockMod(Block.Properties.from(azulejo0));
@@ -224,7 +225,7 @@ public final class ModBlocks {
public static Block manaFlame = new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement());
public static Block prism = new BlockPrism(Block.Properties.from(elfGlass).doesNotBlockMovement());
public static Block enchantedSoil = new BlockEnchantedSoil(Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).sound(SoundType.PLANT));
public static Block petalBlockWhite = new BlockPetalBlock(DyeColor.WHITE, Block.Properties.create(Material.PLANTS).hardnessAndResistance(0.4F).sound(SoundType.PLANT));
public static Block petalBlockOrange = new BlockPetalBlock(DyeColor.ORANGE, Block.Properties.from(petalBlockWhite));
public static Block petalBlockMagenta = new BlockPetalBlock(DyeColor.MAGENTA, Block.Properties.from(petalBlockWhite));
@@ -263,7 +264,7 @@ public final class ModBlocks {
public static Block blackMushroom = new BlockModMushroom(DyeColor.BLACK, Block.Properties.from(whiteMushroom));
public static Block pump = new BlockPump(Block.Properties.from(livingrock));
public static Block doubleFlowerWhite = new BlockModDoubleFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower));
public static Block doubleFlowerOrange = new BlockModDoubleFlower(DyeColor.ORANGE, Block.Properties.from(doubleFlowerWhite));
public static Block doubleFlowerMagenta = new BlockModDoubleFlower(DyeColor.MAGENTA, Block.Properties.from(doubleFlowerWhite));
@@ -335,7 +336,7 @@ public final class ModBlocks {
register(r, "green" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, greenFlower);
register(r, "red" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, redFlower);
register(r, "black" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, blackFlower);
register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.DEFAULT.name().toLowerCase(Locale.ROOT), defaultAltar);
register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.FOREST.name().toLowerCase(Locale.ROOT), forestAltar);
register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.PLAINS.name().toLowerCase(Locale.ROOT), plainsAltar);
@@ -372,7 +373,7 @@ public final class ModBlocks {
register(r, LibBlockNames.POOL_FABULOUS, fabulousPool);
register(r, LibBlockNames.RUNE_ALTAR, runeAltar);
register(r, LibBlockNames.PYLON, manaPylon);
register(r, LibBlockNames.PYLON_NATURA, naturaPylon);
register(r, LibBlockNames.PYLON_GAIA, gaiaPylon);
@@ -394,7 +395,7 @@ public final class ModBlocks {
register(r, LibBlockNames.CRAFT_CRATE, craftCrate);
register(r, LibBlockNames.FOREST_EYE, forestEye);
register(r, LibBlockNames.MANASTEEL_BLOCK, manasteelBlock);
register(r, LibBlockNames.TERRASTEEL_BLOCK, terrasteelBlock);
register(r, LibBlockNames.ELEMENTIUM_BLOCK, elementiumBlock);
@@ -404,7 +405,7 @@ public final class ModBlocks {
register(r, LibBlockNames.DRUM_WILD, wildDrum);
register(r, LibBlockNames.DRUM_GATHERING, gatheringDrum);
register(r, LibBlockNames.DRUM_CANOPY, canopyDrum);
register(r, "white" + LibBlockNames.SHINY_FLOWER_SUFFIX, whiteShinyFlower);
register(r, "orange" + LibBlockNames.SHINY_FLOWER_SUFFIX, orangeShinyFlower);
register(r, "magenta" + LibBlockNames.SHINY_FLOWER_SUFFIX, magentaShinyFlower);
@@ -438,7 +439,7 @@ public final class ModBlocks {
register(r, LibBlockNames.CONJURATION_CATALYST, conjurationCatalyst);
register(r, LibBlockNames.BIFROST, bifrost);
register(r, LibBlockNames.SOLID_VINE, solidVines);
register(r, "white" + LibBlockNames.BURIED_PETALS_SUFFIX, whiteBuriedPetals);
register(r, "orange" + LibBlockNames.BURIED_PETALS_SUFFIX, orangeBuriedPetals);
register(r, "magenta" + LibBlockNames.BURIED_PETALS_SUFFIX, magentaBuriedPetals);
@@ -455,7 +456,7 @@ public final class ModBlocks {
register(r, "green" + LibBlockNames.BURIED_PETALS_SUFFIX, greenBuriedPetals);
register(r, "red" + LibBlockNames.BURIED_PETALS_SUFFIX, redBuriedPetals);
register(r, "black" + LibBlockNames.BURIED_PETALS_SUFFIX, blackBuriedPetals);
register(r, "white" + LibBlockNames.FLOATING_FLOWER_SUFFIX, whiteFloatingFlower);
register(r, "orange" + LibBlockNames.FLOATING_FLOWER_SUFFIX, orangeFloatingFlower);
register(r, "magenta" + LibBlockNames.FLOATING_FLOWER_SUFFIX, magentaFloatingFlower);
@@ -475,7 +476,7 @@ public final class ModBlocks {
register(r, LibBlockNames.TINY_POTATO, tinyPotato);
register(r, LibBlockNames.SPAWNER_CLAW, spawnerClaw);
register(r, LibBlockNames.AZULEJO_PREFIX + 0, azulejo0);
register(r, LibBlockNames.AZULEJO_PREFIX + 1, azulejo1);
register(r, LibBlockNames.AZULEJO_PREFIX + 2, azulejo2);
@@ -510,7 +511,7 @@ public final class ModBlocks {
register(r, LibBlockNames.MANA_FLAME, manaFlame);
register(r, LibBlockNames.PRISM, prism);
register(r, LibBlockNames.ENCHANTED_SOIL, enchantedSoil);
register(r, "white" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockWhite);
register(r, "orange" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockOrange);
register(r, "magenta" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockMagenta);
@@ -530,7 +531,7 @@ public final class ModBlocks {
register(r, LibBlockNames.CORPOREA_INDEX, corporeaIndex);
register(r, LibBlockNames.CORPOREA_FUNNEL, corporeaFunnel);
register(r, "white" + LibBlockNames.MUSHROOM_SUFFIX, whiteMushroom);
register(r, "orange" + LibBlockNames.MUSHROOM_SUFFIX, orangeMushroom);
register(r, "magenta" + LibBlockNames.MUSHROOM_SUFFIX, magentaMushroom);
@@ -549,7 +550,7 @@ public final class ModBlocks {
register(r, "black" + LibBlockNames.MUSHROOM_SUFFIX, blackMushroom);
register(r, LibBlockNames.PUMP, pump);
register(r, "white" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerWhite);
register(r, "orange" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerOrange);
register(r, "magenta" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerMagenta);
@@ -15,6 +15,7 @@ import net.minecraft.item.Item;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.common.block.decor.panes.BlockModPane;
import vazkii.botania.common.block.decor.stairs.BlockModStairs;
import vazkii.botania.common.item.ModItems;
@@ -49,67 +50,67 @@ public final class ModFluffBlocks {
public static Block darkQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block darkQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block darkQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block manaQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block manaQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block manaQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block manaQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block manaQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block blazeQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block blazeQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block blazeQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block blazeQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block blazeQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block lavenderQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block lavenderQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block lavenderQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block lavenderQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block lavenderQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block redQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block redQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block redQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block redQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block redQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block elfQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block elfQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block elfQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block elfQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block elfQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block sunnyQuartz = new BlockMod(Block.Properties.from(darkQuartz));
public static Block sunnyQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
public static Block sunnyQuartzPillar = new RotatedPillarBlock(Block.Properties.from(darkQuartz));
public static Block sunnyQuartzSlab = new SlabBlock(Block.Properties.from(darkQuartz));
public static Block sunnyQuartzStairs = new BlockModStairs(darkQuartz.getDefaultState(), Block.Properties.from(darkQuartz));
public static Block whitePavement = new BlockMod(Block.Properties.from(livingrock));
public static Block whitePavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block whitePavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block blackPavement = new BlockMod(Block.Properties.from(whitePavement));
public static Block blackPavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block blackPavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block bluePavement = new BlockMod(Block.Properties.from(whitePavement));
public static Block bluePavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block bluePavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block yellowPavement = new BlockMod(Block.Properties.from(whitePavement));
public static Block yellowPavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block yellowPavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block redPavement = new BlockMod(Block.Properties.from(whitePavement));
public static Block redPavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block redPavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block greenPavement = new BlockMod(Block.Properties.from(whitePavement));
public static Block greenPavementStair = new BlockModStairs(whitePavement.getDefaultState(), Block.Properties.from(whitePavement));
public static Block greenPavementSlab = new SlabBlock(Block.Properties.from(whitePavement));
public static Block biomeStoneForest = new BlockMod(Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 10).sound(SoundType.STONE));
public static Block biomeStoneForestSlab = new SlabBlock(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneForestStairs = new BlockModStairs(biomeStoneForest.getDefaultState(), Block.Properties.from(biomeStoneForest));
@@ -121,7 +122,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickForestSlab = new SlabBlock(Block.Properties.from(biomeStoneForest));
public static Block biomeBrickForestStairs = new BlockModStairs(biomeStoneForest.getDefaultState(), Block.Properties.from(biomeStoneForest));
public static Block biomeChiseledBrickForest = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStonePlains = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStonePlainsSlab = new SlabBlock(Block.Properties.from(biomeStonePlains));
public static Block biomeStonePlainsStairs = new BlockModStairs(biomeStonePlains.getDefaultState(), Block.Properties.from(biomeStonePlains));
@@ -133,7 +134,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickPlainsSlab = new SlabBlock(Block.Properties.from(biomeStonePlains));
public static Block biomeBrickPlainsStairs = new BlockModStairs(biomeStonePlains.getDefaultState(), Block.Properties.from(biomeStonePlains));
public static Block biomeChiseledBrickPlains = new BlockMod(Block.Properties.from(biomeStonePlains));
public static Block biomeStoneMountain = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneMountainSlab = new SlabBlock(Block.Properties.from(biomeStoneMountain));
public static Block biomeStoneMountainStairs = new BlockModStairs(biomeStoneMountain.getDefaultState(), Block.Properties.from(biomeStoneMountain));
@@ -145,7 +146,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickMountainSlab = new SlabBlock(Block.Properties.from(biomeStoneMountain));
public static Block biomeBrickMountainStairs = new BlockModStairs(biomeStoneMountain.getDefaultState(), Block.Properties.from(biomeStoneMountain));
public static Block biomeChiseledBrickMountain = new BlockMod(Block.Properties.from(biomeStoneMountain));
public static Block biomeStoneFungal = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneFungalSlab = new SlabBlock(Block.Properties.from(biomeStoneFungal));
public static Block biomeStoneFungalStairs = new BlockModStairs(biomeStoneFungal.getDefaultState(), Block.Properties.from(biomeStoneFungal));
@@ -157,7 +158,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickFungalSlab = new SlabBlock(Block.Properties.from(biomeStoneFungal));
public static Block biomeBrickFungalStairs = new BlockModStairs(biomeStoneFungal.getDefaultState(), Block.Properties.from(biomeStoneFungal));
public static Block biomeChiseledBrickFungal = new BlockMod(Block.Properties.from(biomeStoneFungal));
public static Block biomeStoneSwamp = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneSwampSlab = new SlabBlock(Block.Properties.from(biomeStoneSwamp));
public static Block biomeStoneSwampStairs = new BlockModStairs(biomeStoneSwamp.getDefaultState(), Block.Properties.from(biomeStoneSwamp));
@@ -169,7 +170,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickSwampSlab = new SlabBlock(Block.Properties.from(biomeStoneSwamp));
public static Block biomeBrickSwampStairs = new BlockModStairs(biomeStoneSwamp.getDefaultState(), Block.Properties.from(biomeStoneSwamp));
public static Block biomeChiseledBrickSwamp = new BlockMod(Block.Properties.from(biomeStoneSwamp));
public static Block biomeStoneDesert = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneDesertSlab = new SlabBlock(Block.Properties.from(biomeStoneDesert));
public static Block biomeStoneDesertStairs = new BlockModStairs(biomeStoneDesert.getDefaultState(), Block.Properties.from(biomeStoneDesert));
@@ -181,7 +182,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickDesertSlab = new SlabBlock(Block.Properties.from(biomeStoneDesert));
public static Block biomeBrickDesertStairs = new BlockModStairs(biomeStoneDesert.getDefaultState(), Block.Properties.from(biomeStoneDesert));
public static Block biomeChiseledBrickDesert = new BlockMod(Block.Properties.from(biomeStoneDesert));
public static Block biomeStoneTaiga = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneTaigaSlab = new SlabBlock(Block.Properties.from(biomeStoneTaiga));
public static Block biomeStoneTaigaStairs = new BlockModStairs(biomeStoneTaiga.getDefaultState(), Block.Properties.from(biomeStoneTaiga));
@@ -193,7 +194,7 @@ public final class ModFluffBlocks {
public static Block biomeBrickTaigaSlab = new SlabBlock(Block.Properties.from(biomeStoneTaiga));
public static Block biomeBrickTaigaStairs = new BlockModStairs(biomeStoneTaiga.getDefaultState(), Block.Properties.from(biomeStoneTaiga));
public static Block biomeChiseledBrickTaiga = new BlockMod(Block.Properties.from(biomeStoneTaiga));
public static Block biomeStoneMesa = new BlockMod(Block.Properties.from(biomeStoneForest));
public static Block biomeStoneMesaSlab = new SlabBlock(Block.Properties.from(biomeStoneMesa));
public static Block biomeStoneMesaStairs = new BlockModStairs(biomeStoneMesa.getDefaultState(), Block.Properties.from(biomeStoneMesa));
@@ -208,7 +209,7 @@ public final class ModFluffBlocks {
public static Block shimmerrockSlab = new SlabBlock(Block.Properties.from(shimmerrock));
public static Block shimmerrockStairs = new BlockModStairs(shimmerrock.getDefaultState(), Block.Properties.from(shimmerrock));
public static Block shimmerwoodPlankSlab = new SlabBlock(Block.Properties.from(shimmerwoodPlanks));
public static Block shimmerwoodPlankStairs = new BlockModStairs(shimmerwoodPlanks.getDefaultState(), Block.Properties.from(shimmerwoodPlanks));
@@ -243,73 +244,73 @@ public final class ModFluffBlocks {
register(r, LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX, dreamwoodPlankStairs);
register(r, LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX, dreamwoodPlankSlab);
register(r, QUARTZ_DARK, darkQuartz);
register(r, "chiseled_" + QUARTZ_DARK, darkQuartzChiseled);
register(r, QUARTZ_DARK + "_pillar", darkQuartzPillar);
register(r, QUARTZ_DARK + SLAB_SUFFIX, darkQuartzSlab);
register(r, QUARTZ_DARK + STAIR_SUFFIX, darkQuartzStairs);
register(r, QUARTZ_MANA, manaQuartz);
register(r, "chiseled_" + QUARTZ_MANA, manaQuartzChiseled);
register(r, QUARTZ_MANA + "_pillar", manaQuartzPillar);
register(r, QUARTZ_MANA + SLAB_SUFFIX, manaQuartzSlab);
register(r, QUARTZ_MANA + STAIR_SUFFIX, manaQuartzStairs);
register(r, QUARTZ_BLAZE, blazeQuartz);
register(r, "chiseled_" + QUARTZ_BLAZE, blazeQuartzChiseled);
register(r, QUARTZ_BLAZE + "_pillar", blazeQuartzPillar);
register(r, QUARTZ_BLAZE + SLAB_SUFFIX, blazeQuartzSlab);
register(r, QUARTZ_BLAZE + STAIR_SUFFIX, blazeQuartzStairs);
register(r, QUARTZ_LAVENDER, lavenderQuartz);
register(r, "chiseled_" + QUARTZ_LAVENDER, lavenderQuartzChiseled);
register(r, QUARTZ_LAVENDER + "_pillar", lavenderQuartzPillar);
register(r, QUARTZ_LAVENDER + SLAB_SUFFIX, lavenderQuartzSlab);
register(r, QUARTZ_LAVENDER + STAIR_SUFFIX, lavenderQuartzStairs);
register(r, QUARTZ_RED, redQuartz);
register(r, "chiseled_" + QUARTZ_RED, redQuartzChiseled);
register(r, QUARTZ_RED + "_pillar", redQuartzPillar);
register(r, QUARTZ_RED + SLAB_SUFFIX, redQuartzSlab);
register(r, QUARTZ_RED + STAIR_SUFFIX, redQuartzStairs);
register(r, QUARTZ_ELF, elfQuartz);
register(r, "chiseled_" + QUARTZ_ELF, elfQuartzChiseled);
register(r, QUARTZ_ELF + "_pillar", elfQuartzPillar);
register(r, QUARTZ_ELF + SLAB_SUFFIX, elfQuartzSlab);
register(r, QUARTZ_ELF + STAIR_SUFFIX, elfQuartzStairs);
register(r, QUARTZ_SUNNY, sunnyQuartz);
register(r, "chiseled_" + QUARTZ_SUNNY, sunnyQuartzChiseled);
register(r, QUARTZ_SUNNY + "_pillar", sunnyQuartzPillar);
register(r, QUARTZ_SUNNY + SLAB_SUFFIX, sunnyQuartzSlab);
register(r, QUARTZ_SUNNY + STAIR_SUFFIX, sunnyQuartzStairs);
register(r, "white" + PAVEMENT_SUFFIX, whitePavement);
register(r, "white" + PAVEMENT_SUFFIX + STAIR_SUFFIX, whitePavementStair);
register(r, "white" + PAVEMENT_SUFFIX + SLAB_SUFFIX, whitePavementSlab);
register(r, "black" + PAVEMENT_SUFFIX, blackPavement);
register(r, "black" + PAVEMENT_SUFFIX + STAIR_SUFFIX, blackPavementStair);
register(r, "black" + PAVEMENT_SUFFIX + SLAB_SUFFIX, blackPavementSlab);
register(r, "blue" + PAVEMENT_SUFFIX, bluePavement);
register(r, "blue" + PAVEMENT_SUFFIX + STAIR_SUFFIX, bluePavementStair);
register(r, "blue" + PAVEMENT_SUFFIX + SLAB_SUFFIX, bluePavementSlab);
register(r, "yellow" + PAVEMENT_SUFFIX, yellowPavement);
register(r, "yellow" + PAVEMENT_SUFFIX + STAIR_SUFFIX, yellowPavementStair);
register(r, "yellow" + PAVEMENT_SUFFIX + SLAB_SUFFIX, yellowPavementSlab);
register(r, "red" + PAVEMENT_SUFFIX, redPavement);
register(r, "red" + PAVEMENT_SUFFIX + STAIR_SUFFIX, redPavementStair);
register(r, "red" + PAVEMENT_SUFFIX + SLAB_SUFFIX, redPavementSlab);
register(r, "green" + PAVEMENT_SUFFIX, greenPavement);
register(r, "green" + PAVEMENT_SUFFIX + STAIR_SUFFIX, greenPavementStair);
register(r, "green" + PAVEMENT_SUFFIX + SLAB_SUFFIX, greenPavementSlab);
register(r, METAMORPHIC_PREFIX + "forest_stone", biomeStoneForest);
register(r, METAMORPHIC_PREFIX + "forest_stone" + SLAB_SUFFIX, biomeStoneForestSlab);
register(r, METAMORPHIC_PREFIX + "forest_stone" + STAIR_SUFFIX, biomeStoneForestStairs);
@@ -321,7 +322,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "forest_bricks" + SLAB_SUFFIX, biomeBrickForestSlab);
register(r, METAMORPHIC_PREFIX + "forest_bricks" + STAIR_SUFFIX, biomeBrickForestStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "forest_bricks", biomeChiseledBrickForest);
register(r, METAMORPHIC_PREFIX + "plains_stone", biomeStonePlains);
register(r, METAMORPHIC_PREFIX + "plains_stone" + SLAB_SUFFIX, biomeStonePlainsSlab);
register(r, METAMORPHIC_PREFIX + "plains_stone" + STAIR_SUFFIX, biomeStonePlainsStairs);
@@ -333,7 +334,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "plains_bricks" + SLAB_SUFFIX, biomeBrickPlainsSlab);
register(r, METAMORPHIC_PREFIX + "plains_bricks" + STAIR_SUFFIX, biomeBrickPlainsStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "plains_bricks", biomeChiseledBrickPlains);
register(r, METAMORPHIC_PREFIX + "mountain_stone", biomeStoneMountain);
register(r, METAMORPHIC_PREFIX + "mountain_stone" + SLAB_SUFFIX, biomeStoneMountainSlab);
register(r, METAMORPHIC_PREFIX + "mountain_stone" + STAIR_SUFFIX, biomeStoneMountainStairs);
@@ -345,7 +346,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "mountain_bricks" + SLAB_SUFFIX, biomeBrickMountainSlab);
register(r, METAMORPHIC_PREFIX + "mountain_bricks" + STAIR_SUFFIX, biomeBrickMountainStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "mountain_bricks", biomeChiseledBrickMountain);
register(r, METAMORPHIC_PREFIX + "fungal_stone", biomeStoneFungal);
register(r, METAMORPHIC_PREFIX + "fungal_stone" + SLAB_SUFFIX, biomeStoneFungalSlab);
register(r, METAMORPHIC_PREFIX + "fungal_stone" + STAIR_SUFFIX, biomeStoneFungalStairs);
@@ -357,7 +358,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "fungal_bricks" + SLAB_SUFFIX, biomeBrickFungalSlab);
register(r, METAMORPHIC_PREFIX + "fungal_bricks" + STAIR_SUFFIX, biomeBrickFungalStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "fungal_bricks", biomeChiseledBrickFungal);
register(r, METAMORPHIC_PREFIX + "swamp_stone", biomeStoneSwamp);
register(r, METAMORPHIC_PREFIX + "swamp_stone" + SLAB_SUFFIX, biomeStoneSwampSlab);
register(r, METAMORPHIC_PREFIX + "swamp_stone" + STAIR_SUFFIX, biomeStoneSwampStairs);
@@ -369,7 +370,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "swamp_bricks" + SLAB_SUFFIX, biomeBrickSwampSlab);
register(r, METAMORPHIC_PREFIX + "swamp_bricks" + STAIR_SUFFIX, biomeBrickSwampStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "swamp_bricks", biomeChiseledBrickSwamp);
register(r, METAMORPHIC_PREFIX + "desert_stone", biomeStoneDesert);
register(r, METAMORPHIC_PREFIX + "desert_stone" + SLAB_SUFFIX, biomeStoneDesertSlab);
register(r, METAMORPHIC_PREFIX + "desert_stone" + STAIR_SUFFIX, biomeStoneDesertStairs);
@@ -381,7 +382,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "desert_bricks" + SLAB_SUFFIX, biomeBrickDesertSlab);
register(r, METAMORPHIC_PREFIX + "desert_bricks" + STAIR_SUFFIX, biomeBrickDesertStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "desert_bricks", biomeChiseledBrickDesert);
register(r, METAMORPHIC_PREFIX + "taiga_stone", biomeStoneTaiga);
register(r, METAMORPHIC_PREFIX + "taiga_stone" + SLAB_SUFFIX, biomeStoneTaigaSlab);
register(r, METAMORPHIC_PREFIX + "taiga_stone" + STAIR_SUFFIX, biomeStoneTaigaStairs);
@@ -393,7 +394,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "taiga_bricks" + SLAB_SUFFIX, biomeBrickTaigaSlab);
register(r, METAMORPHIC_PREFIX + "taiga_bricks" + STAIR_SUFFIX, biomeBrickTaigaStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "taiga_bricks", biomeChiseledBrickTaiga);
register(r, METAMORPHIC_PREFIX + "mesa_stone", biomeStoneMesa);
register(r, METAMORPHIC_PREFIX + "mesa_stone" + SLAB_SUFFIX, biomeStoneMesaSlab);
register(r, METAMORPHIC_PREFIX + "mesa_stone" + STAIR_SUFFIX, biomeStoneMesaStairs);
@@ -405,7 +406,7 @@ public final class ModFluffBlocks {
register(r, METAMORPHIC_PREFIX + "mesa_bricks" + SLAB_SUFFIX, biomeBrickMesaSlab);
register(r, METAMORPHIC_PREFIX + "mesa_bricks" + STAIR_SUFFIX, biomeBrickMesaStairs);
register(r, "chiseled_" + METAMORPHIC_PREFIX + "mesa_bricks", biomeChiseledBrickMesa);
register(r, LibBlockNames.SHIMMERROCK + SLAB_SUFFIX, shimmerrockSlab);
register(r, LibBlockNames.SHIMMERROCK + STAIR_SUFFIX, shimmerrockStairs);
@@ -40,49 +40,49 @@ import static vazkii.botania.common.block.ModBlocks.register;
public class ModSubtiles {
public static final Block pureDaisy = new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY), SubTilePureDaisy::new);
public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15), SubTilePureDaisy::new);
public static final Block manastar = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileManastar::new);
public static final Block manastarFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileManastar::new);
public static final Block hydroangeas = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHydroangeas::new);
public static final Block hydroangeasFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHydroangeas::new);
public static final Block endoflame = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileEndoflame::new);
public static final Block endoflameFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileEndoflame::new);
public static final Block thermalily = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileThermalily::new);
public static final Block thermalilyFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileThermalily::new);
public static final Block rosaArcana = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileArcaneRose::new);
public static final Block rosaArcanaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileArcaneRose::new);
public static final Block munchdew = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileMunchdew::new);
public static final Block munchdewFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMunchdew::new);
public static final Block entropinnyum = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileEntropinnyum::new);
public static final Block entropinnyumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileEntropinnyum::new);
public static final Block kekimurus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileKekimurus::new);
public static final Block kekimurusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileKekimurus::new);
public static final Block gourmaryllis = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileGourmaryllis::new);
public static final Block gourmaryllisFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileGourmaryllis::new);
public static final Block narslimmus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileNarslimmus::new);
public static final Block narslimmusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileNarslimmus::new);
public static final Block spectrolus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileSpectrolus::new);
public static final Block spectrolusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileSpectrolus::new);
public static final Block dandelifeon = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileDandelifeon::new);
public static final Block dandelifeonFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDandelifeon::new);
public static final Block rafflowsia = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileRafflowsia::new);
public static final Block rafflowsiaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileRafflowsia::new);
public static final Block shulkMeNot = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileShulkMeNot::new);
public static final Block shulkMeNotFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileShulkMeNot::new);
public static final Block bellethorn = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn::new);
public static final Block bellethornChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn.Mini::new);
public static final Block bellethornFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn::new);
@@ -90,93 +90,93 @@ public class ModSubtiles {
public static final Block bergamute = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileBergamute::new);
public static final Block bergamuteFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileBergamute::new);
public static final Block dreadthorn = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileDreadthorn::new);
public static final Block dreadthornFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDreadthorn::new);
public static final Block heiseiDream = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHeiseiDream::new);
public static final Block heiseiDreamFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHeiseiDream::new);
public static final Block tigerseye = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileTigerseye::new);
public static final Block tigerseyeFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileTigerseye::new);
public static final Block jadedAmaranthus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileJadedAmaranthus::new);
public static final Block jadedAmaranthusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileJadedAmaranthus::new);
public static final Block orechid = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileOrechid::new);
public static final Block orechidFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileOrechid::new);
public static final Block fallenKanade = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileFallenKanade::new);
public static final Block fallenKanadeFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileFallenKanade::new);
public static final Block exoflame = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileExoflame::new);
public static final Block exoflameFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileExoflame::new);
public static final Block agricarnation = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation::new);
public static final Block agricarnationChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation.Mini::new);
public static final Block agricarnationFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation::new);
public static final Block agricarnationChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation.Mini::new);
public static final Block hopperhock = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new);
public static final Block hopperhockChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new);
public static final Block hopperhockFloating = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new);
public static final Block hopperhockChibiFloating = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new);
public static final Block tangleberrie = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileTangleberrie::new);
public static final Block tangleberrieFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileTangleberrie::new);
public static final Block jiyuulia = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileJiyuulia::new);
public static final Block jiyuuliaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileJiyuulia::new);
public static final Block rannuncarpus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus::new);
public static final Block rannuncarpusChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus.Mini::new);
public static final Block rannuncarpusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus::new);
public static final Block rannuncarpusChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus.Mini::new);
public static final Block hyacidus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHyacidus::new);
public static final Block hyacidusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHyacidus::new);
public static final Block pollidisiac = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTilePollidisiac::new);
public static final Block pollidisiacFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTilePollidisiac::new);
public static final Block clayconia = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia::new);
public static final Block clayconiaChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia.Mini::new);
public static final Block clayconiaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia::new);
public static final Block clayconiaChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia.Mini::new);
public static final Block loonium = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileLoonuim::new);
public static final Block looniumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileLoonuim::new);
public static final Block daffomill = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileDaffomill::new);
public static final Block daffomillFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDaffomill::new);
public static final Block vinculotus = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileVinculotus::new);
public static final Block vinculotusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileVinculotus::new);
public static final Block spectranthemum = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileSpectranthemum::new);
public static final Block spectranthemumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileSpectranthemum::new);
public static final Block medumone = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileMedumone::new);
public static final Block medumoneFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMedumone::new);
public static final Block marimorphosis = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileMarimorphosis::new);
public static final Block marimorphosisChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMarimorphosis.Mini::new);
public static final Block marimorphosisFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileMarimorphosis::new);
public static final Block marimorphosisChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMarimorphosis.Mini::new);
public static final Block bubbell = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell::new);
public static final Block bubbellChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell.Mini::new);
public static final Block bubbellFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell::new);
public static final Block bubbellChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell.Mini::new);
public static final Block solegnolia = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia::new);
public static final Block solegnoliaChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia.Mini::new);
public static final Block solegnoliaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia::new);
public static final Block solegnoliaChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia.Mini::new);
public static final Block orechidIgnem = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileOrechidIgnem::new);
public static final Block orechidIgnemFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileOrechidIgnem::new);
public static final TileEntityType<SubTilePureDaisy> PURE_DAISY = TileEntityType.Builder.create(SubTilePureDaisy::new, pureDaisy, pureDaisyFloating).build(null);
public static final TileEntityType<SubTileManastar> MANASTAR = TileEntityType.Builder.create(SubTileManastar::new, manastar, manastarFloating).build(null);
public static final TileEntityType<SubTileHydroangeas> HYDROANGEAS = TileEntityType.Builder.create(SubTileHydroangeas::new, hydroangeas, hydroangeasFloating).build(null);
@@ -226,7 +226,7 @@ public class ModSubtiles {
public static final TileEntityType<SubTileSolegnolia> SOLEGNOLIA = TileEntityType.Builder.create(SubTileSolegnolia::new, solegnolia, solegnoliaFloating).build(null);
public static final TileEntityType<SubTileSolegnolia.Mini> SOLEGNOLIA_CHIBI = TileEntityType.Builder.create(SubTileSolegnolia.Mini::new, solegnoliaChibi, solegnoliaChibiFloating).build(null);
public static final TileEntityType<SubTileOrechidIgnem> ORECHID_IGNEM = TileEntityType.Builder.create(SubTileOrechidIgnem::new, orechidIgnem, orechidIgnemFloating).build(null);
private static ResourceLocation floating(ResourceLocation orig) {
return new ResourceLocation(orig.getNamespace(), "floating_" + orig.getPath());
}
@@ -293,140 +293,140 @@ public class ModSubtiles {
IForgeRegistry<Block> r = evt.getRegistry();
register(r, LibBlockNames.SUBTILE_PUREDAISY, pureDaisy);
register(r, floating(LibBlockNames.SUBTILE_PUREDAISY), pureDaisyFloating);
register(r, LibBlockNames.SUBTILE_MANASTAR, manastar);
register(r, floating(LibBlockNames.SUBTILE_MANASTAR), manastarFloating);
register(r, LibBlockNames.SUBTILE_HYDROANGEAS, hydroangeas);
register(r, floating(LibBlockNames.SUBTILE_HYDROANGEAS), hydroangeasFloating);
register(r, LibBlockNames.SUBTILE_ENDOFLAME, endoflame);
register(r, floating(LibBlockNames.SUBTILE_ENDOFLAME), endoflameFloating);
register(r, LibBlockNames.SUBTILE_THERMALILY, thermalily);
register(r, floating(LibBlockNames.SUBTILE_THERMALILY), thermalilyFloating);
register(r, LibBlockNames.SUBTILE_ARCANE_ROSE, rosaArcana);
register(r, floating(LibBlockNames.SUBTILE_ARCANE_ROSE), rosaArcanaFloating);
register(r, LibBlockNames.SUBTILE_MUNCHDEW, munchdew);
register(r, floating(LibBlockNames.SUBTILE_MUNCHDEW), munchdewFloating);
register(r, LibBlockNames.SUBTILE_ENTROPINNYUM, entropinnyum);
register(r, floating(LibBlockNames.SUBTILE_ENTROPINNYUM), entropinnyumFloating);
register(r, LibBlockNames.SUBTILE_KEKIMURUS, kekimurus);
register(r, floating(LibBlockNames.SUBTILE_KEKIMURUS), kekimurusFloating);
register(r, LibBlockNames.SUBTILE_GOURMARYLLIS, gourmaryllis);
register(r, floating(LibBlockNames.SUBTILE_GOURMARYLLIS), gourmaryllisFloating);
register(r, LibBlockNames.SUBTILE_NARSLIMMUS, narslimmus);
register(r, floating(LibBlockNames.SUBTILE_NARSLIMMUS), narslimmusFloating);
register(r, LibBlockNames.SUBTILE_SPECTROLUS, spectrolus);
register(r, floating(LibBlockNames.SUBTILE_SPECTROLUS), spectrolusFloating);
register(r, LibBlockNames.SUBTILE_DANDELIFEON, dandelifeon);
register(r, floating(LibBlockNames.SUBTILE_DANDELIFEON), dandelifeonFloating);
register(r, LibBlockNames.SUBTILE_RAFFLOWSIA, rafflowsia);
register(r, floating(LibBlockNames.SUBTILE_RAFFLOWSIA), rafflowsiaFloating);
register(r, LibBlockNames.SUBTILE_SHULK_ME_NOT, shulkMeNot);
register(r, floating(LibBlockNames.SUBTILE_SHULK_ME_NOT), shulkMeNotFloating);
register(r, LibBlockNames.SUBTILE_BELLETHORN, bellethorn);
register(r, chibi(LibBlockNames.SUBTILE_BELLETHORN), bellethornChibi);
register(r, floating(LibBlockNames.SUBTILE_BELLETHORN), bellethornFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_BELLETHORN)), bellethornChibiFloating);
register(r, LibBlockNames.SUBTILE_BERGAMUTE, bergamute);
register(r, floating(LibBlockNames.SUBTILE_BERGAMUTE), bergamuteFloating);
register(r, LibBlockNames.SUBTILE_DREADTHORN, dreadthorn);
register(r, floating(LibBlockNames.SUBTILE_DREADTHORN), dreadthornFloating);
register(r, LibBlockNames.SUBTILE_HEISEI_DREAM, heiseiDream);
register(r, floating(LibBlockNames.SUBTILE_HEISEI_DREAM), heiseiDreamFloating);
register(r, LibBlockNames.SUBTILE_TIGERSEYE, tigerseye);
register(r, floating(LibBlockNames.SUBTILE_TIGERSEYE), tigerseyeFloating);
register(r, LibBlockNames.SUBTILE_JADED_AMARANTHUS, jadedAmaranthus);
register(r, floating(LibBlockNames.SUBTILE_JADED_AMARANTHUS), jadedAmaranthusFloating);
register(r, LibBlockNames.SUBTILE_ORECHID, orechid);
register(r, floating(LibBlockNames.SUBTILE_ORECHID), orechidFloating);
register(r, LibBlockNames.SUBTILE_FALLEN_KANADE, fallenKanade);
register(r, floating(LibBlockNames.SUBTILE_FALLEN_KANADE), fallenKanadeFloating);
register(r, LibBlockNames.SUBTILE_EXOFLAME, exoflame);
register(r, floating(LibBlockNames.SUBTILE_EXOFLAME), exoflameFloating);
register(r, LibBlockNames.SUBTILE_AGRICARNATION, agricarnation);
register(r, chibi(LibBlockNames.SUBTILE_AGRICARNATION), agricarnationChibi);
register(r, floating(LibBlockNames.SUBTILE_AGRICARNATION), agricarnationFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_AGRICARNATION)), agricarnationChibiFloating);
register(r, LibBlockNames.SUBTILE_HOPPERHOCK, hopperhock);
register(r, chibi(LibBlockNames.SUBTILE_HOPPERHOCK), hopperhockChibi);
register(r, floating(LibBlockNames.SUBTILE_HOPPERHOCK), hopperhockFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_HOPPERHOCK)), hopperhockChibiFloating);
register(r, LibBlockNames.SUBTILE_TANGLEBERRIE, tangleberrie);
register(r, floating(LibBlockNames.SUBTILE_TANGLEBERRIE), tangleberrieFloating);
register(r, LibBlockNames.SUBTILE_JIYUULIA, jiyuulia);
register(r, floating(LibBlockNames.SUBTILE_JIYUULIA), jiyuuliaFloating);
register(r, LibBlockNames.SUBTILE_RANNUNCARPUS, rannuncarpus);
register(r, chibi(LibBlockNames.SUBTILE_RANNUNCARPUS), rannuncarpusChibi);
register(r, floating(LibBlockNames.SUBTILE_RANNUNCARPUS), rannuncarpusFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_RANNUNCARPUS)), rannuncarpusChibiFloating);
register(r, LibBlockNames.SUBTILE_HYACIDUS, hyacidus);
register(r, floating(LibBlockNames.SUBTILE_HYACIDUS), hyacidusFloating);
register(r, LibBlockNames.SUBTILE_POLLIDISIAC, pollidisiac);
register(r, floating(LibBlockNames.SUBTILE_POLLIDISIAC), pollidisiacFloating);
register(r, LibBlockNames.SUBTILE_CLAYCONIA, clayconia);
register(r, chibi(LibBlockNames.SUBTILE_CLAYCONIA), clayconiaChibi);
register(r, floating(LibBlockNames.SUBTILE_CLAYCONIA), clayconiaFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_CLAYCONIA)), clayconiaChibiFloating);
register(r, LibBlockNames.SUBTILE_LOONIUM, loonium);
register(r, floating(LibBlockNames.SUBTILE_LOONIUM), looniumFloating);
register(r, LibBlockNames.SUBTILE_DAFFOMILL, daffomill);
register(r, floating(LibBlockNames.SUBTILE_DAFFOMILL), daffomillFloating);
register(r, LibBlockNames.SUBTILE_VINCULOTUS, vinculotus);
register(r, floating(LibBlockNames.SUBTILE_VINCULOTUS), vinculotusFloating);
register(r, LibBlockNames.SUBTILE_SPECTRANTHEMUM, spectranthemum);
register(r, floating(LibBlockNames.SUBTILE_SPECTRANTHEMUM), spectranthemumFloating);
register(r, LibBlockNames.SUBTILE_MEDUMONE, medumone);
register(r, floating(LibBlockNames.SUBTILE_MEDUMONE), medumoneFloating);
register(r, LibBlockNames.SUBTILE_MARIMORPHOSIS, marimorphosis);
register(r, chibi(LibBlockNames.SUBTILE_MARIMORPHOSIS), marimorphosisChibi);
register(r, floating(LibBlockNames.SUBTILE_MARIMORPHOSIS), marimorphosisFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_MARIMORPHOSIS)), marimorphosisChibiFloating);
register(r, LibBlockNames.SUBTILE_BUBBELL, bubbell);
register(r, chibi(LibBlockNames.SUBTILE_BUBBELL), bubbellChibi);
register(r, floating(LibBlockNames.SUBTILE_BUBBELL), bubbellFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_BUBBELL)), bubbellChibiFloating);
register(r, LibBlockNames.SUBTILE_SOLEGNOLIA, solegnolia);
register(r, chibi(LibBlockNames.SUBTILE_SOLEGNOLIA), solegnoliaChibi);
register(r, floating(LibBlockNames.SUBTILE_SOLEGNOLIA), solegnoliaFloating);
register(r, chibi(floating(LibBlockNames.SUBTILE_SOLEGNOLIA)), solegnoliaChibiFloating);
register(r, LibBlockNames.SUBTILE_ORECHID_IGNEM, orechidIgnem);
register(r, floating(LibBlockNames.SUBTILE_ORECHID_IGNEM), orechidIgnemFloating);
}
@@ -13,6 +13,7 @@ import net.minecraft.item.DyeColor;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.corporea.*;
import vazkii.botania.common.block.tile.mana.*;
@@ -25,6 +25,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.recipe.ElvenPortalUpdateEvent;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.api.recipe.IElvenTradeRecipe;
@@ -43,6 +44,7 @@ import vazkii.patchouli.api.PatchouliAPI;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.*;
import java.util.stream.Collectors;
@@ -65,7 +65,7 @@ import java.util.Optional;
import java.util.regex.Pattern;
public class TileAltar extends TileSimpleInventory implements IPetalApothecary, ITickableTileEntity {
private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)");
private static final int SET_KEEP_TICKS_EVENT = 0;
private static final int CRAFT_EFFECT_EVENT = 1;
@@ -25,6 +25,7 @@ import net.minecraftforge.common.extensions.IForgeContainerType;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.mana.spark.SparkUpgradeType;