Version 5.8.1 Release

Better zh_cn.lang translation file update.

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Ignore spotlessApply reformat
-94aa9346b1811eff7e67820b75d5098e3f83448d

.gitattributes

@@ -1,44 +0,0 @@
-* text eol=lf
-
-*.[jJ][aA][rR]          binary
-
-*.[pP][nN][gG]          binary
-*.[jJ][pP][gG]          binary
-*.[jJ][pP][eE][gG]      binary
-*.[gG][iI][fF]          binary
-*.[tT][iI][fF]          binary
-*.[tT][iI][fF][fF]      binary
-*.[iI][cC][oO]          binary
-*.[sS][vV][gG]          text
-*.[eE][pP][sS]          binary
-*.[xX][cC][fF]          binary
-
-*.[kK][aA][rR]          binary
-*.[mM]4[aA]             binary
-*.[mM][iI][dD]          binary
-*.[mM][iI][dD][iI]      binary
-*.[mM][pP]3             binary
-*.[oO][gG][gG]          binary
-*.[rR][aA]              binary
-
-*.7[zZ]                 binary
-*.[gG][zZ]              binary
-*.[tT][aA][rR]          binary
-*.[tT][gG][zZ]          binary
-*.[zZ][iI][pP]          binary
-
-*.[tT][cC][nN]          binary
-*.[sS][oO]              binary
-*.[dD][lL][lL]          binary
-*.[dD][yY][lL][iI][bB]  binary
-*.[pP][sS][dD]          binary
-*.[tT][tT][fF]          binary
-*.[oO][tT][fF]          binary
-
-*.[pP][aA][tT][cC][hH]  -text
-
-*.[bB][aA][tT]          text eol=crlf
-*.[cC][mM][dD]          text eol=crlf
-*.[pP][sS]1             text eol=crlf
-
-*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+Thank you for reporting!
+
+For issues:
+ * Try the latest version, it may have fixed the issue already.
+ * If you crashed, please paste the crash log to [gist](https://gist.github.com/) and link it here.

.github/workflows/build-and-test.yml

@@ -1,13 +0,0 @@
-
-name: Build and test
-
-on:
-  pull_request:
-    branches: [ master, main, release/** ]
-  push:
-    branches: [ master, main, release/** ]
-
-jobs:
-  build-and-test:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
-    secrets: inherit

.github/workflows/optimize-images.yml

@@ -1,17 +0,0 @@
-name: Optimize images
-
-on:
-  pull_request:
-    branches: [ master, main, release/** ]
-    paths:
-      - "**/*.png"
-
-  push:
-    branches: [ master, main, release/** ]
-    paths:
-      - "**/*.png"
-
-jobs:
-  optimize-images:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
-    secrets: inherit

.github/workflows/release-tags.yml

@@ -1,14 +0,0 @@
-
-name: Release tagged build
-
-on:
-  push:
-    tags: [ '*' ]
-
-permissions:
-  contents: write
-
-jobs:
-  release-tags:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
-    secrets: inherit

.gitignore

@@ -1,33 +1,23 @@
-.gradle
-.settings
-/.idea/
-/.vscode/
-/run/
-/build/
-/eclipse/
-.classpath
-.project
-/bin/
-/config/
-/crash-reports/
-/logs/
-options.txt
-/saves/
-usernamecache.json
-banned-ips.json
-banned-players.json
-eula.txt
-ops.json
-server.properties
-servers.dat
-usercache.json
-whitelist.json
-/out/
-*.iml
-*.ipr
-*.iws
-src/main/resources/mixins.*.json
-*.bat
-*.DS_Store
-!gradlew.bat
-layout.json
+# everything
+/*
+
+# folders
+!/.github
+!/forestry_techne
+!/gradle/wrapper
+!/src
+
+# files
+!/.gitignore
+!/CLA.txt
+!/CONTRIBUTING.md
+!/LICENSE.txt
+!/license-header.txt
+!/README.md
+!/gradle.properties
+!/build.gradle
+!/build.xml
+!/gradlew
+!/gradlew.bat
+!/cla-signatures.txt
+!/formatting-settings.jar

CHANGELOG-2.1.1.0.md

@@ -1,48 +0,0 @@
-
-# ForestryMC
-
-Changelog of ForestryMC.
-
-
-### [#8 Fix NPE on crafting in worktable](https://github.com/GTNewHorizons/ForestryMC/pull/8)
-**Merge pull request #8 from GTNewHorizons/worktable-npe**
-* Fix NPE on crafting in worktable
-
-[4c7c7c34388aebd](https://github.com/GTNewHorizons/ForestryMC/commit/4c7c7c34388aebd)
-by Martin Robertz *2021-04-06 15:05:20*
-### No issue
-**Fix NPE on crafting in worktable**
-
-[621208393e64d97](https://github.com/GTNewHorizons/ForestryMC/commit/621208393e64d97)
-by Glease *2021-04-06 14:46:39*
-
-### [#6 Ic2 crop module](https://github.com/GTNewHorizons/ForestryMC/pull/6)
-**Ic2 crop module (#6)**
-* Added IC2-Crop-Module
-* Changed Lang repo
-* updated lang submodule
-
-[d2545b7a5990cf2](https://github.com/GTNewHorizons/ForestryMC/commit/d2545b7a5990cf2)
-by bartimaeusnek *2020-12-24 20:15:03*
-### [#7 Dirty fix for BQ3 crafting quest not triggering](https://github.com/GTNewHorizons/ForestryMC/pull/7)
-**Merge pull request #7 from GTNewHorizons/bq3_compat**
-* Dirty fix for BQ3 crafting quest not triggering
-
-[d0254997472c5be](https://github.com/GTNewHorizons/ForestryMC/commit/d0254997472c5be)
-by Martin Robertz *2021-01-22 16:15:58*
-### No issue
-**bump version**
-
-[98c0b66b6fbe598](https://github.com/GTNewHorizons/ForestryMC/commit/98c0b66b6fbe598)
-by DreamMasterXXL *2021-01-29 19:11:09*
-
-**Merge branch 'IC2-Crop-Module' into GTNH-Fixes**
-
-[5b61261d69d541b](https://github.com/GTNewHorizons/ForestryMC/commit/5b61261d69d541b)
-by DreamMasterXXL *2021-01-29 19:05:41*
-
-**Dirty fix for BQ3 crafting quest not triggering**
-
-[7320ddb44f63bfd](https://github.com/GTNewHorizons/ForestryMC/commit/7320ddb44f63bfd)
-by Glease *2021-01-22 14:41:32*
-

CODEOWNERS

@@ -1,3 +0,0 @@
-# Any Github changes require admin approval
-/.github/** @GTNewHorizons/admin
-

CONTRIBUTING.md

@@ -0,0 +1,29 @@
+How to submit a bug report to Forestry
+====================================
+Please make sure the bug has not already been reported by [searching the issues](https://github.com/ForestryMC/ForestryMC/issues?q=is%3Aissue).
+
+If you can, see if the bug still happens with the latest unstable build.  
+[The latest unstable builds are available here](http://jenkins.ic2.player.to/job/Forestry_Dev/)
+
+For crashes, you must post a link to the full crash report.  
+[gist.github.com](gist.github.com) or [pastebin.com](www.pastebin.com) are good places to upload them.  
+Full crash reports are located in [the minecraft data folder](http://hopper.minecraft.net/help/finding-minecraft-data-folder/), in "crash-reports".
+
+Thank you for reporting bugs!
+
+How to contribute to Forestry
+====================================
+
+### Contributor License Agreement
+
+Before pull requests can be accepted, the contributor needs to sign a contributor license agreement. (Essentially giving a license for using his code and/or media and for re-licensing it, for details read the agreement linked below.) 
+
+### How do I sign?
+
+To keep the hassle for everyone involved to a minimum, Forestry uses CLAHub to manage the agreements. To get started, <a href="https://www.clahub.com/agreements/ForestryMC/ForestryMC">sign the Contributor License Agreement</a>.
+
+### Why is this needed?
+
+Without CLAs it at some point becomes essentially impossible to change the license of a project which accepts contributions from third parties. Without an explicit agreement every contributor would still own the copyright to his code. So as long as it (or parts of it) remain in the code base, he would have to agree to every license change. If enough time has passed, there may be dozens, perhaps even hundreds of contributors involved and it will be very hard to track down each and every one of them and get them to agree on a new license.
+
+This would make it impossible to change the license to a more permissive one at a later date, so the code would be locked into CC BY-NC-ND 3.0 until it passes into the public domain about a hundred years from now. This situation is to be avoided and that’s why you are being bothered with this CLA.

LICENSE.txt

@@ -1,7 +1,7 @@
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -163,3 +163,678 @@ whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,21 +1,34 @@
-Forestry
+[Forestry](https://minecraft.curseforge.com/projects/forestry/files)
 ====================================
 
 ### What is it?
 
-This is the GTNH fork of Forestry for 1.7.10.  Do not report any issues to the original Forestry team.  This fork is maintained by the GTNH team and is not supported by the original Forestry team.
 Forestry is a modification for the game Minecraft and known primarily for its farms and bees. 
 
+### Homepage
+
+[Wiki](http://forestry.sengir.net/)
+
+[Latest Builds for 1.11.2/1.12](http://jenkins.ic2.player.to/job/Forestry_1.11/)
+
+[![Discord](https://img.shields.io/discord/417745379258400778.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/49XNRJk)
+
+For those interested in developement, you can also visit #forestry-dev.
 
 ### Building
 
-The API and localization files reside in their own repository. It is pulled in automatically.
+The localization files reside in their own repository. It is pulled in automatically.
 
 You may want to adjust the "./gradle.properties" file to set your mc account as needed.
 
-To setup, open a command line and run "gradlew setupDecompWorkspace" and "gradlew eclipse".
+To setup, open a command line and run "gradlew setupDecompWorkspace". Then run the following depending on your IDE:
 
-To package, open a command line and type "gradlew release".
+Eclipse: "gradlew eclipse"
+IntelliJ IDEA: "gradlew idea genIntellijRuns"
+
+To package, open a command line and type "gradlew build".
+
+For mod authors: the Forestry maven is located at http://maven.ic2.player.to/net/sengir/forestry/
 
 ### Notes
 
@@ -23,6 +36,8 @@ Beware of ugly code.
 
 Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.
 
+**If you submit a PR you must accept the [Contributor License Agreement](https://cla-assistant.io/ForestryMC/ForestryMC). There is no way around that, since otherwise changing the license later - even to something more permissive! - , becomes close to impossible.**
+
 ### License & Copyright
 
-Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw, the GTNH Team, and others.
+Forestry is (c) 2011 - 2014 SirSengir and licensed under LGPL v3. See the LICENSE.txt for all the gory details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. Forestry also contains code contributed by CovertJaguar, Player, MysteriousAges, Binnie, RichardG, cpw and others.

build.gradle

@@ -1,5 +1,169 @@
-//version: 1707058017
+buildscript {
+	repositories {
+		jcenter()
+		maven { url = "http://files.minecraftforge.net/maven" }
+	}
+	dependencies {
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+		classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.47"
+	}
+}
 
 plugins {
-    id 'com.gtnewhorizons.gtnhconvention'
+	id "com.matthewprenger.cursegradle" version "1.0.9"
+}
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'idea'
+apply plugin: 'maven'
+apply plugin: "se.bjurr.gitchangelog.git-changelog-gradle-plugin"
+
+version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber()
+if (project.hasProperty('buildQualifier')) {
+	version = project.version + '-' + project.buildQualifier
+}
+group = "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "forestry_" + mcversion
+
+ext.dirDest = './build/dist'
+
+// java version
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+minecraft {
+	version = mcversion + "-" + forgeversion
+	runDir = "run"
+	mappings = mcp_mappings
+
+	replace '@VERSION@', project.version
+	replace '@BUILD_NUMBER@', getBuildNumber()
+}
+
+repositories {
+	maven {
+		url = 'http://maven.mcmoddev.com'
+	}
+	maven {
+		url "http://dvs1.progwml6.com/files/maven"
+	}
+	maven {
+		name = "ic2"
+		url = "http://maven.ic2.player.to/"
+	}
+	maven {
+		name = "Modmuss50"
+		url = "http://maven.modmuss50.me"
+	}
+	maven {
+		url = 'https://mod-buildcraft.com/maven'
+	}
+}
+
+dependencies {
+	deobfProvided "net.darkhax.tesla:Tesla-${tesla_mcversion}:${tesla_version}"
+	deobfProvided "mezz.jei:jei_${jei_mcversion}:${jei_version}:api"
+	runtimeOnly "mezz.jei:jei_${jei_mcversion}:${jei_version}"
+	deobfProvided "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+	deobfProvided "TechReborn:TechReborn-${TR_mcversion}:${TR_version}:api"
+	deobfProvided "com.mod-buildcraft:buildcraft-api:${buildcraft_version}"
+}
+
+configurations {
+	api
+	compile.extendsFrom api
+}
+
+processResources {
+
+	// this will ensure that this task is redone when the versions change.
+	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft.version
+
+	// replace stuff in mcmod.info, nothing else
+	from(sourceSets.main.resources.srcDirs) {
+		include 'mcmod.info'
+
+		// replace version and mcversion
+		expand 'version': project.version, 'mcversion': project.minecraft.version
+	}
+
+	// copy everything else, thats not the mcmod.info
+	from(sourceSets.main.resources.srcDirs) {
+		exclude 'mcmod.info'
+		exclude '**/*.md'
+	}
+
+	// Move access transformers to META-INF
+	rename '(.+_at.cfg)', 'META-INF/$1'
+}
+
+// prevent java 8's strict doclint for javadocs from failing builds
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addStringOption('Xdoclint:none', '-quiet')
+	}
+}
+
+jar {
+	manifest {
+		attributes 'FMLAT': 'forestry_at.cfg'
+	}
+}
+
+task sourcesJar(type: Jar) {
+	from zipTree('build/retromapping/retromappedReplacedMain.jar') // Not sure if this is how Abrar designed it, but grab the remapped src
+	classifier = 'sources'
+}
+
+task apiJar(type: Jar) {
+	// TODO: when FG bug is fixed, remove allSource from the api jar.
+	// https://github.com/MinecraftForge/ForgeGradle/issues/369
+	// Gradle should be able to pull them from the -sources jar.
+	from sourceSets.main.allSource
+	from sourceSets.main.output
+	include 'forestry/api/**'
+	classifier = 'api'
+}
+
+artifacts {
+	archives sourcesJar
+	archives apiJar
+}
+
+uploadArchives {
+	repositories {
+		if (project.hasProperty('mavenDir')) {
+			mavenDeployer {
+				repository(url: "file://" + mavenDir)
+			}
+		} else {
+			println 'Archives upload disabled, mavenDir in gradle.properties is missing.'
+		}
+	}
+}
+
+def getBuildNumber() {
+	return "$System.env.BUILD_NUMBER" != "null" ? "$System.env.BUILD_NUMBER" : "0"
+}
+
+task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
+	filePath = "changelog.html"
+	untaggedName = "Current release ${project.version}"
+	fromCommit = "5a3850c2642e535656d090d1473054d5fa8d3331"
+	toRef = "HEAD"
+	templateContent = file('changelog.mustache').getText('UTF-8')
+}
+
+curseforge {
+	apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0'
+	project {
+		id = curse_project_id
+		changelog = file('changelog.html')
+		changelogType = 'html'
+		releaseType = 'beta'
+	}
+}
+
+afterEvaluate {
+	tasks.curseforge59751.dependsOn.add(makeChangelog)
 }

changelog.mustache

