From d21df2aa21809de0524387c8ce0c2e3167cf813d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Sep 2017 15:38:52 -0500 Subject: [PATCH] Fix world-compatibility for new azulejos --- .../botania/api/state/enums/CustomBrickVariant.java | 11 +++++++---- .../botania/common/block/decor/BlockCustomBrick.java | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index 14c3e31da..d3ef2e03a 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -13,7 +13,13 @@ import net.minecraft.util.IStringSerializable; import java.util.Locale; public enum CustomBrickVariant implements IStringSerializable { + /* Azulejos 0, 13, 14, and 15 replaced the old bricks + They are here at the top because putting them at the bottom while deleting the bricks + would shift the variants of azulejos in older worlds.*/ AZULEJO_0, + AZULEJO_13, + AZULEJO_14, + AZULEJO_15, AZULEJO_1, AZULEJO_2, AZULEJO_3, @@ -25,10 +31,7 @@ public enum CustomBrickVariant implements IStringSerializable { AZULEJO_9, AZULEJO_10, AZULEJO_11, - AZULEJO_12, - AZULEJO_13, - AZULEJO_14, - AZULEJO_15; + AZULEJO_12; @Override public String getName() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index dcc3a3a0b..ee6bc9a99 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -83,8 +83,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - CustomBrickVariant variant = world.getBlockState(pos).getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT); - return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; + return LexiconData.azulejo; } @SideOnly(Side.CLIENT)