diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index 916388c08..6a590e4da 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -129,7 +129,10 @@ public class Brew { * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { - return getPotionEffectsShim(stack).stream().map(PotionEffectShim::toVanilla).collect(Collectors.toList()); + List ret = new ArrayList<>(); + for(PotionEffectShim s : getPotionEffectsShim(stack)) + ret.add(s.toVanilla()); + return ret; } } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 3e08907a4..f9771a7f9 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -8,6 +8,7 @@ */ package vazkii.botania.api.state; +import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; @@ -22,6 +23,8 @@ import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.*; +import javax.annotation.Nullable; + /** * Holds all Botania block state properties. Use these to set botania blockstates */ @@ -73,9 +76,12 @@ public class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { + @Override + public boolean apply(FutureStoneVariant variant) { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; + } }); // BlockAlfPortal @@ -94,7 +100,12 @@ public class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { + @Override + public boolean apply(BiomeStoneVariant input) { + return input.getName().contains("cobble"); + } + }); // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); @@ -121,20 +132,34 @@ public class BotaniaStateProps { public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); // BlockModDoubleFlower (white to gray) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + return input.ordinal() >= 0 && input.ordinal() <= 7; + } + }); // (silver to black) - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor input) { + return input.ordinal() >= 8 && input.ordinal() <= 15; + } + }); // 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, color -> - color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + @Override + public boolean apply(EnumDyeColor color) { + return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED - || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN; + } + }); // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 78ce6dd9b..328b4dbd7 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -13,6 +13,9 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraftforge.common.property.IUnlistedProperty; +import javax.annotation.Nullable; +import java.util.Objects; + // Generic base class for unlisted properties public class PropertyObject implements IUnlistedProperty { @@ -29,7 +32,12 @@ public class PropertyObject implements IUnlistedProperty { } public PropertyObject(String name, Class clazz) { - this(name, clazz, Predicates.alwaysTrue(), Object::toString); + this(name, clazz, Predicates.alwaysTrue(), new Function() { + @Override + public String apply(T input) { + return Objects.toString(input); + } + }); } @Override