From a76d0d1c296b8b275b2208acb362ccfb0833c611 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 11 Oct 2015 06:46:06 -0700 Subject: [PATCH] Update Forestry version, fix flower providers' growFlowers --- gradle.properties | 2 +- .../allele/flowerProvider/FlowerProvider.java | 8 ++- .../FlowerProviderArsMagicaFlower.java | 65 ++++++++++++------- .../FlowerProviderAuraNode.java | 1 + .../FlowerProviderBookshelf.java | 1 + .../flowerProvider/FlowerProviderBotania.java | 23 ++++++- .../FlowerProviderThaumcraftFlower.java | 54 ++++++++++----- .../magicbees/main/utils/VersionInfo.java | 2 +- 8 files changed, 112 insertions(+), 44 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0b08eaa..969e2c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=4 version_rev=0 -version_forestry=4.0.4.32 +version_forestry=4.0.8.36 version_bloodmagic=1.3.3-4 version_botania=r1.7-221 version_baubles=1.0.1.10 diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java index f87e607..b33c579 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java @@ -6,11 +6,13 @@ import net.minecraft.block.Block; import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.IFlower; +import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerProvider; public abstract class FlowerProvider implements IFlowerProvider { @Override + @Deprecated public Set getFlowers() { return FlowerManager.flowerRegistry.getAcceptableFlowers(getFlowerType()); } @@ -22,4 +24,8 @@ public abstract class FlowerProvider implements IFlowerProvider { protected void registerAcceptableFlower(Block block, int meta) { FlowerManager.flowerRegistry.registerAcceptableFlower(block, meta, getFlowerType()); } -} \ No newline at end of file + + protected void registerGrowthRule(IFlowerGrowthRule growthRule) { + FlowerManager.flowerRegistry.registerGrowthRule(growthRule, getFlowerType()); + } +} diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java index e75bb22..c5eaec0 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java @@ -7,21 +7,61 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.api.genetics.IFlowerGrowthHelper; +import forestry.api.genetics.IFlowerGrowthRule; +import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -public class FlowerProviderArsMagicaFlower extends FlowerProvider { - +public class FlowerProviderArsMagicaFlower extends FlowerProvider implements IFlowerGrowthRule { + public FlowerProviderArsMagicaFlower() { registerPlantableFlower(ArsMagicaHelper.blackOrchid, 0, 1); registerPlantableFlower(ArsMagicaHelper.desertNova, 0, 1); registerPlantableFlower(ArsMagicaHelper.aum, 0, 1); registerPlantableFlower(ArsMagicaHelper.wakebloom, 0, 1); registerPlantableFlower(ArsMagicaHelper.tarmaRoot, 0, 1); + registerGrowthRule(this); } @Override + public String getFlowerType() { + return "flowersArsMagica"; + } + + @Override + public String getDescription() { + return LocalizationManager.getLocalizedString("flowerProvider.arsmagica"); + } + + @Override + public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) { + return products; + } + + @Override + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { + return pollinatable.getPlantType().size() > 1; + } + + @Override + @Deprecated public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + @Deprecated + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + private boolean growFlower(World world, int x, int y, int z) { boolean flag = false; Block blockDown = world.getBlock(x, y - 1, z); if (world.getBlock(x, y, z).isAir(world, x, y, z)) { @@ -50,25 +90,4 @@ public class FlowerProviderArsMagicaFlower extends FlowerProvider { } return flag; } - - @Override - public String getFlowerType() { - return "flowersArsMagica"; - } - - @Override - public String getDescription() { - return LocalizationManager.getLocalizedString("flowerProvider.arsmagica"); - } - - @Override - public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) { - return products; - } - - @Override - public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { - return pollinatable.getPlantType().size() > 1; - } - } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java index 419d733..cd2fbda 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java @@ -21,6 +21,7 @@ public class FlowerProviderAuraNode extends FlowerProvider { } @Override + @Deprecated public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { return true; } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java index aa860ac..caeac9d 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java @@ -18,6 +18,7 @@ public class FlowerProviderBookshelf extends FlowerProvider { } @Override + @Deprecated public boolean growFlower(World world, IIndividual genome, int x, int i, int j) { return true; } diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java index 988d4c7..db5e7df 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java @@ -5,17 +5,38 @@ import magicbees.main.utils.compat.BotaniaHelper; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.genetics.IFlowerGrowthHelper; +import forestry.api.genetics.IFlowerGrowthRule; +import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -public class FlowerProviderBotania extends FlowerProvider { +public class FlowerProviderBotania extends FlowerProvider implements IFlowerGrowthRule { public FlowerProviderBotania() { registerPlantableFlower(BotaniaHelper.blockMysticalFlower, OreDictionary.WILDCARD_VALUE, 1); + registerGrowthRule(this); } @Override + @Deprecated public boolean growFlower(World world, IIndividual individual, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + @Deprecated + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + private boolean growFlower(World world, int x, int y, int z) { if (world.isAirBlock(x, y, z) && BotaniaHelper.blockMysticalFlower.canPlaceBlockAt(world, x, y, z)) { world.setBlock(x, y, z, BotaniaHelper.blockMysticalFlower); world.setBlockMetadataWithNotify(x, y, z, world.rand.nextInt(16), 2); diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java index b29a38c..0288c18 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java @@ -6,30 +6,19 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + +import forestry.api.genetics.IFlowerGrowthHelper; +import forestry.api.genetics.IFlowerGrowthRule; +import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; -public class FlowerProviderThaumcraftFlower extends FlowerProvider { +public class FlowerProviderThaumcraftFlower extends FlowerProvider implements IFlowerGrowthRule { public FlowerProviderThaumcraftFlower() { registerPlantableFlower(ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 1); registerPlantableFlower(ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 1); - } - - @Override - public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { - boolean flag = false; - Block blockDown = world.getBlock(x, y - 1, z); - if (world.getBlock(x, y, z).isAir(world, x, y, z)) { - if (blockDown == Blocks.dirt || blockDown == Blocks.grass) { - world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 2); - flag = true; - } else if (blockDown == Blocks.sand) { - world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 2); - flag = true; - } - } - return flag; + registerGrowthRule(this); } @Override @@ -52,4 +41,35 @@ public class FlowerProviderThaumcraftFlower extends FlowerProvider { return 0 < pollinatable.getPlantType().size(); } + @Override + @Deprecated + public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + public boolean growFlower(IFlowerGrowthHelper helper, String flowerType, World world, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + @Override + @Deprecated + public boolean growFlower(IFlowerRegistry fr, String flowerType, World world, IIndividual individual, int x, int y, int z) { + return growFlower(world, x, y, z); + } + + private boolean growFlower(World world, int x, int y, int z) { + boolean flag = false; + Block blockDown = world.getBlock(x, y - 1, z); + if (world.getBlock(x, y, z).isAir(world, x, y, z)) { + if (blockDown == Blocks.dirt || blockDown == Blocks.grass) { + world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 2); + flag = true; + } else if (blockDown == Blocks.sand) { + world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 2); + flag = true; + } + } + return flag; + } } diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 5896cfc..af7eb65 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -25,7 +25,7 @@ public class VersionInfo public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = "required-after:Forestry@[4.0.4,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; + public static final String Depends = "required-after:Forestry@[4.0.8,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; boolean criticalUpdate; boolean newVersion;