Build 315

build.properties

@@ -1,9 +1,9 @@
 #
-#Fri Jul 29 18:40:22 CDT 2016
+#Wed Aug 03 20:27:38 CDT 2016
 version=r1.8
 dir_output=../Build Output/Botania/
-forge_version=12.18.1.2044
-mc_version=1.10.2
 dir_repo=./
-build_number=315
+mc_version=1.10.2
+forge_version=12.18.1.2044
+build_number=316
 mod_name=Botania

src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java

@@ -210,16 +210,13 @@ public class SpecialFlowerModel implements IModelCustomData {
 		public List<BakedQuad> 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<IBakedModel> specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID));
-				if(specialModel.isPresent())
-					ret = specialModel.get();
-			}
+			Optional<IBakedModel> specialModel = bakedBlockModels.getUnchecked(subtileId);
+			if(specialModel.isPresent())
+				ret = specialModel.get();
 
 			return ret.getQuads(state, face, rand);
 		}

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

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

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)
 		);
 	}
 

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

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

version/1.10.2.txt

@@ -1 +1 @@
-r1.8-314
+r1.8-315

version/update.json

@@ -5,7 +5,8 @@
     "1.10.2": {
         "r1.8-312": "See https://github.com/williewillus/Botania/releases/r1.8-312",
         "r1.8-313": "See https://github.com/williewillus/Botania/releases/r1.8-313",
-        "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314"
+        "r1.8-314": "See https://github.com/williewillus/Botania/releases/r1.8-314",
+        "r1.8-315": "See https://github.com/williewillus/Botania/releases/r1.8-315"
     },
     "1.9": {
         "r1.8-301": "See https://github.com/williewillus/Botania/releases/r1.8-301",
@@ -28,8 +29,8 @@
     "promos": {
         "1.10-latest": "r1.8-311",
         "1.10-recommended": "r1.8-311",
-        "1.10.2-latest": "r1.8-314",
-        "1.10.2-recommended": "r1.8-314",
+        "1.10.2-latest": "r1.8-315",
+        "1.10.2-recommended": "r1.8-315",
         "1.9-latest": "r1.8-305",
         "1.9-recommended": "r1.8-305",
         "1.9.4-latest": "r1.8-313",

web/versions.ini

@@ -266,4 +266,5 @@ r1.8-312=1.9.4
 r1.8-312=1.10.2
 r1.8-313=1.9.4
 r1.8-313=1.10.2
-r1.8-314=1.10.2
+r1.8-314=1.10.2
+r1.8-315=1.10.2