From 01e1bf7c59afaa38eeb36fe26abe53a50dd54b0a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 5 Mar 2018 11:05:39 -0600 Subject: [PATCH] Flatten storage blocks --- block_flattening_notes.txt | 9 ++- .../botania/api/state/BotaniaStateProps.java | 4 -- .../api/state/enums/StorageVariant.java | 27 ------- .../botania/common/block/BlockStorage.java | 70 +++++-------------- .../botania/common/block/ModBlocks.java | 19 +++-- .../block/corporea/BlockCorporeaIndex.java | 5 +- .../common/core/BotaniaCreativeTab.java | 6 +- .../common/crafting/ModElvenTradeRecipes.java | 4 +- .../crafting/ModManaInfusionRecipes.java | 4 +- .../botania/common/fixers/FlattenItems.java | 10 +++ .../common/item/block/ItemBlockStorage.java | 27 ------- .../item/material/ItemManaResource.java | 1 + .../botania/common/lib/LibBlockNames.java | 2 +- .../blockstates/dragonstone_block.json | 5 ++ .../botania/blockstates/elementium_block.json | 5 ++ .../blockstates/mana_diamond_block.json | 5 ++ .../botania/blockstates/manasteel_block.json | 5 ++ .../assets/botania/blockstates/storage.json | 9 --- .../botania/blockstates/terrasteel_block.json | 5 ++ .../resources/assets/botania/lang/de_de.lang | 4 +- .../resources/assets/botania/lang/en_us.lang | 10 +-- .../resources/assets/botania/lang/es_ar.lang | 6 +- .../resources/assets/botania/lang/es_es.lang | 10 +-- .../resources/assets/botania/lang/fr_fr.lang | 10 +-- .../resources/assets/botania/lang/ja_jp.lang | 10 +-- .../resources/assets/botania/lang/ko_kr.lang | 10 +-- .../resources/assets/botania/lang/nl_nl.lang | 10 +-- .../resources/assets/botania/lang/pt_br.lang | 10 +-- .../resources/assets/botania/lang/ru_ru.lang | 6 +- .../resources/assets/botania/lang/zh_cn.lang | 10 +-- .../resources/assets/botania/lang/zh_tw.lang | 10 +-- .../assets/botania/recipes/brewery.json | 3 +- .../dragonstone_block_deconstruct.json | 3 +- .../elementium_block_deconstruct.json | 3 +- .../manadiamond_block_deconstruct.json | 3 +- .../manasteel_block_deconstruct.json | 3 +- .../terrasteel_block_deconstruct.json | 3 +- ...{storage_4.json => dragonstone_block.json} | 3 +- .../{storage_2.json => elementium_block.json} | 3 +- ...storage_3.json => mana_diamond_block.json} | 3 +- .../{storage_0.json => manasteel_block.json} | 3 +- .../assets/botania/recipes/spawnerclaw.json | 3 +- .../assets/botania/recipes/terraplate.json | 3 +- .../{storage_1.json => terrasteel_block.json} | 3 +- 44 files changed, 156 insertions(+), 211 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/StorageVariant.java delete mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java create mode 100644 src/main/resources/assets/botania/blockstates/dragonstone_block.json create mode 100644 src/main/resources/assets/botania/blockstates/elementium_block.json create mode 100644 src/main/resources/assets/botania/blockstates/mana_diamond_block.json create mode 100644 src/main/resources/assets/botania/blockstates/manasteel_block.json delete mode 100644 src/main/resources/assets/botania/blockstates/storage.json create mode 100644 src/main/resources/assets/botania/blockstates/terrasteel_block.json rename src/main/resources/assets/botania/recipes/{storage_4.json => dragonstone_block.json} (79%) rename src/main/resources/assets/botania/recipes/{storage_2.json => elementium_block.json} (79%) rename src/main/resources/assets/botania/recipes/{storage_3.json => mana_diamond_block.json} (78%) rename src/main/resources/assets/botania/recipes/{storage_0.json => manasteel_block.json} (78%) rename src/main/resources/assets/botania/recipes/{storage_1.json => terrasteel_block.json} (78%) diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index 2b6638199..32cca268e 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -4,4 +4,11 @@ botania:altgrass[variant={dry, golden, vivid, scorched, infused, mutated}] => botania:vivid_grass => botania:scorched_grass => botania:infused_grass -=> botania:mutated_grass \ No newline at end of file +=> botania:mutated_grass + +botania:storage[variant={manasteel, terrasteel, elementium, mana_diamond, terrasteel}] +=> botania:manasteel_block +=> botania:terrasteel_block +=> botania:elementium_block +=> botania:mana_diamond_block +=> botania:terrasteel_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 c57ad62d2..b5368475f 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -37,7 +37,6 @@ import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.api.state.enums.SpreaderVariant; -import vazkii.botania.api.state.enums.StorageVariant; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -172,9 +171,6 @@ public final class BotaniaStateProps { // BlockSpreader public static final PropertyEnum SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class); - // BlockStorage - public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); - private BotaniaStateProps() { } diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java deleted file mode 100644 index 6626730d4..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ /dev/null @@ -1,27 +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 StorageVariant implements IStringSerializable { - MANASTEEL, - TERRASTEEL, - ELEMENTIUM, - MANA_DIAMOND, - DRAGONSTONE; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 691433f19..bfa08abe6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -12,66 +12,37 @@ 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.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.annotation.Nonnull; +import java.util.Locale; -public class BlockStorage extends BlockMod implements ILexiconable { +public class BlockStorage extends BlockMod implements IElvenItem, ILexiconable { - public BlockStorage() { - super(Material.IRON, LibBlockNames.STORAGE); + public enum Variant { + MANASTEEL, + TERRASTEEL, + ELEMENTIUM, + MANA_DIAMOND, + DRAGONSTONE + } + + private final Variant variant; + + public BlockStorage(Variant v) { + super(Material.IRON, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.STORAGE_SUFFIX); setHardness(3F); setResistance(10F); setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= StorageVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); - } - - @Override - public void getSubBlocks(CreativeTabs par2, NonNullList par3) { - for(int i = 0; i < StorageVariant.values().length; i++) - par3.add(new ItemStack(this, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); + this.variant = v; } @Override @@ -81,14 +52,11 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - StorageVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.STORAGE_VARIANT); - return variant == StorageVariant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; + return variant == Variant.MANASTEEL ? LexiconData.pool : LexiconData.terrasteel; } - @SideOnly(Side.CLIENT) @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, StorageVariant.values().length); + public boolean isElvenItem(ItemStack stack) { + return variant == Variant.ELEMENTIUM; } - } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 621403ba2..5a01ff1dd 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -118,7 +118,6 @@ import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; @@ -146,7 +145,11 @@ public final class ModBlocks { public static final Block alchemyCatalyst = new BlockAlchemyCatalyst(); public static final Block openCrate = new BlockOpenCrate(); public static final Block forestEye = new BlockForestEye(); - public static final Block storage = new BlockStorage(); + public static final Block manasteelBlock = new BlockStorage(BlockStorage.Variant.MANASTEEL); + public static final Block terrasteelBlock = new BlockStorage(BlockStorage.Variant.TERRASTEEL); + public static final Block elementiumBlock = new BlockStorage(BlockStorage.Variant.ELEMENTIUM); + public static final Block manaDiamondBlock = new BlockStorage(BlockStorage.Variant.MANA_DIAMOND); + public static final Block dragonstoneBlock = new BlockStorage(BlockStorage.Variant.DRAGONSTONE); public static final Block forestDrum = new BlockForestDrum(); public static final Block shinyFlower = new BlockShinyFlower(); public static final Block platform = new BlockPlatform(); @@ -239,7 +242,11 @@ public final class ModBlocks { r.register(alchemyCatalyst); r.register(openCrate); r.register(forestEye); - r.register(storage); + r.register(manasteelBlock); + r.register(terrasteelBlock); + r.register(elementiumBlock); + r.register(manaDiamondBlock); + r.register(dragonstoneBlock); r.register(forestDrum); r.register(shinyFlower); r.register(platform); @@ -335,7 +342,11 @@ public final class ModBlocks { r.register(new ItemBlockMod(alchemyCatalyst).setRegistryName(alchemyCatalyst.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(openCrate).setRegistryName(openCrate.getRegistryName())); r.register(new ItemBlockMod(forestEye).setRegistryName(forestEye.getRegistryName())); - r.register(new ItemBlockStorage(storage).setRegistryName(storage.getRegistryName())); + r.register(new ItemBlockMod(manasteelBlock).setRegistryName(manasteelBlock.getRegistryName())); + r.register(new ItemBlockMod(terrasteelBlock).setRegistryName(terrasteelBlock.getRegistryName())); + r.register(new ItemBlockElven(elementiumBlock).setRegistryName(elementiumBlock.getRegistryName())); + r.register(new ItemBlockMod(manaDiamondBlock).setRegistryName(manaDiamondBlock.getRegistryName())); + r.register(new ItemBlockMod(dragonstoneBlock).setRegistryName(dragonstoneBlock.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(forestDrum).setRegistryName(forestDrum.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(shinyFlower).setRegistryName(shinyFlower.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(platform).setRegistryName(platform.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 6d272ccbf..b75616c07 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -30,7 +30,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; @@ -84,7 +83,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl d0 = 2.5D; } int i = (int)(150.0D * d0); - world.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); + world.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(ModBlocks.elementiumBlock.getDefaultState())); return true; } @@ -101,7 +100,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl double d0 = pos.getX() + (j + 0.5D) / i; double d1 = pos.getY() + (k + 0.5D) / i; double d2 = pos.getZ() + (l + 0.5D) / i; - effectRenderer.addEffect(factory.createParticle(-1, world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); + effectRenderer.addEffect(factory.createParticle(-1, world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D, Block.getStateId(ModBlocks.elementiumBlock.getDefaultState()))); } } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index fd071a100..c243ad3b3 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -87,7 +87,11 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.pebble); addItem(ModItems.manaweaveCloth); addItem(ModItems.manaPowder); - addBlock(ModBlocks.storage); + addBlock(ModBlocks.manasteelBlock); + addBlock(ModBlocks.terrasteelBlock); + addBlock(ModBlocks.elementiumBlock); + addBlock(ModBlocks.manaDiamondBlock); + addBlock(ModBlocks.dragonstoneBlock); addItem(ModItems.manaCookie); addItem(ModItems.runeWater); addItem(ModItems.runeFire); diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index 34682123d..ea993cba5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -26,12 +26,12 @@ public class ModElvenTradeRecipes { elementiumRecipes = new ArrayList<>(); elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elementium), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL)); - elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ModBlocks.storage), new ItemStack(ModBlocks.storage))); + elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elementiumBlock), new ItemStack(ModBlocks.manasteelBlock), new ItemStack(ModBlocks.manasteelBlock))); pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.pixieDust), LibOreDict.MANA_PEARL); dragonstoneRecipes = new ArrayList<>(); dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), LibOreDict.MANA_DIAMOND)); - dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3))); + dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dragonstoneBlock), new ItemStack(ModBlocks.manaDiamondBlock))); elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elfQuartz), new ItemStack(Items.QUARTZ)); alfglassRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elfGlass), new ItemStack(ModBlocks.manaGlass)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index b427e034a..5ee6a5083 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -46,13 +46,13 @@ public final class ModManaInfusionRecipes { public static void init() { manasteelRecipes = new ArrayList<>(); manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaSteel), "ingotIron", 3000)); - manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 0), new ItemStack(Blocks.IRON_BLOCK), 27000)); + manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manasteelBlock), new ItemStack(Blocks.IRON_BLOCK), 27000)); manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPearl), new ItemStack(Items.ENDER_PEARL), 6000); manaDiamondRecipes = new ArrayList<>(); manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaDiamond), "gemDiamond", 10000)); - manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.DIAMOND_BLOCK), 90000)); + manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaDiamondBlock), new ItemStack(Blocks.DIAMOND_BLOCK), 90000)); manaPowderRecipes = new ArrayList<>(); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.GUNPOWDER), 500)); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 0dca276bd..43f5bf606 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -136,6 +136,16 @@ public class FlattenItems implements IFixableData { case 5: return ModBlocks.mutatedGrass.getRegistryName().toString(); } }); + LOOKUP.put("botania:storage", i -> { + switch (i) { + default: + case 0: return ModBlocks.manasteelBlock.getRegistryName().toString(); + case 1: return ModBlocks.terrasteelBlock.getRegistryName().toString(); + case 2: return ModBlocks.elementiumBlock.getRegistryName().toString(); + case 3: return ModBlocks.manaDiamondBlock.getRegistryName().toString(); + case 4: return ModBlocks.dragonstoneBlock.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java deleted file mode 100644 index eacb3600e..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockStorage.java +++ /dev/null @@ -1,27 +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 @ [Jun 22, 2014, 1:04:55 AM (GMT)] - */ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.recipe.IElvenItem; - -public class ItemBlockStorage extends ItemBlockWithMetadataAndName implements IElvenItem { - - public ItemBlockStorage(Block block) { - super(block); - } - - @Override - public boolean isElvenItem(ItemStack stack) { - return stack.getItemDamage() == 2; - } -} diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index bef004551..08b6a8cf2 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -35,6 +35,7 @@ import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +// todo 1.13 further break this up @Mod.EventBusSubscriber public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { public ItemManaResource(String registryName) { diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 9aa5887a1..b2346254a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -32,7 +32,7 @@ public final class LibBlockNames { public static final String OPEN_CRATE = "openCrate"; public static final String CRAFT_CRATE = "craftCrate"; public static final String FOREST_EYE = "forestEye"; - public static final String STORAGE = "storage"; + public static final String STORAGE_SUFFIX = "_block"; public static final String FOREST_DRUM = "forestDrum"; public static final String SHINY_FLOWER = "shinyFlower"; public static final String PLATFORM = "platform"; diff --git a/src/main/resources/assets/botania/blockstates/dragonstone_block.json b/src/main/resources/assets/botania/blockstates/dragonstone_block.json new file mode 100644 index 000000000..e4f58cc57 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dragonstone_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:dragonstone_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elementium_block.json b/src/main/resources/assets/botania/blockstates/elementium_block.json new file mode 100644 index 000000000..576205b10 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elementium_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:elementium_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mana_diamond_block.json b/src/main/resources/assets/botania/blockstates/mana_diamond_block.json new file mode 100644 index 000000000..ebadd6a36 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mana_diamond_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:mana_diamond_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manasteel_block.json b/src/main/resources/assets/botania/blockstates/manasteel_block.json new file mode 100644 index 000000000..2dc2e11a0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manasteel_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:manasteel_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json deleted file mode 100644 index 416692109..000000000 --- a/src/main/resources/assets/botania/blockstates/storage.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "variant=manasteel": { "model": "botania:manasteel_block" }, - "variant=terrasteel": { "model": "botania:terrasteel_block" }, - "variant=elementium": { "model": "botania:elementium_block" }, - "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, - "variant=dragonstone": { "model": "botania:dragonstone_block" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/terrasteel_block.json b/src/main/resources/assets/botania/blockstates/terrasteel_block.json new file mode 100644 index 000000000..16aecb0b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/terrasteel_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "botania:terrasteel_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 4249c5fd8..278b291ce 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -163,8 +163,8 @@ tile.botania:tinyPlanetBlock.name=Winziger Planet tile.botania:alchemyCatalyst.name=Alchemiekatalysator tile.botania:openCrate.name=Offene Kiste tile.botania:forestEye.name=Auge der Ältesten -tile.botania:storage0.name=Manastahlblock -tile.botania:storage1.name=Terrastahlblock +tile.botania:manasteel_block.name=Manastahlblock +tile.botania:terrasteel_block.name=Terrastahlblock tile.botania:forestDrum.name=Trommel der Wildnis tile.botania:shinyFlower0.name=Schimmernde Weiße Blume tile.botania:shinyFlower1.name=Schimmernde Orange Blume diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index f55d3c8d7..3d7cb1dbe 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -715,11 +715,11 @@ tile.botania:alchemyCatalyst.name=Alchemy Catalyst tile.botania:openCrate0.name=Open Crate tile.botania:openCrate1.name=Crafty Crate tile.botania:forestEye.name=Eye of the Ancients -tile.botania:storage0.name=Block of Manasteel -tile.botania:storage1.name=Block of Terrasteel -tile.botania:storage2.name=Block of Elementium -tile.botania:storage3.name=Block of Mana Diamond -tile.botania:storage4.name=Block of Dragonstone +tile.botania:manasteel_block.name=Block of Manasteel +tile.botania:terrasteel_block.name=Block of Terrasteel +tile.botania:elementium_block.name=Block of Elementium +tile.botania:mana_diamond_block.name=Block of Mana Diamond +tile.botania:dragonstone_block.name=Block of Dragonstone tile.botania:forestDrum0.name=Drum of the Wild tile.botania:forestDrum1.name=Drum of the Gathering tile.botania:forestDrum2.name=Drum of the Canopy diff --git a/src/main/resources/assets/botania/lang/es_ar.lang b/src/main/resources/assets/botania/lang/es_ar.lang index d2c235181..0c2feb189 100644 --- a/src/main/resources/assets/botania/lang/es_ar.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -224,6 +224,6 @@ tile.botania:enchanter.name=Encantador de Maná tile.botania:turntable.name=Spreader Turntable tile.botania:tinyPlanetBlock.name=Planeta Diminuto tile.botania:alchemyCatalyst.name=Catalizador Alquímico -tile.botania:storage0.name=Bloque de Acero de Maná -tile.botania:storage1.name=Bloque de Acero de la Tierra -tile.botania:storage2.name=Bloque de Elementium \ No newline at end of file +tile.botania:manasteel_block.name=Bloque de Acero de Maná +tile.botania:terrasteel_block.name=Bloque de Acero de la Tierra +tile.botania:elementium_block.name=Bloque de Elementium \ No newline at end of file diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 0604002e5..4ec8a0cac 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -575,11 +575,11 @@ tile.botania:alchemyCatalyst.name=Catalizador alquímico tile.botania:openCrate0.name=Caja abierta tile.botania:openCrate1.name=Caja de trabajo tile.botania:forestEye.name=Ojo de los Antiguos -tile.botania:storage0.name=Bloque de manacero -tile.botania:storage1.name=Bloque de terracero -tile.botania:storage2.name=Bloque de elementio -tile.botania:storage3.name=Bloque de diamante de maná -tile.botania:storage4.name=Bloque de piedra de dragón +tile.botania:manasteel_block.name=Bloque de manacero +tile.botania:terrasteel_block.name=Bloque de terracero +tile.botania:elementium_block.name=Bloque de elementio +tile.botania:mana_diamond_block.name=Bloque de diamante de maná +tile.botania:dragonstone_block.name=Bloque de piedra de dragón tile.botania:forestDrum0.name=Tambor de lo salvaje tile.botania:forestDrum1.name=Tambor de la recolección tile.botania:forestDrum2.name=Tambor del follaje diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 03c7ab877..55321059e 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -501,11 +501,11 @@ tile.botania:alchemyCatalyst.name=Catalyseur alchimique tile.botania:openCrate0.name=Caisse ouverte tile.botania:openCrate1.name=Caisse astucieuse tile.botania:forestEye.name=Oeil des anciens -tile.botania:storage0.name=Bloc de manacier -tile.botania:storage1.name=Bloc de terracier -tile.botania:storage2.name=Bloc d'élémentium -tile.botania:storage3.name=Bloc de mana diamant -tile.botania:storage4.name=Bloc de dragonite +tile.botania:manasteel_block.name=Bloc de manacier +tile.botania:terrasteel_block.name=Bloc de terracier +tile.botania:elementium_block.name=Bloc d'élémentium +tile.botania:mana_diamond_block.name=Bloc de mana diamant +tile.botania:dragonstone_block.name=Bloc de dragonite tile.botania:forestDrum0.name=Tambour sauvage tile.botania:forestDrum1.name=Tambour de récolte tile.botania:forestDrum2.name=Tambour de la canopée diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 53cf8ec26..2679abdc9 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -492,11 +492,11 @@ tile.botania:alchemyCatalyst.name=錬金術の触媒 tile.botania:openCrate0.name=開けた木箱 tile.botania:openCrate1.name=クラフト木箱 tile.botania:forestEye.name=古代人の目 -tile.botania:storage0.name=マナスチールブロック -tile.botania:storage1.name=テラスチールブロック -tile.botania:storage2.name=エレメンチウムブロック -tile.botania:storage3.name=マナダイヤモンドブロック -tile.botania:storage4.name=ドラゴンストーンブロック +tile.botania:manasteel_block.name=マナスチールブロック +tile.botania:terrasteel_block.name=テラスチールブロック +tile.botania:elementium_block.name=エレメンチウムブロック +tile.botania:mana_diamond_block.name=マナダイヤモンドブロック +tile.botania:dragonstone_block.name=ドラゴンストーンブロック tile.botania:forestDrum0.name=野生のドラム tile.botania:forestDrum1.name=収集のドラム tile.botania:forestDrum2.name=天蓋のドラム diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index b65049ce2..c3f34bcd3 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -540,11 +540,11 @@ tile.botania:alchemyCatalyst.name=연금술 촉매 tile.botania:openCrate0.name=오픈 그레이트 tile.botania:openCrate1.name=제작 그레이트 tile.botania:forestEye.name=고대인의 눈 -tile.botania:storage0.name=마나 합금 블럭 -tile.botania:storage1.name=테라스틸 블럭 -tile.botania:storage2.name=엘레멘티움 블럭 -tile.botania:storage3.name=마나 다이아몬드 블럭 -tile.botania:storage4.name=드래곤스톤 블럭 +tile.botania:manasteel_block.name=마나 합금 블럭 +tile.botania:terrasteel_block.name=테라스틸 블럭 +tile.botania:elementium_block.name=엘레멘티움 블럭 +tile.botania:mana_diamond_block.name=마나 다이아몬드 블럭 +tile.botania:dragonstone_block.name=드래곤스톤 블럭 tile.botania:forestDrum0.name=야생의 드럼 tile.botania:forestDrum1.name=수집의 드럼 tile.botania:forestDrum2.name=캐너피 드럼 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 8069e2fdf..2fadf1157 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -565,11 +565,11 @@ tile.botania:alchemyCatalyst.name=Chemieversneller tile.botania:openCrate0.name=Open Krat tile.botania:openCrate1.name=Handige Kist tile.botania:forestEye.name=Oog der Ouden -tile.botania:storage0.name=Blok Manastaal -tile.botania:storage1.name=Blok Terrastaal -tile.botania:storage2.name=Blok Elementium -tile.botania:storage3.name=Blok Mana Diamant -tile.botania:storage4.name=Blok Drakensteen +tile.botania:manasteel_block.name=Blok Manastaal +tile.botania:terrasteel_block.name=Blok Terrastaal +tile.botania:elementium_block.name=Blok Elementium +tile.botania:mana_diamond_block.name=Blok Mana Diamant +tile.botania:dragonstone_block.name=Blok Drakensteen tile.botania:forestDrum0.name=Drum van het Wild tile.botania:forestDrum1.name=Drum der Verzameling tile.botania:forestDrum2.name=Drum van de Troonhemel diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index a7599bd47..0f2d3e14e 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -708,11 +708,11 @@ tile.botania:alchemyCatalyst.name=Catalisador Alquímico tile.botania:openCrate0.name=Caixote Aberto tile.botania:openCrate1.name=Caixote Inteligente tile.botania:forestEye.name=Olho dos Ancestrais -tile.botania:storage0.name=Bloco de Manasteel -tile.botania:storage1.name=Bloco de Terrasteel -tile.botania:storage2.name=Bloco de Elementium -tile.botania:storage3.name=Bloco de Diamante de Mana -tile.botania:storage4.name=Bloco of Pedra Draconiana +tile.botania:manasteel_block.name=Bloco de Manasteel +tile.botania:terrasteel_block.name=Bloco de Terrasteel +tile.botania:elementium_block.name=Bloco de Elementium +tile.botania:mana_diamond_block.name=Bloco de Diamante de Mana +tile.botania:dragonstone_block.name=Bloco of Pedra Draconiana tile.botania:forestDrum0.name=Tambor da Vida Selvagem tile.botania:forestDrum1.name=Tambor da União tile.botania:forestDrum2.name=Tambor do Toldo diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 5ec49bccb..9a0ae6887 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -318,9 +318,9 @@ tile.botania:alchemyCatalyst.name=Алхимический катализато tile.botania:openCrate0.name=Открытый ящик tile.botania:openCrate1.name=Сборочный ящик tile.botania:forestEye.name=Глаз древних -tile.botania:storage0.name=Блок манастали -tile.botania:storage1.name=Блок террастали -tile.botania:storage2.name=Блок элементия +tile.botania:manasteel_block.name=Блок манастали +tile.botania:terrasteel_block.name=Блок террастали +tile.botania:elementium_block.name=Блок элементия tile.botania:forestDrum0.name=Барабан дикой природы tile.botania:forestDrum1.name=Барабан сбора tile.botania:shinyFlower0.name=Светящийся белый цветок diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index d5a297838..e4050ae72 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -715,11 +715,11 @@ tile.botania:alchemyCatalyst.name=炼金催化器 tile.botania:openCrate0.name=花格箱 tile.botania:openCrate1.name=机巧箱 tile.botania:forestEye.name=远古之眼 -tile.botania:storage0.name=魔力钢块 -tile.botania:storage1.name=泰拉钢块 -tile.botania:storage2.name=源质钢块 -tile.botania:storage3.name=魔力钻石块 -tile.botania:storage4.name=龙石块 +tile.botania:manasteel_block.name=魔力钢块 +tile.botania:terrasteel_block.name=泰拉钢块 +tile.botania:elementium_block.name=源质钢块 +tile.botania:mana_diamond_block.name=魔力钻石块 +tile.botania:dragonstone_block.name=龙石块 tile.botania:forestDrum0.name=狂野之鼓 tile.botania:forestDrum1.name=收集之鼓 tile.botania:forestDrum2.name=林冠之鼓 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index bdacf20fc..306c38be5 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -672,11 +672,11 @@ tile.botania:alchemyCatalyst.name=煉金催化器 tile.botania:openCrate0.name=花格箱 tile.botania:openCrate1.name=機巧箱 tile.botania:forestEye.name=遠古之眼 -tile.botania:storage0.name=瑪那鋼塊 -tile.botania:storage1.name=泰拉鋼塊 -tile.botania:storage2.name=源質鋼塊 -tile.botania:storage3.name=瑪那鑽石塊 -tile.botania:storage4.name=龍石塊 +tile.botania:manasteel_block.name=瑪那鋼塊 +tile.botania:terrasteel_block.name=泰拉鋼塊 +tile.botania:elementium_block.name=源質鋼塊 +tile.botania:mana_diamond_block.name=瑪那鑽石塊 +tile.botania:dragonstone_block.name=龍石塊 tile.botania:forestDrum0.name=狂野之鼓 tile.botania:forestDrum1.name=收集之鼓 tile.botania:forestDrum2.name=林冠之鼓 diff --git a/src/main/resources/assets/botania/recipes/brewery.json b/src/main/resources/assets/botania/recipes/brewery.json index 41761110e..8a6c236f7 100644 --- a/src/main/resources/assets/botania/recipes/brewery.json +++ b/src/main/resources/assets/botania/recipes/brewery.json @@ -19,8 +19,7 @@ "item": "minecraft:brewing_stand" }, "M": { - "item": "botania:storage", - "data": 0 + "item": "botania:manasteel_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/conversions/dragonstone_block_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/dragonstone_block_deconstruct.json index 787e171ec..c55f8c045 100644 --- a/src/main/resources/assets/botania/recipes/conversions/dragonstone_block_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/dragonstone_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:storage", - "data": 4 + "item": "botania:dragonstone_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json index 9446e1298..d792f8e4e 100644 --- a/src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:storage", - "data": 2 + "item": "botania:elementium_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/manadiamond_block_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/manadiamond_block_deconstruct.json index f3b1a65bd..a99f31d64 100644 --- a/src/main/resources/assets/botania/recipes/conversions/manadiamond_block_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/manadiamond_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:storage", - "data": 3 + "item": "botania:mana_diamond_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json index 20e7ff842..2fc7bb09a 100644 --- a/src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:storage", - "data": 0 + "item": "botania:manasteel_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json index bc753a5d9..a5b88a6e7 100644 --- a/src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json @@ -5,8 +5,7 @@ }, "ingredients": [ { - "item": "botania:storage", - "data": 1 + "item": "botania:terrasteel_block" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/storage_4.json b/src/main/resources/assets/botania/recipes/dragonstone_block.json similarity index 79% rename from src/main/resources/assets/botania/recipes/storage_4.json rename to src/main/resources/assets/botania/recipes/dragonstone_block.json index d1156dfed..bdf69f978 100644 --- a/src/main/resources/assets/botania/recipes/storage_4.json +++ b/src/main/resources/assets/botania/recipes/dragonstone_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:storage", - "data": 4 + "item": "botania:dragonstone_block" }, "pattern": [ "III", diff --git a/src/main/resources/assets/botania/recipes/storage_2.json b/src/main/resources/assets/botania/recipes/elementium_block.json similarity index 79% rename from src/main/resources/assets/botania/recipes/storage_2.json rename to src/main/resources/assets/botania/recipes/elementium_block.json index 8fba96301..9d617d31f 100644 --- a/src/main/resources/assets/botania/recipes/storage_2.json +++ b/src/main/resources/assets/botania/recipes/elementium_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:storage", - "data": 2 + "item": "botania:elementium_block" }, "pattern": [ "III", diff --git a/src/main/resources/assets/botania/recipes/storage_3.json b/src/main/resources/assets/botania/recipes/mana_diamond_block.json similarity index 78% rename from src/main/resources/assets/botania/recipes/storage_3.json rename to src/main/resources/assets/botania/recipes/mana_diamond_block.json index 19e00e21c..69b9ff754 100644 --- a/src/main/resources/assets/botania/recipes/storage_3.json +++ b/src/main/resources/assets/botania/recipes/mana_diamond_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:storage", - "data": 3 + "item": "botania:mana_diamond_block" }, "pattern": [ "III", diff --git a/src/main/resources/assets/botania/recipes/storage_0.json b/src/main/resources/assets/botania/recipes/manasteel_block.json similarity index 78% rename from src/main/resources/assets/botania/recipes/storage_0.json rename to src/main/resources/assets/botania/recipes/manasteel_block.json index 7fa812f70..17dc97495 100644 --- a/src/main/resources/assets/botania/recipes/storage_0.json +++ b/src/main/resources/assets/botania/recipes/manasteel_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:storage", - "data": 0 + "item": "botania:manasteel_block" }, "pattern": [ "III", diff --git a/src/main/resources/assets/botania/recipes/spawnerclaw.json b/src/main/resources/assets/botania/recipes/spawnerclaw.json index 526142946..94ae7a81e 100644 --- a/src/main/resources/assets/botania/recipes/spawnerclaw.json +++ b/src/main/resources/assets/botania/recipes/spawnerclaw.json @@ -23,8 +23,7 @@ "item": "#BENDERAIRBOTTLE" }, "M": { - "item": "botania:storage", - "data": 0 + "item": "botania:manasteel_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/terraplate.json b/src/main/resources/assets/botania/recipes/terraplate.json index 064d00245..06e1c4a68 100644 --- a/src/main/resources/assets/botania/recipes/terraplate.json +++ b/src/main/resources/assets/botania/recipes/terraplate.json @@ -28,8 +28,7 @@ "item": "#BLOCKLAPIS" }, "M": { - "item": "botania:storage", - "data": 0 + "item": "botania:manasteel_block" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/storage_1.json b/src/main/resources/assets/botania/recipes/terrasteel_block.json similarity index 78% rename from src/main/resources/assets/botania/recipes/storage_1.json rename to src/main/resources/assets/botania/recipes/terrasteel_block.json index 7d6234987..6a1867ecc 100644 --- a/src/main/resources/assets/botania/recipes/storage_1.json +++ b/src/main/resources/assets/botania/recipes/terrasteel_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:storage", - "data": 1 + "item": "botania:terrasteel_block" }, "pattern": [ "III",