diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index f089c9de..723e3541 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,8 +1,11 @@ package binnie.botany; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -95,6 +98,8 @@ public class Botany extends AbstractMod { public static BlockCeramicPatterned ceramicTile; public static BlockStainedGlass stained; public static BlockCeramicBrick ceramicBrick; + @Nullable + public static Item botanistBackpack; @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index b38d5bd4..b1f740e5 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -10,6 +10,7 @@ import binnie.core.IInitializable; public class ModuleCore implements IInitializable { @Override public void preInit() { + for (final EnumAcidity pH : EnumAcidity.values()) { Binnie.LANGUAGE.addObjectName(pH, Binnie.LANGUAGE.unlocalised(Botany.instance, "ph." + pH.getName())); } diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 183b208d..19f661f5 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -1,16 +1,25 @@ package binnie.botany.genetics; +import java.awt.Color; +import java.util.function.Predicate; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.FlowerManager; +import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; +import forestry.api.storage.BackpackManager; +import forestry.api.storage.IBackpackInterface; +import forestry.storage.BackpackDefinition; import binnie.Binnie; import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.FlowerManager; import binnie.botany.core.BotanyCore; import binnie.botany.flower.BlockFlower; import binnie.botany.flower.ItemBotany; @@ -30,7 +39,23 @@ public class ModuleGenetics implements IInitializable { AlleleManager.alleleRegistry.registerAllele(ModuleGenetics.alleleEffectNone); EnumFlowerColor.setupMutations(); FlowerDefinition.preInitFlowers(); - + + /* BACKPACK*/ + IBackpackInterface backpackInterface = BackpackManager.backpackInterface; + + if (ForestryAPI.enabledPlugins.contains("forestry.storage")) { + Predicate filter = BackpackManager.backpackInterface.createNaturalistBackpackFilter("rootFlowers"); + BackpackDefinition definition = new BackpackDefinition(new Color(0xf6e83e), Color.WHITE, filter); + BackpackManager.backpackInterface.registerBackpackDefinition("botanist", definition); + Item botanistBackpack = Botany.botanistBackpack = backpackInterface.createNaturalistBackpack("botanist", FlowerManager.flowerRoot).setRegistryName("botanist_bag").setUnlocalizedName("botany.botanist_bag"); + Botany.proxy.registerItem(botanistBackpack); + botanistBackpack.setCreativeTab(CreativeTabBotany.instance); + } else { + Botany.botanistBackpack = null; + } + + /* ITEMS */ + Botany.flower = new BlockFlower(); Botany.proxy.registerBlock(Botany.flower); BinnieCore.getBinnieProxy().registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null); @@ -53,7 +78,7 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { - FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); + forestry.api.apiculture.FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(Botany.database), "X#X", "YEY", diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index b9954908..a53cf05e 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -46,6 +46,9 @@ botany.grammar.flower.secondary=%PRIMARY and %SECONDARY, %STEM Stem tile.botany.ceramic.name=Ceramic Block tile.botany.pigmented.glass.name=Pigmented Glass +item.botany.botanist_bag.name=Botanist's Backpack +botany.jei.description.botanist_bag=Extra inventory that automatically picks up flowers. + botany.colour.aquamarine=Aquamarine botany.colour.black=Black botany.colour.blue=Deep Blue