diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 4d96a6a68..89f93cca4 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -139,6 +139,7 @@ public 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 public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java new file mode 100644 index 000000000..2cbf2a8f8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -0,0 +1,31 @@ +/** + * 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 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); + } +} diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index d6dad5ae5..ca5583f87 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -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"); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index c6dcfb424..8bf6e2463 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -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; diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json index 4e13284f2..35e3f6aae 100644 --- a/src/main/resources/assets/botania/blockstates/openCrate.json +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -1,23 +1,26 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "botania:cube_bottom_other", "transform": "forge:default-block" }, "variants": { - "variant=open": [{ - "textures": { - "bottom": "botania:blocks/openCrate1", - "side": "botania:blocks/openCrate0", - "top": "botania:blocks/openCrate0" - } - }], - "variant=crafty": [{ - "textures": { - "bottom": "botania:blocks/openCrate3", - "side": "botania:blocks/openCrate2", - "top": "botania:blocks/openCrate2" - } - }] + "pattern": { + "none": {}, + "crafty_1_1": { "textures": { "other": "botania:blocks/ocPattern0" } }, + "crafty_2_2": { "textures": { "other": "botania:blocks/ocPattern1" } }, + "crafty_1_2": { "textures": { "other": "botania:blocks/ocPattern2" } }, + "crafty_2_1": { "textures": { "other": "botania:blocks/ocPattern3" } }, + "crafty_1_3": { "textures": { "other": "botania:blocks/ocPattern4" } }, + "crafty_3_1": { "textures": { "other": "botania:blocks/ocPattern5" } }, + "crafty_2_3": { "textures": { "other": "botania:blocks/ocPattern6" } }, + "crafty_3_2": { "textures": { "other": "botania:blocks/ocPattern7" } }, + "crafty_donut": { "textures": { "other": "botania:blocks/ocPattern8" } } + }, + "variant": { + "open": { "textures": { "bottom": "botania:blocks/openCrate1", "other": "botania:blocks/openCrate0" } }, + "crafty": { "textures": { "bottom": "botania:blocks/openCrate3", "other": "botania:blocks/openCrate2" } } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cube_bottom_other.json b/src/main/resources/assets/botania/models/block/cube_bottom_other.json new file mode 100644 index 000000000..8c2629967 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/cube_bottom_other.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "#bottom", + "up": "#other", + "north": "#other", + "south": "#other", + "west": "#other", + "east": "#other", + "particle": "#other" + } +} \ No newline at end of file