@@ -0,0 +1,9 @@
+Please help the Forestry project by <a href="https://github.com/ForestryMC/ForestryMC/issues">reporting issues here.</a><br/>
+{{#tags}}
+    <h3>{{name}}</h3>
+    <ul>
+        {{#commits}}
+            <li>{{{message}}} - {{authorName}}</li>
+        {{/commits}}
+    </ul>
+{{/tags}}

cla-signatures.txt

@@ -4,3 +4,4 @@ GenuineSounds;[email protected];2015-02-26
 airbreather;[email protected];2015-04-10
 ganymedes01;[email protected];2015-05-27
 infinityraider;theoneandonlyraider@gmail;com;2015-10-03
+girafistudios;[email protected];2016-06-02

dependencies.gradle

@@ -1,13 +0,0 @@
-// Add your dependencies here
-
-dependencies {
-    api("com.github.GTNewHorizons:GTNHLib:0.9.54:dev")
-    api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.19:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.107-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
-    compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-    compileOnly('curse.maven:craftguide-75557:2459320')
-    devOnlyNonPublishable('net.xonich.mc:NoHotbarNeeded:0.0.3:dev')
-}

gradle.properties

@@ -1,238 +1,16 @@
-# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
-# LOCAL to test local config updates.
-gtnh.settings.blowdryerTag = 0.2.0
+mcversion=1.12.2
+forgeversion=14.23.4.2705
+mcp_mappings=snapshot_20171003
+curse_project_id=59751
 
-# Human-readable mod name, available for mcmod.info population.
-modName = Forestry
-
-# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
-# Conventionally lowercase.
-modId = Forestry
-
-# Root package of the mod, used to find various classes in other properties,
-# mcmod.info substitution, enabling assertions in run tasks, etc.
-modGroup = forestry
-
-# Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
-useModGroupForPublishing = false
-
-# Updates your build.gradle and settings.gradle automatically whenever an update is available.
-autoUpdateBuildScript = false
-
-# Version of Minecraft to target
-minecraftVersion = 1.7.10
-
-# Version of Minecraft Forge to target
-forgeVersion = 10.13.4.1614
-
-# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
-channel = stable
-
-# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
-mappingsVersion = 12
-
-# Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
-
-# Select a default username for testing your mod. You can always override this per-run by running
-# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
-developmentEnvironmentUserName = Developer
-
-# Enables modern Java syntax support. Valid values:
-# - false: No modern syntax, Java 8 only
-# - jabel: Jabel syntax-only support, compiles to J8 bytecode
-# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
-# - modern: Native modern Java bytecode, no downgrading
-enableModernJavaSyntax = jabel
-
-# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
-# and should *not* be used in most situations. -1 disables this.
-# forceToolchainVersion = -1
-
-# Target JVM version for JVM Downgrader bytecode downgrading.
-# Only used when enableModernJavaSyntax = jvmDowngrader
-# downgradeTargetVersion = 8
-
-# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
-# Classes will be available in META-INF/versions/N/ for each version N in this list.
-# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
-# jvmDowngraderMultiReleaseVersions = 21,25
-
-# Specifies how JVM Downgrader API stubs are provided. Options:
-# - shade: Shade minimized stubs into the jar
-# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
-# - external: Another dependency provides stubs (no constraint, no warning)
-# - (empty): Warning reminding you to configure stubs
-# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
-# jvmDowngraderStubsProvider =
-
-# Enables injecting missing generics into the decompiled source code for a better coding experience.
-# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = true
-
-# Generate a class with a String field for the mod version named as defined below.
-# If generateGradleTokenClass is empty or not missing, no such class will be generated.
-# If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass = forestry.Tags
-
-# Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = VERSION
-
-# [DEPRECATED] Mod ID replacement token.
-gradleTokenModId =
-
-# [DEPRECATED] Mod name replacement token.
-gradleTokenModName =
-
-# [DEPRECATED] Mod Group replacement token.
-gradleTokenGroupName =
-
-# [DEPRECATED]
-# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
-# public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...]).
-# Leave these properties empty to skip individual token replacements.
-replaceGradleTokenInFile =
-
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
-# leave this property empty.
-# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
-apiPackage = api
-
-# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# There can be multiple files in a space-separated list.
-# Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile = forestry_at.cfg
-
-# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
-usesMixins = false
-
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet =
-
-# Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
-
-# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
-mixinPlugin =
-
-# Specify the package that contains all of your Mixins. The package must exist or
-# the build will fail. If you have a package property defined in your mixins.<modid>.json,
-# it must match with this or the build will fail.
-mixinsPackage =
-
-# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
-# This parameter is for legacy compatibility only
-# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
-coreModClass =
-
-# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
-# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
-containsMixinsAndOrCoreModOnly = false
-
-# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
-forceEnableMixins = false
-
-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
-# responsibility to check the license and request permission for distribution if required.
-usesShadowedDependencies = false
-
-# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
-# their own classes, making the minimization unreliable.
-minimizeShadowedDependencies = true
-
-# If disabled, won't rename the shadowed classes.
-relocateShadowedDependencies = true
-
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
-includeWellKnownRepositories = true
-
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
-
-# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
-# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
-# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
-usesMavenPublishing = true
-
-# Maven repository to publish the mod to.
-# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
-
-# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
-#
-# The project's ID on Modrinth. Can be either the slug or the ID.
-# Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId =
-
-# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
-# Syntax: scope1-type1:name1;scope2-type2:name2;...
-# Where scope can be one of [required, optional, incompatible, embedded],
-#       type can be one of [project, version],
-#       and the name is the Modrinth project or version slug/id of the other mod.
-# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-modrinthRelations =
-
-# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-#
-# The project's numeric ID on CurseForge. You can find this in the About Project box.
-# Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId =
-
-# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
-# Syntax: type1:name1;type2:name2;...
-# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
-#       and the name is the CurseForge project slug of the other mod.
-# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-curseForgeRelations =
-
-# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
-# projects. New projects should not use this parameter.
-# customArchiveBaseName =
-
-# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
-# runClientWorkingDirectory = run/client
-
-# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
-# runServerWorkingDirectory = run/server
-
-# Optional parameter to have the build automatically fail if an illegal version is used.
-# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
-# The check is ONLY performed if the version is a git tag.
-# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
-# versionPattern =
-
-# Uncomment to prevent the source code from being published.
-# noPublishedSources = true
-
-# Uncomment this to disable Spotless checks.
-# This should only be uncommented to keep it easier to sync with upstream/other forks.
-# That is, if there is no other active fork/upstream, NEVER change this.
-# disableSpotless = true
-
-# Uncomment this to disable Checkstyle checks (currently wildcard import check).
-# disableCheckstyle = true
-
-# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
-# (force use delegated build).
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
-# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
-# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
-# ideaOverrideBuildType = idea
-
-# Whether IDEA should run spotless checks when pressing the Build button.
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# ideaCheckSpotlessOnBuild = true
-
-# Non-GTNH properties
-org.gradle.configuration-cache = true
-org.gradle.parallel = true
+tesla_version=1.0.60
+tesla_mcversion=1.12
+jei_version=4.10.0.200
+jei_mcversion=1.12.2
+ic2_version=2.8.90-ex112
+TR_mcversion=1.12.2
+TR_version=2.13.2.561
+buildcraft_version=7.99.17
+version_major=5
+version_minor=8
+version_patch=1

gradle/gradle-daemon-jvm.properties

@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
-toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+#Mon Jul 03 15:24:47 PDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradlew

@@ -1,128 +1,74 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+#!/usr/bin/env bash
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
-# Attempt to set APP_HOME
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
-} >&2
+}
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
 esac
 
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -131,118 +77,84 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,22 +1,4 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -26,30 +8,26 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,35 +35,54 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
 :execute
 @rem Setup the command line
 
-
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

jitpack.yml

@@ -1,2 +0,0 @@
-before_install:
-  - ./gradlew setupCIWorkspace

license-header.txt

@@ -0,0 +1,12 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ *******************************************************************************
+ */

repositories.gradle

@@ -1,5 +0,0 @@
-// Add any additional repositiroes for your dependencies here
-
-repositories {
-    mavenLocal()
-}

settings.gradle

@@ -1,23 +0,0 @@
-
-pluginManagement {
-    repositories {
-        maven {
-            // RetroFuturaGradle
-            name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
-            mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
-            }
-        }
-        gradlePluginPortal()
-        mavenCentral()
-        mavenLocal()
-    }
-}
-
-plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
-}
-
-

src/api/java/invtweaks/LICENSE.txt

@@ -0,0 +1,21 @@
+## Inventory Tweaks Mod license (MIT)
+
+Copyright (c) 2011-2013 Marwane Kalam-Alami
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/api/java/invtweaks/api/IItemTree.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+@SuppressWarnings("unused")
+public interface IItemTree {
+    void registerOre(String category, String name, String oreName, int order);
+
+    boolean matches(List<IItemTreeItem> items, String keyword);
+
+    boolean isKeywordValid(String keyword);
+
+    Collection<IItemTreeCategory> getAllCategories();
+
+    IItemTreeCategory getRootCategory();
+
+    void setRootCategory(IItemTreeCategory category);
+
+    IItemTreeCategory getCategory(String keyword);
+
+    boolean isItemUnknown(String id, int damage);
+
+    List<IItemTreeItem> getItems(String id, int damage);
+
+    List<IItemTreeItem> getItems(String name);
+
+    IItemTreeItem getRandomItem(Random r);
+
+    boolean containsItem(String name);
+
+    boolean containsCategory(String name);
+
+    IItemTreeCategory addCategory(String parentCategory, String newCategory) throws NullPointerException;
+
+    void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException;
+
+    IItemTreeItem addItem(String parentCategory, String name, String id, int damage, int order)
+            throws NullPointerException;
+
+    void addItem(String parentCategory, IItemTreeItem newItem) throws NullPointerException;
+
+    int getKeywordDepth(String keyword);
+
+    int getKeywordOrder(String keyword);
+}

src/api/java/invtweaks/api/IItemTreeCategory.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.Collection;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public interface IItemTreeCategory {
+    boolean contains(IItemTreeItem item);
+
+    void addCategory(IItemTreeCategory category);
+
+    void addItem(IItemTreeItem item);
+
+    Collection<IItemTreeCategory> getSubCategories();
+
+    Collection<List<IItemTreeItem>> getItems();
+
+    String getName();
+
+    int getCategoryOrder();
+
+    int findCategoryOrder(String keyword);
+
+    int findKeywordDepth(String keyword);
+}

src/api/java/invtweaks/api/IItemTreeItem.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+@SuppressWarnings("unused")
+public interface IItemTreeItem extends Comparable<IItemTreeItem> {
+    String getName();
+
+    String getId();
+
+    int getDamage();
+
+    int getOrder();
+}

src/api/java/invtweaks/api/IItemTreeListener.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import java.util.EventListener;
+
+@SuppressWarnings("unused")
+public interface IItemTreeListener extends EventListener {
+    void onTreeLoaded(IItemTree tree);
+}

src/api/java/invtweaks/api/InvTweaksAPI.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+import invtweaks.api.container.ContainerSection;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Interface to access functions exposed by Inventory Tweaks
+ * <p/>
+ * The main @Mod instance of the mod implements this interface, so a refernce to it can
+ * be obtained via @Instance("inventorytweaks") or methods in net.minecraftforge.fml.common.Loader
+ * <p/>
+ * All of these functions currently have no effect if called on a dedicated server.
+ */
+@SuppressWarnings("unused")
+public interface InvTweaksAPI {
+    /**
+     * Add a listener for ItemTree load events
+     */
+    void addOnLoadListener(IItemTreeListener listener);
+
+    /**
+     * Remove a listener for ItemTree load events
+     *
+     * @return true if the listener was previously added
+     */
+    boolean removeOnLoadListener(IItemTreeListener listener);
+
+    /**
+     * Toggle sorting shortcut state.
+     */
+    void setSortKeyEnabled(boolean enabled);
+
+    /**
+     * Toggle sorting shortcut supression.
+     * Unlike setSortKeyEnabled, this flag is automatically cleared when GUIs are closed.
+     */
+    void setTextboxMode(boolean enabled);
+
+    /**
+     * Compare two items using the default (non-rule based) algorithm,
+     * sutable for an implementation of Comparator&lt;ItemStack&gt;.
+     *
+     * @param i
+     * @param j
+     * @return A value with a sign representing the relative order of the item stacks
+     */
+    int compareItems(ItemStack i, ItemStack j);
+
+    /**
+     * Initiate a sort as if the player had clicked on a sorting button or pressed the sort key.
+     */
+    void sort(ContainerSection section, SortingMethod method);
+}

src/api/java/invtweaks/api/SortingMethod.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api;
+
+@SuppressWarnings("unused")
+public enum SortingMethod {
+    /**
+     * Standard 'r' sorting for generic inventories
+     */
+    DEFAULT,
+    /**
+     * Sort method creating vertical columns of items.
+     * Used for chests only, requires container to have a valid row size for correct results.
+     */
+    VERTICAL,
+    /**
+     * Sort method creating horizontal rows of items.
+     * Used for chests only, requires container to have a valid row size for correct results.
+     */
+    HORIZONTAL,
+    /**
+     * Sort method for player inventory.
+     * Applies to extra player-specified sorting rules for the main inventory.
+     * Will always operate on main inventory.
+     */
+    INVENTORY,
+    /**
+     * Attempts to even the number of items in each stack of the same type of item, without moving full stacks.
+     * Used in crafting grid sorting.
+     */
+    EVEN_STACKS,
+}

src/api/java/invtweaks/api/container/ChestContainer.java

@@ -0,0 +1,38 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for containers that have a chest-like persistant storage component. Enables the Inventroy Tweaks sorting
+ * buttons for this container.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ChestContainer {
+    // Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
+    boolean showButtons() default true;
+
+    // Size of a chest row
+    int rowSize() default 9;
+
+    // Uses 'large chest' mode for sorting buttons
+    // (Renders buttons vertically down the right side of the GUI)
+    boolean isLargeChest() default false;
+
+    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
+    // Signature int func()
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface RowSizeCallback {
+    }
+
+    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
+    // Signature int func()
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface IsLargeCallback {
+    }
+}

src/api/java/invtweaks/api/container/ContainerSection.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2013 Andrew Crocker
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package invtweaks.api.container;
+
+/**
+ * Names for specific parts of containers. For unknown container types (such as mod containers), only INVENTORY and
+ * CHEST sections are available.
+ */
+@SuppressWarnings("unused")
+public enum ContainerSection {
+    /**
+     * The player's inventory
+     */
+    INVENTORY,
+    /**
+     * The player's inventory (only the hotbar)
+     */
+    INVENTORY_HOTBAR,
+    /**
+     * The player's inventory (all except the hotbar)
+     */
+    INVENTORY_NOT_HOTBAR,
+    /**
+     * The chest or dispenser contents. Also used for unknown container contents.
+     */
+    CHEST,
+    /**
+     * The crafting input
+     */
+    CRAFTING_IN,
+    /**
+     * The crafting input, for containters that store it internally
+     */
+    CRAFTING_IN_PERSISTENT,
+    /**
+     * The crafting output
+     */
+    CRAFTING_OUT,
+    /**
+     * The armor slots
+     */
+    ARMOR,
+    /**
+     * The furnace input
+     */
+    FURNACE_IN,
+    /**
+     * The furnace output
+     */
+    FURNACE_OUT,
+    /**
+     * The furnace fuel
+     */
+    FURNACE_FUEL,
+    /**
+     * The enchantment table slot
+     */
+    ENCHANTMENT,
+    /**
+     * The three bottles slots in brewing tables
+     * NOTE: Do not use without also using BREWING_INGREDIENT.
+     */
+    BREWING_BOTTLES,
+    /**
+     * The top slot in brewing tables
+     * NOTE: Do not use without also using BREWING_BOTTLES.
+     */
+    BREWING_INGREDIENT
+}

src/api/java/invtweaks/api/container/ContainerSectionCallback.java

@@ -0,0 +1,16 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for a method to call which returns the set of ContainerSections for this container.
+ * <p/>
+ * Signature of the method should be Map<ContainerSection, List<Slot>> func()
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ContainerSectionCallback {
+}

src/api/java/invtweaks/api/container/IgnoreContainer.java

@@ -0,0 +1,15 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Use this annotation to override inherited annotation properties and mark a Container as unsortable.
+ * This effect is inherited as well.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface IgnoreContainer {
+}

src/api/java/invtweaks/api/container/InventoryContainer.java

@@ -0,0 +1,20 @@
+package invtweaks.api.container;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A marker for containers that need special treatment, such as crafting inputs or alternate player inventory positions,
+ * but do not have a chest-like component.
+ * <p/>
+ * Does not enable the Inventory Tweaks sorting buttons for this container.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface InventoryContainer {
+    // Set to true if the Inventory Tweaks options button should be shown for this container.
+    // (For instance, if you are replacing a vanilla container such as the player's inventory)
+    boolean showOptions() default true;
+}

src/main/java/forestry/Forestry.java

