From 2ced7506c69b38353f32f3b0215f6084cfc936a0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Nov 2015 22:42:27 +0000 Subject: [PATCH] Added floating flower variants to all the new pasture seed types. --- .../java/vazkii/botania/client/lib/LibResources.java | 6 ++++++ .../botania/common/block/decor/IFloatingFlower.java | 10 ++++++++-- .../vazkii/botania/common/item/ItemGrassSeeds.java | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3cbc6df06..554f0cf7b 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -114,6 +114,12 @@ public final class LibResources { public static final String MODEL_MINI_ISLAND_PODZOL = PREFIX_MODEL + "miniIslandPodzol.png"; public static final String MODEL_MINI_ISLAND_MYCEL = PREFIX_MODEL + "miniIslandMycelium.png"; public static final String MODEL_MINI_ISLAND_SNOW = PREFIX_MODEL + "miniIslandSnow.png"; + public static final String MODEL_MINI_ISLAND_DRY = PREFIX_MODEL + "miniIslandDry.png"; + public static final String MODEL_MINI_ISLAND_GOLDEN = PREFIX_MODEL + "miniIslandGolden.png"; + public static final String MODEL_MINI_ISLAND_VIVID = PREFIX_MODEL + "miniIslandVivid.png"; + public static final String MODEL_MINI_ISLAND_SCORCHED = PREFIX_MODEL + "miniIslandScorched.png"; + public static final String MODEL_MINI_ISLAND_INFUSED = PREFIX_MODEL + "miniIslandInfused.png"; + public static final String MODEL_MINI_ISLAND_MUTATED = PREFIX_MODEL + "miniIslandMutated.png"; public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; public static final String MODEL_CRYSTAL_CUBE = PREFIX_MODEL + "crystalCube.png"; public static final String MODEL_INCENSE_PLATE = PREFIX_MODEL + "incensePlate.png"; diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index e3ec23aa1..5a66a8829 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -21,12 +21,18 @@ public interface IFloatingFlower { public IslandType getIslandType(); public void setIslandType(IslandType type); - + public static enum IslandType { GRASS(LibResources.MODEL_MINI_ISLAND), PODZOL(LibResources.MODEL_MINI_ISLAND_PODZOL), MYCEL(LibResources.MODEL_MINI_ISLAND_MYCEL), - SNOW(LibResources.MODEL_MINI_ISLAND_SNOW); + SNOW(LibResources.MODEL_MINI_ISLAND_SNOW), + DRY(LibResources.MODEL_MINI_ISLAND_DRY), + GOLDEN(LibResources.MODEL_MINI_ISLAND_GOLDEN), + VIVID(LibResources.MODEL_MINI_ISLAND_VIVID), + SCORCHED(LibResources.MODEL_MINI_ISLAND_SCORCHED), + INFUSED(LibResources.MODEL_MINI_ISLAND_INFUSED), + MUTATED(LibResources.MODEL_MINI_ISLAND_MUTATED); private IslandType(String s) { res = new ResourceLocation(s); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 40ee55673..45627d49b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -44,7 +44,8 @@ public class ItemGrassSeeds extends ItemMod { private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, - null, null, null, null, null, null + IslandType.DRY, IslandType.GOLDEN, IslandType.VIVID, + IslandType.SCORCHED, IslandType.INFUSED, IslandType.MUTATED }; private static final int SUBTYPES = 9;