From 94841df9aa496ac3cb7251871ae195f0e0fd3219 Mon Sep 17 00:00:00 2001
From: MoriyaShiine <45156123+MoriyaShiine@users.noreply.github.com>
Date: Wed, 24 Jun 2020 16:12:41 -0500
Subject: [PATCH] de-objectholder blocks (#3336)
---
.../api/corporea/IWrappedInventory.java | 6 +-
.../botania/common/block/ModBlocks.java | 1202 +++++++----------
.../botania/common/block/ModFluffBlocks.java | 815 ++++++-----
.../botania/common/block/ModSubtiles.java | 590 +++++---
.../common/block/subtile/SubTileManastar.java | 7 +-
.../block/subtile/SubTilePureDaisy.java | 9 +-
.../functional/SubTileAgricarnation.java | 11 +-
.../subtile/functional/SubTileBellethorn.java | 12 +-
.../subtile/functional/SubTileBergamute.java | 6 +-
.../subtile/functional/SubTileBubbell.java | 11 +-
.../subtile/functional/SubTileClayconia.java | 11 +-
.../subtile/functional/SubTileDaffomill.java | 6 +-
.../subtile/functional/SubTileDreadthorn.java | 6 +-
.../subtile/functional/SubTileExoflame.java | 6 +-
.../functional/SubTileFallenKanade.java | 6 +-
.../functional/SubTileHeiseiDream.java | 6 +-
.../subtile/functional/SubTileHopperhock.java | 11 +-
.../subtile/functional/SubTileHyacidus.java | 6 +-
.../functional/SubTileJadedAmaranthus.java | 6 +-
.../subtile/functional/SubTileJiyuulia.java | 6 +-
.../subtile/functional/SubTileLoonuim.java | 6 +-
.../functional/SubTileMarimorphosis.java | 11 +-
.../subtile/functional/SubTileMedumone.java | 6 +-
.../subtile/functional/SubTileOrechid.java | 6 +-
.../functional/SubTileOrechidIgnem.java | 6 +-
.../functional/SubTilePollidisiac.java | 6 +-
.../functional/SubTileRannuncarpus.java | 11 +-
.../subtile/functional/SubTileSolegnolia.java | 11 +-
.../functional/SubTileSpectranthemum.java | 6 +-
.../functional/SubTileTangleberrie.java | 6 +-
.../subtile/functional/SubTileTigerseye.java | 7 +-
.../subtile/functional/SubTileVinculotus.java | 6 +-
.../subtile/generating/SubTileArcaneRose.java | 7 +-
.../generating/SubTileDandelifeon.java | 7 +-
.../subtile/generating/SubTileEndoflame.java | 7 +-
.../generating/SubTileEntropinnyum.java | 7 +-
.../generating/SubTileGourmaryllis.java | 7 +-
.../generating/SubTileHydroangeas.java | 7 +-
.../subtile/generating/SubTileKekimurus.java | 7 +-
.../subtile/generating/SubTileMunchdew.java | 7 +-
.../subtile/generating/SubTileNarslimmus.java | 7 +-
.../subtile/generating/SubTileRafflowsia.java | 6 +-
.../subtile/generating/SubTileShulkMeNot.java | 7 +-
.../subtile/generating/SubTileSpectrolus.java | 7 +-
.../subtile/generating/SubTileThermalily.java | 7 +-
.../botania/common/block/tile/ModTiles.java | 1 -
.../common/block/tile/TileAlfPortal.java | 6 -
.../botania/common/block/tile/TileAltar.java | 2 +-
.../vazkii/botania/common/item/ModItems.java | 5 -
49 files changed, 1383 insertions(+), 1548 deletions(-)
diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java
index 635e4d695..3f6356a46 100644
--- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java
+++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java
@@ -41,10 +41,10 @@ public interface IWrappedInventory {
/**
* Extracts items matching request from the inventory.
- * {@link ICorporeaRequest#stillNeeded} is updated to reflect how many items are
+ * {@link ICorporeaRequest#getStillNeeded()} is updated to reflect how many items are
* yet to be extracted.
- * {@link ICorporeaRequest#foundItems} and
- * {@link ICorporeaRequest#extractedItems} are updated to reflect how many
+ * {@link ICorporeaRequest#getFound()} and
+ * {@link ICorporeaRequest#getExtracted()} are updated to reflect how many
* items were found and extracted.
*
* @param request
diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java
index 54a87d33c..494f5bca3 100644
--- a/src/main/java/vazkii/botania/common/block/ModBlocks.java
+++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java
@@ -17,7 +17,6 @@ import net.minecraft.item.BlockItem;
import net.minecraft.item.DyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.Rarity;
-import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.api.distmarker.Dist;
@@ -26,8 +25,6 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
-import net.minecraftforge.registries.ObjectHolder;
-
import vazkii.botania.api.state.enums.LuminizerVariant;
import vazkii.botania.client.render.tile.RenderTilePylon;
import vazkii.botania.client.render.tile.TEISR;
@@ -39,10 +36,6 @@ import vazkii.botania.common.block.dispenser.BehaviourWand;
import vazkii.botania.common.block.dispenser.SeedBehaviours;
import vazkii.botania.common.block.mana.*;
import vazkii.botania.common.block.string.*;
-import vazkii.botania.common.block.tile.*;
-import vazkii.botania.common.block.tile.corporea.*;
-import vazkii.botania.common.block.tile.mana.*;
-import vazkii.botania.common.block.tile.string.*;
import vazkii.botania.common.item.ItemGaiaHead;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockDreamwood;
@@ -52,727 +45,572 @@ import vazkii.botania.common.item.block.ItemBlockTinyPotato;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
-import java.util.Arrays;
import java.util.Locale;
-@ObjectHolder(LibMisc.MOD_ID)
public final class ModBlocks {
- @ObjectHolder("white" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block whiteFlower;
- @ObjectHolder("orange" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block orangeFlower;
- @ObjectHolder("magenta" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block magentaFlower;
- @ObjectHolder("light_blue" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block lightBlueFlower;
- @ObjectHolder("yellow" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block yellowFlower;
- @ObjectHolder("lime" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block limeFlower;
- @ObjectHolder("pink" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block pinkFlower;
- @ObjectHolder("gray" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block grayFlower;
- @ObjectHolder("light_gray" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block lightGrayFlower;
- @ObjectHolder("cyan" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block cyanFlower;
- @ObjectHolder("purple" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block purpleFlower;
- @ObjectHolder("blue" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block blueFlower;
- @ObjectHolder("brown" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block brownFlower;
- @ObjectHolder("green" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block greenFlower;
- @ObjectHolder("red" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block redFlower;
- @ObjectHolder("black" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX)
- public static Block blackFlower;
+ public static Block whiteFlower = new BlockModFlower(DyeColor.WHITE, Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT));
+ public static Block orangeFlower = new BlockModFlower(DyeColor.ORANGE, Block.Properties.from(whiteFlower));
+ public static Block magentaFlower = new BlockModFlower(DyeColor.MAGENTA, Block.Properties.from(whiteFlower));
+ public static Block lightBlueFlower = new BlockModFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteFlower));
+ public static Block yellowFlower = new BlockModFlower(DyeColor.YELLOW, Block.Properties.from(whiteFlower));
+ public static Block limeFlower = new BlockModFlower(DyeColor.LIME, Block.Properties.from(whiteFlower));
+ public static Block pinkFlower = new BlockModFlower(DyeColor.PINK, Block.Properties.from(whiteFlower));
+ public static Block grayFlower = new BlockModFlower(DyeColor.GRAY, Block.Properties.from(whiteFlower));
+ public static Block lightGrayFlower = new BlockModFlower(DyeColor.LIGHT_GRAY, Block.Properties.from(whiteFlower));
+ public static Block cyanFlower = new BlockModFlower(DyeColor.CYAN, Block.Properties.from(whiteFlower));
+ public static Block purpleFlower = new BlockModFlower(DyeColor.PURPLE, Block.Properties.from(whiteFlower));
+ public static Block blueFlower = new BlockModFlower(DyeColor.BLUE, Block.Properties.from(whiteFlower));
+ public static Block brownFlower = new BlockModFlower(DyeColor.BROWN, Block.Properties.from(whiteFlower));
+ public static Block greenFlower = new BlockModFlower(DyeColor.GREEN, Block.Properties.from(whiteFlower));
+ public static Block redFlower = new BlockModFlower(DyeColor.RED, Block.Properties.from(whiteFlower));
+ public static Block blackFlower = new BlockModFlower(DyeColor.BLACK, Block.Properties.from(whiteFlower));
- @ObjectHolder("apothecary_default")
- public static Block defaultAltar;
- @ObjectHolder("apothecary_forest")
- public static Block forestAltar;
- @ObjectHolder("apothecary_plains")
- public static Block plainsAltar;
- @ObjectHolder("apothecary_mountain")
- public static Block mountainAltar;
- @ObjectHolder("apothecary_fungal")
- public static Block fungalAltar;
- @ObjectHolder("apothecary_swamp")
- public static Block swampAltar;
- @ObjectHolder("apothecary_desert")
- public static Block desertAltar;
- @ObjectHolder("apothecary_taiga")
- public static Block taigaAltar;
- @ObjectHolder("apothecary_mesa")
- public static Block mesaAltar;
- @ObjectHolder("apothecary_mossy")
- public static Block mossyAltar;
+ public static Block defaultAltar = new BlockAltar(BlockAltar.Variant.DEFAULT, Block.Properties.create(Material.ROCK).hardnessAndResistance(3.5F).sound(SoundType.STONE));
+ public static Block forestAltar = new BlockAltar(BlockAltar.Variant.FOREST, Block.Properties.from(defaultAltar));
+ public static Block plainsAltar = new BlockAltar(BlockAltar.Variant.PLAINS, Block.Properties.from(defaultAltar));
+ public static Block mountainAltar = new BlockAltar(BlockAltar.Variant.MOUNTAIN, Block.Properties.from(defaultAltar));
+ public static Block fungalAltar = new BlockAltar(BlockAltar.Variant.FUNGAL, Block.Properties.from(defaultAltar));
+ public static Block swampAltar = new BlockAltar(BlockAltar.Variant.SWAMP, Block.Properties.from(defaultAltar));
+ public static Block desertAltar = new BlockAltar(BlockAltar.Variant.DESERT, Block.Properties.from(defaultAltar));
+ public static Block taigaAltar = new BlockAltar(BlockAltar.Variant.TAIGA, Block.Properties.from(defaultAltar));
+ public static Block mesaAltar = new BlockAltar(BlockAltar.Variant.MESA, Block.Properties.from(defaultAltar));
+ public static Block mossyAltar = new BlockAltar(BlockAltar.Variant.MOSSY, Block.Properties.from(defaultAltar));
- @ObjectHolder(LibBlockNames.LIVING_ROCK)
- public static Block livingrock;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK)
- public static Block livingrockBrick;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_CHISELED)
- public static Block livingrockBrickChiseled;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_CRACKED)
- public static Block livingrockBrickCracked;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_MOSSY)
- public static Block livingrockBrickMossy;
+ public static Block livingrock = new BlockMod(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE));
+ public static Block livingrockBrick = new BlockMod(Block.Properties.from(livingrock));
+ public static Block livingrockBrickChiseled = new BlockMod(Block.Properties.from(livingrock));
+ public static Block livingrockBrickCracked = new BlockMod(Block.Properties.from(livingrock));
+ public static Block livingrockBrickMossy = new BlockMod(Block.Properties.from(livingrock));
- @ObjectHolder(LibBlockNames.LIVING_WOOD)
- public static Block livingwood;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS)
- public static Block livingwoodPlanks;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS_MOSSY)
- public static Block livingwoodPlanksMossy;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_FRAMED)
- public static Block livingwoodFramed;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_PATTERN_FRAMED)
- public static Block livingwoodPatternFramed;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_GLIMMERING)
- public static Block livingwoodGlimmering;
+ public static Block livingwood = new BlockMod(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD));
+ public static Block livingwoodPlanks = new BlockMod(Block.Properties.from(livingwood));
+ public static Block livingwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood));
+ public static Block livingwoodFramed = new BlockMod(Block.Properties.from(livingwood));
+ public static Block livingwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood));
+ public static Block livingwoodGlimmering = new BlockMod(Block.Properties.from(livingwood).lightValue(12));
- @ObjectHolder(LibBlockNames.SPREADER)
- public static Block manaSpreader;
- @ObjectHolder(LibBlockNames.SPREADER_REDSTONE)
- public static Block redstoneSpreader;
- @ObjectHolder(LibBlockNames.SPREADER_ELVEN)
- public static Block elvenSpreader;
- @ObjectHolder(LibBlockNames.SPREADER_GAIA)
- public static Block gaiaSpreader;
+ public static Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA, Block.Properties.from(livingwood));
+ public static Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE, Block.Properties.from(livingwood));
+ public static Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN, Block.Properties.from(livingwood));
+ public static Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA, Block.Properties.from(livingwood));
- @ObjectHolder(LibBlockNames.POOL)
- public static Block manaPool;
- @ObjectHolder(LibBlockNames.POOL_CREATIVE)
- public static Block creativePool;
- @ObjectHolder(LibBlockNames.POOL_DILUTED)
- public static Block dilutedPool;
- @ObjectHolder(LibBlockNames.POOL_FABULOUS)
- public static Block fabulousPool;
+ public static Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT, Block.Properties.from(livingrock));
+ public static Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE, Block.Properties.from(livingrock));
+ public static Block dilutedPool = new BlockPool(BlockPool.Variant.DILUTED, Block.Properties.from(livingrock));
+ public static Block fabulousPool = new BlockPool(BlockPool.Variant.FABULOUS, Block.Properties.from(livingrock));
- @ObjectHolder(LibBlockNames.RUNE_ALTAR)
- public static Block runeAltar;
- @ObjectHolder(LibBlockNames.PYLON)
- public static Block manaPylon;
- @ObjectHolder(LibBlockNames.PYLON_NATURA)
- public static Block naturaPylon;
- @ObjectHolder(LibBlockNames.PYLON_GAIA)
- public static Block gaiaPylon;
+ public static Block runeAltar = new BlockRuneAltar(Block.Properties.from(livingrock));
+ 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));
+ public static Block manaDetector = new BlockManaDetector(Block.Properties.from(livingrock));
+ public static Block enchanter = new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE));
+ public static Block turntable = new BlockTurntable(Block.Properties.from(livingwood));
+ public static Block tinyPlanet = new BlockTinyPlanet(Block.Properties.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE));
+ public static Block alchemyCatalyst = new BlockAlchemyCatalyst(Block.Properties.from(livingrock));
+ public static Block openCrate = new BlockOpenCrate(Block.Properties.from(livingwood));
+ public static Block craftCrate = new BlockCraftyCrate(Block.Properties.from(livingwood));
+ public static Block forestEye = new BlockForestEye(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 10).sound(SoundType.METAL));
+ public static Block manasteelBlock = new BlockStorage(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL));
+ public static Block terrasteelBlock = new BlockStorage(Block.Properties.from(manasteelBlock));
+ public static Block elementiumBlock = new BlockStorage(Block.Properties.from(manasteelBlock));
+ public static Block manaDiamondBlock = new BlockStorage(Block.Properties.from(manasteelBlock));
+ public static Block dragonstoneBlock = new BlockStorage(Block.Properties.from(manasteelBlock));
+ 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));
+ public static Block lightBlueShinyFlower = new BlockShinyFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteShinyFlower));
+ public static Block yellowShinyFlower = new BlockShinyFlower(DyeColor.YELLOW, Block.Properties.from(whiteShinyFlower));
+ public static Block limeShinyFlower = new BlockShinyFlower(DyeColor.LIME, Block.Properties.from(whiteShinyFlower));
+ public static Block pinkShinyFlower = new BlockShinyFlower(DyeColor.PINK, Block.Properties.from(whiteShinyFlower));
+ public static Block grayShinyFlower = new BlockShinyFlower(DyeColor.GRAY, Block.Properties.from(whiteShinyFlower));
+ public static Block lightGrayShinyFlower = new BlockShinyFlower(DyeColor.LIGHT_GRAY, Block.Properties.from(whiteShinyFlower));
+ public static Block cyanShinyFlower = new BlockShinyFlower(DyeColor.CYAN, Block.Properties.from(whiteShinyFlower));
+ public static Block purpleShinyFlower = new BlockShinyFlower(DyeColor.PURPLE, Block.Properties.from(whiteShinyFlower));
+ public static Block blueShinyFlower = new BlockShinyFlower(DyeColor.BLUE, Block.Properties.from(whiteShinyFlower));
+ public static Block brownShinyFlower = new BlockShinyFlower(DyeColor.BROWN, Block.Properties.from(whiteShinyFlower));
+ 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));
+ public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD));
+ public static Block dreamwood = new BlockMod(Block.Properties.from(livingwood));
+ public static Block dreamwoodPlanks = new BlockMod(Block.Properties.from(livingwood));
+ public static Block dreamwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood));
+ public static Block dreamwoodFramed = new BlockMod(Block.Properties.from(livingwood));
+ public static Block dreamwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood));
+ public static Block dreamwoodGlimmering = new BlockMod(Block.Properties.from(livingwoodGlimmering));
+ public static Block conjurationCatalyst = new BlockConjurationCatalyst(Block.Properties.from(livingrock));
+ public static Block bifrost = new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).notSolid());
+ public static Block solidVines = new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).notSolid());
- @ObjectHolder(LibBlockNames.PISTON_RELAY)
- public static Block pistonRelay;
- @ObjectHolder(LibBlockNames.DISTRIBUTOR)
- public static Block distributor;
- @ObjectHolder(LibBlockNames.MANA_VOID)
- public static Block manaVoid;
- @ObjectHolder(LibBlockNames.MANA_DETECTOR)
- public static Block manaDetector;
- @ObjectHolder(LibBlockNames.ENCHANTER)
- public static Block enchanter;
- @ObjectHolder(LibBlockNames.TURNTABLE)
- public static Block turntable;
- @ObjectHolder(LibBlockNames.TINY_PLANET)
- public static Block tinyPlanet;
- @ObjectHolder(LibBlockNames.ALCHEMY_CATALYST)
- public static Block alchemyCatalyst;
- @ObjectHolder(LibBlockNames.OPEN_CRATE)
- public static Block openCrate;
- @ObjectHolder(LibBlockNames.CRAFT_CRATE)
- public static Block craftCrate;
- @ObjectHolder(LibBlockNames.FOREST_EYE)
- public static Block forestEye;
- @ObjectHolder(LibBlockNames.MANASTEEL_BLOCK)
- public static Block manasteelBlock;
- @ObjectHolder(LibBlockNames.TERRASTEEL_BLOCK)
- public static Block terrasteelBlock;
- @ObjectHolder(LibBlockNames.ELEMENTIUM_BLOCK)
- public static Block elementiumBlock;
- @ObjectHolder(LibBlockNames.MANA_DIAMOND_BLOCK)
- public static Block manaDiamondBlock;
- @ObjectHolder(LibBlockNames.DRAGONSTONE_BLOCK)
- public static Block dragonstoneBlock;
- @ObjectHolder(LibBlockNames.DRUM_WILD)
- public static Block wildDrum;
- @ObjectHolder(LibBlockNames.DRUM_GATHERING)
- public static Block gatheringDrum;
- @ObjectHolder(LibBlockNames.DRUM_CANOPY)
- public static Block canopyDrum;
- @ObjectHolder("white" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block whiteShinyFlower;
- @ObjectHolder("orange" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block orangeShinyFlower;
- @ObjectHolder("magenta" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block magentaShinyFlower;
- @ObjectHolder("light_blue" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block lightBlueShinyFlower;
- @ObjectHolder("yellow" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block yellowShinyFlower;
- @ObjectHolder("lime" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block limeShinyFlower;
- @ObjectHolder("pink" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block pinkShinyFlower;
- @ObjectHolder("gray" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block grayShinyFlower;
- @ObjectHolder("light_gray" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block lightGrayShinyFlower;
- @ObjectHolder("cyan" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block cyanShinyFlower;
- @ObjectHolder("purple" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block purpleShinyFlower;
- @ObjectHolder("blue" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block blueShinyFlower;
- @ObjectHolder("brown" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block brownShinyFlower;
- @ObjectHolder("green" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block greenShinyFlower;
- @ObjectHolder("red" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block redShinyFlower;
- @ObjectHolder("black" + LibBlockNames.SHINY_FLOWER_SUFFIX)
- public static Block blackShinyFlower;
- @ObjectHolder(LibBlockNames.PLATFORM_ABSTRUSE)
- public static Block abstrusePlatform;
- @ObjectHolder(LibBlockNames.PLATFORM_SPECTRAL)
- public static Block spectralPlatform;
- @ObjectHolder(LibBlockNames.PLATFORM_INFRANGIBLE)
- public static Block infrangiblePlatform;
- @ObjectHolder(LibBlockNames.ALF_PORTAL)
- public static Block alfPortal;
- @ObjectHolder(LibBlockNames.DREAM_WOOD)
- public static Block dreamwood;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS)
- public static Block dreamwoodPlanks;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS_MOSSY)
- public static Block dreamwoodPlanksMossy;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_FRAMED)
- public static Block dreamwoodFramed;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_PATTERN_FRAMED)
- public static Block dreamwoodPatternFramed;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_GLIMMERING)
- public static Block dreamwoodGlimmering;
- @ObjectHolder(LibBlockNames.CONJURATION_CATALYST)
- public static Block conjurationCatalyst;
- @ObjectHolder(LibBlockNames.BIFROST)
- public static Block bifrost;
- @ObjectHolder(LibBlockNames.SOLID_VINE)
- public static Block solidVines;
- @ObjectHolder("white" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block whiteBuriedPetals;
- @ObjectHolder("orange" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block orangeBuriedPetals;
- @ObjectHolder("magenta" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block magentaBuriedPetals;
- @ObjectHolder("light_blue" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block lightBlueBuriedPetals;
- @ObjectHolder("yellow" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block yellowBuriedPetals;
- @ObjectHolder("lime" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block limeBuriedPetals;
- @ObjectHolder("pink" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block pinkBuriedPetals;
- @ObjectHolder("gray" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block grayBuriedPetals;
- @ObjectHolder("light_gray" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block lightGrayBuriedPetals;
- @ObjectHolder("cyan" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block cyanBuriedPetals;
- @ObjectHolder("purple" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block purpleBuriedPetals;
- @ObjectHolder("blue" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block blueBuriedPetals;
- @ObjectHolder("brown" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block brownBuriedPetals;
- @ObjectHolder("green" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block greenBuriedPetals;
- @ObjectHolder("red" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block redBuriedPetals;
- @ObjectHolder("black" + LibBlockNames.BURIED_PETALS_SUFFIX)
- public static Block blackBuriedPetals;
- @ObjectHolder("white" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block whiteFloatingFlower;
- @ObjectHolder("orange" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block orangeFloatingFlower;
- @ObjectHolder("magenta" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block magentaFloatingFlower;
- @ObjectHolder("light_blue" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block lightBlueFloatingFlower;
- @ObjectHolder("yellow" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block yellowFloatingFlower;
- @ObjectHolder("lime" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block limeFloatingFlower;
- @ObjectHolder("pink" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block pinkFloatingFlower;
- @ObjectHolder("gray" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block grayFloatingFlower;
- @ObjectHolder("light_gray" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block lightGrayFloatingFlower;
- @ObjectHolder("cyan" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block cyanFloatingFlower;
- @ObjectHolder("purple" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block purpleFloatingFlower;
- @ObjectHolder("blue" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block blueFloatingFlower;
- @ObjectHolder("brown" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block brownFloatingFlower;
- @ObjectHolder("green" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block greenFloatingFlower;
- @ObjectHolder("red" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block redFloatingFlower;
- @ObjectHolder("black" + LibBlockNames.FLOATING_FLOWER_SUFFIX)
- public static Block blackFloatingFlower;
- @ObjectHolder(LibBlockNames.TINY_POTATO)
- public static Block tinyPotato;
- @ObjectHolder(LibBlockNames.SPAWNER_CLAW)
- public static Block spawnerClaw;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 0)
- public static Block azulejo0;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 1)
- public static Block azulejo1;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 2)
- public static Block azulejo2;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 3)
- public static Block azulejo3;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 4)
- public static Block azulejo4;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 5)
- public static Block azulejo5;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 6)
- public static Block azulejo6;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 7)
- public static Block azulejo7;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 8)
- public static Block azulejo8;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 9)
- public static Block azulejo9;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 10)
- public static Block azulejo10;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 11)
- public static Block azulejo11;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 12)
- public static Block azulejo12;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 13)
- public static Block azulejo13;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 14)
- public static Block azulejo14;
- @ObjectHolder(LibBlockNames.AZULEJO_PREFIX + 15)
- public static Block azulejo15;
- @ObjectHolder(LibBlockNames.ENDER_EYE_BLOCK)
- public static Block enderEye;
- @ObjectHolder(LibBlockNames.STARFIELD)
- public static Block starfield;
- @ObjectHolder(LibBlockNames.FLUXFIELD)
- public static Block rfGenerator;
- @ObjectHolder(LibBlockNames.ELF_GLASS)
- public static Block elfGlass;
- @ObjectHolder(LibBlockNames.BREWERY)
- public static Block brewery;
- @ObjectHolder(LibBlockNames.MANA_GLASS)
- public static Block manaGlass;
- @ObjectHolder(LibBlockNames.TERRA_PLATE)
- public static Block terraPlate;
- @ObjectHolder(LibBlockNames.RED_STRING_CONTAINER)
- public static Block redStringContainer;
- @ObjectHolder(LibBlockNames.RED_STRING_DISPENSER)
- public static Block redStringDispenser;
- @ObjectHolder(LibBlockNames.RED_STRING_FERTILIZER)
- public static Block redStringFertilizer;
- @ObjectHolder(LibBlockNames.RED_STRING_COMPARATOR)
- public static Block redStringComparator;
- @ObjectHolder(LibBlockNames.RED_STRING_RELAY)
- public static Block redStringRelay;
- @ObjectHolder(LibBlockNames.MANA_FLAME)
- public static Block manaFlame;
- @ObjectHolder(LibBlockNames.PRISM)
- public static Block prism;
- @ObjectHolder(LibBlockNames.ENCHANTED_SOIL)
- public static Block enchantedSoil;
- @ObjectHolder("white" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockWhite;
- @ObjectHolder("orange" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockOrange;
- @ObjectHolder("magenta" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockMagenta;
- @ObjectHolder("light_blue" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockLightBlue;
- @ObjectHolder("yellow" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockYellow;
- @ObjectHolder("lime" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockLime;
- @ObjectHolder("pink" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockPink;
- @ObjectHolder("gray" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockGray;
- @ObjectHolder("light_gray" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockSilver;
- @ObjectHolder("cyan" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockCyan;
- @ObjectHolder("purple" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockPurple;
- @ObjectHolder("blue" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockBlue;
- @ObjectHolder("brown" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockBrown;
- @ObjectHolder("green" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockGreen;
- @ObjectHolder("red" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockRed;
- @ObjectHolder("black" + LibBlockNames.PETAL_BLOCK_SUFFIX)
- public static Block petalBlockBlack;
- @ObjectHolder(LibBlockNames.CORPOREA_INDEX)
- public static Block corporeaIndex;
- @ObjectHolder(LibBlockNames.CORPOREA_FUNNEL)
- public static Block corporeaFunnel;
- @ObjectHolder("white" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block whiteMushroom;
- @ObjectHolder("orange" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block orangeMushroom;
- @ObjectHolder("magenta" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block magentaMushroom;
- @ObjectHolder("light_blue" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block lightBlueMushroom;
- @ObjectHolder("yellow" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block yellowMushroom;
- @ObjectHolder("lime" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block limeMushroom;
- @ObjectHolder("pink" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block pinkMushroom;
- @ObjectHolder("gray" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block grayMushroom;
- @ObjectHolder("light_gray" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block lightGrayMushroom;
- @ObjectHolder("cyan" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block cyanMushroom;
- @ObjectHolder("purple" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block purpleMushroom;
- @ObjectHolder("blue" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block blueMushroom;
- @ObjectHolder("brown" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block brownMushroom;
- @ObjectHolder("green" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block greenMushroom;
- @ObjectHolder("red" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block redMushroom;
- @ObjectHolder("black" + LibBlockNames.MUSHROOM_SUFFIX)
- public static Block blackMushroom;
- @ObjectHolder(LibBlockNames.PUMP)
- public static Block pump;
- @ObjectHolder("white" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerWhite;
- @ObjectHolder("orange" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerOrange;
- @ObjectHolder("magenta" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerMagenta;
- @ObjectHolder("light_blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerLightBlue;
- @ObjectHolder("yellow" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerYellow;
- @ObjectHolder("lime" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerLime;
- @ObjectHolder("pink" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerPink;
- @ObjectHolder("gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerGray;
- @ObjectHolder("light_gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerLightGray;
- @ObjectHolder("cyan" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerCyan;
- @ObjectHolder("purple" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerPurple;
- @ObjectHolder("blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerBlue;
- @ObjectHolder("brown" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerBrown;
- @ObjectHolder("green" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerGreen;
- @ObjectHolder("red" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerRed;
- @ObjectHolder("black" + LibBlockNames.DOUBLE_FLOWER_SUFFIX)
- public static Block doubleFlowerBlack;
- @ObjectHolder(LibBlockNames.FAKE_AIR)
- public static Block fakeAir;
- @ObjectHolder(LibBlockNames.BLAZE_BLOCK)
- public static Block blazeBlock;
- @ObjectHolder(LibBlockNames.CORPOREA_INTERCEPTOR)
- public static Block corporeaInterceptor;
- @ObjectHolder(LibBlockNames.CORPOREA_CRYSTAL_CUBE)
- public static Block corporeaCrystalCube;
- @ObjectHolder(LibBlockNames.INCENSE_PLATE)
- public static Block incensePlate;
- @ObjectHolder(LibBlockNames.HOURGLASS)
- public static Block hourglass;
- @ObjectHolder(LibBlockNames.GHOST_RAIL)
- public static Block ghostRail;
- @ObjectHolder(LibBlockNames.SPARK_CHANGER)
- public static Block sparkChanger;
- @ObjectHolder(LibBlockNames.ROOT)
- public static Block root;
- @ObjectHolder(LibBlockNames.FEL_PUMPKIN)
- public static Block felPumpkin;
- @ObjectHolder(LibBlockNames.COCOON)
- public static Block cocoon;
- @ObjectHolder(LibBlockNames.LIGHT_RELAY)
- public static Block lightRelayDefault;
- @ObjectHolder("detector" + LibBlockNames.LIGHT_RELAY_SUFFIX)
- public static Block lightRelayDetector;
- @ObjectHolder("toggle" + LibBlockNames.LIGHT_RELAY_SUFFIX)
- public static Block lightRelayToggle;
- @ObjectHolder("fork" + LibBlockNames.LIGHT_RELAY_SUFFIX)
- public static Block lightRelayFork;
- @ObjectHolder(LibBlockNames.LIGHT_LAUNCHER)
- public static Block lightLauncher;
- @ObjectHolder(LibBlockNames.MANA_BOMB)
- public static Block manaBomb;
- @ObjectHolder(LibBlockNames.CACOPHONIUM)
- public static Block cacophonium;
- @ObjectHolder(LibBlockNames.BELLOWS)
- public static Block bellows;
- @ObjectHolder(LibBlockNames.BIFROST_PERM)
- public static Block bifrostPerm;
- @ObjectHolder(LibBlockNames.CELL_BLOCK)
- public static Block cellBlock;
- @ObjectHolder(LibBlockNames.RED_STRING_INTERCEPTOR)
- public static Block redStringInterceptor;
- @ObjectHolder(LibBlockNames.GAIA_HEAD)
- public static Block gaiaHead;
- @ObjectHolder(LibBlockNames.GAIA_WALL_HEAD)
- public static Block gaiaHeadWall;
- @ObjectHolder(LibBlockNames.CORPOREA_RETAINER)
- public static Block corporeaRetainer;
- @ObjectHolder(LibBlockNames.TERU_TERU_BOZU)
- public static Block teruTeruBozu;
- @ObjectHolder(LibBlockNames.SHIMMERROCK)
- public static Block shimmerrock;
- @ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS)
- public static Block shimmerwoodPlanks;
- @ObjectHolder(LibBlockNames.AVATAR)
- public static Block avatar;
- @ObjectHolder("dry" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block dryGrass;
- @ObjectHolder("golden" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block goldenGrass;
- @ObjectHolder("vivid" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block vividGrass;
- @ObjectHolder("scorched" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block scorchedGrass;
- @ObjectHolder("infused" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block infusedGrass;
- @ObjectHolder("mutated" + LibBlockNames.ALT_GRASS_SUFFIX)
- public static Block mutatedGrass;
- @ObjectHolder(LibBlockNames.ANIMATED_TORCH)
- public static Block animatedTorch;
+ public static Block whiteBuriedPetals = new BlockBuriedPetals(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(4));
+ public static Block orangeBuriedPetals = new BlockBuriedPetals(DyeColor.ORANGE, Block.Properties.from(whiteBuriedPetals));
+ public static Block magentaBuriedPetals = new BlockBuriedPetals(DyeColor.MAGENTA, Block.Properties.from(whiteBuriedPetals));
+ public static Block lightBlueBuriedPetals = new BlockBuriedPetals(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteBuriedPetals));
+ public static Block yellowBuriedPetals = new BlockBuriedPetals(DyeColor.YELLOW, Block.Properties.from(whiteBuriedPetals));
+ public static Block limeBuriedPetals = new BlockBuriedPetals(DyeColor.LIME, Block.Properties.from(whiteBuriedPetals));
+ public static Block pinkBuriedPetals = new BlockBuriedPetals(DyeColor.PINK, Block.Properties.from(whiteBuriedPetals));
+ public static Block grayBuriedPetals = new BlockBuriedPetals(DyeColor.GRAY, Block.Properties.from(whiteBuriedPetals));
+ public static Block lightGrayBuriedPetals = new BlockBuriedPetals(DyeColor.LIGHT_GRAY, Block.Properties.from(whiteBuriedPetals));
+ public static Block cyanBuriedPetals = new BlockBuriedPetals(DyeColor.CYAN, Block.Properties.from(whiteBuriedPetals));
+ public static Block purpleBuriedPetals = new BlockBuriedPetals(DyeColor.PURPLE, Block.Properties.from(whiteBuriedPetals));
+ public static Block blueBuriedPetals = new BlockBuriedPetals(DyeColor.BLUE, Block.Properties.from(whiteBuriedPetals));
+ public static Block brownBuriedPetals = new BlockBuriedPetals(DyeColor.BROWN, Block.Properties.from(whiteBuriedPetals));
+ 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));
+ public static Block lightBlueFloatingFlower = new BlockFloatingFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteFloatingFlower));
+ public static Block yellowFloatingFlower = new BlockFloatingFlower(DyeColor.YELLOW, Block.Properties.from(whiteFloatingFlower));
+ public static Block limeFloatingFlower = new BlockFloatingFlower(DyeColor.LIME, Block.Properties.from(whiteFloatingFlower));
+ public static Block pinkFloatingFlower = new BlockFloatingFlower(DyeColor.PINK, Block.Properties.from(whiteFloatingFlower));
+ public static Block grayFloatingFlower = new BlockFloatingFlower(DyeColor.GRAY, Block.Properties.from(whiteFloatingFlower));
+ public static Block lightGrayFloatingFlower = new BlockFloatingFlower(DyeColor.LIGHT_GRAY, Block.Properties.from(whiteFloatingFlower));
+ public static Block cyanFloatingFlower = new BlockFloatingFlower(DyeColor.CYAN, Block.Properties.from(whiteFloatingFlower));
+ public static Block purpleFloatingFlower = new BlockFloatingFlower(DyeColor.PURPLE, Block.Properties.from(whiteFloatingFlower));
+ public static Block blueFloatingFlower = new BlockFloatingFlower(DyeColor.BLUE, Block.Properties.from(whiteFloatingFlower));
+ public static Block brownFloatingFlower = new BlockFloatingFlower(DyeColor.BROWN, Block.Properties.from(whiteFloatingFlower));
+ 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));
+ public static Block azulejo3 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo4 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo5 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo6 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo7 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo8 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo9 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo10 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo11 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo12 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo13 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo14 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block azulejo15 = new BlockMod(Block.Properties.from(azulejo0));
+ public static Block enderEye = new BlockEnderEye(Block.Properties.from(manasteelBlock));
+ public static Block starfield = new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL));
+ public static Block rfGenerator = new BlockRFGenerator(Block.Properties.from(livingrock));
+ public static Block elfGlass = new BlockElfGlass(Block.Properties.from(Blocks.GLASS).lightValue(15));
+ public static Block brewery = new BlockBrewery(Block.Properties.from(livingrock));
+ public static Block manaGlass = new BlockModGlass(Block.Properties.from(elfGlass));
+ public static Block terraPlate = new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL));
+ public static Block redStringContainer = new BlockRedStringContainer(Block.Properties.from(livingrock));
+ public static Block redStringDispenser = new BlockRedStringDispenser(Block.Properties.from(livingrock));
+ public static Block redStringFertilizer = new BlockRedStringFertilizer(Block.Properties.from(livingrock));
+ public static Block redStringComparator = new BlockRedStringComparator(Block.Properties.from(livingrock));
+ public static Block redStringRelay = new BlockRedStringRelay(Block.Properties.from(livingrock));
+ public static Block redStringInterceptor = new BlockRedStringInterceptor(Block.Properties.from(livingrock));
+ 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));
+ public static Block petalBlockLightBlue = new BlockPetalBlock(DyeColor.LIGHT_BLUE, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockYellow = new BlockPetalBlock(DyeColor.YELLOW, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockLime = new BlockPetalBlock(DyeColor.LIME, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockPink = new BlockPetalBlock(DyeColor.PINK, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockGray = new BlockPetalBlock(DyeColor.GRAY, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockSilver = new BlockPetalBlock(DyeColor.LIGHT_GRAY, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockCyan = new BlockPetalBlock(DyeColor.CYAN, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockPurple = new BlockPetalBlock(DyeColor.PURPLE, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockBlue = new BlockPetalBlock(DyeColor.BLUE, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockBrown = new BlockPetalBlock(DyeColor.BROWN, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockGreen = new BlockPetalBlock(DyeColor.GREEN, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockRed = new BlockPetalBlock(DyeColor.RED, Block.Properties.from(petalBlockWhite));
+ public static Block petalBlockBlack = new BlockPetalBlock(DyeColor.BLACK, Block.Properties.from(petalBlockWhite));
+
+ public static Block corporeaIndex = new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).notSolid());
+ public static Block corporeaFunnel = new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL));
+
+ public static Block whiteMushroom = new BlockModMushroom(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(3));
+ public static Block orangeMushroom = new BlockModMushroom(DyeColor.ORANGE, Block.Properties.from(whiteMushroom));
+ public static Block magentaMushroom = new BlockModMushroom(DyeColor.MAGENTA, Block.Properties.from(whiteMushroom));
+ public static Block lightBlueMushroom = new BlockModMushroom(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteMushroom));
+ public static Block yellowMushroom = new BlockModMushroom(DyeColor.YELLOW, Block.Properties.from(whiteMushroom));
+ public static Block limeMushroom = new BlockModMushroom(DyeColor.LIME, Block.Properties.from(whiteMushroom));
+ public static Block pinkMushroom = new BlockModMushroom(DyeColor.PINK, Block.Properties.from(whiteMushroom));
+ public static Block grayMushroom = new BlockModMushroom(DyeColor.GRAY, Block.Properties.from(whiteMushroom));
+ public static Block lightGrayMushroom = new BlockModMushroom(DyeColor.LIGHT_GRAY, Block.Properties.from(whiteMushroom));
+ public static Block cyanMushroom = new BlockModMushroom(DyeColor.CYAN, Block.Properties.from(whiteMushroom));
+ public static Block purpleMushroom = new BlockModMushroom(DyeColor.PURPLE, Block.Properties.from(whiteMushroom));
+ public static Block blueMushroom = new BlockModMushroom(DyeColor.BLUE, Block.Properties.from(whiteMushroom));
+ public static Block brownMushroom = new BlockModMushroom(DyeColor.BROWN, Block.Properties.from(whiteMushroom));
+ public static Block greenMushroom = new BlockModMushroom(DyeColor.GREEN, Block.Properties.from(whiteMushroom));
+ public static Block redMushroom = new BlockModMushroom(DyeColor.RED, Block.Properties.from(whiteMushroom));
+ 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));
+ public static Block doubleFlowerLightBlue = new BlockModDoubleFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerYellow = new BlockModDoubleFlower(DyeColor.YELLOW, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerLime = new BlockModDoubleFlower(DyeColor.LIME, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerPink = new BlockModDoubleFlower(DyeColor.PINK, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerGray = new BlockModDoubleFlower(DyeColor.GRAY, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerLightGray = new BlockModDoubleFlower(DyeColor.LIGHT_GRAY, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerCyan = new BlockModDoubleFlower(DyeColor.CYAN, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerPurple = new BlockModDoubleFlower(DyeColor.PURPLE, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerBlue = new BlockModDoubleFlower(DyeColor.BLUE, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerBrown = new BlockModDoubleFlower(DyeColor.BROWN, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerGreen = new BlockModDoubleFlower(DyeColor.GREEN, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerRed = new BlockModDoubleFlower(DyeColor.RED, Block.Properties.from(doubleFlowerWhite));
+ public static Block doubleFlowerBlack = new BlockModDoubleFlower(DyeColor.BLACK, Block.Properties.from(doubleFlowerWhite));
+
+ public static Block fakeAir = new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly());
+ public static Block blazeBlock = new BlockMod(Block.Properties.from(manasteelBlock).lightValue(15));
+ public static Block corporeaInterceptor = new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL));
+ public static Block corporeaCrystalCube = new BlockCorporeaCrystalCube(Block.Properties.from(corporeaInterceptor));
+ public static Block incensePlate = new BlockIncensePlate(Block.Properties.from(livingwood));
+ public static Block hourglass = new BlockHourglass(Block.Properties.create(Material.IRON).hardnessAndResistance(2).sound(SoundType.METAL));
+ public static Block ghostRail = new BlockGhostRail(Block.Properties.from(Blocks.RAIL));
+ public static Block sparkChanger = new BlockSparkChanger(Block.Properties.from(livingrock));
+ public static Block root = new BlockRoot(Block.Properties.create(Material.PLANTS).hardnessAndResistance(1.2F).sound(SoundType.WOOD));
+ public static Block felPumpkin = new BlockFelPumpkin(Block.Properties.from(Blocks.CARVED_PUMPKIN));
+ public static Block cocoon = new BlockCocoon(Block.Properties.create(Material.WOOL).hardnessAndResistance(3, 60).sound(SoundType.CLOTH));
+ public static Block lightRelayDefault = new BlockLightRelay(LuminizerVariant.DEFAULT, Block.Properties.create(Material.GLASS).doesNotBlockMovement());
+ public static Block lightRelayDetector = new BlockLightRelay(LuminizerVariant.DETECTOR, Block.Properties.from(lightRelayDefault));
+ public static Block lightRelayFork = new BlockLightRelay(LuminizerVariant.TOGGLE, Block.Properties.from(lightRelayDefault));
+ public static Block lightRelayToggle = new BlockLightRelay(LuminizerVariant.FORK, Block.Properties.from(lightRelayDefault));
+ public static Block lightLauncher = new BlockLightLauncher(Block.Properties.from(livingwood));
+ public static Block manaBomb = new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD));
+ public static Block cacophonium = new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F));
+ public static Block bellows = new BlockBellows(Block.Properties.from(livingwood));
+ public static Block bifrostPerm = new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).notSolid());
+ public static Block cellBlock = new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH));
+ public static Block gaiaHeadWall = new BlockGaiaHeadWall(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1));
+ public static Block gaiaHead = new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1));
+ public static Block corporeaRetainer = new BlockCorporeaRetainer(Block.Properties.from(corporeaInterceptor));
+ public static Block teruTeruBozu = new BlockTeruTeruBozu(Block.Properties.create(Material.WOOL));
+ public static Block shimmerrock = new BlockMod(Block.Properties.from(livingrock));
+ public static Block shimmerwoodPlanks = new BlockMod(Block.Properties.from(livingwood));
+ public static Block avatar = new BlockAvatar(Block.Properties.from(livingwood));
+ public static Block dryGrass = new BlockAltGrass(BlockAltGrass.Variant.DRY, Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).tickRandomly().sound(SoundType.PLANT));
+ public static Block goldenGrass = new BlockAltGrass(BlockAltGrass.Variant.GOLDEN, Block.Properties.from(dryGrass));
+ public static Block vividGrass = new BlockAltGrass(BlockAltGrass.Variant.VIVID, Block.Properties.from(dryGrass));
+ public static Block scorchedGrass = new BlockAltGrass(BlockAltGrass.Variant.SCORCHED, Block.Properties.from(dryGrass));
+ public static Block infusedGrass = new BlockAltGrass(BlockAltGrass.Variant.INFUSED, Block.Properties.from(dryGrass));
+ public static Block mutatedGrass = new BlockAltGrass(BlockAltGrass.Variant.MUTATED, Block.Properties.from(dryGrass));
+ public static Block animatedTorch = new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid());
public static void registerBlocks(RegistryEvent.Register evt) {
IForgeRegistry r = evt.getRegistry();
+ register(r, "white" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, whiteFlower);
+ register(r, "orange" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, orangeFlower);
+ register(r, "magenta" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, magentaFlower);
+ register(r, "light_blue" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, lightBlueFlower);
+ register(r, "yellow" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, yellowFlower);
+ register(r, "lime" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, limeFlower);
+ register(r, "pink" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, pinkFlower);
+ register(r, "gray" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, grayFlower);
+ register(r, "light_gray" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, lightGrayFlower);
+ register(r, "cyan" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, cyanFlower);
+ register(r, "purple" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, purpleFlower);
+ register(r, "blue" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, blueFlower);
+ register(r, "brown" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, brownFlower);
+ 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);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.MOUNTAIN.name().toLowerCase(Locale.ROOT), mountainAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.FUNGAL.name().toLowerCase(Locale.ROOT), fungalAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.SWAMP.name().toLowerCase(Locale.ROOT), swampAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.DESERT.name().toLowerCase(Locale.ROOT), desertAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.TAIGA.name().toLowerCase(Locale.ROOT), taigaAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.MESA.name().toLowerCase(Locale.ROOT), mesaAltar);
+ register(r, LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.MOSSY.name().toLowerCase(Locale.ROOT), mossyAltar);
- Block.Properties builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.MYSTICAL_FLOWER_SUFFIX, new BlockModFlower(color, builder));
- }
+ register(r, LibBlockNames.LIVING_ROCK, livingrock);
+ register(r, LibBlockNames.LIVING_ROCK_BRICK, livingrockBrick);
+ register(r, LibBlockNames.LIVING_ROCK_BRICK_MOSSY, livingrockBrickMossy);
+ register(r, LibBlockNames.LIVING_ROCK_BRICK_CRACKED, livingrockBrickCracked);
+ register(r, LibBlockNames.LIVING_ROCK_BRICK_CHISELED, livingrockBrickChiseled);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(3.5F).sound(SoundType.STONE);
- for (BlockAltar.Variant v : BlockAltar.Variant.values()) {
- r.register(new BlockAltar(v, builder)
- .setRegistryName(LibMisc.MOD_ID, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT)));
- }
-
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.LIVING_ROCK, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_ROCK_BRICK, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_ROCK_BRICK_MOSSY, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_ROCK_BRICK_CRACKED, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_ROCK_BRICK_CHISELED, new BlockMod(builder));
-
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
// todo 1.13: livingwood should support leaves
- register(r, LibBlockNames.LIVING_WOOD, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_WOOD_PLANKS, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_WOOD_PLANKS_MOSSY, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_WOOD_FRAMED, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_WOOD_PATTERN_FRAMED, new BlockMod(builder));
- register(r, LibBlockNames.LIVING_WOOD_GLIMMERING, new BlockMod(builder.lightValue(12)));
+ register(r, LibBlockNames.LIVING_WOOD, livingwood);
+ register(r, LibBlockNames.LIVING_WOOD_PLANKS, livingwoodPlanks);
+ register(r, LibBlockNames.LIVING_WOOD_PLANKS_MOSSY, livingwoodPlanksMossy);
+ register(r, LibBlockNames.LIVING_WOOD_FRAMED, livingwoodFramed);
+ register(r, LibBlockNames.LIVING_WOOD_PATTERN_FRAMED, livingwoodPatternFramed);
+ register(r, LibBlockNames.LIVING_WOOD_GLIMMERING, livingwoodGlimmering);
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
- register(r, LibBlockNames.SPREADER, new BlockSpreader(BlockSpreader.Variant.MANA, builder));
- register(r, LibBlockNames.SPREADER_REDSTONE, new BlockSpreader(BlockSpreader.Variant.REDSTONE, builder));
- register(r, LibBlockNames.SPREADER_ELVEN, new BlockSpreader(BlockSpreader.Variant.ELVEN, builder));
- register(r, LibBlockNames.SPREADER_GAIA, new BlockSpreader(BlockSpreader.Variant.GAIA, builder));
+ register(r, LibBlockNames.SPREADER, manaSpreader);
+ register(r, LibBlockNames.SPREADER_REDSTONE, redstoneSpreader);
+ register(r, LibBlockNames.SPREADER_ELVEN, elvenSpreader);
+ register(r, LibBlockNames.SPREADER_GAIA, gaiaSpreader);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.POOL, new BlockPool(BlockPool.Variant.DEFAULT, builder));
- register(r, LibBlockNames.POOL_CREATIVE, new BlockPool(BlockPool.Variant.CREATIVE, builder));
- register(r, LibBlockNames.POOL_DILUTED, new BlockPool(BlockPool.Variant.DILUTED, builder));
- register(r, LibBlockNames.POOL_FABULOUS, new BlockPool(BlockPool.Variant.FABULOUS, builder));
+ register(r, LibBlockNames.POOL, manaPool);
+ register(r, LibBlockNames.POOL_CREATIVE, creativePool);
+ register(r, LibBlockNames.POOL_DILUTED, dilutedPool);
+ register(r, LibBlockNames.POOL_FABULOUS, fabulousPool);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.RUNE_ALTAR, new BlockRuneAltar(builder));
+ register(r, LibBlockNames.RUNE_ALTAR, runeAltar);
+
+ register(r, LibBlockNames.PYLON, manaPylon);
+ register(r, LibBlockNames.PYLON_NATURA, naturaPylon);
+ register(r, LibBlockNames.PYLON_GAIA, gaiaPylon);
- builder = Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7);
- register(r, LibBlockNames.PYLON, new BlockPylon(BlockPylon.Variant.MANA, builder));
- register(r, LibBlockNames.PYLON_NATURA, new BlockPylon(BlockPylon.Variant.NATURA, builder));
- register(r, LibBlockNames.PYLON_GAIA, new BlockPylon(BlockPylon.Variant.GAIA, builder));
+ register(r, LibBlockNames.PISTON_RELAY, pistonRelay);
- builder = Block.Properties.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL);
- register(r, LibBlockNames.PISTON_RELAY, new BlockPistonRelay(builder));
+ register(r, LibBlockNames.DISTRIBUTOR, distributor);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.DISTRIBUTOR, new BlockDistributor(builder));
+ register(r, LibBlockNames.MANA_VOID, manaVoid);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE);
- register(r, LibBlockNames.MANA_VOID, new BlockManaVoid(builder));
+ register(r, LibBlockNames.MANA_DETECTOR, manaDetector);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.MANA_DETECTOR, new BlockManaDetector(builder));
+ register(r, LibBlockNames.ENCHANTER, enchanter);
+ register(r, LibBlockNames.TURNTABLE, turntable);
+ register(r, LibBlockNames.TINY_PLANET, tinyPlanet);
+ register(r, LibBlockNames.ALCHEMY_CATALYST, alchemyCatalyst);
- register(r, LibBlockNames.ENCHANTER, new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE)));
- register(r, LibBlockNames.TURNTABLE, new BlockTurntable(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
- register(r, LibBlockNames.TINY_PLANET, new BlockTinyPlanet(Block.Properties.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE)));
- register(r, LibBlockNames.ALCHEMY_CATALYST, new BlockAlchemyCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
+ register(r, LibBlockNames.OPEN_CRATE, openCrate);
+ register(r, LibBlockNames.CRAFT_CRATE, craftCrate);
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
- register(r, LibBlockNames.OPEN_CRATE, new BlockOpenCrate(builder));
- register(r, LibBlockNames.CRAFT_CRATE, new BlockCraftyCrate(builder));
+ register(r, LibBlockNames.FOREST_EYE, forestEye);
+
+ register(r, LibBlockNames.MANASTEEL_BLOCK, manasteelBlock);
+ register(r, LibBlockNames.TERRASTEEL_BLOCK, terrasteelBlock);
+ register(r, LibBlockNames.ELEMENTIUM_BLOCK, elementiumBlock);
+ register(r, LibBlockNames.MANA_DIAMOND_BLOCK, manaDiamondBlock);
+ register(r, LibBlockNames.DRAGONSTONE_BLOCK, dragonstoneBlock);
- register(r, LibBlockNames.FOREST_EYE, new BlockForestEye(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 10).sound(SoundType.METAL)));
+ 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);
+ register(r, "light_blue" + LibBlockNames.SHINY_FLOWER_SUFFIX, lightBlueShinyFlower);
+ register(r, "yellow" + LibBlockNames.SHINY_FLOWER_SUFFIX, yellowShinyFlower);
+ register(r, "lime" + LibBlockNames.SHINY_FLOWER_SUFFIX, limeShinyFlower);
+ register(r, "pink" + LibBlockNames.SHINY_FLOWER_SUFFIX, pinkShinyFlower);
+ register(r, "gray" + LibBlockNames.SHINY_FLOWER_SUFFIX, grayShinyFlower);
+ register(r, "light_gray" + LibBlockNames.SHINY_FLOWER_SUFFIX, lightGrayShinyFlower);
+ register(r, "cyan" + LibBlockNames.SHINY_FLOWER_SUFFIX, cyanShinyFlower);
+ register(r, "purple" + LibBlockNames.SHINY_FLOWER_SUFFIX, purpleShinyFlower);
+ register(r, "blue" + LibBlockNames.SHINY_FLOWER_SUFFIX, blueShinyFlower);
+ register(r, "brown" + LibBlockNames.SHINY_FLOWER_SUFFIX, brownShinyFlower);
+ register(r, "green" + LibBlockNames.SHINY_FLOWER_SUFFIX, greenShinyFlower);
+ register(r, "red" + LibBlockNames.SHINY_FLOWER_SUFFIX, redShinyFlower);
+ register(r, "black" + LibBlockNames.SHINY_FLOWER_SUFFIX, blackShinyFlower);
- builder = Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL);
- register(r, LibBlockNames.MANASTEEL_BLOCK, new BlockStorage(builder));
- register(r, LibBlockNames.TERRASTEEL_BLOCK, new BlockStorage(builder));
- register(r, LibBlockNames.ELEMENTIUM_BLOCK, new BlockStorage(builder));
- register(r, LibBlockNames.MANA_DIAMOND_BLOCK, new BlockStorage(builder));
- register(r, LibBlockNames.DRAGONSTONE_BLOCK, new BlockStorage(builder));
+ register(r, LibBlockNames.PLATFORM_ABSTRUSE, abstrusePlatform);
+ register(r, LibBlockNames.PLATFORM_SPECTRAL, spectralPlatform);
+ register(r, LibBlockNames.PLATFORM_INFRANGIBLE, infrangiblePlatform);
+ register(r, LibBlockNames.ALF_PORTAL, alfPortal);
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
- register(r, LibBlockNames.DRUM_WILD, new BlockForestDrum(BlockForestDrum.Variant.WILD, builder));
- register(r, LibBlockNames.DRUM_CANOPY, new BlockForestDrum(BlockForestDrum.Variant.CANOPY, builder));
- register(r, LibBlockNames.DRUM_GATHERING, new BlockForestDrum(BlockForestDrum.Variant.GATHERING, builder));
-
- builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(15);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.SHINY_FLOWER_SUFFIX, new BlockShinyFlower(color, builder));
- }
-
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD);
- register(r, LibBlockNames.PLATFORM_ABSTRUSE, new BlockPlatform(BlockPlatform.Variant.ABSTRUSE, builder));
- register(r, LibBlockNames.PLATFORM_SPECTRAL, new BlockPlatform(BlockPlatform.Variant.SPECTRAL, builder));
- register(r, LibBlockNames.PLATFORM_INFRANGIBLE, new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, Block.Properties.create(Material.WOOD).hardnessAndResistance(-1, Float.MAX_VALUE).sound(SoundType.WOOD)));
- register(r, LibBlockNames.ALF_PORTAL, new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD)));
-
- builder = Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD);
// todo 1.13: dreamwood should support leaves?
- register(r, LibBlockNames.DREAM_WOOD, new BlockMod(builder));
- register(r, LibBlockNames.DREAM_WOOD_PLANKS, new BlockMod(builder));
- register(r, LibBlockNames.DREAM_WOOD_PLANKS_MOSSY, new BlockMod(builder));
- register(r, LibBlockNames.DREAM_WOOD_FRAMED, new BlockMod(builder));
- register(r, LibBlockNames.DREAM_WOOD_PATTERN_FRAMED, new BlockMod(builder));
- register(r, LibBlockNames.DREAM_WOOD_GLIMMERING, new BlockMod(builder.lightValue(12)));
+ register(r, LibBlockNames.DREAM_WOOD, dreamwood);
+ register(r, LibBlockNames.DREAM_WOOD_PLANKS, dreamwoodPlanks);
+ register(r, LibBlockNames.DREAM_WOOD_PLANKS_MOSSY, dreamwoodPlanksMossy);
+ register(r, LibBlockNames.DREAM_WOOD_FRAMED, dreamwoodFramed);
+ register(r, LibBlockNames.DREAM_WOOD_PATTERN_FRAMED, dreamwoodPatternFramed);
+ register(r, LibBlockNames.DREAM_WOOD_GLIMMERING, dreamwoodGlimmering);
- register(r, LibBlockNames.CONJURATION_CATALYST, new BlockConjurationCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
- register(r, LibBlockNames.BIFROST, new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()));
- register(r, LibBlockNames.SOLID_VINE, new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).notSolid()));
+ 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);
+ register(r, "light_blue" + LibBlockNames.BURIED_PETALS_SUFFIX, lightBlueBuriedPetals);
+ register(r, "yellow" + LibBlockNames.BURIED_PETALS_SUFFIX, yellowBuriedPetals);
+ register(r, "lime" + LibBlockNames.BURIED_PETALS_SUFFIX, limeBuriedPetals);
+ register(r, "pink" + LibBlockNames.BURIED_PETALS_SUFFIX, pinkBuriedPetals);
+ register(r, "gray" + LibBlockNames.BURIED_PETALS_SUFFIX, grayBuriedPetals);
+ register(r, "light_gray" + LibBlockNames.BURIED_PETALS_SUFFIX, lightGrayBuriedPetals);
+ register(r, "cyan" + LibBlockNames.BURIED_PETALS_SUFFIX, cyanBuriedPetals);
+ register(r, "purple" + LibBlockNames.BURIED_PETALS_SUFFIX, purpleBuriedPetals);
+ register(r, "blue" + LibBlockNames.BURIED_PETALS_SUFFIX, blueBuriedPetals);
+ register(r, "brown" + LibBlockNames.BURIED_PETALS_SUFFIX, brownBuriedPetals);
+ 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);
+ register(r, "light_blue" + LibBlockNames.FLOATING_FLOWER_SUFFIX, lightBlueFloatingFlower);
+ register(r, "yellow" + LibBlockNames.FLOATING_FLOWER_SUFFIX, yellowFloatingFlower);
+ register(r, "lime" + LibBlockNames.FLOATING_FLOWER_SUFFIX, limeFloatingFlower);
+ register(r, "pink" + LibBlockNames.FLOATING_FLOWER_SUFFIX, pinkFloatingFlower);
+ register(r, "gray" + LibBlockNames.FLOATING_FLOWER_SUFFIX, grayFloatingFlower);
+ register(r, "light_gray" + LibBlockNames.FLOATING_FLOWER_SUFFIX, lightGrayFloatingFlower);
+ register(r, "cyan" + LibBlockNames.FLOATING_FLOWER_SUFFIX, cyanFloatingFlower);
+ register(r, "purple" + LibBlockNames.FLOATING_FLOWER_SUFFIX, purpleFloatingFlower);
+ register(r, "blue" + LibBlockNames.FLOATING_FLOWER_SUFFIX, blueFloatingFlower);
+ register(r, "brown" + LibBlockNames.FLOATING_FLOWER_SUFFIX, brownFloatingFlower);
+ register(r, "green" + LibBlockNames.FLOATING_FLOWER_SUFFIX, greenFloatingFlower);
+ register(r, "red" + LibBlockNames.FLOATING_FLOWER_SUFFIX, redFloatingFlower);
+ register(r, "black" + LibBlockNames.FLOATING_FLOWER_SUFFIX, blackFloatingFlower);
- builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(4);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.BURIED_PETALS_SUFFIX, new BlockBuriedPetals(color, builder));
- }
+ 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);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 3, azulejo3);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 4, azulejo4);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 5, azulejo5);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 6, azulejo6);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 7, azulejo7);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 8, azulejo8);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 9, azulejo9);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 10, azulejo10);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 11, azulejo11);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 12, azulejo12);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 13, azulejo13);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 14, azulejo14);
+ register(r, LibBlockNames.AZULEJO_PREFIX + 15, azulejo15);
- builder = Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.FLOATING_FLOWER_SUFFIX, new BlockFloatingFlower(color, builder));
- }
+ register(r, LibBlockNames.ENDER_EYE_BLOCK, enderEye);
+ register(r, LibBlockNames.STARFIELD, starfield);
+ register(r, LibBlockNames.FLUXFIELD, rfGenerator);
+ register(r, LibBlockNames.ELF_GLASS, elfGlass);
+ register(r, LibBlockNames.BREWERY, brewery);
+ register(r, LibBlockNames.MANA_GLASS, manaGlass);
+ register(r, LibBlockNames.TERRA_PLATE, terraPlate);
- register(r, LibBlockNames.TINY_POTATO, new BlockTinyPotato(Block.Properties.create(Material.WOOL).hardnessAndResistance(0.25F)));
- register(r, LibBlockNames.SPAWNER_CLAW, new BlockSpawnerClaw(Block.Properties.create(Material.IRON).hardnessAndResistance(3)));
+ register(r, LibBlockNames.RED_STRING_CONTAINER, redStringContainer);
+ register(r, LibBlockNames.RED_STRING_DISPENSER, redStringDispenser);
+ register(r, LibBlockNames.RED_STRING_FERTILIZER, redStringFertilizer);
+ register(r, LibBlockNames.RED_STRING_COMPARATOR, redStringComparator);
+ register(r, LibBlockNames.RED_STRING_RELAY, redStringRelay);
+ register(r, LibBlockNames.RED_STRING_INTERCEPTOR, redStringInterceptor);
+ 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);
+ register(r, "light_blue" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockLightBlue);
+ register(r, "yellow" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockYellow);
+ register(r, "lime" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockLime);
+ register(r, "pink" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockPink);
+ register(r, "gray" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockGray);
+ register(r, "light_gray" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockSilver);
+ register(r, "cyan" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockCyan);
+ register(r, "purple" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockPurple);
+ register(r, "blue" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockBlue);
+ register(r, "brown" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockBrown);
+ register(r, "green" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockGreen);
+ register(r, "red" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockRed);
+ register(r, "black" + LibBlockNames.PETAL_BLOCK_SUFFIX, petalBlockBlack);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE);
- for (int i = 0; i < 16; i++) {
- register(r, LibBlockNames.AZULEJO_PREFIX + i, new BlockMod(builder));
- }
+ 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);
+ register(r, "light_blue" + LibBlockNames.MUSHROOM_SUFFIX, lightBlueMushroom);
+ register(r, "yellow" + LibBlockNames.MUSHROOM_SUFFIX, yellowMushroom);
+ register(r, "lime" + LibBlockNames.MUSHROOM_SUFFIX, limeMushroom);
+ register(r, "pink" + LibBlockNames.MUSHROOM_SUFFIX, pinkMushroom);
+ register(r, "gray" + LibBlockNames.MUSHROOM_SUFFIX, grayMushroom);
+ register(r, "light_gray" + LibBlockNames.MUSHROOM_SUFFIX, lightGrayMushroom);
+ register(r, "cyan" + LibBlockNames.MUSHROOM_SUFFIX, cyanMushroom);
+ register(r, "purple" + LibBlockNames.MUSHROOM_SUFFIX, purpleMushroom);
+ register(r, "blue" + LibBlockNames.MUSHROOM_SUFFIX, blueMushroom);
+ register(r, "brown" + LibBlockNames.MUSHROOM_SUFFIX, brownMushroom);
+ register(r, "green" + LibBlockNames.MUSHROOM_SUFFIX, greenMushroom);
+ register(r, "red" + LibBlockNames.MUSHROOM_SUFFIX, redMushroom);
+ register(r, "black" + LibBlockNames.MUSHROOM_SUFFIX, blackMushroom);
- register(r, LibBlockNames.ENDER_EYE_BLOCK, new BlockEnderEye(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)));
- register(r, LibBlockNames.STARFIELD, new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)));
- register(r, LibBlockNames.FLUXFIELD, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
- register(r, LibBlockNames.ELF_GLASS, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).notSolid()));
- register(r, LibBlockNames.BREWERY, new BlockBrewery(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
- register(r, LibBlockNames.MANA_GLASS, new BlockModGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).notSolid()));
- register(r, LibBlockNames.TERRA_PLATE, new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)));
+ 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);
+ register(r, "light_blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerLightBlue);
+ register(r, "yellow" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerYellow);
+ register(r, "lime" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerLime);
+ register(r, "pink" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerPink);
+ register(r, "gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerGray);
+ register(r, "light_gray" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerLightGray);
+ register(r, "cyan" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerCyan);
+ register(r, "purple" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerPurple);
+ register(r, "blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerBlue);
+ register(r, "brown" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerBrown);
+ register(r, "green" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerGreen);
+ register(r, "red" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerRed);
+ register(r, "black" + LibBlockNames.DOUBLE_FLOWER_SUFFIX, doubleFlowerBlack);
- builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- register(r, LibBlockNames.RED_STRING_CONTAINER, new BlockRedStringContainer(builder));
- register(r, LibBlockNames.RED_STRING_DISPENSER, new BlockRedStringDispenser(builder));
- register(r, LibBlockNames.RED_STRING_FERTILIZER, new BlockRedStringFertilizer(builder));
- register(r, LibBlockNames.RED_STRING_COMPARATOR, new BlockRedStringComparator(builder));
- register(r, LibBlockNames.RED_STRING_RELAY, new BlockRedStringRelay(builder));
- register(r, LibBlockNames.RED_STRING_INTERCEPTOR, new BlockRedStringInterceptor(builder));
- register(r, LibBlockNames.MANA_FLAME, new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement()));
- register(r, LibBlockNames.PRISM, new BlockPrism(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).doesNotBlockMovement()));
- register(r, LibBlockNames.ENCHANTED_SOIL, new BlockEnchantedSoil(Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).sound(SoundType.PLANT)));
+ register(r, LibBlockNames.FAKE_AIR, fakeAir);
+ register(r, LibBlockNames.BLAZE_BLOCK, blazeBlock);
+ register(r, LibBlockNames.CORPOREA_INTERCEPTOR, corporeaInterceptor);
+ register(r, LibBlockNames.CORPOREA_CRYSTAL_CUBE, corporeaCrystalCube);
+ register(r, LibBlockNames.INCENSE_PLATE, incensePlate);
+ register(r, LibBlockNames.HOURGLASS, hourglass);
+ register(r, LibBlockNames.GHOST_RAIL, ghostRail);
+ register(r, LibBlockNames.SPARK_CHANGER, sparkChanger);
+ register(r, LibBlockNames.ROOT, root);
+ register(r, LibBlockNames.FEL_PUMPKIN, felPumpkin);
+ register(r, LibBlockNames.COCOON, cocoon);
- builder = Block.Properties.create(Material.PLANTS).hardnessAndResistance(0.4F).sound(SoundType.PLANT);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX, new BlockPetalBlock(color, builder));
- }
+ register(r, LibBlockNames.LIGHT_RELAY, lightRelayDefault);
+ register(r, "detector" + LibBlockNames.LIGHT_RELAY_SUFFIX, lightRelayDetector);
+ register(r, "fork" + LibBlockNames.LIGHT_RELAY_SUFFIX, lightRelayFork);
+ register(r, "toggle" + LibBlockNames.LIGHT_RELAY_SUFFIX, lightRelayToggle);
- register(r, LibBlockNames.CORPOREA_INDEX, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).notSolid()));
- register(r, LibBlockNames.CORPOREA_FUNNEL, new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)));
+ register(r, LibBlockNames.LIGHT_LAUNCHER, lightLauncher);
+ register(r, LibBlockNames.MANA_BOMB, manaBomb);
+ register(r, LibBlockNames.CACOPHONIUM, cacophonium);
+ register(r, LibBlockNames.BELLOWS, bellows);
+ register(r, LibBlockNames.BIFROST_PERM, bifrostPerm);
+ register(r, LibBlockNames.CELL_BLOCK, cellBlock);
+ register(r, LibBlockNames.GAIA_WALL_HEAD, gaiaHeadWall);
+ register(r, LibBlockNames.GAIA_HEAD, gaiaHead);
+ register(r, LibBlockNames.CORPOREA_RETAINER, corporeaRetainer);
+ register(r, LibBlockNames.TERU_TERU_BOZU, teruTeruBozu);
+ register(r, LibBlockNames.SHIMMERROCK, shimmerrock);
+ register(r, LibBlockNames.SHIMMERWOOD_PLANKS, shimmerwoodPlanks);
+ register(r, LibBlockNames.AVATAR, avatar);
- builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.MUSHROOM_SUFFIX, new BlockModMushroom(color, builder));
- }
+ register(r, BlockAltGrass.Variant.DRY.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, dryGrass);
+ register(r, BlockAltGrass.Variant.GOLDEN.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, goldenGrass);
+ register(r, BlockAltGrass.Variant.VIVID.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, vividGrass);
+ register(r, BlockAltGrass.Variant.SCORCHED.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, scorchedGrass);
+ register(r, BlockAltGrass.Variant.INFUSED.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, infusedGrass);
+ register(r, BlockAltGrass.Variant.MUTATED.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, mutatedGrass);
- register(r, LibBlockNames.PUMP, new BlockPump(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
-
- builder = Block.Properties.create(Material.TALL_PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT);
- for (DyeColor color : DyeColor.values()) {
- register(r, color.getName() + LibBlockNames.DOUBLE_FLOWER_SUFFIX, new BlockModDoubleFlower(color, builder));
- }
-
- register(r, LibBlockNames.FAKE_AIR, new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly()));
- register(r, LibBlockNames.BLAZE_BLOCK, new BlockMod(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15)));
- register(r, LibBlockNames.CORPOREA_INTERCEPTOR, new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)));
- register(r, LibBlockNames.CORPOREA_CRYSTAL_CUBE, new BlockCorporeaCrystalCube(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)));
- register(r, LibBlockNames.INCENSE_PLATE, new BlockIncensePlate(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
- register(r, LibBlockNames.HOURGLASS, new BlockHourglass(Block.Properties.create(Material.IRON).hardnessAndResistance(2).sound(SoundType.METAL)));
- register(r, LibBlockNames.GHOST_RAIL, new BlockGhostRail(Block.Properties.create(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0.7F).sound(SoundType.METAL)));
- register(r, LibBlockNames.SPARK_CHANGER, new BlockSparkChanger(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
- register(r, LibBlockNames.ROOT, new BlockRoot(Block.Properties.create(Material.PLANTS).hardnessAndResistance(1.2F).sound(SoundType.WOOD)));
- register(r, LibBlockNames.FEL_PUMPKIN, new BlockFelPumpkin(Block.Properties.from(Blocks.CARVED_PUMPKIN)));
- register(r, LibBlockNames.COCOON, new BlockCocoon(Block.Properties.create(Material.WOOL).hardnessAndResistance(3, 60).sound(SoundType.CLOTH)));
-
- builder = Block.Properties.create(Material.GLASS).doesNotBlockMovement();
- register(r, LibBlockNames.LIGHT_RELAY, new BlockLightRelay(LuminizerVariant.DEFAULT, builder));
- register(r, "detector" + LibBlockNames.LIGHT_RELAY_SUFFIX, new BlockLightRelay(LuminizerVariant.DETECTOR, builder));
- register(r, "fork" + LibBlockNames.LIGHT_RELAY_SUFFIX, new BlockLightRelay(LuminizerVariant.FORK, builder));
- register(r, "toggle" + LibBlockNames.LIGHT_RELAY_SUFFIX, new BlockLightRelay(LuminizerVariant.TOGGLE, builder));
-
- register(r, LibBlockNames.LIGHT_LAUNCHER, new BlockLightLauncher(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
- register(r, LibBlockNames.MANA_BOMB, new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD)));
- register(r, LibBlockNames.CACOPHONIUM, new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F)));
- register(r, LibBlockNames.BELLOWS, new BlockBellows(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
- register(r, LibBlockNames.BIFROST_PERM, new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()));
- register(r, LibBlockNames.CELL_BLOCK, new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH)));
- register(r, LibBlockNames.GAIA_WALL_HEAD, new BlockGaiaHeadWall(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)));
- register(r, LibBlockNames.GAIA_HEAD, new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)));
- register(r, LibBlockNames.CORPOREA_RETAINER, new BlockCorporeaRetainer(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)));
- register(r, LibBlockNames.TERU_TERU_BOZU, new BlockTeruTeruBozu(Block.Properties.create(Material.WOOL)));
- register(r, LibBlockNames.SHIMMERROCK, new BlockMod(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)));
- register(r, LibBlockNames.SHIMMERWOOD_PLANKS, new BlockMod(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
- register(r, LibBlockNames.AVATAR, new BlockAvatar(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)));
-
- builder = Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).tickRandomly().sound(SoundType.PLANT);
- for (BlockAltGrass.Variant v : BlockAltGrass.Variant.values()) {
- register(r, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX, new BlockAltGrass(v, builder));
- }
-
- register(r, LibBlockNames.ANIMATED_TORCH, new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid()));
+ register(r, LibBlockNames.ANIMATED_TORCH, animatedTorch);
}
public static void registerItemBlocks(RegistryEvent.Register- evt) {
IForgeRegistry
- r = evt.getRegistry();
Item.Properties props = ModItems.defaultBuilder();
-
register(r, Registry.BLOCK.getKey(whiteFlower), new BlockItem(whiteFlower, props));
register(r, Registry.BLOCK.getKey(orangeFlower), new BlockItem(orangeFlower, props));
register(r, Registry.BLOCK.getKey(magentaFlower), new BlockItem(magentaFlower, props));
diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java
index 6bd338af3..22cb33e71 100644
--- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java
+++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java
@@ -15,465 +15,406 @@ import net.minecraft.item.Item;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.registries.IForgeRegistry;
-import net.minecraftforge.registries.ObjectHolder;
-
import vazkii.botania.common.block.decor.panes.BlockModPane;
import vazkii.botania.common.block.decor.stairs.BlockModStairs;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
-import vazkii.botania.common.lib.LibMisc;
-import static vazkii.botania.common.block.ModBlocks.register;
+import static vazkii.botania.common.block.ModBlocks.*;
import static vazkii.botania.common.lib.LibBlockNames.*;
-import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
-@ObjectHolder(LibMisc.MOD_ID)
public final class ModFluffBlocks {
+ public static Block livingwoodStairs = new BlockModStairs(livingwood.getDefaultState(), Block.Properties.from(livingwood));
+ public static Block livingwoodSlab = new SlabBlock(Block.Properties.from(livingwood));
+ public static Block livingwoodWall = new WallBlock(Block.Properties.from(livingwood));
+ public static Block livingwoodFence = new FenceBlock(Block.Properties.from(livingwood));
+ public static Block livingwoodFenceGate = new FenceGateBlock(Block.Properties.from(livingwood));
+ public static Block livingwoodPlankStairs = new BlockModStairs(livingwoodPlanks.getDefaultState(), Block.Properties.from(livingwoodPlanks));
+ public static Block livingwoodPlankSlab = new SlabBlock(Block.Properties.from(livingwoodPlanks));
+ public static Block livingrockStairs = new BlockModStairs(livingrock.getDefaultState(), Block.Properties.from(livingrock));
+ public static Block livingrockSlab = new SlabBlock(Block.Properties.from(livingrock));
+ public static Block livingrockWall = new WallBlock(Block.Properties.from(livingrock));
+ public static Block livingrockBrickStairs = new BlockModStairs(livingrockBrick.getDefaultState(), Block.Properties.from(livingrockBrick));
+ public static Block livingrockBrickSlab = new SlabBlock(Block.Properties.from(livingrockBrick));
+ public static Block dreamwoodStairs = new BlockModStairs(dreamwood.getDefaultState(), Block.Properties.from(dreamwood));
+ public static Block dreamwoodSlab = new SlabBlock(Block.Properties.from(dreamwood));
+ public static Block dreamwoodWall = new WallBlock(Block.Properties.from(dreamwood));
+ public static Block dreamwoodFence = new FenceBlock(Block.Properties.from(dreamwood));
+ public static Block dreamwoodFenceGate = new FenceGateBlock(Block.Properties.from(dreamwood));
+ public static Block dreamwoodPlankStairs = new BlockModStairs(dreamwoodPlanks.getDefaultState(), Block.Properties.from(dreamwoodPlanks));
+ public static Block dreamwoodPlankSlab = new SlabBlock(Block.Properties.from(dreamwoodPlanks));
- @ObjectHolder(LibBlockNames.LIVING_WOOD + STAIR_SUFFIX)
- public static Block livingwoodStairs;
- @ObjectHolder(LibBlockNames.LIVING_WOOD + SLAB_SUFFIX)
- public static Block livingwoodSlab;
- @ObjectHolder(LibBlockNames.LIVING_WOOD + WALL_SUFFIX)
- public static Block livingwoodWall;
- @ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_SUFFIX)
- public static Block livingwoodFence;
- @ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX)
- public static Block livingwoodFenceGate;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX)
- public static Block livingwoodPlankStairs;
- @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX)
- public static Block livingwoodPlankSlab;
- @ObjectHolder(LibBlockNames.LIVING_ROCK + STAIR_SUFFIX)
- public static Block livingrockStairs;
- @ObjectHolder(LibBlockNames.LIVING_ROCK + SLAB_SUFFIX)
- public static Block livingrockSlab;
- @ObjectHolder(LibBlockNames.LIVING_ROCK + WALL_SUFFIX)
- public static Block livingrockWall;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX)
- public static Block livingrockBrickStairs;
- @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX)
- public static Block livingrockBrickSlab;
- @ObjectHolder(LibBlockNames.DREAM_WOOD + STAIR_SUFFIX)
- public static Block dreamwoodStairs;
- @ObjectHolder(LibBlockNames.DREAM_WOOD + SLAB_SUFFIX)
- public static Block dreamwoodSlab;
- @ObjectHolder(LibBlockNames.DREAM_WOOD + WALL_SUFFIX)
- public static Block dreamwoodWall;
- @ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_SUFFIX)
- public static Block dreamwoodFence;
- @ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX)
- public static Block dreamwoodFenceGate;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX)
- public static Block dreamwoodPlankStairs;
- @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX)
- public static Block dreamwoodPlankSlab;
+ public static Block darkQuartz = new BlockMod(Block.Properties.from(Blocks.QUARTZ_BLOCK));
+ public static Block darkQuartzChiseled = new BlockMod(Block.Properties.from(darkQuartz));
+ 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));
+ public static Block biomeCobblestoneForest = new BlockMod(Block.Properties.from(biomeStoneForest));
+ public static Block biomeCobblestoneForestSlab = new SlabBlock(Block.Properties.from(biomeStoneForest));
+ public static Block biomeCobblestoneForestStairs = new BlockModStairs(biomeStoneForest.getDefaultState(), Block.Properties.from(biomeStoneForest));
+ public static Block biomeWallForest = new WallBlock(Block.Properties.from(biomeStoneForest));
+ public static Block biomeBrickForest = new BlockMod(Block.Properties.from(biomeStoneForest));
+ 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));
+ public static Block biomeCobblestonePlains = new BlockMod(Block.Properties.from(biomeStonePlains));
+ public static Block biomeCobblestonePlainsSlab = new SlabBlock(Block.Properties.from(biomeStonePlains));
+ public static Block biomeCobblestonePlainsStairs = new BlockModStairs(biomeStonePlains.getDefaultState(), Block.Properties.from(biomeStonePlains));
+ public static Block biomeWallPlains = new WallBlock(Block.Properties.from(biomeStonePlains));
+ public static Block biomeBrickPlains = new BlockMod(Block.Properties.from(biomeStonePlains));
+ 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));
+ public static Block biomeCobblestoneMountain = new BlockMod(Block.Properties.from(biomeStoneMountain));
+ public static Block biomeCobblestoneMountainSlab = new SlabBlock(Block.Properties.from(biomeStoneMountain));
+ public static Block biomeCobblestoneMountainStairs = new BlockModStairs(biomeStoneMountain.getDefaultState(), Block.Properties.from(biomeStoneMountain));
+ public static Block biomeWallMountain = new WallBlock(Block.Properties.from(biomeStoneMountain));
+ public static Block biomeBrickMountain = new BlockMod(Block.Properties.from(biomeStoneMountain));
+ 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));
+ public static Block biomeCobblestoneFungal = new BlockMod(Block.Properties.from(biomeStoneFungal));
+ public static Block biomeCobblestoneFungalSlab = new SlabBlock(Block.Properties.from(biomeStoneFungal));
+ public static Block biomeCobblestoneFungalStairs = new BlockModStairs(biomeStoneFungal.getDefaultState(), Block.Properties.from(biomeStoneFungal));
+ public static Block biomeWallFungal = new WallBlock(Block.Properties.from(biomeStoneFungal));
+ public static Block biomeBrickFungal = new BlockMod(Block.Properties.from(biomeStoneFungal));
+ 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));
+ public static Block biomeCobblestoneSwamp = new BlockMod(Block.Properties.from(biomeStoneSwamp));
+ public static Block biomeCobblestoneSwampSlab = new SlabBlock(Block.Properties.from(biomeStoneSwamp));
+ public static Block biomeCobblestoneSwampStairs = new BlockModStairs(biomeStoneSwamp.getDefaultState(), Block.Properties.from(biomeStoneSwamp));
+ public static Block biomeWallSwamp = new WallBlock(Block.Properties.from(biomeStoneSwamp));
+ public static Block biomeBrickSwamp = new BlockMod(Block.Properties.from(biomeStoneSwamp));
+ 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));
+ public static Block biomeCobblestoneDesert = new BlockMod(Block.Properties.from(biomeStoneDesert));
+ public static Block biomeCobblestoneDesertSlab = new SlabBlock(Block.Properties.from(biomeStoneDesert));
+ public static Block biomeCobblestoneDesertStairs = new BlockModStairs(biomeStoneDesert.getDefaultState(), Block.Properties.from(biomeStoneDesert));
+ public static Block biomeWallDesert = new WallBlock(Block.Properties.from(biomeStoneDesert));
+ public static Block biomeBrickDesert = new BlockMod(Block.Properties.from(biomeStoneDesert));
+ 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));
+ public static Block biomeCobblestoneTaiga = new BlockMod(Block.Properties.from(biomeStoneTaiga));
+ public static Block biomeCobblestoneTaigaSlab = new SlabBlock(Block.Properties.from(biomeStoneTaiga));
+ public static Block biomeCobblestoneTaigaStairs = new BlockModStairs(biomeStoneTaiga.getDefaultState(), Block.Properties.from(biomeStoneTaiga));
+ public static Block biomeWallTaiga = new WallBlock(Block.Properties.from(biomeStoneTaiga));
+ public static Block biomeBrickTaiga = new BlockMod(Block.Properties.from(biomeStoneTaiga));
+ 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));
+ public static Block biomeCobblestoneMesa = new BlockMod(Block.Properties.from(biomeStoneMesa));
+ public static Block biomeCobblestoneMesaSlab = new SlabBlock(Block.Properties.from(biomeStoneMesa));
+ public static Block biomeCobblestoneMesaStairs = new BlockModStairs(biomeStoneMesa.getDefaultState(), Block.Properties.from(biomeStoneMesa));
+ public static Block biomeWallMesa = new WallBlock(Block.Properties.from(biomeStoneMesa));
+ public static Block biomeBrickMesa = new BlockMod(Block.Properties.from(biomeStoneMesa));
+ public static Block biomeBrickMesaSlab = new SlabBlock(Block.Properties.from(biomeStoneMesa));
+ public static Block biomeBrickMesaStairs = new BlockModStairs(biomeStoneMesa.getDefaultState(), Block.Properties.from(biomeStoneMesa));
+ public static Block biomeChiseledBrickMesa = new BlockMod(Block.Properties.from(biomeStoneMesa));
- @ObjectHolder(LibBlockNames.QUARTZ_DARK)
- public static Block darkQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_DARK)
- public static Block darkQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_DARK + "_pillar")
- public static Block darkQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_DARK + SLAB_SUFFIX)
- public static Block darkQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_DARK + STAIR_SUFFIX)
- public static Block darkQuartzStairs;
+ 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));
- @ObjectHolder(LibBlockNames.QUARTZ_MANA)
- public static Block manaQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_MANA)
- public static Block manaQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_MANA + "_pillar")
- public static Block manaQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_MANA + SLAB_SUFFIX)
- public static Block manaQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_MANA + STAIR_SUFFIX)
- public static Block manaQuartzStairs;
-
- @ObjectHolder(LibBlockNames.QUARTZ_BLAZE)
- public static Block blazeQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_BLAZE)
- public static Block blazeQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_BLAZE + "_pillar")
- public static Block blazeQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_BLAZE + SLAB_SUFFIX)
- public static Block blazeQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_BLAZE + STAIR_SUFFIX)
- public static Block blazeQuartzStairs;
-
- @ObjectHolder(LibBlockNames.QUARTZ_LAVENDER)
- public static Block lavenderQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_LAVENDER)
- public static Block lavenderQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_LAVENDER + "_pillar")
- public static Block lavenderQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_LAVENDER + SLAB_SUFFIX)
- public static Block lavenderQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_LAVENDER + STAIR_SUFFIX)
- public static Block lavenderQuartzStairs;
-
- @ObjectHolder(LibBlockNames.QUARTZ_RED)
- public static Block redQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_RED)
- public static Block redQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_RED + "_pillar")
- public static Block redQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_RED + SLAB_SUFFIX)
- public static Block redQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_RED + STAIR_SUFFIX)
- public static Block redQuartzStairs;
-
- @ObjectHolder(LibBlockNames.QUARTZ_ELF)
- public static Block elfQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_ELF)
- public static Block elfQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_ELF + "_pillar")
- public static Block elfQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_ELF + SLAB_SUFFIX)
- public static Block elfQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_ELF + STAIR_SUFFIX)
- public static Block elfQuartzStairs;
-
- @ObjectHolder(LibBlockNames.QUARTZ_SUNNY)
- public static Block sunnyQuartz;
- @ObjectHolder("chiseled_" + LibBlockNames.QUARTZ_SUNNY)
- public static Block sunnyQuartzChiseled;
- @ObjectHolder(LibBlockNames.QUARTZ_SUNNY + "_pillar")
- public static Block sunnyQuartzPillar;
- @ObjectHolder(LibBlockNames.QUARTZ_SUNNY + SLAB_SUFFIX)
- public static Block sunnyQuartzSlab;
- @ObjectHolder(LibBlockNames.QUARTZ_SUNNY + STAIR_SUFFIX)
- public static Block sunnyQuartzStairs;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_stone")
- public static Block biomeStoneForest;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_stone" + SLAB_SUFFIX)
- public static Block biomeStoneForestSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_stone" + STAIR_SUFFIX)
- public static Block biomeStoneForestStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone")
- public static Block biomeCobblestoneForest;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneForestSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneForestStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallForest;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks")
- public static Block biomeBrickForest;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickForestSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickForestStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "forest_bricks")
- public static Block biomeChiseledBrickForest;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_stone")
- public static Block biomeStonePlains;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_stone" + SLAB_SUFFIX)
- public static Block biomeStonePlainsSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_stone" + STAIR_SUFFIX)
- public static Block biomeStonePlainsStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone")
- public static Block biomeCobblestonePlains;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestonePlainsSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestonePlainsStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallPlains;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks")
- public static Block biomeBrickPlains;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickPlainsSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickPlainsStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "plains_bricks")
- public static Block biomeChiseledBrickPlains;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_stone")
- public static Block biomeStoneMountain;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_stone" + SLAB_SUFFIX)
- public static Block biomeStoneMountainSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_stone" + STAIR_SUFFIX)
- public static Block biomeStoneMountainStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone")
- public static Block biomeCobblestoneMountain;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneMountainSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneMountainStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallMountain;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks")
- public static Block biomeBrickMountain;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickMountainSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickMountainStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "mountain_bricks")
- public static Block biomeChiseledBrickMountain;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_stone")
- public static Block biomeStoneFungal;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_stone" + SLAB_SUFFIX)
- public static Block biomeStoneFungalSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_stone" + STAIR_SUFFIX)
- public static Block biomeStoneFungalStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone")
- public static Block biomeCobblestoneFungal;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneFungalSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneFungalStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallFungal;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks")
- public static Block biomeBrickFungal;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickFungalSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickFungalStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "fungal_bricks")
- public static Block biomeChiseledBrickFungal;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_stone")
- public static Block biomeStoneSwamp;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_stone" + SLAB_SUFFIX)
- public static Block biomeStoneSwampSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_stone" + STAIR_SUFFIX)
- public static Block biomeStoneSwampStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone")
- public static Block biomeCobblestoneSwamp;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneSwampSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneSwampStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallSwamp;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks")
- public static Block biomeBrickSwamp;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickSwampSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickSwampStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "swamp_bricks")
- public static Block biomeChiseledBrickSwamp;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_stone")
- public static Block biomeStoneDesert;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_stone" + SLAB_SUFFIX)
- public static Block biomeStoneDesertSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_stone" + STAIR_SUFFIX)
- public static Block biomeStoneDesertStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone")
- public static Block biomeCobblestoneDesert;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneDesertSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneDesertStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallDesert;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks")
- public static Block biomeBrickDesert;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickDesertSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickDesertStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "desert_bricks")
- public static Block biomeChiseledBrickDesert;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_stone")
- public static Block biomeStoneTaiga;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_stone" + SLAB_SUFFIX)
- public static Block biomeStoneTaigaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_stone" + STAIR_SUFFIX)
- public static Block biomeStoneTaigaStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone")
- public static Block biomeCobblestoneTaiga;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneTaigaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneTaigaStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallTaiga;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks")
- public static Block biomeBrickTaiga;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickTaigaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickTaigaStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "taiga_bricks")
- public static Block biomeChiseledBrickTaiga;
-
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_stone")
- public static Block biomeStoneMesa;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_stone" + SLAB_SUFFIX)
- public static Block biomeStoneMesaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_stone" + STAIR_SUFFIX)
- public static Block biomeStoneMesaStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone")
- public static Block biomeCobblestoneMesa;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + SLAB_SUFFIX)
- public static Block biomeCobblestoneMesaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + STAIR_SUFFIX)
- public static Block biomeCobblestoneMesaStairs;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_cobblestone" + WALL_SUFFIX)
- public static Block biomeWallMesa;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks")
- public static Block biomeBrickMesa;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks" + SLAB_SUFFIX)
- public static Block biomeBrickMesaSlab;
- @ObjectHolder(LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks" + STAIR_SUFFIX)
- public static Block biomeBrickMesaStairs;
- @ObjectHolder("chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + "mesa_bricks")
- public static Block biomeChiseledBrickMesa;
-
- @ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block whitePavement;
- @ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block blackPavement;
- @ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block bluePavement;
- @ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block yellowPavement;
- @ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block redPavement;
- @ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX)
- public static Block greenPavement;
-
- @ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block whitePavementSlab;
- @ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block blackPavementSlab;
- @ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block bluePavementSlab;
- @ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block yellowPavementSlab;
- @ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block redPavementSlab;
- @ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX)
- public static Block greenPavementSlab;
-
- @ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block whitePavementStair;
- @ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block blackPavementStair;
- @ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block bluePavementStair;
- @ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block yellowPavementStair;
- @ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block redPavementStair;
- @ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX)
- public static Block greenPavementStair;
-
- @ObjectHolder(LibBlockNames.SHIMMERROCK + SLAB_SUFFIX)
- public static Block shimmerrockSlab;
- @ObjectHolder(LibBlockNames.SHIMMERROCK + STAIR_SUFFIX)
- public static Block shimmerrockStairs;
- @ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS + SLAB_SUFFIX)
- public static Block shimmerwoodPlankSlab;
- @ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS + STAIR_SUFFIX)
- public static Block shimmerwoodPlankStairs;
-
- @ObjectHolder(LibBlockNames.MANA_GLASS + "_pane")
- public static Block managlassPane;
- @ObjectHolder(LibBlockNames.ELF_GLASS + "_pane")
- public static Block alfglassPane;
- @ObjectHolder(LibBlockNames.BIFROST + "_pane")
- public static Block bifrostPane;
+ public static Block managlassPane = new BlockModPane(Block.Properties.from(manaGlass));
+ public static Block alfglassPane = new BlockModPane(Block.Properties.from(elfGlass));
+ public static Block bifrostPane = new BlockModPane(Block.Properties.from(bifrostPerm));
public static void registerBlocks(RegistryEvent.Register evt) {
IForgeRegistry r = evt.getRegistry();
- Block base = r.getValue(prefix(LibBlockNames.LIVING_WOOD));
- register(r, LibBlockNames.LIVING_WOOD + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_WOOD + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_WOOD + WALL_SUFFIX, new WallBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_WOOD + FENCE_SUFFIX, new FenceBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX, new FenceGateBlock(Block.Properties.from(base)));
+ register(r, LibBlockNames.LIVING_WOOD + STAIR_SUFFIX, livingwoodStairs);
+ register(r, LibBlockNames.LIVING_WOOD + SLAB_SUFFIX, livingwoodSlab);
+ register(r, LibBlockNames.LIVING_WOOD + WALL_SUFFIX, livingwoodWall);
+ register(r, LibBlockNames.LIVING_WOOD + FENCE_SUFFIX, livingwoodFence);
+ register(r, LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX, livingwoodFenceGate);
- base = r.getValue(prefix(LibBlockNames.LIVING_WOOD_PLANKS));
- register(r, LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
+ register(r, LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX, livingwoodPlankStairs);
+ register(r, LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX, livingwoodPlankSlab);
- base = r.getValue(prefix(LibBlockNames.LIVING_ROCK));
- register(r, LibBlockNames.LIVING_ROCK + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_ROCK + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_ROCK + WALL_SUFFIX, new WallBlock(Block.Properties.from(base)));
+ register(r, LibBlockNames.LIVING_ROCK + STAIR_SUFFIX, livingrockStairs);
+ register(r, LibBlockNames.LIVING_ROCK + SLAB_SUFFIX, livingrockSlab);
+ register(r, LibBlockNames.LIVING_ROCK + WALL_SUFFIX, livingrockWall);
- base = r.getValue(prefix(LibBlockNames.LIVING_ROCK_BRICK));
- register(r, LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
+ register(r, LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX, livingrockBrickStairs);
+ register(r, LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX, livingrockBrickSlab);
- base = r.getValue(prefix(LibBlockNames.DREAM_WOOD));
- register(r, LibBlockNames.DREAM_WOOD + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.DREAM_WOOD + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.DREAM_WOOD + WALL_SUFFIX, new WallBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.DREAM_WOOD + FENCE_SUFFIX, new FenceBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX, new FenceGateBlock(Block.Properties.from(base)));
+ register(r, LibBlockNames.DREAM_WOOD + STAIR_SUFFIX, dreamwoodStairs);
+ register(r, LibBlockNames.DREAM_WOOD + SLAB_SUFFIX, dreamwoodSlab);
+ register(r, LibBlockNames.DREAM_WOOD + WALL_SUFFIX, dreamwoodWall);
+ register(r, LibBlockNames.DREAM_WOOD + FENCE_SUFFIX, dreamwoodFence);
+ register(r, LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX, dreamwoodFenceGate);
- base = r.getValue(prefix(LibBlockNames.DREAM_WOOD_PLANKS));
- register(r, LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
- register(r, LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
+ 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);
+ register(r, METAMORPHIC_PREFIX + "forest_cobblestone", biomeCobblestoneForest);
+ register(r, METAMORPHIC_PREFIX + "forest_cobblestone" + SLAB_SUFFIX, biomeCobblestoneForestSlab);
+ register(r, METAMORPHIC_PREFIX + "forest_cobblestone" + STAIR_SUFFIX, biomeCobblestoneForestStairs);
+ register(r, METAMORPHIC_PREFIX + "forest_cobblestone" + WALL_SUFFIX, biomeWallForest);
+ register(r, METAMORPHIC_PREFIX + "forest_bricks", biomeBrickForest);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "plains_cobblestone", biomeCobblestonePlains);
+ register(r, METAMORPHIC_PREFIX + "plains_cobblestone" + SLAB_SUFFIX, biomeCobblestonePlainsSlab);
+ register(r, METAMORPHIC_PREFIX + "plains_cobblestone" + STAIR_SUFFIX, biomeCobblestonePlainsStairs);
+ register(r, METAMORPHIC_PREFIX + "plains_cobblestone" + WALL_SUFFIX, biomeWallPlains);
+ register(r, METAMORPHIC_PREFIX + "plains_bricks", biomeBrickPlains);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "mountain_cobblestone", biomeCobblestoneMountain);
+ register(r, METAMORPHIC_PREFIX + "mountain_cobblestone" + SLAB_SUFFIX, biomeCobblestoneMountainSlab);
+ register(r, METAMORPHIC_PREFIX + "mountain_cobblestone" + STAIR_SUFFIX, biomeCobblestoneMountainStairs);
+ register(r, METAMORPHIC_PREFIX + "mountain_cobblestone" + WALL_SUFFIX, biomeWallMountain);
+ register(r, METAMORPHIC_PREFIX + "mountain_bricks", biomeBrickMountain);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "fungal_cobblestone", biomeCobblestoneFungal);
+ register(r, METAMORPHIC_PREFIX + "fungal_cobblestone" + SLAB_SUFFIX, biomeCobblestoneFungalSlab);
+ register(r, METAMORPHIC_PREFIX + "fungal_cobblestone" + STAIR_SUFFIX, biomeCobblestoneFungalStairs);
+ register(r, METAMORPHIC_PREFIX + "fungal_cobblestone" + WALL_SUFFIX, biomeWallFungal);
+ register(r, METAMORPHIC_PREFIX + "fungal_bricks", biomeBrickFungal);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "swamp_cobblestone", biomeCobblestoneSwamp);
+ register(r, METAMORPHIC_PREFIX + "swamp_cobblestone" + SLAB_SUFFIX, biomeCobblestoneSwampSlab);
+ register(r, METAMORPHIC_PREFIX + "swamp_cobblestone" + STAIR_SUFFIX, biomeCobblestoneSwampStairs);
+ register(r, METAMORPHIC_PREFIX + "swamp_cobblestone" + WALL_SUFFIX, biomeWallSwamp);
+ register(r, METAMORPHIC_PREFIX + "swamp_bricks", biomeBrickSwamp);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "desert_cobblestone", biomeCobblestoneDesert);
+ register(r, METAMORPHIC_PREFIX + "desert_cobblestone" + SLAB_SUFFIX, biomeCobblestoneDesertSlab);
+ register(r, METAMORPHIC_PREFIX + "desert_cobblestone" + STAIR_SUFFIX, biomeCobblestoneDesertStairs);
+ register(r, METAMORPHIC_PREFIX + "desert_cobblestone" + WALL_SUFFIX, biomeWallDesert);
+ register(r, METAMORPHIC_PREFIX + "desert_bricks", biomeBrickDesert);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "taiga_cobblestone", biomeCobblestoneTaiga);
+ register(r, METAMORPHIC_PREFIX + "taiga_cobblestone" + SLAB_SUFFIX, biomeCobblestoneTaigaSlab);
+ register(r, METAMORPHIC_PREFIX + "taiga_cobblestone" + STAIR_SUFFIX, biomeCobblestoneTaigaStairs);
+ register(r, METAMORPHIC_PREFIX + "taiga_cobblestone" + WALL_SUFFIX, biomeWallTaiga);
+ register(r, METAMORPHIC_PREFIX + "taiga_bricks", biomeBrickTaiga);
+ 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);
+ register(r, METAMORPHIC_PREFIX + "mesa_cobblestone", biomeCobblestoneMesa);
+ register(r, METAMORPHIC_PREFIX + "mesa_cobblestone" + SLAB_SUFFIX, biomeCobblestoneMesaSlab);
+ register(r, METAMORPHIC_PREFIX + "mesa_cobblestone" + STAIR_SUFFIX, biomeCobblestoneMesaStairs);
+ register(r, METAMORPHIC_PREFIX + "mesa_cobblestone" + WALL_SUFFIX, biomeWallMesa);
+ register(r, METAMORPHIC_PREFIX + "mesa_bricks", biomeBrickMesa);
+ 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);
- Block.Properties props = Block.Properties.from(Blocks.QUARTZ_BLOCK);
- for (String variant : LibBlockNames.QUARTZ_VARIANTS) {
+ register(r, LibBlockNames.SHIMMERWOOD_PLANKS + SLAB_SUFFIX, shimmerwoodPlankSlab);
+ register(r, LibBlockNames.SHIMMERWOOD_PLANKS + STAIR_SUFFIX, shimmerwoodPlankStairs);
- base = new BlockMod(props);
- register(r, variant, base);
- register(r, "chiseled_" + variant, new BlockMod(props));
- register(r, variant + "_pillar", new RotatedPillarBlock(props));
- register(r, variant + SLAB_SUFFIX, new SlabBlock(props));
- register(r, variant + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props));
- }
-
- props = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
- for (String color : LibBlockNames.PAVEMENT_VARIANTS) {
- Block block = new BlockMod(props);
- register(r, color + LibBlockNames.PAVEMENT_SUFFIX, block);
- register(r, color + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX, new BlockModStairs(block.getDefaultState(), props));
- register(r, color + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX, new SlabBlock(props));
- }
-
- props = Block.Properties.create(Material.ROCK).hardnessAndResistance(1.5F, 10).sound(SoundType.STONE);
- for (String variant : LibBlockNames.METAMORPHIC_VARIANTS) {
- base = new BlockMod(props);
- register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_stone", base);
- register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props));
- register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props));
-
- base = new BlockMod(props);
- register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone", base);
- register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props));
- register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props));
- register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone" + WALL_SUFFIX, new WallBlock(props));
-
- base = new BlockMod(props);
- register(r, LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks", base);
- register(r, Registry.BLOCK.getKey(base).getPath() + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), props));
- register(r, Registry.BLOCK.getKey(base).getPath() + SLAB_SUFFIX, new SlabBlock(props));
- register(r, "chiseled_" + LibBlockNames.METAMORPHIC_PREFIX + variant + "_bricks", new BlockMod(props));
- }
-
- base = r.getValue(prefix(LibBlockNames.SHIMMERROCK));
- register(r, LibBlockNames.SHIMMERROCK + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.SHIMMERROCK + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
-
- base = r.getValue(prefix(LibBlockNames.SHIMMERWOOD_PLANKS));
- register(r, LibBlockNames.SHIMMERWOOD_PLANKS + SLAB_SUFFIX, new SlabBlock(Block.Properties.from(base)));
- register(r, LibBlockNames.SHIMMERWOOD_PLANKS + STAIR_SUFFIX, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)));
-
- base = r.getValue(prefix(LibBlockNames.MANA_GLASS));
- register(r, LibBlockNames.MANA_GLASS + "_pane", new BlockModPane(Block.Properties.from(base)));
-
- base = r.getValue(prefix(LibBlockNames.ELF_GLASS));
- register(r, LibBlockNames.ELF_GLASS + "_pane", new BlockModPane(Block.Properties.from(base)));
-
- base = r.getValue(prefix(LibBlockNames.BIFROST_PERM));
- register(r, LibBlockNames.BIFROST + "_pane", new BlockModPane(Block.Properties.from(base)));
+ register(r, LibBlockNames.MANA_GLASS + "_pane", managlassPane);
+ register(r, LibBlockNames.ELF_GLASS + "_pane", alfglassPane);
+ register(r, LibBlockNames.BIFROST + "_pane", bifrostPane);
}
public static void registerItemBlocks(RegistryEvent.Register
- evt) {
diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java
index 4d53de35e..f2115231b 100644
--- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java
+++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java
@@ -11,9 +11,7 @@ package vazkii.botania.common.block;
import com.google.common.collect.ImmutableList;
import com.mojang.datafixers.util.Pair;
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.SoundType;
+import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntityType;
@@ -40,204 +38,195 @@ import static vazkii.botania.common.block.ModBlocks.register;
@ObjectHolder(LibMisc.MOD_ID)
public class ModSubtiles {
- @ObjectHolder("pure_daisy")
- public static Block pureDaisy;
- @ObjectHolder("manastar")
- public static Block manastar;
- @ObjectHolder("hydroangeas")
- public static Block hydroangeas;
- @ObjectHolder("endoflame")
- public static Block endoflame;
- @ObjectHolder("thermalily")
- public static Block thermalily;
- @ObjectHolder("rosa_arcana")
- public static Block rosaArcana;
- @ObjectHolder("munchdew")
- public static Block munchdew;
- @ObjectHolder("entropinnyum")
- public static Block entropinnyum;
- @ObjectHolder("kekimurus")
- public static Block kekimurus;
- @ObjectHolder("gourmaryllis")
- public static Block gourmaryllis;
- @ObjectHolder("narslimmus")
- public static Block narslimmus;
- @ObjectHolder("spectrolus")
- public static Block spectrolus;
- @ObjectHolder("dandelifeon")
- public static Block dandelifeon;
- @ObjectHolder("rafflowsia")
- public static Block rafflowsia;
- @ObjectHolder("shulk_me_not")
- public static Block shulkMeNot;
- @ObjectHolder("bellethorn")
- public static Block bellethorn;
- @ObjectHolder("bellethorn_chibi")
- public static Block bellethornChibi;
- @ObjectHolder("bergamute")
- public static Block bergamute;
- @ObjectHolder("dreadthorn")
- public static Block dreadthorn;
- @ObjectHolder("heisei_dream")
- public static Block heiseiDream;
- @ObjectHolder("tigerseye")
- public static Block tigerseye;
- @ObjectHolder("jaded_amaranthus")
- public static Block jadedAmaranthus;
- @ObjectHolder("orechid")
- public static Block orechid;
- @ObjectHolder("fallen_kanade")
- public static Block fallenKanade;
- @ObjectHolder("exoflame")
- public static Block exoflame;
- @ObjectHolder("agricarnation")
- public static Block agricarnation;
- @ObjectHolder("agricarnation_chibi")
- public static Block agricarnationChibi;
- @ObjectHolder("hopperhock")
- public static Block hopperhock;
- @ObjectHolder("hopperhock_chibi")
- public static Block hopperhockChibi;
- @ObjectHolder("tangleberrie")
- public static Block tangleberrie;
- @ObjectHolder("jiyuulia")
- public static Block jiyuulia;
- @ObjectHolder("rannuncarpus")
- public static Block rannuncarpus;
- @ObjectHolder("rannuncarpus_chibi")
- public static Block rannuncarpusChibi;
- @ObjectHolder("hyacidus")
- public static Block hyacidus;
- @ObjectHolder("pollidisiac")
- public static Block pollidisiac;
- @ObjectHolder("clayconia")
- public static Block clayconia;
- @ObjectHolder("clayconia_chibi")
- public static Block clayconiaChibi;
- @ObjectHolder("loonium")
- public static Block loonium;
- @ObjectHolder("daffomill")
- public static Block daffomill;
- @ObjectHolder("vinculotus")
- public static Block vinculotus;
- @ObjectHolder("spectranthemum")
- public static Block spectranthemum;
- @ObjectHolder("medumone")
- public static Block medumone;
- @ObjectHolder("marimorphosis")
- public static Block marimorphosis;
- @ObjectHolder("marimorphosis_chibi")
- public static Block marimorphosisChibi;
- @ObjectHolder("bubbell")
- public static Block bubbell;
- @ObjectHolder("bubbell_chibi")
- public static Block bubbellChibi;
- @ObjectHolder("solegnolia")
- public static Block solegnolia;
- @ObjectHolder("solegnolia_chibi")
- public static Block solegnoliaChibi;
- @ObjectHolder("orechid_ignem")
- public static Block orechidIgnem;
-
- @ObjectHolder("floating_pure_daisy")
- public static Block pureDaisyFloating;
- @ObjectHolder("floating_manastar")
- public static Block manastarFloating;
- @ObjectHolder("floating_hydroangeas")
- public static Block hydroangeasFloating;
- @ObjectHolder("floating_endoflame")
- public static Block endoflameFloating;
- @ObjectHolder("floating_thermalily")
- public static Block thermalilyFloating;
- @ObjectHolder("floating_rosa_arcana")
- public static Block rosaArcanaFloating;
- @ObjectHolder("floating_munchdew")
- public static Block munchdewFloating;
- @ObjectHolder("floating_entropinnyum")
- public static Block entropinnyumFloating;
- @ObjectHolder("floating_kekimurus")
- public static Block kekimurusFloating;
- @ObjectHolder("floating_gourmaryllis")
- public static Block gourmaryllisFloating;
- @ObjectHolder("floating_narslimmus")
- public static Block narslimmusFloating;
- @ObjectHolder("floating_spectrolus")
- public static Block spectrolusFloating;
- @ObjectHolder("floating_dandelifeon")
- public static Block dandelifeonFloating;
- @ObjectHolder("floating_rafflowsia")
- public static Block rafflowsiaFloating;
- @ObjectHolder("floating_shulk_me_not")
- public static Block shulkMeNotFloating;
- @ObjectHolder("floating_bellethorn")
- public static Block bellethornFloating;
- @ObjectHolder("floating_bellethorn_chibi")
- public static Block bellethornChibiFloating;
- @ObjectHolder("floating_bergamute")
- public static Block bergamuteFloating;
- @ObjectHolder("floating_dreadthorn")
- public static Block dreadthornFloating;
- @ObjectHolder("floating_heisei_dream")
- public static Block heiseiDreamFloating;
- @ObjectHolder("floating_tigerseye")
- public static Block tigerseyeFloating;
- @ObjectHolder("floating_jaded_amaranthus")
- public static Block jadedAmaranthusFloating;
- @ObjectHolder("floating_orechid")
- public static Block orechidFloating;
- @ObjectHolder("floating_fallen_kanade")
- public static Block fallenKanadeFloating;
- @ObjectHolder("floating_exoflame")
- public static Block exoflameFloating;
- @ObjectHolder("floating_agricarnation")
- public static Block agricarnationFloating;
- @ObjectHolder("floating_agricarnation_chibi")
- public static Block agricarnationChibiFloating;
- @ObjectHolder("floating_hopperhock")
- public static Block hopperhockFloating;
- @ObjectHolder("floating_hopperhock_chibi")
- public static Block hopperhockChibiFloating;
- @ObjectHolder("floating_tangleberrie")
- public static Block tangleberrieFloating;
- @ObjectHolder("floating_jiyuulia")
- public static Block jiyuuliaFloating;
- @ObjectHolder("floating_rannuncarpus")
- public static Block rannuncarpusFloating;
- @ObjectHolder("floating_rannuncarpus_chibi")
- public static Block rannuncarpusChibiFloating;
- @ObjectHolder("floating_hyacidus")
- public static Block hyacidusFloating;
- @ObjectHolder("floating_pollidisiac")
- public static Block pollidisiacFloating;
- @ObjectHolder("floating_clayconia")
- public static Block clayconiaFloating;
- @ObjectHolder("floating_clayconia_chibi")
- public static Block clayconiaChibiFloating;
- @ObjectHolder("floating_loonium")
- public static Block looniumFloating;
- @ObjectHolder("floating_daffomill")
- public static Block daffomillFloating;
- @ObjectHolder("floating_vinculotus")
- public static Block vinculotusFloating;
- @ObjectHolder("floating_spectranthemum")
- public static Block spectranthemumFloating;
- @ObjectHolder("floating_medumone")
- public static Block medumoneFloating;
- @ObjectHolder("floating_marimorphosis")
- public static Block marimorphosisFloating;
- @ObjectHolder("floating_marimorphosis_chibi")
- public static Block marimorphosisChibiFloating;
- @ObjectHolder("floating_bubbell")
- public static Block bubbellFloating;
- @ObjectHolder("floating_bubbell_chibi")
- public static Block bubbellChibiFloating;
- @ObjectHolder("floating_solegnolia")
- public static Block solegnoliaFloating;
- @ObjectHolder("floating_solegnolia_chibi")
- public static Block solegnoliaChibiFloating;
- @ObjectHolder("floating_orechid_ignem")
- public static Block orechidIgnemFloating;
+ 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);
+ public static final Block bellethornChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn.Mini::new);
+ 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 PURE_DAISY = TileEntityType.Builder.create(SubTilePureDaisy::new, pureDaisy, pureDaisyFloating).build(null);
+ public static final TileEntityType MANASTAR = TileEntityType.Builder.create(SubTileManastar::new, manastar, manastarFloating).build(null);
+ public static final TileEntityType HYDROANGEAS = TileEntityType.Builder.create(SubTileHydroangeas::new, hydroangeas, hydroangeasFloating).build(null);
+ public static final TileEntityType ENDOFLAME = TileEntityType.Builder.create(SubTileEndoflame::new, endoflame, endoflameFloating).build(null);
+ public static final TileEntityType THERMALILY = TileEntityType.Builder.create(SubTileThermalily::new, thermalily, thermalilyFloating).build(null);
+ public static final TileEntityType ROSA_ARCANA = TileEntityType.Builder.create(SubTileArcaneRose::new, rosaArcana, rosaArcanaFloating).build(null);
+ public static final TileEntityType MUNCHDEW = TileEntityType.Builder.create(SubTileMunchdew::new, munchdew, munchdewFloating).build(null);
+ public static final TileEntityType ENTROPINNYUM = TileEntityType.Builder.create(SubTileEntropinnyum::new, entropinnyum, entropinnyumFloating).build(null);
+ public static final TileEntityType KEKIMURUS = TileEntityType.Builder.create(SubTileKekimurus::new, kekimurus, kekimurusFloating).build(null);
+ public static final TileEntityType GOURMARYLLIS = TileEntityType.Builder.create(SubTileGourmaryllis::new, gourmaryllis, gourmaryllisFloating).build(null);
+ public static final TileEntityType NARSLIMMUS = TileEntityType.Builder.create(SubTileNarslimmus::new, narslimmus, narslimmusFloating).build(null);
+ public static final TileEntityType SPECTROLUS = TileEntityType.Builder.create(SubTileSpectrolus::new, spectrolus, spectrolusFloating).build(null);
+ public static final TileEntityType DANDELIFEON = TileEntityType.Builder.create(SubTileDandelifeon::new, dandelifeon, dandelifeonFloating).build(null);
+ public static final TileEntityType RAFFLOWSIA = TileEntityType.Builder.create(SubTileRafflowsia::new, rafflowsia, rafflowsiaFloating).build(null);
+ public static final TileEntityType SHULK_ME_NOT = TileEntityType.Builder.create(SubTileShulkMeNot::new, shulkMeNot, shulkMeNotFloating).build(null);
+ public static final TileEntityType BELLETHORNE = TileEntityType.Builder.create(SubTileBellethorn::new, bellethorn, bellethornFloating).build(null);
+ public static final TileEntityType BELLETHORNE_CHIBI = TileEntityType.Builder.create(SubTileBellethorn.Mini::new, bellethornChibi, bellethornChibiFloating).build(null);
+ public static final TileEntityType BERGAMUTE = TileEntityType.Builder.create(SubTileBergamute::new, bergamute, bergamuteFloating).build(null);
+ public static final TileEntityType DREADTHORN = TileEntityType.Builder.create(SubTileDreadthorn::new, dreadthorn, dreadthornFloating).build(null);
+ public static final TileEntityType HEISEI_DREAM = TileEntityType.Builder.create(SubTileHeiseiDream::new, heiseiDream, heiseiDreamFloating).build(null);
+ public static final TileEntityType TIGERSEYE = TileEntityType.Builder.create(SubTileTigerseye::new, tigerseye, tigerseyeFloating).build(null);
+ public static final TileEntityType JADED_AMARANTHUS = TileEntityType.Builder.create(SubTileJadedAmaranthus::new, jadedAmaranthus, jadedAmaranthusFloating).build(null);
+ public static final TileEntityType ORECHID = TileEntityType.Builder.create(SubTileOrechid::new, orechid, orechidFloating).build(null);
+ public static final TileEntityType FALLEN_KANADE = TileEntityType.Builder.create(SubTileFallenKanade::new, fallenKanade, fallenKanadeFloating).build(null);
+ public static final TileEntityType EXOFLAME = TileEntityType.Builder.create(SubTileExoflame::new, exoflame, exoflameFloating).build(null);
+ public static final TileEntityType AGRICARNATION = TileEntityType.Builder.create(SubTileAgricarnation::new, agricarnation, agricarnationFloating).build(null);
+ public static final TileEntityType AGRICARNATION_CHIBI = TileEntityType.Builder.create(SubTileAgricarnation.Mini::new, agricarnationChibi, agricarnationChibiFloating).build(null);
+ public static final TileEntityType HOPPERHOCK = TileEntityType.Builder.create(SubTileHopperhock::new, hopperhock, hopperhockFloating).build(null);
+ public static final TileEntityType HOPPERHOCK_CHIBI = TileEntityType.Builder.create(SubTileHopperhock.Mini::new, hopperhockChibi, hopperhockChibiFloating).build(null);
+ public static final TileEntityType TANGLEBERRIE = TileEntityType.Builder.create(SubTileTangleberrie::new, tangleberrie, tangleberrieFloating).build(null);
+ public static final TileEntityType JIYUULIA = TileEntityType.Builder.create(SubTileJiyuulia::new, jiyuulia, jiyuuliaFloating).build(null);
+ public static final TileEntityType RANNUNCARPUS = TileEntityType.Builder.create(SubTileRannuncarpus::new, rannuncarpus, rannuncarpusFloating).build(null);
+ public static final TileEntityType RANNUNCARPUS_CHIBI = TileEntityType.Builder.create(SubTileRannuncarpus.Mini::new, rannuncarpusChibi, rannuncarpusChibiFloating).build(null);
+ public static final TileEntityType HYACIDUS = TileEntityType.Builder.create(SubTileHyacidus::new, hyacidus, hyacidusFloating).build(null);
+ public static final TileEntityType POLLIDISIAC = TileEntityType.Builder.create(SubTilePollidisiac::new, pollidisiac, pollidisiacFloating).build(null);
+ public static final TileEntityType CLAYCONIA = TileEntityType.Builder.create(SubTileClayconia::new, clayconia, clayconiaFloating).build(null);
+ public static final TileEntityType CLAYCONIA_CHIBI = TileEntityType.Builder.create(SubTileClayconia.Mini::new, clayconiaChibi, clayconiaChibiFloating).build(null);
+ public static final TileEntityType LOONIUM = TileEntityType.Builder.create(SubTileLoonuim::new, loonium, looniumFloating).build(null);
+ public static final TileEntityType DAFFOMILL = TileEntityType.Builder.create(SubTileDaffomill::new, daffomill, daffomillFloating).build(null);
+ public static final TileEntityType VINCULOTUS = TileEntityType.Builder.create(SubTileVinculotus::new, vinculotus, vinculotusFloating).build(null);
+ public static final TileEntityType SPECTRANTHEMUM = TileEntityType.Builder.create(SubTileSpectranthemum::new, spectranthemum, spectranthemumFloating).build(null);
+ public static final TileEntityType MEDUMONE = TileEntityType.Builder.create(SubTileMedumone::new, medumone, medumoneFloating).build(null);
+ public static final TileEntityType MARIMORPHOSIS = TileEntityType.Builder.create(SubTileMarimorphosis::new, marimorphosis, marimorphosisFloating).build(null);
+ public static final TileEntityType MARIMORPHOSIS_CHIBI = TileEntityType.Builder.create(SubTileMarimorphosis.Mini::new, marimorphosisChibi, marimorphosisChibiFloating).build(null);
+ public static final TileEntityType BUBBELL = TileEntityType.Builder.create(SubTileBubbell::new, bubbell, bubbellFloating).build(null);
+ public static final TileEntityType BUBBELL_CHIBI = TileEntityType.Builder.create(SubTileBubbell.Mini::new, bubbellChibi, bubbellChibiFloating).build(null);
+ public static final TileEntityType SOLEGNOLIA = TileEntityType.Builder.create(SubTileSolegnolia::new, solegnolia, solegnoliaFloating).build(null);
+ public static final TileEntityType SOLEGNOLIA_CHIBI = TileEntityType.Builder.create(SubTileSolegnolia.Mini::new, solegnoliaChibi, solegnoliaChibiFloating).build(null);
+ public static final TileEntityType 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());
}
@@ -302,13 +291,144 @@ public class ModSubtiles {
public static void registerBlocks(RegistryEvent.Register evt) {
IForgeRegistry r = evt.getRegistry();
- Block.Properties props = Block.Properties.from(Blocks.POPPY);
- Block.Properties floatProps = Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15);
-
- for (Pair, ResourceLocation> type : getTypes()) {
- register(r, type.getSecond(), new BlockSpecialFlower(props, type.getFirst()));
- register(r, floating(type.getSecond()), new BlockFloatingSpecialFlower(floatProps, type.getFirst()));
- }
+ 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);
}
public static void registerItemBlocks(RegistryEvent.Register
- evt) {
@@ -326,13 +446,55 @@ public class ModSubtiles {
}
public static void registerTEs(RegistryEvent.Register> evt) {
- Registry b = Registry.BLOCK;
IForgeRegistry> r = evt.getRegistry();
-
- for (Pair, ResourceLocation> type : getTypes()) {
- Block block = b.getValue(type.getSecond()).get();
- Block floating = b.getValue(floating(type.getSecond())).get();
- register(r, type.getSecond(), TileEntityType.Builder.create(type.getFirst(), block, floating).build(null));
- }
+ register(r, LibBlockNames.SUBTILE_PUREDAISY, PURE_DAISY);
+ register(r, LibBlockNames.SUBTILE_MANASTAR, MANASTAR);
+ register(r, LibBlockNames.SUBTILE_HYDROANGEAS, HYDROANGEAS);
+ register(r, LibBlockNames.SUBTILE_ENDOFLAME, ENDOFLAME);
+ register(r, LibBlockNames.SUBTILE_THERMALILY, THERMALILY);
+ register(r, LibBlockNames.SUBTILE_ARCANE_ROSE, ROSA_ARCANA);
+ register(r, LibBlockNames.SUBTILE_MUNCHDEW, MUNCHDEW);
+ register(r, LibBlockNames.SUBTILE_ENTROPINNYUM, ENTROPINNYUM);
+ register(r, LibBlockNames.SUBTILE_KEKIMURUS, KEKIMURUS);
+ register(r, LibBlockNames.SUBTILE_GOURMARYLLIS, GOURMARYLLIS);
+ register(r, LibBlockNames.SUBTILE_NARSLIMMUS, NARSLIMMUS);
+ register(r, LibBlockNames.SUBTILE_SPECTROLUS, SPECTROLUS);
+ register(r, LibBlockNames.SUBTILE_DANDELIFEON, DANDELIFEON);
+ register(r, LibBlockNames.SUBTILE_RAFFLOWSIA, RAFFLOWSIA);
+ register(r, LibBlockNames.SUBTILE_SHULK_ME_NOT, SHULK_ME_NOT);
+ register(r, LibBlockNames.SUBTILE_BELLETHORN, BELLETHORNE);
+ register(r, chibi(LibBlockNames.SUBTILE_BELLETHORN), BELLETHORNE_CHIBI);
+ register(r, LibBlockNames.SUBTILE_BERGAMUTE, BERGAMUTE);
+ register(r, LibBlockNames.SUBTILE_DREADTHORN, DREADTHORN);
+ register(r, LibBlockNames.SUBTILE_HEISEI_DREAM, HEISEI_DREAM);
+ register(r, LibBlockNames.SUBTILE_TIGERSEYE, TIGERSEYE);
+ register(r, LibBlockNames.SUBTILE_JADED_AMARANTHUS, JADED_AMARANTHUS);
+ register(r, LibBlockNames.SUBTILE_ORECHID, ORECHID);
+ register(r, LibBlockNames.SUBTILE_FALLEN_KANADE, FALLEN_KANADE);
+ register(r, LibBlockNames.SUBTILE_EXOFLAME, EXOFLAME);
+ register(r, LibBlockNames.SUBTILE_AGRICARNATION, AGRICARNATION);
+ register(r, chibi(LibBlockNames.SUBTILE_AGRICARNATION), AGRICARNATION_CHIBI);
+ register(r, LibBlockNames.SUBTILE_HOPPERHOCK, HOPPERHOCK);
+ register(r, chibi(LibBlockNames.SUBTILE_HOPPERHOCK), HOPPERHOCK_CHIBI);
+ register(r, LibBlockNames.SUBTILE_TANGLEBERRIE, TANGLEBERRIE);
+ register(r, LibBlockNames.SUBTILE_JIYUULIA, JIYUULIA);
+ register(r, LibBlockNames.SUBTILE_RANNUNCARPUS, RANNUNCARPUS);
+ register(r, chibi(LibBlockNames.SUBTILE_RANNUNCARPUS), RANNUNCARPUS_CHIBI);
+ register(r, LibBlockNames.SUBTILE_HYACIDUS, HYACIDUS);
+ register(r, LibBlockNames.SUBTILE_POLLIDISIAC, POLLIDISIAC);
+ register(r, LibBlockNames.SUBTILE_CLAYCONIA, CLAYCONIA);
+ register(r, chibi(LibBlockNames.SUBTILE_CLAYCONIA), CLAYCONIA_CHIBI);
+ register(r, LibBlockNames.SUBTILE_LOONIUM, LOONIUM);
+ register(r, LibBlockNames.SUBTILE_DAFFOMILL, DAFFOMILL);
+ register(r, LibBlockNames.SUBTILE_VINCULOTUS, VINCULOTUS);
+ register(r, LibBlockNames.SUBTILE_SPECTRANTHEMUM, SPECTRANTHEMUM);
+ register(r, LibBlockNames.SUBTILE_MEDUMONE, MEDUMONE);
+ register(r, LibBlockNames.SUBTILE_MARIMORPHOSIS, MARIMORPHOSIS);
+ register(r, chibi(LibBlockNames.SUBTILE_MARIMORPHOSIS), MARIMORPHOSIS_CHIBI);
+ register(r, LibBlockNames.SUBTILE_BUBBELL, BUBBELL);
+ register(r, chibi(LibBlockNames.SUBTILE_BUBBELL), BUBBELL_CHIBI);
+ register(r, LibBlockNames.SUBTILE_SOLEGNOLIA, SOLEGNOLIA);
+ register(r, chibi(LibBlockNames.SUBTILE_SOLEGNOLIA), SOLEGNOLIA_CHIBI);
+ register(r, LibBlockNames.SUBTILE_ORECHID_IGNEM, ORECHID_IGNEM);
}
}
diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java
index eefb88511..e5b2fdb2c 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java
@@ -17,12 +17,11 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.client.fx.WispParticleData;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
public class SubTileManastar extends TileEntitySpecialFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":manastar")
- public static TileEntityType TYPE;
-
private static final int SET_STATE_EVENT = 0;
private static final int NONE = 0, DECREASING = 1, INCREASING = 2;
@@ -30,7 +29,7 @@ public class SubTileManastar extends TileEntitySpecialFlower {
private int state = NONE;
public SubTileManastar() {
- super(TYPE);
+ super(ModSubtiles.MANASTAR);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java
index b34f9c33b..3f4dd9ae9 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java
@@ -12,28 +12,23 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
-import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.recipe.IPureDaisyRecipe;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.client.fx.WispParticleData;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.crafting.ModRecipeTypes;
-import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nullable;
import java.util.Arrays;
public class SubTilePureDaisy extends TileEntitySpecialFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":pure_daisy")
- public static TileEntityType TYPE;
-
private static final String TAG_POSITION = "position";
private static final String TAG_TICKS_REMAINING = "ticksRemaining";
private static final int RECIPE_COMPLETE_EVENT = 0;
@@ -54,7 +49,7 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower {
private final int[] ticksRemaining = new int[POSITIONS.length];
public SubTilePureDaisy() {
- super(TYPE);
+ super(ModSubtiles.PURE_DAISY);
Arrays.fill(prevTicksRemaining, -1);
Arrays.fill(ticksRemaining, -1);
}
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java
index b6d5c9910..2d732b3ca 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java
@@ -19,6 +19,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibMisc;
@@ -26,9 +27,6 @@ import vazkii.botania.common.lib.LibMisc;
import java.util.Set;
public class SubTileAgricarnation extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":agricarnation")
- public static TileEntityType TYPE;
-
private static final Set MATERIALS = ImmutableSet.of(Material.PLANTS, Material.CACTUS, Material.ORGANIC,
Material.LEAVES, Material.GOURD, Material.OCEAN_PLANT, Material.BAMBOO);
private static final int RANGE = 5;
@@ -39,7 +37,7 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower {
}
public SubTileAgricarnation() {
- this(TYPE);
+ this(ModSubtiles.AGRICARNATION);
}
@Override
@@ -132,11 +130,8 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileAgricarnation {
- @ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.AGRICARNATION_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java
index e99b0504b..a82c11206 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java
@@ -19,15 +19,14 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
import java.util.function.Predicate;
public class SubTileBellethorn extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":bellethorn")
- public static TileEntityType TYPE;
-
public static final int RANGE = 6;
public static final int RANGE_MINI = 1;
@@ -36,7 +35,7 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower {
}
public SubTileBellethorn() {
- this(TYPE);
+ this(ModSubtiles.BELLETHORNE);
}
@Override
@@ -105,11 +104,8 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileBellethorn {
- @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.BELLETHORNE_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java
index fbb845244..8d62433ee 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java
@@ -13,6 +13,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.Collections;
@@ -20,14 +21,11 @@ import java.util.Set;
import java.util.WeakHashMap;
public class SubTileBergamute extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":bergamute")
- public static TileEntityType TYPE;
-
private static final int RANGE = 4;
private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>());
public SubTileBergamute() {
- super(TYPE);
+ super(ModSubtiles.BERGAMUTE);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java
index adbd3acc4..76225e398 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java
@@ -20,13 +20,11 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.tile.TileFakeAir;
import vazkii.botania.common.lib.LibMisc;
public class SubTileBubbell extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":bubbell")
- public static TileEntityType TYPE;
-
private static final int RANGE = 12;
private static final int RANGE_MINI = 6;
private static final int COST_PER_TICK = 4;
@@ -39,7 +37,7 @@ public class SubTileBubbell extends TileEntityFunctionalFlower {
}
public SubTileBubbell() {
- this(TYPE);
+ this(ModSubtiles.BUBBELL);
}
@Override
@@ -115,11 +113,8 @@ public class SubTileBubbell extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileBubbell {
- @ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.BUBBELL_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java
index 2792a3930..a090239ac 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java
@@ -19,6 +19,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lib.LibMisc;
@@ -26,9 +27,6 @@ import java.util.ArrayList;
import java.util.List;
public class SubTileClayconia extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":clayconia")
- public static TileEntityType TYPE;
-
private static final int COST = 80;
private static final int RANGE = 5;
private static final int RANGE_Y = 3;
@@ -41,7 +39,7 @@ public class SubTileClayconia extends TileEntityFunctionalFlower {
}
public SubTileClayconia() {
- this(TYPE);
+ this(ModSubtiles.CLAYCONIA);
}
@Override
@@ -112,11 +110,8 @@ public class SubTileClayconia extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileClayconia {
- @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.CLAYCONIA_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java
index 944355645..6e15b9b5e 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java
@@ -26,6 +26,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.client.fx.WispParticleData;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketItemAge;
@@ -33,9 +34,6 @@ import vazkii.botania.common.network.PacketItemAge;
import java.util.List;
public class SubTileDaffomill extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":daffomill")
- public static TileEntityType TYPE;
-
private static final String TAG_ORIENTATION = "orientation";
private static final String TAG_WIND_TICKS = "windTicks";
@@ -43,7 +41,7 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower {
private Direction orientation = Direction.NORTH;
public SubTileDaffomill() {
- super(TYPE);
+ super(ModSubtiles.DAFFOMILL);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java
index e84256a3a..c4993ab82 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java
@@ -13,16 +13,14 @@ import net.minecraft.entity.passive.AnimalEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.function.Predicate;
public class SubTileDreadthorn extends SubTileBellethorn {
- @ObjectHolder(LibMisc.MOD_ID + ":dreadthorn")
- public static TileEntityType TYPE;
-
public SubTileDreadthorn() {
- super(TYPE);
+ super(ModSubtiles.DREADTHORN);
}
@Override
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 a1f9ba6de..463c148ed 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
@@ -17,19 +17,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.item.IExoflameHeatable;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ExoflameFurnaceHandler;
import vazkii.botania.common.lib.LibMisc;
public class SubTileExoflame extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":exoflame")
- public static TileEntityType TYPE;
-
private static final int RANGE = 5;
private static final int RANGE_Y = 2;
private static final int COST = 300;
public SubTileExoflame() {
- super(TYPE);
+ super(ModSubtiles.EXOFLAME);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java
index 309b8fdb6..707cb8218 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java
@@ -18,19 +18,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileFallenKanade extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":fallen_kanade")
- public static TileEntityType TYPE;
-
private static final int RANGE = 2;
private static final int COST = 120;
public SubTileFallenKanade() {
- super(TYPE);
+ super(ModSubtiles.FALLEN_KANADE);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java
index 0700a2388..460062e50 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java
@@ -22,19 +22,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileHeiseiDream extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":heisei_dream")
- public static TileEntityType TYPE;
-
private static final int RANGE = 5;
private static final int COST = 100;
public SubTileHeiseiDream() {
- super(TYPE);
+ super(ModSubtiles.HEISEI_DREAM);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java
index 4a629ce4f..50c10858c 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java
@@ -35,6 +35,7 @@ import vazkii.botania.api.corporea.InvWithLocation;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.lib.LibMisc;
@@ -42,9 +43,6 @@ import java.util.ArrayList;
import java.util.List;
public class SubTileHopperhock extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":hopperhock")
- public static TileEntityType TYPE;
-
private static final String TAG_FILTER_TYPE = "filterType";
private static final int RANGE_MANA = 10;
private static final int RANGE = 6;
@@ -59,7 +57,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower {
}
public SubTileHopperhock() {
- this(TYPE);
+ this(ModSubtiles.HOPPERHOCK);
}
@Override
@@ -263,11 +261,8 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileHopperhock {
- @ObjectHolder(LibMisc.MOD_ID + ":hopperhock_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.HOPPERHOCK_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java
index 1008768a1..04eaaf7ca 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java
@@ -19,19 +19,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileHyacidus extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":hyacidus")
- public static TileEntityType TYPE;
-
private static final int RANGE = 6;
private static final int COST = 20;
public SubTileHyacidus() {
- super(TYPE);
+ super(ModSubtiles.HYACIDUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
index ca07e61c7..6f285e20a 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
@@ -18,18 +18,16 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lib.LibMisc;
public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":jaded_amaranthus")
- public static TileEntityType TYPE;
-
private static final int COST = 100;
final int RANGE = 4;
public SubTileJadedAmaranthus() {
- super(TYPE);
+ super(ModSubtiles.JADED_AMARANTHUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java
index 286335b6f..7b5b0d325 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java
@@ -12,14 +12,12 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraftforge.registries.ObjectHolder;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
public class SubTileJiyuulia extends SubTileTangleberrie {
- @ObjectHolder(LibMisc.MOD_ID + ":jiyuulia")
- public static TileEntityType TYPE;
-
public SubTileJiyuulia() {
- super(TYPE);
+ super(ModSubtiles.JIYUULIA);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java
index e0553ba59..54a6f52df 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java
@@ -36,6 +36,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.ModTags;
@@ -44,9 +45,6 @@ import java.util.List;
import java.util.Random;
public class SubTileLoonuim extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":loonium")
- public static TileEntityType TYPE;
-
private static final int COST = 35000;
private static final int RANGE = 5;
private static final String TAG_LOOT_TABLE = "lootTable";
@@ -55,7 +53,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower {
private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon");
public SubTileLoonuim() {
- super(TYPE);
+ super(ModSubtiles.LOONIUM);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java
index 1219105d4..d40ab0c87 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java
@@ -21,6 +21,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.block.ModFluffBlocks;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lib.LibMisc;
@@ -29,9 +30,6 @@ import java.util.List;
import java.util.Set;
public class SubTileMarimorphosis extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis")
- public static TileEntityType TYPE;
-
private static final int COST = 12;
private static final int RANGE = 8;
private static final int RANGE_Y = 5;
@@ -55,7 +53,7 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower {
}
public SubTileMarimorphosis() {
- this(TYPE);
+ this(ModSubtiles.MARIMORPHOSIS);
}
@Override
@@ -174,11 +172,8 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileMarimorphosis {
- @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.MARIMORPHOSIS_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java
index bac42bec5..2b8e2907d 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java
@@ -18,18 +18,16 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileMedumone extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":medumone")
- public static TileEntityType TYPE;
-
private static final int RANGE = 6;
public SubTileMedumone() {
- super(TYPE);
+ super(ModSubtiles.MEDUMONE);
}
@Override
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 b5962c63d..15301dd19 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
@@ -24,6 +24,7 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.common.Botania;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibMisc;
@@ -38,9 +39,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
public class SubTileOrechid extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":orechid")
- public static TileEntityType TYPE;
-
private static final int COST = 17500;
private static final int COST_GOG = 700;
private static final int DELAY = 100;
@@ -53,7 +51,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower {
}
public SubTileOrechid() {
- this(TYPE);
+ this(ModSubtiles.ORECHID);
}
@Override
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 7443ce220..e0264ed06 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
@@ -15,19 +15,17 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.Map;
import java.util.function.Predicate;
public class SubTileOrechidIgnem extends SubTileOrechid {
- @ObjectHolder(LibMisc.MOD_ID + ":orechid_ignem")
- public static TileEntityType TYPE;
-
private static final int COST = 20000;
public SubTileOrechidIgnem() {
- super(TYPE);
+ super(ModSubtiles.ORECHID_IGNEM);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java
index 90fddbeb6..0c5586cbf 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java
@@ -17,19 +17,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTilePollidisiac extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":pollidisiac")
- public static TileEntityType TYPE;
-
private static final int RANGE = 6;
private static final int MANA_COST = 12;
public SubTilePollidisiac() {
- super(TYPE);
+ super(ModSubtiles.POLLIDISIAC);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java
index 50431efcb..0c033acb4 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java
@@ -33,6 +33,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.item.IFlowerPlaceable;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lib.LibMisc;
@@ -44,9 +45,6 @@ import java.util.Collections;
import java.util.List;
public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus")
- public static TileEntityType TYPE;
-
private static final int RANGE = 2;
private static final int RANGE_Y = 3;
private static final int RANGE_PLACE_MANA = 8;
@@ -62,7 +60,7 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
}
public SubTileRannuncarpus() {
- this(TYPE);
+ this(ModSubtiles.RANNUNCARPUS);
}
@Override
@@ -188,11 +186,8 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileRannuncarpus {
- @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.RANNUNCARPUS_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
index ceca77b41..86728a5c4 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java
@@ -16,15 +16,13 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.Collections;
import java.util.Set;
public class SubTileSolegnolia extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":solegnolia")
- public static TileEntityType TYPE;
-
private static final double RANGE = 5;
private static final double RANGE_MINI = 1;
@@ -35,7 +33,7 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower {
}
public SubTileSolegnolia() {
- this(TYPE);
+ this(ModSubtiles.SOLEGNOLIA);
}
@Override
@@ -79,11 +77,8 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower {
}
public static class Mini extends SubTileSolegnolia {
- @ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi")
- public static TileEntityType TYPE;
-
public Mini() {
- super(TYPE);
+ super(ModSubtiles.SOLEGNOLIA_CHIBI);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java
index 3a7fdde41..90418bd72 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java
@@ -27,6 +27,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -34,9 +35,6 @@ import vazkii.botania.common.network.PacketHandler;
import java.util.List;
public class SubTileSpectranthemum extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":spectranthemum")
- public static TileEntityType TYPE;
-
private static final String TAG_BIND_X = "bindX";
private static final String TAG_BIND_Y = "bindY";
private static final String TAG_BIND_Z = "bindZ";
@@ -50,7 +48,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower {
private BlockPos bindPos = new BlockPos(0, -1, 0);
public SubTileSpectranthemum() {
- super(TYPE);
+ super(ModSubtiles.SPECTRANTHEMUM);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java
index b27dafa3e..d14b5028e 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java
@@ -17,6 +17,7 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.client.fx.SparkleParticleData;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.lib.LibMisc;
@@ -24,15 +25,12 @@ import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileTangleberrie extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":tangleberrie")
- public static TileEntityType TYPE;
-
public SubTileTangleberrie(TileEntityType> type) {
super(type);
}
public SubTileTangleberrie() {
- this(TYPE);
+ this(ModSubtiles.TANGLEBERRIE);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java
index ff6516145..70be40113 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java
@@ -22,21 +22,20 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
public class SubTileTigerseye extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":tigerseye")
- public static TileEntityType TYPE;
-
private static final int RANGE = 10;
private static final int RANGE_Y = 4;
private static final int COST = 70;
public SubTileTigerseye() {
- super(TYPE);
+ super(ModSubtiles.TIGERSEYE);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java
index e1bdf45ba..22033096a 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java
@@ -16,20 +16,18 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.lib.LibMisc;
import java.util.*;
public class SubTileVinculotus extends TileEntityFunctionalFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":vinculotus")
- public static TileEntityType TYPE;
-
public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>());
private static final int RANGE = 64;
public SubTileVinculotus() {
- super(TYPE);
+ super(ModSubtiles.VINCULOTUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java
index 034b690a7..63e683286 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java
@@ -16,19 +16,18 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.core.helper.ExperienceHelper;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileArcaneRose extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":rosa_arcana")
- public static TileEntityType TYPE;
-
private static final int RANGE = 1;
public SubTileArcaneRose() {
- super(TYPE);
+ super(ModSubtiles.ROSA_ARCANA);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java
index c21f7fff5..27f50abf7 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java
@@ -19,6 +19,8 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.block.tile.TileCell;
import vazkii.botania.common.lib.LibMisc;
@@ -26,9 +28,6 @@ import java.util.ArrayList;
import java.util.List;
public class SubTileDandelifeon extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":dandelifeon")
- public static TileEntityType TYPE;
-
private static final int RANGE = 12;
private static final int SPEED = 10;
// private static final int MAX_GENERATIONS = 100;
@@ -47,7 +46,7 @@ public class SubTileDandelifeon extends TileEntityGeneratingFlower {
};
public SubTileDandelifeon() {
- super(TYPE);
+ super(ModSubtiles.DANDELIFEON);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java
index 9acd48544..ee389e1db 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java
@@ -23,14 +23,13 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.mana.BlockSpreader;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibMisc;
public class SubTileEndoflame extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":endoflame")
- public static TileEntityType TYPE;
-
private static final String TAG_BURN_TIME = "burnTime";
private static final int FUEL_CAP = 32000;
private static final int RANGE = 3;
@@ -39,7 +38,7 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower {
private int burnTime = 0;
public SubTileEndoflame() {
- super(TYPE);
+ super(ModSubtiles.ENDOFLAME);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java
index efa981b89..02f46905d 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java
@@ -21,19 +21,18 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.client.fx.SparkleParticleData;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileEntropinnyum extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":entropinnyum")
- public static TileEntityType TYPE;
-
private static final int RANGE = 12;
private static final int EXPLODE_EFFECT_EVENT = 0;
public SubTileEntropinnyum() {
- super(TYPE);
+ super(ModSubtiles.ENTROPINNYUM);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java
index 862f1b978..3af48c675 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java
@@ -24,14 +24,13 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":gourmaryllis")
- public static TileEntityType TYPE;
-
private static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_DIGESTING_MANA = "digestingMana";
public static final String TAG_LAST_FOOD = "lastFood";
@@ -44,7 +43,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
private int lastFoodCount = 0;
public SubTileGourmaryllis() {
- super(TYPE);
+ super(ModSubtiles.GOURMARYLLIS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java
index 3e10482bd..dc2911738 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java
@@ -26,6 +26,8 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.client.fx.WispParticleData;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.Arrays;
@@ -33,9 +35,6 @@ import java.util.Collections;
import java.util.List;
public class SubTileHydroangeas extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":hydroangeas")
- public static TileEntityType TYPE;
-
private static final String TAG_BURN_TIME = "burnTime";
public static final String TAG_COOLDOWN = "cooldown";
@@ -44,7 +43,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower {
int burnTime, cooldown;
public SubTileHydroangeas() {
- this(TYPE);
+ this(ModSubtiles.HYDROANGEAS);
}
public SubTileHydroangeas(TileEntityType> type) {
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java
index 97dac1229..3e72c9e21 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java
@@ -19,16 +19,15 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
public class SubTileKekimurus extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":kekimurus")
- public static TileEntityType TYPE;
-
private static final int RANGE = 5;
public SubTileKekimurus() {
- super(TYPE);
+ super(ModSubtiles.KEKIMURUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java
index 7fd4a962c..b937037ab 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java
@@ -19,6 +19,8 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.lib.LibMisc;
@@ -27,9 +29,6 @@ import java.util.Collections;
import java.util.List;
public class SubTileMunchdew extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":munchdew")
- public static TileEntityType TYPE;
-
public static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_ATE_ONCE = "ateOnce";
@@ -41,7 +40,7 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower {
private int cooldown = 0;
public SubTileMunchdew() {
- super(TYPE);
+ super(ModSubtiles.MUNCHDEW);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java
index 0d084aec6..a7a256cd0 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java
@@ -25,20 +25,19 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileNarslimmus extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":narslimmus")
- public static TileEntityType TYPE;
-
public static final String TAG_WORLD_SPAWNED = "botania:world_spawned";
private static final int RANGE = 2;
public SubTileNarslimmus() {
- super(TYPE);
+ super(ModSubtiles.NARSLIMMUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java
index 8326ad7be..e129d0301 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java
@@ -20,15 +20,13 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.ModTags;
import javax.annotation.Nullable;
public class SubTileRafflowsia extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":rafflowsia")
- public static TileEntityType TYPE;
-
public static final String TAG_LAST_FLOWER = "lastFlower";
public static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes";
@@ -39,7 +37,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower {
private static final int RANGE = 5;
public SubTileRafflowsia() {
- super(TYPE);
+ super(ModSubtiles.RAFFLOWSIA);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
index 74936d5ac..8d67921b4 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java
@@ -26,18 +26,17 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class SubTileShulkMeNot extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":shulk_me_not")
- public static TileEntityType TYPE;
-
private static final int RADIUS = 8;
public SubTileShulkMeNot() {
- super(TYPE);
+ super(ModSubtiles.SHULK_ME_NOT);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
index 8a46e4d4a..11a13da9e 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java
@@ -33,6 +33,8 @@ import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.core.helper.ColorHelper;
import vazkii.botania.common.lib.LibMisc;
@@ -40,9 +42,6 @@ import java.util.List;
import java.util.function.Predicate;
public class SubTileSpectrolus extends TileEntityGeneratingFlower {
- @ObjectHolder(LibMisc.MOD_ID + ":spectrolus")
- public static TileEntityType TYPE;
-
public static final String TAG_NEXT_COLOR = "nextColor";
private static final int WOOL_GEN = 1200;
private static final int SHEEP_GEN = 5000;
@@ -53,7 +52,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
private DyeColor nextColor = DyeColor.WHITE;
public SubTileSpectrolus() {
- super(TYPE);
+ super(ModSubtiles.SPECTROLUS);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java
index 7b8c56a0d..ba14c5dc4 100644
--- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java
+++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java
@@ -16,15 +16,14 @@ import net.minecraft.util.SoundCategory;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.client.fx.WispParticleData;
+import vazkii.botania.common.block.ModSubtiles;
+import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibMisc;
public class SubTileThermalily extends SubTileHydroangeas {
- @ObjectHolder(LibMisc.MOD_ID + ":thermalily")
- public static TileEntityType TYPE;
-
public SubTileThermalily() {
- super(TYPE);
+ super(ModSubtiles.THERMALILY);
}
@Override
diff --git a/src/main/java/vazkii/botania/common/block/tile/ModTiles.java b/src/main/java/vazkii/botania/common/block/tile/ModTiles.java
index 40451859f..0a963f376 100644
--- a/src/main/java/vazkii/botania/common/block/tile/ModTiles.java
+++ b/src/main/java/vazkii/botania/common/block/tile/ModTiles.java
@@ -13,7 +13,6 @@ 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.*;
diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java
index 4380ce7eb..1f651861a 100644
--- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java
+++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java
@@ -19,15 +19,12 @@ import net.minecraft.item.crafting.RecipeManager;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.LazyValue;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion;
import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.registries.ObjectHolder;
-
import vazkii.botania.api.recipe.ElvenPortalUpdateEvent;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.api.recipe.IElvenTradeRecipe;
@@ -41,14 +38,11 @@ import vazkii.botania.common.block.tile.mana.TilePool;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.crafting.ModRecipeTypes;
import vazkii.botania.common.item.ItemLexicon;
-import vazkii.botania.common.lib.LibBlockNames;
-import vazkii.botania.common.lib.LibMisc;
import vazkii.patchouli.api.IMultiblock;
import vazkii.patchouli.api.PatchouliAPI;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-
import java.util.*;
import java.util.stream.Collectors;
diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java
index bfba7469b..37f2c97d9 100644
--- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java
+++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java
@@ -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;
diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java
index 739b96bc5..7f6df55c0 100644
--- a/src/main/java/vazkii/botania/common/item/ModItems.java
+++ b/src/main/java/vazkii/botania/common/item/ModItems.java
@@ -25,8 +25,6 @@ import net.minecraftforge.common.extensions.IForgeContainerType;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.IForgeRegistry;
-import net.minecraftforge.registries.ObjectHolder;
-
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.mana.spark.SparkUpgradeType;
@@ -76,15 +74,12 @@ import vazkii.botania.common.item.record.ItemModRecord;
import vazkii.botania.common.item.relic.*;
import vazkii.botania.common.item.rod.*;
import vazkii.botania.common.lib.LibItemNames;
-import vazkii.botania.common.lib.LibMisc;
import java.util.Locale;
-import static vazkii.botania.common.block.ModBlocks.dreamwood;
import static vazkii.botania.common.block.ModBlocks.register;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
-@ObjectHolder(LibMisc.MOD_ID)
public final class ModItems {
public static final Item lexicon = new ItemLexicon(unstackable().rarity(Rarity.UNCOMMON));