@@ -1,38 +1,50 @@
 /*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
  *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package forestry;
 
+import com.google.common.base.Preconditions;
+
+import javax.annotation.Nullable;
 import java.io.File;
 
-import net.minecraft.block.Block;
+import forestry.plugins.ForestryCompatPlugins;
+import forestry.plugins.PluginBuildCraftFuels;
+import forestry.plugins.PluginIC2;
+import forestry.plugins.PluginNatura;
+import forestry.plugins.PluginTechReborn;
 import net.minecraft.item.Item;
-import net.minecraftforge.common.MinecraftForge;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.ModAPIManager;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
-import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.Type;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
 import forestry.api.core.ForestryAPI;
-import forestry.core.ClimateManager;
+import forestry.api.core.ForestryEvent;
 import forestry.core.EventHandlerCore;
+import forestry.core.advancements.AdvancementManager;
+import forestry.core.climate.ClimateStates;
 import forestry.core.config.Config;
 import forestry.core.config.Constants;
 import forestry.core.config.GameMode;
@@ -42,10 +54,10 @@ import forestry.core.gui.GuiHandler;
 import forestry.core.multiblock.MultiblockEventHandler;
 import forestry.core.network.PacketHandler;
 import forestry.core.proxy.Proxies;
-import forestry.core.utils.Log;
-import forestry.core.utils.StringUtil;
+import forestry.core.utils.MigrationHelper;
 import forestry.core.worldgen.WorldGenerator;
-import forestry.plugins.PluginManager;
+import forestry.modules.ForestryModules;
+import forestry.modules.ModuleManager;
 
 /**
  * Forestry Minecraft Mod
@@ -53,122 +65,123 @@ import forestry.plugins.PluginManager;
  * @author SirSengir
  */
 @Mod(
-        modid = Constants.MOD,
-        name = Constants.MOD,
-        version = Constants.VERSION,
-        guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
-        dependencies = "required-after:Forge@[10.13.4.1566,);" + "required-after:gtnhlib@[0.9.41,);"
-                + "after:Buildcraft|Core@[6.1.7,);"
-                + "after:ExtrabiomesXL;"
-                + "after:BiomesOPlenty;"
-                + "after:IC2@[2.0.140,);"
-                + "after:Natura@[2.2.0,);"
-                + "after:HardcoreEnderExpansion;")
+		modid = Constants.MOD_ID,
+		name = Constants.MOD_NAME,
+		version = Constants.VERSION,
+		guiFactory = "forestry.core.config.ForestryGuiConfigFactory",
+		acceptedMinecraftVersions = "[1.12.2,1.13.0)",
+		dependencies = "required-after:forge@[14.23.4.2705,);"
+				+ "after:jei@[4.7.8.91,);"
+				+ "after:" + PluginIC2.MOD_ID + ";"
+				+ "after:" + PluginNatura.MOD_ID + ";"
+				+ "after:toughasnails;"
+				+ "after:" + PluginTechReborn.MOD_ID + ";"
+				+ "after:" + PluginBuildCraftFuels.MOD_ID + ";")
 public class Forestry {
 
-    @Mod.Instance(Constants.MOD)
-    public static Forestry instance;
+	@SuppressWarnings("NullableProblems")
+	@Mod.Instance(Constants.MOD_ID)
+	public static Forestry instance;
+	@Nullable
+	private File configFolder;
 
-    private File configFolder;
+	public Forestry() {
+		ForestryAPI.instance = this;
+		ForestryAPI.forestryConstants = new Constants();
+		ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
+		ForestryAPI.states = ClimateStates.INSTANCE;
+		EnumErrorCode.init();
+		FluidRegistry.enableUniversalBucket();
+		MinecraftForge.EVENT_BUS.register(this);
+		ModuleManager moduleManager = ModuleManager.getInstance();
+		ForestryAPI.moduleManager = moduleManager;
+		moduleManager.registerContainers(new ForestryModules(), new ForestryCompatPlugins());
+	}
 
-    public Forestry() {
-        ForestryAPI.instance = this;
-        ForestryAPI.climateManager = new ClimateManager();
-        ForestryAPI.forestryConstants = new Constants();
-        ForestryAPI.errorStateRegistry = new ErrorStateRegistry();
-        EnumErrorCode.init();
-    }
+	@Nullable
+	private static PacketHandler packetHandler;
 
-    public static PacketHandler packetHandler;
+	public static PacketHandler getPacketHandler() {
+		Preconditions.checkNotNull(packetHandler);
+		return packetHandler;
+	}
 
-    public static boolean isDreamcraftLoaded;
+	@EventHandler
+	public void preInit(FMLPreInitializationEvent event) {
+		packetHandler = new PacketHandler();
 
-    @EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        checkForCoFHLib();
-        packetHandler = new PacketHandler();
+		// Register event handler
+		EventHandlerCore eventHandlerCore = new EventHandlerCore();
+		MinecraftForge.EVENT_BUS.register(eventHandlerCore);
+		MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
+		MinecraftForge.EVENT_BUS.register(Config.class);
+		Proxies.common.registerEventHandlers();
 
-        isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
+		configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID);
+		Config.load(event.getSide());
 
-        // Register event handler
-        EventHandlerCore eventHandlerCore = new EventHandlerCore();
-        MinecraftForge.EVENT_BUS.register(eventHandlerCore);
-        FMLCommonHandler.instance().bus().register(eventHandlerCore);
-        MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler());
+		MinecraftForge.EVENT_BUS.post(new ForestryEvent.PreInit(this, event));
 
-        configFolder = new File(event.getModConfigurationDirectory(), "forestry");
-        Config.load();
+		ModuleManager.runSetup(event);
+		ModuleManager.getInternalHandler().runSetup();
 
-        PluginManager.runSetup();
+		String gameMode = Config.gameMode;
+		Preconditions.checkNotNull(gameMode);
+		ForestryAPI.activeMode = new GameMode(gameMode);
 
-        ForestryAPI.activeMode = new GameMode(Config.gameMode);
+		MigrationHelper.registerFixable();
 
-        PluginManager.runPreInit();
-    }
+		ModuleManager.getInternalHandler().runPreInit(event.getSide());
+	}
 
-    @EventHandler
-    public void init(FMLInitializationEvent event) {
-        // Register gui handler
-        NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
+	@SubscribeEvent(priority = EventPriority.LOWEST)
+	public void registerItems(RegistryEvent.Register<Item> event) {
+		ModuleManager.getInternalHandler().runRegisterBackpacksAndCrates();
+	}
 
-        PluginManager.runInit();
-    }
+	@SubscribeEvent
+	public void registerModels(ModelRegistryEvent event) {
+		Proxies.render.registerModels();
+	}
 
-    @EventHandler
-    public void postInit(FMLPostInitializationEvent event) {
-        PluginManager.runPostInit();
+	@EventHandler
+	public void init(FMLInitializationEvent event) {
+		// Register gui handler
+		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
 
-        // Parse Mail Blacklist
-        Config.parseMailBlacklist();
+		ModuleManager.getInternalHandler().runInit();
 
-        // Register world generator
-        WorldGenerator worldGenerator = new WorldGenerator();
-        GameRegistry.registerWorldGenerator(worldGenerator, 0);
+		Proxies.render.registerItemAndBlockColors();
+		AdvancementManager.registerTriggers();
+	}
 
-        // Register tick handlers
-        Proxies.common.registerTickHandlers(worldGenerator);
+	@EventHandler
+	public void postInit(FMLPostInitializationEvent event) {
+		ModuleManager.getInternalHandler().runPostInit();
 
-        // Handle IMC messages.
-        PluginManager.processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
-    }
+		// Register world generator
+		WorldGenerator worldGenerator = new WorldGenerator();
+		GameRegistry.registerWorldGenerator(worldGenerator, 0);
 
-    @EventHandler
-    public void serverStarting(FMLServerStartingEvent event) {
-        PluginManager.serverStarting(event.getServer());
-    }
+		// Register tick handlers
+		Proxies.common.registerTickHandlers(worldGenerator);
 
-    public File getConfigFolder() {
-        return configFolder;
-    }
+		// Handle IMC messages.
+		ModuleManager.getInternalHandler().processIMCMessages(FMLInterModComms.fetchRuntimeMessages(ForestryAPI.instance));
+	}
 
-    @EventHandler
-    public void processIMCMessages(IMCEvent event) {
-        PluginManager.processIMCMessages(event.getMessages());
-    }
+	@EventHandler
+	public void serverStarting(FMLServerStartingEvent event) {
+		ModuleManager.serverStarting(event.getServer());
+	}
 
-    @EventHandler
-    public void missingMapping(FMLMissingMappingsEvent event) {
-        for (MissingMapping mapping : event.get()) {
-            if (mapping.type == Type.BLOCK) {
-                Block block = GameRegistry.findBlock(Constants.MOD, StringUtil.cleanTags(mapping.name));
-                if (block != null) {
-                    mapping.remap(block);
-                    Log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block));
-                }
-            } else {
-                Item item = GameRegistry.findItem(Constants.MOD, StringUtil.cleanTags(mapping.name));
-                if (item != null) {
-                    mapping.remap(item);
-                    Log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanItemName(item));
-                }
-            }
-        }
-    }
+	@Nullable
+	public File getConfigFolder() {
+		return configFolder;
+	}
 
-    private static void checkForCoFHLib() {
-        if (!ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy")) {
-            throw new RuntimeException(
-                    "CoFHAPI|energy could not be found! This version of Forestry does not contain the RedstoneFlux API anymore, so you have to install either CoFHLib or CoFHCore.");
-        }
-    }
+	@EventHandler
+	public void processIMCMessages(IMCEvent event) {
+		ModuleManager.getInternalHandler().processIMCMessages(event.getMessages());
+	}
 }

src/main/java/forestry/api/LICENSE.txt

@@ -0,0 +1,11 @@
+License („MIT“)
+
+Forestry API
+
+Copyright (c) 2011 - 2014 SirSengir.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/java/forestry/api/README.md

@@ -0,0 +1,26 @@
+Forestry API
+====================================
+
+### What is it?
+
+Forestry is a modification for the game Minecraft and known primarily for its farms and bees. This is the API for inter-mod operations.
+
+### Homepage
+
+[Wiki](http://forestry.sengir.net/)
+
+[Forums](http://forestry.sengir.net/forum/)
+
+[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryWiki...&channels=forestry&prompt=1)
+
+### Notes
+
+This is only the API. It is not intended to be used by itself, but rather for use either with Forestry itself or another mod which wants to use a functionality of Forestry.
+
+Package versioning follows the rules laid out by http://semver.org/
+
+Bugfixes are generally welcome. If you want to contribute something which changes game mechanics, please talk to someone with commit privileges first. Nothing is more frustrating than putting a lot of work and effort into a new game mechanic and then having the PR rejected because it doesn’t fit gameplay-wise.
+
+### License & Copyright
+
+Forestry API is (c) 2011 - 2014 SirSengir and licensed under MIT. See the LICENSE.txt for more information. Note that the core Forestry source is licensed differently! The Forestry API may also contain code contributed by CovertJaguar, Player, MysteriousAges, Binnie and others.

src/main/java/forestry/api/apiculture/ApicultureCapabilities.java

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+
+public class ApicultureCapabilities {
+	/**
+	 * Capability for {@link IArmorApiarist}.
+	 * The {@link Capability#getDefaultInstance()} will always protect the wearer with no side effects.
+	 */
+	@CapabilityInject(IArmorApiarist.class)
+	public static Capability<IArmorApiarist> ARMOR_APIARIST;
+}

src/main/java/forestry/api/apiculture/BeeManager.java

@@ -5,51 +5,71 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.ArrayList;
+import javax.annotation.Nullable;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
 /**
- *
  * Some miscellaneous lists and settings for bees.
  *
  * @author SirSengir
  */
 public class BeeManager {
 
-    /**
-     * 0 - Common Village Bees 1 - Uncommon Village Bees (20 % of spawns)
-     */
-    public static ArrayList<IBeeGenome>[] villageBees;
+	/**
+	 * Common Village Bees
+	 */
+	public static List<IBeeGenome> commonVillageBees;
+	/**
+	 * Uncommon Village Bees (20 % of spawns)
+	 */
+	public static List<IBeeGenome> uncommonVillageBees;
 
-    /**
-     * List of items that can induce swarming. Integer denotes x in 1000 chance.
-     */
-    public static HashMap<ItemStack, Integer> inducers = new HashMap<ItemStack, Integer>();
+	/**
+	 * List of items that can induce swarming. Integer denotes x in 1000 chance.
+	 */
+	public static final Map<ItemStack, Integer> inducers = new HashMap<>();
 
-    /**
-     * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")
-     */
-    public static IBeeRoot beeRoot;
+	/**
+	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootBees")
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeRoot beeRoot;
 
-    /**
-     * Used to create new bees.
-     */
-    public static IBeeFactory beeFactory;
+	/**
+	 * Used to create new bees.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeFactory beeFactory;
 
-    /**
-     * Used to create new bee mutations.
-     */
-    public static IBeeMutationFactory beeMutationFactory;
+	/**
+	 * Used to create new bee mutations.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IBeeMutationFactory beeMutationFactory;
 
-    /**
-     * Used to get Forestry's jubilance implementations.
-     */
-    public static IJubilanceFactory jubilanceFactory;
+	/**
+	 * Used to get Forestry's jubilance implementations.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IJubilanceFactory jubilanceFactory;
 
-    /**
-     * Used to check whether a player is wearing Apiarist Armor.
-     */
-    public static IArmorApiaristHelper armorApiaristHelper;
+	/**
+	 * Used to check whether a player is wearing Apiarist Armor.
+	 *
+	 * @implNote Only null if the "apiculture" module is not enabled.
+	 */
+	@Nullable
+	public static IArmorApiaristHelper armorApiaristHelper;
 }

src/main/java/forestry/api/apiculture/DefaultBeeListener.java

@@ -8,19 +8,24 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IIndividual;
 
 /**
- * Easily extendable default IBeeListener. By itself, this IBeeListener does nothing. BeeListeners should inherit from
- * this class unless they need to listen for everything.
+ * Easily extendable default IBeeListener.
+ * By itself, this IBeeListener does nothing.
+ * BeeListeners should inherit from this class unless they need to listen for everything.
  */
 public class DefaultBeeListener implements IBeeListener {
+	@Override
+	public void wearOutEquipment(int amount) {
 
-    @Override
-    public void wearOutEquipment(int amount) {}
+	}
 
-    @Override
-    public void onQueenDeath() {}
+	@Override
+	public void onQueenDeath() {
+
+	}
+
+	@Override
+	public boolean onPollenRetrieved(IIndividual pollen) {
+		return false;
+	}
 
-    @Override
-    public boolean onPollenRetrieved(IIndividual pollen) {
-        return false;
-    }
 }

src/main/java/forestry/api/apiculture/DefaultBeeModifier.java

@@ -5,53 +5,63 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
+
 /**
- * Easily extendable default IBeeModifier. By itself, this IBeeModifier does nothing. BeeModifiers should inherit from
- * this class unless they modify everything.
+ * Easily extendable default IBeeModifier.
+ * By itself, this IBeeModifier does nothing.
+ * BeeModifiers should inherit from this class unless they modify everything.
  */
 public class DefaultBeeModifier implements IBeeModifier {
 
-    public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
-        return 1.0f;
-    }
+	@Override
+	public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
 
-    public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-        return 1.0f;
-    }
+	@Override
+	public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
+		return 1.0f;
+	}
 
-    public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-        return 1.0f;
-    }
+	@Override
+	public float getLifespanModifier(IBeeGenome genome, @Nullable IBeeGenome mate, float currentModifier) {
+		return 1.0f;
+	}
 
-    public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-        return 0.0f;
-    }
+	@Override
+	public float getProductionModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
 
-    public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
-        return 1.0f;
-    }
+	@Override
+	public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
 
-    public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
-        return 1.0f;
-    }
+	@Override
+	public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
+		return 1.0f;
+	}
 
-    public boolean isSealed() {
-        return false;
-    }
+	@Override
+	public boolean isSealed() {
+		return false;
+	}
 
-    public boolean isSelfLighted() {
-        return false;
-    }
+	@Override
+	public boolean isSelfLighted() {
+		return false;
+	}
 
-    public boolean isSelfUnlighted() {
-        return false;
-    }
+	@Override
+	public boolean isSunlightSimulated() {
+		return false;
+	}
 
-    public boolean isSunlightSimulated() {
-        return false;
-    }
+	@Override
+	public boolean isHellish() {
+		return false;
+	}
 
-    public boolean isHellish() {
-        return false;
-    }
 }

src/main/java/forestry/api/apiculture/EnumBeeChromosome.java

@@ -23,90 +23,77 @@ import forestry.api.genetics.ISpeciesRoot;
  * @author SirSengir
  */
 public enum EnumBeeChromosome implements IChromosomeType {
+	/**
+	 * Species of the bee. Alleles here must implement {@link IAlleleBeeSpecies}.
+	 */
+	SPECIES(IAlleleBeeSpecies.class),
+	/**
+	 * (Production) Speed of the bee.
+	 */
+	SPEED(IAlleleFloat.class),
+	/**
+	 * Lifespan of the bee.
+	 */
+	LIFESPAN(IAlleleInteger.class),
+	/**
+	 * Fertility of the bee. Determines number of offspring.
+	 */
+	FERTILITY(IAlleleInteger.class),
+	/**
+	 * Temperature difference to its native supported one the bee can tolerate.
+	 */
+	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
+	/**
+	 * If true, a naturally diurnal bee can work during the night. If true, a naturally nocturnal bee can work during the day.
+	 */
+	NEVER_SLEEPS(IAlleleBoolean.class),
+	/**
+	 * Humidity difference to its native supported one the bee can tolerate.
+	 */
+	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
+	/**
+	 * If true the bee can work during rain.
+	 */
+	TOLERATES_RAIN(IAlleleBoolean.class),
+	/**
+	 * If true, the bee can work without a clear view of the sky.
+	 */
+	CAVE_DWELLING(IAlleleBoolean.class),
+	/**
+	 * Contains the supported flower provider.
+	 */
+	FLOWER_PROVIDER(IAlleleFlowers.class),
+	/**
+	 * Determines pollination speed.
+	 */
+	FLOWERING(IAlleleInteger.class),
+	/**
+	 * Determines the size of the bee's territory.
+	 */
+	TERRITORY(IAlleleArea.class),
+	/**
+	 * Determines the bee's effect.
+	 */
+	EFFECT(IAlleleBeeEffect.class);
 
-    /**
-     * Species of the bee. Alleles here must implement {@link IAlleleBeeSpecies}.
-     */
-    SPECIES(IAlleleBeeSpecies.class),
-    /**
-     * (Production) Speed of the bee.
-     */
-    SPEED(IAlleleFloat.class),
-    /**
-     * Lifespan of the bee.
-     */
-    LIFESPAN(IAlleleInteger.class),
-    /**
-     * Fertility of the bee. Determines number of offspring.
-     */
-    FERTILITY(IAlleleInteger.class),
-    /**
-     * Temperature difference to its native supported one the bee can tolerate.
-     */
-    TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
-    /**
-     * Slightly incorrectly named. If true, a naturally dirunal bee can work during the night. If true, a naturally
-     * nocturnal bee can work during the day.
-     */
-    NOCTURNAL(IAlleleBoolean.class),
-    /**
-     * Not used / superseded by fixed values for the species. Probably going to be replaced with a boolean for
-     * FIRE_RESIST.
-     */
-    @Deprecated
-    HUMIDITY(IAllele.class),
-    /**
-     * Humidity difference to its native supported one the bee can tolerate.
-     */
-    HUMIDITY_TOLERANCE(IAlleleTolerance.class),
-    /**
-     * If true the bee can work during rain.
-     */
-    TOLERANT_FLYER(IAlleleBoolean.class),
-    /**
-     * If true, the bee can work without a clear view of the sky.
-     */
-    CAVE_DWELLING(IAlleleBoolean.class),
-    /**
-     * Contains the supported flower provider.
-     */
-    FLOWER_PROVIDER(IAlleleFlowers.class),
-    /**
-     * Determines pollination speed.
-     */
-    FLOWERING(IAlleleInteger.class),
-    /**
-     * Determines the size of the bee's territory.
-     */
-    TERRITORY(IAlleleArea.class),
-    /**
-     * Determines the bee's effect.
-     */
-    EFFECT(IAlleleBeeEffect.class);
+	private final Class<? extends IAllele> alleleClass;
 
-    final Class<? extends IAllele> clss;
+	EnumBeeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
+	}
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumBeeChromosome[] VALUES = values();
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return alleleClass;
+	}
 
