From 947a225d23c1a840438254bf933f91033739d797 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 20:55:04 -0500 Subject: [PATCH] TIL you don't set default values for unlisted properties --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 9 +++------ .../botania/common/block/BlockFloatingSpecialFlower.java | 5 +---- .../java/vazkii/botania/common/block/BlockPlatform.java | 6 +----- .../vazkii/botania/common/block/BlockSpecialFlower.java | 5 ++--- .../common/block/corporea/BlockCorporeaCrystalCube.java | 2 +- .../botania/common/block/decor/BlockFloatingFlower.java | 4 +--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 42fd26156..325d0bfa2 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -210,16 +210,13 @@ public class SpecialFlowerModel implements IModelCustomData { public List getQuads(IBlockState state, EnumFacing face, long rand) { if(state.getBlock() != ModBlocks.specialFlower) return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); - Botania.LOGGER.info("Getting " + (face == null ? "gen" : face.getName()) + " quads"); IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); IBakedModel ret = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); - if(subtileId != null) { // Todo remove - workaround for subtile ID being null? - Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if(specialModel.isPresent()) - ret = specialModel.get(); - } + Optional specialModel = bakedBlockModels.getUnchecked(subtileId); + if(specialModel.isPresent()) + ret = specialModel.get(); return ret.getQuads(state, face, rand); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index cbf48db81..815a99231 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -64,10 +64,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IFloatingFlower.IslandType.GRASS) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index a369ca59f..3725d77d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -58,11 +58,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, setHardness(2.0F); setResistance(5.0F); setSoundType(SoundType.WOOD); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.HELD_STATE, null) - .withProperty(BotaniaStateProps.HELD_WORLD, null) - .withProperty(BotaniaStateProps.HELD_POS, null) - .withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 47e96c45c..723966808 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -57,6 +57,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -132,9 +133,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I setSoundType(SoundType.PLANT); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.SUBTILE_ID, "daybloom") - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY) ); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 9b755491f..d9b9976b1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -49,7 +49,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE); setHardness(5.5F); setSoundType(SoundType.METAL); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()).withProperty(Properties.AnimationProperty, null).withProperty(Properties.StaticProperty, true)); + setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 59142b4a3..a345e1402 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -82,9 +82,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu setSoundType(SoundType.GROUND); setLightLevel(1F); - setDefaultState(((IExtendedBlockState) blockState.getBaseState()) - .withProperty(BotaniaStateProps.ISLAND_TYPE, IslandType.GRASS) - .withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Nonnull