From 6d36357bceff0fae9094b524a7d00dcc82cad5e9 Mon Sep 17 00:00:00 2001 From: Hubry Date: Tue, 23 Jun 2020 19:21:31 +0200 Subject: [PATCH] Formatting: newline after field annotation, align javadoc tags per type --- spotless/eclipseformat.xml | 6 +- .../api/corporea/IWrappedInventory.java | 14 +- .../botania/api/item/IFlowerPlaceable.java | 4 +- .../vazkii/botania/api/mana/IManaItem.java | 4 +- .../botania/api/mana/ManaItemHandler.java | 48 +- .../botania/api/recipe/IElvenTradeRecipe.java | 6 +- .../api/subtile/TileEntitySpecialFlower.java | 3 +- .../handler/ItemsRemainingRenderHandler.java | 3 +- .../core/helper/ShaderWrappedRenderLayer.java | 3 +- .../client/patchouli/PatchouliUtils.java | 6 +- .../component/RotatingRecipeComponent.java | 6 +- .../common/advancements/ManaGunTrigger.java | 3 +- .../botania/common/block/ModBlocks.java | 747 ++++++++++++------ .../botania/common/block/ModFluffBlocks.java | 501 ++++++++---- .../botania/common/block/ModSubtiles.java | 294 ++++--- .../common/block/subtile/SubTileManastar.java | 3 +- .../block/subtile/SubTilePureDaisy.java | 3 +- .../functional/SubTileAgricarnation.java | 6 +- .../subtile/functional/SubTileBellethorn.java | 6 +- .../subtile/functional/SubTileBergamute.java | 3 +- .../subtile/functional/SubTileBubbell.java | 6 +- .../subtile/functional/SubTileClayconia.java | 6 +- .../subtile/functional/SubTileDaffomill.java | 3 +- .../subtile/functional/SubTileDreadthorn.java | 3 +- .../subtile/functional/SubTileExoflame.java | 3 +- .../functional/SubTileFallenKanade.java | 3 +- .../functional/SubTileHeiseiDream.java | 3 +- .../subtile/functional/SubTileHopperhock.java | 6 +- .../subtile/functional/SubTileHyacidus.java | 3 +- .../functional/SubTileJadedAmaranthus.java | 3 +- .../subtile/functional/SubTileJiyuulia.java | 3 +- .../subtile/functional/SubTileLoonuim.java | 3 +- .../functional/SubTileMarimorphosis.java | 6 +- .../subtile/functional/SubTileMedumone.java | 3 +- .../subtile/functional/SubTileOrechid.java | 3 +- .../functional/SubTileOrechidIgnem.java | 3 +- .../functional/SubTilePollidisiac.java | 3 +- .../functional/SubTileRannuncarpus.java | 6 +- .../subtile/functional/SubTileSolegnolia.java | 6 +- .../functional/SubTileSpectranthemum.java | 3 +- .../functional/SubTileTangleberrie.java | 3 +- .../subtile/functional/SubTileTigerseye.java | 3 +- .../subtile/functional/SubTileVinculotus.java | 3 +- .../subtile/generating/SubTileArcaneRose.java | 3 +- .../generating/SubTileDandelifeon.java | 3 +- .../subtile/generating/SubTileEndoflame.java | 3 +- .../generating/SubTileEntropinnyum.java | 3 +- .../generating/SubTileGourmaryllis.java | 3 +- .../generating/SubTileHydroangeas.java | 3 +- .../subtile/generating/SubTileKekimurus.java | 3 +- .../subtile/generating/SubTileMunchdew.java | 3 +- .../subtile/generating/SubTileNarslimmus.java | 3 +- .../subtile/generating/SubTileRafflowsia.java | 6 +- .../subtile/generating/SubTileShulkMeNot.java | 3 +- .../subtile/generating/SubTileSpectrolus.java | 3 +- .../subtile/generating/SubTileThermalily.java | 3 +- .../common/block/tile/TileAlfPortal.java | 3 +- .../tile/corporea/TileCorporeaRetainer.java | 3 +- .../common/block/tile/mana/TileSpreader.java | 3 +- .../tile/string/TileRedStringContainer.java | 6 +- .../core/handler/ExoflameFurnaceHandler.java | 3 +- .../common/crafting/FuzzyNBTIngredient.java | 8 +- .../common/crafting/RecipeManaInfusion.java | 3 +- .../common/entity/EntityDoppleganger.java | 9 +- .../botania/common/item/ItemGrassSeeds.java | 12 +- .../vazkii/botania/common/item/ModItems.java | 4 +- .../item/equipment/bauble/ItemHolyCloak.java | 3 +- .../item/equipment/bauble/ItemTravelBelt.java | 3 +- .../network/PacketUpdateItemsRemaining.java | 3 +- .../data/recipes/ManaInfusionProvider.java | 3 +- .../botania/data/recipes/WrapperResult.java | 6 +- 71 files changed, 1228 insertions(+), 642 deletions(-) diff --git a/spotless/eclipseformat.xml b/spotless/eclipseformat.xml index 9fadb8e5f..0f5d90b80 100644 --- a/spotless/eclipseformat.xml +++ b/spotless/eclipseformat.xml @@ -52,7 +52,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -166,7 +166,7 @@ - + diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java index e7551f20c..635e4d695 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -26,11 +26,11 @@ public interface IWrappedInventory { /** * Counts items in the inventory matching the request * - * @param request - * - specifies what should be found - * @return List of ItemStack, individual stacks may exceed maxStackSize for - * purposes of counting huge amounts. To get final count requestor - * should sum stackSize of all stacks. + * @param request + * - specifies what should be found + * @return List of ItemStack, individual stacks may exceed maxStackSize for + * purposes of counting huge amounts. To get final count requestor + * should sum stackSize of all stacks. */ List countItems(ICorporeaRequest request); @@ -47,8 +47,8 @@ public interface IWrappedInventory { * {@link ICorporeaRequest#extractedItems} are updated to reflect how many * items were found and extracted. * - * @param request - * @return List of ItemStacks to be delivered to the destination. + * @param request + * @return List of ItemStacks to be delivered to the destination. */ List extractItems(ICorporeaRequest request); } diff --git a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java index 092c77a8d..1079c8cfd 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java @@ -18,8 +18,8 @@ import vazkii.botania.api.subtile.TileEntitySpecialFlower; public interface IFlowerPlaceable { /** - * @param ctx The placement context, aiming downwards towards the downward neighbor position - * @return Whether the block was placed successfully + * @param ctx The placement context, aiming downwards towards the downward neighbor position + * @return Whether the block was placed successfully */ boolean tryPlace(TileEntitySpecialFlower flower, BlockItemUseContext ctx); } diff --git a/src/main/java/vazkii/botania/api/mana/IManaItem.java b/src/main/java/vazkii/botania/api/mana/IManaItem.java index ad7c51c74..9c527f630 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaItem.java +++ b/src/main/java/vazkii/botania/api/mana/IManaItem.java @@ -36,7 +36,7 @@ public interface IManaItem { * Can this item receive mana from a mana Pool? * * @param pool The pool it's receiving mana from, can be casted to IManaPool. - * @see IManaPool#isOutputtingPower() + * @see IManaPool#isOutputtingPower() */ public boolean canReceiveManaFromPool(ItemStack stack, TileEntity pool); @@ -49,7 +49,7 @@ public interface IManaItem { * Can this item export mana to a mana Pool? * * @param pool The pool it's exporting mana to, can be casted to IManaPool. - * @see IManaPool#isOutputtingPower() + * @see IManaPool#isOutputtingPower() */ public boolean canExportManaToPool(ItemStack stack, TileEntity pool); diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index ae8dc44de..a52bed8d4 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -54,11 +54,11 @@ public interface ManaItemHandler { /** * Requests mana from items in a given player's inventory. * - * @param manaToGet How much mana is to be requested, if less mana exists than this amount, - * the amount of mana existent will be returned instead, if you want exact values use - * {@link #requestManaExact}. - * @param remove If true, the mana will be removed from the target item. Set to false to just check. - * @return The amount of mana received from the request. + * @param manaToGet How much mana is to be requested, if less mana exists than this amount, + * the amount of mana existent will be returned instead, if you want exact values use + * {@link #requestManaExact}. + * @param remove If true, the mana will be removed from the target item. Set to false to just check. + * @return The amount of mana received from the request. */ default int requestMana(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return 0; @@ -67,10 +67,10 @@ public interface ManaItemHandler { /** * Requests an exact amount of mana from items in a given player's inventory. * - * @param manaToGet How much mana is to be requested, if less mana exists than this amount, - * false will be returned instead, and nothing will happen. - * @param remove If true, the mana will be removed from the target item. Set to false to just check. - * @return If the request was succesful. + * @param manaToGet How much mana is to be requested, if less mana exists than this amount, + * false will be returned instead, and nothing will happen. + * @param remove If true, the mana will be removed from the target item. Set to false to just check. + * @return If the request was succesful. */ default boolean requestManaExact(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return false; @@ -80,9 +80,9 @@ public interface ManaItemHandler { * Dispatches mana to items in a given player's inventory. Note that this method * does not automatically remove mana from the item which is exporting. * - * @param manaToSend How much mana is to be sent. - * @param add If true, the mana will be added from the target item. Set to false to just check. - * @return The amount of mana actually sent. + * @param manaToSend How much mana is to be sent. + * @param add If true, the mana will be added from the target item. Set to false to just check. + * @return The amount of mana actually sent. */ default int dispatchMana(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { return 0; @@ -92,9 +92,9 @@ public interface ManaItemHandler { * Dispatches an exact amount of mana to items in a given player's inventory. Note that this method * does not automatically remove mana from the item which is exporting. * - * @param manaToSend How much mana is to be sent. - * @param add If true, the mana will be added from the target item. Set to false to just check. - * @return If an item received the mana sent. + * @param manaToSend How much mana is to be sent. + * @param add If true, the mana will be added from the target item. Set to false to just check. + * @return If an item received the mana sent. */ default boolean dispatchManaExact(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { return false; @@ -104,11 +104,11 @@ public interface ManaItemHandler { * Requests mana from items in a given player's inventory. This version also * checks for IManaDiscountArmor items equipped to lower the cost. * - * @param manaToGet How much mana is to be requested, if less mana exists than this amount, - * the amount of mana existent will be returned instead, if you want exact values use - * requestManaExact. - * @param remove If true, the mana will be removed from the target item. Set to false to just check. - * @return The amount of mana received from the request. + * @param manaToGet How much mana is to be requested, if less mana exists than this amount, + * the amount of mana existent will be returned instead, if you want exact values use + * requestManaExact. + * @param remove If true, the mana will be removed from the target item. Set to false to just check. + * @return The amount of mana received from the request. */ default int requestManaForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return 0; @@ -118,10 +118,10 @@ public interface ManaItemHandler { * Requests an exact amount of mana from items in a given player's inventory. This version also * checks for IManaDiscountArmor items equipped to lower the cost. * - * @param manaToGet How much mana is to be requested, if less mana exists than this amount, - * false will be returned instead, and nothing will happen. - * @param remove If true, the mana will be removed from the target item. Set to false to just check. - * @return If the request was succesful. + * @param manaToGet How much mana is to be requested, if less mana exists than this amount, + * false will be returned instead, and nothing will happen. + * @param remove If true, the mana will be removed from the target item. Set to false to just check. + * @return If the request was succesful. */ default boolean requestManaExactForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return false; diff --git a/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java b/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java index 6c6578002..8e8115620 100644 --- a/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java @@ -31,9 +31,9 @@ public interface IElvenTradeRecipe extends IRecipe { /** * Attempts to match the recipe * - * @param stacks Entire contents of the portal's buffer - * @return {@link Optional#empty()} if recipe doesn't match, Optional with a set of items used by recipe - * otherwise + * @param stacks Entire contents of the portal's buffer + * @return {@link Optional#empty()} if recipe doesn't match, Optional with a set of items used by recipe + * otherwise */ Optional> match(List stacks); diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 1f2ee1785..862b5aec8 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -58,7 +58,8 @@ import java.util.List; * Common superclass of all magical flower TE's */ public class TileEntitySpecialFlower extends TileEntity implements ITickableTileEntity, IWandBindable { - @CapabilityInject(IFloatingFlower.class) public static Capability FLOATING_FLOWER_CAP; + @CapabilityInject(IFloatingFlower.class) + public static Capability FLOATING_FLOWER_CAP; public static final ResourceLocation DING_SOUND_EVENT = new ResourceLocation("botania", "ding"); public static final int SLOWDOWN_FACTOR_PODZOL = 5; public static final int SLOWDOWN_FACTOR_MYCEL = 10; diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 6deef5445..6c04ea3e7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -34,7 +34,8 @@ public final class ItemsRemainingRenderHandler { private static final int leaveTicks = 20; private static ItemStack stack = ItemStack.EMPTY; - @Nullable private static ITextComponent customString; + @Nullable + private static ITextComponent customString; private static int ticks, count; @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java index f01c52966..84d47b212 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java @@ -21,7 +21,8 @@ public class ShaderWrappedRenderLayer extends RenderType { private final RenderType delegate; private final ShaderHelper.BotaniaShader shader; - @Nullable private final ShaderCallback cb; + @Nullable + private final ShaderCallback cb; public ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader shader, @Nullable ShaderCallback cb, RenderType delegate) { super(LibResources.PREFIX_MOD + delegate.toString() + "_with_" + shader.name(), delegate.getVertexFormat(), delegate.getDrawMode(), delegate.getBufferSize(), delegate.isUseDelegate(), true, diff --git a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java index b2c9084db..58a2c3b78 100644 --- a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java +++ b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java @@ -24,9 +24,9 @@ public class PatchouliUtils { * looping back ingredients that run out of matched stacks, until the ingredients reach the length * of the longest ingredient in the recipe set. * - * @param ingredients List of ingredients in the specific slot - * @param longestIngredientSize Longest ingredient in the entire recipe - * @return Serialized Patchouli ingredient string + * @param ingredients List of ingredients in the specific slot + * @param longestIngredientSize Longest ingredient in the entire recipe + * @return Serialized Patchouli ingredient string */ public static String interweaveIngredients(List ingredients, int longestIngredientSize) { if (ingredients.size() == 1) { diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java index dc2a2ea81..2a8a8c041 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -25,9 +25,11 @@ import java.util.function.Function; * Patchouli custom component that draws a rotating circle of items from the defined recipe. */ public class RotatingRecipeComponent extends RotatingItemListComponentBase { - @SerializedName("recipe_name") public String recipeName; + @SerializedName("recipe_name") + public String recipeName; - @SerializedName("recipe_type") public String recipeType; + @SerializedName("recipe_type") + public String recipeType; @Override protected List makeIngredients() { diff --git a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java index b29ed11f8..d3ea41274 100644 --- a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java @@ -106,7 +106,8 @@ public class ManaGunTrigger implements ICriterionTrigger evt) { IForgeRegistry r = evt.getRegistry(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index dd0a2372d..6bd338af3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -30,193 +30,360 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @ObjectHolder(LibMisc.MOD_ID) public final class ModFluffBlocks { - @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; + @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; - @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; + @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; - @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_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_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_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_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_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.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 + "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 + "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 + "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 + "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 + "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 + "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 + "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(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) + 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 + 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("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.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; + @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 void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index 351ae3fbc..4d53de35e 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -40,105 +40,203 @@ 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("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; + @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; private static ResourceLocation floating(ResourceLocation orig) { return new ResourceLocation(orig.getNamespace(), "floating_" + orig.getPath()); 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 c45adfb6c..eefb88511 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -20,7 +20,8 @@ import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends TileEntitySpecialFlower { - @ObjectHolder(LibMisc.MOD_ID + ":manastar") public static TileEntityType TYPE; + @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; 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 2472fcf52..b34f9c33b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -31,7 +31,8 @@ import javax.annotation.Nullable; import java.util.Arrays; public class SubTilePureDaisy extends TileEntitySpecialFlower { - @ObjectHolder(LibMisc.MOD_ID + ":pure_daisy") public static TileEntityType TYPE; + @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"; 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 d81573e90..b6d5c9910 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 @@ -26,7 +26,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.Set; public class SubTileAgricarnation extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":agricarnation") public static TileEntityType TYPE; + @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); @@ -131,7 +132,8 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { } public static class Mini extends SubTileAgricarnation { - @ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":agricarnation_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 8d9596c69..e99b0504b 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 @@ -25,7 +25,8 @@ import java.util.List; import java.util.function.Predicate; public class SubTileBellethorn extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":bellethorn") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn") + public static TileEntityType TYPE; public static final int RANGE = 6; public static final int RANGE_MINI = 1; @@ -104,7 +105,8 @@ public class SubTileBellethorn extends TileEntityFunctionalFlower { } public static class Mini extends SubTileBellethorn { - @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 87d17d60d..fbb845244 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 @@ -20,7 +20,8 @@ import java.util.Set; import java.util.WeakHashMap; public class SubTileBergamute extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":bergamute") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":bergamute") + public static TileEntityType TYPE; private static final int RANGE = 4; private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); 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 e34e4fefb..adbd3acc4 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 @@ -24,7 +24,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":bubbell") + public static TileEntityType TYPE; private static final int RANGE = 12; private static final int RANGE_MINI = 6; @@ -114,7 +115,8 @@ public class SubTileBubbell extends TileEntityFunctionalFlower { } public static class Mini extends SubTileBubbell { - @ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":bubbell_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 b79cd022d..2792a3930 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 @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.List; public class SubTileClayconia extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":clayconia") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":clayconia") + public static TileEntityType TYPE; private static final int COST = 80; private static final int RANGE = 5; @@ -111,7 +112,8 @@ public class SubTileClayconia extends TileEntityFunctionalFlower { } public static class Mini extends SubTileClayconia { - @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":bellethorn_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 67ad654b4..944355645 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 @@ -33,7 +33,8 @@ import vazkii.botania.common.network.PacketItemAge; import java.util.List; public class SubTileDaffomill extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":daffomill") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":daffomill") + public static TileEntityType TYPE; private static final String TAG_ORIENTATION = "orientation"; private static final String TAG_WIND_TICKS = "windTicks"; 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 f6ec5e731..e84256a3a 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 @@ -18,7 +18,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":dreadthorn") + public static TileEntityType TYPE; public SubTileDreadthorn() { super(TYPE); 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 78addb996..a1f9ba6de 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 @@ -21,7 +21,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":exoflame") + public static TileEntityType TYPE; private static final int RANGE = 5; private static final int RANGE_Y = 2; 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 357158058..309b8fdb6 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 @@ -23,7 +23,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":fallen_kanade") + public static TileEntityType TYPE; private static final int RANGE = 2; private static final int COST = 120; 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 cf7f779ce..0700a2388 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 @@ -27,7 +27,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":heisei_dream") + public static TileEntityType TYPE; private static final int RANGE = 5; private static final int COST = 100; 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 a0025265f..4a629ce4f 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 @@ -42,7 +42,8 @@ import java.util.ArrayList; import java.util.List; public class SubTileHopperhock extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":hopperhock") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":hopperhock") + public static TileEntityType TYPE; private static final String TAG_FILTER_TYPE = "filterType"; private static final int RANGE_MANA = 10; @@ -262,7 +263,8 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { } public static class Mini extends SubTileHopperhock { - @ObjectHolder(LibMisc.MOD_ID + ":hopperhock_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":hopperhock_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 4fa0aff8d..1008768a1 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 @@ -24,7 +24,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileHyacidus extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":hyacidus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":hyacidus") + public static TileEntityType TYPE; private static final int RANGE = 6; private static final int COST = 20; 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 d16f05920..ca07e61c7 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 @@ -22,7 +22,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":jaded_amaranthus") + public static TileEntityType TYPE; private static final int COST = 100; final int RANGE = 4; 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 7ffc04871..286335b6f 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 @@ -15,7 +15,8 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.lib.LibMisc; public class SubTileJiyuulia extends SubTileTangleberrie { - @ObjectHolder(LibMisc.MOD_ID + ":jiyuulia") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":jiyuulia") + public static TileEntityType TYPE; public SubTileJiyuulia() { super(TYPE); 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 598bb6dad..e0553ba59 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 @@ -44,7 +44,8 @@ import java.util.List; import java.util.Random; public class SubTileLoonuim extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":loonium") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":loonium") + public static TileEntityType TYPE; private static final int COST = 35000; private static final int RANGE = 5; 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 54fa956ae..1219105d4 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 @@ -29,7 +29,8 @@ import java.util.List; import java.util.Set; public class SubTileMarimorphosis extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis") + public static TileEntityType TYPE; private static final int COST = 12; private static final int RANGE = 8; @@ -173,7 +174,8 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { } public static class Mini extends SubTileMarimorphosis { - @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":marimorphosis_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 55219debf..bac42bec5 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 @@ -23,7 +23,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileMedumone extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":medumone") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":medumone") + public static TileEntityType TYPE; private static final int RANGE = 6; 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 86f9e84eb..b5962c63d 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 @@ -38,7 +38,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; public class SubTileOrechid extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":orechid") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":orechid") + public static TileEntityType TYPE; private static final int COST = 17500; private static final int COST_GOG = 700; 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 9f3d0f1fa..7443ce220 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 @@ -21,7 +21,8 @@ import java.util.Map; import java.util.function.Predicate; public class SubTileOrechidIgnem extends SubTileOrechid { - @ObjectHolder(LibMisc.MOD_ID + ":orechid_ignem") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":orechid_ignem") + public static TileEntityType TYPE; private static final int COST = 20000; 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 73680a877..90fddbeb6 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 @@ -22,7 +22,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTilePollidisiac extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":pollidisiac") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":pollidisiac") + public static TileEntityType TYPE; private static final int RANGE = 6; private static final int MANA_COST = 12; 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 8c2ee80b9..50431efcb 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 @@ -44,7 +44,8 @@ import java.util.Collections; import java.util.List; public class SubTileRannuncarpus extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus") + public static TileEntityType TYPE; private static final int RANGE = 2; private static final int RANGE_Y = 3; @@ -187,7 +188,8 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { } public static class Mini extends SubTileRannuncarpus { - @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":rannuncarpus_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 982ce2fa4..ceca77b41 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 @@ -22,7 +22,8 @@ import java.util.Collections; import java.util.Set; public class SubTileSolegnolia extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":solegnolia") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":solegnolia") + public static TileEntityType TYPE; private static final double RANGE = 5; private static final double RANGE_MINI = 1; @@ -78,7 +79,8 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { } public static class Mini extends SubTileSolegnolia { - @ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":solegnolia_chibi") + public static TileEntityType TYPE; public Mini() { super(TYPE); 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 d4ddb9ce4..3a7fdde41 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 @@ -34,7 +34,8 @@ import vazkii.botania.common.network.PacketHandler; import java.util.List; public class SubTileSpectranthemum extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":spectranthemum") public static TileEntityType TYPE; + @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"; 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 cddc3815a..b27dafa3e 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 @@ -24,7 +24,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileTangleberrie extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":tangleberrie") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":tangleberrie") + public static TileEntityType TYPE; public SubTileTangleberrie(TileEntityType type) { super(type); 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 ce44a4311..ff6516145 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 @@ -28,7 +28,8 @@ import java.util.ArrayList; import java.util.List; public class SubTileTigerseye extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":tigerseye") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":tigerseye") + public static TileEntityType TYPE; private static final int RANGE = 10; private static final int RANGE_Y = 4; 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 f3590a6d8..e1bdf45ba 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 @@ -22,7 +22,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.*; public class SubTileVinculotus extends TileEntityFunctionalFlower { - @ObjectHolder(LibMisc.MOD_ID + ":vinculotus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":vinculotus") + public static TileEntityType TYPE; public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static final int RANGE = 64; 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 4d22251ae..034b690a7 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 @@ -22,7 +22,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":rosa_arcana") + public static TileEntityType TYPE; private static final int RANGE = 1; 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 df976e825..c21f7fff5 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 @@ -26,7 +26,8 @@ import java.util.ArrayList; import java.util.List; public class SubTileDandelifeon extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":dandelifeon") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":dandelifeon") + public static TileEntityType TYPE; private static final int RANGE = 12; private static final int SPEED = 10; 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 a8c62c774..9acd48544 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 @@ -28,7 +28,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":endoflame") + public static TileEntityType TYPE; private static final String TAG_BURN_TIME = "burnTime"; private static final int FUEL_CAP = 32000; 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 e1179a74e..efa981b89 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 @@ -26,7 +26,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileEntropinnyum extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":entropinnyum") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":entropinnyum") + public static TileEntityType TYPE; private static final int RANGE = 12; private static final int EXPLODE_EFFECT_EVENT = 0; 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 2d1c28077..862f1b978 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 @@ -29,7 +29,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileGourmaryllis extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":gourmaryllis") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":gourmaryllis") + public static TileEntityType TYPE; private static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_DIGESTING_MANA = "digestingMana"; 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 f6ac01c12..3e10482bd 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 @@ -33,7 +33,8 @@ import java.util.Collections; import java.util.List; public class SubTileHydroangeas extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":hydroangeas") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":hydroangeas") + public static TileEntityType TYPE; private static final String TAG_BURN_TIME = "burnTime"; public static final String TAG_COOLDOWN = "cooldown"; 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 1504093fc..97dac1229 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 @@ -22,7 +22,8 @@ import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.lib.LibMisc; public class SubTileKekimurus extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":kekimurus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":kekimurus") + public static TileEntityType TYPE; private static final int RANGE = 5; 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 681b4b3d3..7fd4a962c 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 @@ -27,7 +27,8 @@ import java.util.Collections; import java.util.List; public class SubTileMunchdew extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":munchdew") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":munchdew") + public static TileEntityType TYPE; public static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_ATE_ONCE = "ateOnce"; 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 18a290fb9..0d084aec6 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 @@ -30,7 +30,8 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; public class SubTileNarslimmus extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":narslimmus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":narslimmus") + public static TileEntityType TYPE; public static final String TAG_WORLD_SPAWNED = "botania:world_spawned"; 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 321239f2e..8326ad7be 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 @@ -26,12 +26,14 @@ import vazkii.botania.common.lib.ModTags; import javax.annotation.Nullable; public class SubTileRafflowsia extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":rafflowsia") public static TileEntityType TYPE; + @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"; - @Nullable private Block lastFlower; + @Nullable + private Block lastFlower; private int lastFlowerTimes; private static final int RANGE = 5; 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 f72520679..74936d5ac 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 @@ -31,7 +31,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":shulk_me_not") + public static TileEntityType TYPE; private static final int RADIUS = 8; 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 8be275629..8a46e4d4a 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 @@ -40,7 +40,8 @@ import java.util.List; import java.util.function.Predicate; public class SubTileSpectrolus extends TileEntityGeneratingFlower { - @ObjectHolder(LibMisc.MOD_ID + ":spectrolus") public static TileEntityType TYPE; + @ObjectHolder(LibMisc.MOD_ID + ":spectrolus") + public static TileEntityType TYPE; public static final String TAG_NEXT_COLOR = "nextColor"; private static final int WOOL_GEN = 1200; 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 656d6b8a1..7b8c56a0d 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 @@ -20,7 +20,8 @@ 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; + @ObjectHolder(LibMisc.MOD_ID + ":thermalily") + public static TileEntityType TYPE; public SubTileThermalily() { super(TYPE); 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 0725e0b4e..4380ce7eb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -78,7 +78,8 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { private int ticksSinceLastItem = 0; private boolean closeNow = false; private boolean explode = false; - @Nullable private UUID breadPlayer = null; + @Nullable + private UUID breadPlayer = null; public TileAlfPortal() { super(ModTiles.ALF_PORTAL); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 3568ca263..636ddca49 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -37,7 +37,8 @@ public class TileCorporeaRetainer extends TileMod { private static final Map, ResourceLocation> corporeaMatcherSerializers = new ConcurrentHashMap<>(); private BlockPos requestPos = BlockPos.ZERO; - @Nullable private ICorporeaRequestMatcher request; + @Nullable + private ICorporeaRequestMatcher request; private int requestCount; private int compValue; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 4c55090da..f063be49a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -109,7 +109,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, private int mana; public float rotationX, rotationY; - @Nullable public DyeColor paddingColor = null; + @Nullable + public DyeColor paddingColor = null; private boolean requestsClientUpdate = false; private boolean hasReceivedInitialPacket = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index c3aef2607..e7d32d327 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -30,8 +30,10 @@ import java.util.Arrays; public class TileRedStringContainer extends TileRedString { private static final LazyOptional EMPTY = LazyOptional.of(EmptyHandler::new); - @Nullable private LazyOptional lastBoundInv = null; - @Nullable private LazyOptional proxiedInv = null; + @Nullable + private LazyOptional lastBoundInv = null; + @Nullable + private LazyOptional proxiedInv = null; public TileRedStringContainer() { this(ModTiles.RED_STRING_CONTAINER); diff --git a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java index 1d5dcaaa0..6f83f859a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -31,7 +31,8 @@ import java.lang.invoke.MethodHandle; public class ExoflameFurnaceHandler { - @CapabilityInject(IExoflameHeatable.class) public static Capability CAPABILITY; + @CapabilityInject(IExoflameHeatable.class) + public static Capability CAPABILITY; public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "exoflame_heatable"); private static final MethodHandle CAN_SMELT = LibObfuscation.getMethod(AbstractFurnaceTileEntity.class, "func_214008_b", IRecipe.class); diff --git a/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java b/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java index 82d459b73..f593ccb8f 100644 --- a/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java +++ b/src/main/java/vazkii/botania/common/crafting/FuzzyNBTIngredient.java @@ -44,9 +44,9 @@ public class FuzzyNBTIngredient extends Ingredient { /** * Constructs the ingredient. * - * @param stack Template stack for this ingredient - * @param acceptsEmptyTag Whether lack of NBT data is accepted by this ingredient in addition to the - * stack's data. + * @param stack Template stack for this ingredient + * @param acceptsEmptyTag Whether lack of NBT data is accepted by this ingredient in addition to the + * stack's data. * @throws IllegalArgumentException if the stack has no NBT data. */ public FuzzyNBTIngredient(ItemStack stack, boolean acceptsEmptyTag) { @@ -61,7 +61,7 @@ public class FuzzyNBTIngredient extends Ingredient { /** * Constructs the ingredient. * - * @param stack Template stack for this ingredient + * @param stack Template stack for this ingredient * @throws IllegalArgumentException if the stack has no NBT data. */ public FuzzyNBTIngredient(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java index 6e8380317..39d672661 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java @@ -39,7 +39,8 @@ public class RecipeManaInfusion implements IManaInfusionRecipe { private final ItemStack output; private final Ingredient input; private final int mana; - @Nullable private final BlockState catalystState; + @Nullable + private final BlockState catalystState; private final String group; public RecipeManaInfusion(ResourceLocation id, ItemStack output, Ingredient input, int mana, diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 3e65a70e5..1b77976ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -923,8 +923,10 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp return BossBarHandler.defaultBossBar; } - @OnlyIn(Dist.CLIENT) private static Rectangle barRect; - @OnlyIn(Dist.CLIENT) private static Rectangle hpBarRect; + @OnlyIn(Dist.CLIENT) + private static Rectangle barRect; + @OnlyIn(Dist.CLIENT) + private static Rectangle hpBarRect; @OnlyIn(Dist.CLIENT) public Rectangle getBossBarTextureRect() { @@ -968,7 +970,8 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp return background ? null : ShaderHelper.BotaniaShader.DOPPLEGANGER_BAR; } - @OnlyIn(Dist.CLIENT) private ShaderCallback shaderCallback; + @OnlyIn(Dist.CLIENT) + private ShaderCallback shaderCallback; @OnlyIn(Dist.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 7f9db18da..0074e20a3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -118,10 +118,10 @@ public class ItemGrassSeeds extends Item implements IFloatingFlowerVariant { * calling this method will recieve a marker block swapper which contains * the provided information but is not ticked. * - * @param world The world the swapper will be in. - * @param pos The position of the swapper. - * @param type The IslandType of the grass seed - * @return The created block swapper. + * @param world The world the swapper will be in. + * @param pos The position of the swapper. + * @param type The IslandType of the grass seed + * @return The created block swapper. */ private static BlockSwapper addBlockSwapper(World world, BlockPos pos, IslandType type) { BlockSwapper swapper = new BlockSwapper(world, pos, stateForType(type)); @@ -251,8 +251,8 @@ public class ItemGrassSeeds extends Item implements IFloatingFlowerVariant { * means that the block must be either dirt or grass (with meta 0), * and have a block above it which does not block grass growth. * - * @param pos The position to check. - * @return True if the position is valid to swap, false otherwise. + * @param pos The position to check. + * @return True if the position is valid to swap, false otherwise. */ public boolean isValidSwapPosition(BlockPos pos) { BlockState state = world.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 313cd190f..739b96bc5 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -87,7 +87,7 @@ 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)); - + public static final Item whitePetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.WHITE), DyeColor.WHITE, defaultBuilder()); public static final Item orangePetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.ORANGE), DyeColor.ORANGE, defaultBuilder()); public static final Item magentaPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.MAGENTA), DyeColor.MAGENTA, defaultBuilder()); @@ -104,7 +104,7 @@ public final class ModItems { public static final Item greenPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.GREEN), DyeColor.GREEN, defaultBuilder()); public static final Item redPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.RED), DyeColor.RED, defaultBuilder()); public static final Item blackPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.BLACK), DyeColor.BLACK, defaultBuilder()); - + public static final Item whiteDye = new ItemDye(DyeColor.WHITE, defaultBuilder()); public static final Item orangeDye = new ItemDye(DyeColor.ORANGE, defaultBuilder()); public static final Item magentaDye = new ItemDye(DyeColor.MAGENTA, defaultBuilder()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index c7d6e74ce..98eeefe54 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -39,7 +39,8 @@ public class ItemHolyCloak extends ItemBauble { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK); private static final ResourceLocation textureGlow = new ResourceLocation(LibResources.MODEL_HOLY_CLOAK_GLOW); - @OnlyIn(Dist.CLIENT) private static ModelCloak model; + @OnlyIn(Dist.CLIENT) + private static ModelCloak model; private static final String TAG_COOLDOWN = "cooldown"; private static final String TAG_IN_EFFECT = "inEffect"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index e8d3a13c9..78f6ee314 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -39,7 +39,8 @@ import java.util.List; public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); - @OnlyIn(Dist.CLIENT) private static BipedModel model; + @OnlyIn(Dist.CLIENT) + private static BipedModel model; private static final int COST = 1; private static final int COST_INTERVAL = 10; diff --git a/src/main/java/vazkii/botania/common/network/PacketUpdateItemsRemaining.java b/src/main/java/vazkii/botania/common/network/PacketUpdateItemsRemaining.java index 467e3a214..b1ec576c4 100644 --- a/src/main/java/vazkii/botania/common/network/PacketUpdateItemsRemaining.java +++ b/src/main/java/vazkii/botania/common/network/PacketUpdateItemsRemaining.java @@ -23,7 +23,8 @@ import java.util.function.Supplier; public class PacketUpdateItemsRemaining { private final ItemStack stack; private final int count; - @Nullable private final ITextComponent tooltip; + @Nullable + private final ITextComponent tooltip; public PacketUpdateItemsRemaining(ItemStack stack, int count, @Nullable ITextComponent tooltip) { this.stack = stack; diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 115c820d1..8e989cacb 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -208,7 +208,8 @@ public class ManaInfusionProvider extends RecipeProvider { private final ItemStack output; private final int mana; private final String group; - @Nullable private final BlockState catalyst; + @Nullable + private final BlockState catalyst; public static FinishedRecipe conjuration(ResourceLocation id, ItemStack output, Ingredient input, int mana) { return new FinishedRecipe(id, output, input, mana, "", ModBlocks.conjurationCatalyst.getDefaultState()); diff --git a/src/main/java/vazkii/botania/data/recipes/WrapperResult.java b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java index 4e995c852..065c18f82 100644 --- a/src/main/java/vazkii/botania/data/recipes/WrapperResult.java +++ b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java @@ -21,8 +21,10 @@ import java.util.function.Consumer; public class WrapperResult implements IFinishedRecipe { private final IFinishedRecipe delegate; - @Nullable private final IRecipeSerializer type; - @Nullable private final Consumer transform; + @Nullable + private final IRecipeSerializer type; + @Nullable + private final Consumer transform; /** * Wraps recipe consumer with one that swaps the recipe type to a different one.