-    EnumBeeChromosome(Class<? extends IAllele> clss) {
-        this.clss = clss;
-    }
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase(Locale.ENGLISH);
+	}
 
-    @Override
-    public Class<? extends IAllele> getAlleleClass() {
-        return clss;
-    }
-
-    @Override
-    public String getName() {
-        return this.toString().toLowerCase(Locale.ENGLISH);
-    }
-
-    @Override
-    public ISpeciesRoot getSpeciesRoot() {
-        return BeeManager.beeRoot;
-    }
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return BeeManager.beeRoot;
+	}
 }

src/main/java/forestry/api/apiculture/EnumBeeType.java

@@ -10,29 +10,17 @@ import java.util.Locale;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumBeeType implements ISpeciesType {
+	DRONE, PRINCESS, QUEEN, LARVAE;
 
-    DRONE,
-    PRINCESS,
-    QUEEN,
-    LARVAE,
-    NONE;
+	public static final EnumBeeType[] VALUES = values();
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumBeeType[] VALUES = values();
+	private final String name;
 
-    private final String name;
+	EnumBeeType() {
+		this.name = this.toString().toLowerCase(Locale.ENGLISH);
+	}
 
-    EnumBeeType() {
-        this.name = this.toString().toLowerCase(Locale.ENGLISH);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static EnumBeeType fromOrdinal(int ordinal) {
-        return VALUES[ordinal];
-    }
+	public String getName() {
+		return name;
+	}
 }

src/main/java/forestry/api/apiculture/FlowerManager.java

@@ -5,43 +5,22 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.ArrayList;
-
-import net.minecraft.item.ItemStack;
-
 import forestry.api.genetics.IFlowerRegistry;
 
 public class FlowerManager {
+	/**
+	 * <blockquote><pre>e.g. FlowerManager.flowerRegister.registerPlantableFlower(new ItemStack(Blocks.RED_FLOWER), 1.0, FlowerManager.FlowerTypeVanilla, FlowerManager.FlowerTypeSnow);</pre></blockquote>
+	 */
+	public static IFlowerRegistry flowerRegistry;
 
-    /**
-     * <blockquote>
-     * 
-     * <pre>
-     * e.g.FlowerManager.flowerRegister.registerPlantableFlower(
-     *         new ItemStack(Blocks.red_flower),
-     *         1.0,
-     *         FlowerManager.FlowerTypeVanilla,
-     *         FlowerManager.FlowerTypeSnow);
-     * </pre>
-     * 
-     * </blockquote>
-     */
-    public static IFlowerRegistry flowerRegistry;
+	public static final String FlowerTypeVanilla = "flowersVanilla";
+	public static final String FlowerTypeNether = "flowersNether";
+	public static final String FlowerTypeCacti = "flowersCacti";
+	public static final String FlowerTypeMushrooms = "flowersMushrooms";
+	public static final String FlowerTypeEnd = "flowersEnd";
+	public static final String FlowerTypeJungle = "flowersJungle";
+	public static final String FlowerTypeSnow = "flowersSnow";
+	public static final String FlowerTypeWheat = "flowersWheat";
+	public static final String FlowerTypeGourd = "flowersGourd";
 
-    public static final String FlowerTypeVanilla = "flowersVanilla";
-    public static final String FlowerTypeNether = "flowersNether";
-    public static final String FlowerTypeCacti = "flowersCacti";
-    public static final String FlowerTypeMushrooms = "flowersMushrooms";
-    public static final String FlowerTypeEnd = "flowersEnd";
-    public static final String FlowerTypeJungle = "flowersJungle";
-    public static final String FlowerTypeSnow = "flowersSnow";
-    public static final String FlowerTypeWheat = "flowersWheat";
-    public static final String FlowerTypeGourd = "flowersGourd";
-
-    /**
-     * @deprecated since Forestry 3.4. Use IFlowerRegistry.registerPlantableFlower instead. Completely unused since
-     *             Forestry 4.0, kept for backward compatibility with older mods.
-     */
-    @Deprecated
-    public static ArrayList<ItemStack> plainFlowers = new ArrayList<ItemStack>();
 }

src/main/java/forestry/api/apiculture/IAlleleBeeAcceleratableEffect.java

@@ -1,9 +0,0 @@
-package forestry.api.apiculture;
-
-import forestry.api.genetics.IEffectData;
-
-@SuppressWarnings("unused")
-public interface IAlleleBeeAcceleratableEffect {
-
-    IEffectData doEffectAccelerated(IBeeGenome genome, IEffectData storedData, IBeeHousing housing, float did);
-}

src/main/java/forestry/api/apiculture/IAlleleBeeEffect.java

@@ -7,26 +7,30 @@ package forestry.api.apiculture;
 
 import forestry.api.genetics.IAlleleEffect;
 import forestry.api.genetics.IEffectData;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IAlleleBeeEffect extends IAlleleEffect {
 
-    /**
-     * Called by apiaries to cause an effect in the world.
-     *
-     * @param genome     Genome of the bee queen causing this effect
-     * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
-     * @param housing    {@link IBeeHousing} the bee currently resides in.
-     * @return storedData, may have been manipulated.
-     */
-    IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+	/**
+	 * Called by apiaries to cause an effect in the world. (server)
+	 *
+	 * @param genome     Genome of the bee queen causing this effect
+	 * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing    {@link IBeeHousing} the bee currently resides in.
+	 * @return storedData, may have been manipulated.
+	 */
+	IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
+
+	/**
+	 * Is called to produce visual bee effects. (client)
+	 *
+	 * @param genome     Genome of the bee queen causing this effect
+	 * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
+	 * @param housing    {@link IBeeHousing} the bee currently resides in.
+	 * @return storedData, may have been manipulated.
+	 */
+	@SideOnly(Side.CLIENT)
+	IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
 
-    /**
-     * Is called to produce bee effects.
-     *
-     * @param genome
-     * @param storedData Object containing the stored effect data for the apiary/hive the bee is in.
-     * @param housing    {@link IBeeHousing} the bee currently resides in.
-     * @return storedData, may have been manipulated.
-     */
-    IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
 }

src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java

@@ -7,49 +7,47 @@ package forestry.api.apiculture;
 
 import java.util.Map;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.core.IModelManager;
 import forestry.api.genetics.IAlleleSpecies;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public interface IAlleleBeeSpecies extends IAlleleSpecies {
 
-    /**
-     * @return the IBeeRoot
-     */
-    IBeeRoot getRoot();
+	/**
+	 * @return the IBeeRoot
+	 */
+	@Override
+	IBeeRoot getRoot();
 
-    /**
-     * @return true if this species is only active at night.
-     */
-    boolean isNocturnal();
+	/**
+	 * @return true if this species is only active at night.
+	 */
+	boolean isNocturnal();
 
-    /**
-     * @return Map of possible products with the chance for drop each bee cycle. (0 - 1]
-     */
-    Map<ItemStack, Float> getProductChances();
+	/**
+	 * @return Map of possible products with the chance for drop each bee cycle. (0 - 1]
+	 */
+	Map<ItemStack, Float> getProductChances();
 
-    /**
-     * @return Map of possible specialities with the chance for drop each bee cycle. (0 - 1]
-     */
-    Map<ItemStack, Float> getSpecialtyChances();
+	/**
+	 * @return Map of possible specialities with the chance for drop each bee cycle. (0 - 1]
+	 */
+	Map<ItemStack, Float> getSpecialtyChances();
 
-    /**
-     * Only jubilant bees produce specialities.
-     * 
-     * @return true if the bee is jubilant, false otherwise.
-     */
-    boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
+	/**
+	 * Only jubilant bees produce specialities.
+	 *
+	 * @return true if the bee is jubilant, false otherwise.
+	 */
+	boolean isJubilant(IBeeGenome genome, IBeeHousing housing);
 
-    @SideOnly(Side.CLIENT)
-    IIcon getIcon(EnumBeeType type, int renderPass);
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumBeeType type);
 
-    /**
-     * @deprecated since Forestry 3.6.
-     * @return Path of the texture to use for entity rendering.
-     */
-    @Deprecated
-    String getEntityTexture();
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
 }

src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesBuilder.java

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.genetics.IAlleleSpeciesBuilder;
+import net.minecraft.item.ItemStack;
+
+public interface IAlleleBeeSpeciesBuilder extends IAlleleSpeciesBuilder {
+
+	@Override
+	IAlleleBeeSpecies build();
+
+	/**
+	 * Add a product for this bee species.
+	 * Chance is between 0 and 1.
+	 */
+	IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance);
+
+	/**
+	 * Add a specialty product for this bee species.
+	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
+	 * Chance is between 0 and 1.
+	 */
+	IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance);
+
+	/**
+	 * Set the Jubilance Provider for this bee species.
+	 * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
+	 */
+	IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider);
+
+	/**
+	 * Make this species only active at night.
+	 */
+	IAlleleBeeSpeciesBuilder setNocturnal();
+
+	/**
+	 * Use this if you have custom icons for bees.
+	 */
+	IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider);
+
+	/**
+	 * Use this if you have custom icon colours for bees (other than the default static primary + secondary colours).
+	 */
+	IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider);
+}

src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesCustom.java

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.apiculture;
-
-import net.minecraft.item.ItemStack;
-
-import forestry.api.genetics.IAlleleSpeciesCustom;
-
-public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom {
-
-    /**
-     * Add a product for this bee species. Chance is between 0 and 1.
-     */
-    IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
-
-    /**
-     * Add a specialty product for this bee species. Bees only produce their specialty when they are Jubilant (see
-     * IJubilanceProvider) Chance is between 0 and 1.
-     */
-    IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance);
-
-    /**
-     * Set the Jubilance Provider for this bee species. Bees only produce their specialty when they are Jubilant (see
-     * IJubilanceProvider)
-     */
-    IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider);
-
-    /**
-     * Get the Jubilance Provider for this bee species.
-     */
-    default IJubilanceProvider getJubilanceProvider() {
-        return null;
-    }
-
-    /**
-     * Make this species only active at night.
-     */
-    IAlleleBeeSpeciesCustom setNocturnal();
-
-    /** Use this if you have custom icons for bees. */
-    IAlleleBeeSpeciesCustom setCustomBeeIconProvider(IBeeIconProvider beeIconProvider);
-
-    /**
-     * Use this if you have custom icon colours for bees (other than the default static primary + secondary colours).
-     */
-    IAlleleBeeSpeciesCustom setCustomBeeIconColourProvider(IBeeIconColourProvider beeIconColourProvider);
-}

src/main/java/forestry/api/apiculture/IApiaristTracker.java

@@ -9,46 +9,46 @@ import forestry.api.genetics.IBreedingTracker;
 import forestry.api.genetics.IIndividual;
 
 /**
- * Can be used to garner information on bee breeding. See {@link forestry.api.genetics.ISpeciesRoot} for retrieval
- * functions.
+ * Can be used to garner information on bee breeding. See {@link forestry.api.genetics.ISpeciesRoot} for retrieval functions.
  *
  * @author SirSengir
  */
 public interface IApiaristTracker extends IBreedingTracker {
 
-    /**
-     * Register the birth of a queen. Will mark species as discovered.
-     *
-     * @param queen Created queen.
-     */
-    void registerQueen(IIndividual queen);
+	/**
+	 * Register the birth of a queen. Will mark species as discovered.
+	 *
+	 * @param queen Created queen.
+	 */
+	void registerQueen(IIndividual queen);
 
-    /**
-     * @return Amount of queens bred with this tracker.
-     */
-    int getQueenCount();
+	/**
+	 * @return Amount of queens bred with this tracker.
+	 */
+	int getQueenCount();
 
-    /**
-     * Register the birth of a princess. Will mark species as discovered.
-     *
-     * @param princess Created princess.
-     */
-    void registerPrincess(IIndividual princess);
+	/**
+	 * Register the birth of a princess. Will mark species as discovered.
+	 *
+	 * @param princess Created princess.
+	 */
+	void registerPrincess(IIndividual princess);
 
-    /**
-     * @return Amount of princesses bred with this tracker.
-     */
-    int getPrincessCount();
+	/**
+	 * @return Amount of princesses bred with this tracker.
+	 */
+	int getPrincessCount();
 
-    /**
-     * Register the birth of a drone. Will mark species as discovered.
-     *
-     * @param drone Created drone.
-     */
-    void registerDrone(IIndividual drone);
+	/**
+	 * Register the birth of a drone. Will mark species as discovered.
+	 *
+	 * @param drone Created drone.
+	 */
+	void registerDrone(IIndividual drone);
+
+	/**
+	 * @return Amount of drones bred with this tracker.
+	 */
+	int getDroneCount();
 
-    /**
-     * @return Amount of drones bred with this tracker.
-     */
-    int getDroneCount();
 }

src/main/java/forestry/api/apiculture/IArmorApiarist.java

@@ -5,36 +5,25 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 /**
- * When implemented by armor piece items, allows them to act as apiarist's armor.
+ * When implemented as a capability by armor items, protects the wearer from negative bee effects.
+ *
+ * @see ApicultureCapabilities#ARMOR_APIARIST
  */
 public interface IArmorApiarist {
-
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     *
-     * @param entity    Entity being attacked
-     * @param armor     Armor item
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return Whether or not the armor should protect the player from that attack
-     */
-    boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect);
-
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     *
-     * @param player    Player being attacked
-     * @param armor     Armor item
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return Whether or not the armor should protect the player from that attack
-     * @deprecated since Forestry 4.2. Use protectEntity
-     */
-    @Deprecated
-    public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect);
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 *
+	 * @param entity    Entity being attacked
+	 * @param armor     Armor item
+	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect Whether or not to actually do the side effects of protection
+	 * @return Whether or not the armor should protect the player from that attack
+	 */
+	boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect);
 }

src/main/java/forestry/api/apiculture/IArmorApiaristHelper.java

@@ -6,7 +6,6 @@
 package forestry.api.apiculture;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 /**
@@ -16,51 +15,27 @@ import net.minecraft.item.ItemStack;
  */
 public interface IArmorApiaristHelper {
 
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     * 
-     * @param stack     ItemStack to check
-     * @param entity    Entity being attacked
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
-     * @since Forestry 4.2
-     */
-    boolean isArmorApiarist(ItemStack stack, EntityLivingBase entity, String cause, boolean doProtect);
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 *
+	 * @param stack     ItemStack to check
+	 * @param entity    Entity being attacked
+	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect Whether or not to actually do the side effects of protection
+	 * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
+	 * @since Forestry 4.2
+	 */
+	boolean isArmorApiarist(ItemStack stack, EntityLivingBase entity, String cause, boolean doProtect);
 
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     * 
-     * @param entity    Entity being attacked
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting
-     * @since Forestry 4.2
-     */
-    int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
-
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     * 
-     * @param stack     ItemStack to check
-     * @param player    Player being attacked
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return Whether or not the item is valid Apiarist Armor and should protect the player from that attack
-     * @deprecated since Forestry 4.2. use the EntityLivingBase version
-     */
-    @Deprecated
-    boolean isArmorApiarist(ItemStack stack, EntityPlayer player, String cause, boolean doProtect);
-
-    /**
-     * Called when the apiarist's armor acts as protection against an attack.
-     * 
-     * @param player    Player being attacked
-     * @param cause     Optional cause of attack, such as a bee effect identifier
-     * @param doProtect Whether or not to actually do the side effects of protection
-     * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting
-     * @deprecated since Forestry 4.2. use the EntityLivingBase version
-     */
-    @Deprecated
-    int wearsItems(EntityPlayer player, String cause, boolean doProtect);
+	/**
+	 * Called when the apiarist's armor acts as protection against an attack.
+	 *
+	 * @param entity    Entity being attacked
+	 * @param cause     Optional cause of attack, such as a bee effect identifier
+	 * @param doProtect Whether or not to actually do the side effects of protection
+	 * @return The number of valid Apiarist Armor pieces the player is wearing that are actually protecting.
+	 * 4 means full protection, but it can go higher if they are holding items like the smoker.
+	 * @since Forestry 4.2
+	 */
+	int wearsItems(EntityLivingBase entity, String cause, boolean doProtect);
 }

src/main/java/forestry/api/apiculture/IArmorApiaristMulti.java

@@ -1,20 +0,0 @@
-package forestry.api.apiculture;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-public interface IArmorApiaristMulti extends IArmorApiarist {
-
-    /**
-     * Called to determine how many pieces an armor "counts for". For instance, if this returns 4, the single piece will
-     * act as full protection.
-     *
-     * @param entity Entity being attacked
-     * @param armor  Armor item
-     * @param cause  Optional cause of attack, such as a bee effect identifier
-     * @return Amount of effective protected slots
-     */
-    default int getProtectionCount(EntityLivingBase entity, ItemStack armor, String cause) {
-        return 1;
-    }
-}

