Flatten storage blocks

This commit is contained in:
Vincent Lee committed 2018-03-05 11:05:39 -06:00
1 parent 9dfa61c7fa
commit 01e1bf7c59
44 files changed
+156 -211

No files matched your search

@@ -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<SpreaderVariant> SPREADER_VARIANT = PropertyEnum.create("variant", SpreaderVariant.class);
// BlockStorage
public static final PropertyEnum<StorageVariant> STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class);
private BotaniaStateProps() {
}
@@ -1,27 +0,0 @@
/**
* This class was created by <williewillus>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
* <p>
* 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);
}
}
@@ -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<ItemStack> 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;
}
}
@@ -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()));
@@ -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())));
}
}
}
@@ -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);
@@ -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));
@@ -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));
@@ -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
@@ -1,27 +0,0 @@
/**
* This class was created by <Vazkii>. 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;
}
}
@@ -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) {
@@ -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";