COrrect Crafty crate models

This commit is contained in:
Vincent Lee committed 2016-01-09 21:01:50 -06:00
1 parent a6899a9f40
commit 14a7f6b14b
6 files changed
+82 -20

No files matched your search

@@ -139,6 +139,7 @@ public class BotaniaStateProps {
// BlockOpenCrate
public static final PropertyEnum<CrateVariant> CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class);
public static final PropertyEnum<CratePattern> CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class);
// BlockPavement
public static final PropertyEnum<EnumDyeColor> PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate<EnumDyeColor>() {
@@ -0,0 +1,31 @@
/**
* 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
*
* 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 CratePattern implements IStringSerializable {
NONE,
CRAFTY_1_1,
CRAFTY_2_2,
CRAFTY_1_2,
CRAFTY_2_1,
CRAFTY_1_3,
CRAFTY_3_1,
CRAFTY_2_3,
CRAFTY_3_2,
CRAFTY_DONUT;
@Override
public String getName() {
return name().toLowerCase(Locale.ROOT);
}
}
@@ -430,7 +430,7 @@ public final class ModelHandler {
registerItemModel(ModBlocks.manaFlame);
registerItemModel(ModBlocks.incensePlate);
// Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler
// Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons
registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length);
registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length);
@@ -450,7 +450,7 @@ public final class ModelHandler {
registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant");
registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "pattern=none,variant");
registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant");
registerVariantsDefaulted(ModBlocks.platform, PlatformVariant.class, "variant");
@@ -41,6 +41,7 @@ import org.lwjgl.opengl.GL12;
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;
@@ -62,13 +63,15 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
setHardness(2.0F);
setStepSound(soundTypeWood);
setUnlocalizedName(LibBlockNames.OPEN_CRATE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN));
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)
.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE));
random = new Random();
}
@Override
public BlockState createBlockState() {
return new BlockState(this, BotaniaStateProps.CRATE_VARIANT);
return new BlockState(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN);
}
@Override
@@ -78,12 +81,24 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta > CrateVariant.values().length) {
if (meta >= CrateVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.values()[meta]);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
if (world.getTileEntity(pos) instanceof TileCraftCrate) {
TileCraftCrate tile = ((TileCraftCrate) world.getTileEntity(pos));
state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]);
} else {
state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE);
}
return state;
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;