src/main/java/forestry/api/apiculture/IBee.java

@@ -5,11 +5,18 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;
 
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.biome.Biome;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import forestry.api.core.IErrorState;
 import forestry.api.genetics.IEffectData;
@@ -23,65 +30,89 @@ import forestry.api.genetics.IIndividualLiving;
  */
 public interface IBee extends IIndividualLiving {
 
-    /**
-     * @return Bee's genetic information.
-     */
-    IBeeGenome getGenome();
+	/**
+	 * @return Bee's genetic information.
+	 */
+	@Override
+	IBeeGenome getGenome();
 
-    /**
-     * @return Genetic information of the bee's mate, null if unmated.
-     */
-    IBeeGenome getMate();
+	/**
+	 * @return Genetic information of the bee's mate, null if unmated.
+	 */
+	@Nullable
+	@Override
+	IBeeGenome getMate();
 
-    /**
-     * @return true if the individual is originally of natural origin.
-     */
-    boolean isNatural();
+	/**
+	 * @return true if the individual is originally of natural origin.
+	 */
+	boolean isNatural();
 
-    /**
-     * @return generation this individual is removed from the original individual.
-     */
-    int getGeneration();
+	/**
+	 * @return generation this individual is removed from the original individual.
+	 */
+	int getGeneration();
 
-    /**
-     * Set the natural flag on this bee.
-     * 
-     * @param flag
-     */
-    void setIsNatural(boolean flag);
+	/**
+	 * Set the natural flag on this bee.
+	 */
+	void setIsNatural(boolean flag);
 
-    IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
+	IEffectData[] doEffect(IEffectData[] storedData, IBeeHousing housing);
 
-    IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
+	@SideOnly(Side.CLIENT)
+	IEffectData[] doFX(IEffectData[] storedData, IBeeHousing housing);
 
-    /**
-     * @return true if the bee may spawn offspring
-     */
-    boolean canSpawn();
+	/**
+	 * @return true if the bee may spawn offspring
+	 */
+	boolean canSpawn();
 
-    /**
-     * Determines whether the queen can work.
-     * 
-     * @param housing the {@link IBeeHousing} the bee currently resides in.
-     * @return an empty set if the queen can work, a set of error states if the queen can not work
-     */
-    Set<IErrorState> getCanWork(IBeeHousing housing);
+	/**
+	 * Determines whether the queen can work.
+	 *
+	 * @param housing the {@link IBeeHousing} the bee currently resides in.
+	 * @return an empty set if the queen can work, a set of error states if the queen can not work
+	 */
+	Set<IErrorState> getCanWork(IBeeHousing housing);
 
-    List<BiomeGenBase> getSuitableBiomes();
+	List<Biome> getSuitableBiomes();
 
-    ItemStack[] getProduceList();
+	NonNullList<ItemStack> getProduceList();
 
-    ItemStack[] getSpecialtyList();
+	NonNullList<ItemStack> getSpecialtyList();
 
-    ItemStack[] produceStacks(IBeeHousing housing);
+	NonNullList<ItemStack> produceStacks(IBeeHousing housing);
 
-    IBee spawnPrincess(IBeeHousing housing);
+	@Nullable
+	IBee spawnPrincess(IBeeHousing housing);
 
-    IBee[] spawnDrones(IBeeHousing housing);
+	List<IBee> spawnDrones(IBeeHousing housing);
 
-    void plantFlowerRandom(IBeeHousing housing);
+	/**
+	 * @deprecated since Forestry 5.5.4. Use {@link #plantFlowerRandom(IBeeHousing, List)}
+	 */
+	@Deprecated
+	void plantFlowerRandom(IBeeHousing housing);
 
-    IIndividual retrievePollen(IBeeHousing housing);
+	/**
+	 * Plants a random flower from the given list near the housing
+	 *
+	 * @param housing          the location the bee is living
+	 * @param potentialFlowers the flowers to choose from
+	 * @return the position of the planted flower, or null of none were planted
+	 * @since Forestry 5.5.4
+	 */
+	@Nullable
+	default BlockPos plantFlowerRandom(IBeeHousing housing, List<IBlockState> potentialFlowers) {
+		//noinspection deprecation
+		plantFlowerRandom(housing);
+		return null;
+	}
+
+	@Nullable
+	IIndividual retrievePollen(IBeeHousing housing);
+
+	boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
 
-    boolean pollinateRandom(IBeeHousing housing, IIndividual pollen);
 }

src/main/java/forestry/api/apiculture/IBeeFactory.java

@@ -9,33 +9,39 @@ import forestry.api.genetics.IClassification;
 
 public interface IBeeFactory {
 
-    /**
-     * Creates a new bee species. Automatically registered with AlleleManager.alleleRegistry.registerAllele() See
-     * IAlleleBeeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
-     *
-     * @param uid                    Unique Identifier for this species
-     * @param dominant               Whether this species is genetically dominant (false means it is recessive)
-     * @param authority              Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
-     * @param unlocalizedName        Unlocalized name for this species
-     * @param unlocalizedDescription Unlocalized description for this species
-     * @param branch                 Classification of this species
-     * @param binomial               Binomial name of the species sans genus ("Apis"). "humboldti" will have the bee
-     *                               species flavour name be "Apis humboldti". Feel free to use fun names or null.
-     * @param primaryColor           The outline color of this species
-     * @param secondaryColor         The body color of this species
-     * @return a new bee species allele.
-     */
-    IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName,
-            String unlocalizedDescription, IClassification branch, String binomial, int primaryColor,
-            int secondaryColor);
+	/**
+	 * Creates a new bee species.
+	 * Automatically registered with AlleleManager.alleleRegistry.registerAllele()
+	 * See IAlleleBeeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
+	 *
+	 * @param modId                  The modId of the mod that is creating the species
+	 * @param uid                    Unique Identifier for this species
+	 * @param dominant               Whether this species is genetically dominant (false means it is recessive)
+	 * @param authority              Authority for the binomial name, e.g. "Sengir" on species of base Forestry.
+	 * @param unlocalizedName        Unlocalized name for this species
+	 * @param unlocalizedDescription Unlocalized description for this species
+	 * @param branch                 Classification of this species
+	 * @param binomial               Binomial name of the species sans genus ("Apis"). "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null.
+	 * @param primaryColor           The outline color of this species
+	 * @param secondaryColor         The body color of this species
+	 * @return a new bee species allele.
+	 * @since Forestry 5.6.0.
+	 */
+	IAlleleBeeSpeciesBuilder createSpecies(String modId, String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
 
-    /**
-     * Creates a new bee branch. Must be registered with
-     * AlleleManager.alleleRegistry.getClassification("family.apidae").addMemberGroup();
-     *
-     * @param uid        Unique Identifier for this branch
-     * @param scientific approximates a "genus" in real life. Real life examples: "Micrapis", "Megapis"
-     * @return a new bee branch
-     */
-    IClassification createBranch(String uid, String scientific);
+	/**
+	 * Creates a new bee branch.
+	 * Must be registered with AlleleManager.alleleRegistry.getClassification("family.apidae").addMemberGroup();
+	 *
+	 * @param uid        Unique Identifier for this branch
+	 * @param scientific approximates a "genus" in real life. Real life examples: "Micrapis", "Megapis"
+	 * @return a new bee branch
+	 */
+	IClassification createBranch(String uid, String scientific);
+
+	/**
+	 * @deprecated since Forestry 5.6.0. use {@link #createSpecies(String, String, boolean, String, String, String, IClassification, String, int, int)}
+	 */
+	@Deprecated
+	IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
 }

src/main/java/forestry/api/apiculture/IBeeGenome.java

@@ -8,40 +8,43 @@ package forestry.api.apiculture;
 import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IGenome;
+import net.minecraft.util.math.Vec3i;
 
 /**
  * Only the default implementation is supported.
  *
  * @author SirSengir
- *
  */
 public interface IBeeGenome extends IGenome {
 
-    IAlleleBeeSpecies getPrimary();
+	@Override
+	IAlleleBeeSpecies getPrimary();
 
-    IAlleleBeeSpecies getSecondary();
+	@Override
+	IAlleleBeeSpecies getSecondary();
 
-    float getSpeed();
+	float getSpeed();
 
-    int getLifespan();
+	int getLifespan();
 
-    int getFertility();
+	int getFertility();
 
-    EnumTolerance getToleranceTemp();
+	EnumTolerance getToleranceTemp();
 
-    EnumTolerance getToleranceHumid();
+	EnumTolerance getToleranceHumid();
 
-    boolean getNocturnal();
+	boolean getNeverSleeps();
 
-    boolean getTolerantFlyer();
+	boolean getToleratesRain();
 
-    boolean getCaveDwelling();
+	boolean getCaveDwelling();
 
-    IFlowerProvider getFlowerProvider();
+	IFlowerProvider getFlowerProvider();
 
-    int getFlowering();
+	int getFlowering();
 
-    int[] getTerritory();
+	Vec3i getTerritory();
+
+	IAlleleBeeEffect getEffect();
 
-    IAlleleBeeEffect getEffect();
 }

src/main/java/forestry/api/apiculture/IBeeHousing.java

@@ -5,48 +5,49 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
+import javax.annotation.Nullable;
 
 import com.mojang.authlib.GameProfile;
-
-import forestry.api.core.IClimateProvider;
+import forestry.api.climate.IClimateProvider;
 import forestry.api.core.IErrorLogicSource;
+import forestry.api.core.ILocatable;
 import forestry.api.genetics.IHousing;
+import net.minecraft.util.math.Vec3d;
 
-public interface IBeeHousing extends IHousing, IClimateProvider, IErrorLogicSource {
+public interface IBeeHousing extends IHousing, IErrorLogicSource, IClimateProvider, ILocatable {
 
-    /**
-     * Used by BeeManager.beeRoot.createBeeHousingModifier(IBeeHousing housing) to combine bee modifiers from several
-     * sources that can change over time.
-     * 
-     * @return IBeeModifiers from the housing, frames, etc.
-     */
-    Iterable<IBeeModifier> getBeeModifiers();
+	/**
+	 * Used by {@link IBeeRoot#createBeeHousingModifier(IBeeHousing)}
+	 * to combine bee modifiers from several sources that can change over time.
+	 *
+	 * @return IBeeModifiers from the housing, frames, etc.
+	 */
+	Iterable<IBeeModifier> getBeeModifiers();
 
-    /**
-     * Used by BeeManager.beeRoot.createBeeHousingListener(IBeeHousing housing) to combine bee listeners from several
-     * sources that can change over time.
-     * 
-     * @return IBeeListeners from the housing, multiblock parts, etc.
-     */
-    Iterable<IBeeListener> getBeeListeners();
+	/**
+	 * Used by {@link IBeeRoot#createBeeHousingListener(IBeeHousing)}
+	 * to combine bee listeners from several sources that can change over time.
+	 *
+	 * @return IBeeListeners from the housing, multiblock parts, etc.
+	 */
+	Iterable<IBeeListener> getBeeListeners();
 
-    IBeeHousingInventory getBeeInventory();
+	IBeeHousingInventory getBeeInventory();
 
-    IBeekeepingLogic getBeekeepingLogic();
+	IBeekeepingLogic getBeekeepingLogic();
 
-    int getBlockLightValue();
+	int getBlockLightValue();
 
-    boolean canBlockSeeTheSky();
+	boolean canBlockSeeTheSky();
 
-    World getWorld();
+	boolean isRaining();
 
-    GameProfile getOwner();
+	@Nullable
+	GameProfile getOwner();
 
-    /**
-     * @since Forestry 4.2
-     * @return exact coordinates where bee FX should spawn from
-     */
-    Vec3 getBeeFXCoordinates();
+	/**
+	 * @return exact coordinates where bee particle FX should spawn from
+	 * @since Forestry 4.2
+	 */
+	Vec3d getBeeFXCoordinates();
 }

src/main/java/forestry/api/apiculture/IBeeHousingInventory.java

@@ -9,20 +9,20 @@ import net.minecraft.item.ItemStack;
 
 public interface IBeeHousingInventory {
 
-    ItemStack getQueen();
+	ItemStack getQueen();
 
-    ItemStack getDrone();
+	ItemStack getDrone();
 
-    void setQueen(ItemStack itemstack);
+	void setQueen(ItemStack itemstack);
 
-    void setDrone(ItemStack itemstack);
+	void setDrone(ItemStack itemstack);
 
-    /**
-     * Adds products to the housing's inventory.
-     *
-     * @param product ItemStack with the product to add.
-     * @param all     if true, success requires that all products are added
-     * @return boolean indicating success or failure.
-     */
-    boolean addProduct(ItemStack product, boolean all);
+	/**
+	 * Adds products to the housing's inventory.
+	 *
+	 * @param product ItemStack with the product to add.
+	 * @param all     if true, success requires that all products are added
+	 * @return boolean indicating success or failure.
+	 */
+	boolean addProduct(ItemStack product, boolean all);
 }

src/main/java/forestry/api/apiculture/IBeeListener.java

@@ -9,22 +9,23 @@ import forestry.api.genetics.IIndividual;
 
 public interface IBeeListener {
 
-    /**
-     * Called when the bees wear out the housing's equipment.
-     * 
-     * @param amount Integer indicating the amount worn out.
-     */
-    void wearOutEquipment(int amount);
+	/**
+	 * Called when the bees wear out the housing's equipment.
+	 *
+	 * @param amount Integer indicating the amount worn out.
+	 */
+	void wearOutEquipment(int amount);
 
-    /**
-     * Called after the children have been spawned, and before the new princess is spawned.
-     */
-    void onQueenDeath();
+	/**
+	 * Called after the children have been spawned, and before the new princess is spawned.
+	 */
+	void onQueenDeath();
+
+	/**
+	 * Called when the bees have retrieved some pollen.
+	 *
+	 * @return true if this bee listener handled the pollen.
+	 */
+	boolean onPollenRetrieved(IIndividual pollen);
 
-    /**
-     * Called when the bees have retrieved some pollen.
-     * 
-     * @return true if this bee listener handled the pollen.
-     */
-    boolean onPollenRetrieved(IIndividual pollen);
 }

src/main/java/forestry/api/apiculture/IBeeModelProvider.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import forestry.api.core.IModelManager;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public interface IBeeModelProvider {
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getModel(EnumBeeType type);
+}

src/main/java/forestry/api/apiculture/IBeeModifier.java

@@ -5,73 +5,68 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import javax.annotation.Nullable;
+
 public interface IBeeModifier {
+	/**
+	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the base territory.
+	 */
+	float getTerritoryModifier(IBeeGenome genome, float currentModifier);
 
-    /**
-     * @param genome          Genome of the bee this modifier is called for.
-     * @param currentModifier Current modifier.
-     * @return Float used to modify the base territory.
-     */
-    float getTerritoryModifier(IBeeGenome genome, float currentModifier);
+	/**
+	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param mate            Genome of the bee mate this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the base mutation chance.
+	 */
+	float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
 
-    /**
-     * @param genome          Genome of the bee this modifier is called for.
-     * @param mate            Genome of the bee mate this modifier is called for.
-     * @param currentModifier Current modifier.
-     * @return Float used to modify the base mutation chance.
-     */
-    float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+	/**
+	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float used to modify the life span of queens.
+	 */
+	float getLifespanModifier(IBeeGenome genome, @Nullable IBeeGenome mate, float currentModifier);
 
-    /**
-     * @param genome          Genome of the bee this modifier is called for.
-     * @param currentModifier Current modifier.
-     * @return Float used to modify the life span of queens.
-     */
-    float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier);
+	/**
+	 * @param genome          Genome of the bee this modifier is called for.
+	 * @param currentModifier Current modifier.
+	 * @return Float modifying the production speed of queens.
+	 */
+	float getProductionModifier(IBeeGenome genome, float currentModifier);
 
-    /**
-     * @param genome          Genome of the bee this modifier is called for.
-     * @param currentModifier Current modifier.
-     * @return Float modifying the production speed of queens.
-     */
-    float getProductionModifier(IBeeGenome genome, float currentModifier);
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @return Float modifying the flowering of queens.
+	 */
+	float getFloweringModifier(IBeeGenome genome, float currentModifier);
 
-    /**
-     * @param genome Genome of the bee this modifier is called for.
-     * @return Float modifying the flowering of queens.
-     */
-    float getFloweringModifier(IBeeGenome genome, float currentModifier);
+	/**
+	 * @param genome Genome of the bee this modifier is called for.
+	 * @return Float modifying the chance for a swarmer queen to die off.
+	 */
+	float getGeneticDecay(IBeeGenome genome, float currentModifier);
 
-    /**
-     * @param genome Genome of the bee this modifier is called for.
-     * @return Float modifying the chance for a swarmer queen to die off.
-     */
-    float getGeneticDecay(IBeeGenome genome, float currentModifier);
+	/**
+	 * @return Boolean indicating if housing can ignore rain
+	 */
+	boolean isSealed();
 
-    /**
-     * @return Boolean indicating if housing can ignore rain
-     */
-    boolean isSealed();
+	/**
+	 * @return Boolean indicating if housing can ignore darkness/night
+	 */
+	boolean isSelfLighted();
 
-    /**
-     * @return Boolean indicating if housing can ignore darkness/night. Cannot be used together with SelfUnlighted
-     */
-    boolean isSelfLighted();
+	/**
+	 * @return Boolean indicating if housing can ignore not seeing the sky
+	 */
+	boolean isSunlightSimulated();
 
-    /**
-     * @return Boolean indicating if housing can ignore lightness/day. Cannot be used together with SelfLighted
-     */
-    default boolean isSelfUnlighted() {
-        return false;
-    }
+	/**
+	 * @return Boolean indicating whether this housing simulates the nether
+	 */
+	boolean isHellish();
 
-    /**
-     * @return Boolean indicating if housing can ignore not seeing the sky
-     */
-    boolean isSunlightSimulated();
-
-    /**
-     * @return Boolean indicating whether this housing simulates the nether
-     */
-    boolean isHellish();
 }

