diff --git a/block_flattening_notes.txt b/block_flattening_notes.txt index 92d381eca..a5a43de87 100644 --- a/block_flattening_notes.txt +++ b/block_flattening_notes.txt @@ -39,12 +39,19 @@ botania:pylon[variant={mana, natura, gaia}] => botania:mana_pylon => botania:natura_pylon => botania:gaia_pylon +reason: each is a different variant botania:platform[variant={abstruse, spectral, infrangible}] => botania:abstruse_platform => botania:spectral_platform => botania:infrangible_platform +reason: each is a different variant -block:altar[variant={default, forest, plains, mountain, fungal, swamp, desert, taiga, mesa, mossy}] +botania: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 +reason: each is a different variant. mossy moved from actual state read from TE to a real separate block + +botania:opencrate[variant={open, crafty}, pattern={..}] +=> botania:opencrate +=> botania:craftcrate[pattern={..}] +reason: split open and crafty crate. Crafty patterns can stay blockstate properties since a pattern can only be changed by using an item on a existing crate \ 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 e958f00e0..44813b063 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -25,7 +25,6 @@ import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CratePattern; -import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; @@ -129,7 +128,6 @@ public final class BotaniaStateProps { }); // BlockOpenCrate - public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java deleted file mode 100644 index ba2fa8784..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ /dev/null @@ -1,24 +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 CrateVariant implements IStringSerializable { - OPEN, - CRAFTY; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java new file mode 100644 index 000000000..a1db707bf --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -0,0 +1,105 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +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.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.api.wand.IWandHUD; +import vazkii.botania.common.block.tile.TileCraftCrate; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; + +import javax.annotation.Nonnull; + +public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { + + public BlockCraftyCrate() { + super(LibBlockNames.CRAFT_CRATE); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); + } + + @Nonnull + @Override + public BlockStateContainer createBlockState() { + return new BlockStateContainer(this, BotaniaStateProps.CRATE_PATTERN); + } + + @Nonnull + @Override + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + if(te instanceof TileCraftCrate) { + TileCraftCrate tile = (TileCraftCrate) te; + state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, tile.pattern); + } + + return state; + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @Nonnull + @Override + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + return new TileCraftCrate(); + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return LexiconData.craftCrate; + } + + @SideOnly(Side.CLIENT) + @Override + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCraftCrate) { + TileCraftCrate craft = (TileCraftCrate) tile; + + int width = 52; + int height = 52; + int xc = res.getScaledWidth() / 2 + 20; + int yc = res.getScaledHeight() / 2 - height / 2; + + Gui.drawRect(xc - 6, yc - 6, xc + width + 6, yc + height + 6, 0x22000000); + Gui.drawRect(xc - 4, yc - 4, xc + width + 4, yc + height + 4, 0x22000000); + + for(int i = 0; i < 3; i++) + for(int j = 0; j < 3; j++) { + int index = i * 3 + j; + int xp = xc + j * 18; + int yp = yc + i * 18; + + boolean enabled = true; + if(craft.pattern != CratePattern.NONE) + enabled = craft.pattern.openSlots.get(index); + + Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); + + ItemStack item = craft.getItemHandler().getStackInSlot(index); + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); + GlStateManager.enableRescaleNormal(); + mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + } + } + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b0258ac75..bd608ff10 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -12,34 +12,16 @@ 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.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; 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.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.CratePattern; -import vazkii.botania.api.state.enums.CrateVariant; -import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; @@ -48,63 +30,18 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; -public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { +public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable { public BlockOpenCrate() { - super(Material.WOOD, LibBlockNames.OPEN_CRATE); + this(LibBlockNames.OPEN_CRATE); + } + + protected BlockOpenCrate(String name) { + super(Material.WOOD, name); setHardness(2.0F); setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN) - .withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE)); } - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= CrateVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]); - } - - @Nonnull - @Override - public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); - if (te instanceof TileCraftCrate) { - TileCraftCrate tile = (TileCraftCrate) te; - state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, tile.pattern); - } else { - state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); - } - - return state; - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < CrateVariant.values().length; i++) - stacks.add(new ItemStack(this, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override public boolean hasComparatorInputOverride(IBlockState state) { return true; @@ -134,12 +71,12 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Nonnull @Override public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { - return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate(); + return new TileOpenCrate(); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return world.getBlockState(pos).getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? LexiconData.openCrate : LexiconData.craftCrate; + return LexiconData.openCrate; } @Override @@ -148,47 +85,4 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return crate.onWanded(world, player, stack); } - @SideOnly(Side.CLIENT) - @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - if(tile instanceof TileCraftCrate) { - TileCraftCrate craft = (TileCraftCrate) tile; - - int width = 52; - int height = 52; - int xc = res.getScaledWidth() / 2 + 20; - int yc = res.getScaledHeight() / 2 - height / 2; - - Gui.drawRect(xc - 6, yc - 6, xc + width + 6, yc + height + 6, 0x22000000); - Gui.drawRect(xc - 4, yc - 4, xc + width + 4, yc + height + 4, 0x22000000); - - for(int i = 0; i < 3; i++) - for(int j = 0; j < 3; j++) { - int index = i * 3 + j; - int xp = xc + j * 18; - int yp = yc + i * 18; - - boolean enabled = true; - if(craft.pattern != CratePattern.NONE) - enabled = craft.pattern.openSlots.get(index); - - Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); - - ItemStack item = craft.getItemHandler().getStackInSlot(index); - net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); - GlStateManager.enableRescaleNormal(); - mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); - net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - } - } - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, 0, getDefaultState()); - ModelHandler.registerBlockToState(this, 1, getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.CRAFTY)); - } - } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d2a684861..4c82255c5 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -158,6 +158,7 @@ public final class ModBlocks { public static final Block tinyPlanet = new BlockTinyPlanet(); public static final Block alchemyCatalyst = new BlockAlchemyCatalyst(); public static final Block openCrate = new BlockOpenCrate(); + public static final Block craftCrate = new BlockCraftyCrate(); public static final Block forestEye = new BlockForestEye(); public static final Block manasteelBlock = new BlockStorage(BlockStorage.Variant.MANASTEEL); public static final Block terrasteelBlock = new BlockStorage(BlockStorage.Variant.TERRASTEEL); @@ -288,6 +289,7 @@ public final class ModBlocks { r.register(tinyPlanet); r.register(alchemyCatalyst); r.register(openCrate); + r.register(craftCrate); r.register(forestEye); r.register(manasteelBlock); r.register(terrasteelBlock); @@ -420,7 +422,8 @@ public final class ModBlocks { r.register(new ItemBlockMod(turntable).setRegistryName(turntable.getRegistryName())); r.register(new ItemBlockMod(tinyPlanet).setRegistryName(tinyPlanet.getRegistryName())); r.register(new ItemBlockMod(alchemyCatalyst).setRegistryName(alchemyCatalyst.getRegistryName())); - r.register(new ItemBlockWithMetadataAndName(openCrate).setRegistryName(openCrate.getRegistryName())); + r.register(new ItemBlockMod(openCrate).setRegistryName(openCrate.getRegistryName())); + r.register(new ItemBlockMod(craftCrate).setRegistryName(craftCrate.getRegistryName())); r.register(new ItemBlockMod(forestEye).setRegistryName(forestEye.getRegistryName())); r.register(new ItemBlockMod(manasteelBlock).setRegistryName(manasteelBlock.getRegistryName())); r.register(new ItemBlockMod(terrasteelBlock).setRegistryName(terrasteelBlock.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index b4de34254..1862726b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -32,7 +32,7 @@ public class TileOpenCrate extends TileSimpleInventory implements ITickable { return true; if(oldState.getBlock() != ModBlocks.openCrate || newState.getBlock() != ModBlocks.openCrate) return true; - return oldState.getValue(BotaniaStateProps.CRATE_VARIANT) != newState.getValue(BotaniaStateProps.CRATE_VARIANT); + return false; } @Override diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 3a5f6c8d1..86307cc2a 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -184,6 +184,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.livingwood); addBlock(ModBlocks.openCrate); + addBlock(ModBlocks.craftCrate); addItem(ModItems.craftPattern1_1); addItem(ModItems.craftPattern2_2); addItem(ModItems.craftPattern1_2); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 2be733c84..366ac88fd 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -495,7 +495,7 @@ public final class ModCraftingRecipes { recipePylon = ModBlocks.manaPylon.getRegistryName(); recipeTurntable = ModBlocks.turntable.getRegistryName(); recipeAlchemyCatalyst = ModBlocks.alchemyCatalyst.getRegistryName(); - recipeOpenCrate = path("opencrate_0"); + recipeOpenCrate = ModBlocks.openCrate.getRegistryName(); recipeForestEye = ModBlocks.forestEye.getRegistryName(); recipeForestDrum = ModBlocks.wildDrum.getRegistryName(); recipePlatform = ModBlocks.abstrusePlatform.getRegistryName(); @@ -503,7 +503,7 @@ public final class ModCraftingRecipes { recipeSpectralPlatform = ModBlocks.spectralPlatform.getRegistryName(); recipeGatherDrum = ModBlocks.gatheringDrum.getRegistryName(); recipePlaceholder = ModItems.placeholder.getRegistryName(); - recipeCraftCrate = path("opencrate_1"); + recipeCraftCrate = ModBlocks.craftCrate.getRegistryName(); recipesPatterns = allOfGroup("craft_pattern"); recipeBrewery = ModBlocks.brewery.getRegistryName(); recipeVial = ModItems.vial.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 8db7e658b..44009438f 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -192,6 +192,13 @@ public class FlattenItems implements IFixableData { } }); LOOKUP.put("botania:altar", i -> LibMisc.MOD_ID + ":" + LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.values()[i % 10].name().toLowerCase(Locale.ROOT)); + LOOKUP.put("botania:opencrate", i -> { + if(i == 1) { + return ModBlocks.craftCrate.getRegistryName().toString(); + } else { + return ModBlocks.openCrate.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 43155223e..6e6c40a0c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -777,7 +777,7 @@ public final class LexiconData { new PageText("4"), new PageText("7"), new PageImage("5", LibResources.ENTRY_CRAFT_CRATE), new PageCraftingRecipe("6", ModCraftingRecipes.recipeCraftCrate), new PageText("8"), new PageCraftingRecipe("9", ModCraftingRecipes.recipesPatterns)) - .setIcon(new ItemStack(ModBlocks.openCrate, 1, 1)); + .setIcon(new ItemStack(ModBlocks.craftCrate)); brewery = new BasicLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); brewery.setLexiconPages(new PageText("0"), new PageText("1"), diff --git a/src/main/resources/assets/botania/blockstates/craftcrate.json b/src/main/resources/assets/botania/blockstates/craftcrate.json new file mode 100644 index 000000000..d4f452d13 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/craftcrate.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:crate", + "textures": { "bottom": "botania:blocks/crate_crafty_bottom", "side": "botania:blocks/crate_crafty", "particle": "botania:blocks/crate_crafty" } + }, + "variants": { + "pattern": { + "none": {}, + "crafty_1_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/crate_crafty_pattern_8" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/opencrate.json b/src/main/resources/assets/botania/blockstates/opencrate.json index 0027f2451..026ca8d37 100644 --- a/src/main/resources/assets/botania/blockstates/opencrate.json +++ b/src/main/resources/assets/botania/blockstates/opencrate.json @@ -2,24 +2,9 @@ "forge_marker": 1, "defaults": { "model": "botania:crate", - "transform": "forge:default-block" + "textures": { "bottom": "botania:blocks/crate_open_bottom", "side": "botania:blocks/crate_open", "particle": "botania:blocks/crate_open" } }, "variants": { - "pattern": { - "none": {}, - "crafty_1_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_0" } }, - "crafty_2_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_1" } }, - "crafty_1_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_2" } }, - "crafty_2_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_3" } }, - "crafty_1_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_4" } }, - "crafty_3_1": { "textures": { "side": "botania:blocks/crate_crafty_pattern_5" } }, - "crafty_2_3": { "textures": { "side": "botania:blocks/crate_crafty_pattern_6" } }, - "crafty_3_2": { "textures": { "side": "botania:blocks/crate_crafty_pattern_7" } }, - "crafty_donut": { "textures": { "side": "botania:blocks/crate_crafty_pattern_8" } } - }, - "variant": { - "open": { "textures": { "bottom": "botania:blocks/crate_open_bottom", "side": "botania:blocks/crate_open", "particle": "botania:blocks/crate_open" } }, - "crafty": { "textures": { "bottom": "botania:blocks/crate_crafty_bottom", "side": "botania:blocks/crate_crafty", "particle": "botania:blocks/crate_crafty" } } - } + "normal": [{}] } } \ 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 1f3a7d2d9..d51faf873 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -712,8 +712,8 @@ tile.botania:enchanter.name=Mana Enchanter tile.botania:turntable.name=Spreader Turntable tile.botania:tinyPlanetBlock.name=Tiny Planet tile.botania:alchemyCatalyst.name=Alchemy Catalyst -tile.botania:openCrate0.name=Open Crate -tile.botania:openCrate1.name=Crafty Crate +tile.botania:openCrate.name=Open Crate +tile.botania:craftCrate.name=Crafty Crate tile.botania:forestEye.name=Eye of the Ancients tile.botania:manasteel_block.name=Block of Manasteel tile.botania:terrasteel_block.name=Block of Terrasteel diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 5551327a0..37a5662a6 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -572,8 +572,8 @@ tile.botania:enchanter.name=Encantador de maná tile.botania:turntable.name=Girador de esparcidor tile.botania:tinyPlanetBlock.name=Planeta diminuto tile.botania:alchemyCatalyst.name=Catalizador alquímico -tile.botania:openCrate0.name=Caja abierta -tile.botania:openCrate1.name=Caja de trabajo +tile.botania:openCrate.name=Caja abierta +tile.botania:craftCrate.name=Caja de trabajo tile.botania:forestEye.name=Ojo de los Antiguos tile.botania:manasteel_block.name=Bloque de manacero tile.botania:terrasteel_block.name=Bloque de terracero diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 155d6e1fa..42209542b 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -498,8 +498,8 @@ tile.botania:enchanter.name=Enchanteur de mana tile.botania:turntable.name=Plaque tournante de distributeur tile.botania:tinyPlanetBlock.name=Minuscule planète tile.botania:alchemyCatalyst.name=Catalyseur alchimique -tile.botania:openCrate0.name=Caisse ouverte -tile.botania:openCrate1.name=Caisse astucieuse +tile.botania:openCrate.name=Caisse ouverte +tile.botania:craftCrate.name=Caisse astucieuse tile.botania:forestEye.name=Oeil des anciens tile.botania:manasteel_block.name=Bloc de manacier tile.botania:terrasteel_block.name=Bloc de terracier diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 0104141ae..46cc6a621 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -489,8 +489,8 @@ tile.botania:enchanter.name=マナエンチャンター tile.botania:turntable.name=送信機回転台 tile.botania:tinyPlanetBlock.name=小さな惑星 tile.botania:alchemyCatalyst.name=錬金術の触媒 -tile.botania:openCrate0.name=開けた木箱 -tile.botania:openCrate1.name=クラフト木箱 +tile.botania:openCrate.name=開けた木箱 +tile.botania:craftCrate.name=クラフト木箱 tile.botania:forestEye.name=古代人の目 tile.botania:manasteel_block.name=マナスチールブロック tile.botania:terrasteel_block.name=テラスチールブロック diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index d22893818..f42e700fa 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -537,8 +537,8 @@ tile.botania:enchanter.name=마나 인첸트기 tile.botania:turntable.name=회전 공급기 tile.botania:tinyPlanetBlock.name=작은 유성 tile.botania:alchemyCatalyst.name=연금술 촉매 -tile.botania:openCrate0.name=오픈 그레이트 -tile.botania:openCrate1.name=제작 그레이트 +tile.botania:openCrate.name=오픈 그레이트 +tile.botania:craftCrate.name=제작 그레이트 tile.botania:forestEye.name=고대인의 눈 tile.botania:manasteel_block.name=마나 합금 블럭 tile.botania:terrasteel_block.name=테라스틸 블럭 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 922273e20..ebeafac91 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -562,8 +562,8 @@ tile.botania:enchanter.name=Mana Betoveraar tile.botania:turntable.name=Verspreider Draaischijf tile.botania:tinyPlanetBlock.name=Kleine Planeet tile.botania:alchemyCatalyst.name=Chemieversneller -tile.botania:openCrate0.name=Open Krat -tile.botania:openCrate1.name=Handige Kist +tile.botania:openCrate.name=Open Krat +tile.botania:craftCrate.name=Handige Kist tile.botania:forestEye.name=Oog der Ouden tile.botania:manasteel_block.name=Blok Manastaal tile.botania:terrasteel_block.name=Blok Terrastaal diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 79b1d1cf6..5386891f4 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -705,8 +705,8 @@ tile.botania:enchanter.name=Encantador de Mana tile.botania:turntable.name=Rotator do Dispersor tile.botania:tinyPlanetBlock.name=Pequeno Planeta tile.botania:alchemyCatalyst.name=Catalisador Alquímico -tile.botania:openCrate0.name=Caixote Aberto -tile.botania:openCrate1.name=Caixote Inteligente +tile.botania:openCrate.name=Caixote Aberto +tile.botania:craftCrate.name=Caixote Inteligente tile.botania:forestEye.name=Olho dos Ancestrais tile.botania:manasteel_block.name=Bloco de Manasteel tile.botania:terrasteel_block.name=Bloco de Terrasteel diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 57dc24742..d3f131379 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -315,8 +315,8 @@ tile.botania:enchanter.name=Маночарователь tile.botania:turntable.name=Поворотный стол tile.botania:tinyPlanetBlock.name=Микропланета tile.botania:alchemyCatalyst.name=Алхимический катализатор -tile.botania:openCrate0.name=Открытый ящик -tile.botania:openCrate1.name=Сборочный ящик +tile.botania:openCrate.name=Открытый ящик +tile.botania:craftCrate.name=Сборочный ящик tile.botania:forestEye.name=Глаз древних tile.botania:manasteel_block.name=Блок манастали tile.botania:terrasteel_block.name=Блок террастали diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 217c80ddb..10a50f22e 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -712,8 +712,8 @@ tile.botania:enchanter.name=魔力附魔台 tile.botania:turntable.name=发射器旋转台 tile.botania:tinyPlanetBlock.name=魔力环绕器 tile.botania:alchemyCatalyst.name=炼金催化器 -tile.botania:openCrate0.name=花格箱 -tile.botania:openCrate1.name=机巧箱 +tile.botania:openCrate.name=花格箱 +tile.botania:craftCrate.name=机巧箱 tile.botania:forestEye.name=远古之眼 tile.botania:manasteel_block.name=魔力钢块 tile.botania:terrasteel_block.name=泰拉钢块 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 227828e1a..14ddc6734 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -669,8 +669,8 @@ tile.botania:enchanter.name=瑪那附魔台 tile.botania:turntable.name=發射器旋轉台 tile.botania:tinyPlanetBlock.name=瑪那環繞器 tile.botania:alchemyCatalyst.name=煉金催化器 -tile.botania:openCrate0.name=花格箱 -tile.botania:openCrate1.name=機巧箱 +tile.botania:openCrate.name=花格箱 +tile.botania:craftCrate.name=機巧箱 tile.botania:forestEye.name=遠古之眼 tile.botania:manasteel_block.name=瑪那鋼塊 tile.botania:terrasteel_block.name=泰拉鋼塊 diff --git a/src/main/resources/assets/botania/recipes/opencrate_1.json b/src/main/resources/assets/botania/recipes/craftcrate.json similarity index 83% rename from src/main/resources/assets/botania/recipes/opencrate_1.json rename to src/main/resources/assets/botania/recipes/craftcrate.json index f183e2ab8..ea0052f09 100644 --- a/src/main/resources/assets/botania/recipes/opencrate_1.json +++ b/src/main/resources/assets/botania/recipes/craftcrate.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:opencrate", - "data": 1 + "item": "botania:craftcrate" }, "pattern": [ "WCW", diff --git a/src/main/resources/assets/botania/recipes/opencrate_0.json b/src/main/resources/assets/botania/recipes/opencrate.json similarity index 80% rename from src/main/resources/assets/botania/recipes/opencrate_0.json rename to src/main/resources/assets/botania/recipes/opencrate.json index b98701ee0..74a3cc2cd 100644 --- a/src/main/resources/assets/botania/recipes/opencrate_0.json +++ b/src/main/resources/assets/botania/recipes/opencrate.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:opencrate", - "data": 0 + "item": "botania:opencrate" }, "pattern": [ "WWW",