From 168d484621c92c0ea268f9f9c2744ca95bdb349f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 6 Mar 2018 18:27:26 -0600 Subject: [PATCH] Flatten apothecaries --- block_flattening_notes.txt | 4 + .../botania/api/state/BotaniaStateProps.java | 4 - .../botania/api/state/enums/AltarVariant.java | 32 ------- .../client/challenge/ModChallenges.java | 2 +- .../integration/jei/JEIBotaniaPlugin.java | 15 ++-- .../PetalApothecaryRecipeCategory.java | 2 +- .../client/render/tile/RenderTileAltar.java | 3 +- .../botania/common/block/BlockAltar.java | 89 ++++++------------- .../botania/common/block/ModBlocks.java | 33 ++++++- .../botania/common/block/tile/TileAltar.java | 42 +++------ .../common/core/BotaniaCreativeTab.java | 11 ++- .../common/crafting/ModCraftingRecipes.java | 2 +- .../botania/common/fixers/FlattenItems.java | 2 + .../common/lexicon/page/PagePetalRecipe.java | 2 +- .../botania/common/lib/LibBlockNames.java | 1 + .../assets/botania/blockstates/altar.json | 14 --- .../blockstates/apothecary_default.json | 5 ++ .../blockstates/apothecary_desert.json | 5 ++ .../blockstates/apothecary_forest.json | 5 ++ .../blockstates/apothecary_fungal.json | 5 ++ .../botania/blockstates/apothecary_mesa.json | 5 ++ .../botania/blockstates/apothecary_mossy.json | 5 ++ .../blockstates/apothecary_mountain.json | 5 ++ .../blockstates/apothecary_plains.json | 5 ++ .../botania/blockstates/apothecary_swamp.json | 5 ++ .../botania/blockstates/apothecary_taiga.json | 5 ++ .../resources/assets/botania/lang/en_us.lang | 18 ++-- .../resources/assets/botania/lang/es_es.lang | 18 ++-- .../resources/assets/botania/lang/fr_fr.lang | 18 ++-- .../resources/assets/botania/lang/ja_jp.lang | 18 ++-- .../resources/assets/botania/lang/ko_kr.lang | 18 ++-- .../resources/assets/botania/lang/nl_nl.lang | 18 ++-- .../resources/assets/botania/lang/pt_br.lang | 18 ++-- .../resources/assets/botania/lang/ru_ru.lang | 2 +- .../resources/assets/botania/lang/zh_cn.lang | 18 ++-- .../resources/assets/botania/lang/zh_tw.lang | 18 ++-- .../apothecaries/default_apothecary.json | 23 ----- .../block/apothecaries/desert_apothecary.json | 23 ----- .../block/apothecaries/forest_apothecary.json | 23 ----- .../block/apothecaries/fungal_apothecary.json | 23 ----- .../block/apothecaries/mesa_apothecary.json | 23 ----- .../block/apothecaries/mossy_apothecary.json | 23 ----- .../apothecaries/mountain_apothecary.json | 23 ----- .../block/apothecaries/plains_apothecary.json | 23 ----- .../block/apothecaries/swamp_apothecary.json | 23 ----- .../block/apothecaries/taiga_apothecary.json | 23 ----- .../{altar_6.json => apotehcary_desert.json} | 6 +- .../{altar_0.json => apothecary_default.json} | 3 +- .../{altar_1.json => apothecary_forest.json} | 6 +- .../{altar_4.json => apothecary_fungal.json} | 6 +- .../{altar_8.json => apothecary_mesa.json} | 6 +- ...{altar_3.json => apothecary_mountain.json} | 6 +- .../{altar_2.json => apothecary_plains.json} | 6 +- .../{altar_5.json => apothecary_swamp.json} | 6 +- .../{altar_7.json => apothecary_taiga.json} | 6 +- 55 files changed, 253 insertions(+), 500 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarVariant.java delete mode 100644 src/main/resources/assets/botania/blockstates/altar.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_default.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_desert.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_forest.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_fungal.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mesa.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mossy.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mountain.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_plains.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_swamp.json create mode 100644 src/main/resources/assets/botania/blockstates/apothecary_taiga.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json rename src/main/resources/assets/botania/recipes/{altar_6.json => apotehcary_desert.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_0.json => apothecary_default.json} (95%) rename src/main/resources/assets/botania/recipes/{altar_1.json => apothecary_forest.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_4.json => apothecary_fungal.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_8.json => apothecary_mesa.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_3.json => apothecary_mountain.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_2.json => apothecary_plains.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_5.json => apothecary_swamp.json} (74%) rename src/main/resources/assets/botania/recipes/{altar_7.json => apothecary_taiga.json} (74%) diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index e42a43d0e..92d381eca 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -44,3 +44,7 @@ botania:platform[variant={abstruse, spectral, infrangible}] => botania:abstruse_platform => botania:spectral_platform => botania:infrangible_platform + +block:altar[variant={default, forest, plains, mountain, fungal, swamp, desert, taiga, mesa, mossy}] +=> botania:apothecary_ +mossy moved from actual state read from TE to a real separate block \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 95ac9ed9d..e958f00e0 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.AlfPortalState; -import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CratePattern; @@ -84,9 +83,6 @@ public final class BotaniaStateProps { // BlockAlfPortal public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); - // BlockAltar - public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); - // BlockBiomeStoneA public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java deleted file mode 100644 index 056b2b428..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ /dev/null @@ -1,32 +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 - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum AltarVariant implements IStringSerializable { - DEFAULT, - FOREST, - PLAINS, - MOUNTAIN, - FUNGAL, - SWAMP, - DESERT, - TAIGA, - MESA, - MOSSY; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 83c0274e0..9536db26d 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -40,7 +40,7 @@ public final class ModChallenges { addChallenge(EnumChallengeLevel.EASY, "pureDaisy", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); addChallenge(EnumChallengeLevel.EASY, "battery", new ItemStack(ModBlocks.manaPool)); - addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.altar)); + addChallenge(EnumChallengeLevel.NORMAL, "apothecaryRefill", new ItemStack(ModBlocks.defaultAltar)); addChallenge(EnumChallengeLevel.NORMAL, "treeFarm", new ItemStack(Blocks.SAPLING)); addChallenge(EnumChallengeLevel.NORMAL, "fullCropFarm", new ItemStack(Items.WHEAT_SEEDS)); addChallenge(EnumChallengeLevel.NORMAL, "animalFarm", new ItemStack(Items.LEATHER)); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index a27d5de0f..10e60a6da 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -23,7 +23,6 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeWrapper; @@ -91,10 +90,16 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(ModBlocks.dilutedPool), ManaPoolRecipeCategory.UID); registry.addRecipeCatalyst(new ItemStack(ModBlocks.fabulousPool), ManaPoolRecipeCategory.UID); - for(AltarVariant v : AltarVariant.values()) { - if(v == AltarVariant.MOSSY) continue; - registry.addRecipeCatalyst(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID); - } + registry.addRecipeCatalyst(new ItemStack(ModBlocks.defaultAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.forestAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.plainsAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.mountainAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.fungalAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.swampAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.desertAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.taigaAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.mesaAltar), PetalApothecaryRecipeCategory.UID); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.mossyAltar), PetalApothecaryRecipeCategory.UID); registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID); registry.addRecipeCatalyst(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index ddf0ee744..93827bb62 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -76,7 +76,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return; recipeLayout.getItemStacks().init(0, true, 64, 52); - recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.defaultAltar)); int index = 1; double angleBetweenEach = 360.0 / ingredients.getInputs(ItemStack.class).size(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 3ead2c7d1..3574725f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -33,8 +33,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { @Override public void render(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) { - if(!altar.getWorld().isBlockLoaded(altar.getPos(), false) - || altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar) + if(!altar.getWorld().isBlockLoaded(altar.getPos(), false)) return; GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 84b569ee0..3d47877d5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -12,25 +12,21 @@ package vazkii.botania.common.block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -44,9 +40,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; @@ -57,17 +50,33 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.util.Locale; +import java.util.Random; public class BlockAltar extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); - protected BlockAltar() { - super(Material.ROCK, LibBlockNames.ALTAR); + public enum Variant { + DEFAULT, + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA, + MOSSY + } + + public final Variant variant; + + protected BlockAltar(Variant v) { + super(Material.ROCK, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT)); setHardness(3.5F); setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT)); + this.variant = v; } @Nonnull @@ -76,40 +85,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { return AABB; } - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= AltarVariant.values().length ) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); - } - - @Nonnull - @Override - public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); - if (te instanceof TileAltar) { - TileAltar altar = (TileAltar) te; - - if (altar.isMossy) { - state = state.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.MOSSY); - } - } - return state; - } - @SideOnly(Side.CLIENT) @Nonnull @Override @@ -117,10 +92,14 @@ public class BlockAltar extends BlockMod implements ILexiconable { return BlockRenderLayer.CUTOUT; } + @Nonnull @Override - public void getSubBlocks(CreativeTabs tab, NonNullList list) { - for(int i = 0; i < 9; i++) - list.add(new ItemStack(this, 1, i)); + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + if(variant == Variant.MOSSY) { + return Item.getItemFromBlock(ModBlocks.defaultAltar); + } else { + return super.getItemDropped(state, rand, fortune); + } } @Override @@ -211,11 +190,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { } } - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - private boolean isValidWaterContainer(ItemStack stack) { if(stack.isEmpty() || stack.getCount() != 1) return false; @@ -281,11 +255,4 @@ public class BlockAltar extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.apothecary; } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, AltarVariant.values().length - 1); - } - } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index facbab375..d2a684861 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -127,7 +127,16 @@ import vazkii.botania.common.lib.LibOreDict; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModBlocks { public static final Block flower = new BlockModFlower(); - public static final Block altar = new BlockAltar(); + public static final Block defaultAltar = new BlockAltar(BlockAltar.Variant.DEFAULT); + public static final Block forestAltar = new BlockAltar(BlockAltar.Variant.FOREST); + public static final Block plainsAltar = new BlockAltar(BlockAltar.Variant.PLAINS); + public static final Block mountainAltar = new BlockAltar(BlockAltar.Variant.MOUNTAIN); + public static final Block fungalAltar = new BlockAltar(BlockAltar.Variant.FUNGAL); + public static final Block swampAltar = new BlockAltar(BlockAltar.Variant.SWAMP); + public static final Block desertAltar = new BlockAltar(BlockAltar.Variant.DESERT); + public static final Block taigaAltar = new BlockAltar(BlockAltar.Variant.TAIGA); + public static final Block mesaAltar = new BlockAltar(BlockAltar.Variant.MESA); + public static final Block mossyAltar = new BlockAltar(BlockAltar.Variant.MOSSY); public static final Block livingrock = new BlockLivingrock(); public static final Block livingwood = new BlockLivingwood(); public static final Block specialFlower = new BlockSpecialFlower(); @@ -248,7 +257,16 @@ public final class ModBlocks { IForgeRegistry r = evt.getRegistry(); r.register(flower); - r.register(altar); + r.register(defaultAltar); + r.register(forestAltar); + r.register(plainsAltar); + r.register(mountainAltar); + r.register(fungalAltar); + r.register(swampAltar); + r.register(desertAltar); + r.register(taigaAltar); + r.register(mesaAltar); + r.register(mossyAltar); r.register(livingrock); r.register(livingwood); r.register(specialFlower); @@ -372,7 +390,16 @@ public final class ModBlocks { public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); r.register(new ItemBlockWithMetadataAndName(flower).setRegistryName(flower.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(altar).setRegistryName(altar.getRegistryName())); + r.register(new ItemBlockMod(defaultAltar).setRegistryName(defaultAltar.getRegistryName())); + r.register(new ItemBlockMod(forestAltar).setRegistryName(forestAltar.getRegistryName())); + r.register(new ItemBlockMod(plainsAltar).setRegistryName(plainsAltar.getRegistryName())); + r.register(new ItemBlockMod(mountainAltar).setRegistryName(mountainAltar.getRegistryName())); + r.register(new ItemBlockMod(fungalAltar).setRegistryName(fungalAltar.getRegistryName())); + r.register(new ItemBlockMod(swampAltar).setRegistryName(swampAltar.getRegistryName())); + r.register(new ItemBlockMod(desertAltar).setRegistryName(desertAltar.getRegistryName())); + r.register(new ItemBlockMod(taigaAltar).setRegistryName(taigaAltar.getRegistryName())); + r.register(new ItemBlockMod(mesaAltar).setRegistryName(mesaAltar.getRegistryName())); + r.register(new ItemBlockMod(mossyAltar).setRegistryName(mossyAltar.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(livingrock).setRegistryName(livingrock.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(livingwood).setRegistryName(livingwood.getRegistryName())); r.register(new ItemBlockSpecialFlower(specialFlower).setRegistryName(specialFlower.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index b185014cf..f687f8c56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -24,8 +25,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; @@ -38,22 +37,16 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; -import scala.reflect.internal.Trees.If; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.item.equipment.bauble.ItemBalanceCloak; -import vazkii.botania.common.network.PacketBotaniaEffect; -import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import java.awt.Color; @@ -74,7 +67,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, public boolean hasWater = false; public boolean hasLava = false; - public boolean isMossy = false; + private boolean mossyLegacy = false; List lastRecipe = null; int recipeKeepTicks = 0; @@ -84,14 +77,12 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, if(world.isRemote || stack.isEmpty() || item.isDead) return false; - if(!isMossy && world.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { - if(stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { - isMossy = true; - world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); - stack.shrink(1); + if(getBlockType() == ModBlocks.defaultAltar && stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { + // todo 1.13 this resets the tile entity/drops all contents + world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState()); + stack.shrink(1); - return true; - } + return true; } if(!hasWater() && !hasLava()) { @@ -190,7 +181,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, lastRecipe.add(stack.copy()); } recipeKeepTicks = 400; - world.addBlockEvent(getPos(), ModBlocks.altar, SET_KEEP_TICKS_EVENT, 400); + world.addBlockEvent(getPos(), getBlockType(), SET_KEEP_TICKS_EVENT, 400); } public void trySetLastRecipe(EntityPlayer player) { @@ -238,6 +229,11 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, @Override public void update() { if(!world.isRemote) { + if(mossyLegacy) { + world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState()); + mossyLegacy = false; + } + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); boolean didChange = false; @@ -264,7 +260,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } if(hasLava()) { - isMossy = false; world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); if(Math.random() > 0.9) world.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); @@ -282,7 +277,6 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, cmp.setBoolean(TAG_HAS_WATER, hasWater()); cmp.setBoolean(TAG_HAS_LAVA, hasLava()); - cmp.setBoolean(TAG_IS_MOSSY, isMossy); } @Override @@ -291,15 +285,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, hasWater = cmp.getBoolean(TAG_HAS_WATER); hasLava = cmp.getBoolean(TAG_HAS_LAVA); - isMossy = cmp.getBoolean(TAG_IS_MOSSY); - } - - @Override - public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { - boolean lastMossy = isMossy; - super.onDataPacket(manager, packet); - if(isMossy != lastMossy) - world.markBlockRangeForRenderUpdate(pos, pos); + mossyLegacy = cmp.getBoolean(TAG_IS_MOSSY); } @Override diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 9dd0413ee..3a5f6c8d1 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -198,7 +198,16 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.spectralPlatform); addBlock(ModBlocks.infrangiblePlatform); addBlock(ModBlocks.alfPortal); - addBlock(ModBlocks.altar); + addBlock(ModBlocks.defaultAltar); + addBlock(ModBlocks.forestAltar); + addBlock(ModBlocks.plainsAltar); + addBlock(ModBlocks.mountainAltar); + addBlock(ModBlocks.fungalAltar); + addBlock(ModBlocks.swampAltar); + addBlock(ModBlocks.desertAltar); + addBlock(ModBlocks.taigaAltar); + addBlock(ModBlocks.mesaAltar); + addBlock(ModBlocks.mossyAltar); addBlock(ModBlocks.runeAltar); addBlock(ModBlocks.terraPlate); addBlock(ModBlocks.brewery); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1d12c3c0a..2be733c84 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -423,7 +423,7 @@ public final class ModCraftingRecipes { recipesPetalBlocks = allOfGroup(ModBlocks.petalBlock.getRegistryName()); recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct"); - recipeApothecary = path("altar_0"); + recipeApothecary = ModBlocks.defaultAltar.getRegistryName(); recipeLexicon = ModItems.lexicon.getRegistryName(); recipesTwigWand = allOfGroup(ModItems.twigWand.getRegistryName()); recipeLivingwoodTwig = ModItems.livingwoodTwig.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 19f038166..8db7e658b 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.common.block.BlockAltar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; @@ -190,6 +191,7 @@ public class FlattenItems implements IFixableData { case 2: return ModBlocks.infrangiblePlatform.getRegistryName().toString(); } }); + LOOKUP.put("botania:altar", i -> LibMisc.MOD_ID + ":" + LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.values()[i % 10].name().toLowerCase(Locale.ROOT)); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index b74a79368..b3519d65b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -99,7 +99,7 @@ public class PagePetalRecipe extends PageRecipe { } ItemStack getMiddleStack() { - return new ItemStack(ModBlocks.altar); + return new ItemStack(ModBlocks.defaultAltar); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 65a6dae17..2d1a46c6e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -14,6 +14,7 @@ public final class LibBlockNames { public static final String FLOWER = "flower"; public static final String ALTAR = "altar"; + public static final String APOTHECARY_PREFIX = "apothecary_"; public static final String SPECIAL_FLOWER = "specialFlower"; public static final String LIVING_ROCK = "livingrock"; public static final String LIVING_WOOD = "livingwood"; diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json deleted file mode 100644 index 80d2e5aa2..000000000 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "variant=default": { "model": "botania:apothecary_default" }, - "variant=forest": { "model": "botania:apothecary_forest" }, - "variant=plains": { "model": "botania:apothecary_plains" }, - "variant=mountain": { "model": "botania:apothecary_mountain" }, - "variant=fungal": { "model": "botania:apothecary_fungal" }, - "variant=swamp": { "model": "botania:apothecary_swamp" }, - "variant=desert": { "model": "botania:apothecary_desert" }, - "variant=taiga": { "model": "botania:apothecary_taiga" }, - "variant=mesa": { "model": "botania:apothecary_mesa" }, - "variant=mossy": { "model": "botania:apothecary_mossy" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_default.json b/src/main/resources/assets/botania/blockstates/apothecary_default.json new file mode 100644 index 000000000..c834f365e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_default.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_default" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_desert.json b/src/main/resources/assets/botania/blockstates/apothecary_desert.json new file mode 100644 index 000000000..c18dbb6f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_desert.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_desert" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_forest.json b/src/main/resources/assets/botania/blockstates/apothecary_forest.json new file mode 100644 index 000000000..c7c594675 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_forest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_forest" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_fungal.json b/src/main/resources/assets/botania/blockstates/apothecary_fungal.json new file mode 100644 index 000000000..19d484c66 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_fungal.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_fungal" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mesa.json b/src/main/resources/assets/botania/blockstates/apothecary_mesa.json new file mode 100644 index 000000000..31d273329 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_mesa.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_mesa" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mossy.json b/src/main/resources/assets/botania/blockstates/apothecary_mossy.json new file mode 100644 index 000000000..9a98e9764 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_mossy.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_mossy" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mountain.json b/src/main/resources/assets/botania/blockstates/apothecary_mountain.json new file mode 100644 index 000000000..6d37a9594 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_mountain.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_mountain" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_plains.json b/src/main/resources/assets/botania/blockstates/apothecary_plains.json new file mode 100644 index 000000000..bf488c49e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_plains.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_plains" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_swamp.json b/src/main/resources/assets/botania/blockstates/apothecary_swamp.json new file mode 100644 index 000000000..03358a9ae --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_swamp.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_swamp" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_taiga.json b/src/main/resources/assets/botania/blockstates/apothecary_taiga.json new file mode 100644 index 000000000..6a5aa2c80 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/apothecary_taiga.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:apothecary_taiga" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 5fa47bee6..1f3a7d2d9 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -640,15 +640,15 @@ tile.botania:flower12.name=Mystical Brown Flower tile.botania:flower13.name=Mystical Green Flower tile.botania:flower14.name=Mystical Red Flower tile.botania:flower15.name=Mystical Black Flower -tile.botania:altar0.name=Petal Apothecary -tile.botania:altar1.name=Forest Petal Apothecary -tile.botania:altar2.name=Plains Petal Apothecary -tile.botania:altar3.name=Mountain Petal Apothecary -tile.botania:altar4.name=Fungal Petal Apothecary -tile.botania:altar5.name=Swamp Petal Apothecary -tile.botania:altar6.name=Desert Petal Apothecary -tile.botania:altar7.name=Taiga Petal Apothecary -tile.botania:altar8.name=Mesa Petal Apothecary +tile.botania:apothecary_default.name=Petal Apothecary +tile.botania:apothecary_forest.name=Forest Petal Apothecary +tile.botania:apothecary_plains.name=Plains Petal Apothecary +tile.botania:apothecary_mountain.name=Mountain Petal Apothecary +tile.botania:apothecary_fungal.name=Fungal Petal Apothecary +tile.botania:apothecary_swamp.name=Swamp Petal Apothecary +tile.botania:apothecary_desert.name=Desert Petal Apothecary +tile.botania:apothecary_taiga.name=Taiga Petal Apothecary +tile.botania:apothecary_mesa.name=Mesa Petal Apothecary tile.botania:livingrock0.name=Livingrock tile.botania:livingrock1.name=Livingrock Brick tile.botania:livingrock2.name=Mossy Livingrock Brick diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index e19a2e6e5..5551327a0 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -501,15 +501,15 @@ tile.botania:flower12.name=Flor mística marrón tile.botania:flower13.name=Flor mística verde tile.botania:flower14.name=Flor mística roja tile.botania:flower15.name=Flor mística negra -tile.botania:altar0.name=Botica de pétalos -tile.botania:altar1.name=Botica de pétalos de bosque -tile.botania:altar2.name=Botica de pétalos de llanura -tile.botania:altar3.name=Botica de pétalos de montaña -tile.botania:altar4.name=Botica de pétalos de setas -tile.botania:altar5.name=Botica de pétalos de pantano -tile.botania:altar6.name=Botica de pétalos de desierto -tile.botania:altar7.name=Botica de pétalos de taiga -tile.botania:altar8.name=Botica de pétalos de mesa +tile.botania:apothecary_default.name=Botica de pétalos +tile.botania:apothecary_forest.name=Botica de pétalos de bosque +tile.botania:apothecary_plains.name=Botica de pétalos de llanura +tile.botania:apothecary_mountain.name=Botica de pétalos de montaña +tile.botania:apothecary_fungal.name=Botica de pétalos de setas +tile.botania:apothecary_swamp.name=Botica de pétalos de pantano +tile.botania:apothecary_desert.name=Botica de pétalos de desierto +tile.botania:apothecary_taiga.name=Botica de pétalos de taiga +tile.botania:apothecary_mesa.name=Botica de pétalos de mesa tile.botania:livingrock0.name=Piedra viviente tile.botania:livingrock1.name=Ladrillo de piedra viviente tile.botania:livingrock2.name=Ladrillo musgoso de piedra viviente diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index ff736eea2..155d6e1fa 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -427,15 +427,15 @@ tile.botania:flower12.name=Fleur mystique marron tile.botania:flower13.name=Fleur mystique verte tile.botania:flower14.name=Fleur mystique rouge tile.botania:flower15.name=Fleur mystique noire -tile.botania:altar0.name=Apothicaire de pétale -tile.botania:altar1.name=Apothicaire de pétale des forêts -tile.botania:altar2.name=Apothicaire de pétale des plaines -tile.botania:altar3.name=Apothicaire de pétale des montagnes -tile.botania:altar4.name=Apothicaire de pétale des fonges -tile.botania:altar5.name=Apothicaire de pétale des marais -tile.botania:altar6.name=Apothicaire de pétale des déserts -tile.botania:altar7.name=Apothicaire de pétale des taigas -tile.botania:altar8.name=Apothicaire de pétale des messas +tile.botania:apothecary_default.name=Apothicaire de pétale +tile.botania:apothecary_forest.name=Apothicaire de pétale des forêts +tile.botania:apothecary_plains.name=Apothicaire de pétale des plaines +tile.botania:apothecary_mountain.name=Apothicaire de pétale des montagnes +tile.botania:apothecary_fungal.name=Apothicaire de pétale des fonges +tile.botania:apothecary_swamp.name=Apothicaire de pétale des marais +tile.botania:apothecary_desert.name=Apothicaire de pétale des déserts +tile.botania:apothecary_taiga.name=Apothicaire de pétale des taigas +tile.botania:apothecary_mesa.name=Apothicaire de pétale des messas tile.botania:livingrock0.name=Viveroche tile.botania:livingrock1.name=Brique de viveroche tile.botania:livingrock2.name=Brique de viveroche moussue diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index de8ad0414..0104141ae 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -417,15 +417,15 @@ tile.botania:flower12.name=茶色の神秘の花 tile.botania:flower13.name=緑色の神秘の花 tile.botania:flower14.name=赤色の神秘の花 tile.botania:flower15.name=黒色の神秘の花 -tile.botania:altar0.name=花びらの調合所 -tile.botania:altar1.name=森の花びらの調合所 -tile.botania:altar2.name=平原の花びらの調合所 -tile.botania:altar3.name=山の花びらの調合所 -tile.botania:altar4.name=きのこの花びらの調合所 -tile.botania:altar5.name=沼の花びらの調合所 -tile.botania:altar6.name=砂漠の花びらの調合所 -tile.botania:altar7.name=タイガの花びらの調合所 -tile.botania:altar8.name=メサの花びらの調合所 +tile.botania:apothecary_default.name=花びらの調合所 +tile.botania:apothecary_forest.name=森の花びらの調合所 +tile.botania:apothecary_plains.name=平原の花びらの調合所 +tile.botania:apothecary_mountain.name=山の花びらの調合所 +tile.botania:apothecary_fungal.name=きのこの花びらの調合所 +tile.botania:apothecary_swamp.name=沼の花びらの調合所 +tile.botania:apothecary_desert.name=砂漠の花びらの調合所 +tile.botania:apothecary_taiga.name=タイガの花びらの調合所 +tile.botania:apothecary_mesa.name=メサの花びらの調合所 tile.botania:livingrock0.name=リビングロック tile.botania:livingrock1.name=リビングロックレンガ tile.botania:livingrock2.name=苔むしたリビングロックレンガ diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 13d2506f4..d22893818 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -466,15 +466,15 @@ tile.botania:flower12.name=신비로운 갈색 꽃 tile.botania:flower13.name=신비로운 초록색 꽃 tile.botania:flower14.name=신비로운 빨강색 꽃 tile.botania:flower15.name=신비로운 검은색 꽃 -tile.botania:altar0.name=꽃잎 연금술기 -tile.botania:altar1.name=숲 꽃잎 연금술기 -tile.botania:altar2.name=평원 꽃잎 연금술기 -tile.botania:altar3.name=산 꽃잎 연금술기 -tile.botania:altar4.name=균사 꽃잎 연금술기 -tile.botania:altar5.name=늪 꽃잎 연금술기 -tile.botania:altar6.name=사막 꽃잎 연금술기 -tile.botania:altar7.name=타이가 꽃잎 연금술기 -tile.botania:altar8.name=메사 꽃잎 연금술기 +tile.botania:apothecary_default.name=꽃잎 연금술기 +tile.botania:apothecary_forest.name=숲 꽃잎 연금술기 +tile.botania:apothecary_plains.name=평원 꽃잎 연금술기 +tile.botania:apothecary_mountain.name=산 꽃잎 연금술기 +tile.botania:apothecary_fungal.name=균사 꽃잎 연금술기 +tile.botania:apothecary_swamp.name=늪 꽃잎 연금술기 +tile.botania:apothecary_desert.name=사막 꽃잎 연금술기 +tile.botania:apothecary_taiga.name=타이가 꽃잎 연금술기 +tile.botania:apothecary_mesa.name=메사 꽃잎 연금술기 tile.botania:livingrock0.name=생명의 돌 tile.botania:livingrock1.name=생명의 벽돌 tile.botania:livingrock2.name=이끼 낀 생명의 벽돌 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 4cde6c4b7..922273e20 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -491,15 +491,15 @@ tile.botania:flower12.name=Mystieke Bruine Bloem tile.botania:flower13.name=Mystieke Groene Bloem tile.botania:flower14.name=Mystieke Rode Bloem tile.botania:flower15.name=Mystieke Zwarte Bloem -tile.botania:altar0.name=Bloemblad Apotheek -tile.botania:altar1.name=Woud Bloemblad Apotheek -tile.botania:altar2.name=Veld Bloemblad Apotheek -tile.botania:altar3.name=Berg Bloemblad Apotheek -tile.botania:altar4.name=Schimmel Bloemblad Apotheek -tile.botania:altar5.name=Moeras Bloemblad Apotheek -tile.botania:altar6.name=Woestijn Bloemblad Apotheek -tile.botania:altar7.name=Winterwoud Bloemblad Apotheek -tile.botania:altar8.name=Hoogvlakte Bloemblad Apotheek +tile.botania:apothecary_default.name=Bloemblad Apotheek +tile.botania:apothecary_forest.name=Woud Bloemblad Apotheek +tile.botania:apothecary_plains.name=Veld Bloemblad Apotheek +tile.botania:apothecary_mountain.name=Berg Bloemblad Apotheek +tile.botania:apothecary_fungal.name=Schimmel Bloemblad Apotheek +tile.botania:apothecary_swamp.name=Moeras Bloemblad Apotheek +tile.botania:apothecary_desert.name=Woestijn Bloemblad Apotheek +tile.botania:apothecary_taiga.name=Winterwoud Bloemblad Apotheek +tile.botania:apothecary_mesa.name=Hoogvlakte Bloemblad Apotheek tile.botania:livingrock0.name=Levensteen tile.botania:livingrock1.name=Levensteen Baksteen tile.botania:livingrock2.name=Mossige Levensteen Baksteen diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index e3e861bd6..79b1d1cf6 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -633,15 +633,15 @@ tile.botania:flower12.name=Flor Mística Marrom tile.botania:flower13.name=Flor Mística Verde tile.botania:flower14.name=Flor Mística Vermelha tile.botania:flower15.name=Flor Mística Preta -tile.botania:altar0.name=Boticário de Pétalas -tile.botania:altar1.name=Boticário de Pétalas - Floresta -tile.botania:altar2.name=Boticário de Pétalas - Planície -tile.botania:altar3.name=Boticário de Pétalas - Montanha -tile.botania:altar4.name=Boticário de Pétalas - Fungo -tile.botania:altar5.name=Boticário de Pétalas - Pântano -tile.botania:altar6.name=Boticário de Pétalas - Deserto -tile.botania:altar7.name=Boticário de Pétalas - Taiga -tile.botania:altar8.name=Boticário de Pétalas - Mesa +tile.botania:apothecary_default.name=Boticário de Pétalas +tile.botania:apothecary_forest.name=Boticário de Pétalas - Floresta +tile.botania:apothecary_plains.name=Boticário de Pétalas - Planície +tile.botania:apothecary_mountain.name=Boticário de Pétalas - Montanha +tile.botania:apothecary_fungal.name=Boticário de Pétalas - Fungo +tile.botania:apothecary_swamp.name=Boticário de Pétalas - Pântano +tile.botania:apothecary_desert.name=Boticário de Pétalas - Deserto +tile.botania:apothecary_taiga.name=Boticário de Pétalas - Taiga +tile.botania:apothecary_mesa.name=Boticário de Pétalas - Mesa tile.botania:livingrock0.name=Rocha-viva tile.botania:livingrock1.name=Tijolos de Rocha-viva tile.botania:livingrock2.name=Tijolos de Rocha-viva com musgo diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index d1bf9fa91..57dc24742 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -252,7 +252,7 @@ tile.botania:flower12.name=Мистический коричневый цвет tile.botania:flower13.name=Мистический зелёный цветок tile.botania:flower14.name=Мистический красный цветок tile.botania:flower15.name=Мистический чёрный цветок -tile.botania:altar0.name=Лепестковый аптекарь +tile.botania:apothecary_default.name=Лепестковый аптекарь tile.botania:livingrock0.name=Жизнекамень tile.botania:livingrock1.name=Кирпич из жизнекамня tile.botania:livingrock2.name=Замшелый кирпич из жизнекамня diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 60811a8c5..217c80ddb 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -640,15 +640,15 @@ tile.botania:flower12.name=棕色神秘花 tile.botania:flower13.name=绿色神秘花 tile.botania:flower14.name=红色神秘花 tile.botania:flower15.name=黑色神秘花 -tile.botania:altar0.name=花药台 -tile.botania:altar1.name=森林花药台 -tile.botania:altar2.name=平原花药台 -tile.botania:altar3.name=高山花药台 -tile.botania:altar4.name=菌丝花药台 -tile.botania:altar5.name=沼泽花药台 -tile.botania:altar6.name=沙漠花药台 -tile.botania:altar7.name=雪原花药台 -tile.botania:altar8.name=高原花药台 +tile.botania:apothecary_default.name=花药台 +tile.botania:apothecary_forest.name=森林花药台 +tile.botania:apothecary_plains.name=平原花药台 +tile.botania:apothecary_mountain.name=高山花药台 +tile.botania:apothecary_fungal.name=菌丝花药台 +tile.botania:apothecary_swamp.name=沼泽花药台 +tile.botania:apothecary_desert.name=沙漠花药台 +tile.botania:apothecary_taiga.name=雪原花药台 +tile.botania:apothecary_mesa.name=高原花药台 tile.botania:livingrock0.name=活石 tile.botania:livingrock1.name=活石砖 tile.botania:livingrock2.name=苔活石砖 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 408f17cf7..227828e1a 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -597,15 +597,15 @@ tile.botania:flower12.name=棕色神秘花 tile.botania:flower13.name=綠色神秘花 tile.botania:flower14.name=紅色神秘花 tile.botania:flower15.name=黑色神秘花 -tile.botania:altar0.name=花藥台 -tile.botania:altar1.name=森林花藥台 -tile.botania:altar2.name=平原花藥台 -tile.botania:altar3.name=高山花藥台 -tile.botania:altar4.name=菌絲花藥台 -tile.botania:altar5.name=沼澤花藥台 -tile.botania:altar6.name=沙漠花藥台 -tile.botania:altar7.name=雪原花藥台 -tile.botania:altar8.name=高原花藥台 +tile.botania:apothecary_default.name=花藥台 +tile.botania:apothecary_forest.name=森林花藥台 +tile.botania:apothecary_plains.name=平原花藥台 +tile.botania:apothecary_mountain.name=高山花藥台 +tile.botania:apothecary_fungal.name=菌絲花藥台 +tile.botania:apothecary_swamp.name=沼澤花藥台 +tile.botania:apothecary_desert.name=沙漠花藥台 +tile.botania:apothecary_taiga.name=雪原花藥台 +tile.botania:apothecary_mesa.name=高原花藥台 tile.botania:livingrock0.name=活石 tile.botania:livingrock1.name=活石磚 tile.botania:livingrock2.name=苔活石磚 diff --git a/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json deleted file mode 100644 index b8b2d35ac..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/default/gobletbase_sides", - "gobletbasetop": "botania:model/altar/default/gobletbase_top", - "gobletbasebottom": "botania:model/altar/default/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/default/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/default/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/default/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/default/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/default/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/default/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/default/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/default/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/default/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/default/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/default/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/default/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/default/kelkbase2_bottom", - "kelkwall": "botania:model/altar/default/kelkwall", - "particle": "minecraft:blocks/cobblestone" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json deleted file mode 100644 index 75187e5ff..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/desert/gobletbase_sides", - "gobletbasetop": "botania:model/altar/desert/gobletbase_top", - "gobletbasebottom": "botania:model/altar/desert/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/desert/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/desert/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/desert/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/desert/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/desert/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/desert/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/desert/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/desert/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/desert/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/desert/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/desert/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/desert/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/desert/kelkbase2_bottom", - "kelkwall": "botania:model/altar/desert/kelkwall", - "particle": "botania:blocks/biomestone5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json deleted file mode 100644 index 2f46c21e1..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/forest/gobletbase_sides", - "gobletbasetop": "botania:model/altar/forest/gobletbase_top", - "gobletbasebottom": "botania:model/altar/forest/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/forest/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/forest/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/forest/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/forest/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/forest/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/forest/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/forest/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/forest/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/forest/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/forest/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/forest/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/forest/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/forest/kelkbase2_bottom", - "kelkwall": "botania:model/altar/forest/kelkwall", - "particle": "botania:blocks/biomestone0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json deleted file mode 100644 index 93292da90..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/fungal/gobletbase_sides", - "gobletbasetop": "botania:model/altar/fungal/gobletbase_top", - "gobletbasebottom": "botania:model/altar/fungal/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/fungal/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/fungal/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/fungal/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/fungal/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/fungal/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/fungal/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/fungal/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/fungal/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/fungal/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/fungal/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/fungal/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/fungal/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/fungal/kelkbase2_bottom", - "kelkwall": "botania:model/altar/fungal/kelkwall", - "particle": "botania:blocks/biomestone3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json deleted file mode 100644 index ad2a8a766..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/mesa/gobletbase_sides", - "gobletbasetop": "botania:model/altar/mesa/gobletbase_top", - "gobletbasebottom": "botania:model/altar/mesa/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/mesa/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/mesa/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/mesa/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/mesa/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/mesa/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/mesa/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/mesa/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/mesa/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/mesa/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/mesa/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/mesa/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/mesa/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/mesa/kelkbase2_bottom", - "kelkwall": "botania:model/altar/mesa/kelkwall", - "particle": "botania:blocks/biomestone7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json deleted file mode 100644 index 58f2149ee..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/mossy/gobletbase_sides", - "gobletbasetop": "botania:model/altar/mossy/gobletbase_top", - "gobletbasebottom": "botania:model/altar/mossy/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/mossy/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/mossy/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/mossy/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/mossy/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/mossy/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/mossy/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/mossy/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/mossy/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/mossy/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/mossy/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/mossy/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/mossy/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/mossy/kelkbase2_bottom", - "kelkwall": "botania:model/altar/mossy/kelkwall", - "particle": "minecraft:blocks/cobblestone_mossy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json deleted file mode 100644 index a6067404e..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/mountain/gobletbase_sides", - "gobletbasetop": "botania:model/altar/mountain/gobletbase_top", - "gobletbasebottom": "botania:model/altar/mountain/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/mountain/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/mountain/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/mountain/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/mountain/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/mountain/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/mountain/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/mountain/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/mountain/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/mountain/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/mountain/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/mountain/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/mountain/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/mountain/kelkbase2_bottom", - "kelkwall": "botania:model/altar/mountain/kelkwall", - "particle": "botania:blocks/biomestone2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json deleted file mode 100644 index 8186efcb4..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/plains/gobletbase_sides", - "gobletbasetop": "botania:model/altar/plains/gobletbase_top", - "gobletbasebottom": "botania:model/altar/plains/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/plains/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/plains/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/plains/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/plains/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/plains/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/plains/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/plains/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/plains/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/plains/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/plains/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/plains/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/plains/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/plains/kelkbase2_bottom", - "kelkwall": "botania:model/altar/plains/kelkwall", - "particle": "botania:blocks/biomestone1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json deleted file mode 100644 index 7a3adf989..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/swamp/gobletbase_sides", - "gobletbasetop": "botania:model/altar/swamp/gobletbase_top", - "gobletbasebottom": "botania:model/altar/swamp/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/swamp/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/swamp/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/swamp/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/swamp/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/swamp/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/swamp/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/swamp/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/swamp/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/swamp/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/swamp/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/swamp/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/swamp/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/swamp/kelkbase2_bottom", - "kelkwall": "botania:model/altar/swamp/kelkwall", - "particle": "botania:blocks/biomestone4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json deleted file mode 100644 index 249034459..000000000 --- a/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "gobletbaseside": "botania:model/altar/taiga/gobletbase_sides", - "gobletbasetop": "botania:model/altar/taiga/gobletbase_top", - "gobletbasebottom": "botania:model/altar/taiga/gobletbase_bottom", - "gobletbase2side": "botania:model/altar/taiga/gobletbase2_sides", - "gobletbase2top": "botania:model/altar/taiga/gobletbase2_top", - "gobletbase2bottom": "botania:model/altar/taiga/gobletbase2_bottom", - "gobletbase3side": "botania:model/altar/taiga/gobletbase3_sides", - "gobletbase3top": "botania:model/altar/taiga/gobletbase3_top", - "gobletbase3bottom": "botania:model/altar/taiga/gobletbase3_bottom", - "gobletstandside": "botania:model/altar/taiga/gobletstand_sides", - "gobletstandtopbottom": "botania:model/altar/taiga/gobletstand_top_bottom", - "kelkbaseside": "botania:model/altar/taiga/kelkbase_sides", - "kelkbasetopbottom": "botania:model/altar/taiga/kelkbase_top_bottom", - "kelkbase2side": "botania:model/altar/taiga/kelkbase2_sides", - "kelkbase2top": "botania:model/altar/taiga/kelkbase2_top", - "kelkbase2bottom": "botania:model/altar/taiga/kelkbase2_bottom", - "kelkwall": "botania:model/altar/taiga/kelkwall", - "particle": "botania:blocks/biomestone6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/altar_6.json b/src/main/resources/assets/botania/recipes/apotehcary_desert.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_6.json rename to src/main/resources/assets/botania/recipes/apotehcary_desert.json index 84d244e4a..02db1bead 100644 --- a/src/main/resources/assets/botania/recipes/altar_6.json +++ b/src/main/resources/assets/botania/recipes/apotehcary_desert.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 6 + "item": "botania:apothecary_desert" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_0.json b/src/main/resources/assets/botania/recipes/apothecary_default.json similarity index 95% rename from src/main/resources/assets/botania/recipes/altar_0.json rename to src/main/resources/assets/botania/recipes/apothecary_default.json index 5b70d95ff..5531c5f04 100644 --- a/src/main/resources/assets/botania/recipes/altar_0.json +++ b/src/main/resources/assets/botania/recipes/apothecary_default.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "pattern": [ "SPS", diff --git a/src/main/resources/assets/botania/recipes/altar_1.json b/src/main/resources/assets/botania/recipes/apothecary_forest.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_1.json rename to src/main/resources/assets/botania/recipes/apothecary_forest.json index c2eacc7db..5f8093df9 100644 --- a/src/main/resources/assets/botania/recipes/altar_1.json +++ b/src/main/resources/assets/botania/recipes/apothecary_forest.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 1 + "item": "botania:apothecary_forest" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_4.json b/src/main/resources/assets/botania/recipes/apothecary_fungal.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_4.json rename to src/main/resources/assets/botania/recipes/apothecary_fungal.json index 78fca3d20..35f32e44c 100644 --- a/src/main/resources/assets/botania/recipes/altar_4.json +++ b/src/main/resources/assets/botania/recipes/apothecary_fungal.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 4 + "item": "botania:apothecary_fungal" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_8.json b/src/main/resources/assets/botania/recipes/apothecary_mesa.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_8.json rename to src/main/resources/assets/botania/recipes/apothecary_mesa.json index 3bff6c38a..8cd49ae7f 100644 --- a/src/main/resources/assets/botania/recipes/altar_8.json +++ b/src/main/resources/assets/botania/recipes/apothecary_mesa.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 8 + "item": "botania:apothecary_mesa" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_3.json b/src/main/resources/assets/botania/recipes/apothecary_mountain.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_3.json rename to src/main/resources/assets/botania/recipes/apothecary_mountain.json index 7b674ba0d..72a89e7ea 100644 --- a/src/main/resources/assets/botania/recipes/altar_3.json +++ b/src/main/resources/assets/botania/recipes/apothecary_mountain.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 3 + "item": "botania:apothecary_mountain" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_2.json b/src/main/resources/assets/botania/recipes/apothecary_plains.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_2.json rename to src/main/resources/assets/botania/recipes/apothecary_plains.json index b118bc49a..9a16a4691 100644 --- a/src/main/resources/assets/botania/recipes/altar_2.json +++ b/src/main/resources/assets/botania/recipes/apothecary_plains.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 2 + "item": "botania:apothecary_plains" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_5.json b/src/main/resources/assets/botania/recipes/apothecary_swamp.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_5.json rename to src/main/resources/assets/botania/recipes/apothecary_swamp.json index 45590eded..05d12afcf 100644 --- a/src/main/resources/assets/botania/recipes/altar_5.json +++ b/src/main/resources/assets/botania/recipes/apothecary_swamp.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 5 + "item": "botania:apothecary_swamp" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea", diff --git a/src/main/resources/assets/botania/recipes/altar_7.json b/src/main/resources/assets/botania/recipes/apothecary_taiga.json similarity index 74% rename from src/main/resources/assets/botania/recipes/altar_7.json rename to src/main/resources/assets/botania/recipes/apothecary_taiga.json index a0e8b3b59..8c8ec6f7b 100644 --- a/src/main/resources/assets/botania/recipes/altar_7.json +++ b/src/main/resources/assets/botania/recipes/apothecary_taiga.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:altar", - "data": 7 + "item": "botania:apothecary_taiga" }, "pattern": [ "SSS", @@ -12,8 +11,7 @@ "group": "botania:metamorphic_apothecary", "key": { "A": { - "item": "botania:altar", - "data": 0 + "item": "botania:apothecary_default" }, "S": { "item": "botania:biomestonea",