src/main/java/forestry/api/apiculture/IBeeMutation.java

@@ -9,12 +9,11 @@ import forestry.api.genetics.IMutation;
 
 public interface IBeeMutation extends IMutation {
 
-    IBeeRoot getRoot();
+	@Override
+	IBeeRoot getRoot();
 
-    /**
-     * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an
-     *         integer previously!
-     */
-    float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0,
-            IBeeGenome genome1);
+	/**
+	 * @return float representing the chance for mutation to occur. note that this is 0 - 100 based, since it was an integer previously!
+	 */
+	float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1);
 }

src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java

@@ -5,7 +5,9 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import forestry.api.genetics.IMutationCustom;
+import forestry.api.genetics.IMutationBuilder;
 
-public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom {
+public interface IBeeMutationBuilder extends IMutationBuilder {
+	@Override
+	IBeeMutation build();
 }

src/main/java/forestry/api/apiculture/IBeeMutationFactory.java

@@ -8,17 +8,16 @@ package forestry.api.apiculture;
 import forestry.api.genetics.IAllele;
 
 public interface IBeeMutationFactory {
-
-    /**
-     * Creates a new bee mutation. Automatically registered with BeeManager.beeRoot.registerMutation() See
-     * IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation.
-     *
-     * @param parentBee0 A parent bee for this mutation
-     * @param parentBee1 A parent bee for this mutation
-     * @param result     The resulting alleles for this mutation
-     * @param chance     The chance that breeding the two parent bees will result in this mutation
-     * @return a new bee mutation.
-     */
-    IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result,
-            int chance);
+	/**
+	 * Creates a new bee mutation.
+	 * Automatically registered with BeeManager.beeRoot.registerMutation()
+	 * See IBeeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation.
+	 *
+	 * @param parentBee0 A parent bee for this mutation
+	 * @param parentBee1 A parent bee for this mutation
+	 * @param result     The resulting alleles for this mutation
+	 * @param chance     The chance that breeding the two parent bees will result in this mutation
+	 * @return a new bee mutation.
+	 */
+	IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance);
 }

src/main/java/forestry/api/apiculture/IBeeRoot.java

@@ -5,123 +5,130 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import javax.annotation.Nullable;
+import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.ISpeciesRoot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
 public interface IBeeRoot extends ISpeciesRoot {
 
-    /**
-     * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE
-     */
-    @Override
-    boolean isMember(ItemStack stack);
+	/**
+	 * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != null
+	 */
+	@Override
+	boolean isMember(ItemStack stack);
 
-    /**
-     * @return {@link IBee} pattern parsed from the passed stack's nbt data.
-     */
-    @Override
-    IBee getMember(ItemStack stack);
+	/**
+	 * @return {@link IBee} pattern parsed from the passed stack's nbt data. Null if the ItemStack is not a valid member.
+	 */
+	@Override
+	@Nullable
+	IBee getMember(ItemStack stack);
 
-    @Override
-    IBee getMember(NBTTagCompound compound);
+	@Override
+	IBee getMember(NBTTagCompound compound);
 
-    /* GENOME CONVERSION */
-    @Override
-    IBee templateAsIndividual(IAllele[] template);
+	/* GENOME CONVERSION */
+	@Override
+	IBee templateAsIndividual(IAllele[] template);
 
-    @Override
-    IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+	@Override
+	IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
 
-    @Override
-    IBeeGenome templateAsGenome(IAllele[] template);
+	@Override
+	IBeeGenome templateAsGenome(IAllele[] template);
 
-    @Override
-    IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+	@Override
+	IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
 
-    /* BREEDING TRACKER */
-    /**
-     * @param world
-     * @return {@link IApiaristTracker} associated with the passed world.
-     */
-    IApiaristTracker getBreedingTracker(World world, GameProfile player);
+	/* BREEDING TRACKER */
 
-    /* BEE SPECIFIC */
-    /**
-     * @return type of bee encoded on the itemstack. EnumBeeType.NONE if it isn't a bee.
-     */
-    @Override
-    EnumBeeType getType(ItemStack stack);
+	/**
+	 * @return {@link IApiaristTracker} associated with the passed world.
+	 */
+	@Override
+	IApiaristTracker getBreedingTracker(World world, @Nullable GameProfile player);
 
-    /**
-     * @return true if passed item is a drone. Equal to getType(ItemStack stack) == EnumBeeType.DRONE
-     */
-    boolean isDrone(ItemStack stack);
+	/* BEE SPECIFIC */
 
-    /**
-     * @return true if passed item is mated (i.e. a queen)
-     */
-    boolean isMated(ItemStack stack);
+	/**
+	 * @return type of bee encoded on the itemstack. null if it isn't a bee.
+	 */
+	@Nullable
+	@Override
+	EnumBeeType getType(ItemStack stack);
 
-    /**
-     * @param genome Valid {@link IBeeGenome}
-     * @return {@link IBee} from the passed genome
-     */
-    IBee getBee(World world, IBeeGenome genome);
+	/**
+	 * @return true if passed item is a drone. Equal to getType(ItemStack stack) == EnumBeeType.DRONE
+	 */
+	boolean isDrone(ItemStack stack);
 
-    /**
-     * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
-     *
-     * @param genome Valid {@link IBeeGenome}
-     * @param mate   Valid {@link IBee} representing the mate.
-     * @return Mated {@link IBee} from the passed genomes.
-     */
-    IBee getBee(World world, IBeeGenome genome, IBee mate);
+	/**
+	 * @return true if passed item is mated (i.e. a queen)
+	 */
+	boolean isMated(ItemStack stack);
 
-    /* TEMPLATES */
-    @Override
-    ArrayList<IBee> getIndividualTemplates();
+	/**
+	 * @param genome Valid {@link IBeeGenome}
+	 * @return {@link IBee} from the passed genome
+	 */
+	IBee getBee(IBeeGenome genome);
 
-    /* MUTATIONS */
-    @Override
-    Collection<IBeeMutation> getMutations(boolean shuffle);
+	/**
+	 * Creates an IBee suitable for a queen containing the necessary second genome for the mate.
+	 *
+	 * @param genome Valid {@link IBeeGenome}
+	 * @param mate   Valid {@link IBee} representing the mate.
+	 * @return Mated {@link IBee} from the passed genomes.
+	 */
+	IBee getBee(World world, IBeeGenome genome, IBee mate);
 
-    /* GAME MODE */
-    void resetBeekeepingMode();
+	/* TEMPLATES */
 
-    ArrayList<IBeekeepingMode> getBeekeepingModes();
+	@Override
+	List<IBee> getIndividualTemplates();
 
-    IBeekeepingMode getBeekeepingMode(World world);
+	/* MUTATIONS */
+	@Override
+	List<IBeeMutation> getMutations(boolean shuffle);
 
-    IBeekeepingMode getBeekeepingMode(String name);
+	/* GAME MODE */
+	void resetBeekeepingMode();
 
-    void registerBeekeepingMode(IBeekeepingMode mode);
+	List<IBeekeepingMode> getBeekeepingModes();
 
-    void setBeekeepingMode(World world, String name);
+	IBeekeepingMode getBeekeepingMode(World world);
 
-    /* MISC */
-    /**
-     * Creates beekeepingLogic for a housing. Should be used when the housing is created, see IBeekeepingLogic
-     */
-    IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
+	@Nullable
+	IBeekeepingMode getBeekeepingMode(String name);
 
-    /**
-     * Combines multiple modifiers from an IBeeHousing into one. Stays up to date with changes to the housing's
-     * modifiers.
-     */
-    IBeeModifier createBeeHousingModifier(IBeeHousing housing);
+	void registerBeekeepingMode(IBeekeepingMode mode);
+
+	void setBeekeepingMode(World world, IBeekeepingMode mode);
+
+	/* MISC */
+
+	/**
+	 * Creates beekeepingLogic for a housing.
+	 * Should be used when the housing is created, see IBeekeepingLogic
+	 */
+	IBeekeepingLogic createBeekeepingLogic(IBeeHousing housing);
+
+	/**
+	 * Combines multiple modifiers from an IBeeHousing into one.
+	 * Stays up to date with changes to the housing's modifiers.
+	 */
+	IBeeModifier createBeeHousingModifier(IBeeHousing housing);
+
+	/**
+	 * Combines multiple listeners from an IBeeHousing into one.
+	 * Stays up to date with changes to the housing's listeners.
+	 */
+	IBeeListener createBeeHousingListener(IBeeHousing housing);
 
-    /**
-     * Combines multiple listeners from an IBeeHousing into one. Stays up to date with changes to the housing's
-     * listeners.
-     */
-    IBeeListener createBeeHousingListener(IBeeHousing housing);
 }

src/main/java/forestry/api/apiculture/IBeeSpriteColourProvider.java

@@ -8,7 +8,6 @@ package forestry.api.apiculture;
 /**
  * Custom colour provider for bees with complicated colors.
  */
-public interface IBeeIconColourProvider {
-
-    int getIconColour(int renderPass);
+public interface IBeeSpriteColourProvider {
+	int getSpriteColour(int renderPass);
 }

src/main/java/forestry/api/apiculture/IBeekeepingLogic.java

@@ -5,53 +5,90 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import java.io.IOException;
+import java.util.List;
 
-import forestry.api.core.INBTTagable;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.INbtReadable;
+import forestry.api.core.INbtWritable;
 
 /**
- * Stores beekeeping logic for bee housings. Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
- * Save and load it to NBT using the INBTTagable methods.
+ * Stores beekeeping logic for bee housings.
+ * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing)
+ * Save and load it to NBT using the INbtWritable methods.
  */
-public interface IBeekeepingLogic extends INBTTagable {
+public interface IBeekeepingLogic extends INbtWritable, INbtReadable {
 
-    /* SERVER */
+	/* SERVER */
 
-    /**
-     * Checks that the bees can work, setting error conditions on the housing where needed
-     * 
-     * @return true if no errors are present and doWork should be called
-     */
-    boolean canWork();
+	/**
+	 * Checks that the bees can work, setting error conditions on the housing where needed
+	 *
+	 * @return true if no errors are present and doWork should be called
+	 */
+	boolean canWork();
 
-    /**
-     * Performs actual work, breeding, production, etc.
-     */
-    void doWork();
+	/**
+	 * Performs actual work, breeding, production, etc.
+	 */
+	void doWork();
 
-    /* CLIENT */
+	/**
+	 * Force the logic to refresh any cached values and error states.
+	 * Call this when a player opens the gui so that all errors are up to date.
+	 */
+	void clearCachedValues();
 
-    /**
-     * Call this when the housing comes into view of the client. (i.e. when tile.getDescriptionPacket() is called)
-     */
-    void syncToClient();
 
-    void syncToClient(EntityPlayerMP player);
+	/* CLIENT */
 
-    /**
-     * Get the progress bar for breeding and production. To avoid network spam, this is only available server-side, and
-     * must be synced manually to the client when a GUI is open.
-     */
-    int getBeeProgressPercent();
+	/**
+	 * Sync to client by using {@link #writeToNBT(NBTTagCompound)} in your {@link TileEntity#getUpdateTag()}
+	 */
+	void syncToClient();
 
-    /**
-     * Whether bee fx should be active. Internally, this is automatically synced to the client.
-     */
-    boolean canDoBeeFX();
+	void syncToClient(EntityPlayerMP player);
 
-    /**
-     * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen. Internally, the
-     * queen is automatically synced to the client for the fx.
-     */
-    void doBeeFX();
+	/**
+	 * Get the progress bar for breeding and production.
+	 * To avoid network spam, this is only available server-side,
+	 * and must be synced manually to the client when a GUI is open.
+	 */
+	int getBeeProgressPercent();
+
+	/**
+	 * Whether bee fx should be active.
+	 * Internally, this is automatically synced to the client.
+	 */
+	@SideOnly(Side.CLIENT)
+	boolean canDoBeeFX();
+
+	/**
+	 * Display bee fx. Calls IBee.doFX(IEffectData[] storedData, IBeeHousing housing) on the queen.
+	 * Internally, the queen is automatically synced to the client for the fx.
+	 */
+	@SideOnly(Side.CLIENT)
+	void doBeeFX();
+
+	/**
+	 * Used by bee fx to direct bees to nearby flowers.
+	 * These positions are synced to the client from the server.
+	 */
+	List<BlockPos> getFlowerPositions();
+
+	default void readData(PacketBuffer data) throws IOException {
+
+	}
+
+	default void writeData(PacketBuffer data) {
+
+	}
 }

src/main/java/forestry/api/apiculture/IBeekeepingMode.java

@@ -5,70 +5,65 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.ArrayList;
+import java.util.List;
 
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IBeekeepingMode {
 
-    /**
-     * @return Localized name of this beekeeping mode.
-     */
-    String getName();
+	/**
+	 * @return Localized name of this beekeeping mode.
+	 */
+	String getName();
 
-    /**
-     * @return Localized list of strings outlining the behaviour of this beekeeping mode.
-     */
-    ArrayList<String> getDescription();
+	/**
+	 * @return Localized list of strings outlining the behaviour of this beekeeping mode.
+	 */
+	List<String> getDescription();
 
-    /**
-     * @return Float used to modify the wear on comb frames.
-     */
-    float getWearModifier();
+	/**
+	 * @return Float used to modify the wear on comb frames.
+	 */
+	float getWearModifier();
 
-    /**
-     * @param queen
-     * @return fertility taking into account the birthing queen and surroundings.
-     */
-    int getFinalFertility(IBee queen, World world, int x, int y, int z);
+	/**
+	 * @return fertility taking into account the birthing queen and surroundings.
+	 */
+	int getFinalFertility(IBee queen, World world, BlockPos pos);
 
-    /**
-     * @param queen
-     * @return true if the queen is genetically "fatigued" and should not be reproduced anymore.
-     */
-    boolean isFatigued(IBee queen, IBeeHousing housing);
+	/**
+	 * @return true if the queen is genetically "fatigued" and should not be reproduced anymore.
+	 */
+	boolean isFatigued(IBee queen, IBeeHousing housing);
 
-    /**
-     * @param queen
-     * @param housing
-     * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.
-     */
-    boolean isOverworked(IBee queen, IBeeHousing housing);
+	/**		
+	 * @return true if the queen is being overworked in the bee housing (with chance). will trigger a negative effect.		
+	 * @deprecated bees max out at 16x productivity instead of being overworked.
+	 * TODO remove this method in 1.13
+	 */
+	@Deprecated
+	default boolean isOverworked(IBee queen, IBeeHousing housing) {
+		return false;
+	}
 
-    /**
-     *
-     * @param queen
-     * @param offspring
-     * @param housing
-     * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with
-     *         chance). will trigger a negative effect.
-     */
-    boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing);
+	/**
+	 * @return true if the genetic structure of the queen is breaking down during spawning of the offspring (with chance). will trigger a negative effect.
+	 */
+	boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing);
 
-    /**
-     * @param queen
-     * @return true if an offspring of this queen is considered a natural
-     */
-    boolean isNaturalOffspring(IBee queen);
+	/**
+	 * @return true if an offspring of this queen is considered a natural
+	 */
+	boolean isNaturalOffspring(IBee queen);
 
-    /**
-     * @param queen
-     * @return true if this mode allows the passed queen or princess to be multiplied
-     */
-    boolean mayMultiplyPrincess(IBee queen);
+	/**
+	 * @return true if this mode allows the passed queen or princess to be multiplied
+	 */
+	boolean mayMultiplyPrincess(IBee queen);
 
-    /**
-     * @return the bee modifier for this mode
-     */
-    IBeeModifier getBeeModifier();
+	/**
+	 * @return the bee modifier for this mode
+	 */
+	IBeeModifier getBeeModifier();
 }

src/main/java/forestry/api/apiculture/IHiveDrop.java

@@ -5,34 +5,39 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.Collection;
-
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 
 /**
  * Bees can be seeded either as hive drops or as mutation results.
- *
+ * <p>
  * Add IHiveDrops with HiveManager.get___Hive.addDrop
  *
  * @author SirSengir
  */
 public interface IHiveDrop {
 
-    ItemStack getPrincess(World world, int x, int y, int z, int fortune);
+	IBee getBeeType(IBlockAccess world, BlockPos pos);
 
-    Collection<ItemStack> getDrones(World world, int x, int y, int z, int fortune);
+	NonNullList<ItemStack> getExtraItems(IBlockAccess world, BlockPos pos, int fortune);
 
-    Collection<ItemStack> getAdditional(World world, int x, int y, int z, int fortune);
+	/**
+	 * Chance to drop a bee or extra items. Default drops have 0.80 (= 80 %).
+	 *
+	 * @param world Minecraft world this is called for.
+	 * @param pos   Coordinates of the broken hive.
+	 * @return Chance for drop as a float of 0.0 - 1.0.
+	 */
+	double getChance(IBlockAccess world, BlockPos pos, int fortune);
 
-    /**
-     * Chance to drop. Default drops have 80 (= 80 %).
-     *
-     * @param world Minecraft world this is called for.
-     * @param x     x-Coordinate of the broken hive.
-     * @param y     y-Coordinate of the broken hive.
-     * @param z     z-Coordinate of the broken hive.
-     * @return Chance for drop as an integer of 0 - 100.
-     */
-    int getChance(World world, int x, int y, int z);
+	/**
+	 * Chance for the princess to be ignoble. Default is around 0.4 to 0.7 (40% - 70%).
+	 *
+	 * @param world Minecraft world this is called for.
+	 * @param pos   Coordinates of the broken hive.
+	 * @return Chance for ignoble as a float of 0.0 - 1.0.
+	 */
+	double getIgnobleChance(IBlockAccess world, BlockPos pos, int fortune);
 }

