diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 0e9f5ee0f..5ec591a98 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -52,8 +52,7 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.signature.BasicSignature; -import vazkii.botania.api.subtile.signature.SubTileSignature; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.SimpleWikiProvider; import vazkii.botania.api.wiki.WikiHooks; @@ -88,10 +87,6 @@ public final class BotaniaAPI { public static final List miniFlowerRecipes = new ArrayList<>(); public static final ResourceLocation DUMMY_SUBTILE_NAME = new ResourceLocation("botania", "dummy"); - private static final RegistryNamespacedDefaultedByKey> subTiles = new RegistryNamespacedDefaultedByKey<>(DUMMY_SUBTILE_NAME); - private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); - public static final Set subtilesForCreativeMenu = new LinkedHashSet<>(); - public static final BiMap miniFlowers = HashBiMap.create(); public static final Map oreWeights = new HashMap<>(); public static final Map oreWeightsNether = new HashMap<>(); @@ -378,8 +373,6 @@ public final class BotaniaAPI { public static final Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); static { - subTiles.register(0, DUMMY_SUBTILE_NAME, DummySubTile.class); // int id irrelevant, this is just to set the default value - basicKnowledge = registerKnowledgeType("minecraft", TextFormatting.RESET, true); elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false); relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false); @@ -674,63 +667,17 @@ public final class BotaniaAPI { return recipe; } - /** - * Registers a SubTileEntity, a new special flower. Look in the subtile package of the API. - * Call this during {@code RegistryEvent.Register}, and don't forget to register a model in BotaniaAPIClient. - */ - public static void registerSubTile(ResourceLocation id, Class subtileClass) { - subTiles.put(id, subtileClass); - } - /** * Register a SubTileEntity and makes it a mini flower. Also adds the recipe and returns it. - * @see BotaniaAPI#registerSubTile */ public static RecipeManaInfusion registerMiniSubTile(ResourceLocation id, Class subtileClass, ResourceLocation original) { - registerSubTile(id, subtileClass); - miniFlowers.put(original, id); - + /* todo 1.13 RecipeMiniFlower recipe = new RecipeMiniFlower(id, original, 2500); manaInfusionRecipes.add(recipe); miniFlowerRecipes.add(recipe); return recipe; - } - - /** - * Registers a SubTileEntity's signature. - * @see SubTileSignature - */ - public static void registerSubTileSignature(Class subtileClass, SubTileSignature signature) { - subTileSignatures.put(subtileClass, signature); - } - - /** - * Gets the singleton signature for a SubTileEntity class. Registers a fallback if one wasn't registered - * before the call. - */ - public static SubTileSignature getSignatureForClass(Class subtileClass) { - if(!subTileSignatures.containsKey(subtileClass)) - registerSubTileSignature(subtileClass, new BasicSignature(subTiles.getKey(subtileClass))); - - return subTileSignatures.get(subtileClass); - } - - /** - * Gets the singleton signature for a SubTileEntity's name. Registers a fallback if one wasn't registered - * before the call. - */ - public static SubTileSignature getSignatureForName(ResourceLocation name) { - Class subtileClass = subTiles.get(name); - return getSignatureForClass(subtileClass); - } - - /** - * Adds the key for a SubTileEntity into the creative menu. This goes into the - * subtilesForCreativeMenu Set. This does not need to be called for mini flowers, - * those will just use the mini flower map to add themselves next to the source. - */ - public static void addSubTileToCreativeMenu(ResourceLocation key) { - subtilesForCreativeMenu.add(key); + */ + return null; } /** @@ -800,18 +747,6 @@ public final class BotaniaAPI { WikiHooks.registerModWiki(mod, provider); } - public static Class getSubTileMapping(ResourceLocation key) { - return subTiles.get(key); - } - - public static ResourceLocation getSubTileStringMapping(Class clazz) { - return subTiles.getKey(clazz); - } - - public static Set getAllSubTiles() { - return subTiles.keySet(); - } - public static void blacklistBlockFromGaiaGuardian(Block block) { gaiaBreakBlacklist.add(block); } diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 4120af4d2..b8599a7d7 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -60,15 +60,6 @@ public final class BotaniaAPIClient { registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getNamespace() + ":" + model.getPath(), "inventory")); } - // Convenience overloads for the above two calls - public static void registerSubtileModel(Class clazz, ModelResourceLocation model) { - registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model); - } - - public static void registerSubtileModel(Class clazz, ModelResourceLocation model, ModelResourceLocation itemModel) { - registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel); - } - /** * @return An immutable and live view of the registered subtile block model map */ diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 16265c326..b76e70a0e 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -32,6 +32,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import java.util.List; @@ -117,17 +118,17 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public ItemStack getSubTileAsStack(ResourceLocation subTile) { + public ItemStack getSubTileAsStack(SubTileType subTile) { return ItemStack.EMPTY; } @Override - public ItemStack getSubTileAsFloatingFlowerStack(ResourceLocation subTile) { + public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) { return getSubTileAsStack(subTile); } @Override - public ResourceLocation getStackSubTileKey(ItemStack stack) { + public SubTileType getStackSubTileKey(ItemStack stack) { return null; } diff --git a/src/main/java/vazkii/botania/api/internal/DummySubTile.java b/src/main/java/vazkii/botania/api/internal/DummySubTile.java index cec661fc3..c3a8c181e 100644 --- a/src/main/java/vazkii/botania/api/internal/DummySubTile.java +++ b/src/main/java/vazkii/botania/api/internal/DummySubTile.java @@ -11,7 +11,11 @@ package vazkii.botania.api.internal; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; public class DummySubTile extends SubTileEntity { + public DummySubTile(SubTileType type) { + super(type); + } } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 372ee270f..d17abba34 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -34,6 +34,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import java.util.List; @@ -78,11 +79,11 @@ public interface IInternalMethodHandler { public IManaNetwork getManaNetworkInstance(); - public ItemStack getSubTileAsStack(ResourceLocation subTile); + public ItemStack getSubTileAsStack(SubTileType subTile); - public ItemStack getSubTileAsFloatingFlowerStack(ResourceLocation subTile); + public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile); - public ResourceLocation getStackSubTileKey(ItemStack stack); + public SubTileType getStackSubTileKey(ItemStack stack); @OnlyIn(Dist.CLIENT) public ModelResourceLocation getSubTileBlockModelForName(String name); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index f38a6183a..af64aae10 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -14,23 +14,24 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileType; public class RecipeMiniFlower extends RecipeManaInfusion { - public RecipeMiniFlower(ResourceLocation mini, ResourceLocation flower, int mana) { + public RecipeMiniFlower(SubTileType mini, SubTileType flower, int mana) { super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(mini)), mana); setCatalyst(RecipeManaInfusion.alchemy.getDefaultState()); } @Override public boolean matches(ItemStack stack) { - ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack); + ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack).getRegistryName(); ItemStack[] matching = getInput().getMatchingStacks(); if(matching.length == 0) return false; - ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]); + ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]).getRegistryName(); return key != null && key.equals(input); } diff --git a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java b/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java index 1a9fbd747..c14ba889b 100644 --- a/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java +++ b/src/main/java/vazkii/botania/api/subtile/ISubTileContainer.java @@ -26,6 +26,6 @@ public interface ISubTileContainer { /** * Sets the SubTile on this block from it's name. */ - public void setSubTile(ResourceLocation name); + public void setSubTile(SubTileType type); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index c328c6368..6d6f55182 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -44,6 +44,8 @@ public class SubTileEntity { public int ticksExisted = 0; + private final SubTileType type; + /** true if this flower is working on Enchanted Soil **/ public boolean overgrowth = false; /** true if this flower is working on Enchanted Soil and this is the second tick **/ @@ -53,6 +55,14 @@ public class SubTileEntity { public static final String TAG_TYPE = "type"; public static final String TAG_TICKS_EXISTED = "ticksExisted"; + public SubTileEntity(SubTileType type) { + this.type = type; + } + + public final SubTileType getType() { + return type; + } + public final BlockPos getPos() { return supertile.getPos(); } @@ -99,7 +109,7 @@ public class SubTileEntity { } public String getUnlocalizedName() { - return BotaniaAPI.getSubTileStringMapping(getClass()).toString(); + return getType().getRegistryName().toString(); } /** diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 65f231d67..912569898 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -19,7 +19,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.IRegistry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; @@ -52,6 +51,10 @@ public class SubTileFunctional extends SubTileEntity { BlockPos cachedPoolCoordinates = null; + public SubTileFunctional(SubTileType type) { + super(type); + } + /** * If set to true, redstoneSignal will be updated every tick. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index fd4eac297..48cf4595d 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -24,7 +24,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.registry.IRegistry; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -61,6 +60,10 @@ public class SubTileGenerating extends SubTileEntity { BlockPos cachedCollectorCoordinates = null; + public SubTileGenerating(SubTileType type) { + super(type); + } + /** * If set to true, redstoneSignal will be updated every tick. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileType.java b/src/main/java/vazkii/botania/api/subtile/SubTileType.java new file mode 100644 index 000000000..8c54710fb --- /dev/null +++ b/src/main/java/vazkii/botania/api/subtile/SubTileType.java @@ -0,0 +1,72 @@ +package vazkii.botania.api.subtile; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistryEntry; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.function.Function; + +/** + * Analog to {@link net.minecraft.tileentity.TileEntityType}, but for subtiles + */ +public class SubTileType extends ForgeRegistryEntry { + public static final String SPECIAL_FLOWER_PREFIX = "flower."; + public static final String GENERATING_TYPE = "botania.flowerType.generating"; + public static final String FUNCTIONAL_TYPE = "botania.flowerType.generating"; + public static final String MISC_TYPE = "botania.flowerType.misc"; + + private final String type; + private final Function factory; + private boolean showInCreative = true; + + /** + * @param typeKey Translation key for this subtile type, usually {@link #GENERATING_TYPE} or {@link #FUNCTIONAL_TYPE} + * @param factory Function to create new subtiles of this type + */ + public SubTileType(String typeKey, Function factory) { + this.type = typeKey; + this.factory = Preconditions.checkNotNull(factory); + } + + public SubTileType setShowInCreative(boolean show) { + this.showInCreative = show; + return this; + } + + public boolean shouldShowInCreative() { + return showInCreative; + } + + public String getTranslationKey(ItemStack stack) { + return "tile.botania:" + SPECIAL_FLOWER_PREFIX + getRegistryName(); + } + + /** + * Gets the lore text for the flower item, displayed in the item's tooltip. + */ + @Nullable + public ITextComponent getLore(ItemStack stack) { + return new TextComponentTranslation("tile.botania:" + SPECIAL_FLOWER_PREFIX + getRegistryName() + ".reference"); + } + + public SubTileEntity create() { + return this.factory.apply(this); + } + + public String getType() { + return type; + } + + /** + * Adds additional text to the tooltip. This text is added before {@link #getLore(ItemStack)} + */ + public void addTooltip(ItemStack stack, World world, List tooltip) { + tooltip.add(new TextComponentTranslation(getType()).applyTextStyle(TextFormatting.BLUE)); + } +} diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java deleted file mode 100644 index 3f940c61b..000000000 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 17, 2014, 5:34:35 PM (GMT)] - */ -package vazkii.botania.api.subtile.signature; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileGenerating; - -import java.util.List; - -/** - * A basic (and fallback) implementation of SubTileSignature. - */ -public class BasicSignature implements SubTileSignature { - - private final ResourceLocation name; - - public BasicSignature(ResourceLocation name) { - this.name = name; - } - - @Override - public String getUnlocalizedNameForStack(ItemStack stack) { - return unlocalizedName(""); - } - - @Override - public String getUnlocalizedLoreTextForStack(ItemStack stack) { - return unlocalizedName(".reference"); - } - - public ResourceLocation getName() { - return name; - } - - public String getType() { - Class clazz = BotaniaAPI.getSubTileMapping(name); - - if(clazz == null) - return "uwotm8"; - - if(SubTileGenerating.class.isAssignableFrom(clazz)) - return "botania.flowerType.generating"; - - if(SubTileFunctional.class.isAssignableFrom(clazz)) - return "botania.flowerType.functional"; - - return "botania.flowerType.misc"; - } - - @OnlyIn(Dist.CLIENT) - @Override - public void addTooltip(ItemStack stack, World world, List tooltip) { - tooltip.add(new TextComponentTranslation(getType()).applyTextStyle(TextFormatting.BLUE)); - } - - private String unlocalizedName(String end) { - return "tile.botania:" + SubTileSignature.SPECIAL_FLOWER_PREFIX + name + end; - } - -} diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java deleted file mode 100644 index c7789aa9c..000000000 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 17, 2014, 5:29:26 PM (GMT)] - */ -package vazkii.botania.api.subtile.signature; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.List; - -/** - * A singleton instance for a SubTileEntity, this is called for a few methods. - */ -public interface SubTileSignature { - - public static final String SPECIAL_FLOWER_PREFIX = "flower."; - - /** - * Gets the display name for the flower item. - */ - String getUnlocalizedNameForStack(ItemStack stack); - - /** - * Gets the lore text for the flower item, displayed in the item's tooltip. - * If you do not want a reference return a key that does not have localization such - * as "botaniamisc.noloc". - */ - String getUnlocalizedLoreTextForStack(ItemStack stack); - - /** - * Adds additional text to the tooltip. This text is added after getUnlocalizedLoreTextForStack. - */ - @OnlyIn(Dist.CLIENT) - default void addTooltip(ItemStack stack, World world, List tooltip) {} - -} diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index f347f5ad6..b330342a6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -23,9 +23,11 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.item.IBaubleRender.Helper; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -93,7 +95,8 @@ public final class ContributorFancinessHandler implements LayerRenderer SUBTILES = new RegistryBuilder() + .setName(new ResourceLocation(LibMisc.MOD_ID, "subtiles")) + .setType(SubTileType.class) + .setDefaultKey(BotaniaAPI.DUMMY_SUBTILE_NAME) + .disableSaving() + .create(); + + // To force class load + public static void init() {} +} diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 3154712b8..e8db037e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -39,8 +39,10 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -117,18 +119,18 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public void fillItemGroup(ItemGroup tab, NonNullList stacks) { - for(ResourceLocation s : BotaniaAPI.subtilesForCreativeMenu) { - stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), s)); - if(BotaniaAPI.miniFlowers.containsKey(s)) - stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), BotaniaAPI.miniFlowers.get(s))); + for(SubTileType type : BotaniaRegistries.SUBTILES) { + if(type.shouldShowInCreative()) { + stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(this), type)); + } } } @Nonnull @Override public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) { - ResourceLocation name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; - return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name); + SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType(); + return ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type); } @Override @@ -160,8 +162,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I TileEntity tile = world.getTileEntity(pos); if(tile != null) { - ResourceLocation name = ((TileSpecialFlower) tile).subTileName; - list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), name)); + SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType(); + list.add(ItemBlockSpecialFlower.ofType(new ItemStack(state.getBlock()), type)); ((TileSpecialFlower) tile).getDrops(list); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index dbb7a5108..43fb5c281 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -46,9 +46,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -63,57 +65,6 @@ import java.util.Arrays; import java.util.List; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { - - static { - BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList( - // Misc - LibBlockNames.SUBTILE_PUREDAISY, - LibBlockNames.SUBTILE_MANASTAR, - - // Generating - LibBlockNames.SUBTILE_ENDOFLAME, - LibBlockNames.SUBTILE_HYDROANGEAS, - LibBlockNames.SUBTILE_THERMALILY, - LibBlockNames.SUBTILE_ARCANE_ROSE, - LibBlockNames.SUBTILE_MUNCHDEW, - LibBlockNames.SUBTILE_ENTROPINNYUM, - LibBlockNames.SUBTILE_KEKIMURUS, - LibBlockNames.SUBTILE_GOURMARYLLIS, - LibBlockNames.SUBTILE_NARSLIMMUS, - LibBlockNames.SUBTILE_SPECTROLUS, - LibBlockNames.SUBTILE_RAFFLOWSIA, - LibBlockNames.SUBTILE_SHULK_ME_NOT, - LibBlockNames.SUBTILE_DANDELIFEON, - - // Functional - LibBlockNames.SUBTILE_JADED_AMARANTHUS, - LibBlockNames.SUBTILE_BELLETHORN, - LibBlockNames.SUBTILE_DREADTHORN, - LibBlockNames.SUBTILE_HEISEI_DREAM, - LibBlockNames.SUBTILE_TIGERSEYE, - LibBlockNames.SUBTILE_MARIMORPHOSIS, - LibBlockNames.SUBTILE_ORECHID, - LibBlockNames.SUBTILE_ORECHID_IGNEM, - LibBlockNames.SUBTILE_FALLEN_KANADE, - LibBlockNames.SUBTILE_EXOFLAME, - LibBlockNames.SUBTILE_AGRICARNATION, - LibBlockNames.SUBTILE_HOPPERHOCK, - LibBlockNames.SUBTILE_RANNUNCARPUS, - LibBlockNames.SUBTILE_TANGLEBERRIE, - LibBlockNames.SUBTILE_JIYUULIA, - LibBlockNames.SUBTILE_HYACIDUS, - LibBlockNames.SUBTILE_MEDUMONE, - LibBlockNames.SUBTILE_POLLIDISIAC, - LibBlockNames.SUBTILE_CLAYCONIA, - LibBlockNames.SUBTILE_LOONIUM, - LibBlockNames.SUBTILE_DAFFOMILL, - LibBlockNames.SUBTILE_VINCULOTUS, - LibBlockNames.SUBTILE_SPECTRANTHEMUM, - LibBlockNames.SUBTILE_BUBBELL, - LibBlockNames.SUBTILE_SOLEGNOLIA, - LibBlockNames.SUBTILE_BERGAMUTE)); - } - private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); protected BlockSpecialFlower(Properties props) { @@ -177,18 +128,18 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public void fillItemGroup(ItemGroup tab, @Nonnull NonNullList stacks) { - for(ResourceLocation s : BotaniaAPI.subtilesForCreativeMenu) { - stacks.add(ItemBlockSpecialFlower.ofType(s)); - if(BotaniaAPI.miniFlowers.containsKey(s)) - stacks.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s))); + for(SubTileType type : BotaniaRegistries.SUBTILES) { + if(type.shouldShowInCreative()) { + stacks.add(ItemBlockSpecialFlower.ofType(type)); + } } } @Nonnull @Override public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityPlayer player) { - ResourceLocation name = ((TileSpecialFlower) world.getTileEntity(pos)).subTileName; - return ItemBlockSpecialFlower.ofType(name); + SubTileType type = ((TileSpecialFlower) world.getTileEntity(pos)).getSubTile().getType(); + return ItemBlockSpecialFlower.ofType(type); } @Override @@ -227,8 +178,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I TileEntity tile = world.getTileEntity(pos); if(tile != null) { - ResourceLocation name = ((TileSpecialFlower) tile).subTileName; - list.add(ItemBlockSpecialFlower.ofType(name)); + SubTileType type = ((TileSpecialFlower) tile).getSubTile().getType(); + list.add(ItemBlockSpecialFlower.ofType(type)); ((TileSpecialFlower) tile).getDrops(list); } } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ed77702fb..c7b96cfb6 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -26,9 +26,11 @@ import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.internal.DummySubTile; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; @@ -894,58 +896,64 @@ public final class ModBlocks { r.register(TileEntityType.Builder.create(TileTeruTeruBozu::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU)); r.register(TileEntityType.Builder.create(TileAvatar::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR)); r.register(TileEntityType.Builder.create(TileAnimatedTorch::new).build(null).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH)); - - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); - - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENDOFLAME, SubTileEndoflame.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_THERMALILY, SubTileThermalily.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MUNCHDEW, SubTileMunchdew.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENTROPINNYUM, SubTileEntropinnyum.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_KEKIMURUS, SubTileKekimurus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_GOURMARYLLIS, SubTileGourmaryllis.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NARSLIMMUS, SubTileNarslimmus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTROLUS, SubTileSpectrolus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DANDELIFEON, SubTileDandelifeon.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_RAFFLOWSIA, SubTileRafflowsia.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SHULK_ME_NOT, SubTileShulkMeNot.class); - - registerSubTileWithMini(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DREADTHORN, SubTileDreadthorn.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HEISEI_DREAM, SubTileHeiseiDream.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_TIGERSEYE, SubTileTigerseye.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JADED_AMARANTHUS, SubTileJadedAmaranthus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ORECHID, SubTileOrechid.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ORECHID_IGNEM, SubTileOrechidIgnem.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_FALLEN_KANADE, SubTileFallenKanade.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_EXOFLAME, SubTileExoflame.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_AGRICARNATION, SubTileAgricarnation.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_HOPPERHOCK, SubTileHopperhock.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_TANGLEBERRIE, SubTileTangleberrie.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_JIYUULIA, SubTileJiyuulia.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_RANNUNCARPUS, SubTileRannuncarpus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYACIDUS, SubTileHyacidus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_POLLIDISIAC, SubTilePollidisiac.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_CLAYCONIA, SubTileClayconia.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_LOONIUM, SubTileLoonuim.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAFFOMILL, SubTileDaffomill.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTRANTHEMUM, SubTileSpectranthemum.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); - registerSubTileWithMini(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BERGAMUTE, SubTileBergamute.class); } - private static void registerSubTileWithMini(ResourceLocation key, Class clazz) { - BotaniaAPI.registerSubTile(key, clazz); + @SubscribeEvent + public static void initSubtiles(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); + r.register(new SubTileType(SubTileType.MISC_TYPE, DummySubTile::new).setRegistryName(BotaniaAPI.DUMMY_SUBTILE_NAME)); + r.register(new SubTileType(SubTileType.MISC_TYPE, SubTilePureDaisy::new).setRegistryName(LibBlockNames.SUBTILE_PUREDAISY)); + r.register(new SubTileType(SubTileType.MISC_TYPE, SubTileManastar::new).setRegistryName(LibBlockNames.SUBTILE_MANASTAR)); - for(Class innerClazz : clazz.getDeclaredClasses()) - if(innerClazz.getSimpleName().equals("Mini")) - BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "_chibi"), innerClazz, key); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileHydroangeas::new).setRegistryName(LibBlockNames.SUBTILE_HYDROANGEAS)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEndoflame::new).setRegistryName(LibBlockNames.SUBTILE_ENDOFLAME)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileThermalily::new).setRegistryName(LibBlockNames.SUBTILE_THERMALILY)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileArcaneRose::new).setRegistryName(LibBlockNames.SUBTILE_ARCANE_ROSE)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileMunchdew::new).setRegistryName(LibBlockNames.SUBTILE_MUNCHDEW)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileEntropinnyum::new).setRegistryName(LibBlockNames.SUBTILE_ENTROPINNYUM)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileKekimurus::new).setRegistryName(LibBlockNames.SUBTILE_KEKIMURUS)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileGourmaryllis::new).setRegistryName(LibBlockNames.SUBTILE_GOURMARYLLIS)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileNarslimmus::new).setRegistryName(LibBlockNames.SUBTILE_NARSLIMMUS)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileSpectrolus::new).setRegistryName(LibBlockNames.SUBTILE_SPECTROLUS)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileDandelifeon::new).setRegistryName(LibBlockNames.SUBTILE_DANDELIFEON)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileRafflowsia::new).setRegistryName(LibBlockNames.SUBTILE_RAFFLOWSIA)); + r.register(new SubTileType(SubTileType.GENERATING_TYPE, SubTileShulkMeNot::new).setRegistryName(LibBlockNames.SUBTILE_SHULK_ME_NOT)); + + // todo 1.13 register recipes for chibis: BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "_chibi"), innerClazz, key); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn::new).setRegistryName(LibBlockNames.SUBTILE_BELLETHORN)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBellethorn.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDreadthorn::new).setRegistryName(LibBlockNames.SUBTILE_DREADTHORN)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHeiseiDream::new).setRegistryName(LibBlockNames.SUBTILE_HEISEI_DREAM)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTigerseye::new).setRegistryName(LibBlockNames.SUBTILE_TIGERSEYE)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJadedAmaranthus::new).setRegistryName(LibBlockNames.SUBTILE_JADED_AMARANTHUS)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechid::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileOrechidIgnem::new).setRegistryName(LibBlockNames.SUBTILE_ORECHID_IGNEM)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileFallenKanade::new).setRegistryName(LibBlockNames.SUBTILE_FALLEN_KANADE)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileExoflame::new).setRegistryName(LibBlockNames.SUBTILE_EXOFLAME)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation::new).setRegistryName(LibBlockNames.SUBTILE_AGRICARNATION)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileAgricarnation.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_AGRICARNATION.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock::new).setRegistryName(LibBlockNames.SUBTILE_HOPPERHOCK)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHopperhock.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_HOPPERHOCK.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileTangleberrie::new).setRegistryName(LibBlockNames.SUBTILE_TANGLEBERRIE)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileJiyuulia::new).setRegistryName(LibBlockNames.SUBTILE_JIYUULIA)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus::new).setRegistryName(LibBlockNames.SUBTILE_RANNUNCARPUS)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileRannuncarpus.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_RANNUNCARPUS.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileHyacidus::new).setRegistryName(LibBlockNames.SUBTILE_HYACIDUS)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTilePollidisiac::new).setRegistryName(LibBlockNames.SUBTILE_POLLIDISIAC)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia::new).setRegistryName(LibBlockNames.SUBTILE_CLAYCONIA)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileClayconia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_CLAYCONIA.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileLoonuim::new).setRegistryName(LibBlockNames.SUBTILE_LOONIUM)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileDaffomill::new).setRegistryName(LibBlockNames.SUBTILE_DAFFOMILL)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileVinculotus::new).setRegistryName(LibBlockNames.SUBTILE_VINCULOTUS)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSpectranthemum::new).setRegistryName(LibBlockNames.SUBTILE_SPECTRANTHEMUM)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMedumone::new).setRegistryName(LibBlockNames.SUBTILE_MEDUMONE)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis::new).setRegistryName(LibBlockNames.SUBTILE_MARIMORPHOSIS)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileMarimorphosis.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_MARIMORPHOSIS.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell::new).setRegistryName(LibBlockNames.SUBTILE_BUBBELL)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBubbell.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_BUBBELL.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia::new).setRegistryName(LibBlockNames.SUBTILE_SOLEGNOLIA)); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileSolegnolia.Mini::new).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SUBTILE_SOLEGNOLIA.getPath() + "_chibi")); + r.register(new SubTileType(SubTileType.FUNCTIONAL_TYPE, SubTileBergamute::new).setRegistryName(LibBlockNames.SUBTILE_BERGAMUTE)); } public static Block getFlower(EnumDyeColor color) { 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 3cf410ff6..476824e41 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -27,6 +28,10 @@ public class SubTileManastar extends SubTileEntity { private int lastMana = 0; private int state = NONE; + public SubTileManastar(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 c8c2ed4af..e1411df4f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -20,6 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -50,7 +51,8 @@ public class SubTilePureDaisy extends SubTileEntity { // Bitfield of active positions, used clientside for particles private int activePositions = 0; - public SubTilePureDaisy() { + public SubTilePureDaisy(SubTileType type) { + super(type); Arrays.fill(ticksRemaining, -1); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index 21feeb762..e4ed61ff8 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 @@ -24,6 +24,7 @@ import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; @@ -33,6 +34,10 @@ public class SubTileAgricarnation extends SubTileFunctional { private static final int RANGE = 5; private static final int RANGE_MINI = 2; + public SubTileAgricarnation(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -108,6 +113,10 @@ public class SubTileAgricarnation extends SubTileFunctional { } public static class Mini extends SubTileAgricarnation { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return RANGE_MINI; } } 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 098e92295..442ae5ee3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -19,6 +19,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; @@ -29,6 +30,10 @@ public class SubTileBellethorn extends SubTileFunctional { public static final int RANGE = 6; public static final int RANGE_MINI = 1; + public SubTileBellethorn(SubTileType type) { + super(type); + } + @Override public int getColor() { return 0xBA3421; @@ -97,6 +102,10 @@ public class SubTileBellethorn extends SubTileFunctional { } public static class Mini extends SubTileBellethorn { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return RANGE_MINI; } } 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 8dd4baaab..e82cc15a5 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 @@ -3,6 +3,7 @@ package vazkii.botania.common.block.subtile.functional; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.Collections; @@ -13,6 +14,10 @@ public class SubTileBergamute extends SubTileFunctional { private static final int RANGE = 4; private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + public SubTileBergamute(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 731423caa..53f8aad6d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -20,6 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lexicon.LexiconData; @@ -33,6 +34,10 @@ public class SubTileBubbell extends SubTileFunctional { int range = 2; + public SubTileBubbell(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -112,6 +117,10 @@ public class SubTileBubbell extends SubTileFunctional { } public static class Mini extends SubTileBubbell { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return RANGE_MINI; } } 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 f2291e339..6b2532926 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -19,6 +19,7 @@ import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -34,6 +35,10 @@ public class SubTileClayconia extends SubTileFunctional { private static final int RANGE_MINI = 2; private static final int RANGE_Y_MINI = 1; + public SubTileClayconia(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -102,6 +107,10 @@ public class SubTileClayconia extends SubTileFunctional { } public static class Mini extends SubTileClayconia { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return RANGE_MINI; } @Override public int getRangeY() { return RANGE_Y_MINI; } } 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 dc176bf79..510a22243 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 @@ -23,6 +23,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; @@ -36,6 +37,10 @@ public class SubTileDaffomill extends SubTileFunctional { private int windTicks = 0; private EnumFacing orientation = EnumFacing.NORTH; + public SubTileDaffomill(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 69f862159..ebe51e23a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -13,12 +13,17 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.function.Predicate; public class SubTileDreadthorn extends SubTileBellethorn { + public SubTileDreadthorn(SubTileType type) { + super(type); + } + @Override public int getColor() { return 0x260B45; 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 fd5dc12ae..a66f382ae 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 @@ -23,6 +23,7 @@ import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; public class SubTileExoflame extends SubTileFunctional { @@ -31,6 +32,10 @@ public class SubTileExoflame extends SubTileFunctional { private static final int RANGE_Y = 2; private static final int COST = 300; + public SubTileExoflame(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 ccfb09b67..580583ae3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -18,6 +18,7 @@ import net.minecraft.world.dimension.EndDimension; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; @@ -27,6 +28,10 @@ public class SubTileFallenKanade extends SubTileFunctional { private static final int RANGE = 2; private static final int COST = 120; + public SubTileFallenKanade(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 39a8b5722..9ed940fa9 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 @@ -24,6 +24,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -34,6 +35,10 @@ public class SubTileHeiseiDream extends SubTileFunctional { private static final int RANGE = 5; + public SubTileHeiseiDream(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 6e67908fe..0723a141b 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 @@ -34,6 +34,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -52,6 +53,10 @@ public class SubTileHopperhock extends SubTileFunctional { private int filterType = 0; + public SubTileHopperhock(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -249,6 +254,10 @@ public class SubTileHopperhock extends SubTileFunctional { } public static class Mini extends SubTileHopperhock { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return mana > 0 ? RANGE_MANA_MINI : RANGE_MINI; } } } 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 03a19e4b8..0703e75c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -19,6 +19,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; @@ -27,6 +28,10 @@ public class SubTileHyacidus extends SubTileFunctional { private static final int RANGE = 6; + public SubTileHyacidus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 9302d92a7..96781a0de 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 @@ -19,6 +19,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -28,6 +29,10 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { private static final int COST = 100; final int RANGE = 4; + public SubTileJadedAmaranthus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 6e60e7939..99d789b60 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 @@ -11,10 +11,15 @@ package vazkii.botania.common.block.subtile.functional; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; public class SubTileJiyuulia extends SubTileTangleberrie { + public SubTileJiyuulia(SubTileType type) { + super(type); + } + @Override double getMaxDistance() { return 0; 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 d361bde68..16ae92577 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 @@ -45,6 +45,7 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -63,6 +64,10 @@ public class SubTileLoonuim extends SubTileFunctional { private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon"); + public SubTileLoonuim(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 9c1f308ed..6e5dedfb0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -21,6 +21,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -49,6 +50,10 @@ public class SubTileMarimorphosis extends SubTileFunctional { Type.MESA }; + public SubTileMarimorphosis(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -154,6 +159,10 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public static class Mini extends SubTileMarimorphosis { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return RANGE_MINI; } @Override public int getRangeY() { return RANGE_Y_MINI; } } 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 742b22f51..20cda825b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -18,6 +18,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; @@ -26,6 +27,10 @@ public class SubTileMedumone extends SubTileFunctional { private static final int RANGE = 6; + public SubTileMedumone(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 70da377dd..e15c65312 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 @@ -26,6 +26,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; @@ -46,6 +47,10 @@ public class SubTileOrechid extends SubTileFunctional { private static final int RANGE_Y = 3; private static final int TRIES = 20; + public SubTileOrechid(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 be10f6438..77e86df61 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -15,6 +15,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.Map; @@ -24,6 +25,10 @@ public class SubTileOrechidIgnem extends SubTileOrechid { private static final int COST = 20000; + public SubTileOrechidIgnem(SubTileType type) { + super(type); + } + @Override public boolean canOperate() { return supertile.getWorld().getDimension().isNether(); 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 2b5ef58f9..71ef56a85 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -17,6 +17,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -26,6 +27,10 @@ public class SubTilePollidisiac extends SubTileFunctional { private static final int RANGE = 6; + public SubTilePollidisiac(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 fa8793890..43cf24686 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 @@ -40,6 +40,7 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; @@ -64,6 +65,10 @@ public class SubTileRannuncarpus extends SubTileFunctional { private static final int RANGE_PLACE_MINI = 2; private static final int RANGE_PLACE_Y_MINI = 2; + public SubTileRannuncarpus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -189,6 +194,10 @@ public class SubTileRannuncarpus extends SubTileFunctional { } public static class Mini extends SubTileRannuncarpus { + public Mini(SubTileType type) { + super(type); + } + @Override public int getRange() { return mana > 0 ? RANGE_PLACE_MANA_MINI : RANGE_PLACE_MINI; } @Override public int getRangeY() { return RANGE_PLACE_Y_MINI; } } 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 37acb8784..ea1ed1c36 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 @@ -15,6 +15,7 @@ import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.Collections; @@ -27,6 +28,10 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final Set existingFlowers = Collections.newSetFromMap(new MapMaker().concurrencyLevel(2).weakKeys().makeMap()); + public SubTileSolegnolia(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); @@ -75,6 +80,10 @@ public class SubTileSolegnolia extends SubTileFunctional { } public static class Mini extends SubTileSolegnolia { + public Mini(SubTileType type) { + super(type); + } + @Override public double getRange() { return RANGE_MINI; } } 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 f3ac09ceb..bdfe4507d 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 @@ -28,6 +28,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -48,6 +49,10 @@ public class SubTileSpectranthemum extends SubTileFunctional { private BlockPos bindPos = new BlockPos(0, -1, 0); + public SubTileSpectranthemum(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 35ec378de..9b305e5cd 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 @@ -16,6 +16,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; @@ -25,6 +26,10 @@ import java.util.List; public class SubTileTangleberrie extends SubTileFunctional { + public SubTileTangleberrie(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 8d4359bdf..45cc7de94 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -22,6 +22,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -33,6 +34,10 @@ public class SubTileTigerseye extends SubTileFunctional { private static final int RANGE = 10; private static final int RANGE_Y = 4; + public SubTileTigerseye(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 5202ea2d1..3d1cec6e7 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 @@ -21,6 +21,7 @@ import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -40,6 +41,10 @@ public class SubTileVinculotus extends SubTileFunctional { public static final Map existingFlowers = new WeakHashMap<>(); private static final int RANGE = 64; + public SubTileVinculotus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 fb28eff9c..2e6293338 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.helper.ExperienceHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -25,6 +26,10 @@ public class SubTileArcaneRose extends SubTileGenerating { private static final int RANGE = 1; + public SubTileArcaneRose(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 44fc6c6fe..055ff37da 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 @@ -18,6 +18,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; @@ -44,6 +45,10 @@ public class SubTileDandelifeon extends SubTileGenerating { { +0, -1 } }; + public SubTileDandelifeon(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 de04ddab7..879715c15 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 @@ -24,6 +24,7 @@ import net.minecraft.util.math.Vec3d; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockSpreader; import vazkii.botania.common.core.handler.ModSounds; @@ -37,6 +38,10 @@ public class SubTileEndoflame extends SubTileGenerating { private int burnTime = 0; + public SubTileEndoflame(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 e0dc244a5..cbd603576 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 @@ -19,6 +19,7 @@ import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; @@ -31,6 +32,10 @@ public class SubTileEntropinnyum extends SubTileGenerating { private static final int RANGE = 12; private static final int EXPLODE_EFFECT_EVENT = 0; + public SubTileEntropinnyum(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 f7b6eae90..cbfd1b59c 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 @@ -26,6 +26,7 @@ import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import java.util.List; @@ -43,6 +44,10 @@ public class SubTileGourmaryllis extends SubTileGenerating { private ItemStack lastFood = ItemStack.EMPTY; private int lastFoodCount = 0; + public SubTileGourmaryllis(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 474cc8adf..5ffe3e667 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 @@ -29,6 +29,7 @@ import net.minecraft.world.biome.Biome; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -46,6 +47,10 @@ public class SubTileHydroangeas extends SubTileGenerating { int burnTime, cooldown; + public SubTileHydroangeas(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 60203762d..100604535 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -19,12 +19,17 @@ import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; public class SubTileKekimurus extends SubTileGenerating { private static final int RANGE = 5; + public SubTileKekimurus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 31e293ffd..6b36c5441 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 @@ -23,6 +23,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -43,6 +44,10 @@ public class SubTileMunchdew extends SubTileGenerating { private int ticksWithoutEating = -1; private int cooldown = 0; + public SubTileMunchdew(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 52adafd8e..a3c3ec696 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 @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -39,6 +40,10 @@ public class SubTileNarslimmus extends SubTileGenerating { private static final int RANGE = 2; + public SubTileNarslimmus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 594775022..57f6a252b 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 @@ -23,6 +23,7 @@ import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -38,6 +39,10 @@ public class SubTileRafflowsia extends SubTileGenerating { private static final int RANGE = 5; + public SubTileRafflowsia(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 431739cb3..151f2349d 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 @@ -17,12 +17,17 @@ import net.minecraft.world.WorldServer; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.lexicon.LexiconData; public class SubTileShulkMeNot extends SubTileGenerating { private static final int RADIUS = 8; - + + public SubTileShulkMeNot(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 883004f6d..ac636e8e4 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 @@ -31,6 +31,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; @@ -45,6 +46,10 @@ public class SubTileSpectrolus extends SubTileGenerating { private EnumDyeColor nextColor = EnumDyeColor.WHITE; + public SubTileSpectrolus(SubTileType type) { + super(type); + } + @Override public void onUpdate() { super.onUpdate(); 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 fdf267cbb..505194f67 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -16,12 +16,17 @@ import net.minecraft.tags.FluidTags; import net.minecraft.tags.Tag; import net.minecraft.util.SoundCategory; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; public class SubTileThermalily extends SubTileHydroangeas { + public SubTileThermalily(SubTileType type) { + super(type); + } + @Override public int getColor(){ return 0xD03C00; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index 57216f60e..5c1fd3602 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -29,7 +29,7 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo @Override public ItemStack getDisplayStack() { - return ItemBlockSpecialFlower.ofType(subTileName); + return ItemBlockSpecialFlower.ofType(getSubTile().getType()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index b6b59fee9..df58fcdd2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -33,7 +33,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISubTileSlowableContainer; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.api.wand.IWandBindable; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; @@ -48,7 +50,6 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil private static final String TAG_SUBTILE_NAME = "subTileName"; private static final String TAG_SUBTILE_CMP = "subTileCmp"; - public ResourceLocation subTileName = BotaniaAPI.DUMMY_SUBTILE_NAME; private SubTileEntity subTile; public TileSpecialFlower() { @@ -61,32 +62,19 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void setSubTile(ResourceLocation name) { - subTileName = name; - provideSubTile(subTileName); + public void setSubTile(SubTileType type) { + setSubTile(type.create()); } - public void setSubTile(SubTileEntity tile) { + private void setSubTile(SubTileEntity tile) { subTile = tile; subTile.setSupertile(this); } - private void provideSubTile(ResourceLocation name) { - subTileName = name; - - Class tileClass = BotaniaAPI.getSubTileMapping(name); - try { - SubTileEntity tile = tileClass.newInstance(); - setSubTile(tile); - } catch (Exception e) { - e.printStackTrace(); - } - } - @Override public void tick() { if(subTile != null) { - world.profiler.startSection(() -> subTileName.toString()); + world.profiler.startSection(() -> subTile.getType().getRegistryName().toString()); TileEntity tileBelow = world.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); @@ -124,26 +112,24 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil public void writePacketNBT(NBTTagCompound cmp) { super.writePacketNBT(cmp); - cmp.putString(TAG_SUBTILE_NAME, subTileName.toString()); - NBTTagCompound subCmp = new NBTTagCompound(); - cmp.put(TAG_SUBTILE_CMP, subCmp); - - if(subTile != null) + if(subTile != null) { + cmp.putString(TAG_SUBTILE_NAME, subTile.getType().getRegistryName().toString()); + NBTTagCompound subCmp = new NBTTagCompound(); + cmp.put(TAG_SUBTILE_CMP, subCmp); subTile.writeToPacketNBTInternal(subCmp); + } } @Override public void readPacketNBT(NBTTagCompound cmp) { super.readPacketNBT(cmp); - subTileName = new ResourceLocation(cmp.getString(TAG_SUBTILE_NAME)); - NBTTagCompound subCmp = cmp.getCompound(TAG_SUBTILE_CMP); - - if(subTile == null || !BotaniaAPI.getSubTileStringMapping(subTile.getClass()).equals(subTileName)) - provideSubTile(subTileName); - - if(subTile != null) - subTile.readFromPacketNBTInternal(subCmp); + if(cmp.contains(TAG_SUBTILE_NAME)) { + ResourceLocation id = new ResourceLocation(cmp.getString(TAG_SUBTILE_NAME)); + if(subTile == null || !id.equals(subTile.getType().getRegistryName())) + setSubTile(BotaniaRegistries.SUBTILES.getValue(id)); + subTile.readFromPacketNBTInternal(cmp.getCompound(TAG_SUBTILE_CMP)); + } } public LexiconEntry getEntry() { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index ae4c06d4d..ff07ac324 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -42,6 +42,7 @@ import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.api.subtile.SubTileType; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.Botania; @@ -156,17 +157,17 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public ItemStack getSubTileAsStack(ResourceLocation subTile) { + public ItemStack getSubTileAsStack(SubTileType subTile) { return ItemBlockSpecialFlower.ofType(subTile); } @Override - public ItemStack getSubTileAsFloatingFlowerStack(ResourceLocation subTile) { + public ItemStack getSubTileAsFloatingFlowerStack(SubTileType subTile) { return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), subTile); } @Override - public ResourceLocation getStackSubTileKey(ItemStack stack) { + public SubTileType getStackSubTileKey(ItemStack stack) { return ItemBlockSpecialFlower.getType(stack); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index a7495cc0e..c061a1d40 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -25,6 +25,7 @@ import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.Botania; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; @@ -331,7 +332,7 @@ public final class ModCraftingRecipes { public static void registerRecipes(FMLServerStartingEvent evt) { evt.getServer().getResourceManager().addReloadListener(manager -> { // todo 1.13 have each subtile responsible for itself - for (ResourceLocation s : BotaniaAPI.getAllSubTiles()) { + for (ResourceLocation s : BotaniaRegistries.SUBTILES.getKeys()) { ResourceLocation id = new ResourceLocation(LibMisc.MOD_ID, "floating_" + s.toString().replaceAll(":", "_")); evt.getServer().getRecipeManager().addRecipe(new SpecialFloatingFlowerRecipe(id, s)); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index 3b66e5206..c5c3a6cb2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -24,6 +24,8 @@ import net.minecraft.util.JsonUtils; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.registries.IForgeRegistryEntry; +import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -75,7 +77,8 @@ public class SpecialFloatingFlowerRecipe extends IRecipeHidden { if(specialFlower.isEmpty()) return ItemStack.EMPTY; - return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), flowerType); + SubTileType type = BotaniaRegistries.SUBTILES.getValue(flowerType); + return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), type); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index dad4899c0..3be014a66 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -43,7 +43,8 @@ import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.signature.SubTileSignature; +import vazkii.botania.api.subtile.SubTileType; +import vazkii.botania.common.BotaniaRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; @@ -69,7 +70,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr BlockPos pos = ctx.getPos(); ItemStack stack = ctx.getItem(); - ResourceLocation type = getType(ctx.getItem()); + SubTileType type = getType(ctx.getItem()); TileEntity te = world.getTileEntity(pos); if(te instanceof TileSpecialFlower) { TileSpecialFlower tile = (TileSpecialFlower) te; @@ -87,40 +88,45 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @Nonnull @Override public String getTranslationKey(ItemStack stack) { - return BotaniaAPI.getSignatureForName(getType(stack)).getUnlocalizedNameForStack(stack); + return getType(stack).getTranslationKey(stack); } @OnlyIn(Dist.CLIENT) @Override public void addInformation(@Nonnull ItemStack par1ItemStack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { - ResourceLocation type = getType(par1ItemStack); - SubTileSignature sig = BotaniaAPI.getSignatureForName(type); - - sig.addTooltip(par1ItemStack, world, stacks); + SubTileType type = getType(par1ItemStack); + type.addTooltip(par1ItemStack, world, stacks); if(ConfigHandler.CLIENT.referencesEnabled.get()) { - String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); - String refLocalized = I18n.format(refUnlocalized); - if(!refLocalized.equals(refUnlocalized)) - stacks.add(new TextComponentTranslation(refLocalized).applyTextStyle(TextFormatting.ITALIC)); + ITextComponent lore = type.getLore(par1ItemStack); + if(lore != null) + stacks.add(lore.applyTextStyle(TextFormatting.ITALIC)); } } @Override public String getCreatorModId(ItemStack itemStack) { - return getType(itemStack).getNamespace(); + return getType(itemStack).getRegistryName().getNamespace(); } - public static ResourceLocation getType(ItemStack stack) { - return stack.hasTag() ? new ResourceLocation(ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, BotaniaAPI.DUMMY_SUBTILE_NAME.toString())) : BotaniaAPI.DUMMY_SUBTILE_NAME; + public static SubTileType getType(ItemStack stack) { + ResourceLocation id = BotaniaAPI.DUMMY_SUBTILE_NAME; + if(stack.hasTag()) { + id = new ResourceLocation(ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, BotaniaAPI.DUMMY_SUBTILE_NAME.toString())); + } + return BotaniaRegistries.SUBTILES.getValue(id); } public static ItemStack ofType(ResourceLocation type) { + return ofType(BotaniaRegistries.SUBTILES.getValue(type)); + } + + public static ItemStack ofType(SubTileType type) { return ofType(new ItemStack(ModBlocks.specialFlower), type); } - public static ItemStack ofType(ItemStack stack, ResourceLocation type) { - ItemNBTHelper.setString(stack, SubTileEntity.TAG_TYPE, type.toString()); + public static ItemStack ofType(ItemStack stack, SubTileType type) { + ItemNBTHelper.setString(stack, SubTileEntity.TAG_TYPE, type.getRegistryName().toString()); return stack; } @@ -132,9 +138,10 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @SubscribeEvent public static void onItemPickup(EntityItemPickupEvent evt) { if(evt.getItem().getItem().getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) { - ResourceLocation type = getType(evt.getItem().getItem()); - Class subtile = BotaniaAPI.getSubTileMapping(type); + SubTileType type = getType(evt.getItem().getItem()); + /* todo 1.13 use tags after flattening + Class subtile = BotaniaAPI.getSubTileMapping(type); if(SubTileGenerating.class.isAssignableFrom(subtile)) { PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/generating_flower"), "code_triggered"); } @@ -142,8 +149,9 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(SubTileFunctional.class.isAssignableFrom(subtile)) { PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered"); } + */ - if(BotaniaAPI.DUMMY_SUBTILE_NAME.equals(type)) { + if(BotaniaAPI.DUMMY_SUBTILE_NAME.equals(type.getRegistryName())) { PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/null_flower"), "code_triggered"); } }