src/main/java/forestry/api/apiculture/IHiveFrame.java

@@ -5,37 +5,33 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import java.util.List;
-
-import javax.annotation.Nullable;
-
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public interface IHiveFrame {
 
-    /**
-     * Wears out a frame.
-     *
-     * @param housing IBeeHousing the frame is contained in.
-     * @param frame   ItemStack containing the actual frame.
-     * @param queen   Current queen in the caller.
-     * @param wear    Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already
-     *                been taken into account.
-     * @return ItemStack containing the actual frame with adjusted damage, or null if it has been broken.
-     */
-    ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
+	/**
+	 * Wears out a frame.
+	 *
+	 * @param housing IBeeHousing the frame is contained in.
+	 * @param frame   ItemStack containing the actual frame.
+	 * @param queen   Current queen in the caller.
+	 * @param wear    Integer denoting the amount worn out. The wear modifier of the current beekeeping mode has already been taken into account.
+	 * @return ItemStack containing the actual frame with adjusted damage, or Empty ItemStack if it has been broken.
+	 */
+	ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
 
-    IBeeModifier getBeeModifier();
+	/**
+	 * @param frame ItemStack containing the actual frame.
+	 * @return the {@link IBeeModifier} for this frame.
+	 * @since Forestry 5.5.1
+	 */
+	default IBeeModifier getBeeModifier(ItemStack frame) {
+		return getBeeModifier();
+	}
 
-    /**
-     * Provides an override for the "Hold Shift" tooltip info for a frame.<br>
-     * Called by {@link forestry.apiculture.EventHandlerApiculture#addFrameTooltip(ItemTooltipEvent)}.
-     *
-     * @return The info to display for this frame, or null if default generated info.
-     */
-    @Nullable
-    default List<String> getFrameTooltip() {
-        return null;
-    }
+	/**
+	 * @deprecated since Forestry 5.5.1. Use {@link #getBeeModifier(ItemStack)}
+	 */
+	@Deprecated
+	IBeeModifier getBeeModifier();
 }

src/main/java/forestry/api/apiculture/IHiveTile.java

@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.apiculture;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IHiveTile {
+	/**
+	 * Call to calm agitated bees. Used by the smoker to stop wild bees from attacking as much.
+	 * Bees will not stay calm for very long.
+	 */
+	void calmBees();
+
+	boolean isAngry();
+
+	/**
+	 * Called when the hive is attacked.
+	 */
+	void onAttack(World world, BlockPos pos, EntityPlayer player);
+
+	/**
+	 * Called when the hive is broken.
+	 */
+	void onBroken(World world, BlockPos pos, EntityPlayer player, boolean canHarvest);
+}

src/main/java/forestry/api/apiculture/IJubilanceFactory.java

@@ -5,13 +5,16 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 
 public interface IJubilanceFactory {
+	/**
+	 * The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee.
+	 */
+	IJubilanceProvider getDefault();
 
-    /** The default Jubilance Provider is satisfied when the humidity and temperature are ideal for the bee. */
-    IJubilanceProvider getDefault();
-
-    /** The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive. */
-    IJubilanceProvider getRequiresResource(Block block, int meta);
+	/**
+	 * The Requires Resource Jubilance Provider is satisfied when a specific block is under the hive.
+	 */
+	IJubilanceProvider getRequiresResource(IBlockState... acceptedBlockStates);
 }

src/main/java/forestry/api/apiculture/IJubilanceProvider.java

@@ -7,13 +7,9 @@ package forestry.api.apiculture;
 
 public interface IJubilanceProvider {
 
-    /**
-     * Returns true when conditions are right to make this species Jubilant. Jubilant bees can produce their Specialty
-     * products.
-     */
-    boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing);
-
-    default String getDescription() {
-        return null;
-    }
+	/**
+	 * Returns true when conditions are right to make this species Jubilant.
+	 * Jubilant bees can produce their Specialty products.
+	 */
+	boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing);
 }

src/main/java/forestry/api/apiculture/hives/HiveManager.java

@@ -7,6 +7,7 @@ package forestry.api.apiculture.hives;
 
 public class HiveManager {
 
-    public static IHiveRegistry hiveRegistry;
-    public static IHiveGenHelper genHelper;
+	public static IHiveRegistry hiveRegistry;
+	public static IHiveGenHelper genHelper;
+
 }

src/main/java/forestry/api/apiculture/hives/IHiveDescription.java

@@ -5,46 +5,47 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
+import java.util.Random;
 
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
 
 public interface IHiveDescription {
 
-    /**
-     * The hive generator for this hive.
-     */
-    IHiveGen getHiveGen();
+	/**
+	 * The hive generator for this hive.
+	 */
+	IHiveGen getHiveGen();
 
-    /**
-     * The hive block to be placed in the world.
-     */
-    Block getBlock();
+	/**
+	 * The hive block to be placed in the world.
+	 */
+	IBlockState getBlockState();
 
-    int getMeta();
+	/**
+	 * returns true if the hive can be generated in these conditions.
+	 * Used as a fast early-elimination check for hives that have no hope of spawning in the area.
+	 */
+	boolean isGoodBiome(Biome biome);
 
-    /**
-     * returns true if the hive can be generated in these conditions. Used as a fast early-elimination check for hives
-     * that have no hope of spawning in the area.
-     */
-    boolean isGoodBiome(BiomeGenBase biome);
+	boolean isGoodHumidity(EnumHumidity humidity);
 
-    boolean isGoodHumidity(EnumHumidity humidity);
+	boolean isGoodTemperature(EnumTemperature temperature);
 
-    boolean isGoodTemperature(EnumTemperature temperature);
+	/**
+	 * float representing the relative chance a hive will generate in a chunk.
+	 * Default is 1.0, higher numbers result in more hives, smaller will result in fewer.
+	 * Tree hives want around 3.0 to 4.0 since there are less locations to generate on.
+	 */
+	float getGenChance();
 
-    /**
-     * float representing the relative chance a hive will generate in a chunk. Default is 1.0, higher numbers result in
-     * more hives, smaller will result in fewer. Tree hives want around 3.0 to 4.0 since there are less locations to
-     * generate on.
-     */
-    float getGenChance();
-
-    /**
-     * Called after successful hive generation. world, x, y, z give the location of the new hive.
-     **/
-    void postGen(World world, int x, int y, int z);
+	/**
+	 * Called after successful hive generation.
+	 * world, x, y, z give the location of the new hive.
+	 **/
+	void postGen(World world, Random rand, BlockPos pos);
 }

src/main/java/forestry/api/apiculture/hives/IHiveGen.java

@@ -5,23 +5,30 @@
  ******************************************************************************/
 package forestry.api.apiculture.hives;
 
+import javax.annotation.Nullable;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IHiveGen {
 
-    /**
-     * return a Y value that the hive should try to generate at. returns negative if the hive can't be placed anywhere.
-     */
-    int getYForHive(World world, int x, int z);
+	/**
+	 * return a position that the hive should try to generate at.
+	 * returns null if the hive can't be placed anywhere.
+	 */
+	@Nullable
+	BlockPos getPosForHive(World world, int x, int z);
 
-    /**
-     * returns true if the hive can be generated at this location. Used for advanced conditions, like checking that the
-     * ground below the hive is a certain type.
-     */
-    boolean isValidLocation(World world, int x, int y, int z);
+	/**
+	 * returns true if the hive can be generated at this location.
+	 * Used for advanced conditions, like checking that the ground below the hive is a certain type.
+	 */
+	boolean isValidLocation(World world, BlockPos pos);
+
+	/**
+	 * returns true if the hive can safely replace the block at this location.
+	 */
+	boolean canReplace(IBlockState blockState, World world, BlockPos pos);
 
-    /**
-     * returns true if the hive can safely replace the block at this location.
-     */
-    boolean canReplace(World world, int x, int y, int z);
 }

src/main/java/forestry/api/apiculture/hives/IHiveGenHelper.java

@@ -9,14 +9,15 @@ import net.minecraft.block.Block;
 
 public interface IHiveGenHelper {
 
-    /**
-     * Returns a hiveGen for a hive that spawns on the ground. validGroundBlocks specifies which block materials it can
-     * spawn on.
-     */
-    IHiveGen ground(Block... validGroundBlocks);
+	/**
+	 * Returns a hiveGen for a hive that spawns on the ground.
+	 * validGroundBlocks specifies which block materials it can spawn on.
+	 */
+	IHiveGen ground(Block... validGroundBlocks);
+
+	/**
+	 * Returns a hiveGen for a hive that spawns in trees.
+	 */
+	IHiveGen tree();
 
-    /**
-     * Returns a hiveGen for a hive that spawns in trees.
-     */
-    IHiveGen tree();
 }

src/main/java/forestry/api/apiculture/hives/IHiveRegistry.java

@@ -6,29 +6,64 @@
 package forestry.api.apiculture.hives;
 
 import java.util.List;
+import java.util.Locale;
+
+import net.minecraft.util.IStringSerializable;
 
 import forestry.api.apiculture.IHiveDrop;
 
 public interface IHiveRegistry {
 
-    /* Forestry Hive Names */
-    public static final String forest = "Forestry:forest";
-    public static final String meadows = "Forestry:meadows";
-    public static final String desert = "Forestry:desert";
-    public static final String jungle = "Forestry:jungle";
-    public static final String end = "Forestry:end";
-    public static final String snow = "Forestry:snow";
-    public static final String swamp = "Forestry:swamp";
+	/* Forestry Hive Names */
+	enum HiveType implements IStringSerializable {
+		FOREST("forestry:forest", "forestry.speciesForest"),
+		MEADOWS("forestry:meadows", "forestry.speciesMeadows"),
+		DESERT("forestry:desert", "forestry.speciesModest"),
+		JUNGLE("forestry:jungle", "forestry.speciesTropical"),
+		END("forestry:end", "forestry.speciesEnded"),
+		SNOW("forestry:snow", "forestry.speciesWintry"),
+		SWAMP("forestry:swamp", "forestry.speciesMarshy"),
+		SWARM("forestry:swarm", "forestry.speciesForest");
 
-    /**
-     * Adds a new hive to be generated in the world.
-     */
-    void registerHive(String hiveName, IHiveDescription hiveDescription);
+		public static final HiveType[] VALUES = values();
 
-    /**
-     * Add drops to a registered hive.
-     */
-    void addDrops(String hiveName, IHiveDrop... drops);
+		private final String hiveUid;
+		private final String speciesUid;
 
-    void addDrops(String hiveName, List<IHiveDrop> drop);
+		HiveType(String hiveUid, String speciesUid) {
+			this.hiveUid = hiveUid;
+			this.speciesUid = speciesUid;
+		}
+
+
+		public String getHiveUid() {
+			return hiveUid;
+		}
+
+
+		public String getSpeciesUid() {
+			return speciesUid;
+		}
+
+		@Override
+		public String getName() {
+			return name().toLowerCase(Locale.ENGLISH);
+		}
+
+		public int getMeta() {
+			return ordinal();
+		}
+	}
+
+	/**
+	 * Adds a new hive to be generated in the world.
+	 */
+	void registerHive(String hiveName, IHiveDescription hiveDescription);
+
+	/**
+	 * Add drops to a registered hive.
+	 */
+	void addDrops(String hiveName, IHiveDrop... drops);
+
+	void addDrops(String hiveName, List<IHiveDrop> drop);
 }

src/main/java/forestry/api/apiculture/hives/package-info.java

@@ -3,7 +3,12 @@
  *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
 @API(apiVersion = "4.1.0", owner = "ForestryAPI|apiculture", provides = "ForestryAPI|hives")
 package forestry.api.apiculture.hives;
 
-import cpw.mods.fml.common.API;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import mcp.MethodsReturnNonnullByDefault;
+import net.minecraftforge.fml.common.API;

src/main/java/forestry/api/apiculture/package-info.java

@@ -3,7 +3,12 @@
  *
  * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
  ******************************************************************************/
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
 @API(apiVersion = "5.0.0", owner = "ForestryAPI|core", provides = "ForestryAPI|apiculture")
 package forestry.api.apiculture;
 
-import cpw.mods.fml.common.API;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import mcp.MethodsReturnNonnullByDefault;
+import net.minecraftforge.fml.common.API;

src/main/java/forestry/api/arboriculture/ArboricultureCapabilities.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+
+import forestry.api.core.IArmorNaturalist;
+
+public class ArboricultureCapabilities {
+	/**
+	 * Capability for {@link IArmorNaturalist}.
+	 * The {@link Capability#getDefaultInstance()} will always show pollination with no side effects.
+	 */
+	@CapabilityInject(IArmorNaturalist.class)
+	public static Capability<IArmorNaturalist> ARMOR_NATURALIST;
+}

src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java

@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.Locale;
+import java.util.Random;
+
+public enum EnumForestryWoodType implements IWoodType {
+	LARCH(4),
+	TEAK(4),
+	ACACIA(4),
+	LIME(4),
+	CHESTNUT(4),
+	WENGE(4),
+	BAOBAB(4),
+	SEQUOIA(3, 4.0f),
+
+	KAPOK(4),
+	EBONY(4),
+	MAHOGANY(4),
+	BALSA(4, 1.0f),
+	WILLOW(4),
+	WALNUT(4),
+	GREENHEART(4, 7.5f),
+	CHERRY(4),
+
+	MAHOE(4),
+	POPLAR(4),
+	PALM(4),
+	PAPAYA(4),
+	PINE(4, 3.0f),
+	PLUM(4),
+	MAPLE(4),
+	CITRUS(4),
+
+	GIGANTEUM(3, 4.0f),
+	IPE(4),
+	PADAUK(4),
+	COCOBOLO(4),
+	ZEBRAWOOD(4);
+
+	public static final float DEFAULT_HARDNESS = 2.0f;
+	public static final EnumForestryWoodType[] VALUES = values();
+
+	private final int carbonization;
+	private final float hardness;
+
+	EnumForestryWoodType(int carbonization) {
+		this(carbonization, DEFAULT_HARDNESS);
+	}
+
+	EnumForestryWoodType(int carbonization, float hardness) {
+		this.carbonization = carbonization;
+		this.hardness = hardness;
+	}
+
+	@Override
+	public float getHardness() {
+		return hardness;
+	}
+
+	public static EnumForestryWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	public static EnumForestryWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if (numberOfCharcoal == 3) {
+			return 0.75F;
+		} else if (numberOfCharcoal == 4) {
+			return 0.5F;
+		} else if (numberOfCharcoal == 5) {
+			return 0.25F;
+		}
+		return 0.15F;
+	}
+
+	@Override
+	public String getPlankTexture() {
+		return "forestry:blocks/wood/planks." + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		return "forestry:blocks/doors/" + getName() + "_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		return "forestry:blocks/doors/" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		return "forestry:blocks/wood/bark." + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		return "forestry:blocks/wood/heart." + getName();
+	}
+}

src/main/java/forestry/api/arboriculture/EnumFruitFamily.java

@@ -5,44 +5,45 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IFruitFamily;
 
 public enum EnumFruitFamily implements IFruitFamily {
+	PRUNES("prunes", "Prunus domestica"),
+	POMES("pomes", "Pomum"),
+	JUNGLE("jungle", "Tropicus"),
+	NUX("nuts", "Nux"),
+	NONE("none", "None");
 
-    PRUNES("prunes", "Prunus domestica"),
-    POMES("pomes", "Pomum"),
-    JUNGLE("jungle", "Tropicus"),
-    NUX("nuts", "Nux");
+	private final String uid;
+	private final String scientific;
 
-    private final String uid;
-    private final String scientific;
+	EnumFruitFamily(String uid, String scientific) {
+		this.uid = uid;
+		this.scientific = scientific;
+		AlleleManager.alleleRegistry.registerFruitFamily(this);
+	}
 
-    EnumFruitFamily(String uid, String scientific) {
-        this.uid = uid;
-        this.scientific = scientific;
-        AlleleManager.alleleRegistry.registerFruitFamily(this);
-    }
+	@Override
+	public String getUID() {
+		return "forestry." + uid;
+	}
 
-    @Override
-    public String getUID() {
-        return "forestry." + uid;
-    }
+	@Override
+	public String getScientific() {
+		return this.scientific;
+	}
 
-    @Override
-    public String getScientific() {
-        return this.scientific;
-    }
+	@Override
+	public String getName() {
+		return I18n.translateToLocal("for.family." + uid);
+	}
 
-    @Override
-    public String getName() {
-        return StatCollector.translateToLocal("for.family." + uid);
-    }
+	@Override
+	public String getDescription() {
+		return I18n.translateToLocal("for.family." + uid + ".description");
+	}
 
-    @Override
-    public String getDescription() {
-        return StatCollector.translateToLocal("for.family." + uid + ".description");
-    }
 }

src/main/java/forestry/api/arboriculture/EnumGermlingType.java

@@ -8,22 +8,18 @@ package forestry.api.arboriculture;
 import forestry.api.genetics.ISpeciesType;
 
 public enum EnumGermlingType implements ISpeciesType {
+	SAPLING("sapling"), POLLEN("pollen");
 
-    SAPLING("sapling"),
-    BLOSSOM("blossom"),
-    POLLEN("pollen"),
-    GERMLING("germling"),
-    NONE("none");
+	public static final EnumGermlingType[] VALUES = values();
 
-    public static final EnumGermlingType[] VALUES = values();
+	private final String name;
 
-    private final String name;
+	EnumGermlingType(String name) {
+		this.name = name;
+	}
 
-    EnumGermlingType(String name) {
-        this.name = name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public String getName() {
-        return name;
-    }
 }

src/main/java/forestry/api/arboriculture/EnumLeafType.java

@@ -6,10 +6,5 @@
 package forestry.api.arboriculture;
 
 public enum EnumLeafType {
-    DECIDUOUS,
-    CONIFERS,
-    JUNGLE,
-    WILLOW,
-    MAPLE,
-    PALM
+	DECIDUOUS, CONIFERS, JUNGLE, WILLOW, MAPLE, PALM
 }

src/main/java/forestry/api/arboriculture/EnumPileType.java

@@ -5,10 +5,10 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-public enum EnumGrowthConditions {
-    HOSTILE,
-    PALTRY,
-    NORMAL,
-    GOOD,
-    EXCELLENT
+public enum EnumPileType {
+	WOOD,
+	DIRT,
+	ASH;
+
+	public static final EnumPileType[] VALUES = values();
 }

src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java

@@ -7,97 +7,76 @@ package forestry.api.arboriculture;
 
 import java.util.Locale;
 
-import net.minecraftforge.common.EnumPlantType;
-
 import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleArea;
 import forestry.api.genetics.IAlleleBoolean;
 import forestry.api.genetics.IAlleleFloat;
 import forestry.api.genetics.IAlleleInteger;
-import forestry.api.genetics.IAllelePlantType;
 import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.IFruitFamily;
 import forestry.api.genetics.ISpeciesRoot;
+import net.minecraftforge.common.EnumPlantType;
 
 public enum EnumTreeChromosome implements IChromosomeType {
 
-    /**
-     * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits
-     * which {@link IFruitProvider} will actually yield fruit with this species. - Native {@link EnumPlantType} for this
-     * tree. Combines with the PLANT chromosome.
-     */
-    SPECIES(IAlleleTreeSpecies.class),
-    /**
-     * {@link IGrowthProvider}, determines conditions required by the tree to grow.
-     */
-    GROWTH(IAlleleGrowth.class),
-    /**
-     * A float modifying the height of the tree. Taken into account at worldgen.
-     */
-    HEIGHT(IAlleleFloat.class),
-    /**
-     * Chance for saplings.
-     */
-    FERTILITY(IAlleleFloat.class),
-    /**
-     * {@link IFruitProvider}, determines if and what fruits are grown on the tree. Limited by the {@link IFruitFamily}s
-     * the species supports.
-     */
-    FRUITS(IAlleleFruit.class),
-    /**
-     * Chance for fruit leaves and/or drops.
-     */
-    YIELD(IAlleleFloat.class),
-    /**
-     * May add additional tolerances for {@link EnumPlantTypes}.
-     */
-    PLANT(IAllelePlantType.class),
-    /**
-     * Determines the speed at which fruit will ripen on this tree.
-     */
-    SAPPINESS(IAlleleFloat.class),
-    /**
-     * Territory for leaf effects. Unused.
-     */
-    TERRITORY(IAlleleArea.class),
-    /**
-     * Leaf effect. Unused.
-     */
-    EFFECT(IAlleleLeafEffect.class),
-    /**
-     * Amount of random ticks which need to elapse before a sapling will grow into a tree.
-     */
-    MATURATION(IAlleleInteger.class),
+	/**
+	 * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider}
+	 * will actually yield fruit with this species. - Native {@link EnumPlantType} for this tree. Combines with the PLANT chromosome.
+	 */
+	SPECIES(IAlleleTreeSpecies.class),
+	/**
+	 * A float modifying the height of the tree. Taken into account at worldgen.
+	 */
+	HEIGHT(IAlleleFloat.class),
+	/**
+	 * Chance for saplings.
+	 */
+	FERTILITY(IAlleleFloat.class),
+	/**
+	 * {@link IFruitProvider}, determines if and what fruits are grown on the tree. Limited by the {@link IFruitFamily}s the species supports.
+	 */
+	FRUITS(IAlleleFruit.class),
+	/**
+	 * Chance for fruit leaves and/or drops.
+	 */
+	YIELD(IAlleleFloat.class),
+	/**
+	 * Determines the speed at which fruit will ripen on this tree.
+	 */
+	SAPPINESS(IAlleleFloat.class),
+	/**
+	 * Leaf effect. Unused.
+	 */
+	EFFECT(IAlleleLeafEffect.class),
+	/**
+	 * Amount of random ticks which need to elapse before a sapling will grow into a tree.
+	 */
+	MATURATION(IAlleleInteger.class),
 
-    GIRTH(IAlleleInteger.class),
-    /**
-     * Determines if the tree can burn.
-     */
-    FIREPROOF(IAlleleBoolean.class);
+	GIRTH(IAlleleInteger.class),
+	/**
+	 * Determines if the tree can burn.
+	 */
+	FIREPROOF(IAlleleBoolean.class),;
 
-    final Class<? extends IAllele> clss;
+	private final Class<? extends IAllele> alleleClass;
 
-    /**
-     * Cached values() array for frequent read-only operations, the array should NOT be mutated.
-     */
-    public static final EnumTreeChromosome[] VALUES = values();
+	EnumTreeChromosome(Class<? extends IAllele> alleleClass) {
+		this.alleleClass = alleleClass;
+	}
 
-    EnumTreeChromosome(Class<? extends IAllele> clss) {
-        this.clss = clss;
-    }
+	@Override
+	public Class<? extends IAllele> getAlleleClass() {
+		return alleleClass;
+	}
 
-    @Override
-    public Class<? extends IAllele> getAlleleClass() {
-        return clss;
-    }
+	@Override
+	public String getName() {
+		return this.toString().toLowerCase(Locale.ENGLISH);
+	}
 
-    @Override
-    public String getName() {
-        return this.toString().toLowerCase(Locale.ENGLISH);
-    }
+	@Override
+	public ISpeciesRoot getSpeciesRoot() {
+		return TreeManager.treeRoot;
+	}
 
-    @Override
-    public ISpeciesRoot getSpeciesRoot() {
-        return TreeManager.treeRoot;
-    }
 }

src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java

@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import java.util.Locale;
+import java.util.Random;
+
+import net.minecraft.block.BlockPlanks;
+
+public enum EnumVanillaWoodType implements IWoodType {
+	OAK(BlockPlanks.EnumType.OAK, 5),
+	SPRUCE(BlockPlanks.EnumType.SPRUCE, 4),
+	BIRCH(BlockPlanks.EnumType.BIRCH, 4),
+	JUNGLE(BlockPlanks.EnumType.JUNGLE, 5),
+	ACACIA(BlockPlanks.EnumType.ACACIA, 4),
+	DARK_OAK(BlockPlanks.EnumType.DARK_OAK, 5);
+
+	public static final EnumVanillaWoodType[] VALUES = values();
+
+	public static EnumVanillaWoodType getRandom(Random random) {
+		return VALUES[random.nextInt(VALUES.length)];
+	}
+
+	private final BlockPlanks.EnumType vanillaType;
+	private final int carbonization;
+
+	EnumVanillaWoodType(BlockPlanks.EnumType vanillaType, int carbonization) {
+		this.vanillaType = vanillaType;
+		this.carbonization = carbonization;
+	}
+
+	public BlockPlanks.EnumType getVanillaType() {
+		return vanillaType;
+	}
+
+	@Override
+	public String toString() {
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+
+	@Override
+	public String getName() {
+		return toString();
+	}
+
+	@Override
+	public int getMetadata() {
+		return ordinal();
+	}
+
+	public static EnumVanillaWoodType byMetadata(int meta) {
+		if (meta < 0 || meta >= VALUES.length) {
+			meta = 0;
+		}
+		return VALUES[meta];
+	}
+
+	@Override
+	public float getHardness() {
+		return 2.0F;
+	}
+
+	@Override
+	public int getCarbonization() {
+		return carbonization;
+	}
+
+	@Override
+	public float getCharcoalChance(int numberOfCharcoal) {
+		if (numberOfCharcoal == 3) {
+			return 0.75F;
+		} else if (numberOfCharcoal == 4) {
+			return 0.5F;
+		} else if (numberOfCharcoal == 5) {
+			return 0.25F;
+		}
+		return 0.15F;
+	}
+
+	@Override
+	public String getPlankTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/planks_big_oak";
+		}
+		return "blocks/planks_" + getName();
+	}
+
+	@Override
+	public String getDoorLowerTexture() {
+		if (this == OAK) {
+			return "blocks/door_wood_lower";
+		}
+		return "blocks/door_wood_lower";
+	}
+
+	@Override
+	public String getDoorUpperTexture() {
+		if (this == OAK) {
+			return "blocks/door_wood_upper";
+		}
+		return "blocks/door_" + getName() + "_upper";
+	}
+
+	@Override
+	public String getBarkTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/log_big_oak";
+		}
+		return "blocks/log_" + getName();
+	}
+
+	@Override
+	public String getHeartTexture() {
+		if (this == DARK_OAK) {
+			return "blocks/log_big_oak_top";
+		}
+		return "blocks/log_" + getName() + "_top";
+	}
+}

src/main/java/forestry/api/arboriculture/EnumWoodType.java

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import java.util.Locale;
-import java.util.Random;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-public enum EnumWoodType {
-
-    LARCH,
-    TEAK,
-    ACACIA,
-    LIME,
-    CHESTNUT,
-    WENGE,
-    BAOBAB,
-    SEQUOIA(4.0f),
-    KAPOK,
-    EBONY,
-    MAHOGANY,
-    BALSA(1.0f),
-    WILLOW,
-    WALNUT,
-    GREENHEART(7.5f),
-    CHERRY,
-    MAHOE,
-    POPLAR,
-    PALM,
-    PAPAYA,
-    PINE(3.0f),
-    PLUM,
-    MAPLE,
-    CITRUS,
-    GIGANTEUM,
-    IPE,
-    PADAUK,
-    COCOBOLO,
-    ZEBRAWOOD;
-
-    public static final float DEFAULT_HARDNESS = 2.0f;
-    public static final EnumWoodType[] VALUES = values();
-
-    private final float hardness;
-
-    EnumWoodType() {
-        this.hardness = DEFAULT_HARDNESS;
-    }
-
-    EnumWoodType(float hardness) {
-        this.hardness = hardness;
-    }
-
-    public float getHardness() {
-        return hardness;
-    }
-
-    /**
-     * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
-     */
-    @Deprecated
-    public void saveToCompound(NBTTagCompound compound) {
-        compound.setInteger("WoodType", ordinal());
-    }
-
-    /**
-     * @deprecated since Forestry 4.2. Woods use itemDamage instead of NBT now
-     */
-    @Deprecated
-    public static EnumWoodType getFromCompound(NBTTagCompound compound) {
-        if (compound != null) {
-            int typeOrdinal = compound.getInteger("WoodType");
-            if (typeOrdinal >= 0 && typeOrdinal < VALUES.length) {
-                return VALUES[typeOrdinal];
-            }
-        }
-
-        return EnumWoodType.LARCH;
-    }
-
-    public static EnumWoodType getRandom(Random random) {
-        return VALUES[random.nextInt(VALUES.length)];
-    }
-
-    @Override
-    public String toString() {
-        return super.toString().toLowerCase(Locale.ENGLISH);
-    }
-}

src/main/java/forestry/api/arboriculture/IAlleleFruit.java

@@ -5,12 +5,18 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import forestry.api.genetics.IAllele;
+import javax.annotation.Nullable;
+
+import forestry.api.genetics.IAlleleProperty;
 
 /**
  * Simple allele encapsulating an {@link IFruitProvider}.
  */
-public interface IAlleleFruit extends IAllele {
+public interface IAlleleFruit extends IAlleleProperty<IAlleleFruit> {
+
+	IFruitProvider getProvider();
+
+	@Nullable
+	String getModelName();
 
-    IFruitProvider getProvider();
 }

src/main/java/forestry/api/arboriculture/IAlleleLeafEffect.java

@@ -5,15 +5,16 @@
  ******************************************************************************/
 package forestry.api.arboriculture;
 
-import net.minecraft.world.World;
-
 import forestry.api.genetics.IAlleleEffect;
 import forestry.api.genetics.IEffectData;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 /**
  * Simple allele encapsulating a leaf effect. (Not implemented)
  */
 public interface IAlleleLeafEffect extends IAlleleEffect {
 
-    IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, int x, int y, int z);
+	IEffectData doEffect(ITreeGenome genome, IEffectData storedData, World world, BlockPos pos);
+
 }

src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java

@@ -7,42 +7,61 @@ package forestry.api.arboriculture;
 
 import java.util.Collection;
 
-import net.minecraft.util.IIcon;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+
 import net.minecraftforge.common.EnumPlantType;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import forestry.api.core.IModelManager;
+import forestry.api.genetics.IAlleleProperty;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IFruitFamily;
 
-public interface IAlleleTreeSpecies extends IAlleleSpecies {
+public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleTreeSpecies> {
 
-    ITreeRoot getRoot();
+	@Override
+	ITreeRoot getRoot();
 
-    /**
-     * @return Native plant type of this species.
-     */
-    EnumPlantType getPlantType();
+	/**
+	 * @return Native plant type of this species.
+	 */
+	EnumPlantType getPlantType();
 
-    /**
-     * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
-     */
-    Collection<IFruitFamily> getSuitableFruit();
+	/**
+	 * @return List of all {@link IFruitFamily}s which can grow on leaves generated by this species.
+	 */
+	Collection<IFruitFamily> getSuitableFruit();
 
-    /**
-     * @return Tree generator for this species.
-     */
-    ITreeGenerator getGenerator();
+	/**
+	 * @return Tree generator for this species.
+	 */
+	ITreeGenerator getGenerator();
+	
+	/**
+	 * @return Float between 0 and 1 representing the rarity of the species, will affect spawn rate. If it's 0, it will not spawn.
+	 */
+	float getRarity();
 
-    /* TEXTURES AND OVERRIDES */
-    int getLeafColour(boolean pollinated);
+	IWoodProvider getWoodProvider();
+	
+	ILeafProvider getLeafProvider();
+	
+	IGrowthProvider getGrowthProvider();
 
-    @SideOnly(Side.CLIENT)
-    IIcon getLeafIcon(boolean pollinated, boolean fancy);
+	/* MODELS AND OVERRIDES */
+	@SideOnly(Side.CLIENT)
+	ILeafSpriteProvider getLeafSpriteProvider();
 
-    @SideOnly(Side.CLIENT)
-    IIcon getGermlingIcon(EnumGermlingType type, int renderPass);
+	@SideOnly(Side.CLIENT)
+	int getGermlingColour(EnumGermlingType type, int renderPass);
+
+	@SideOnly(Side.CLIENT)
+	ModelResourceLocation getGermlingModel(EnumGermlingType type);
+
+	@SideOnly(Side.CLIENT)
+	void registerModels(Item item, IModelManager manager, EnumGermlingType type);
 
-    @SideOnly(Side.CLIENT)
-    int getGermlingColour(EnumGermlingType type, int renderPass);
 }

src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesBuilder.java

@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright 2011-2014 SirSengir
+ *
+ * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
+ ******************************************************************************/
+package forestry.api.arboriculture;
+
+import forestry.api.genetics.IAlleleSpeciesBuilder;
+import forestry.api.genetics.IFruitFamily;
+import net.minecraftforge.common.EnumPlantType;
+
+public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder {
+
+	@Override
+	IAlleleTreeSpecies build();
+
+	/**
+	 * Add a fruit family for this tree. Trees can have multiple fruit families.
+	 */
+	IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family);
+
+	/**
+	 * Set the minecraft plant type for this tree. Default is Plains.
+	 */
+	IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type);
+	
+	/**
+	 * Set rarity of the species, will affect spawn rate in the world. Must be a float between 0 and 1. If it's 0, it will not spawn.
+	 */
+	IAlleleTreeSpeciesBuilder setRarity(float rarity);
+	
+	/**
+	 * Set the growth provider.
+	 */
+	IAlleleTreeSpeciesBuilder setGrowthProvider(IGrowthProvider growthProvider);
+
+}

src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesCustom.java

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright 2011-2014 SirSengir
- *
- * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details.
- ******************************************************************************/
-package forestry.api.arboriculture;
-
-import net.minecraftforge.common.EnumPlantType;
-
-import forestry.api.genetics.IAlleleSpeciesCustom;
-import forestry.api.genetics.IFruitFamily;
-
-public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
-
-    /** Add a fruit family for this tree. Trees can have multiple fruit families. */
-    IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
-
-    /** Set the minecraft plant type for this tree. Default is Plains. */
-    IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
-}