Merge pull request #18 from AlbertoPirillo/genetics-better-info

Genetics - Better info for Acclimatiser and Isolator

.github/scripts/test-no-crash-reports.sh

@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
-  echo "Crash reports detected:"
-  cat $directory/*
-  exit 1
-else
-  echo "No crash reports detected"
-  exit 0
-fi

.github/scripts/test-no-error-reports.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+RUNDIR="run"
+CRASH="crash-reports"
+SERVERLOG="server.log"
+
+if [[ -d $RUNDIR/$CRASH ]]; then
+  echo "Crash reports detected:"
+  cat $RUNDIR/$CRASH/crash*.txt
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" $SERVERLOG; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+

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

@@ -1,5 +1,3 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Build and test
 
@@ -11,35 +9,5 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with: 
-        fetch-depth: 0
-    
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-    
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1 minute
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 60 ./gradlew runServer || true
-
-    - name: Test no crashes happend
-      run: |
-        chmod +x .github/scripts/test-no-crash-reports.sh
-        .github/scripts/test-no-crash-reports.sh
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -1,45 +1,14 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Release tagged build
 
 on:
   push:
-    tags:
-      - '*'
+    tags: [ '*' ]
+
+permissions:
+  contents: write
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

.gitignore

@@ -1,6 +1,7 @@
 .gradle
 .settings
 /.idea/
+/.vscode/
 /run/
 /build/
 /eclipse/
@@ -27,3 +28,5 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*.json
 *.bat
+*.DS_Store
+!gradlew.bat

CODEOWNERS

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

LICENSE.txt

@@ -1,7 +1,7 @@
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -163,678 +163,3 @@ 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>.

build.gradle

@@ -1,49 +1,71 @@
-//version: 928ecf7feb33a1149538b0e2cd17e3bc5f281428
+//version: 1656760175
 /*
 DO NOT CHANGE THIS FILE!
 
 Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
- */
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+*/
 
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+import org.gradle.internal.logging.text.StyledTextOutputFactory
 
+import java.nio.file.Files
+import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
 
 buildscript {
     repositories {
         maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
         }
         maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
         maven {
-            name = "Scala CI dependencies"
-            url = "https://repo1.maven.org/maven2/"
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
         }
         maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
+            name 'jitpack'
+            url 'https://jitpack.io'
         }
     }
     dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
 
 plugins {
+    id 'java-library'
     id 'idea'
+    id 'eclipse'
     id 'scala'
-    id("org.ajoberstar.grgit") version("3.1.1")
-    id("com.github.johnrengelman.shadow") version("4.0.4")
-    id("com.palantir.git-version") version("0.12.3")
+    id 'maven-publish'
+    id 'org.jetbrains.kotlin.jvm'        version '1.5.30'       apply false
+    id 'org.jetbrains.kotlin.kapt'       version '1.5.30'       apply false
+    id 'com.google.devtools.ksp'         version '1.5.30-1.0.0' apply false
+    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'com.palantir.git-version'        version '0.13.0'       apply false
+    id 'de.undercouch.download'          version '5.0.1'
+    id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
+    id "com.diffplug.spotless"           version "6.7.2"
 }
 
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
+}
+
+def out = services.get(StyledTextOutputFactory).create('an-output')
+
 apply plugin: 'forge'
 
 def projectJavaVersion = JavaLanguageVersion.of(8)
@@ -62,6 +84,37 @@ idea {
     }
 }
 
+// Spotless autoformatter
+// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
+// Can be locally toggled via spotless:off/spotless:on comments
+spotless {
+    encoding 'UTF-8'
+
+    format 'misc', {
+        target '.gitignore'
+
+        trimTrailingWhitespace()
+        indentWithSpaces(4)
+        endWithNewline()
+    }
+    java {
+        toggleOffOn()
+        importOrder()
+        removeUnusedImports()
+        palantirJavaFormat('1.1.0') // last version supporting jvm 8
+    }
+    kotlin {
+        toggleOffOn()
+        ktfmt('0.39')
+    }
+    groovyGradle {
+        toggleOffOn()
+        importOrder()
+        target '*.gradle'
+        greclipse('4.19.0') // last version supporting jvm 8
+    }
+}
+
 if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
     throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
 }
@@ -87,27 +140,35 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+String channel = project.findProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
+String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
 
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
+String kotlinSourceDir = "src/main/kotlin/"
 
 String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
 String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
 }
 
 if(apiPackage) {
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
     }
 }
 
 if(accessTransformersFile) {
     String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if(getFile(targetFile).exists() == false) {
+    if(!getFile(targetFile).exists()) {
         throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
     }
 }
@@ -119,15 +180,17 @@ if(usesMixins.toBoolean()) {
 
     targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
     targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
     }
 
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
 
@@ -135,8 +198,9 @@ if(coreModClass) {
     String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
     String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
     String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
     }
 }
 
@@ -149,13 +213,35 @@ configurations.all {
 }
 
 // Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-'git config core.fileMode false'.execute()
-// Pulls version from git tag
 try {
-    version = minecraftVersion + "-" + gitVersion()
+    'git config core.fileMode false'.execute()
 }
-catch (Exception e) {
-    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+catch (Exception ignored) {
+    out.style(Style.Failure).println("git isn't installed at all")
+}
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+String versionOverride = System.getenv("VERSION") ?: null
+try {
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+}
+catch (Exception ignored) {
+    out.style(Style.Failure).text(
+            'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+                    'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+            'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+    )
+    versionOverride = 'NO-GIT-TAG-SET'
+    identifiedVersion = versionOverride
+}
+version = minecraftVersion + '-' + identifiedVersion
+ext {
+    modVersion = identifiedVersion
+}
+
+if(identifiedVersion == versionOverride) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
 }
 
 group = modGroup
@@ -166,9 +252,25 @@ else {
     archivesBaseName = modId
 }
 
+def arguments = []
+def jvmArguments = []
+
+if (usesMixins.toBoolean()) {
+    arguments += [
+            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    if (usesMixinDebug.toBoolean()) {
+        jvmArguments += [
+                "-Dmixin.debug.countInjections=true",
+                "-Dmixin.debug.verbose=true",
+                "-Dmixin.debug.export=true"
+        ]
+    }
+}
+
 minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'
 
     if (replaceGradleTokenInFile) {
         replaceIn replaceGradleTokenInFile
@@ -179,78 +281,99 @@ minecraft {
             replace gradleTokenModName, modName
         }
         if(gradleTokenVersion) {
-            replace gradleTokenVersion, versionDetails().lastTag
+            replace gradleTokenVersion, modVersion
         }
         if(gradleTokenGroupName) {
             replace gradleTokenGroupName, modGroup
         }
     }
+
+    clientIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+
+        if(developmentEnvironmentUserName) {
+            args("--username", developmentEnvironmentUserName)
+        }
+    }
+
+    serverIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+    }
 }
 
-if(file("addon.gradle").exists()) {
-    apply from: "addon.gradle"
+if(file('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
 }
 
 apply from: 'repositories.gradle'
 
 configurations {
-    implementation.extendsFrom(shadowImplementation)
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
 }
 
 repositories {
     maven {
-        name = "Overmind forge repo mirror"
-        url = "https://gregtech.overminddl1.com/"
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
     }
     if(usesMixins.toBoolean()) {
         maven {
-            name = "sponge"
-            url = "https://repo.spongepowered.org/repository/maven-public"
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
         }
         maven {
-            url = "https://jitpack.io"
+            url 'https://jitpack.io'
         }
     }
 }
 
 dependencies {
     if(usesMixins.toBoolean()) {
-        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
-        annotationProcessor("com.google.guava:guava:24.1.1-jre")
-        annotationProcessor("com.google.code.gson:gson:2.8.6")
-        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
+        annotationProcessor('com.google.guava:guava:24.1.1-jre')
+        annotationProcessor('com.google.code.gson:gson:2.8.6')
+        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
         // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
             // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: "launchwrapper"
-            exclude module: "guava"
-            exclude module: "gson"
-            exclude module: "commons-io"
-            exclude module: "log4j-core"
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
         }
-        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
     }
 }
 
 apply from: 'dependencies.gradle'
 
-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
 def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
 
 task generateAssets {
-    if(usesMixins.toBoolean()) {
-        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+    if (usesMixins.toBoolean()) {
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        if (!mixinConfigFile.exists()) {
+            mixinConfigFile.text = """{
   "required": true,
   "minVersion": "0.7.11",
   "package": "${modGroup}.${mixinsPackage}",
   "plugin": "${modGroup}.${mixinPlugin}",
   "refmap": "${mixingConfigRefMap}",
   "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [],
+  "server": []
 }
-
 """
+        }
     }
 }
 
@@ -260,16 +383,28 @@ task relocateShadowJar(type: ConfigureShadowRelocation) {
 }
 
 shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
     manifest {
         attributes(getManifestAttributes())
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation]
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
     dependsOn(relocateShadowJar)
 }
 
 jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
     manifest {
         attributes(getManifestAttributes())
     }
@@ -302,15 +437,6 @@ afterEvaluate {
 }
 
 runClient {
-    def arguments = []
-
-    if(usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
     if(developmentEnvironmentUserName) {
         arguments += [
                 "--username",
@@ -319,19 +445,12 @@ runClient {
     }
 
     args(arguments)
+    jvmArgs(jvmArguments)
 }
 
 runServer {
-    def arguments = []
-
-    if (usesMixins.toBoolean()) {
-        arguments += [
-                "--mods=../build/libs/$modId-${version}.jar",
-                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-        ]
-    }
-
     args(arguments)
+    jvmArgs(jvmArguments)
 }
 
 tasks.withType(JavaExec).configureEach {
@@ -342,36 +461,35 @@ tasks.withType(JavaExec).configureEach {
     )
 }
 
-processResources
-        {
-            // this will ensure that this task is redone when the versions change.
-            inputs.property "version", project.version
-            inputs.property "mcversion", project.minecraft.version
+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 stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
 
-                // replace version and mcversion
-                expand "minecraftVersion": project.minecraft.version,
-                        "modVersion": versionDetails().lastTag,
-                        "modId": modId,
-                        "modName": modName
-            }
+        // replace modVersion and minecraftVersion
+        expand "minecraftVersion": project.minecraft.version,
+                "modVersion": modVersion,
+                "modId": modId,
+                "modName": modName
+    }
 
-            if(usesMixins.toBoolean()) {
-                from refMap
-            }
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
 
-            // copy everything else, thats not the mcmod.info
-            from(sourceSets.main.resources.srcDirs) {
-                exclude 'mcmod.info'
-            }
-        }
+    // copy everything else that's not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
 
 def getManifestAttributes() {
     def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
         manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
     }
 
@@ -387,19 +505,25 @@ def getManifestAttributes() {
         manifestAttributes += [
                 "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
                 "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
 }
 
 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
+    from (sourceSets.main.allSource)
     from (file("$projectDir/LICENSE"))
     getArchiveClassifier().set('sources')
 }
 
 task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
     from sourceSets.main.output
     getArchiveClassifier().set("dev")
 
@@ -408,7 +532,7 @@ task shadowDevJar(type: ShadowJar) {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation]
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
 }
 
 task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -423,6 +547,12 @@ task circularResolverJar(type: Jar) {
 }
 
 task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
     from sourceSets.main.output
     getArchiveClassifier().set("dev")
 
@@ -437,7 +567,7 @@ task devJar(type: Jar) {
 }
 
 task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
+    from (sourceSets.main.allSource) {
         include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
     }
 
@@ -453,13 +583,76 @@ task apiJar(type: Jar) {
 }
 
 artifacts {
-    archives sourcesJar
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
     archives devJar
     if(apiPackage) {
         archives apiJar
     }
 }
 
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
+// and isn't strictly needed with the POM so just disable it.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "sources"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+
+            // remove extra garbage from minecraft and minecraftDeps configuration
+            pom.withXml {
+                def badArtifacts = [:].withDefault {[] as Set<String>}
+                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                    for (dependency in configuration.allDependencies) {
+                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+                    }
+                }
+                // example for specifying extra stuff to ignore
+                // badArtifacts["org.example.group"] += "artifactName"
+
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
 // Updating
 task updateBuildScript {
     doLast {
@@ -473,19 +666,19 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
     if (autoUpdateBuildScript.toBoolean()) {
         performBuildScriptUpdate(projectDir.toString())
     } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
     }
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
 }
 
 boolean performBuildScriptUpdate(String projectDir) {
     if (isNewBuildScriptVersionAvailable(projectDir)) {
         def buildscriptFile = getFile("build.gradle")
         availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
         return true
     }
     return false
@@ -516,14 +709,224 @@ configure(updateBuildScript) {
     description = 'Updates the build script to the latest version'
 }
 
+// Parameter Deobfuscation
+
+task deobfParams {
+    doLast {
+
+        String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
+        String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+        String paramsCSV = "$mcpDir/params.csv"
+
+        download.run {
+            src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+            dest mcpZIP
+            overwrite false
+        }
+
+        if(!file(paramsCSV).exists()) {
+            println("Extracting MCP archive ...")
+            unzip(mcpZIP, mcpDir)
+        }
+
+        println("Parsing params.csv ...")
+        Map<String, String> params = new HashMap<>()
+        Files.lines(Paths.get(paramsCSV)).forEach{line ->
+            String[] cells = line.split(",")
+            if(cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
+                params.put(cells[0], cells[1])
+            }
+        }
+
+        out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
+        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+    }
+}
+
+static int replaceParams(File file, Map<String, String> params) {
+    int fileCount = 0
+
+    if(file.isDirectory()) {
+        for(File f : file.listFiles()) {
+            fileCount += replaceParams(f, params)
+        }
+        return fileCount
+    }
+    println("Visiting ${file.getName()} ...")
+    try {
+        String content = new String(Files.readAllBytes(file.toPath()))
+        int hash = content.hashCode()
+        params.forEach{key, value ->
+            content = content.replaceAll(key, value)
+        }
+        if(hash != content.hashCode()) {
+            Files.write(file.toPath(), content.getBytes("UTF-8"))
+            return 1
+        }
+    } catch(Exception e) {
+        e.printStackTrace()
+    }
+    return 0
+}
+
+// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
+static unzip(String zipFileName, String outputDir) {
+    byte[] buffer = new byte[16384]
+    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+    ZipEntry zipEntry = zis.getNextEntry()
+    while (zipEntry != null) {
+        File newFile = new File(outputDir + File.separator, zipEntry.name)
+        if (zipEntry.isDirectory()) {
+            if (!newFile.isDirectory() && !newFile.mkdirs()) {
+                throw new IOException("Failed to create directory $newFile")
+            }
+        } else {
+            // fix for Windows-created archives
+            File parent = newFile.parentFile
+            if (!parent.isDirectory() && !parent.mkdirs()) {
+                throw new IOException("Failed to create directory $parent")
+            }
+            // write file content
+            FileOutputStream fos = new FileOutputStream(newFile)
+            int len = 0
+            while ((len = zis.read(buffer)) > 0) {
+                fos.write(buffer, 0, len)
+            }
+            fos.close()
+        }
+        zipEntry = zis.getNextEntry()
+    }
+    zis.closeEntry()
+    zis.close()
+}
+
+configure(deobfParams) {
+    group = 'forgegradle'
+    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+}
+
+// Dependency Deobfuscation
+
+def deobf(String sourceURL) {
+    try {
+        URL url = new URL(sourceURL)
+        String fileName = url.getFile()
+
+        //get rid of directories:
+        int lastSlash = fileName.lastIndexOf("/")
+        if(lastSlash > 0) {
+            fileName = fileName.substring(lastSlash + 1)
+        }
+        //get rid of extension:
+        if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
+            fileName = fileName.substring(0, fileName.lastIndexOf("."))
+        }
+
+        String hostName = url.getHost()
+        if(hostName.startsWith("www.")) {
+            hostName = hostName.substring(4)
+        }
+        List parts = Arrays.asList(hostName.split("\\."))
+        Collections.reverse(parts)
+        hostName = String.join(".", parts)
+
+        return deobf(sourceURL, "$hostName/$fileName")
+    } catch(Exception e) {
+        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
+    }
+}
+
+// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
+def deobf(String sourceURL, String rawFileName) {
+    String bon2Version = "2.5.1"
+    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+    String bon2Dir = "$cacheDir/forge_gradle/deobf"
+    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
+    String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
+    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
+
+    if(file(deobfFile).exists()) {
+        return files(deobfFile)
+    }
+
+    String mappingsVer
+    if(remoteMappings) {
+        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+
+        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+
+        mappingsVer = "snapshot_$id"
+    } else {
+        mappingsVer = "${channel}_$mappingsVersion"
+    }
+
+    download.run {
+        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
+        dest bon2File
+        quiet true
+        overwrite false
+    }
+
+    download.run {
+        src sourceURL
+        dest obfFile
+        quiet true
+        overwrite false
+    }
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
+        workingDir bon2Dir
+        standardOutput = new FileOutputStream("${deobfFile}.log")
+    }
+
+    return files(deobfFile)
+}
+
+def zipMappings(String zipPath, String url, String bon2Dir) {
+    File zipFile = new File(zipPath)
+    if(zipFile.exists()) {
+        return
+    }
+
+    String fieldsCache = "$bon2Dir/data/fields.csv"
+    String methodsCache = "$bon2Dir/data/methods.csv"
+
+    download.run {
+        src "${url}fields.csv"
+        dest fieldsCache
+        quiet true
+    }
+    download.run {
+        src "${url}methods.csv"
+        dest methodsCache
+        quiet true
+    }
+
+    zipFile.getParentFile().mkdirs()
+    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+
+    zos.putNextEntry(new ZipEntry("fields.csv"))
+    Files.copy(Paths.get(fieldsCache), zos)
+    zos.closeEntry()
+
+    zos.putNextEntry(new ZipEntry("methods.csv"))
+    Files.copy(Paths.get(methodsCache), zos)
+    zos.closeEntry()
+
+    zos.close()
+}
+
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
-    if (project.hasProperty(propertyName) == false) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+    if (!project.hasProperty(propertyName)) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
     }
 }
 
 def getFile(String relativePath) {
     return new File(projectDir, relativePath)
-}
+}

dependencies.gradle

@@ -1,16 +1,11 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:ForestryMC:master-SNAPSHOT:dev")
+	compile('com.github.GTNewHorizons:ForestryMC:4.4.6:dev')
+	compile('com.github.GTNewHorizons:NotEnoughItems:2.2.17-GTNH:dev')
 
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:api')
 
-    /*compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:api") {  // Transitive by ForestryMC
-        transitive = false
-    }
-    compileOnly("com.mod-buildcraft:buildcraft:7.1.23:dev") {  // Transitive by ForestryMC
-        transitive = false
-    }
-    compileOnly("curse.maven:cofh-lib-220333:2388748") {  // Transitive by ForestryMC
-        transitive = false
-    }*/
-}
+	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+	compileOnly('curse.maven:cofh-lib-220333:2388748')
+}

gradle.properties

@@ -15,29 +15,29 @@ autoUpdateBuildScript = false
 minecraftVersion = 1.7.10
 forgeVersion = 10.13.4.1614
 
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
 # restart Minecraft in development. Choose this dependent on your mod:
 # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
-developmentEnvironmentUserName = "Developer"
+developmentEnvironmentUserName = Developer
 
 # Define a source file of your project with:
 # public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# 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 =
+replaceGradleTokenInFile = BinnieCore.java
 gradleTokenModId =
 gradleTokenModName =
-gradleTokenVersion =
+gradleTokenVersion = GRADLETOKEN_VERSION
 gradleTokenGroupName =
 
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
+# 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 =
 
-# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # Example value: mymodid_at.cfg
 accessTransformersFile =
 
@@ -48,7 +48,7 @@ mixinPlugin =
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package 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 compatability only
+# 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

repositories.gradle

@@ -1,18 +1,26 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name = "ic2"
-        url = "http://maven.ic2.player.to/"
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        url = "https://jitpack.io"
-    }
+	maven {
+		name 'GTNH Maven'
+		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+		allowInsecureProtocol
+	}
+	maven {
+		name 'ic2'
+		url 'http://maven.ic2.player.to/'
+		metadataSources {
+			mavenPom()
+			artifact()
+		}
+	}
+	maven {
+		url 'https://cursemaven.com'
+		content {
+			includeGroup 'curse.maven'
+		}
+	}
+	maven {
+		url 'https://jitpack.io'
+	}
 }

src/main/java/binnie/Binnie.java

@@ -7,16 +7,15 @@ import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.ManagerMachine;
 import binnie.core.mod.config.ManagerConfig;
 import binnie.core.resource.ManagerResource;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public final class Binnie {
-	public static List<ManagerBase> Managers = new ArrayList<>();
-	public static ManagerGenetics Genetics = new ManagerGenetics();
-	public static ManagerConfig Configuration = new ManagerConfig();
-	public static ManagerLiquid Liquid = new ManagerLiquid();
-	public static ManagerMachine Machine = new ManagerMachine();
-	public static ManagerItem Item = new ManagerItem();
-	public static ManagerResource Resource = new ManagerResource();
+    public static List<ManagerBase> Managers = new ArrayList<>();
+    public static ManagerGenetics Genetics = new ManagerGenetics();
+    public static ManagerConfig Configuration = new ManagerConfig();
+    public static ManagerLiquid Liquid = new ManagerLiquid();
+    public static ManagerMachine Machine = new ManagerMachine();
+    public static ManagerItem Item = new ManagerItem();
+    public static ManagerResource Resource = new ManagerResource();
 }

src/main/java/binnie/botany/Botany.java

@@ -53,287 +53,300 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
 
 @Mod(
-	modid = "Botany",
-	name = "Botany",
-	useMetadata = true,
-	dependencies = "after:BinnieCore"
-)
+        modid = "Botany",
+        name = "Botany",
+        version = BinnieCore.VERSION,
+        useMetadata = true,
+        dependencies = "after:BinnieCore")
 public class Botany extends AbstractMod {
-	@Mod.Instance("Botany")
-	public static Botany instance;
+    @Mod.Instance("Botany")
+    public static Botany instance;
 
-	@SidedProxy(
-		clientSide = "binnie.botany.proxy.ProxyClient",
-		serverSide = "binnie.botany.proxy.ProxyServer"
-	)
-	public static Proxy proxy;
+    @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
+    public static Proxy proxy;
 
-	public static BlockFlower flower;
-	public static Item seed;
-	public static Item pollen;
-	public static ItemDictionary database;
-	public static BlockPlant plant;
-	public static ItemTrowel trowelWood;
-	public static ItemTrowel trowelStone;
-	public static ItemTrowel trowelIron;
-	public static ItemTrowel trowelDiamond;
-	public static ItemTrowel trowelGold;
-	public static BlockSoil soil;
-	public static BlockSoil loam;
-	public static BlockSoil flowerbed;
-	public static BlockSoil soilNoWeed;
-	public static BlockSoil loamNoWeed;
-	public static BlockSoil flowerbedNoWeed;
-	public static ItemInsulatedTube insulatedTube;
-	public static ItemSoilMeter soilMeter;
-	public static ItemMisc misc;
-	public static ItemFlower flowerItem;
-	public static ItemPigment pigment;
-	public static ItemClay clay;
-	public static BlockCeramic ceramic;
-	public static BlockCeramicPatterned ceramicTile;
-	public static BlockStained stained;
-	public static BlockCeramicBrick ceramicBrick;
+    public static BlockFlower flower;
+    public static Item seed;
+    public static Item pollen;
+    public static ItemDictionary database;
+    public static BlockPlant plant;
+    public static ItemTrowel trowelWood;
+    public static ItemTrowel trowelStone;
+    public static ItemTrowel trowelIron;
+    public static ItemTrowel trowelDiamond;
+    public static ItemTrowel trowelGold;
+    public static BlockSoil soil;
+    public static BlockSoil loam;
+    public static BlockSoil flowerbed;
+    public static BlockSoil soilNoWeed;
+    public static BlockSoil loamNoWeed;
+    public static BlockSoil flowerbedNoWeed;
+    public static ItemInsulatedTube insulatedTube;
+    public static ItemSoilMeter soilMeter;
+    public static ItemMisc misc;
+    public static ItemFlower flowerItem;
+    public static ItemPigment pigment;
+    public static ItemClay clay;
+    public static BlockCeramic ceramic;
+    public static BlockCeramicPatterned ceramicTile;
+    public static BlockStained stained;
+    public static BlockCeramicBrick ceramicBrick;
 
-	public Botany() {
-		Botany.instance = this;
-	}
+    public Botany() {
+        Botany.instance = this;
+    }
 
-	@Mod.EventHandler
-	public void preInit(FMLPreInitializationEvent event) {
-		addModule(new ModuleCore());
-		addModule(new ModuleGenetics());
-		addModule(new ModuleGardening());
-		preInit();
-	}
+    @Mod.EventHandler
+    public void preInit(FMLPreInitializationEvent event) {
+        addModule(new ModuleCore());
+        addModule(new ModuleGenetics());
+        addModule(new ModuleGardening());
+        preInit();
+    }
 
-	@Mod.EventHandler
-	public void init(FMLInitializationEvent event) {
-		init();
-	}
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event) {
+        init();
+    }
 
-	@Mod.EventHandler
-	public void postInit(FMLPostInitializationEvent event) {
-		postInit();
-	}
+    @Mod.EventHandler
+    public void postInit(FMLPostInitializationEvent event) {
+        postInit();
+    }
 
-	@Override
-	public IBinnieGUID[] getGUIDs() {
-		return BotanyGUI.values();
-	}
+    @Override
+    public IBinnieGUID[] getGUIDs() {
+        return BotanyGUI.values();
+    }
 
-	@Override
-	public Class<?>[] getConfigs() {
-		return new Class[0];
-	}
+    @Override
+    public Class<?>[] getConfigs() {
+        return new Class[0];
+    }
 
-	@Override
-	public IPacketID[] getPacketIDs() {
-		return PacketID.values();
-	}
+    @Override
+    public IPacketID[] getPacketIDs() {
+        return PacketID.values();
+    }
 
-	@Override
-	public IProxyCore getProxy() {
-		return Botany.proxy;
-	}
+    @Override
+    public IProxyCore getProxy() {
+        return Botany.proxy;
+    }
 
-	@Override
-	public String getChannel() {
-		return "BOT";
-	}
+    @Override
+    public String getChannel() {
+        return "BOT";
+    }
 
-	@Override
-	public String getModID() {
-		return "botany";
-	}
+    @Override
+    public String getModID() {
+        return "botany";
+    }
 
-	@Override
-	protected Class<? extends BinniePacketHandler> getPacketHandler() {
-		return PacketHandler.class;
-	}
+    @Override
+    protected Class<? extends BinniePacketHandler> getPacketHandler() {
+        return PacketHandler.class;
+    }
 
-	@SubscribeEvent
-	public void onShearFlower(PlayerInteractEvent event) {
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-			return;
-		}
+    @SubscribeEvent
+    public void onShearFlower(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
 
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
-			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-			if (tile instanceof TileEntityFlower) {
-				TileEntityFlower flower = (TileEntityFlower) tile;
-				flower.onShear();
-				event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
-			}
-		}
+        if (event.entityPlayer != null
+                && event.entityPlayer.getHeldItem() != null
+                && event.entityPlayer.getHeldItem().getItem() == Items.shears) {
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (tile instanceof TileEntityFlower) {
+                TileEntityFlower flower = (TileEntityFlower) tile;
+                flower.onShear();
+                event.entityPlayer.getHeldItem().damageItem(1, event.entityPlayer);
+            }
+        }
 
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
-			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-			if (tile instanceof TileEntityFlower) {
-				TileEntityFlower flower = (TileEntityFlower) tile;
-				IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
-				if (pollen != null && flower.canMateWith(pollen)) {
-					flower.mateWith(pollen);
-					if (!event.entityPlayer.capabilities.isCreativeMode) {
-						ItemStack heldItem = event.entityPlayer.getHeldItem();
-						heldItem.stackSize--;
-					}
-				}
-			}
-		}
-	}
+        if (event.entityPlayer != null
+                && event.entityPlayer.getHeldItem() != null
+                && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) {
+            TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+            if (tile instanceof TileEntityFlower) {
+                TileEntityFlower flower = (TileEntityFlower) tile;
+                IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
+                if (pollen != null && flower.canMateWith(pollen)) {
+                    flower.mateWith(pollen);
+                    if (!event.entityPlayer.capabilities.isCreativeMode) {
+                        ItemStack heldItem = event.entityPlayer.getHeldItem();
+                        heldItem.stackSize--;
+                    }
+                }
+            }
+        }
+    }
 
-	@SubscribeEvent
-	public void onFertiliseSoil(PlayerInteractEvent event) {
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
-			return;
-		}
+    @SubscribeEvent
+    public void onFertiliseSoil(PlayerInteractEvent event) {
+        if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
+            return;
+        }
 
-		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
-			return;
-		}
+        if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+            return;
+        }
 
-		int y = event.y;
-		Block block = event.world.getBlock(event.x, y, event.z);
-		if (block == null || !Gardening.isSoil(block)) {
-			block = event.world.getBlock(event.x, --y, event.z);
-		}
-		if (block == null || !Gardening.isSoil(block)) {
-			return;
-		}
+        int y = event.y;
+        Block block = event.world.getBlock(event.x, y, event.z);
+        if (block == null || !Gardening.isSoil(block)) {
+            block = event.world.getBlock(event.x, --y, event.z);
+        }
+        if (block == null || !Gardening.isSoil(block)) {
+            return;
+        }
 
-		IBlockSoil soil = (IBlockSoil) block;
-		if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem()) && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
-			EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
-			int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-			if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem = event.entityPlayer.getHeldItem();
-				heldItem.stackSize--;
-				return;
-			}
-		}
+        IBlockSoil soil = (IBlockSoil) block;
+        if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem())
+                && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
+            EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
+            int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
+            if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next])
+                    && !event.entityPlayer.capabilities.isCreativeMode) {
+                ItemStack heldItem = event.entityPlayer.getHeldItem();
+                heldItem.stackSize--;
+                return;
+            }
+        }
 
-		if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
-			EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-			int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
-			if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem2 = event.entityPlayer.getHeldItem();
-				heldItem2.stackSize--;
-				return;
-			}
-		}
+        if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem())
+                && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) {
+            EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
+            int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0);
+            if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
+                    && !event.entityPlayer.capabilities.isCreativeMode) {
+                ItemStack heldItem2 = event.entityPlayer.getHeldItem();
+                heldItem2.stackSize--;
+                return;
+            }
+        }
 
-		if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
-			EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-			int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
-			if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) {
-				ItemStack heldItem3 = event.entityPlayer.getHeldItem();
-				heldItem3.stackSize--;
-				return;
-			}
-		}
+        if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem())
+                && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) {
+            EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
+            int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2);
+            if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next])
+                    && !event.entityPlayer.capabilities.isCreativeMode) {
+                ItemStack heldItem3 = event.entityPlayer.getHeldItem();
+                heldItem3.stackSize--;
+                return;
+            }
+        }
 
-		if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem()) && Gardening.addWeedKiller(event.world, event.x, y, event.z) && !event.entityPlayer.capabilities.isCreativeMode) {
-			ItemStack heldItem4 = event.entityPlayer.getHeldItem();
-			heldItem4.stackSize--;
-		}
-	}
+        if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem())
+                && Gardening.addWeedKiller(event.world, event.x, y, event.z)
+                && !event.entityPlayer.capabilities.isCreativeMode) {
+            ItemStack heldItem4 = event.entityPlayer.getHeldItem();
+            heldItem4.stackSize--;
+        }
+    }
 
-	@SubscribeEvent
-	public void plantVanilla(BlockEvent.PlaceEvent event) {
-		World world = event.world;
-		int x = event.x;
-		int y = event.y;
-		int z = event.z;
-		Block block = world.getBlock(x, y - 1, z);
-		if (!(block instanceof IBlockSoil)) {
-			return;
-		}
+    @SubscribeEvent
+    public void plantVanilla(BlockEvent.PlaceEvent event) {
+        World world = event.world;
+        int x = event.x;
+        int y = event.y;
+        int z = event.z;
+        Block block = world.getBlock(x, y - 1, z);
+        if (!(block instanceof IBlockSoil)) {
+            return;
+        }
 
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
-		if (flower != null) {
-			Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
-		}
-	}
+        IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
+        if (flower != null) {
+            Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
+        }
+    }
 
-	@Deprecated
-	public void onPlantVanilla(PlayerInteractEvent event) {
-		if (!BinnieCore.proxy.isSimulating(event.world) || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
-			return;
-		}
-		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
-			return;
-		}
+    @Deprecated
+    public void onPlantVanilla(PlayerInteractEvent event) {
+        if (!BinnieCore.proxy.isSimulating(event.world)
+                || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+            return;
+        }
+        if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
+            return;
+        }
 
-		World world = event.world;
-		int x = event.x;
-		int y = event.y;
-		int z = event.z;
-		Block block = world.getBlock(x, y, z);
-		int py = -1;
-		if (block instanceof IBlockSoil && (world.isAirBlock(x, y + 1, z) || world.getBlock(x, y, z).isReplaceable(world, x, y, z))) {
-			py = 1;
-		}
+        World world = event.world;
+        int x = event.x;
+        int y = event.y;
+        int z = event.z;
+        Block block = world.getBlock(x, y, z);
+        int py = -1;
+        if (block instanceof IBlockSoil
+                && (world.isAirBlock(x, y + 1, z) || world.getBlock(x, y, z).isReplaceable(world, x, y, z))) {
+            py = 1;
+        }
 
-		if (py < 0) {
-			return;
-		}
+        if (py < 0) {
+            return;
+        }
 
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem());
-		if (flower != null && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) && !event.entityPlayer.capabilities.isCreativeMode) {
-			ItemStack heldItem = event.entityPlayer.getHeldItem();
-			heldItem.stackSize--;
-		}
-	}
+        IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem());
+        if (flower != null
+                && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile())
+                && !event.entityPlayer.capabilities.isCreativeMode) {
+            ItemStack heldItem = event.entityPlayer.getHeldItem();
+            heldItem.stackSize--;
+        }
+    }
 
-	@SubscribeEvent
-	public void onBonemeal(BonemealEvent event) {
-		Block block = event.world.getBlock(event.x, event.y, event.z);
-		if (Gardening.isSoil(block)) {
-			IBlockSoil soil = (IBlockSoil) block;
-			if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
-				event.setResult(Event.Result.ALLOW);
-			}
-		}
+    @SubscribeEvent
+    public void onBonemeal(BonemealEvent event) {
+        Block block = event.world.getBlock(event.x, event.y, event.z);
+        if (Gardening.isSoil(block)) {
+            IBlockSoil soil = (IBlockSoil) block;
+            if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
+                event.setResult(Event.Result.ALLOW);
+            }
+        }
 
-		TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
-			event.setResult(Event.Result.ALLOW);
-		}
-	}
+        TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+        if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
+            event.setResult(Event.Result.ALLOW);
+        }
+    }
 
-	@Override
-	public boolean isActive() {
-		return BinnieCore.isBotanyActive();
-	}
+    @Override
+    public boolean isActive() {
+        return BinnieCore.isBotanyActive();
+    }
 
-	@Mod.EventHandler
-	public void onIMC(FMLInterModComms.IMCEvent event) {
-		for (FMLInterModComms.IMCMessage message : event.getMessages()) {
-			if (message.key.equals("add-nutrient-fertiliser-1")) {
-				ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-nutrient-fertiliser-2")) {
-				ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 2);
-			}
-			if (message.key.equals("add-acid-fertiliser-1")) {
-				ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-acid-fertiliser-2")) {
-				ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 2);
-			}
-			if (message.key.equals("add-alkaline-fertiliser-1")) {
-				ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
-			}
-			if (message.key.equals("add-alkaline-fertiliser-2")) {
-				ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
-			}
-		}
-	}
+    @Mod.EventHandler
+    public void onIMC(FMLInterModComms.IMCEvent event) {
+        for (FMLInterModComms.IMCMessage message : event.getMessages()) {
+            if (message.key.equals("add-nutrient-fertiliser-1")) {
+                ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 1);
+            }
+            if (message.key.equals("add-nutrient-fertiliser-2")) {
+                ModuleGardening.queuedNutrientFertilisers.put(message.getItemStackValue(), 2);
+            }
+            if (message.key.equals("add-acid-fertiliser-1")) {
+                ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 1);
+            }
+            if (message.key.equals("add-acid-fertiliser-2")) {
+                ModuleGardening.queuedAcidFertilisers.put(message.getItemStackValue(), 2);
+            }
+            if (message.key.equals("add-alkaline-fertiliser-1")) {
+                ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
+            }
+            if (message.key.equals("add-alkaline-fertiliser-2")) {
+                ModuleGardening.queuedAlkalineFertilisers.put(message.getItemStackValue(), 1);
+            }
+        }
+    }
 
-	public static class PacketHandler extends BinniePacketHandler {
-		public PacketHandler() {
-			super(Botany.instance);
-		}
-	}
+    public static class PacketHandler extends BinniePacketHandler {
+        public PacketHandler() {
+            super(Botany.instance);
+        }
+    }
 }

src/main/java/binnie/botany/CreativeTabBotany.java

@@ -9,31 +9,31 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public class CreativeTabBotany extends CreativeTabs {
-	public static CreativeTabs instance = new CreativeTabBotany();
+    public static CreativeTabs instance = new CreativeTabBotany();
 
-	public CreativeTabBotany() {
-		super("Botany");
-	}
+    public CreativeTabBotany() {
+        super("Botany");
+    }
 
-	@Override
-	public ItemStack getIconItemStack() {
-		return new ItemStack(Blocks.red_flower, 1, 5);
-	}
+    @Override
+    public ItemStack getIconItemStack() {
+        return new ItemStack(Blocks.red_flower, 1, 5);
+    }
 
-	@Override
-	public String getTranslatedTabLabel() {
-		return getTabLabel();
-	}
+    @Override
+    public String getTranslatedTabLabel() {
+        return getTabLabel();
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getTabLabel() {
-		return I18N.localise("botany.tab.botany");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public String getTabLabel() {
+        return I18N.localise("botany.tab.botany");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public Item getTabIconItem() {
-		return Item.getItemFromBlock(Blocks.yellow_flower);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public Item getTabIconItem() {
+        return Item.getItemFromBlock(Blocks.yellow_flower);
+    }
 }

src/main/java/binnie/botany/api/EnumAcidity.java

@@ -1,11 +1,11 @@
 package binnie.botany.api;
 
 public enum EnumAcidity {
-	ACID,
-	NEUTRAL,
-	ALKALINE;
+    ACID,
+    NEUTRAL,
+    ALKALINE;
 
-	public String getID() {
-		return name().toLowerCase();
-	}
+    public String getID() {
+        return name().toLowerCase();
+    }
 }

src/main/java/binnie/botany/api/EnumFlowerChromosome.java

@@ -10,37 +10,37 @@ import forestry.api.genetics.IChromosomeType;
 import forestry.api.genetics.ISpeciesRoot;
 
 public enum EnumFlowerChromosome implements IChromosomeType {
-	SPECIES(IAlleleFlowerSpecies.class),
-	PRIMARY(IAlleleInteger.class),
-	SECONDARY(IAlleleInteger.class),
-	FERTILITY(IAlleleInteger.class),
-	TERRITORY(IAlleleArea.class),
-	EFFECT(IAlleleFlowerEffect.class),
-	LIFESPAN(IAlleleInteger.class),
-	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
-	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
-	PH_TOLERANCE(IAlleleTolerance.class),
-	SAPPINESS(IAlleleFloat.class),
-	STEM(IAlleleInteger.class);
+    SPECIES(IAlleleFlowerSpecies.class),
+    PRIMARY(IAlleleInteger.class),
+    SECONDARY(IAlleleInteger.class),
+    FERTILITY(IAlleleInteger.class),
+    TERRITORY(IAlleleArea.class),
+    EFFECT(IAlleleFlowerEffect.class),
+    LIFESPAN(IAlleleInteger.class),
+    TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
+    HUMIDITY_TOLERANCE(IAlleleTolerance.class),
+    PH_TOLERANCE(IAlleleTolerance.class),
+    SAPPINESS(IAlleleFloat.class),
+    STEM(IAlleleInteger.class);
 
-	private Class<? extends IAllele> cls;
+    private Class<? extends IAllele> cls;
 
-	EnumFlowerChromosome(Class<? extends IAllele> cls) {
-		this.cls = cls;
-	}
+    EnumFlowerChromosome(Class<? extends IAllele> cls) {
+        this.cls = cls;
+    }
 
-	@Override
-	public Class<? extends IAllele> getAlleleClass() {
-		return cls;
-	}
+    @Override
+    public Class<? extends IAllele> getAlleleClass() {
+        return cls;
+    }
 
-	@Override
-	public String getName() {
-		return toString().toLowerCase();
-	}
+    @Override
+    public String getName() {
+        return toString().toLowerCase();
+    }
 
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
-	}
+    @Override
+    public ISpeciesRoot getSpeciesRoot() {
+        return AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
+    }
 }

src/main/java/binnie/botany/api/EnumFlowerStage.java

@@ -1,18 +1,18 @@
 package binnie.botany.api;
 
 public enum EnumFlowerStage {
-	FLOWER("Flower"),
-	SEED("Seed"),
-	POLLEN("Pollen"),
-	NONE("NONE");
+    FLOWER("Flower"),
+    SEED("Seed"),
+    POLLEN("Pollen"),
+    NONE("NONE");
 
-	protected String name;
+    protected String name;
 
-	EnumFlowerStage(String name) {
-		this.name = name;
-	}
+    EnumFlowerStage(String name) {
+        this.name = name;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 }

src/main/java/binnie/botany/api/EnumMoisture.java

@@ -1,11 +1,11 @@
 package binnie.botany.api;
 
 public enum EnumMoisture {
-	DRY,
-	NORMAL,
-	DAMP;
+    DRY,
+    NORMAL,
+    DAMP;
 
-	public String getID() {
-		return name().toLowerCase();
-	}
+    public String getID() {
+        return name().toLowerCase();
+    }
 }

src/main/java/binnie/botany/api/EnumSoilType.java

@@ -1,11 +1,11 @@
 package binnie.botany.api;
 
 public enum EnumSoilType {
-	SOIL,
-	LOAM,
-	FLOWERBED;
+    SOIL,
+    LOAM,
+    FLOWERBED;
 
-	public String getID() {
-		return name().toLowerCase();
-	}
+    public String getID() {
+        return name().toLowerCase();
+    }
 }

src/main/java/binnie/botany/api/IAlleleFlowerEffect.java

@@ -5,5 +5,5 @@ import forestry.api.genetics.IEffectData;
 import net.minecraft.world.World;
 
 public interface IAlleleFlowerEffect extends IAlleleEffect {
-	IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
+    IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
 }

src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java

@@ -3,9 +3,9 @@ package binnie.botany.api;
 import forestry.api.genetics.IAlleleSpecies;
 
 public interface IAlleleFlowerSpecies extends IAlleleSpecies {
-	IFlowerType getType();
+    IFlowerType getType();
 
-	EnumAcidity getPH();
+    EnumAcidity getPH();
 
-	EnumMoisture getMoisture();
+    EnumMoisture getMoisture();
 }

src/main/java/binnie/botany/api/IBotanistTracker.java

@@ -2,5 +2,4 @@ package binnie.botany.api;
 
 import forestry.api.genetics.IBreedingTracker;
 
-public interface IBotanistTracker extends IBreedingTracker {
-}
+public interface IBotanistTracker extends IBreedingTracker {}

src/main/java/binnie/botany/api/IColourMix.java

@@ -1,13 +1,13 @@
 package binnie.botany.api;
 
 public interface IColourMix {
-	IFlowerColor getColor1();
+    IFlowerColor getColor1();
 
-	IFlowerColor getColor2();
+    IFlowerColor getColor2();
 
-	boolean isMutation(IFlowerColor color1, IFlowerColor color2);
+    boolean isMutation(IFlowerColor color1, IFlowerColor color2);
 
-	int getChance();
+    int getChance();
 
-	IFlowerColor getResult();
+    IFlowerColor getResult();
 }

src/main/java/binnie/botany/api/IFlower.java

@@ -4,30 +4,30 @@ import forestry.api.genetics.IIndividual;
 import net.minecraft.world.World;
 
 public interface IFlower extends IIndividual {
-	@Override
-	IFlowerGenome getGenome();
+    @Override
+    IFlowerGenome getGenome();
 
-	IFlowerGenome getMate();
+    IFlowerGenome getMate();
 
-	void mate(IFlower other);
+    void mate(IFlower other);
 
-	int getAge();
+    int getAge();
 
-	void setAge(int age);
+    void setAge(int age);
 
-	void age();
+    void age();
 
-	IFlower getOffspring(World world);
+    IFlower getOffspring(World world);
 
-	int getMaxAge();
+    int getMaxAge();
 
-	boolean isWilted();
+    boolean isWilted();
 
-	void setWilted(boolean value);
+    void setWilted(boolean value);
 
-	boolean hasFlowered();
+    boolean hasFlowered();
 
-	void setFlowered(boolean value);
+    void setFlowered(boolean value);
 
-	void removeMate();
+    void removeMate();
 }

src/main/java/binnie/botany/api/IFlowerColor.java

@@ -3,11 +3,11 @@ package binnie.botany.api;
 import forestry.api.genetics.IAlleleInteger;
 
 public interface IFlowerColor {
-	int getColor(boolean dis);
+    int getColor(boolean dis);
 
-	IAlleleInteger getAllele();
+    IAlleleInteger getAllele();
 
-	int getID();
+    int getID();
 
-	String getName();
+    String getName();
 }

src/main/java/binnie/botany/api/IFlowerGenome.java

@@ -5,37 +5,37 @@ import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IGenome;
 
 public interface IFlowerGenome extends IGenome {
-	@Override
-	IAlleleFlowerSpecies getPrimary();
+    @Override
+    IAlleleFlowerSpecies getPrimary();
 
-	@Override
-	IAlleleFlowerSpecies getSecondary();
+    @Override
+    IAlleleFlowerSpecies getSecondary();
 
-	IFlowerColor getPrimaryColor();
+    IFlowerColor getPrimaryColor();
 
-	IFlowerColor getSecondaryColor();
+    IFlowerColor getSecondaryColor();
 
-	IFlowerColor getStemColor();
+    IFlowerColor getStemColor();
 
-	int getFertility();
+    int getFertility();
 
-	int getLifespan();
+    int getLifespan();
 
-	IFlowerType getType();
+    IFlowerType getType();
 
-	EnumTolerance getToleranceTemperature();
+    EnumTolerance getToleranceTemperature();
 
-	EnumTolerance getToleranceMoisture();
+    EnumTolerance getToleranceMoisture();
 
-	EnumTolerance getTolerancePH();
+    EnumTolerance getTolerancePH();
 
-	float getAgeChance();
+    float getAgeChance();
 
-	float getSappiness();
+    float getSappiness();
 
-	boolean canTolerate(EnumAcidity pH);
+    boolean canTolerate(EnumAcidity pH);
 
-	boolean canTolerate(EnumMoisture moisture);
+    boolean canTolerate(EnumMoisture moisture);
 
-	boolean canTolerate(EnumTemperature temp);
+    boolean canTolerate(EnumTemperature temp);
 }

src/main/java/binnie/botany/api/IFlowerMutation.java

@@ -5,5 +5,5 @@ import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutation;
 
 public interface IFlowerMutation extends IMutation {
-	float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
+    float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
 }

src/main/java/binnie/botany/api/IFlowerRoot.java

@@ -3,42 +3,41 @@ package binnie.botany.api;
 import com.mojang.authlib.GameProfile;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.ISpeciesRoot;
+import java.util.Collection;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import java.util.Collection;
-
 public interface IFlowerRoot extends ISpeciesRoot {
-	@Override
-	IFlower getMember(ItemStack stack);
+    @Override
+    IFlower getMember(ItemStack stack);
 
-	@Override
-	IFlower templateAsIndividual(IAllele[] template);
+    @Override
+    IFlower templateAsIndividual(IAllele[] template);
 
-	@Override
-	IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
 
-	@Override
-	IFlowerGenome templateAsGenome(IAllele[] template);
+    @Override
+    IFlowerGenome templateAsGenome(IAllele[] template);
 
-	@Override
-	IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
+    @Override
+    IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
 
-	@Override
-	IBotanistTracker getBreedingTracker(World world, GameProfile player);
+    @Override
+    IBotanistTracker getBreedingTracker(World world, GameProfile player);
 
-	@Override
-	Collection<IFlowerMutation> getMutations(boolean shuffle);
+    @Override
+    Collection<IFlowerMutation> getMutations(boolean shuffle);
 
-	EnumFlowerStage getStageType(ItemStack stack);
+    EnumFlowerStage getStageType(ItemStack stack);
 
-	IFlower getFlower(World world, IFlowerGenome genome);
+    IFlower getFlower(World world, IFlowerGenome genome);
 
-	void addConversion(ItemStack stack, IAllele[] template);
+    void addConversion(ItemStack stack, IAllele[] template);
 
-	IFlower getConversion(ItemStack stack);
+    IFlower getConversion(ItemStack stack);
 
-	Collection<IColourMix> getColourMixes(boolean shuffle);
+    Collection<IColourMix> getColourMixes(boolean shuffle);
 
-	void registerColourMix(IColourMix colorMix);
+    void registerColourMix(IColourMix colorMix);
 }

src/main/java/binnie/botany/api/IFlowerType.java

@@ -3,15 +3,15 @@ package binnie.botany.api;
 import net.minecraft.util.IIcon;
 
 public interface IFlowerType {
-	IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
+    IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
 
-	IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
+    IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
 
-	IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
+    IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
 
-	int getID();
+    int getID();
 
-	int getSections();
+    int getSections();
 
-	int ordinal();
+    int ordinal();
 }

src/main/java/binnie/botany/api/gardening/IBlockSoil.java

@@ -6,19 +6,19 @@ import binnie.botany.api.EnumSoilType;
 import net.minecraft.world.World;
 
 public interface IBlockSoil {
-	EnumAcidity getPH(World world, int x, int y, int z);
+    EnumAcidity getPH(World world, int x, int y, int z);
 
-	EnumMoisture getMoisture(World world, int x, int y, int z);
+    EnumMoisture getMoisture(World world, int x, int y, int z);
 
-	EnumSoilType getType(World world, int x, int y, int z);
+    EnumSoilType getType(World world, int x, int y, int z);
 
-	boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
+    boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
 
-	boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
+    boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
 
-	boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
+    boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
 
-	boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
+    boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
 
-	boolean resistsWeeds(World world, int x, int y, int z);
+    boolean resistsWeeds(World world, int x, int y, int z);
 }

src/main/java/binnie/botany/ceramic/BlockCeramic.java

@@ -9,6 +9,8 @@ import binnie.core.block.TileEntityMetadata;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -24,123 +26,120 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class BlockCeramic extends Block implements IBlockMetadata {
-	public BlockCeramic() {
-		super(Material.rock);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setBlockName("ceramic");
-		setCreativeTab(CreativeTabBotany.instance);
-	}
+    public BlockCeramic() {
+        super(Material.rock);
+        setHardness(1.0f);
+        setResistance(5.0f);
+        setBlockName("ceramic");
+        setCreativeTab(CreativeTabBotany.instance);
+    }
 
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
-	}
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
+        return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
+    }
 
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		return BlockMetadata.breakBlock(this, player, world, x, y, z);
-	}
+    @Override
+    public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
+        return BlockMetadata.breakBlock(this, player, world, x, y, z);
+    }
 
-	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
-	}
+    @Override
+    public TileEntity createNewTileEntity(World var1, int i) {
+        return new TileEntityMetadata();
+    }
 
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
+    @Override
+    public boolean hasTileEntity(int meta) {
+        return true;
+    }
 
-	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
-		super.onBlockEventReceived(world, x, y, z, eventId, eventType);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
-	}
+    @Override
+    public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
+        super.onBlockEventReceived(world, x, y, z, eventId, eventType);
+        TileEntity tileentity = world.getTileEntity(x, y, z);
+        return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
+    }
 
-	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
+    @Override
+    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+        return TileEntityMetadata.getItemDamage(itemStack);
+    }
 
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return tileMeta;
-	}
+    @Override
+    public int getDroppedMeta(int blockMeta, int tileMeta) {
+        return tileMeta;
+    }
 
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		return I18N.localise("botany.ceramicBlock");
-	}
+    @Override
+    public String getBlockName(ItemStack itemStack) {
+        return I18N.localise("botany.ceramicBlock");
+    }
 
-	@Override
-	public void addBlockTooltip(ItemStack stack, List tooltip) {
-		int meta = TileEntityMetadata.getItemDamage(stack);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
-	}
+    @Override
+    public void addBlockTooltip(ItemStack stack, List tooltip) {
+        int meta = TileEntityMetadata.getItemDamage(stack);
+        tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
+    }
 
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
-		dropBlockAsItem(world, x, y, z, itemStack);
-	}
+    @Override
+    public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
+        dropBlockAsItem(world, x, y, z, itemStack);
+    }
 
-	@Override
-	public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
-		}
-	}
+    @Override
+    public void getSubBlocks(Item item, CreativeTabs tabs, List itemList) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getIcon(side, tile.getTileMetadata());
-		}
-		return super.getIcon(world, x, y, z, side);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+        if (tile != null) {
+            return getIcon(side, tile.getTileMetadata());
+        }
+        return super.getIcon(world, x, y, z, side);
+    }
 
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return blockIcon;
-	}
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return blockIcon;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		blockIcon = Botany.proxy.getIcon(register, "ceramic");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister register) {
+        blockIcon = Botany.proxy.getIcon(register, "ceramic");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getRenderColor(tile.getTileMetadata());
-		}
-		return 0xffffff;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+        if (tile != null) {
+            return getRenderColor(tile.getTileMetadata());
+        }
+        return 0xffffff;
+    }
 
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int side) {
-		super.breakBlock(world, x, y, z, block, side);
-		world.removeTileEntity(x, y, z);
-	}
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block block, int side) {
+        super.breakBlock(world, x, y, z, block, side);
+        world.removeTileEntity(x, y, z);
+    }
 
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		return BlockMetadata.getPickBlock(world, x, y, z);
-	}
+    @Override
+    public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
+        return BlockMetadata.getPickBlock(world, x, y, z);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderColor(int meta) {
-		return EnumFlowerColor.get(meta).getColor(false);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(int meta) {
+        return EnumFlowerColor.get(meta).getColor(false);
+    }
 }

src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java

@@ -8,35 +8,35 @@ import binnie.extratrees.api.IDesign;
 import binnie.extratrees.carpentry.BlockDesign;
 import binnie.extratrees.carpentry.DesignBlock;
 import binnie.extratrees.carpentry.ModuleCarpentry;
+import java.util.List;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.List;
-
 public class BlockCeramicPatterned extends BlockDesign {
-	public BlockCeramicPatterned() {
-		super(CeramicDesignSystem.instance, Material.rock);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setCreativeTab(CreativeTabBotany.instance);
-		setBlockName("ceramicPattern");
-	}
+    public BlockCeramicPatterned() {
+        super(CeramicDesignSystem.instance, Material.rock);
+        setHardness(1.0f);
+        setResistance(5.0f);
+        setCreativeTab(CreativeTabBotany.instance);
+        setBlockName("ceramicPattern");
+    }
 
-	@Override
-	public ItemStack getCreativeStack(IDesign design) {
-		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
-	}
+    @Override
+    public ItemStack getCreativeStack(IDesign design) {
+        return ModuleCarpentry.getItemStack(
+                this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
+    }
 
-	@Override
-	public String getBlockName(DesignBlock design) {
-		return I18N.localise("botany.ceramicBlock");
-	}
+    @Override
+    public String getBlockName(DesignBlock design) {
+        return I18N.localise("botany.ceramicBlock");
+    }
 
-	@Override
-	public void addBlockTooltip(ItemStack stack, List tooltip) {
-		super.addBlockTooltip(stack, tooltip);
-		DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
-		tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName());
-	}
+    @Override
+    public void addBlockTooltip(ItemStack stack, List tooltip) {
+        super.addBlockTooltip(stack, tooltip);
+        DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
+        tooltip.add(EnumChatFormatting.GRAY + block.getDesign().getName());
+    }
 }

src/main/java/binnie/botany/ceramic/BlockStained.java

@@ -10,6 +10,9 @@ import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,173 +28,168 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 public class BlockStained extends Block implements IBlockMetadata {
-	public BlockStained() {
-		super(Material.glass);
-		setCreativeTab(CreativeTabBotany.instance);
-		setBlockName("stained");
-	}
+    public BlockStained() {
+        super(Material.glass);
+        setCreativeTab(CreativeTabBotany.instance);
+        setBlockName("stained");
+    }
 
-	@Override
-	public int quantityDropped(Random rand) {
-		return 0;
-	}
+    @Override
+    public int quantityDropped(Random rand) {
+        return 0;
+    }
 
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
 
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderBlockPass() {
-		return 1;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderBlockPass() {
+        return 1;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
-//		Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - Facing.offsetsZForSide[side]);
-		Block block = world.getBlock(x, y, z);
-		return block != this
-			&& block != ExtraTrees.blockStained
-			&& super.shouldSideBeRendered(world, x, y, z, side);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
+        //		Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z -
+        // Facing.offsetsZForSide[side]);
+        Block block = world.getBlock(x, y, z);
+        return block != this && block != ExtraTrees.blockStained && super.shouldSideBeRendered(world, x, y, z, side);
+    }
 
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
-	}
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
+        return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta);
+    }
 
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		return BlockMetadata.breakBlock(this, player, world, x, y, z);
-	}
+    @Override
+    public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
+        return BlockMetadata.breakBlock(this, player, world, x, y, z);
+    }
 
-	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
-	}
+    @Override
+    public TileEntity createNewTileEntity(World var1, int i) {
+        return new TileEntityMetadata();
+    }
 
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
+    @Override
+    public boolean hasTileEntity(int meta) {
+        return true;
+    }
 
-	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
-		super.onBlockEventReceived(world, x, y, z, eventId, eventType);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
-	}
+    @Override
+    public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) {
+        super.onBlockEventReceived(world, x, y, z, eventId, eventType);
+        TileEntity tileentity = world.getTileEntity(x, y, z);
+        return tileentity != null && tileentity.receiveClientEvent(eventId, eventType);
+    }
 
-	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
+    @Override
+    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+        return TileEntityMetadata.getItemDamage(itemStack);
+    }
 
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return tileMeta;
-	}
+    @Override
+    public int getDroppedMeta(int blockMeta, int tileMeta) {
+        return tileMeta;
+    }
 
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		return I18N.localise("botany.pigmentedGlass");
-	}
+    @Override
+    public String getBlockName(ItemStack itemStack) {
+        return I18N.localise("botany.pigmentedGlass");
+    }
 
-	@Override
-	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
-		int meta = TileEntityMetadata.getItemDamage(itemStack);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
-	}
+    @Override
+    public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+        int meta = TileEntityMetadata.getItemDamage(itemStack);
+        tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
+    }
 
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack stack) {
-		dropBlockAsItem(world, x, y, z, stack);
-	}
+    @Override
+    public void dropAsStack(World world, int x, int y, int z, ItemStack stack) {
+        dropBlockAsItem(world, x, y, z, stack);
+    }
 
-	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
-		}
-	}
+    @Override
+    public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getIcon(side, tile.getTileMetadata());
-		}
-		return super.getIcon(world, x, y, z, side);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+        if (tile != null) {
+            return getIcon(side, tile.getTileMetadata());
+        }
+        return super.getIcon(world, x, y, z, side);
+    }
 
-	@Override
-	public IIcon getIcon(int side, int meta) {
-		return blockIcon;
-	}
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return blockIcon;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		blockIcon = Botany.proxy.getIcon(register, "stained");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister register) {
+        blockIcon = Botany.proxy.getIcon(register, "stained");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null) {
-			return getRenderColor(tile.getTileMetadata());
-		}
-		return 0xffffff;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+        if (tile != null) {
+            return getRenderColor(tile.getTileMetadata());
+        }
+        return 0xffffff;
+    }
 
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int side) {
-		super.breakBlock(world, x, y, z, block, side);
-		world.removeTileEntity(x, y, z);
-	}
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block block, int side) {
+        super.breakBlock(world, x, y, z, block, side);
+        world.removeTileEntity(x, y, z);
+    }
 
-	@Override
-	public boolean isWood(IBlockAccess world, int x, int y, int z) {
-		return true;
-	}
+    @Override
+    public boolean isWood(IBlockAccess world, int x, int y, int z) {
+        return true;
+    }
 
-	@Override
-	public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return 20;
-	}
+    @Override
+    public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+        return 20;
+    }
 
-	@Override
-	public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return true;
-	}
+    @Override
+    public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+        return true;
+    }
 
-	@Override
-	public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
-		return 5;
-	}
+    @Override
+    public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
+        return 5;
+    }
 
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		return BlockMetadata.getPickBlock(world, x, y, z);
-	}
+    @Override
+    public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
+        return BlockMetadata.getPickBlock(world, x, y, z);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderColor(int meta) {
-		return EnumFlowerColor.get(meta).getColor(false);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getRenderColor(int meta) {
+        return EnumFlowerColor.get(meta).getColor(false);
+    }
 }

src/main/java/binnie/botany/ceramic/CeramicColor.java

@@ -4,43 +4,42 @@ import binnie.botany.Botany;
 import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.block.TileEntityMetadata;
 import binnie.extratrees.api.IDesignMaterial;
-import net.minecraft.item.ItemStack;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
+import net.minecraft.item.ItemStack;
 
 public class CeramicColor implements IDesignMaterial {
-	private static Map<EnumFlowerColor, CeramicColor> map;
+    private static Map<EnumFlowerColor, CeramicColor> map;
 
-	static {
-		CeramicColor.map = new LinkedHashMap<>();
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			CeramicColor.map.put(c, new CeramicColor(c));
-		}
-	}
+    static {
+        CeramicColor.map = new LinkedHashMap<>();
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            CeramicColor.map.put(c, new CeramicColor(c));
+        }
+    }
 
-	protected EnumFlowerColor color;
+    protected EnumFlowerColor color;
 
-	CeramicColor(EnumFlowerColor color) {
-		this.color = color;
-	}
+    CeramicColor(EnumFlowerColor color) {
+        this.color = color;
+    }
 
-	public static CeramicColor get(EnumFlowerColor c) {
-		return CeramicColor.map.get(c);
-	}
+    public static CeramicColor get(EnumFlowerColor c) {
+        return CeramicColor.map.get(c);
+    }
 
-	@Override
-	public ItemStack getStack() {
-		return TileEntityMetadata.getItemStack(Botany.ceramic, color.ordinal());
-	}
+    @Override
+    public ItemStack getStack() {
+        return TileEntityMetadata.getItemStack(Botany.ceramic, color.ordinal());
+    }
 
-	@Override
-	public String getName() {
-		return color.getName();
-	}
+    @Override
+    public String getName() {
+        return color.getName();
+    }
 
-	@Override
-	public int getColor() {
-		return color.getColor(false);
-	}
+    @Override
+    public int getColor() {
+        return color.getColor(false);
+    }
 }

src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java

@@ -10,85 +10,94 @@ import binnie.extratrees.api.IDesignSystem;
 import binnie.extratrees.api.IPattern;
 import binnie.extratrees.carpentry.DesignerManager;
 import binnie.extratrees.carpentry.EnumPattern;
+import java.util.HashMap;
+import java.util.Map;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class CeramicDesignSystem implements IDesignSystem {
-	public static CeramicDesignSystem instance = new CeramicDesignSystem();
+    public static CeramicDesignSystem instance = new CeramicDesignSystem();
 
-	protected Map<Integer, IIcon> primary;
-	protected Map<Integer, IIcon> secondary;
+    protected Map<Integer, IIcon> primary;
+    protected Map<Integer, IIcon> secondary;
 
-	CeramicDesignSystem() {
-		primary = new HashMap<>();
-		secondary = new HashMap<>();
-		DesignerManager.instance.registerDesignSystem(this);
-	}
+    CeramicDesignSystem() {
+        primary = new HashMap<>();
+        secondary = new HashMap<>();
+        DesignerManager.instance.registerDesignSystem(this);
+    }
 
-	@Override
-	public IDesignMaterial getDefaultMaterial() {
-		return CeramicColor.get(EnumFlowerColor.WHITE);
-	}
+    @Override
+    public IDesignMaterial getDefaultMaterial() {
+        return CeramicColor.get(EnumFlowerColor.WHITE);
+    }
 
-	@Override
-	public IDesignMaterial getDefaultMaterial2() {
-		return CeramicColor.get(EnumFlowerColor.BLACK);
-	}
+    @Override
+    public IDesignMaterial getDefaultMaterial2() {
+        return CeramicColor.get(EnumFlowerColor.BLACK);
+    }
 
-	@Override
-	public IDesignMaterial getMaterial(int id) {
-		return CeramicColor.get(EnumFlowerColor.get(id));
-	}
+    @Override
+    public IDesignMaterial getMaterial(int id) {
+        return CeramicColor.get(EnumFlowerColor.get(id));
+    }
 
-	@Override
-	public int getMaterialIndex(IDesignMaterial id) {
-		return ((CeramicColor) id).color.ordinal();
-	}
+    @Override
+    public int getMaterialIndex(IDesignMaterial id) {
+        return ((CeramicColor) id).color.ordinal();
+    }
 
-	public String getTexturePath() {
-		return "ceramic";
-	}
+    public String getTexturePath() {
+        return "ceramic";
+    }
 
-	@Override
-	public IIcon getPrimaryIcon(IPattern pattern) {
-		if (pattern instanceof EnumPattern) {
-			return primary.get(((EnumPattern) pattern).ordinal());
-		}
-		return null;
-	}
+    @Override
+    public IIcon getPrimaryIcon(IPattern pattern) {
+        if (pattern instanceof EnumPattern) {
+            return primary.get(((EnumPattern) pattern).ordinal());
+        }
+        return null;
+    }
 
-	@Override
-	public IIcon getSecondaryIcon(IPattern pattern) {
-		if (pattern instanceof EnumPattern) {
-			return secondary.get(((EnumPattern) pattern).ordinal());
-		}
-		return null;
-	}
+    @Override
+    public IIcon getSecondaryIcon(IPattern pattern) {
+        if (pattern instanceof EnumPattern) {
+            return secondary.get(((EnumPattern) pattern).ordinal());
+        }
+        return null;
+    }
 
-	@Override
-	public void registerIcons(IIconRegister register) {
-		for (EnumPattern pattern : EnumPattern.values()) {
-			primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
-			secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
-		}
-	}
+    @Override
+    public void registerIcons(IIconRegister register) {
+        for (EnumPattern pattern : EnumPattern.values()) {
+            primary.put(
+                    pattern.ordinal(),
+                    BinnieCore.proxy.getIcon(
+                            register,
+                            getMod().getModID(),
+                            getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
+            secondary.put(
+                    pattern.ordinal(),
+                    BinnieCore.proxy.getIcon(
+                            register,
+                            getMod().getModID(),
+                            getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
+        }
+    }
 
-	public AbstractMod getMod() {
-		return Botany.instance;
-	}
+    public AbstractMod getMod() {
+        return Botany.instance;
+    }
 
-	@Override
-	public ItemStack getAdhesive() {
-		return BotanyItems.Mortar.get(1);
-	}
+    @Override
+    public ItemStack getAdhesive() {
+        return BotanyItems.Mortar.get(1);
+    }
 
-	@Override
-	public IDesignMaterial getMaterial(ItemStack stack) {
-		return (stack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? getMaterial(stack.getItemDamage()) : null;
-	}
+    @Override
+    public IDesignMaterial getMaterial(ItemStack stack) {
+        return (stack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? getMaterial(stack.getItemDamage()) : null;
+    }
 }

src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java

@@ -1,71 +1,70 @@
 package binnie.botany.ceramic;
 
 import binnie.botany.Botany;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class CeramicTileRecipe implements IRecipe {
-	protected ItemStack cached;
+    protected ItemStack cached;
 
-	@Override
-	public boolean matches(InventoryCrafting crafting, World world) {
-		cached = getCraftingResult(crafting);
-		return cached != null;
-	}
+    @Override
+    public boolean matches(InventoryCrafting crafting, World world) {
+        cached = getCraftingResult(crafting);
+        return cached != null;
+    }
 
-	@Override
-	public ItemStack getCraftingResult(InventoryCrafting inv) {
-		Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
-		Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
-		Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
-		Item mortar = Botany.misc;
-		List<ItemStack> stacks = new ArrayList<>();
-		int ix = -1;
-		int iy = -1;
+    @Override
+    public ItemStack getCraftingResult(InventoryCrafting inv) {
+        Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
+        Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
+        Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
+        Item mortar = Botany.misc;
+        List<ItemStack> stacks = new ArrayList<>();
+        int ix = -1;
+        int iy = -1;
 
-		for (int i = 0; i < inv.getSizeInventory(); ++i) {
-			ItemStack stack = inv.getStackInSlot(i);
-			if (stack != null) {
-				int x = i / 3;
-				int y = i % 3;
-				if (ix == -1) {
-					ix = x;
-					iy = y;
-				}
-				if (x - ix >= 2 || y - iy >= 2 || y < iy || x < ix) {
-					return null;
-				}
-				
-				Item item = stack.getItem();
-				if (item != ceramicBlock && item != ceramicTile && item != ceramicBrick && item != mortar) {
-					return null;
-				}
-				stacks.add(stack);
-			}
-		}
+        for (int i = 0; i < inv.getSizeInventory(); ++i) {
+            ItemStack stack = inv.getStackInSlot(i);
+            if (stack != null) {
+                int x = i / 3;
+                int y = i % 3;
+                if (ix == -1) {
+                    ix = x;
+                    iy = y;
+                }
+                if (x - ix >= 2 || y - iy >= 2 || y < iy || x < ix) {
+                    return null;
+                }
 
-		for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
-			ItemStack stack2 = type.getRecipe(stacks);
-			if (stack2 != null) {
-				return stack2;
-			}
-		}
-		return null;
-	}
+                Item item = stack.getItem();
+                if (item != ceramicBlock && item != ceramicTile && item != ceramicBrick && item != mortar) {
+                    return null;
+                }
+                stacks.add(stack);
+            }
+        }
 
-	@Override
-	public int getRecipeSize() {
-		return 2;
-	}
+        for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
+            ItemStack stack2 = type.getRecipe(stacks);
+            if (stack2 != null) {
+                return stack2;
+            }
+        }
+        return null;
+    }
 
-	@Override
-	public ItemStack getRecipeOutput() {
-		return cached;
-	}
+    @Override
+    public int getRecipeSize() {
+        return 2;
+    }
+
+    @Override
+    public ItemStack getRecipeOutput() {
+        return cached;
+    }
 }

src/main/java/binnie/botany/ceramic/PigmentRecipe.java

@@ -9,51 +9,54 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
 public class PigmentRecipe implements IRecipe {
-	protected ItemStack cached;
+    protected ItemStack cached;
 
-	private ItemStack unknown;
+    private ItemStack unknown;
 
-	public PigmentRecipe() {
-		unknown = null;
-	}
+    public PigmentRecipe() {
+        unknown = null;
+    }
 
-	@Override
-	public boolean matches(InventoryCrafting crafting, World world) {
-		return getCraftingResult(crafting) != null;
-	}
+    @Override
+    public boolean matches(InventoryCrafting crafting, World world) {
+        return getCraftingResult(crafting) != null;
+    }
 
-	@Override
-	public ItemStack getRecipeOutput() {
-		if (cached != null) {
-			return cached;
-		}
-		return unknown;
-	}
+    @Override
+    public ItemStack getRecipeOutput() {
+        if (cached != null) {
+            return cached;
+        }
+        return unknown;
+    }
 
-	@Override
-	public ItemStack getCraftingResult(InventoryCrafting crafting) {
-		int n = 0;
-		ItemStack stack = null;
-		for (int i = 0; i < crafting.getSizeInventory(); ++i) {
-			if (crafting.getStackInSlot(i) != null) {
-				if (++n > 1) {
-					return null;
-				}
-				if (!Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
-					continue;
-				}
+    @Override
+    public ItemStack getCraftingResult(InventoryCrafting crafting) {
+        int n = 0;
+        ItemStack stack = null;
+        for (int i = 0; i < crafting.getSizeInventory(); ++i) {
+            if (crafting.getStackInSlot(i) != null) {
+                if (++n > 1) {
+                    return null;
+                }
+                if (!Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
+                    continue;
+                }
 
-				IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
-				if (flower.getAge() >= 1) {
-					stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
-				}
-			}
-		}
-		return stack;
-	}
+                IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
+                if (flower.getAge() >= 1) {
+                    stack = new ItemStack(
+                            Botany.pigment,
+                            1,
+                            flower.getGenome().getPrimaryColor().getID());
+                }
+            }
+        }
+        return stack;
+    }
 
-	@Override
-	public int getRecipeSize() {
-		return 1;
-	}
+    @Override
+    public int getRecipeSize() {
+        return 1;
+    }
 }

src/main/java/binnie/botany/core/BotanyCore.java

@@ -4,9 +4,9 @@ import binnie.botany.api.IFlowerRoot;
 import binnie.botany.genetics.FlowerHelper;
 
 public class BotanyCore {
-	public static IFlowerRoot speciesRoot = new FlowerHelper();
+    public static IFlowerRoot speciesRoot = new FlowerHelper();
 
-	public static IFlowerRoot getFlowerRoot() {
-		return BotanyCore.speciesRoot;
-	}
+    public static IFlowerRoot getFlowerRoot() {
+        return BotanyCore.speciesRoot;
+    }
 }

src/main/java/binnie/botany/core/BotanyGUI.java

@@ -8,19 +8,19 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
 public enum BotanyGUI implements IBinnieGUID {
-	Database,
-	DatabaseNEI;
+    Database,
+    DatabaseNEI;
 
-	@Override
-	public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
-		Window window = null;
-		switch (this) {
-			case Database:
-			case DatabaseNEI: {
-				window = WindowBotanistDatabase.create(player, side, this != BotanyGUI.Database);
-				break;
-			}
-		}
-		return window;
-	}
+    @Override
+    public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
+        Window window = null;
+        switch (this) {
+            case Database:
+            case DatabaseNEI: {
+                window = WindowBotanistDatabase.create(player, side, this != BotanyGUI.Database);
+                break;
+            }
+        }
+        return window;
+    }
 }

src/main/java/binnie/botany/core/ModuleCore.java

@@ -3,18 +3,18 @@ package binnie.botany.core;
 import binnie.core.IInitializable;
 
 public class ModuleCore implements IInitializable {
-	@Override
-	public void preInit() {
-		// ignored
-	}
+    @Override
+    public void preInit() {
+        // ignored
+    }
 
-	@Override
-	public void init() {
-		// ignored
-	}
+    @Override
+    public void init() {
+        // ignored
+    }
 
-	@Override
-	public void postInit() {
-		// ignored
-	}
+    @Override
+    public void postInit() {
+        // ignored
+    }
 }

src/main/java/binnie/botany/craftgui/ControlColorDisplay.java

@@ -11,33 +11,33 @@ import binnie.core.craftgui.controls.core.IControlValue;
 import binnie.core.craftgui.geometry.IArea;
 
 public class ControlColorDisplay extends Control implements IControlValue<IFlowerColor>, ITooltip {
-	private IFlowerColor value;
+    private IFlowerColor value;
 
-	public ControlColorDisplay(IWidget parent, float x, float y) {
-		super(parent, x, y, 16.0f, 16.0f);
-		addAttribute(WidgetAttribute.MOUSE_OVER);
-	}
+    public ControlColorDisplay(IWidget parent, float x, float y) {
+        super(parent, x, y, 16.0f, 16.0f);
+        addAttribute(WidgetAttribute.MOUSE_OVER);
+    }
 
-	@Override
-	public IFlowerColor getValue() {
-		return value;
-	}
+    @Override
+    public IFlowerColor getValue() {
+        return value;
+    }
 
-	@Override
-	public void setValue(IFlowerColor value) {
-		this.value = value;
-	}
+    @Override
+    public void setValue(IFlowerColor value) {
+        this.value = value;
+    }
 
-	@Override
-	public void onRenderBackground() {
-		IArea area = getArea();
-		CraftGUI.render.solid(area, -1);
-		CraftGUI.render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
-	}
+    @Override
+    public void onRenderBackground() {
+        IArea area = getArea();
+        CraftGUI.render.solid(area, -1);
+        CraftGUI.render.solid(area.inset(1), 0xff000000 + getValue().getColor(false));
+    }
 
-	@Override
-	public void getTooltip(Tooltip tooltip) {
-		super.getTooltip(tooltip);
-		tooltip.add(value.getName());
-	}
+    @Override
+    public void getTooltip(Tooltip tooltip) {
+        super.getTooltip(tooltip);
+        tooltip.add(value.getName());
+    }
 }

src/main/java/binnie/botany/craftgui/ControlColorMixBox.java

@@ -5,20 +5,20 @@ import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.listbox.ControlListBox;
 
 public class ControlColorMixBox extends ControlListBox<IColourMix> {
-	private Type type;
+    private Type type;
 
-	public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) {
-		super(parent, x, y, width, height, 12.0f);
-		this.type = type;
-	}
+    public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) {
+        super(parent, x, y, width, height, 12.0f);
+        this.type = type;
+    }
 
-	@Override
-	public IWidget createOption(IColourMix value, int y) {
-		return new ControlColorMixItem(getContent(), value, y);
-	}
+    @Override
+    public IWidget createOption(IColourMix value, int y) {
+        return new ControlColorMixItem(getContent(), value, y);
+    }
 
-	enum Type {
-		Resultant,
-		Further
-	}
+    enum Type {
+        Resultant,
+        Further
+    }
 }

src/main/java/binnie/botany/craftgui/ControlColorMixItem.java

@@ -5,26 +5,26 @@ import binnie.core.craftgui.controls.listbox.ControlList;
 import binnie.core.craftgui.controls.listbox.ControlOption;
 
 public class ControlColorMixItem extends ControlOption<IColourMix> {
-	protected ControlColorDisplay itemWidget1;
-	protected ControlColorDisplay itemWidget2;
-	protected ControlColorDisplay itemWidget3;
-	protected ControlColourMixSymbol addSymbol;
-	protected ControlColourMixSymbol arrowSymbol;
+    protected ControlColorDisplay itemWidget1;
+    protected ControlColorDisplay itemWidget2;
+    protected ControlColorDisplay itemWidget3;
+    protected ControlColourMixSymbol addSymbol;
+    protected ControlColourMixSymbol arrowSymbol;
 
-	public ControlColorMixItem(ControlList<IColourMix> controlList, IColourMix option, int y) {
-		super(controlList, option, y);
-		itemWidget1 = new ControlColorDisplay(this, 4.0f, 4.0f);
-		itemWidget2 = new ControlColorDisplay(this, 44.0f, 4.0f);
-		itemWidget3 = new ControlColorDisplay(this, 104.0f, 4.0f);
-		addSymbol = new ControlColourMixSymbol(this, 24, 4, 0);
-		arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1);
+    public ControlColorMixItem(ControlList<IColourMix> controlList, IColourMix option, int y) {
+        super(controlList, option, y);
+        itemWidget1 = new ControlColorDisplay(this, 4.0f, 4.0f);
+        itemWidget2 = new ControlColorDisplay(this, 44.0f, 4.0f);
+        itemWidget3 = new ControlColorDisplay(this, 104.0f, 4.0f);
+        addSymbol = new ControlColourMixSymbol(this, 24, 4, 0);
+        arrowSymbol = new ControlColourMixSymbol(this, 64, 4, 1);
 
-		if (getValue() != null) {
-			itemWidget1.setValue(getValue().getColor1());
-			itemWidget2.setValue(getValue().getColor2());
-			itemWidget3.setValue(getValue().getResult());
-			addSymbol.setValue(getValue());
-			arrowSymbol.setValue(getValue());
-		}
-	}
+        if (getValue() != null) {
+            itemWidget1.setValue(getValue().getColor1());
+            itemWidget2.setValue(getValue().getColor2());
+            itemWidget3.setValue(getValue().getResult());
+            addSymbol.setValue(getValue());
+            arrowSymbol.setValue(getValue());
+        }
+    }
 }

src/main/java/binnie/botany/craftgui/ControlColorOption.java

@@ -9,20 +9,21 @@ import binnie.core.craftgui.geometry.CraftGUIUtil;
 import binnie.core.craftgui.geometry.IPoint;
 
 public class ControlColorOption extends ControlTextOption<IFlowerColor> {
-	protected ControlColorDisplay controlBee;
-	protected IPoint boxPosition;
+    protected ControlColorDisplay controlBee;
+    protected IPoint boxPosition;
 
-	public ControlColorOption(ControlList<IFlowerColor> controlList, IFlowerColor option, int y) {
-		super(controlList, option, option.getName(), y);
-		setSize(new IPoint(getSize().x(), 20.0f));
-		(controlBee = new ControlColorDisplay(this, 2.0f, 2.0f)).setValue(option);
-		addAttribute(WidgetAttribute.MOUSE_OVER);
-		CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
-		textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
-		int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x());
-		int height = Math.max(20, th + 6);
-		setSize(new IPoint(size().x(), height));
-		textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
-		boxPosition = new IPoint(2.0f, (height - 18) / 2);
-	}
+    public ControlColorOption(ControlList<IFlowerColor> controlList, IFlowerColor option, int y) {
+        super(controlList, option, option.getName(), y);
+        setSize(new IPoint(getSize().x(), 20.0f));
+        (controlBee = new ControlColorDisplay(this, 2.0f, 2.0f)).setValue(option);
+        addAttribute(WidgetAttribute.MOUSE_OVER);
+        CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f));
+        textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f)));
+        int th = (int) CraftGUI.render.textHeight(
+                textWidget.getValue(), textWidget.getSize().x());
+        int height = Math.max(20, th + 6);
+        setSize(new IPoint(size().x(), height));
+        textWidget.setSize(new IPoint(textWidget.getSize().x(), height));
+        boxPosition = new IPoint(2.0f, (height - 18) / 2);
+    }
 }

src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java

@@ -14,39 +14,39 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture;
 import binnie.core.util.I18N;
 
 public class ControlColourMixSymbol extends Control implements ITooltip {
-	protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
-	protected static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
+    protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2);
+    protected static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2);
 
-	protected IColourMix value;
-	protected int type;
+    protected IColourMix value;
+    protected int type;
 
-	protected ControlColourMixSymbol(IWidget parent, int x, int y, int type) {
-		super(parent, x, y, 16 + type * 16, 16.0f);
-		this.type = type;
-		value = null;
-		addAttribute(WidgetAttribute.MOUSE_OVER);
-	}
+    protected ControlColourMixSymbol(IWidget parent, int x, int y, int type) {
+        super(parent, x, y, 16 + type * 16, 16.0f);
+        this.type = type;
+        value = null;
+        addAttribute(WidgetAttribute.MOUSE_OVER);
+    }
 
-	@Override
-	public void onRenderBackground() {
-		super.onRenderBackground();
-		if (type == 0) {
-			CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO);
-		} else {
-			CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO);
-		}
-	}
+    @Override
+    public void onRenderBackground() {
+        super.onRenderBackground();
+        if (type == 0) {
+            CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO);
+        } else {
+            CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO);
+        }
+    }
 
-	public void setValue(IColourMix value) {
-		this.value = value;
-		setColor(0xffffff);
-	}
+    public void setValue(IColourMix value) {
+        this.value = value;
+        setColor(0xffffff);
+    }
 
-	@Override
-	public void getTooltip(Tooltip tooltip) {
-		if (type == 1) {
-			float chance = value.getChance();
-			tooltip.add(I18N.localise("botany.gui.controls.colorMixSymbol.chance", chance));
-		}
-	}
+    @Override
+    public void getTooltip(Tooltip tooltip) {
+        if (type == 1) {
+            float chance = value.getChance();
+            tooltip.add(I18N.localise("botany.gui.controls.colorMixSymbol.chance", chance));
+        }
+    }
 }

src/main/java/binnie/botany/craftgui/PageColorMix.java

@@ -9,28 +9,27 @@ import binnie.core.craftgui.controls.ControlTextCentered;
 import binnie.core.craftgui.database.DatabaseTab;
 import binnie.core.craftgui.database.PageAbstract;
 import binnie.core.util.I18N;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class PageColorMix extends PageAbstract<IFlowerColor> {
-	ControlText title;
-	ControlColorMixBox list;
+    ControlText title;
+    ControlColorMixBox list;
 
-	public PageColorMix(IWidget parent, DatabaseTab tab) {
-		super(parent, tab);
-		title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageColorFurtherTitle"));
-		list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further);
-	}
+    public PageColorMix(IWidget parent, DatabaseTab tab) {
+        super(parent, tab);
+        title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageColorFurtherTitle"));
+        list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further);
+    }
 
-	@Override
-	public void onValueChanged(IFlowerColor colour) {
-		List<IColourMix> mixes = new ArrayList<>();
-		for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
-			if (mix.getColor1() == colour || mix.getColor2() == colour) {
-				mixes.add(mix);
-			}
-		}
-		list.setOptions(mixes);
-	}
+    @Override
+    public void onValueChanged(IFlowerColor colour) {
+        List<IColourMix> mixes = new ArrayList<>();
+        for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
+            if (mix.getColor1() == colour || mix.getColor2() == colour) {
+                mixes.add(mix);
+            }
+        }
+        list.setOptions(mixes);
+    }
 }

src/main/java/binnie/botany/craftgui/PageColorMixResultant.java

@@ -9,28 +9,27 @@ import binnie.core.craftgui.controls.ControlTextCentered;
 import binnie.core.craftgui.database.DatabaseTab;
 import binnie.core.craftgui.database.PageAbstract;
 import binnie.core.util.I18N;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class PageColorMixResultant extends PageAbstract<IFlowerColor> {
-	protected ControlText title;
-	protected ControlColorMixBox list;
+    protected ControlText title;
+    protected ControlColorMixBox list;
 
-	public PageColorMixResultant(IWidget parent, DatabaseTab tab) {
-		super(parent, tab);
-		title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageSpeciesFurtherTitle"));
-		list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant);
-	}
+    public PageColorMixResultant(IWidget parent, DatabaseTab tab) {
+        super(parent, tab);
+        title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageSpeciesFurtherTitle"));
+        list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant);
+    }
 
-	@Override
-	public void onValueChanged(IFlowerColor color) {
-		List<IColourMix> mixes = new ArrayList<>();
-		for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
-			if (mix.getResult() == color) {
-				mixes.add(mix);
-			}
-		}
-		list.setOptions(mixes);
-	}
+    @Override
+    public void onValueChanged(IFlowerColor color) {
+        List<IColourMix> mixes = new ArrayList<>();
+        for (IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) {
+            if (mix.getResult() == color) {
+                mixes.add(mix);
+            }
+        }
+        list.setOptions(mixes);
+    }
 }

src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java

@@ -25,84 +25,137 @@ import forestry.api.genetics.IIndividual;
 import net.minecraft.item.ItemStack;
 
 public class PageSpeciesFlowerGenome extends PageSpecies {
-	public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) {
-		super(parent, tab);
-	}
+    public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) {
+        super(parent, tab);
+    }
 
-	@Override
-	public void onValueChanged(IAlleleSpecies species) {
-		deleteAllChildren();
-		IAllele[] template = Binnie.Genetics.getFlowerRoot().getTemplate(species.getUID());
-		if (template == null) {
-			return;
-		}
+    @Override
+    public void onValueChanged(IAlleleSpecies species) {
+        deleteAllChildren();
+        IAllele[] template = Binnie.Genetics.getFlowerRoot().getTemplate(species.getUID());
+        if (template == null) {
+            return;
+        }
 
-		IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template);
-		if (tree == null) {
-			return;
-		}
+        IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template);
+        if (tree == null) {
+            return;
+        }
 
-		IFlowerGenome genome = tree.getGenome();
-		IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
-		int w = 144;
-		int h = 176;
+        IFlowerGenome genome = tree.getGenome();
+        IAlleleFlowerSpecies treeSpecies = genome.getPrimary();
+        int w = 144;
+        int h = 176;
 
-		new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), I18N.localise("botany.gui.database.tab.genome"), TextJustification.MIDDLE_CENTER);
-		ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f);
-		Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16);
+        new ControlText(
+                this,
+                new IArea(0.0f, 4.0f, w, 16.0f),
+                I18N.localise("botany.gui.database.tab.genome"),
+                TextJustification.MIDDLE_CENTER);
+        ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f);
+        Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16);
 
-		int tw = w - 8 - 12;
-		int w2 = 55;
-		int w3 = tw - 50;
-		int y = 0;
-		int th = 14;
-		int valueX = w2 + 4;
-		new ControlText(contents, new IArea(0.0f, y, w2, th),  I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getTemperature()), TextJustification.MIDDLE_LEFT);
-		y += th;
+        int tw = w - 8 - 12;
+        int w2 = 55;
+        int w3 = tw - 50;
+        int y = 0;
+        int th = 14;
+        int valueX = w2 + 4;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.temp"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents,
+                new IArea(valueX, y, w3, th),
+                AlleleHelper.toDisplay(treeSpecies.getTemperature()),
+                TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFT);
-		y += th;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.moist"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents,
+                new IArea(valueX, y, w3, th),
+                AlleleHelper.toDisplay(treeSpecies.getMoisture()),
+                TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getPH()), TextJustification.MIDDLE_LEFT);
-		y += th;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.ph"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents,
+                new IArea(valueX, y, w3, th),
+                AlleleHelper.toDisplay(treeSpecies.getPH()),
+                TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT);
-		y += th;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.fertility"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
-		String lifespanValue = String.format("%.2f", lifespan);
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.lifespan"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT);
-		y += th;
+        float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f;
+        String lifespanValue = String.format("%.2f", lifespan);
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.lifespan"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents,
+                new IArea(valueX, y, w3, th),
+                I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue),
+                TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MIDDLE_RIGHT);
-		new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFT);
-		y += th;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y, w2, th),
+                I18N.localise("botany.gui.database.tab.genome.nectar"),
+                TextJustification.MIDDLE_RIGHT);
+        new ControlText(
+                contents,
+                new IArea(valueX, y, w3, th),
+                genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(),
+                TextJustification.MIDDLE_LEFT);
+        y += th;
 
-		int x = w2;
-		int tot = 0;
-		for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
-			if (vid.getGenome().getPrimary() == treeSpecies) {
-				if (tot > 0 && tot % 3 == 0) {
-					x -= 54;
-					y += 18;
-				}
-				ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER.ordinal());
-				ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
-				display.setItemStack(stack);
-				tot++;
-				x += 18;
-			}
-		}
+        int x = w2;
+        int tot = 0;
+        for (IIndividual vid : BotanyCore.getFlowerRoot().getIndividualTemplates()) {
+            if (vid.getGenome().getPrimary() == treeSpecies) {
+                if (tot > 0 && tot % 3 == 0) {
+                    x -= 54;
+                    y += 18;
+                }
+                ItemStack stack = BotanyCore.getFlowerRoot().getMemberStack(vid, EnumFlowerStage.FLOWER.ordinal());
+                ControlItemDisplay display = new ControlItemDisplay(contents, x, y);
+                display.setItemStack(stack);
+                tot++;
+                x += 18;
+            }
+        }
 
-		int numOfLines = 1 + (tot - 1) / 3;
-		new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise("botany.gui.database.tab.genome.varieties"), TextJustification.MIDDLE_RIGHT);
-		y += th;
-		contents.setSize(new IPoint(contents.size().x(), y));
-		scrollable.setScrollableContent(contents);
-	}
+        int numOfLines = 1 + (tot - 1) / 3;
+        new ControlText(
+                contents,
+                new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines),
+                I18N.localise("botany.gui.database.tab.genome.varieties"),
+                TextJustification.MIDDLE_RIGHT);
+        y += th;
+        contents.setSize(new IPoint(contents.size().x(), y));
+        scrollable.setScrollableContent(contents);
+    }
 }

src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java

@@ -21,71 +21,71 @@ import binnie.core.craftgui.geometry.IArea;
 import binnie.core.craftgui.minecraft.Window;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
-import net.minecraft.entity.player.EntityPlayer;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import net.minecraft.entity.player.EntityPlayer;
 
 public class WindowBotanistDatabase extends WindowAbstractDatabase {
-	public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) {
-		super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f);
-	}
+    public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) {
+        super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f);
+    }
 
-	public static Window create(EntityPlayer player, Side side, boolean nei) {
-		return new WindowBotanistDatabase(player, side, nei);
-	}
+    public static Window create(EntityPlayer player, Side side, boolean nei) {
+        return new WindowBotanistDatabase(player, side, nei);
+    }
 
-	@Override
-	protected void addTabs() {
-		new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview"));
-		new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome"));
-		new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification"));
-		new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant"));
-		new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further"));
-		new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview"));
-		new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species"));
-		createMode(FlowerMode.COLOR, new ColorModeWidget());
-		new PageColorMixResultant(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.resultant"));
-		new PageColorMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further"));
-		new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder"));
-	}
+    @Override
+    protected void addTabs() {
+        new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview"));
+        new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome"));
+        new PageSpeciesClassification(
+                getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification"));
+        new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant"));
+        new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further"));
+        new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview"));
+        new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species"));
+        createMode(FlowerMode.COLOR, new ColorModeWidget());
+        new PageColorMixResultant(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.resultant"));
+        new PageColorMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further"));
+        new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder"));
+    }
 
-	@Override
-	protected AbstractMod getMod() {
-		return Botany.instance;
-	}
+    @Override
+    protected AbstractMod getMod() {
+        return Botany.instance;
+    }
 
-	@Override
-	protected String getName() {
-		return I18N.localise("botany.gui.database.name");
-	}
+    @Override
+    protected String getName() {
+        return I18N.localise("botany.gui.database.name");
+    }
 
-	enum FlowerMode implements IDatabaseMode {
-		COLOR;
+    enum FlowerMode implements IDatabaseMode {
+        COLOR;
 
-		@Override
-		public String getName() {
-			return I18N.localise("botany.gui.database.tab." + name().toLowerCase());
-		}
-	}
+        @Override
+        public String getName() {
+            return I18N.localise("botany.gui.database.tab." + name().toLowerCase());
+        }
+    }
 
-	private class ColorModeWidget extends ModeWidgets {
-		public ColorModeWidget() {
-			super(FlowerMode.COLOR, WindowBotanistDatabase.this);
-		}
+    private class ColorModeWidget extends ModeWidgets {
+        public ColorModeWidget() {
+            super(FlowerMode.COLOR, WindowBotanistDatabase.this);
+        }
 
-		@Override
-		public void createListBox(IArea area) {
-			listBox = new ControlListBox<IFlowerColor>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
-				@Override
-				public IWidget createOption(IFlowerColor value, int y) {
-					return new ControlColorOption(getContent(), value, y);
-				}
-			};
-			List<IFlowerColor> colors = new ArrayList<>();
-			Collections.addAll(colors, EnumFlowerColor.values());
-			listBox.setOptions(colors);
-		}
-	}
+        @Override
+        public void createListBox(IArea area) {
+            listBox = new ControlListBox<IFlowerColor>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
+                @Override
+                public IWidget createOption(IFlowerColor value, int y) {
+                    return new ControlColorOption(getContent(), value, y);
+                }
+            };
+            List<IFlowerColor> colors = new ArrayList<>();
+            Collections.addAll(colors, EnumFlowerColor.values());
+            listBox.setOptions(colors);
+        }
+    }
 }

src/main/java/binnie/botany/farm/CircuitGarden.java

@@ -11,97 +11,100 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 public class CircuitGarden extends BinnieCircuit {
-	private boolean isManual;
-	private boolean isFertilised;
-	private ItemStack icon;
-	private EnumMoisture moisture;
-	private EnumAcidity acidity;
+    private boolean isManual;
+    private boolean isFertilised;
+    private ItemStack icon;
+    private EnumMoisture moisture;
+    private EnumAcidity acidity;
 
-	public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) {
-		super("garden." + moisture.getID() + ((ph != null) ? ("." + ph.getID()) : "") + (manual ? ".manual" : "") + (fertilised ? ".fert" : ""), 4, manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe);
-		this.moisture = moisture;
-		this.icon = icon;
-		isManual = manual;
-		isFertilised = fertilised;
-		acidity = ph;
-		String info = "";
+    public CircuitGarden(
+            EnumMoisture moisture,
+            EnumAcidity ph,
+            boolean manual,
+            boolean fertilised,
+            ItemStack recipe,
+            ItemStack icon) {
+        super(
+                "garden." + moisture.getID() + ((ph != null) ? ("." + ph.getID()) : "") + (manual ? ".manual" : "")
+                        + (fertilised ? ".fert" : ""),
+                4,
+                manual
+                        ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual")
+                        : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"),
+                recipe);
+        this.moisture = moisture;
+        this.icon = icon;
+        isManual = manual;
+        isFertilised = fertilised;
+        acidity = ph;
+        String info = "";
 
-		if (moisture == EnumMoisture.DRY) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.dry")
-				+ EnumChatFormatting.RESET;
-		}
+        if (moisture == EnumMoisture.DRY) {
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.moisture.dry") + EnumChatFormatting.RESET;
+        }
 
-		if (moisture == EnumMoisture.DAMP) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.damp")
-				+ EnumChatFormatting.RESET;
-		}
+        if (moisture == EnumMoisture.DAMP) {
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.moisture.damp") + EnumChatFormatting.RESET;
+        }
 
-		if (acidity == EnumAcidity.ACID) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.RED
-				+ I18N.localise("botany.ph.acid")
-				+ EnumChatFormatting.RESET;
-		}
+        if (acidity == EnumAcidity.ACID) {
+            if (info.length() > 0) {
+                info += ", ";
+            }
+            info += EnumChatFormatting.RED + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
+        }
 
-		if (acidity == EnumAcidity.NEUTRAL) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.GREEN
-				+ I18N.localise("botany.ph.neutral")
-				+ EnumChatFormatting.RESET;
-		}
+        if (acidity == EnumAcidity.NEUTRAL) {
+            if (info.length() > 0) {
+                info += ", ";
+            }
+            info += EnumChatFormatting.GREEN + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET;
+        }
 
-		if (acidity == EnumAcidity.ALKALINE) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.AQUA
-				+ I18N.localise("botany.ph.alkaline")
-				+ EnumChatFormatting.RESET;
-		}
+        if (acidity == EnumAcidity.ALKALINE) {
+            if (info.length() > 0) {
+                info += ", ";
+            }
+            info += EnumChatFormatting.AQUA + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
+        }
 
-		if (info.length() > 0) {
-			info = " (" + info + EnumChatFormatting.RESET + ")";
-		}
-		addTooltipString(I18N.localise("botany.circuit.flowers") + info);
-	}
+        if (info.length() > 0) {
+            info = " (" + info + EnumChatFormatting.RESET + ")";
+        }
+        addTooltipString(I18N.localise("botany.circuit.flowers") + info);
+    }
 
-	@Override
-	public boolean isCircuitable(Object tile) {
-		return tile instanceof IFarmHousing;
-	}
+    @Override
+    public boolean isCircuitable(Object tile) {
+        return tile instanceof IFarmHousing;
+    }
 
-	@Override
-	public void onInsertion(int slot, Object tile) {
-		if (!isCircuitable(tile)) {
-			return;
-		}
+    @Override
+    public void onInsertion(int slot, Object tile) {
+        if (!isCircuitable(tile)) {
+            return;
+        }
 
-		GardenLogic logic = new GardenLogic((IFarmHousing) tile);
-		logic.setData(moisture, acidity, isManual, isFertilised, icon, I18N.localise(getName()));
-		((IFarmHousing) tile).setFarmLogic(FarmDirection.values()[slot], logic);
-	}
+        GardenLogic logic = new GardenLogic((IFarmHousing) tile);
+        logic.setData(moisture, acidity, isManual, isFertilised, icon, I18N.localise(getName()));
+        ((IFarmHousing) tile).setFarmLogic(FarmDirection.values()[slot], logic);
+    }
 
-	@Override
-	public void onLoad(int slot, Object tile) {
-		onInsertion(slot, tile);
-	}
+    @Override
+    public void onLoad(int slot, Object tile) {
+        onInsertion(slot, tile);
+    }
 
-	@Override
-	public void onRemoval(int slot, Object tile) {
-		if (!isCircuitable(tile)) {
-			return;
-		}
-		((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
-	}
+    @Override
+    public void onRemoval(int slot, Object tile) {
+        if (!isCircuitable(tile)) {
+            return;
+        }
+        ((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
+    }
 
-	@Override
-	public void onTick(int arg0, Object arg1) {
-		// ignored
-	}
+    @Override
+    public void onTick(int arg0, Object arg1) {
+        // ignored
+    }
 }

src/main/java/binnie/botany/farm/FarmLogic.java

@@ -10,49 +10,48 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public abstract class FarmLogic implements IFarmLogic {
-	protected World world;
-	protected IFarmHousing housing;
-	protected boolean isManual;
+    protected World world;
+    protected IFarmHousing housing;
+    protected boolean isManual;
 
-	public FarmLogic(IFarmHousing housing) {
-		this.housing = housing;
-	}
+    public FarmLogic(IFarmHousing housing) {
+        this.housing = housing;
+    }
 
-	@Override
-	public IFarmLogic setManual(boolean flag) {
-		isManual = flag;
-		return this;
-	}
+    @Override
+    public IFarmLogic setManual(boolean flag) {
+        isManual = flag;
+        return this;
+    }
 
-	protected boolean isAirBlock(Vect position) {
-		return world.isAirBlock(position.x, position.y, position.z);
-	}
+    protected boolean isAirBlock(Vect position) {
+        return world.isAirBlock(position.x, position.y, position.z);
+    }
 
-	protected boolean isWaterBlock(Vect position) {
-		return world.getBlock(position.x, position.y, position.z) == Blocks.water;
-	}
+    protected boolean isWaterBlock(Vect position) {
+        return world.getBlock(position.x, position.y, position.z) == Blocks.water;
+    }
 
-	protected Block getBlock(Vect position) {
-		return world.getBlock(position.x, position.y, position.z);
-	}
+    protected Block getBlock(Vect position) {
+        return world.getBlock(position.x, position.y, position.z);
+    }
 
-	protected int getBlockMeta(Vect position) {
-		return world.getBlockMetadata(position.x, position.y, position.z);
-	}
+    protected int getBlockMeta(Vect position) {
+        return world.getBlockMetadata(position.x, position.y, position.z);
+    }
 
-	protected ItemStack getAsItemStack(Vect position) {
-		return new ItemStack(getBlock(position), 1, getBlockMeta(position));
-	}
+    protected ItemStack getAsItemStack(Vect position) {
+        return new ItemStack(getBlock(position), 1, getBlockMeta(position));
+    }
 
-	protected Vect translateWithOffset(int x, int y, int z, FarmDirection direction, int step) {
-		return new Vect(
-			x + direction.getForgeDirection().offsetX * step,
-			y + direction.getForgeDirection().offsetY * step,
-			z + direction.getForgeDirection().offsetZ * step
-		);
-	}
+    protected Vect translateWithOffset(int x, int y, int z, FarmDirection direction, int step) {
+        return new Vect(
+                x + direction.getForgeDirection().offsetX * step,
+                y + direction.getForgeDirection().offsetY * step,
+                z + direction.getForgeDirection().offsetZ * step);
+    }
 
-	protected void setBlock(Vect position, Block block, int meta) {
-		world.setBlock(position.x, position.y, position.z, block, meta, 2);
-	}
+    protected void setBlock(Vect position, Block block, int meta) {
+        world.setBlock(position.x, position.y, position.z, block, meta, 2);
+    }
 }

src/main/java/binnie/botany/farm/FarmableFlower.java

@@ -12,31 +12,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class FarmableFlower implements IFarmable {
-	@Override
-	public boolean isSaplingAt(World world, int x, int y, int z) {
-		return world.getBlock(x, y, z) == Botany.flower;
-	}
+    @Override
+    public boolean isSaplingAt(World world, int x, int y, int z) {
+        return world.getBlock(x, y, z) == Botany.flower;
+    }
 
-	@Override
-	public ICrop getCropAt(World world, int x, int y, int z) {
-		return null;
-	}
+    @Override
+    public ICrop getCropAt(World world, int x, int y, int z) {
+        return null;
+    }
 
-	@Override
-	public boolean isGermling(ItemStack itemstack) {
-		EnumFlowerStage stage = BotanyCore.speciesRoot.getStageType(itemstack);
-		return stage == EnumFlowerStage.FLOWER || stage == EnumFlowerStage.SEED;
-	}
+    @Override
+    public boolean isGermling(ItemStack itemstack) {
+        EnumFlowerStage stage = BotanyCore.speciesRoot.getStageType(itemstack);
+        return stage == EnumFlowerStage.FLOWER || stage == EnumFlowerStage.SEED;
+    }
 
-	@Override
-	public boolean isWindfall(ItemStack itemstack) {
-		return false;
-	}
+    @Override
+    public boolean isWindfall(ItemStack itemstack) {
+        return false;
+    }
 
-	@Override
-	public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
-		IFlower flower = BotanyCore.getFlowerRoot().getMember(germling);
-		Gardening.plant(world, x, y, z, flower, player.getGameProfile());
-		return true;
-	}
+    @Override
+    public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
+        IFlower flower = BotanyCore.getFlowerRoot().getMember(germling);
+        Gardening.plant(world, x, y, z, flower, player.getGameProfile());
+        return true;
+    }
 }

src/main/java/binnie/botany/farm/FarmableVanillaFlower.java

@@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class FarmableVanillaFlower extends FarmableFlower {
-	@Override
-	public boolean isGermling(ItemStack itemstack) {
-		return BotanyCore.getFlowerRoot().getConversion(itemstack) != null;
-	}
+    @Override
+    public boolean isGermling(ItemStack itemstack) {
+        return BotanyCore.getFlowerRoot().getConversion(itemstack) != null;
+    }
 
-	@Override
-	public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
-		IFlower flower = BotanyCore.getFlowerRoot().getConversion(germling);
-		return Gardening.plant(world, x, y, z, flower, player.getGameProfile());
-	}
+    @Override
+    public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) {
+        IFlower flower = BotanyCore.getFlowerRoot().getConversion(germling);
+        return Gardening.plant(world, x, y, z, flower, player.getGameProfile());
+    }
 }

src/main/java/binnie/botany/farm/GardenLogic.java

@@ -17,6 +17,9 @@ import forestry.api.farming.IFarmHousing;
 import forestry.api.farming.IFarmable;
 import forestry.core.access.IOwnable;
 import forestry.core.utils.vect.Vect;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
@@ -28,380 +31,389 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class GardenLogic extends FarmLogic {
-	protected EnumMoisture moisture;
-	protected EnumAcidity acidity;
-	protected boolean fertilised;
-	protected String name;
-	protected ArrayList<ItemStack> produce;
-	protected List<IFarmable> farmables;
+    protected EnumMoisture moisture;
+    protected EnumAcidity acidity;
+    protected boolean fertilised;
+    protected String name;
+    protected ArrayList<ItemStack> produce;
+    protected List<IFarmable> farmables;
 
-	private ItemStack icon;
+    private ItemStack icon;
 
-	public GardenLogic(IFarmHousing housing) {
-		super(housing);
-		produce = new ArrayList<>();
-		farmables = new ArrayList<>();
-		farmables.add(new FarmableFlower());
-		farmables.add(new FarmableVanillaFlower());
-	}
+    public GardenLogic(IFarmHousing housing) {
+        super(housing);
+        produce = new ArrayList<>();
+        farmables = new ArrayList<>();
+        farmables.add(new FarmableFlower());
+        farmables.add(new FarmableVanillaFlower());
+    }
 
-	@Override
-	public int getFertilizerConsumption() {
-		return fertilised ? 8 : 2;
-	}
+    @Override
+    public int getFertilizerConsumption() {
+        return fertilised ? 8 : 2;
+    }
 
-	@Override
-	public int getWaterConsumption(float hydrationModifier) {
-		return (int) (moisture.ordinal() * 40 * hydrationModifier);
-	}
+    @Override
+    public int getWaterConsumption(float hydrationModifier) {
+        return (int) (moisture.ordinal() * 40 * hydrationModifier);
+    }
 
-	@Override
-	public boolean isAcceptedResource(ItemStack stack) {
-		Item item = stack.getItem();
-		return Gardening.isSoil(item)
-			|| item == Item.getItemFromBlock(Blocks.sand)
-			|| item == Item.getItemFromBlock(Blocks.dirt)
-			|| Gardening.isAcidFertiliser(stack)
-			|| Gardening.isAlkalineFertiliser(stack);
-	}
+    @Override
+    public boolean isAcceptedResource(ItemStack stack) {
+        Item item = stack.getItem();
+        return Gardening.isSoil(item)
+                || item == Item.getItemFromBlock(Blocks.sand)
+                || item == Item.getItemFromBlock(Blocks.dirt)
+                || Gardening.isAcidFertiliser(stack)
+                || Gardening.isAlkalineFertiliser(stack);
+    }
 
-	@Override
-	public Collection<ItemStack> collect() {
-		Collection<ItemStack> products = produce;
-		produce = new ArrayList<>();
-		return products;
-	}
+    @Override
+    public Collection<ItemStack> collect() {
+        Collection<ItemStack> products = produce;
+        produce = new ArrayList<>();
+        return products;
+    }
 
-	@Override
-	public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) {
-		world = housing.getWorld();
-		return maintainSoil(x, y, z, direction, extent)
-			|| !isManual && maintainWater(x, y, z, direction, extent)
-			|| maintainCrops(x, y + 1, z, direction, extent);
-	}
+    @Override
+    public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) {
+        world = housing.getWorld();
+        return maintainSoil(x, y, z, direction, extent)
+                || !isManual && maintainWater(x, y, z, direction, extent)
+                || maintainCrops(x, y + 1, z, direction, extent);
+    }
 
-	private boolean isWaste(ItemStack stack) {
-		return stack.getItem() == Item.getItemFromBlock(Blocks.dirt);
-	}
+    private boolean isWaste(ItemStack stack) {
+        return stack.getItem() == Item.getItemFromBlock(Blocks.dirt);
+    }
 
-	private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) {
-		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			boolean isSoil = Gardening.isSoil(world.getBlock(position.x, position.y, position.z));
-			
-			// remove unnecessary blocks
-			if (!isManual && !isSoil && !isAirBlock(position)) {
-				Block block = world.getBlock(position.x, position.y, position.z);
-				if (moisture == EnumMoisture.DAMP) {
-					if (block != Blocks.water) {
-						dropBlockAsProduction(position);
-					}
-				} else if (moisture == EnumMoisture.DRY) {
-					if (block != Blocks.sand) {
-						dropBlockAsProduction(position);
-					}
-				} else {
-					dropBlockAsProduction(position);
-				}
-			}
+    private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) {
+        for (int i = 0; i < extent; ++i) {
+            Vect position = translateWithOffset(x, y, z, direction, i);
+            boolean isSoil = Gardening.isSoil(world.getBlock(position.x, position.y, position.z));
 
-			if (fertilised && isSoil) {
-				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
-				if (soil.fertilise(world, position.x, position.y, position.z, EnumSoilType.FLOWERBED)) {
-					continue;
-				}
-			}
+            // remove unnecessary blocks
+            if (!isManual && !isSoil && !isAirBlock(position)) {
+                Block block = world.getBlock(position.x, position.y, position.z);
+                if (moisture == EnumMoisture.DAMP) {
+                    if (block != Blocks.water) {
+                        dropBlockAsProduction(position);
+                    }
+                } else if (moisture == EnumMoisture.DRY) {
+                    if (block != Blocks.sand) {
+                        dropBlockAsProduction(position);
+                    }
+                } else {
+                    dropBlockAsProduction(position);
+                }
+            }
 
-			if (world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
-				world.setBlockToAir(position.x, position.y + 1, position.z);
-				continue;
-			}
+            if (fertilised && isSoil) {
+                IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
+                if (soil.fertilise(world, position.x, position.y, position.z, EnumSoilType.FLOWERBED)) {
+                    continue;
+                }
+            }
 
-			if (acidity != null && isSoil) {
-				IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
-				EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z);
-				if (pH.ordinal() < acidity.ordinal()) {
-					ItemStack stack = getAvailableAlkaline();
-					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
-						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-						continue;
-					}
-				}
+            if (world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
+                world.setBlockToAir(position.x, position.y + 1, position.z);
+                continue;
+            }
 
-				if (pH.ordinal() > acidity.ordinal()) {
-					ItemStack stack = getAvailableAcid();
-					if (stack != null && soil.setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
-						housing.getFarmInventory().removeResources(new ItemStack[]{stack});
-						continue;
-					}
-				}
-			}
+            if (acidity != null && isSoil) {
+                IBlockSoil soil = (IBlockSoil) world.getBlock(position.x, position.y, position.z);
+                EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z);
+                if (pH.ordinal() < acidity.ordinal()) {
+                    ItemStack stack = getAvailableAlkaline();
+                    if (stack != null
+                            && soil.setPH(
+                                    world,
+                                    position.x,
+                                    position.y,
+                                    position.z,
+                                    EnumAcidity.values()[pH.ordinal() + 1])) {
+                        housing.getFarmInventory().removeResources(new ItemStack[] {stack});
+                        continue;
+                    }
+                }
 
-			if (!isAirBlock(position) && !world.getBlock(position.x, position.y, position.z).isReplaceable(world, position.x, position.y, position.z)) {
-				ItemStack block = getAsItemStack(position);
-				ItemStack loam = getAvailableLoam();
-				if (isWaste(block) && loam != null) {
-					produce.addAll(Blocks.dirt.getDrops(world, position.x, position.y, position.z, block.getItemDamage(), 0));
-					setBlock(position, Blocks.air, 0);
-					return trySetSoil(position, loam);
-				}
-			} else if (!isManual) {
-				if (!isWaterBlock(position)) {
-					if (i % 2 == 0) {
-						return trySetSoil(position);
-					}
+                if (pH.ordinal() > acidity.ordinal()) {
+                    ItemStack stack = getAvailableAcid();
+                    if (stack != null
+                            && soil.setPH(
+                                    world,
+                                    position.x,
+                                    position.y,
+                                    position.z,
+                                    EnumAcidity.values()[pH.ordinal() - 1])) {
+                        housing.getFarmInventory().removeResources(new ItemStack[] {stack});
+                        continue;
+                    }
+                }
+            }
 
-					FarmDirection cclock = FarmDirection.EAST;
-					if (direction == FarmDirection.EAST) {
-						cclock = FarmDirection.SOUTH;
-					} else if (direction == FarmDirection.SOUTH) {
-						cclock = FarmDirection.EAST;
-					} else if (direction == FarmDirection.WEST) {
-						cclock = FarmDirection.SOUTH;
-					}
+            if (!isAirBlock(position)
+                    && !world.getBlock(position.x, position.y, position.z)
+                            .isReplaceable(world, position.x, position.y, position.z)) {
+                ItemStack block = getAsItemStack(position);
+                ItemStack loam = getAvailableLoam();
+                if (isWaste(block) && loam != null) {
+                    produce.addAll(
+                            Blocks.dirt.getDrops(world, position.x, position.y, position.z, block.getItemDamage(), 0));
+                    setBlock(position, Blocks.air, 0);
+                    return trySetSoil(position, loam);
+                }
+            } else if (!isManual) {
+                if (!isWaterBlock(position)) {
+                    if (i % 2 == 0) {
+                        return trySetSoil(position);
+                    }
 
-					Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
-					ItemStack soil2 = getAsItemStack(previous);
-					if (!Gardening.isSoil(soil2.getItem())) {
-						trySetSoil(position);
-					}
-				}
-			}
-		}
-		return false;
-	}
+                    FarmDirection cclock = FarmDirection.EAST;
+                    if (direction == FarmDirection.EAST) {
+                        cclock = FarmDirection.SOUTH;
+                    } else if (direction == FarmDirection.SOUTH) {
+                        cclock = FarmDirection.EAST;
+                    } else if (direction == FarmDirection.WEST) {
+                        cclock = FarmDirection.SOUTH;
+                    }
 
-	private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) {
-		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			if (!isAirBlock(position) && !world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
-				continue;
-			}
+                    Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
+                    ItemStack soil2 = getAsItemStack(previous);
+                    if (!Gardening.isSoil(soil2.getItem())) {
+                        trySetSoil(position);
+                    }
+                }
+            }
+        }
+        return false;
+    }
 
-			if (isWaterBlock(position)) {
-				continue;
-			}
+    private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) {
+        for (int i = 0; i < extent; ++i) {
+            Vect position = translateWithOffset(x, y, z, direction, i);
+            if (!isAirBlock(position)
+                    && !world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
+                continue;
+            }
 
-			boolean isEnclosed = true;
-			if (world.isAirBlock(position.x + 1, position.y, position.z)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x - 1, position.y, position.z)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x, position.y, position.z + 1)) {
-				isEnclosed = false;
-			} else if (world.isAirBlock(position.x, position.y, position.z - 1)) {
-				isEnclosed = false;
-			}
+            if (isWaterBlock(position)) {
+                continue;
+            }
 
-			isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
-			if (isEnclosed) {
-				return trySetWater(position);
-			}
-		}
-		return false;
-	}
+            boolean isEnclosed = true;
+            if (world.isAirBlock(position.x + 1, position.y, position.z)) {
+                isEnclosed = false;
+            } else if (world.isAirBlock(position.x - 1, position.y, position.z)) {
+                isEnclosed = false;
+            } else if (world.isAirBlock(position.x, position.y, position.z + 1)) {
+                isEnclosed = false;
+            } else if (world.isAirBlock(position.x, position.y, position.z - 1)) {
+                isEnclosed = false;
+            }
 
-	private ItemStack getAvailableLoam() {
-		EnumMoisture[] moistures;
-		if (moisture == EnumMoisture.DAMP) {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DAMP,
-				EnumMoisture.NORMAL,
-				EnumMoisture.DRY
-			};
-		} else if (moisture == EnumMoisture.DRY) {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DRY,
-				EnumMoisture.DAMP,
-				EnumMoisture.DRY
-			};
-		} else {
-			moistures = new EnumMoisture[]{
-				EnumMoisture.DRY,
-				EnumMoisture.NORMAL,
-				EnumMoisture.DAMP
-			};
-		}
+            isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
+            if (isEnclosed) {
+                return trySetWater(position);
+            }
+        }
+        return false;
+    }
 
-		EnumAcidity[] acidities = {
-			EnumAcidity.NEUTRAL,
-			EnumAcidity.ACID,
-			EnumAcidity.ALKALINE
-		};
+    private ItemStack getAvailableLoam() {
+        EnumMoisture[] moistures;
+        if (moisture == EnumMoisture.DAMP) {
+            moistures = new EnumMoisture[] {EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY};
+        } else if (moisture == EnumMoisture.DRY) {
+            moistures = new EnumMoisture[] {EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY};
+        } else {
+            moistures = new EnumMoisture[] {EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP};
+        }
 
-		for (EnumMoisture moist : moistures) {
-			for (EnumAcidity acid : acidities) {
-				for (Block type : new Block[]{Botany.flowerbed, Botany.loam, Botany.soil}) {
-					int meta = acid.ordinal() * 3 + moist.ordinal();
-					ItemStack[] resource = {new ItemStack(type, 1, meta)};
-					if (housing.getFarmInventory().hasResources(resource)) {
-						return resource[0];
-					}
-				}
-			}
-		}
+        EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE};
 
-		if (housing.getFarmInventory().hasResources(new ItemStack[]{new ItemStack(Blocks.dirt)})) {
-			return new ItemStack(Blocks.dirt);
-		}
-		return null;
-	}
+        for (EnumMoisture moist : moistures) {
+            for (EnumAcidity acid : acidities) {
+                for (Block type : new Block[] {Botany.flowerbed, Botany.loam, Botany.soil}) {
+                    int meta = acid.ordinal() * 3 + moist.ordinal();
+                    ItemStack[] resource = {new ItemStack(type, 1, meta)};
+                    if (housing.getFarmInventory().hasResources(resource)) {
+                        return resource[0];
+                    }
+                }
+            }
+        }
 
-	private boolean trySetSoil(Vect position) {
-		return trySetSoil(position, getAvailableLoam());
-	}
+        if (housing.getFarmInventory().hasResources(new ItemStack[] {new ItemStack(Blocks.dirt)})) {
+            return new ItemStack(Blocks.dirt);
+        }
+        return null;
+    }
 
-	private boolean trySetSoil(Vect position, ItemStack loam) {
-		ItemStack copy = loam;
-		if (loam == null) {
-			return false;
-		}
+    private boolean trySetSoil(Vect position) {
+        return trySetSoil(position, getAvailableLoam());
+    }
 
-		if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) {
-			loam = new ItemStack(Botany.soil, 0, 4);
-		}
+    private boolean trySetSoil(Vect position, ItemStack loam) {
+        ItemStack copy = loam;
+        if (loam == null) {
+            return false;
+        }
 
-		setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
-		housing.getFarmInventory().removeResources(new ItemStack[]{copy});
-		return true;
-	}
+        if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) {
+            loam = new ItemStack(Botany.soil, 0, 4);
+        }
 
-	private boolean trySetWater(Vect position) {
-		FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
-		if (moisture == EnumMoisture.DAMP) {
-			if (!housing.hasLiquid(water)) {
-				return false;
-			}
+        setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
+        housing.getFarmInventory().removeResources(new ItemStack[] {copy});
+        return true;
+    }
 
-			setBlock(position, Blocks.water, 0);
-			housing.removeLiquid(water);
-			return true;
-		}
+    private boolean trySetWater(Vect position) {
+        FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
+        if (moisture == EnumMoisture.DAMP) {
+            if (!housing.hasLiquid(water)) {
+                return false;
+            }
 
-		if (moisture != EnumMoisture.DRY) {
-			return trySetSoil(position);
-		}
+            setBlock(position, Blocks.water, 0);
+            housing.removeLiquid(water);
+            return true;
+        }
 
-		ItemStack[] sand = {new ItemStack(Blocks.sand, 1)};
-		if (!housing.getFarmInventory().hasResources(sand)) {
-			return false;
-		}
+        if (moisture != EnumMoisture.DRY) {
+            return trySetSoil(position);
+        }
 
-		setBlock(position, Blocks.sand, 0);
-		housing.getFarmInventory().removeResources(sand);
-		return true;
-	}
+        ItemStack[] sand = {new ItemStack(Blocks.sand, 1)};
+        if (!housing.getFarmInventory().hasResources(sand)) {
+            return false;
+        }
 
-	private void dropBlockAsProduction(Vect position) {
-		ItemStack stack = new ItemStack(world.getBlock(position.x, position.y, position.z));
-		if (stack.getItem() == null) {
-			return;
-		}
-		produce.add(stack);
-		world.setBlockToAir(position.x, position.y, position.z);
-	}
+        setBlock(position, Blocks.sand, 0);
+        housing.getFarmInventory().removeResources(sand);
+        return true;
+    }
 
-	@Override
-	public boolean isAcceptedGermling(ItemStack stack) {
-		for (IFarmable farmable : farmables) {
-			if (farmable.isGermling(stack)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    private void dropBlockAsProduction(Vect position) {
+        ItemStack stack = new ItemStack(world.getBlock(position.x, position.y, position.z));
+        if (stack.getItem() == null) {
+            return;
+        }
+        produce.add(stack);
+        world.setBlockToAir(position.x, position.y, position.z);
+    }
 
-	@Override
-	public Collection<ICrop> harvest(int x, int y, int z, FarmDirection direction, int extent) {
-		return null;
-	}
+    @Override
+    public boolean isAcceptedGermling(ItemStack stack) {
+        for (IFarmable farmable : farmables) {
+            if (farmable.isGermling(stack)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon() {
-		return icon.getIconIndex();
-	}
+    @Override
+    public Collection<ICrop> harvest(int x, int y, int z, FarmDirection direction, int extent) {
+        return null;
+    }
 
-	public void setIcon(ItemStack icon) {
-		this.icon = icon;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon() {
+        return icon.getIconIndex();
+    }
 
-	@Override
-	public ResourceLocation getSpriteSheet() {
-		return TextureMap.locationBlocksTexture;
-	}
+    public void setIcon(ItemStack icon) {
+        this.icon = icon;
+    }
 
-	@Override
-	public String getName() {
-		return name;
-	}
+    @Override
+    public ResourceLocation getSpriteSheet() {
+        return TextureMap.locationBlocksTexture;
+    }
 
-	protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) {
-		for (int i = 0; i < extent; ++i) {
-			Vect position = translateWithOffset(x, y, z, direction, i);
-			if (isAirBlock(position) || world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
-				ItemStack below = getAsItemStack(position.add(new Vect(0, -1, 0)));
-				if (Gardening.isSoil(below.getItem())) {
-					return trySetCrop(position);
-				}
-			}
-		}
-		return false;
-	}
+    @Override
+    public String getName() {
+        return name;
+    }
 
-	private boolean trySetCrop(Vect position) {
-		for (IFarmable farmable : farmables) {
-			boolean success = housing.plantGermling(farmable, world, position.x, position.y, position.z);
-			if (!success || !(housing instanceof IOwnable)) {
-				continue;
-			}
+    protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) {
+        for (int i = 0; i < extent; ++i) {
+            Vect position = translateWithOffset(x, y, z, direction, i);
+            if (isAirBlock(position)
+                    || world.getBlock(x, y, z).isReplaceable(world, position.x, position.y, position.z)) {
+                ItemStack below = getAsItemStack(position.add(new Vect(0, -1, 0)));
+                if (Gardening.isSoil(below.getItem())) {
+                    return trySetCrop(position);
+                }
+            }
+        }
+        return false;
+    }
 
-			TileEntity tile = housing.getWorld().getTileEntity(position.x, position.y, position.z);
-			if (!(tile instanceof TileEntityFlower)) {
-				return true;
-			}
+    private boolean trySetCrop(Vect position) {
+        for (IFarmable farmable : farmables) {
+            boolean success = housing.plantGermling(farmable, world, position.x, position.y, position.z);
+            if (!success || !(housing instanceof IOwnable)) {
+                continue;
+            }
 
-			try {
-				IOwnable housing2 = (IOwnable) housing;
-				GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2);
-				((TileEntityFlower) tile).setOwner(prof);
-			} catch (Exception ex) {
-				// ignored
-			}
-			return true;
-		}
-		return false;
-	}
+            TileEntity tile = housing.getWorld().getTileEntity(position.x, position.y, position.z);
+            if (!(tile instanceof TileEntityFlower)) {
+                return true;
+            }
 
-	public ItemStack getAvailableAcid() {
-		for (ItemStack stack : Gardening.getAcidFertilisers()) {
-			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
-				return stack;
-			}
-		}
-		return null;
-	}
+            try {
+                IOwnable housing2 = (IOwnable) housing;
+                GameProfile prof = (GameProfile) IOwnable.class
+                        .getMethod("getOwnerProfile", new Class[0])
+                        .invoke(housing2);
+                ((TileEntityFlower) tile).setOwner(prof);
+            } catch (Exception ex) {
+                // ignored
+            }
+            return true;
+        }
+        return false;
+    }
 
-	public ItemStack getAvailableAlkaline() {
-		for (ItemStack stack : Gardening.getAlkalineFertilisers()) {
-			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
-				return stack;
-			}
-		}
-		return null;
-	}
+    public ItemStack getAvailableAcid() {
+        for (ItemStack stack : Gardening.getAcidFertilisers()) {
+            if (stack != null
+                    && stack.getItem() != null
+                    && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) {
+                return stack;
+            }
+        }
+        return null;
+    }
 
-	public void setData(EnumMoisture moisture, EnumAcidity acidity, boolean isManual, boolean fertilised, ItemStack icon, String name) {
-		this.moisture = moisture;
-		this.acidity = acidity;
-		this.isManual = isManual;
-		this.fertilised = fertilised;
-		this.icon = icon;
-		this.name = name;
-	}
+    public ItemStack getAvailableAlkaline() {
+        for (ItemStack stack : Gardening.getAlkalineFertilisers()) {
+            if (stack != null
+                    && stack.getItem() != null
+                    && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) {
+                return stack;
+            }
+        }
+        return null;
+    }
+
+    public void setData(
+            EnumMoisture moisture,
+            EnumAcidity acidity,
+            boolean isManual,
+            boolean fertilised,
+            ItemStack icon,
+            String name) {
+        this.moisture = moisture;
+        this.acidity = acidity;
+        this.isManual = isManual;
+        this.fertilised = fertilised;
+        this.icon = icon;
+        this.name = name;
+    }
 }

src/main/java/binnie/botany/flower/BlockFlower.java

@@ -11,6 +11,9 @@ import binnie.core.BinnieCore;
 import com.mojang.authlib.GameProfile;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -25,208 +28,201 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 public class BlockFlower extends BlockContainer {
-	public BlockFlower() {
-		super(Material.plants);
-		float f = 0.2f;
-		setBlockBounds(0.5f - f, 0.0f, 0.5f - f, 0.5f + f, f * 3.0f, 0.5f + f);
-		setTickRandomly(true);
-		setBlockName("flower");
-		setStepSound(Block.soundTypeGrass);
-	}
+    public BlockFlower() {
+        super(Material.plants);
+        float f = 0.2f;
+        setBlockBounds(0.5f - f, 0.0f, 0.5f - f, 0.5f + f, f * 3.0f, 0.5f + f);
+        setTickRandomly(true);
+        setBlockName("flower");
+        setStepSound(Block.soundTypeGrass);
+    }
 
-	@Override
-	public String getUnlocalizedName() {
-		return "botany.flower";
-	}
+    @Override
+    public String getUnlocalizedName() {
+        return "botany.flower";
+    }
 
-	@Override
-	public int getRenderType() {
-		return RendererBotany.renderID;
-	}
+    @Override
+    public int getRenderType() {
+        return RendererBotany.renderID;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		for (EnumFlowerType type : EnumFlowerType.values()) {
-			type.registerIcons(register);
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister register) {
+        for (EnumFlowerType type : EnumFlowerType.values()) {
+            type.registerIcons(register);
+        }
+    }
 
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntityFlower();
-	}
+    @Override
+    public TileEntity createNewTileEntity(World world, int meta) {
+        return new TileEntityFlower();
+    }
 
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		return null;
-	}
+    @Override
+    public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+        return null;
+    }
 
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
 
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
 
-	@Override
-	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
-		super.onBlockPlacedBy(world, x, y, z, entity, stack);
-		TileEntity flower = world.getTileEntity(x, y, z);
-		if (!BinnieCore.proxy.isSimulating(world)) {
-			if (flower != null && flower instanceof TileEntityFlower) {
-				IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
-				((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
-			}
-			return;
-		}
+    @Override
+    public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
+        super.onBlockPlacedBy(world, x, y, z, entity, stack);
+        TileEntity flower = world.getTileEntity(x, y, z);
+        if (!BinnieCore.proxy.isSimulating(world)) {
+            if (flower != null && flower instanceof TileEntityFlower) {
+                IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
+                ((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
+            }
+            return;
+        }
 
-		TileEntity below = world.getTileEntity(x, y - 1, z);
-		if (flower != null && flower instanceof TileEntityFlower) {
-			if (below instanceof TileEntityFlower) {
-				((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
-			} else {
-				GameProfile owner = (entity instanceof EntityPlayer) ? ((EntityPlayer) entity).getGameProfile() : null;
-				((TileEntityFlower) flower).create(stack, owner);
-			}
-		}
-		Gardening.tryGrowSection(world, x, y, z);
-	}
+        TileEntity below = world.getTileEntity(x, y - 1, z);
+        if (flower != null && flower instanceof TileEntityFlower) {
+            if (below instanceof TileEntityFlower) {
+                ((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
+            } else {
+                GameProfile owner = (entity instanceof EntityPlayer) ? ((EntityPlayer) entity).getGameProfile() : null;
+                ((TileEntityFlower) flower).create(stack, owner);
+            }
+        }
+        Gardening.tryGrowSection(world, x, y, z);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (!(tile instanceof TileEntityFlower)) {
-			return super.getIcon(world, x, y, z, side);
-		}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (!(tile instanceof TileEntityFlower)) {
+            return super.getIcon(world, x, y, z, side);
+        }
 
-		TileEntityFlower f = (TileEntityFlower) tile;
-		EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
-		IFlowerType flower = f.getType();
-		int section = f.getRenderSection();
-		boolean flowered = f.isFlowered();
-		if (RendererBotany.pass == 0) {
-			return flower.getStem(stage, flowered, section);
-		}
+        TileEntityFlower f = (TileEntityFlower) tile;
+        EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
+        IFlowerType flower = f.getType();
+        int section = f.getRenderSection();
+        boolean flowered = f.isFlowered();
+        if (RendererBotany.pass == 0) {
+            return flower.getStem(stage, flowered, section);
+        }
 
-		return (RendererBotany.pass == 1) ?
-			flower.getPetalIcon(stage, flowered, section) :
-			flower.getVariantIcon(stage, flowered, section);
-	}
+        return (RendererBotany.pass == 1)
+                ? flower.getPetalIcon(stage, flowered, section)
+                : flower.getVariantIcon(stage, flowered, section);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			TileEntityFlower f = (TileEntityFlower) tile;
-			if (RendererBotany.pass == 0) {
-				return f.getStemColour();
-			}
-			return (RendererBotany.pass == 1) ?
-				f.getPrimaryColor() :
-				f.getSecondaryColor();
-		}
-		return 0xffffff;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (tile instanceof TileEntityFlower) {
+            TileEntityFlower f = (TileEntityFlower) tile;
+            if (RendererBotany.pass == 0) {
+                return f.getStemColour();
+            }
+            return (RendererBotany.pass == 1) ? f.getPrimaryColor() : f.getSecondaryColor();
+        }
+        return 0xffffff;
+    }
 
-	@Override
-	public boolean canPlaceBlockAt(World world, int x, int y, int z) {
-		return super.canPlaceBlockAt(world, x, y, z)
-			&& canBlockStay(world, x, y, z);
-	}
+    @Override
+    public boolean canPlaceBlockAt(World world, int x, int y, int z) {
+        return super.canPlaceBlockAt(world, x, y, z) && canBlockStay(world, x, y, z);
+    }
 
-	protected boolean canPlaceBlockOn(Block block) {
-		return block == Blocks.grass
-			|| block == Blocks.dirt
-			|| block == Blocks.farmland
-			|| Gardening.isSoil(block);
-	}
+    protected boolean canPlaceBlockOn(Block block) {
+        return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || Gardening.isSoil(block);
+    }
 
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-		super.onNeighborBlockChange(world, x, y, z, block);
-		checkAndDropBlock(world, x, y, z);
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (!(tile instanceof TileEntityFlower)) {
-			return;
-		}
+    @Override
+    public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
+        super.onNeighborBlockChange(world, x, y, z, block);
+        checkAndDropBlock(world, x, y, z);
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (!(tile instanceof TileEntityFlower)) {
+            return;
+        }
 
-		TileEntityFlower flower = (TileEntityFlower) tile;
-		if (flower.getSection() == 0
-			&& flower.getFlower() != null
-			&& flower.getFlower().getAge() > 0
-			&& flower.getFlower().getGenome().getPrimary().getType().getSections() > 1
-			&& world.getBlock(x, y + 1, z) != Botany.flower) {
-			dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-			world.setBlockToAir(x, y, z);
-		}
-	}
+        TileEntityFlower flower = (TileEntityFlower) tile;
+        if (flower.getSection() == 0
+                && flower.getFlower() != null
+                && flower.getFlower().getAge() > 0
+                && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1
+                && world.getBlock(x, y + 1, z) != Botany.flower) {
+            dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+            world.setBlockToAir(x, y, z);
+        }
+    }
 
-	@Override
-	public void updateTick(World world, int x, int y, int z, Random rand) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			((TileEntityFlower) tile).randomUpdate(rand);
-			checkAndDropBlock(world, x, y, z);
-			return;
-		}
-		world.setBlockToAir(x, y, z);
-	}
+    @Override
+    public void updateTick(World world, int x, int y, int z, Random rand) {
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (tile instanceof TileEntityFlower) {
+            ((TileEntityFlower) tile).randomUpdate(rand);
+            checkAndDropBlock(world, x, y, z);
+            return;
+        }
+        world.setBlockToAir(x, y, z);
+    }
 
-	protected void checkAndDropBlock(World world, int x, int y, int z) {
-		if (!canBlockStay(world, x, y, z)) {
-			dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-			world.setBlockToAir(x, y, z);
-		}
-	}
+    protected void checkAndDropBlock(World world, int x, int y, int z) {
+        if (!canBlockStay(world, x, y, z)) {
+            dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+            world.setBlockToAir(x, y, z);
+        }
+    }
 
-	@Override
-	public boolean canBlockStay(World world, int x, int y, int z) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
-			return world.getBlock(x, y - 1, z) == Botany.flower;
-		}
-		return canPlaceBlockOn(world.getBlock(x, y - 1, z));
-	}
+    @Override
+    public boolean canBlockStay(World world, int x, int y, int z) {
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
+            return world.getBlock(x, y - 1, z) == Botany.flower;
+        }
+        return canPlaceBlockOn(world.getBlock(x, y - 1, z));
+    }
 
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		ArrayList<ItemStack> drops = new ArrayList<>();
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) {
-			ItemStack flower = ((TileEntityFlower) tile).getItemStack();
-			if (flower != null) {
-				drops.add(flower);
-			}
-		}
-		return drops;
-	}
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
+        ArrayList<ItemStack> drops = new ArrayList<>();
+        TileEntity tile = world.getTileEntity(x, y, z);
+        if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) {
+            ItemStack flower = ((TileEntityFlower) tile).getItemStack();
+            if (flower != null) {
+                drops.add(flower);
+            }
+        }
+        return drops;
+    }
 
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		List<ItemStack> drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-		boolean hasBeenBroken = world.setBlockToAir(x, y, z);
-		if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				dropBlockAsItem(world, x, y, z, drop);
-			}
-		}
-		return hasBeenBroken;
-	}
+    @Override
+    public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
+        List<ItemStack> drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+        boolean hasBeenBroken = world.setBlockToAir(x, y, z);
+        if (hasBeenBroken
+                && BinnieCore.proxy.isSimulating(world)
+                && drops.size() > 0
+                && (player == null || !player.capabilities.isCreativeMode)) {
+            for (ItemStack drop : drops) {
+                dropBlockAsItem(world, x, y, z, drop);
+            }
+        }
+        return hasBeenBroken;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int meta, int side) {
-		return Blocks.yellow_flower.getIcon(0, 0);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int meta, int side) {
+        return Blocks.yellow_flower.getIcon(0, 0);
+    }
 }

src/main/java/binnie/botany/flower/ItemBotany.java

@@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 import forestry.core.config.Config;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -30,260 +31,295 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import java.util.List;
-
 public abstract class ItemBotany extends Item {
-	public ItemBotany(String name) {
-		setCreativeTab(CreativeTabBotany.instance);
-		setUnlocalizedName(name);
-		hasSubtypes = true;
-	}
+    public ItemBotany(String name) {
+        setCreativeTab(CreativeTabBotany.instance);
+        setUnlocalizedName(name);
+        hasSubtypes = true;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getSpriteNumber() {
-		return 0;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getSpriteNumber() {
+        return 0;
+    }
 
-	@Override
-	public boolean isDamageable() {
-		return false;
-	}
+    @Override
+    public boolean isDamageable() {
+        return false;
+    }
 
-	@Override
-	public boolean isRepairable() {
-		return false;
-	}
+    @Override
+    public boolean isRepairable() {
+        return false;
+    }
 
-	@Override
-	public boolean getShareTag() {
-		return true;
-	}
+    @Override
+    public boolean getShareTag() {
+        return true;
+    }
 
-	@Override
-	public boolean hasEffect(ItemStack stack, int pass) {
-		if (!stack.hasTagCompound()) {
-			return false;
-		}
+    @Override
+    public boolean hasEffect(ItemStack stack, int pass) {
+        if (!stack.hasTagCompound()) {
+            return false;
+        }
 
-		IIndividual individual = getIndividual(stack);
-		return individual != null
-			&& individual.getGenome() != null
-			&& individual.hasEffect();
-	}
+        IIndividual individual = getIndividual(stack);
+        return individual != null && individual.getGenome() != null && individual.hasEffect();
+    }
 
-	@Override
-	public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) {
-		if (!itemstack.hasTagCompound()) {
-			return;
-		}
-		IFlower individual = (IFlower) getIndividual(itemstack);
-		if (individual == null) {
-			tooltip.add(I18N.localise("botany.item.tooltip.bugged"));
-			return;
-		}
+    @Override
+    public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) {
+        if (!itemstack.hasTagCompound()) {
+            return;
+        }
+        IFlower individual = (IFlower) getIndividual(itemstack);
+        if (individual == null) {
+            tooltip.add(I18N.localise("botany.item.tooltip.bugged"));
+            return;
+        }
 
-		IFlowerGenome genome = individual.getGenome();
-		IFlowerColor primaryColor = genome.getPrimaryColor();
-		IFlowerColor secondColor = genome.getSecondaryColor();
-		IFlowerColor stemColor = genome.getStemColor();
+        IFlowerGenome genome = individual.getGenome();
+        IFlowerColor primaryColor = genome.getPrimaryColor();
+        IFlowerColor secondColor = genome.getSecondaryColor();
+        IFlowerColor stemColor = genome.getStemColor();
 
-		if (primaryColor == secondColor) {
-			tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
-		} else {
-			tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), stemColor.getName()));
-		}
+        if (primaryColor == secondColor) {
+            tooltip.add(EnumChatFormatting.YELLOW
+                    + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
+        } else {
+            tooltip.add(EnumChatFormatting.YELLOW
+                    + I18N.localise(
+                            "botany.item.tooltip.flowerColor2",
+                            primaryColor.getName(),
+                            secondColor.getName(),
+                            stemColor.getName()));
+        }
 
-		if (individual.isAnalyzed()) {
-			if (BinnieCore.proxy.isShiftDown()) {
-				individual.addTooltip(tooltip);
-			} else {
-				tooltip.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.holdMore"));
-			}
-		} else {
-			tooltip.add(I18N.localise("botany.item.tooltip.unknownGenome"));
-		}
-	}
+        if (individual.isAnalyzed()) {
+            if (BinnieCore.proxy.isShiftDown()) {
+                individual.addTooltip(tooltip);
+            } else {
+                tooltip.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.holdMore"));
+            }
+        } else {
+            tooltip.add(I18N.localise("botany.item.tooltip.unknownGenome"));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister par1IconRegister) {}
 
-	protected IIndividual getIndividual(ItemStack itemstack) {
-		return new Flower(itemstack.getTagCompound());
-	}
+    protected IIndividual getIndividual(ItemStack itemstack) {
+        return new Flower(itemstack.getTagCompound());
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack itemstack) {
-		if (!itemstack.hasTagCompound()) {
-			return I18N.localise("botany.item.tooltip.unknown");
-		}
+    @Override
+    public String getItemStackDisplayName(ItemStack itemstack) {
+        if (!itemstack.hasTagCompound()) {
+            return I18N.localise("botany.item.tooltip.unknown");
+        }
 
-		IIndividual individual = getIndividual(itemstack);
-		if (individual != null && individual.getGenome() != null) {
-			String tag = getTag();
-			if (tag == null || tag.isEmpty()) {
-				return individual.getDisplayName();
-			}
-			return I18N.localise("botany.item.botany.name", individual.getDisplayName(), tag);
-		}
-		return I18N.localise("botany.item.flowerCorrupted.name");
-	}
+        IIndividual individual = getIndividual(itemstack);
+        if (individual != null && individual.getGenome() != null) {
+            String tag = getTag();
+            if (tag == null || tag.isEmpty()) {
+                return individual.getDisplayName();
+            }
+            return I18N.localise("botany.item.botany.name", individual.getDisplayName(), tag);
+        }
+        return I18N.localise("botany.item.flowerCorrupted.name");
+    }
 
-	@Override
-	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
-		addCreativeItems(itemList, true);
-	}
+    @Override
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+        addCreativeItems(itemList, true);
+    }
 
-	public void addCreativeItems(List itemList, boolean hideSecrets) {
-		for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
-			if (hideSecrets && individual.isSecret() && !Config.isDebug) {
-				continue;
-			}
-			itemList.add(BotanyCore.speciesRoot.getMemberStack(individual.copy(), getStage().ordinal()));
-		}
-	}
+    public void addCreativeItems(List itemList, boolean hideSecrets) {
+        for (IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
+            if (hideSecrets && individual.isSecret() && !Config.isDebug) {
+                continue;
+            }
+            itemList.add(BotanyCore.speciesRoot.getMemberStack(
+                    individual.copy(), getStage().ordinal()));
+        }
+    }
 
-	@Override
-	public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
-		IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-		if (flower == null || flower.getGenome() == null) {
-			return 0xffffff;
-		}
+    @Override
+    public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
+        IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+        if (flower == null || flower.getGenome() == null) {
+            return 0xffffff;
+        }
 
-		if (renderPass == 0) {
-			return flower.getGenome().getStemColor().getColor(flower.isWilted());
-		}
-		return (renderPass == 1) ?
-			flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) :
-			flower.getGenome().getSecondaryColor().getColor(flower.isWilted());
-	}
+        if (renderPass == 0) {
+            return flower.getGenome().getStemColor().getColor(flower.isWilted());
+        }
+        return (renderPass == 1)
+                ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted())
+                : flower.getGenome().getSecondaryColor().getColor(flower.isWilted());
+    }
 
-	@Override
-	public boolean requiresMultipleRenderPasses() {
-		return true;
-	}
+    @Override
+    public boolean requiresMultipleRenderPasses() {
+        return true;
+    }
 
-	@Override
-	public int getRenderPasses(int metadata) {
-		return 3;
-	}
+    @Override
+    public int getRenderPasses(int metadata) {
+        return 3;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(ItemStack itemstack, int renderPass) {
-		IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
-		if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
-			return EnumFlowerType.ALLIUM.getBlank();
-		}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(ItemStack itemstack, int renderPass) {
+        IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+        if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
+            return EnumFlowerType.ALLIUM.getBlank();
+        }
 
-		IFlowerType type = flower.getGenome().getPrimary().getType();
-		if (renderPass == 0) {
-			return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
-		}
-		if (renderPass == 1) {
-			return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
-		}
-		return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
-	}
+        IFlowerType type = flower.getGenome().getPrimary().getType();
+        if (renderPass == 0) {
+            return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
+        }
+        if (renderPass == 1) {
+            return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
+        }
+        return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
+    }
 
-	@Override
-	public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float px, float py, float pz) {
-		if (getStage() == EnumFlowerStage.POLLEN) {
-			IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack);
-			TileEntity target = world.getTileEntity(x, y, z);
-			if (!(target instanceof IPollinatable)) {
-				return false;
-			}
-			IPollinatable pollinatable = (IPollinatable) target;
-			if (!pollinatable.canMateWith(flower)) {
-				return false;
-			}
-			pollinatable.mateWith(flower);
-			if (!player.capabilities.isCreativeMode) {
-				itemstack.stackSize--;
-			}
-			return true;
-		}
+    @Override
+    public boolean onItemUse(
+            ItemStack itemstack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float px,
+            float py,
+            float pz) {
+        if (getStage() == EnumFlowerStage.POLLEN) {
+            IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack);
+            TileEntity target = world.getTileEntity(x, y, z);
+            if (!(target instanceof IPollinatable)) {
+                return false;
+            }
+            IPollinatable pollinatable = (IPollinatable) target;
+            if (!pollinatable.canMateWith(flower)) {
+                return false;
+            }
+            pollinatable.mateWith(flower);
+            if (!player.capabilities.isCreativeMode) {
+                itemstack.stackSize--;
+            }
+            return true;
+        }
 
-		Block blockFlower = Botany.flower;
-		Block blockAlreadyThere = world.getBlock(x, y, z);
-		if (blockAlreadyThere == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 0x7) < 1) {
-			side = 1;
-		} else if (blockAlreadyThere != Blocks.vine && blockAlreadyThere != Blocks.tallgrass && blockAlreadyThere != Blocks.deadbush && !blockAlreadyThere.isReplaceable(world, x, y, z)) {
-			if (side == 0) {
-				y--;
-			} else if (side == 1) {
-				y++;
-			} else if (side == 2) {
-				z--;
-			} else if (side == 3) {
-				z++;
-			} else if (side == 4) {
-				x--;
-			} else if (side == 5) {
-				x++;
-			}
-		}
+        Block blockFlower = Botany.flower;
+        Block blockAlreadyThere = world.getBlock(x, y, z);
+        if (blockAlreadyThere == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 0x7) < 1) {
+            side = 1;
+        } else if (blockAlreadyThere != Blocks.vine
+                && blockAlreadyThere != Blocks.tallgrass
+                && blockAlreadyThere != Blocks.deadbush
+                && !blockAlreadyThere.isReplaceable(world, x, y, z)) {
+            if (side == 0) {
+                y--;
+            } else if (side == 1) {
+                y++;
+            } else if (side == 2) {
+                z--;
+            } else if (side == 3) {
+                z++;
+            } else if (side == 4) {
+                x--;
+            } else if (side == 5) {
+                x++;
+            }
+        }
 
-		if (itemstack.stackSize == 0 || !player.canPlayerEdit(x, y, z, side, itemstack)) {
-			return false;
-		}
-		if (y == 255 && blockFlower.getMaterial().isSolid()) {
-			return false;
-		}
+        if (itemstack.stackSize == 0 || !player.canPlayerEdit(x, y, z, side, itemstack)) {
+            return false;
+        }
+        if (y == 255 && blockFlower.getMaterial().isSolid()) {
+            return false;
+        }
 
-		if (world.canPlaceEntityOnSide(blockFlower, x, y, z, false, side, player, itemstack)) {
-			int i1 = getMetadata(itemstack.getItemDamage());
-			int j1 = blockFlower.onBlockPlaced(world, x, y, z, side, px, py, pz, i1);
-			if (placeBlockAt(itemstack, player, world, x, y, z, side, px, py, pz, j1)) {
-				world.playSoundEffect(x + 0.5f, y + 0.5f, z + 0.5f, blockFlower.stepSound.func_150496_b(), (blockFlower.stepSound.getVolume() + 1.0f) / 2.0f, blockFlower.stepSound.getPitch() * 0.8f);
-				itemstack.stackSize--;
-			}
-			return true;
-		}
-		return false;
-	}
+        if (world.canPlaceEntityOnSide(blockFlower, x, y, z, false, side, player, itemstack)) {
+            int i1 = getMetadata(itemstack.getItemDamage());
+            int j1 = blockFlower.onBlockPlaced(world, x, y, z, side, px, py, pz, i1);
+            if (placeBlockAt(itemstack, player, world, x, y, z, side, px, py, pz, j1)) {
+                world.playSoundEffect(
+                        x + 0.5f,
+                        y + 0.5f,
+                        z + 0.5f,
+                        blockFlower.stepSound.func_150496_b(),
+                        (blockFlower.stepSound.getVolume() + 1.0f) / 2.0f,
+                        blockFlower.stepSound.getPitch() * 0.8f);
+                itemstack.stackSize--;
+            }
+            return true;
+        }
+        return false;
+    }
 
-	@SideOnly(Side.CLIENT)
-	public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack stack) {
-		Block field_150939_a = Botany.flower;
-		Block block = world.getBlock(x, y, z);
-		if (block == Blocks.snow_layer) {
-			side = 1;
-		} else if (block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) {
-			if (side == 0) {
-				y--;
-			} else if (side == 1) {
-				y++;
-			} else if (side == 2) {
-				z--;
-			} else if (side == 3) {
-				z++;
-			} else if (side == 4) {
-				x--;
-			} else if (side == 5) {
-				x++;
-			}
-		}
-		return world.canPlaceEntityOnSide(field_150939_a, x, y, z, false, side, null, stack);
-	}
+    @SideOnly(Side.CLIENT)
+    public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack stack) {
+        Block field_150939_a = Botany.flower;
+        Block block = world.getBlock(x, y, z);
+        if (block == Blocks.snow_layer) {
+            side = 1;
+        } else if (block != Blocks.vine
+                && block != Blocks.tallgrass
+                && block != Blocks.deadbush
+                && !block.isReplaceable(world, x, y, z)) {
+            if (side == 0) {
+                y--;
+            } else if (side == 1) {
+                y++;
+            } else if (side == 2) {
+                z--;
+            } else if (side == 3) {
+                z++;
+            } else if (side == 4) {
+                x--;
+            } else if (side == 5) {
+                x++;
+            }
+        }
+        return world.canPlaceEntityOnSide(field_150939_a, x, y, z, false, side, null, stack);
+    }
 
-	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
-		Block block = Botany.flower;
-		if (!world.setBlock(x, y, z, block, metadata, 3)) {
-			return false;
-		}
+    public boolean placeBlockAt(
+            ItemStack stack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float hitX,
+            float hitY,
+            float hitZ,
+            int metadata) {
+        Block block = Botany.flower;
+        if (!world.setBlock(x, y, z, block, metadata, 3)) {
+            return false;
+        }
 
-		if (world.getBlock(x, y, z) == block) {
-			block.onBlockPlacedBy(world, x, y, z, player, stack);
-			block.onPostBlockPlaced(world, x, y, z, metadata);
-		}
-		return true;
-	}
+        if (world.getBlock(x, y, z) == block) {
+            block.onBlockPlacedBy(world, x, y, z, player, stack);
+            block.onPostBlockPlaced(world, x, y, z, metadata);
+        }
+        return true;
+    }
 
-	public abstract EnumFlowerStage getStage();
+    public abstract EnumFlowerStage getStage();
 
-	public abstract String getTag();
+    public abstract String getTag();
 }

src/main/java/binnie/botany/flower/ItemFlower.java

@@ -3,17 +3,17 @@ package binnie.botany.flower;
 import binnie.botany.api.EnumFlowerStage;
 
 public class ItemFlower extends ItemBotany {
-	public ItemFlower() {
-		super("itemFlower");
-	}
+    public ItemFlower() {
+        super("itemFlower");
+    }
 
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.FLOWER;
-	}
+    @Override
+    public EnumFlowerStage getStage() {
+        return EnumFlowerStage.FLOWER;
+    }
 
-	@Override
-	public String getTag() {
-		return "";
-	}
+    @Override
+    public String getTag() {
+        return "";
+    }
 }

src/main/java/binnie/botany/flower/ItemInsulatedTube.java

@@ -5,6 +5,7 @@ import binnie.botany.CreativeTabBotany;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,155 +14,152 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import java.util.List;
-
 public class ItemInsulatedTube extends Item {
-	IIcon[] icons;
+    IIcon[] icons;
 
-	public ItemInsulatedTube() {
-		icons = new IIcon[3];
-		setUnlocalizedName("insulatedTube");
-		setCreativeTab(CreativeTabBotany.instance);
-		setHasSubtypes(true);
-	}
+    public ItemInsulatedTube() {
+        icons = new IIcon[3];
+        setUnlocalizedName("insulatedTube");
+        setCreativeTab(CreativeTabBotany.instance);
+        setHasSubtypes(true);
+    }
 
-	public static ItemStack getInsulateStack(ItemStack stack) {
-		return Insulate.get(stack.getItemDamage()).getStack();
-	}
+    public static ItemStack getInsulateStack(ItemStack stack) {
+        return Insulate.get(stack.getItemDamage()).getStack();
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (Material mat : Material.values()) {
-			for (Insulate ins : Insulate.values()) {
-				list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
-			}
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
+        for (Material mat : Material.values()) {
+            for (Insulate ins : Insulate.values()) {
+                list.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
+            }
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		for (int i = 0; i < 3; ++i) {
-			icons[i] = Botany.proxy.getIcon(register, "insulatedTube." + i);
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        for (int i = 0; i < 3; ++i) {
+            icons[i] = Botany.proxy.getIcon(register, "insulatedTube." + i);
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack stack, int pass) {
-		if (pass == 0) {
-			return 0xffffff;
-		}
-		return (pass == 1)
-			? Material.get(stack.getItemDamage()).getColor()
-			: Insulate.get(stack.getItemDamage()).getColor();
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack stack, int pass) {
+        if (pass == 0) {
+            return 0xffffff;
+        }
+        return (pass == 1)
+                ? Material.get(stack.getItemDamage()).getColor()
+                : Insulate.get(stack.getItemDamage()).getColor();
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-		tooltip.add(Insulate.get(stack.getItemDamage()).getName());
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+        super.addInformation(stack, player, tooltip, advanced);
+        tooltip.add(Insulate.get(stack.getItemDamage()).getName());
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return Material.get(stack.getItemDamage()).getName() + " "
-			+ I18N.localise("botany.tube.name");
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return Material.get(stack.getItemDamage()).getName() + " " + I18N.localise("botany.tube.name");
+    }
 
-	@Override
-	public int getRenderPasses(int metadata) {
-		return 3;
-	}
+    @Override
+    public int getRenderPasses(int metadata) {
+        return 3;
+    }
 
-	@Override
-	public IIcon getIcon(ItemStack stack, int pass) {
-		return icons[pass % 3];
-	}
+    @Override
+    public IIcon getIcon(ItemStack stack, int pass) {
+        return icons[pass % 3];
+    }
 
-	@Override
-	public boolean requiresMultipleRenderPasses() {
-		return true;
-	}
+    @Override
+    public boolean requiresMultipleRenderPasses() {
+        return true;
+    }
 
-	enum Material {
-		Copper(0xe3b78e, "cooper"),
-		Tin(0xe1eef4, "tin"),
-		Bronze(0xddc276, "bronze"),
-		Iron(0xd8d8d8, "iron");
+    enum Material {
+        Copper(0xe3b78e, "cooper"),
+        Tin(0xe1eef4, "tin"),
+        Bronze(0xddc276, "bronze"),
+        Iron(0xd8d8d8, "iron");
 
-		protected int color;
-		protected String name;
+        protected int color;
+        protected String name;
 
-		Material(int color, String name) {
-			this.color = color;
-			this.name = name;
-		}
+        Material(int color, String name) {
+            this.color = color;
+            this.name = name;
+        }
 
-		public static Material get(int i) {
-			return values()[i % values().length];
-		}
+        public static Material get(int i) {
+            return values()[i % values().length];
+        }
 
-		public int getColor() {
-			return color;
-		}
+        public int getColor() {
+            return color;
+        }
 
-		public String getName() {
-			return I18N.localise("botany.tube." + name);
-		}
-	}
+        public String getName() {
+            return I18N.localise("botany.tube." + name);
+        }
+    }
 
-	enum Insulate {
-		Clay(0xa1aacc, "clay"),
-		Cobble(0x7b7b7b, "cobblestone"),
-		Sand(0xefeab5, "sand"),
-		HardenedClay(0x935c43, "hardenedClay"),
-		Stone(0x6d6d6d, "smoothStone"),
-		Sandstone(0xc1b989, "sandstone");
+    enum Insulate {
+        Clay(0xa1aacc, "clay"),
+        Cobble(0x7b7b7b, "cobblestone"),
+        Sand(0xefeab5, "sand"),
+        HardenedClay(0x935c43, "hardenedClay"),
+        Stone(0x6d6d6d, "smoothStone"),
+        Sandstone(0xc1b989, "sandstone");
 
-		protected int color;
-		protected String name;
+        protected int color;
+        protected String name;
 
-		Insulate(int color, String name) {
-			this.color = color;
-			this.name = name;
-		}
+        Insulate(int color, String name) {
+            this.color = color;
+            this.name = name;
+        }
 
-		public static Insulate get(int i) {
-			return values()[i / 128 % values().length];
-		}
+        public static Insulate get(int i) {
+            return values()[i / 128 % values().length];
+        }
 
-		public int getColor() {
-			return color;
-		}
+        public int getColor() {
+            return color;
+        }
 
-		public String getName() {
-			return I18N.localise("botany.tube.insulate." + name);
-		}
+        public String getName() {
+            return I18N.localise("botany.tube.insulate." + name);
+        }
 
-		public ItemStack getStack() {
-			switch (this) {
-				case Clay:
-					return new ItemStack(Blocks.clay);
+        public ItemStack getStack() {
+            switch (this) {
+                case Clay:
+                    return new ItemStack(Blocks.clay);
 
-				case Cobble:
-					return new ItemStack(Blocks.cobblestone);
+                case Cobble:
+                    return new ItemStack(Blocks.cobblestone);
 
-				case HardenedClay:
-					return new ItemStack(Blocks.hardened_clay);
+                case HardenedClay:
+                    return new ItemStack(Blocks.hardened_clay);
 
-				case Sand:
-					return new ItemStack(Blocks.sand);
+                case Sand:
+                    return new ItemStack(Blocks.sand);
 
-				case Sandstone:
-					return new ItemStack(Blocks.sandstone);
+                case Sandstone:
+                    return new ItemStack(Blocks.sandstone);
 
-				case Stone:
-					return new ItemStack(Blocks.stone);
-			}
-			return null;
-		}
-	}
+                case Stone:
+                    return new ItemStack(Blocks.stone);
+            }
+            return null;
+        }
+    }
 }

src/main/java/binnie/botany/flower/ItemPollen.java

@@ -4,17 +4,17 @@ import binnie.botany.api.EnumFlowerStage;
 import binnie.core.util.I18N;
 
 public class ItemPollen extends ItemBotany {
-	public ItemPollen() {
-		super("pollen");
-	}
+    public ItemPollen() {
+        super("pollen");
+    }
 
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.POLLEN;
-	}
+    @Override
+    public EnumFlowerStage getStage() {
+        return EnumFlowerStage.POLLEN;
+    }
 
-	@Override
-	public String getTag() {
-		return I18N.localise("botany.item.pollen.tag.name");
-	}
+    @Override
+    public String getTag() {
+        return I18N.localise("botany.item.pollen.tag.name");
+    }
 }

src/main/java/binnie/botany/flower/ItemSeed.java

@@ -4,17 +4,17 @@ import binnie.botany.api.EnumFlowerStage;
 import binnie.core.util.I18N;
 
 public class ItemSeed extends ItemBotany {
-	public ItemSeed() {
-		super("seed");
-	}
+    public ItemSeed() {
+        super("seed");
+    }
 
-	@Override
-	public EnumFlowerStage getStage() {
-		return EnumFlowerStage.SEED;
-	}
+    @Override
+    public EnumFlowerStage getStage() {
+        return EnumFlowerStage.SEED;
+    }
 
-	@Override
-	public String getTag() {
-		return I18N.localise("botany.item.germling.tag.name");
-	}
+    @Override
+    public String getTag() {
+        return I18N.localise("botany.item.germling.tag.name");
+    }
 }

src/main/java/binnie/botany/flower/RendererBotany.java

@@ -9,52 +9,53 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
 public class RendererBotany implements ISimpleBlockRenderingHandler {
-	public static int renderID;
-	public static int pass;
+    public static int renderID;
+    public static int pass;
 
-	@Override
-	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
-		// ignored
-	}
+    @Override
+    public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
+        // ignored
+    }
 
-	@Override
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		Tessellator tessellator = Tessellator.instance;
-		tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z));
-		double d1 = x;
-		double d2 = y;
-		double d3 = z;
-		long i1 = x * 3129871 ^ z * 116129781L;
-		i1 = i1 * i1 * 42317861L + i1 * 11L;
-		d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3;
-		d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3;
+    @Override
+    public boolean renderWorldBlock(
+            IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z));
+        double d1 = x;
+        double d2 = y;
+        double d3 = z;
+        long i1 = x * 3129871 ^ z * 116129781L;
+        i1 = i1 * i1 * 42317861L + i1 * 11L;
+        d1 += ((i1 >> 16 & 0xFL) / 15.0f - 0.5) * 0.3;
+        d3 += ((i1 >> 24 & 0xFL) / 15.0f - 0.5) * 0.3;
 
-		for (int j = 0; j < 3; ++j) {
-			RendererBotany.pass = j;
-			int l = block.colorMultiplier(renderer.blockAccess, x, y, z);
-			float f = (l >> 16 & 0xFF) / 255.0f;
-			float f2 = (l >> 8 & 0xFF) / 255.0f;
-			float f3 = (l & 0xFF) / 255.0f;
+        for (int j = 0; j < 3; ++j) {
+            RendererBotany.pass = j;
+            int l = block.colorMultiplier(renderer.blockAccess, x, y, z);
+            float f = (l >> 16 & 0xFF) / 255.0f;
+            float f2 = (l >> 8 & 0xFF) / 255.0f;
+            float f3 = (l & 0xFF) / 255.0f;
 
-			if (EntityRenderer.anaglyphEnable) {
-				f = (f * 30.0f + f2 * 59.0f + f3 * 11.0f) / 100.0f;
-				f2 = (f * 30.0f + f2 * 70.0f) / 100.0f;
-				f3 = (f * 30.0f + f3 * 70.0f) / 100.0f;
-			}
-			tessellator.setColorOpaque_F(f, f2, f3);
-			IIcon iicon = block.getIcon(world, x, y, z, 0);
-			renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f);
-		}
-		return false;
-	}
+            if (EntityRenderer.anaglyphEnable) {
+                f = (f * 30.0f + f2 * 59.0f + f3 * 11.0f) / 100.0f;
+                f2 = (f * 30.0f + f2 * 70.0f) / 100.0f;
+                f3 = (f * 30.0f + f3 * 70.0f) / 100.0f;
+            }
+            tessellator.setColorOpaque_F(f, f2, f3);
+            IIcon iicon = block.getIcon(world, x, y, z, 0);
+            renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f);
+        }
+        return false;
+    }
 
-	@Override
-	public boolean shouldRender3DInInventory(int i) {
-		return false;
-	}
+    @Override
+    public boolean shouldRender3DInInventory(int i) {
+        return false;
+    }
 
-	@Override
-	public int getRenderId() {
-		return RendererBotany.renderID;
-	}
+    @Override
+    public int getRenderId() {
+        return RendererBotany.renderID;
+    }
 }

src/main/java/binnie/botany/gardening/BlockPlant.java

@@ -7,6 +7,9 @@ import binnie.botany.api.gardening.IBlockSoil;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -17,141 +20,135 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 public class BlockPlant extends BlockBush {
-	public BlockPlant() {
-		setBlockName("plant");
-		setCreativeTab(CreativeTabBotany.instance);
-		setTickRandomly(true);
-		setStepSound(Block.soundTypeGrass);
-	}
+    public BlockPlant() {
+        setBlockName("plant");
+        setCreativeTab(CreativeTabBotany.instance);
+        setTickRandomly(true);
+        setStepSound(Block.soundTypeGrass);
+    }
 
-	public static boolean isWeed(IBlockAccess world, int x, int y, int z) {
-		if (!(world.getBlock(x, y, z) instanceof BlockPlant)) {
-			return false;
-		}
+    public static boolean isWeed(IBlockAccess world, int x, int y, int z) {
+        if (!(world.getBlock(x, y, z) instanceof BlockPlant)) {
+            return false;
+        }
 
-		Type type = Type.get(world.getBlockMetadata(x, y, z));
-		return type == Type.Weeds
-			|| type == Type.WeedsLong
-			|| type == Type.WeedsVeryLong;
-	}
+        Type type = Type.get(world.getBlockMetadata(x, y, z));
+        return type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong;
+    }
 
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
-		return new ArrayList<>();
-	}
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
+        return new ArrayList<>();
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		for (Type t : Type.values()) {
-			t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister register) {
+        for (Type t : Type.values()) {
+            t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
+        }
+    }
 
-	@Override
-	protected boolean canPlaceBlockOn(Block block) {
-		return super.canPlaceBlockOn(block) || Gardening.isSoil(block);
-	}
+    @Override
+    protected boolean canPlaceBlockOn(Block block) {
+        return super.canPlaceBlockOn(block) || Gardening.isSoil(block);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int meta) {
-		return Type.values()[meta % Type.values().length].icon;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta) {
+        return Type.values()[meta % Type.values().length].icon;
+    }
 
-	@Override
-	public int damageDropped(int damage) {
-		return damage;
-	}
+    @Override
+    public int damageDropped(int damage) {
+        return damage;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
-		for (Type type : Type.values()) {
-			list.add(type.get());
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+        for (Type type : Type.values()) {
+            list.add(type.get());
+        }
+    }
 
-	@Override
-	public void updateTick(World world, int x, int y, int z, Random random) {
-		Type type = Type.get(world.getBlockMetadata(x, y, z));
-		if (random.nextInt(4) == 0) {
-			if (type == Type.Weeds) {
-				world.setBlockMetadataWithNotify(x, y, z, Type.WeedsLong.ordinal(), 2);
-			} else if (type == Type.WeedsLong) {
-				world.setBlockMetadataWithNotify(x, y, z, Type.WeedsVeryLong.ordinal(), 2);
-			} else if (type == Type.DeadFlower) {
-				world.setBlockMetadataWithNotify(x, y, z, Type.DecayingFlower.ordinal(), 2);
-			} else if (type == Type.DecayingFlower) {
-				world.setBlockToAir(x, y, z);
-				return;
-			}
-		}
+    @Override
+    public void updateTick(World world, int x, int y, int z, Random random) {
+        Type type = Type.get(world.getBlockMetadata(x, y, z));
+        if (random.nextInt(4) == 0) {
+            if (type == Type.Weeds) {
+                world.setBlockMetadataWithNotify(x, y, z, Type.WeedsLong.ordinal(), 2);
+            } else if (type == Type.WeedsLong) {
+                world.setBlockMetadataWithNotify(x, y, z, Type.WeedsVeryLong.ordinal(), 2);
+            } else if (type == Type.DeadFlower) {
+                world.setBlockMetadataWithNotify(x, y, z, Type.DecayingFlower.ordinal(), 2);
+            } else if (type == Type.DecayingFlower) {
+                world.setBlockToAir(x, y, z);
+                return;
+            }
+        }
 
-		if (random.nextInt(6) == 0) {
-			if (type == Type.Weeds) {
-				world.setBlockToAir(x, y, z);
-			} else if (type == Type.WeedsLong) {
-				world.setBlockMetadataWithNotify(x, y, z, Type.Weeds.ordinal(), 2);
-			} else if (type == Type.WeedsVeryLong) {
-				world.setBlockMetadataWithNotify(x, y, z, Type.WeedsLong.ordinal(), 2);
-			}
-		}
+        if (random.nextInt(6) == 0) {
+            if (type == Type.Weeds) {
+                world.setBlockToAir(x, y, z);
+            } else if (type == Type.WeedsLong) {
+                world.setBlockMetadataWithNotify(x, y, z, Type.Weeds.ordinal(), 2);
+            } else if (type == Type.WeedsVeryLong) {
+                world.setBlockMetadataWithNotify(x, y, z, Type.WeedsLong.ordinal(), 2);
+            }
+        }
 
-		Block below = world.getBlock(x, y - 1, z);
-		if (!Gardening.isSoil(below)) {
-			return;
-		}
+        Block below = world.getBlock(x, y - 1, z);
+        if (!Gardening.isSoil(below)) {
+            return;
+        }
 
-		IBlockSoil soil = (IBlockSoil) below;
-		if (random.nextInt(3) != 0) {
-			return;
-		}
+        IBlockSoil soil = (IBlockSoil) below;
+        if (random.nextInt(3) != 0) {
+            return;
+        }
 
-		if (type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong) {
-			if (!soil.degrade(world, x, y - 1, z, EnumSoilType.LOAM)) {
-				soil.degrade(world, x, y - 1, z, EnumSoilType.SOIL);
-			}
-		} else if (type == Type.DecayingFlower && !soil.fertilise(world, x, y - 1, z, EnumSoilType.LOAM)) {
-			soil.fertilise(world, x, y - 1, z, EnumSoilType.FLOWERBED);
-		}
-	}
+        if (type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong) {
+            if (!soil.degrade(world, x, y - 1, z, EnumSoilType.LOAM)) {
+                soil.degrade(world, x, y - 1, z, EnumSoilType.SOIL);
+            }
+        } else if (type == Type.DecayingFlower && !soil.fertilise(world, x, y - 1, z, EnumSoilType.LOAM)) {
+            soil.fertilise(world, x, y - 1, z, EnumSoilType.FLOWERBED);
+        }
+    }
 
-	@Override
-	public boolean isReplaceable(IBlockAccess world, int x, int y, int z) {
-		return true;
-	}
+    @Override
+    public boolean isReplaceable(IBlockAccess world, int x, int y, int z) {
+        return true;
+    }
 
-	public enum Type {
-		Weeds("weeds"),
-		WeedsLong("longWeeds"),
-		WeedsVeryLong("veryLongWeeds"),
-		DeadFlower("deadFlower"),
-		DecayingFlower("decayingFlower");
+    public enum Type {
+        Weeds("weeds"),
+        WeedsLong("longWeeds"),
+        WeedsVeryLong("veryLongWeeds"),
+        DeadFlower("deadFlower"),
+        DecayingFlower("decayingFlower");
 
-		public IIcon icon;
+        public IIcon icon;
 
-		protected String name;
+        protected String name;
 
-		Type(String name) {
-			this.name = name;
-		}
+        Type(String name) {
+            this.name = name;
+        }
 
-		public static Type get(int id) {
-			return values()[id % values().length];
-		}
+        public static Type get(int id) {
+            return values()[id % values().length];
+        }
 
-		public ItemStack get() {
-			return new ItemStack(Botany.plant, 1, ordinal());
-		}
+        public ItemStack get() {
+            return new ItemStack(Botany.plant, 1, ordinal());
+        }
 
-		public String getName() {
-			return I18N.localise("botany.plant." + name);
-		}
-	}
+        public String getName() {
+            return I18N.localise("botany.plant." + name);
+        }
+    }
 }

src/main/java/binnie/botany/gardening/BlockSoil.java

@@ -8,6 +8,8 @@ import binnie.botany.api.EnumSoilType;
 import binnie.botany.api.gardening.IBlockSoil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
+import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,193 +24,192 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.List;
-import java.util.Random;
-
 public class BlockSoil extends Block implements IBlockSoil {
-	protected boolean weedKilled;
-	protected IIcon[] iconsTop;
-	protected IIcon[] iconsSide;
-	protected IIcon[] iconsNoWeed;
-	protected EnumSoilType type;
+    protected boolean weedKilled;
+    protected IIcon[] iconsTop;
+    protected IIcon[] iconsSide;
+    protected IIcon[] iconsNoWeed;
+    protected EnumSoilType type;
 
-	public BlockSoil(EnumSoilType type, String blockName, boolean weedKilled) {
-		super(Material.ground);
-		this.type = type;
-		this.weedKilled = weedKilled;
-		iconsTop = new IIcon[9];
-		iconsSide = new IIcon[9];
-		iconsNoWeed = new IIcon[9];
-		setCreativeTab(CreativeTabBotany.instance);
-		setBlockName(blockName);
-		setTickRandomly(true);
-		setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.9375f, 1.0f);
-		setLightOpacity(255);
-		setHardness(0.5f);
-		setStepSound(Block.soundTypeGravel);
-	}
+    public BlockSoil(EnumSoilType type, String blockName, boolean weedKilled) {
+        super(Material.ground);
+        this.type = type;
+        this.weedKilled = weedKilled;
+        iconsTop = new IIcon[9];
+        iconsSide = new IIcon[9];
+        iconsNoWeed = new IIcon[9];
+        setCreativeTab(CreativeTabBotany.instance);
+        setBlockName(blockName);
+        setTickRandomly(true);
+        setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.9375f, 1.0f);
+        setLightOpacity(255);
+        setHardness(0.5f);
+        setStepSound(Block.soundTypeGravel);
+    }
 
-	public static int getMeta(EnumAcidity acid, EnumMoisture moisture) {
-		return acid.ordinal() * 3 + moisture.ordinal();
-	}
+    public static int getMeta(EnumAcidity acid, EnumMoisture moisture) {
+        return acid.ordinal() * 3 + moisture.ordinal();
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
-		for (int i = 0; i < 9; ++i) {
-			list.add(new ItemStack(this, 1, i));
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+        for (int i = 0; i < 9; ++i) {
+            list.add(new ItemStack(this, 1, i));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
-		return getIcon(side, world.getBlockMetadata(x, y, z));
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+        return getIcon(side, world.getBlockMetadata(x, y, z));
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int meta) {
-		meta = ((meta >= 9) ? 8 : meta);
-		if (side == 1) {
-			return weedKilled ? iconsNoWeed[meta] : iconsTop[meta];
-		}
-		return (side == 0) ? Blocks.dirt.getIcon(side, 0) : iconsSide[meta];
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta) {
+        meta = ((meta >= 9) ? 8 : meta);
+        if (side == 1) {
+            return weedKilled ? iconsNoWeed[meta] : iconsTop[meta];
+        }
+        return (side == 0) ? Blocks.dirt.getIcon(side, 0) : iconsSide[meta];
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister register) {
-		for (EnumMoisture moisture : EnumMoisture.values()) {
-			for (EnumAcidity pH : EnumAcidity.values()) {
-				int index = moisture.ordinal() + pH.ordinal() * 3;
-				String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID();
-				iconsTop[index] = Botany.proxy.getIcon(register, id + ".0");
-				iconsSide[index] = Botany.proxy.getIcon(register, id + ".1");
-				iconsNoWeed[index] = Botany.proxy.getIcon(register, id + ".2");
-			}
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister register) {
+        for (EnumMoisture moisture : EnumMoisture.values()) {
+            for (EnumAcidity pH : EnumAcidity.values()) {
+                int index = moisture.ordinal() + pH.ordinal() * 3;
+                String id = "soil/" + getType().getID() + "." + pH.getID() + "." + moisture.getID();
+                iconsTop[index] = Botany.proxy.getIcon(register, id + ".0");
+                iconsSide[index] = Botany.proxy.getIcon(register, id + ".1");
+                iconsNoWeed[index] = Botany.proxy.getIcon(register, id + ".2");
+            }
+        }
+    }
 
-	public EnumSoilType getType() {
-		return type;
-	}
+    public EnumSoilType getType() {
+        return type;
+    }
 
-	@Override
-	public int damageDropped(int damage) {
-		return damage;
-	}
+    @Override
+    public int damageDropped(int damage) {
+        return damage;
+    }
 
-	@Override
-	public void updateTick(World world, int x, int y, int z, Random random) {
-		int meta = world.getBlockMetadata(x, y, z);
-		EnumMoisture moisture = EnumMoisture.values()[meta % 3];
-		EnumAcidity acidity = EnumAcidity.values()[meta / 3];
-		EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
-		if (desiredMoisture.ordinal() > moisture.ordinal()) {
-			moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
-		}
-		if (desiredMoisture.ordinal() < moisture.ordinal()) {
-			moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
-		}
+    @Override
+    public void updateTick(World world, int x, int y, int z, Random random) {
+        int meta = world.getBlockMetadata(x, y, z);
+        EnumMoisture moisture = EnumMoisture.values()[meta % 3];
+        EnumAcidity acidity = EnumAcidity.values()[meta / 3];
+        EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
+        if (desiredMoisture.ordinal() > moisture.ordinal()) {
+            moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
+        }
+        if (desiredMoisture.ordinal() < moisture.ordinal()) {
+            moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
+        }
 
-		int meta2 = getMeta(acidity, moisture);
-		if (meta != meta2) {
-			world.setBlockMetadataWithNotify(x, y, z, meta2, 2);
-		}
-		if (!weedKilled && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0 && world.getBlock(x, y + 1, z) == Blocks.air) {
-			world.setBlock(x, y + 1, z, Botany.plant, BlockPlant.Type.Weeds.ordinal(), 2);
-		}
-	}
+        int meta2 = getMeta(acidity, moisture);
+        if (meta != meta2) {
+            world.setBlockMetadataWithNotify(x, y, z, meta2, 2);
+        }
+        if (!weedKilled
+                && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0
+                && world.getBlock(x, y + 1, z) == Blocks.air) {
+            world.setBlock(x, y + 1, z, Botany.plant, BlockPlant.Type.Weeds.ordinal(), 2);
+        }
+    }
 
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
-	}
+    @Override
+    public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+        return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
+    }
 
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
 
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
 
-	@Override
-	public EnumAcidity getPH(World world, int x, int y, int z) {
-		return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
-	}
+    @Override
+    public EnumAcidity getPH(World world, int x, int y, int z) {
+        return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
+    }
 
-	@Override
-	public EnumMoisture getMoisture(World world, int x, int y, int z) {
-		return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
-	}
+    @Override
+    public EnumMoisture getMoisture(World world, int x, int y, int z) {
+        return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
+    }
 
-	@Override
-	public EnumSoilType getType(World world, int x, int y, int z) {
-		return type;
-	}
+    @Override
+    public EnumSoilType getType(World world, int x, int y, int z) {
+        return type;
+    }
 
-	@Override
-	public boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel) {
-		EnumSoilType type = getType(world, x, y, z);
-		if (type.ordinal() >= maxLevel.ordinal()) {
-			return false;
-		}
+    @Override
+    public boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel) {
+        EnumSoilType type = getType(world, x, y, z);
+        if (type.ordinal() >= maxLevel.ordinal()) {
+            return false;
+        }
 
-		int meta = world.getBlockMetadata(x, y, z);
-		return world.setBlock(x, y, z, Gardening.getSoilBlock(maxLevel, weedKilled), meta, 2);
-	}
+        int meta = world.getBlockMetadata(x, y, z);
+        return world.setBlock(x, y, z, Gardening.getSoilBlock(maxLevel, weedKilled), meta, 2);
+    }
 
-	@Override
-	public boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel) {
-		EnumSoilType type = getType(world, x, y, z);
-		if (type.ordinal() <= minLevel.ordinal()) {
-			return false;
-		}
+    @Override
+    public boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel) {
+        EnumSoilType type = getType(world, x, y, z);
+        if (type.ordinal() <= minLevel.ordinal()) {
+            return false;
+        }
 
-		int meta = world.getBlockMetadata(x, y, z);
-		return world.setBlock(x, y, z, Gardening.getSoilBlock(minLevel, weedKilled), meta, 2);
-	}
+        int meta = world.getBlockMetadata(x, y, z);
+        return world.setBlock(x, y, z, Gardening.getSoilBlock(minLevel, weedKilled), meta, 2);
+    }
 
-	@Override
-	public boolean setPH(World world, int x, int y, int z, EnumAcidity pH) {
-		int meta = getMeta(pH, getMoisture(world, x, y, z));
-		return world.setBlockMetadataWithNotify(x, y, z, meta, 2);
-	}
+    @Override
+    public boolean setPH(World world, int x, int y, int z, EnumAcidity pH) {
+        int meta = getMeta(pH, getMoisture(world, x, y, z));
+        return world.setBlockMetadataWithNotify(x, y, z, meta, 2);
+    }
 
-	@Override
-	public boolean setMoisture(World world, int x, int y, int z, EnumMoisture moisture) {
-		int meta = getMeta(getPH(world, x, y, z), moisture);
-		return world.setBlockMetadataWithNotify(x, y, z, meta, 2);
-	}
+    @Override
+    public boolean setMoisture(World world, int x, int y, int z, EnumMoisture moisture) {
+        int meta = getMeta(getPH(world, x, y, z), moisture);
+        return world.setBlockMetadataWithNotify(x, y, z, meta, 2);
+    }
 
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-		super.onNeighborBlockChange(world, x, y, z, block);
-		if (world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN, false)) {
-			world.setBlock(x, y, z, Blocks.dirt, 0, 2);
-		}
-	}
+    @Override
+    public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
+        super.onNeighborBlockChange(world, x, y, z, block);
+        if (world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN, false)) {
+            world.setBlock(x, y, z, Blocks.dirt, 0, 2);
+        }
+    }
 
-	@Override
-	public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) {
-		Block plant = plantable.getPlant(world, x, y + 1, z);
-		if (plant == Botany.flower) {
-			return true;
-		}
+    @Override
+    public boolean canSustainPlant(
+            IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) {
+        Block plant = plantable.getPlant(world, x, y + 1, z);
+        if (plant == Botany.flower) {
+            return true;
+        }
 
-		if (plant == Botany.plant) {
-			return !weedKilled || !BlockPlant.isWeed(world, x, y, z);
-		}
-		return world instanceof World
-			&& Blocks.dirt.canSustainPlant(world, x, y, z, direction, plantable);
-	}
+        if (plant == Botany.plant) {
+            return !weedKilled || !BlockPlant.isWeed(world, x, y, z);
+        }
+        return world instanceof World && Blocks.dirt.canSustainPlant(world, x, y, z, direction, plantable);
+    }
 
-	@Override
-	public boolean resistsWeeds(World world, int x, int y, int z) {
-		return weedKilled;
-	}
+    @Override
+    public boolean resistsWeeds(World world, int x, int y, int z) {
+        return weedKilled;
+    }
 }

src/main/java/binnie/botany/gardening/Gardening.java

@@ -11,6 +11,9 @@ import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
 import com.mojang.authlib.GameProfile;
 import forestry.api.core.EnumTemperature;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
@@ -20,255 +23,260 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 public class Gardening {
-	public static Map<ItemStack, Integer> fertiliserAcid = new LinkedHashMap<>();
-	public static Map<ItemStack, Integer> fertiliserAlkaline = new LinkedHashMap<>();
-	public static Map<ItemStack, Integer> fertiliserNutrient = new LinkedHashMap<>();
+    public static Map<ItemStack, Integer> fertiliserAcid = new LinkedHashMap<>();
+    public static Map<ItemStack, Integer> fertiliserAlkaline = new LinkedHashMap<>();
+    public static Map<ItemStack, Integer> fertiliserNutrient = new LinkedHashMap<>();
 
-	public static boolean isSoil(Block block) {
-		return block instanceof IBlockSoil;
-	}
+    public static boolean isSoil(Block block) {
+        return block instanceof IBlockSoil;
+    }
 
-	public static boolean isSoil(Item item) {
-		return item instanceof ItemBlock
-			&& isSoil(((ItemBlock) item).field_150939_a);
-	}
+    public static boolean isSoil(Item item) {
+        return item instanceof ItemBlock && isSoil(((ItemBlock) item).field_150939_a);
+    }
 
-	public static EnumMoisture getNaturalMoisture(World world, int x, int y, int z) {
-		float bias = getBiomeMoisture(world.getBiomeGenForCoords(x, z), y);
-		for (int dx = -1; dx < 2; ++dx) {
-			for (int dz = -1; dz < 2; ++dz) {
-				if (dx != 0 || dz != 0) {
-					if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) {
-						bias -= 1.5;
-					} else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) {
-						bias += 1.5;
-					}
-				}
-			}
-		}
+    public static EnumMoisture getNaturalMoisture(World world, int x, int y, int z) {
+        float bias = getBiomeMoisture(world.getBiomeGenForCoords(x, z), y);
+        for (int dx = -1; dx < 2; ++dx) {
+            for (int dz = -1; dz < 2; ++dz) {
+                if (dx != 0 || dz != 0) {
+                    if (world.getBlock(x + dx, y, z + dz) == Blocks.sand) {
+                        bias -= 1.5;
+                    } else if (world.getBlock(x + dx, y, z + dz) == Blocks.water) {
+                        bias += 1.5;
+                    }
+                }
+            }
+        }
 
-		if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) {
-			bias += 1.5;
-		}
+        if (world.isRaining() && world.canBlockSeeTheSky(x, y + 1, z) && world.getPrecipitationHeight(x, z) <= y + 1) {
+            bias += 1.5;
+        }
 
-		for (int dx = -1; dx < 2; ++dx) {
-			for (int dz = -1; dz < 2; ++dz) {
-				if (dx != 0 || dz != 0) {
-					if (world.getBlock(x + dx, y, z + dz) == Blocks.gravel && bias > 0.0f) {
-						bias *= 0.4f;
-					}
-				}
-			}
-		}
+        for (int dx = -1; dx < 2; ++dx) {
+            for (int dz = -1; dz < 2; ++dz) {
+                if (dx != 0 || dz != 0) {
+                    if (world.getBlock(x + dx, y, z + dz) == Blocks.gravel && bias > 0.0f) {
+                        bias *= 0.4f;
+                    }
+                }
+            }
+        }
 
-		if (bias <= -1.0f) {
-			return EnumMoisture.DRY;
-		}
-		return (bias >= 1.0f) ? EnumMoisture.DAMP : EnumMoisture.NORMAL;
-	}
+        if (bias <= -1.0f) {
+            return EnumMoisture.DRY;
+        }
+        return (bias >= 1.0f) ? EnumMoisture.DAMP : EnumMoisture.NORMAL;
+    }
 
-	public static EnumAcidity getNaturalPH(World world, int x, int y, int z) {
-		float bias = getBiomePH(world.getBiomeGenForCoords(x, z), y);
-		if (bias <= -1.0f) {
-			return EnumAcidity.ACID;
-		}
-		return (bias >= 1.0f) ? EnumAcidity.ALKALINE : EnumAcidity.NEUTRAL;
-	}
+    public static EnumAcidity getNaturalPH(World world, int x, int y, int z) {
+        float bias = getBiomePH(world.getBiomeGenForCoords(x, z), y);
+        if (bias <= -1.0f) {
+            return EnumAcidity.ACID;
+        }
+        return (bias >= 1.0f) ? EnumAcidity.ALKALINE : EnumAcidity.NEUTRAL;
+    }
 
-	public static float getBiomeMoisture(BiomeGenBase biome, int H) {
-		double R = biome.rainfall;
-		double T = biome.temperature;
-		double m = 3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T) + 1.1 - 1.6 * (T - 0.9) * (T - 0.9) - 0.002 * (H - 64);
-		if (m == 0.0) {
-			return (float) m;
-		}
-		if (m < 0.0){
-			return (float) -Math.sqrt(m * m);
-		}
-		return (float) Math.sqrt(m * m);
-	}
+    public static float getBiomeMoisture(BiomeGenBase biome, int H) {
+        double R = biome.rainfall;
+        double T = biome.temperature;
+        double m =
+                3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T) + 1.1 - 1.6 * (T - 0.9) * (T - 0.9) - 0.002 * (H - 64);
+        if (m == 0.0) {
+            return (float) m;
+        }
+        if (m < 0.0) {
+            return (float) -Math.sqrt(m * m);
+        }
+        return (float) Math.sqrt(m * m);
+    }
 
-	public static float getBiomePH(BiomeGenBase biome, int H) {
-		double R = biome.rainfall;
-		double T = biome.temperature;
-		return (float) (-3.0 * (R - 0.5) + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071) + 0.02f * (H - 64) - 0.15000000596046448);
-	}
+    public static float getBiomePH(BiomeGenBase biome, int H) {
+        double R = biome.rainfall;
+        double T = biome.temperature;
+        return (float) (-3.0 * (R - 0.5)
+                + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071)
+                + 0.02f * (H - 64)
+                - 0.15000000596046448);
+    }
 
-	public static void createSoil(World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity) {
-		int meta = moisture.ordinal() + acidity.ordinal() * 3;
-		world.setBlock(x, y, z, getSoilBlock(soil), meta, 2);
-	}
+    public static void createSoil(
+            World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity) {
+        int meta = moisture.ordinal() + acidity.ordinal() * 3;
+        world.setBlock(x, y, z, getSoilBlock(soil), meta, 2);
+    }
 
-	public static boolean plant(World world, int x, int y, int z, IFlower flower, GameProfile owner) {
-		boolean set = world.setBlock(x, y, z, Botany.flower, 0, 2);
-		if (!set) {
-			return false;
-		}
+    public static boolean plant(World world, int x, int y, int z, IFlower flower, GameProfile owner) {
+        boolean set = world.setBlock(x, y, z, Botany.flower, 0, 2);
+        if (!set) {
+            return false;
+        }
 
-		TileEntity tileFlower = world.getTileEntity(x, y, z);
-		TileEntity below = world.getTileEntity(x, y - 1, z);
-		if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
-			if (below instanceof TileEntityFlower) {
-				((TileEntityFlower) tileFlower).setSection(((TileEntityFlower) below).getSection());
-			} else {
-				((TileEntityFlower) tileFlower).create(flower, owner);
-			}
-		}
+        TileEntity tileFlower = world.getTileEntity(x, y, z);
+        TileEntity below = world.getTileEntity(x, y - 1, z);
+        if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
+            if (below instanceof TileEntityFlower) {
+                ((TileEntityFlower) tileFlower).setSection(((TileEntityFlower) below).getSection());
+            } else {
+                ((TileEntityFlower) tileFlower).create(flower, owner);
+            }
+        }
 
-		tryGrowSection(world, x, y, z);
-		return true;
-	}
+        tryGrowSection(world, x, y, z);
+        return true;
+    }
 
-	public static void tryGrowSection(World world, int x, int y, int z) {
-		if (!BinnieCore.proxy.isSimulating(world)) {
-			return;
-		}
+    public static void tryGrowSection(World world, int x, int y, int z) {
+        if (!BinnieCore.proxy.isSimulating(world)) {
+            return;
+        }
 
-		TileEntity flower = world.getTileEntity(x, y, z);
-		if (flower == null || !(flower instanceof TileEntityFlower)) {
-			return;
-		}
+        TileEntity flower = world.getTileEntity(x, y, z);
+        if (flower == null || !(flower instanceof TileEntityFlower)) {
+            return;
+        }
 
-		IFlower iflower = ((TileEntityFlower) flower).getFlower();
-		int section = ((TileEntityFlower) flower).getSection();
-		if (iflower == null || section >= iflower.getGenome().getPrimary().getType().getSections() - 1 || iflower.getAge() <= 0) {
-			return;
-		}
+        IFlower iflower = ((TileEntityFlower) flower).getFlower();
+        int section = ((TileEntityFlower) flower).getSection();
+        if (iflower == null
+                || section >= iflower.getGenome().getPrimary().getType().getSections() - 1
+                || iflower.getAge() <= 0) {
+            return;
+        }
 
-		world.setBlock(x, y + 1, z, Botany.flower, 0, 2);
-		TileEntity tileFlower = world.getTileEntity(x, y + 1, z);
-		if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
-			((TileEntityFlower) tileFlower).setSection(section + 1);
-		}
-	}
+        world.setBlock(x, y + 1, z, Botany.flower, 0, 2);
+        TileEntity tileFlower = world.getTileEntity(x, y + 1, z);
+        if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
+            ((TileEntityFlower) tileFlower).setSection(section + 1);
+        }
+    }
 
-	public static void onGrowFromSeed(World world, int x, int y, int z) {
-		tryGrowSection(world, x, y, z);
-	}
+    public static void onGrowFromSeed(World world, int x, int y, int z) {
+        tryGrowSection(world, x, y, z);
+    }
 
-	public static Collection<ItemStack> getAcidFertilisers() {
-		return Gardening.fertiliserAcid.keySet();
-	}
+    public static Collection<ItemStack> getAcidFertilisers() {
+        return Gardening.fertiliserAcid.keySet();
+    }
 
-	public static Collection<ItemStack> getAlkalineFertilisers() {
-		return Gardening.fertiliserAlkaline.keySet();
-	}
+    public static Collection<ItemStack> getAlkalineFertilisers() {
+        return Gardening.fertiliserAlkaline.keySet();
+    }
 
-	public static Collection<ItemStack> getNutrientFertilisers() {
-		return Gardening.fertiliserNutrient.keySet();
-	}
+    public static Collection<ItemStack> getNutrientFertilisers() {
+        return Gardening.fertiliserNutrient.keySet();
+    }
 
-	public static boolean isAcidFertiliser(ItemStack itemstack) {
-		for (ItemStack stack : getAcidFertilisers()) {
-			if (stack != null && stack.isItemEqual(itemstack)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public static boolean isAcidFertiliser(ItemStack itemstack) {
+        for (ItemStack stack : getAcidFertilisers()) {
+            if (stack != null && stack.isItemEqual(itemstack)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	public static boolean isAlkalineFertiliser(ItemStack itemstack) {
-		for (ItemStack stack : getAlkalineFertilisers()) {
-			if (stack != null && stack.isItemEqual(itemstack)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public static boolean isAlkalineFertiliser(ItemStack itemstack) {
+        for (ItemStack stack : getAlkalineFertilisers()) {
+            if (stack != null && stack.isItemEqual(itemstack)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	public static boolean isNutrientFertiliser(ItemStack itemstack) {
-		for (ItemStack stack : getNutrientFertilisers()) {
-			if (stack != null && stack.isItemEqual(itemstack)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public static boolean isNutrientFertiliser(ItemStack itemstack) {
+        for (ItemStack stack : getNutrientFertilisers()) {
+            if (stack != null && stack.isItemEqual(itemstack)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	public static int getFertiliserStrength(ItemStack stack) {
-		if (stack == null) {
-			return 1;
-		}
+    public static int getFertiliserStrength(ItemStack stack) {
+        if (stack == null) {
+            return 1;
+        }
 
-		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAcid.entrySet()) {
-			if (entry.getKey().isItemEqual(stack)) {
-				return entry.getValue();
-			}
-		}
+        for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAcid.entrySet()) {
+            if (entry.getKey().isItemEqual(stack)) {
+                return entry.getValue();
+            }
+        }
 
-		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAlkaline.entrySet()) {
-			if (entry.getKey().isItemEqual(stack)) {
-				return entry.getValue();
-			}
-		}
+        for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAlkaline.entrySet()) {
+            if (entry.getKey().isItemEqual(stack)) {
+                return entry.getValue();
+            }
+        }
 
-		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserNutrient.entrySet()) {
-			if (entry.getKey().isItemEqual(stack)) {
-				return entry.getValue();
-			}
-		}
-		return 1;
-	}
+        for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserNutrient.entrySet()) {
+            if (entry.getKey().isItemEqual(stack)) {
+                return entry.getValue();
+            }
+        }
+        return 1;
+    }
 
-	public static boolean canTolerate(IFlower flower, World world, int x, int y, int z) {
-		if (flower == null || flower.getGenome() == null) {
-			return false;
-		}
+    public static boolean canTolerate(IFlower flower, World world, int x, int y, int z) {
+        if (flower == null || flower.getGenome() == null) {
+            return false;
+        }
 
-		int soilMeta = world.getBlockMetadata(x, y - 1, z);
-		BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
-		return canTolerate(flower, EnumAcidity.values()[soilMeta / 3 % 3], EnumMoisture.values()[soilMeta % 3], EnumTemperature.getFromValue(biome.temperature));
-	}
+        int soilMeta = world.getBlockMetadata(x, y - 1, z);
+        BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
+        return canTolerate(
+                flower,
+                EnumAcidity.values()[soilMeta / 3 % 3],
+                EnumMoisture.values()[soilMeta % 3],
+                EnumTemperature.getFromValue(biome.temperature));
+    }
 
-	public static EnumSoilType getSoilType(World world, int x, int y, int z) {
-		if (world.getBlock(x, y, z) instanceof IBlockSoil) {
-			return ((IBlockSoil) world.getBlock(x, y, z)).getType(world, x, y, z);
-		}
-		return EnumSoilType.SOIL;
-	}
+    public static EnumSoilType getSoilType(World world, int x, int y, int z) {
+        if (world.getBlock(x, y, z) instanceof IBlockSoil) {
+            return ((IBlockSoil) world.getBlock(x, y, z)).getType(world, x, y, z);
+        }
+        return EnumSoilType.SOIL;
+    }
 
-	public static Block getSoilBlock(EnumSoilType type) {
-		return getSoilBlock(type, false);
-	}
+    public static Block getSoilBlock(EnumSoilType type) {
+        return getSoilBlock(type, false);
+    }
 
-	public static Block getSoilBlock(EnumSoilType type, boolean weedkill) {
-		switch (type) {
-			case FLOWERBED:
-				return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
+    public static Block getSoilBlock(EnumSoilType type, boolean weedkill) {
+        switch (type) {
+            case FLOWERBED:
+                return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
 
-			case LOAM:
-				return weedkill ? Botany.loamNoWeed : Botany.loam;
-		}
-		return weedkill ? Botany.soilNoWeed : Botany.soil;
-	}
+            case LOAM:
+                return weedkill ? Botany.loamNoWeed : Botany.loam;
+        }
+        return weedkill ? Botany.soilNoWeed : Botany.soil;
+    }
 
-	public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) {
-		return flower.getGenome().canTolerate(ePH)
-			&& flower.getGenome().canTolerate(eMoisture)
-			&& flower.getGenome().canTolerate(eTemp);
-	}
+    public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) {
+        return flower.getGenome().canTolerate(ePH)
+                && flower.getGenome().canTolerate(eMoisture)
+                && flower.getGenome().canTolerate(eTemp);
+    }
 
-	public static boolean isWeedkiller(ItemStack heldItem) {
-		return heldItem != null
-			&& heldItem.isItemEqual(BotanyItems.Weedkiller.get(1));
-	}
+    public static boolean isWeedkiller(ItemStack heldItem) {
+        return heldItem != null && heldItem.isItemEqual(BotanyItems.Weedkiller.get(1));
+    }
 
-	public static boolean addWeedKiller(World world, int x, int y, int z) {
-		if (!(world.getBlock(x, y, z) instanceof IBlockSoil)) {
-			return false;
-		}
+    public static boolean addWeedKiller(World world, int x, int y, int z) {
+        if (!(world.getBlock(x, y, z) instanceof IBlockSoil)) {
+            return false;
+        }
 
-		EnumSoilType type = getSoilType(world, x, y, z);
-		Block block = getSoilBlock(type, true);
-		boolean done = world.setBlock(x, y, z, block, world.getBlockMetadata(x, y, z), 2);
-		if (done && BlockPlant.isWeed(world, x, y + 1, z)) {
-			world.setBlockToAir(x, y + 1, z);
-		}
-		return done;
-	}
+        EnumSoilType type = getSoilType(world, x, y, z);
+        Block block = getSoilBlock(type, true);
+        boolean done = world.setBlock(x, y, z, block, world.getBlockMetadata(x, y, z), 2);
+        if (done && BlockPlant.isWeed(world, x, y + 1, z)) {
+            world.setBlockToAir(x, y + 1, z);
+        }
+        return done;
+    }
 }

src/main/java/binnie/botany/gardening/ItemSoil.java

@@ -6,81 +6,72 @@ import binnie.botany.api.EnumSoilType;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
+import java.util.Locale;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.List;
-import java.util.Locale;
-
 public class ItemSoil extends ItemBlock {
-	protected EnumSoilType type;
+    protected EnumSoilType type;
 
-	private boolean noWeed;
+    private boolean noWeed;
 
-	public ItemSoil(Block block) {
-		super(block);
-		type = ((BlockSoil) field_150939_a).getType();
-		noWeed = ((BlockSoil) field_150939_a).weedKilled;
-		hasSubtypes = true;
-	}
+    public ItemSoil(Block block) {
+        super(block);
+        type = ((BlockSoil) field_150939_a).getType();
+        noWeed = ((BlockSoil) field_150939_a).weedKilled;
+        hasSubtypes = true;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-		EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
-		EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
-		String info = "";
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+        super.addInformation(stack, player, tooltip, advanced);
+        EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
+        EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
+        String info = "";
 
-		if (moisture == EnumMoisture.DRY) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.dry")
-				+ EnumChatFormatting.RESET;
-		}
-		if (moisture == EnumMoisture.DAMP) {
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.moisture.damp")
-				+ EnumChatFormatting.RESET;
-		}
+        if (moisture == EnumMoisture.DRY) {
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.moisture.dry") + EnumChatFormatting.RESET;
+        }
+        if (moisture == EnumMoisture.DAMP) {
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.moisture.damp") + EnumChatFormatting.RESET;
+        }
 
-		if (acidity == EnumAcidity.ACID) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.ph.acid")
-				+ EnumChatFormatting.RESET;
-		}
+        if (acidity == EnumAcidity.ACID) {
+            if (info.length() > 0) {
+                info += ", ";
+            }
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET;
+        }
 
-		if (acidity == EnumAcidity.ALKALINE) {
-			if (info.length() > 0) {
-				info += ", ";
-			}
-			info += EnumChatFormatting.YELLOW
-				+ I18N.localise("botany.ph.alkaline")
-				+ EnumChatFormatting.RESET;
-		}
+        if (acidity == EnumAcidity.ALKALINE) {
+            if (info.length() > 0) {
+                info += ", ";
+            }
+            info += EnumChatFormatting.YELLOW + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET;
+        }
 
-		if (info.length() > 0) {
-			tooltip.add(info);
-		}
+        if (info.length() > 0) {
+            tooltip.add(info);
+        }
 
-		if (noWeed) {
-			tooltip.add(I18N.localise("botany.soil.weedkiller"));
-		}
-	}
+        if (noWeed) {
+            tooltip.add(I18N.localise("botany.soil.weedkiller"));
+        }
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		String soilName = type.name().toLowerCase(Locale.ENGLISH);
-		return I18N.localise("botany.soil." + soilName);
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        String soilName = type.name().toLowerCase(Locale.ENGLISH);
+        return I18N.localise("botany.soil." + soilName);
+    }
 
-	@Override
-	public int getMetadata(int meta) {
-		return meta;
-	}
+    @Override
+    public int getMetadata(int meta) {
+        return meta;
+    }
 }

src/main/java/binnie/botany/gardening/ItemSoilMeter.java

@@ -22,63 +22,67 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 
 public class ItemSoilMeter extends Item {
-	public ItemSoilMeter() {
-		setCreativeTab(CreativeTabBotany.instance);
-		setUnlocalizedName("soilMeter");
-		setMaxStackSize(1);
-	}
+    public ItemSoilMeter() {
+        setCreativeTab(CreativeTabBotany.instance);
+        setUnlocalizedName("soilMeter");
+        setMaxStackSize(1);
+    }
 
-	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float blockX, float blockY, float blockZ) {
-		Block block = world.getBlock(x, y, z);
-		if (!Gardening.isSoil(block)) {
-			y--;
-			block = world.getBlock(x, y, z);
-		}
+    @Override
+    public boolean onItemUse(
+            ItemStack stack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float blockX,
+            float blockY,
+            float blockZ) {
+        Block block = world.getBlock(x, y, z);
+        if (!Gardening.isSoil(block)) {
+            y--;
+            block = world.getBlock(x, y, z);
+        }
 
-		if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) {
-			IBlockSoil soil = (IBlockSoil) block;
-			EnumSoilType type = soil.getType(world, x, y, z);
-			EnumMoisture moisture = soil.getMoisture(world, x, y, z);
-			EnumAcidity pH = soil.getPH(world, x, y, z);
+        if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) {
+            IBlockSoil soil = (IBlockSoil) block;
+            EnumSoilType type = soil.getType(world, x, y, z);
+            EnumMoisture moisture = soil.getMoisture(world, x, y, z);
+            EnumAcidity pH = soil.getPH(world, x, y, z);
 
-			EnumChatFormatting[] colors = new EnumChatFormatting[]{
-				EnumChatFormatting.DARK_GRAY,
-				EnumChatFormatting.GOLD,
-				EnumChatFormatting.LIGHT_PURPLE,
-			};
-			String info = I18N.localise("botany.soil.tooltip.type") + " ";
-			info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET;
+            EnumChatFormatting[] colors = new EnumChatFormatting[] {
+                EnumChatFormatting.DARK_GRAY, EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE,
+            };
+            String info = I18N.localise("botany.soil.tooltip.type") + " ";
+            info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET;
 
-			colors = new EnumChatFormatting[]{
-				EnumChatFormatting.YELLOW,
-				EnumChatFormatting.GRAY,
-				EnumChatFormatting.BLUE,
-			};
-			info += ", " + I18N.localise("botany.soil.tooltip.moisture") + " ";
-			info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET;
+            colors = new EnumChatFormatting[] {
+                EnumChatFormatting.YELLOW, EnumChatFormatting.GRAY, EnumChatFormatting.BLUE,
+            };
+            info += ", " + I18N.localise("botany.soil.tooltip.moisture") + " ";
+            info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET;
 
-			colors = new EnumChatFormatting[]{
-				EnumChatFormatting.RED,
-				EnumChatFormatting.GREEN,
-				EnumChatFormatting.AQUA,
-			};
-			info += ", " + I18N.localise("botany.soil.tooltip.pH") + " ";
-			info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET;
-			IChatComponent chat = new ChatComponentText(info);
-			player.addChatMessage(chat);
-		}
-		return super.onItemUse(stack, player, world, x, y, z, side, blockX, blockY, blockZ);
-	}
+            colors = new EnumChatFormatting[] {
+                EnumChatFormatting.RED, EnumChatFormatting.GREEN, EnumChatFormatting.AQUA,
+            };
+            info += ", " + I18N.localise("botany.soil.tooltip.pH") + " ";
+            info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET;
+            IChatComponent chat = new ChatComponentText(info);
+            player.addChatMessage(chat);
+        }
+        return super.onItemUse(stack, player, world, x, y, z, side, blockX, blockY, blockZ);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		itemIcon = Botany.proxy.getIcon(register, "soilMeter");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        itemIcon = Botany.proxy.getIcon(register, "soilMeter");
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return I18N.localise("botany.item.soilMeter.name");
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return I18N.localise("botany.item.soilMeter.name");
+    }
 }

src/main/java/binnie/botany/gardening/ItemTrowel.java

@@ -16,52 +16,69 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class ItemTrowel extends Item {
-	protected Item.ToolMaterial theToolMaterial;
-	String locName;
+    protected Item.ToolMaterial theToolMaterial;
+    String locName;
 
-	public ItemTrowel(Item.ToolMaterial toolMaterial, String material) {
-		theToolMaterial = toolMaterial;
-		maxStackSize = 1;
-		setMaxDamage(toolMaterial.getMaxUses());
-		setCreativeTab(CreativeTabBotany.instance);
-		setUnlocalizedName("trowel" + material);
-		locName = "trowel" + material;
-	}
+    public ItemTrowel(Item.ToolMaterial toolMaterial, String material) {
+        theToolMaterial = toolMaterial;
+        maxStackSize = 1;
+        setMaxDamage(toolMaterial.getMaxUses());
+        setCreativeTab(CreativeTabBotany.instance);
+        setUnlocalizedName("trowel" + material);
+        locName = "trowel" + material;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		itemIcon = Botany.proxy.getIcon(register, "tools/" + locName);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        itemIcon = Botany.proxy.getIcon(register, "tools/" + locName);
+    }
 
-	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float blockX, float blockY, float blockZ) {
-		if (!player.canPlayerEdit(x, y, z, side, stack)) {
-			return false;
-		}
-		Block block = world.getBlock(x, y, z);
-		if (side == 0 || 
-			(!world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && world.getBlock(x, y + 1, z) != Botany.flower) ||
-			(block != Blocks.grass && block != Blocks.dirt)) {
-			return false;
-		}
+    @Override
+    public boolean onItemUse(
+            ItemStack stack,
+            EntityPlayer player,
+            World world,
+            int x,
+            int y,
+            int z,
+            int side,
+            float blockX,
+            float blockY,
+            float blockZ) {
+        if (!player.canPlayerEdit(x, y, z, side, stack)) {
+            return false;
+        }
+        Block block = world.getBlock(x, y, z);
+        if (side == 0
+                || (!world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z)
+                        && world.getBlock(x, y + 1, z) != Botany.flower)
+                || (block != Blocks.grass && block != Blocks.dirt)) {
+            return false;
+        }
 
-		Block block2 = Botany.soil;
-		world.playSoundEffect(x + 0.5f, y + 0.5f, z + 0.5f, block2.stepSound.getStepResourcePath(), (block2.stepSound.getVolume() + 1.0f) / 2.0f, block2.stepSound.getPitch() * 0.8f);
-		if (world.isRemote) {
-			return true;
-		}
+        Block block2 = Botany.soil;
+        world.playSoundEffect(
+                x + 0.5f,
+                y + 0.5f,
+                z + 0.5f,
+                block2.stepSound.getStepResourcePath(),
+                (block2.stepSound.getVolume() + 1.0f) / 2.0f,
+                block2.stepSound.getPitch() * 0.8f);
+        if (world.isRemote) {
+            return true;
+        }
 
-		EnumMoisture moisture = Gardening.getNaturalMoisture(world, x, y, z);
-		EnumAcidity acidity = Gardening.getNaturalPH(world, x, y, z);
-		Gardening.createSoil(world, x, y, z, EnumSoilType.SOIL, moisture, acidity);
-		stack.damageItem(1, player);
-		return true;
-	}
+        EnumMoisture moisture = Gardening.getNaturalMoisture(world, x, y, z);
+        EnumAcidity acidity = Gardening.getNaturalPH(world, x, y, z);
+        Gardening.createSoil(world, x, y, z, EnumSoilType.SOIL, moisture, acidity);
+        stack.damageItem(1, player);
+        return true;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean isFull3D() {
-		return true;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean isFull3D() {
+        return true;
+    }
 }

src/main/java/binnie/botany/gardening/ItemWeed.java

@@ -8,25 +8,25 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
 public class ItemWeed extends ItemBlock {
-	public ItemWeed(Block block) {
-		super(block);
-		setHasSubtypes(true);
-		hasSubtypes = true;
-	}
+    public ItemWeed(Block block) {
+        super(block);
+        setHasSubtypes(true);
+        hasSubtypes = true;
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return BlockPlant.Type.values()[stack.getItemDamage()].getName();
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return BlockPlant.Type.values()[stack.getItemDamage()].getName();
+    }
 
-	@Override
-	public int getMetadata(int meta) {
-		return meta;
-	}
+    @Override
+    public int getMetadata(int meta) {
+        return meta;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int damage) {
-		return field_150939_a.getIcon(2, damage);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int damage) {
+        return field_150939_a.getIcon(2, damage);
+    }
 }

src/main/java/binnie/botany/gardening/ModuleGardening.java

@@ -26,6 +26,8 @@ import binnie.core.block.ItemMetadataRenderer;
 import binnie.core.block.MultipassItemRenderer;
 import binnie.core.block.TileEntityMetadata;
 import cpw.mods.fml.common.registry.GameRegistry;
+import java.util.HashMap;
+import java.util.Map;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -35,336 +37,317 @@ import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class ModuleGardening implements IInitializable {
-	public static HashMap<ItemStack, Integer> queuedAcidFertilisers = new HashMap<>();
-	public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers = new HashMap<>();
-	public static HashMap<ItemStack, Integer> queuedNutrientFertilisers = new HashMap<>();
+    public static HashMap<ItemStack, Integer> queuedAcidFertilisers = new HashMap<>();
+    public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers = new HashMap<>();
+    public static HashMap<ItemStack, Integer> queuedNutrientFertilisers = new HashMap<>();
 
-	@Override
-	public void preInit() {
-		Botany.plant = new BlockPlant();
-		GameRegistry.registerBlock(Botany.plant, ItemWeed.class, "plant");
+    @Override
+    public void preInit() {
+        Botany.plant = new BlockPlant();
+        GameRegistry.registerBlock(Botany.plant, ItemWeed.class, "plant");
 
-		Botany.soil = new BlockSoil(EnumSoilType.SOIL, "soil", false);
-		GameRegistry.registerBlock(Botany.soil, ItemSoil.class, "soil");
+        Botany.soil = new BlockSoil(EnumSoilType.SOIL, "soil", false);
+        GameRegistry.registerBlock(Botany.soil, ItemSoil.class, "soil");
 
-		Botany.loam = new BlockSoil(EnumSoilType.LOAM, "loam", false);
-		GameRegistry.registerBlock(Botany.loam, ItemSoil.class, "loam");
+        Botany.loam = new BlockSoil(EnumSoilType.LOAM, "loam", false);
+        GameRegistry.registerBlock(Botany.loam, ItemSoil.class, "loam");
 
-		Botany.flowerbed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed", false);
-		GameRegistry.registerBlock(Botany.flowerbed, ItemSoil.class, "flowerbed");
+        Botany.flowerbed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed", false);
+        GameRegistry.registerBlock(Botany.flowerbed, ItemSoil.class, "flowerbed");
 
-		Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true);
-		GameRegistry.registerBlock(Botany.soilNoWeed, ItemSoil.class, "soilNoWeed");
+        Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true);
+        GameRegistry.registerBlock(Botany.soilNoWeed, ItemSoil.class, "soilNoWeed");
 
-		Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true);
-		GameRegistry.registerBlock(Botany.loamNoWeed, ItemSoil.class, "loamNoWeed");
+        Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true);
+        GameRegistry.registerBlock(Botany.loamNoWeed, ItemSoil.class, "loamNoWeed");
 
-		Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true);
-		GameRegistry.registerBlock(Botany.flowerbedNoWeed, ItemSoil.class, "flowerbedNoWeed");
+        Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true);
+        GameRegistry.registerBlock(Botany.flowerbedNoWeed, ItemSoil.class, "flowerbedNoWeed");
 
-		Botany.soilMeter = new ItemSoilMeter();
-		Botany.insulatedTube = new ItemInsulatedTube();
-		Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood");
-		Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone");
-		Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
-		Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
-		Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
-		Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
-		Botany.pigment = new ItemPigment();
-		Botany.clay = new ItemClay();
+        Botany.soilMeter = new ItemSoilMeter();
+        Botany.insulatedTube = new ItemInsulatedTube();
+        Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood");
+        Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone");
+        Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
+        Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond");
+        Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
+        Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
+        Botany.pigment = new ItemPigment();
+        Botany.clay = new ItemClay();
 
-		Botany.ceramic = new BlockCeramic();
-		GameRegistry.registerBlock(Botany.ceramic, ItemMetadata.class, "ceramic");
-		BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer());
+        Botany.ceramic = new BlockCeramic();
+        GameRegistry.registerBlock(Botany.ceramic, ItemMetadata.class, "ceramic");
+        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer());
 
-		Botany.stained = new BlockStained();
-		GameRegistry.registerBlock(Botany.stained, ItemMetadata.class, "stained");
-		BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer());
+        Botany.stained = new BlockStained();
+        GameRegistry.registerBlock(Botany.stained, ItemMetadata.class, "stained");
+        BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer());
 
-		Botany.ceramicTile = new BlockCeramicPatterned();
-		GameRegistry.registerBlock(Botany.ceramicTile, ItemMetadata.class, "ceramicPattern");
-		BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer());
+        Botany.ceramicTile = new BlockCeramicPatterned();
+        GameRegistry.registerBlock(Botany.ceramicTile, ItemMetadata.class, "ceramicPattern");
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer());
 
-		Botany.ceramicBrick = new BlockCeramicBrick();
-		GameRegistry.registerBlock(Botany.ceramicBrick, ItemMetadata.class, "ceramicBrick");
-		BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer());
-	}
+        Botany.ceramicBrick = new BlockCeramicBrick();
+        GameRegistry.registerBlock(Botany.ceramicBrick, ItemMetadata.class, "ceramicBrick");
+        BinnieCore.proxy.registerCustomItemRenderer(
+                Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer());
+    }
 
-	@Override
-	public void init() {
-		OreDictionary.registerOre("pigment", Botany.pigment);
-		RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, "");
-		RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, "");
-		ItemStack yellow = new ItemStack(Blocks.yellow_flower, 1);
-		ItemStack red = new ItemStack(Blocks.red_flower, 1);
-		ItemStack blue = new ItemStack(Blocks.red_flower, 1, 7);
+    @Override
+    public void init() {
+        OreDictionary.registerOre("pigment", Botany.pigment);
+        RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, "");
+        RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, "");
+        ItemStack yellow = new ItemStack(Blocks.yellow_flower, 1);
+        ItemStack red = new ItemStack(Blocks.red_flower, 1);
+        ItemStack blue = new ItemStack(Blocks.red_flower, 1, 7);
 
-		for (boolean manual : new boolean[]{true, false}) {
-			for (boolean fertilised : new boolean[]{true, false}) {
-				for (EnumMoisture moist : EnumMoisture.values()) {
-					ItemStack icon = (moist == EnumMoisture.DRY) ? yellow : ((moist == EnumMoisture.NORMAL) ? red : blue);
-					int insulate = 2 - moist.ordinal();
-					if (fertilised) {
-						insulate += 3;
-					}
-					new CircuitGarden(moist, null, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 128 * insulate), icon);
-					new CircuitGarden(moist, EnumAcidity.ACID, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate), icon);
-					new CircuitGarden(moist, EnumAcidity.NEUTRAL, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate), icon);
-					new CircuitGarden(moist, EnumAcidity.ALKALINE, manual, fertilised, new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate), icon);
-				}
-			}
-		}
-	}
+        for (boolean manual : new boolean[] {true, false}) {
+            for (boolean fertilised : new boolean[] {true, false}) {
+                for (EnumMoisture moist : EnumMoisture.values()) {
+                    ItemStack icon =
+                            (moist == EnumMoisture.DRY) ? yellow : ((moist == EnumMoisture.NORMAL) ? red : blue);
+                    int insulate = 2 - moist.ordinal();
+                    if (fertilised) {
+                        insulate += 3;
+                    }
+                    new CircuitGarden(
+                            moist,
+                            null,
+                            manual,
+                            fertilised,
+                            new ItemStack(Botany.insulatedTube, 1, 128 * insulate),
+                            icon);
+                    new CircuitGarden(
+                            moist,
+                            EnumAcidity.ACID,
+                            manual,
+                            fertilised,
+                            new ItemStack(Botany.insulatedTube, 1, 1 + 128 * insulate),
+                            icon);
+                    new CircuitGarden(
+                            moist,
+                            EnumAcidity.NEUTRAL,
+                            manual,
+                            fertilised,
+                            new ItemStack(Botany.insulatedTube, 1, 2 + 128 * insulate),
+                            icon);
+                    new CircuitGarden(
+                            moist,
+                            EnumAcidity.ALKALINE,
+                            manual,
+                            fertilised,
+                            new ItemStack(Botany.insulatedTube, 1, 3 + 128 * insulate),
+                            icon);
+                }
+            }
+        }
+    }
 
-	@Override
-	public void postInit() {
-		GameRegistry.addRecipe(new CeramicTileRecipe());
-		for (int mat = 0; mat < 4; ++mat) {
-			for (int insulate = 0; insulate < 6; ++insulate) {
-				ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate);
-				ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes);
-				ItemStack forestryTube = new ItemStack(Mods.forestry.item("thermionicTubes"), 1, mat);
-				GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack);
-			}
-		}
+    @Override
+    public void postInit() {
+        GameRegistry.addRecipe(new CeramicTileRecipe());
+        for (int mat = 0; mat < 4; ++mat) {
+            for (int insulate = 0; insulate < 6; ++insulate) {
+                ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate);
+                ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes);
+                ItemStack forestryTube = new ItemStack(Mods.forestry.item("thermionicTubes"), 1, mat);
+                GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack);
+            }
+        }
 
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE));
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE));
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE));
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE));
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE));
-		GameRegistry.addShapelessRecipe(new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE));
+        GameRegistry.addShapelessRecipe(
+                new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE));
 
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.trowelWood,
-			new Object[]{
-				"d  ", " x ", "  s",
-				'd', Blocks.dirt,
-				's', "stickWood",
-				'x', "plankWood"
-			}
-		));
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.trowelStone,
-			new Object[]{
-				"d  ", " x ", "  s",
-				'd', Blocks.dirt,
-				's', "stickWood",
-				'x', "cobblestone"
-			}
-		));
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.trowelIron,
-			new Object[]{
-				"d  ", " x ", "  s",
-				'd', Blocks.dirt,
-				's', "stickWood",
-				'x', "ingotIron"
-			}
-		));
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.trowelGold,
-			new Object[]{
-				"d  ", " x ", "  s",
-				'd', Blocks.dirt,
-				's', "stickWood",
-				'x', "ingotGold"
-			}
-		));
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.trowelDiamond,
-			new Object[]{
-				"d  ", " x ", "  s",
-				'd', Blocks.dirt,
-				's', "stickWood",
-				'x', "gemDiamond"
-			}
-		));
-		GameRegistry.addRecipe(new ShapedOreRecipe(
-			Botany.soilMeter,
-			new Object[]{
-				" gg", " rg", "i  ",
-				'g', "ingotGold",
-				'r', "dustRedstone",
-				'i', "ingotIron"
-			}
-		));
-		GameRegistry.addShapelessRecipe(
-			BotanyItems.Weedkiller.get(4),
-			new ItemStack(Items.spider_eye),
-			new ItemStack(Items.wheat_seeds),
-			new ItemStack(Items.wheat_seeds),
-			new ItemStack(Items.wheat_seeds)
-		);
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.trowelWood,
+                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.trowelStone,
+                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.trowelIron,
+                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.trowelGold,
+                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.trowelDiamond,
+                new Object[] {"d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond"}));
+        GameRegistry.addRecipe(new ShapedOreRecipe(
+                Botany.soilMeter,
+                new Object[] {" gg", " rg", "i  ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron"}));
+        GameRegistry.addShapelessRecipe(
+                BotanyItems.Weedkiller.get(4),
+                new ItemStack(Items.spider_eye),
+                new ItemStack(Items.wheat_seeds),
+                new ItemStack(Items.wheat_seeds),
+                new ItemStack(Items.wheat_seeds));
 
-		GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.forestry.stack("ash"));
-		GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.forestry.stack("mulch"));
-		GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio"));
-		GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound"));
-		GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp"));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(
-			BotanyItems.SulphurPowder.get(4),
-			new Object[]{"dustSulphur"}
-		));
+        GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.forestry.stack("ash"));
+        GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.forestry.stack("mulch"));
+        GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio"));
+        GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound"));
+        GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp"));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] {"dustSulphur"}));
 
-		GameRegistry.addRecipe(new ShapelessOreRecipe(
-			new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
-			new Object[]{
-				"pigment",
-				"pigment",
-				"dyeBlack"
-			}
-		));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(
+                new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
+                new Object[] {"pigment", "pigment", "dyeBlack"}));
 
-		ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1);
-		ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1);
-		ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "mulch")), 2);
+        ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1);
+        ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1);
+        ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "mulch")), 2);
 
-		for (ItemStack stack : OreDictionary.getOres("dustSulfur")) {
-			ModuleGardening.queuedAcidFertilisers.put(stack, 2);
-		}
+        for (ItemStack stack : OreDictionary.getOres("dustSulfur")) {
+            ModuleGardening.queuedAcidFertilisers.put(stack, 2);
+        }
 
-		ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1);
-		ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1);
-		ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "ash")), 2);
-		ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2);
-		ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1);
-		ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1);
-		ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2);
-		ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2);
+        ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1);
+        ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1);
+        ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "ash")), 2);
+        ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2);
+        ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1);
+        ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1);
+        ModuleGardening.queuedNutrientFertilisers.put(
+                new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2);
+        ModuleGardening.queuedNutrientFertilisers.put(
+                new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2);
 
-		for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAcidFertilisers.entrySet()) {
-			addAcidFertiliser(entry.getKey(), entry.getValue());
-		}
+        for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAcidFertilisers.entrySet()) {
+            addAcidFertiliser(entry.getKey(), entry.getValue());
+        }
 
-		for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAlkalineFertilisers.entrySet()) {
-			addAlkalineFertiliser(entry.getKey(), entry.getValue());
-		}
+        for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAlkalineFertilisers.entrySet()) {
+            addAlkalineFertiliser(entry.getKey(), entry.getValue());
+        }
 
-		for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedNutrientFertilisers.entrySet()) {
-			addNutrientFertiliser(entry.getKey(), entry.getValue());
-		}
+        for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedNutrientFertilisers.entrySet()) {
+            addNutrientFertiliser(entry.getKey(), entry.getValue());
+        }
 
-		GameRegistry.addRecipe(
-			BotanyItems.Mortar.get(6),
-			" c ", "cgc", " c ",
-			'c', Items.clay_ball,
-			'g', Blocks.gravel
-		);
+        GameRegistry.addRecipe(
+                BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel);
 
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
-			ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
-			GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
-			GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(Botany.ceramic, c.ordinal()), 0.0f);
-			ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal());
-			glass.stackSize = 4;
-			GameRegistry.addShapedRecipe(
-				glass,
-				" g ", "gpg", " g ",
-				'g', Blocks.glass,
-				'p', pigment
-			);
-		}
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
+            ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
+            GameRegistry.addShapelessRecipe(clay, Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment);
+            GameRegistry.addSmelting(clay, TileEntityMetadata.getItemStack(Botany.ceramic, c.ordinal()), 0.0f);
+            ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal());
+            glass.stackSize = 4;
+            GameRegistry.addShapedRecipe(glass, " g ", "gpg", " g ", 'g', Blocks.glass, 'p', pigment);
+        }
 
-		GameRegistry.addRecipe(new PigmentRecipe());
-	}
+        GameRegistry.addRecipe(new PigmentRecipe());
+    }
 
-	private ItemStack getStack(int type, int pH, int moisture) {
-		if (type < 0 || type > 2 || pH < 0 || pH > 2 || moisture < 0 || moisture > 2) {
-			return null;
-		}
-		return new ItemStack(Gardening.getSoilBlock(EnumSoilType.values()[type]), 1, BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture]));
-	}
+    private ItemStack getStack(int type, int pH, int moisture) {
+        if (type < 0 || type > 2 || pH < 0 || pH > 2 || moisture < 0 || moisture > 2) {
+            return null;
+        }
+        return new ItemStack(
+                Gardening.getSoilBlock(EnumSoilType.values()[type]),
+                1,
+                BlockSoil.getMeta(EnumAcidity.values()[pH], EnumMoisture.values()[moisture]));
+    }
 
-	private void addAcidFertiliser(ItemStack stack, int strengthMax) {
-		if (stack == null) {
-			return;
-		}
+    private void addAcidFertiliser(ItemStack stack, int strengthMax) {
+        if (stack == null) {
+            return;
+        }
 
-		Gardening.fertiliserAcid.put(stack, strengthMax);
-		for (int moisture = 0; moisture < 3; ++moisture) {
-			for (int pH = 0; pH < 3; ++pH) {
-				for (int type = 0; type < 3; ++type) {
-					int numOfBlocks = strengthMax * strengthMax;
-					for (int strength = 1; strength < strengthMax; ++strength) {
-						ItemStack start = getStack(type, pH, moisture);
-						ItemStack end = getStack(type, pH - strength, moisture);
-						if (end != null) {
-							end.stackSize = numOfBlocks;
-							Object[] stacks = new Object[numOfBlocks + 1];
-							for (int i = 0; i < numOfBlocks; ++i) {
-								stacks[i] = start;
-							}
-							stacks[numOfBlocks] = stack.copy();
-							GameRegistry.addShapelessRecipe(end, stacks);
-						}
-						numOfBlocks /= 2;
-					}
-				}
-			}
-		}
-	}
+        Gardening.fertiliserAcid.put(stack, strengthMax);
+        for (int moisture = 0; moisture < 3; ++moisture) {
+            for (int pH = 0; pH < 3; ++pH) {
+                for (int type = 0; type < 3; ++type) {
+                    int numOfBlocks = strengthMax * strengthMax;
+                    for (int strength = 1; strength < strengthMax; ++strength) {
+                        ItemStack start = getStack(type, pH, moisture);
+                        ItemStack end = getStack(type, pH - strength, moisture);
+                        if (end != null) {
+                            end.stackSize = numOfBlocks;
+                            Object[] stacks = new Object[numOfBlocks + 1];
+                            for (int i = 0; i < numOfBlocks; ++i) {
+                                stacks[i] = start;
+                            }
+                            stacks[numOfBlocks] = stack.copy();
+                            GameRegistry.addShapelessRecipe(end, stacks);
+                        }
+                        numOfBlocks /= 2;
+                    }
+                }
+            }
+        }
+    }
 
-	private void addAlkalineFertiliser(ItemStack stack, int strengthMax) {
-		if (stack == null) {
-			return;
-		}
+    private void addAlkalineFertiliser(ItemStack stack, int strengthMax) {
+        if (stack == null) {
+            return;
+        }
 
-		Gardening.fertiliserAlkaline.put(stack, strengthMax);
-		for (int moisture = 0; moisture < 3; ++moisture) {
-			for (int pH = 0; pH < 3; ++pH) {
-				for (int type = 0; type < 3; ++type) {
-					int numOfBlocks = strengthMax * strengthMax;
-					for (int strength = 1; strength < strengthMax; ++strength) {
-						ItemStack start = getStack(type, pH, moisture);
-						ItemStack end = getStack(type, pH + strength, moisture);
-						if (end != null) {
-							end.stackSize = numOfBlocks;
-							Object[] stacks = new Object[numOfBlocks + 1];
-							for (int i = 0; i < numOfBlocks; ++i) {
-								stacks[i] = start;
-							}
-							stacks[numOfBlocks] = stack.copy();
-							GameRegistry.addShapelessRecipe(end, stacks);
-						}
-						numOfBlocks /= 2;
-					}
-				}
-			}
-		}
-	}
+        Gardening.fertiliserAlkaline.put(stack, strengthMax);
+        for (int moisture = 0; moisture < 3; ++moisture) {
+            for (int pH = 0; pH < 3; ++pH) {
+                for (int type = 0; type < 3; ++type) {
+                    int numOfBlocks = strengthMax * strengthMax;
+                    for (int strength = 1; strength < strengthMax; ++strength) {
+                        ItemStack start = getStack(type, pH, moisture);
+                        ItemStack end = getStack(type, pH + strength, moisture);
+                        if (end != null) {
+                            end.stackSize = numOfBlocks;
+                            Object[] stacks = new Object[numOfBlocks + 1];
+                            for (int i = 0; i < numOfBlocks; ++i) {
+                                stacks[i] = start;
+                            }
+                            stacks[numOfBlocks] = stack.copy();
+                            GameRegistry.addShapelessRecipe(end, stacks);
+                        }
+                        numOfBlocks /= 2;
+                    }
+                }
+            }
+        }
+    }
 
-	private void addNutrientFertiliser(ItemStack stack, int strengthMax) {
-		if (stack == null) {
-			return;
-		}
+    private void addNutrientFertiliser(ItemStack stack, int strengthMax) {
+        if (stack == null) {
+            return;
+        }
 
-		Gardening.fertiliserNutrient.put(stack, strengthMax);
-		for (int moisture = 0; moisture < 3; ++moisture) {
-			for (int pH = 0; pH < 3; ++pH) {
-				for (int type = 0; type < 3; ++type) {
-					int numOfBlocks = strengthMax * strengthMax;
-					for (int strength = 1; strength < strengthMax; ++strength) {
-						ItemStack start = getStack(type, pH, moisture);
-						ItemStack end = getStack(type + strength, pH, moisture);
-						if (end != null) {
-							end.stackSize = numOfBlocks;
-							Object[] stacks = new Object[numOfBlocks + 1];
-							for (int i = 0; i < numOfBlocks; ++i) {
-								stacks[i] = start;
-							}
-							stacks[numOfBlocks] = stack.copy();
-							GameRegistry.addShapelessRecipe(end, stacks);
-						}
-						numOfBlocks /= 2;
-					}
-				}
-			}
-		}
-	}
+        Gardening.fertiliserNutrient.put(stack, strengthMax);
+        for (int moisture = 0; moisture < 3; ++moisture) {
+            for (int pH = 0; pH < 3; ++pH) {
+                for (int type = 0; type < 3; ++type) {
+                    int numOfBlocks = strengthMax * strengthMax;
+                    for (int strength = 1; strength < strengthMax; ++strength) {
+                        ItemStack start = getStack(type, pH, moisture);
+                        ItemStack end = getStack(type + strength, pH, moisture);
+                        if (end != null) {
+                            end.stackSize = numOfBlocks;
+                            Object[] stacks = new Object[numOfBlocks + 1];
+                            for (int i = 0; i < numOfBlocks; ++i) {
+                                stacks[i] = start;
+                            }
+                            stacks[numOfBlocks] = stack.copy();
+                            GameRegistry.addShapelessRecipe(end, stacks);
+                        }
+                        numOfBlocks /= 2;
+                    }
+                }
+            }
+        }
+    }
 }

src/main/java/binnie/botany/genetics/AlleleColor.java

@@ -3,43 +3,43 @@ package binnie.botany.genetics;
 import forestry.api.genetics.IAlleleInteger;
 
 public class AlleleColor implements IAlleleInteger {
-	private String uid;
-	private int value;
-	private EnumFlowerColor color;
-	private boolean dominant = true;
+    private String uid;
+    private int value;
+    private EnumFlowerColor color;
+    private boolean dominant = true;
 
-	public AlleleColor(EnumFlowerColor color, String uid, int value) {
-		this.color = color;
-		this.uid = uid;
-		this.value = value;
-	}
+    public AlleleColor(EnumFlowerColor color, String uid, int value) {
+        this.color = color;
+        this.uid = uid;
+        this.value = value;
+    }
 
-	@Override
-	public String getUID() {
-		return uid;
-	}
+    @Override
+    public String getUID() {
+        return uid;
+    }
 
-	@Override
-	public boolean isDominant() {
-		return dominant;
-	}
+    @Override
+    public boolean isDominant() {
+        return dominant;
+    }
 
-	@Override
-	public String getName() {
-		return color.getName();
-	}
+    @Override
+    public String getName() {
+        return color.getName();
+    }
 
-	@Override
-	public int getValue() {
-		return value;
-	}
+    @Override
+    public int getValue() {
+        return value;
+    }
 
-	public EnumFlowerColor getColor() {
-		return color;
-	}
+    public EnumFlowerColor getColor() {
+        return color;
+    }
 
-	@Override
-	public String getUnlocalizedName() {
-		return getUID();
-	}
+    @Override
+    public String getUnlocalizedName() {
+        return getUID();
+    }
 }

src/main/java/binnie/botany/genetics/AlleleEffectNone.java

@@ -7,38 +7,38 @@ import forestry.api.genetics.IEffectData;
 import net.minecraft.world.World;
 
 public class AlleleEffectNone implements IAlleleFlowerEffect {
-	@Override
-	public boolean isCombinable() {
-		return true;
-	}
+    @Override
+    public boolean isCombinable() {
+        return true;
+    }
 
-	@Override
-	public IEffectData validateStorage(IEffectData storedData) {
-		return storedData;
-	}
+    @Override
+    public IEffectData validateStorage(IEffectData storedData) {
+        return storedData;
+    }
 
-	@Override
-	public String getUID() {
-		return "binnie.flowerEffectNone";
-	}
+    @Override
+    public String getUID() {
+        return "binnie.flowerEffectNone";
+    }
 
-	@Override
-	public boolean isDominant() {
-		return false;
-	}
+    @Override
+    public boolean isDominant() {
+        return false;
+    }
 
-	@Override
-	public String getName() {
-		return I18N.localise("forestry.allele.effect.none");
-	}
+    @Override
+    public String getName() {
+        return I18N.localise("forestry.allele.effect.none");
+    }
 
-	@Override
-	public IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z) {
-		return storedData;
-	}
+    @Override
+    public IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z) {
+        return storedData;
+    }
 
-	@Override
-	public String getUnlocalizedName() {
-		return getUID();
-	}
+    @Override
+    public String getUnlocalizedName() {
+        return getUID();
+    }
 }

src/main/java/binnie/botany/genetics/BotanistTracker.java

@@ -8,23 +8,22 @@ import forestry.core.genetics.BreedingTracker;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class BotanistTracker extends BreedingTracker implements IBotanistTracker {
-	public BotanistTracker(String s) {
-		super(s);
-	}
+    public BotanistTracker(String s) {
+        super(s);
+    }
 
-	@Override
-	public void registerPickup(IIndividual individual) {
-		// ignored
-	}
+    @Override
+    public void registerPickup(IIndividual individual) {
+        // ignored
+    }
 
-	@Override
-	protected IBreedingTracker getBreedingTracker(EntityPlayer player) {
-		return Binnie.Genetics.getFlowerRoot()
-			.getBreedingTracker(player.worldObj, player.getGameProfile());
-	}
+    @Override
+    protected IBreedingTracker getBreedingTracker(EntityPlayer player) {
+        return Binnie.Genetics.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile());
+    }
 
-	@Override
-	protected String speciesRootUID() {
-		return "rootFlowers";
-	}
+    @Override
+    protected String speciesRootUID() {
+        return "rootFlowers";
+    }
 }

src/main/java/binnie/botany/genetics/ColorMix.java

@@ -4,41 +4,40 @@ import binnie.botany.api.IColourMix;
 import binnie.botany.api.IFlowerColor;
 
 public class ColorMix implements IColourMix {
-	protected IFlowerColor color1;
-	protected IFlowerColor color2;
-	protected IFlowerColor result;
-	protected int chance;
+    protected IFlowerColor color1;
+    protected IFlowerColor color2;
+    protected IFlowerColor result;
+    protected int chance;
 
-	public ColorMix(IFlowerColor color1, IFlowerColor color2, IFlowerColor result, int chance) {
-		this.color1 = color1;
-		this.color2 = color2;
-		this.result = result;
-		this.chance = chance;
-	}
+    public ColorMix(IFlowerColor color1, IFlowerColor color2, IFlowerColor result, int chance) {
+        this.color1 = color1;
+        this.color2 = color2;
+        this.result = result;
+        this.chance = chance;
+    }
 
-	@Override
-	public IFlowerColor getColor1() {
-		return color1;
-	}
+    @Override
+    public IFlowerColor getColor1() {
+        return color1;
+    }
 
-	@Override
-	public IFlowerColor getColor2() {
-		return color2;
-	}
+    @Override
+    public IFlowerColor getColor2() {
+        return color2;
+    }
 
-	@Override
-	public boolean isMutation(IFlowerColor color1, IFlowerColor color2) {
-		return (color1 == this.color1 && color2 == this.color2)
-			|| (color1 == this.color2 && color2 == this.color1);
-	}
+    @Override
+    public boolean isMutation(IFlowerColor color1, IFlowerColor color2) {
+        return (color1 == this.color1 && color2 == this.color2) || (color1 == this.color2 && color2 == this.color1);
+    }
 
-	@Override
-	public int getChance() {
-		return chance;
-	}
+    @Override
+    public int getChance() {
+        return chance;
+    }
 
-	@Override
-	public IFlowerColor getResult() {
-		return result;
-	}
+    @Override
+    public IFlowerColor getResult() {
+        return result;
+    }
 }

src/main/java/binnie/botany/genetics/EnumFlowerType.java

@@ -7,146 +7,146 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 
 public enum EnumFlowerType implements IFlowerType {
-	DANDELION,
-	POPPY,
-	ORCHID,
-	ALLIUM,
-	BLUET,
-	TULIP,
-	DAISY,
-	CORNFLOWER,
-	PANSY,
-	IRIS,
-	LAVENDER(2),
-	VIOLA,
-	DAFFODIL,
-	DAHLIA,
-	PEONY(2),
-	ROSE(2),
-	LILAC(2),
-	HYDRANGEA(2),
-	FOXGLOVE(2),
-	ZINNIA,
-	MUMS,
-	MARIGOLD,
-	GERANIUM,
-	AZALEA,
-	PRIMROSE,
-	ASTER,
-	CARNATION,
-	LILY,
-	YARROW,
-	PETUNIA,
-	AGAPANTHUS,
-	FUCHSIA,
-	DIANTHUS,
-	FORGET,
-	ANEMONE,
-	AQUILEGIA,
-	EDELWEISS,
-	SCABIOUS,
-	CONEFLOWER,
-	GAILLARDIA,
-	AURICULA,
-	CAMELLIA(2),
-	GOLDENROD(2),
-	ALTHEA(2),
-	PENSTEMON(2),
-	DELPHINIUM(2),
-	HOLLYHOCK(2);
+    DANDELION,
+    POPPY,
+    ORCHID,
+    ALLIUM,
+    BLUET,
+    TULIP,
+    DAISY,
+    CORNFLOWER,
+    PANSY,
+    IRIS,
+    LAVENDER(2),
+    VIOLA,
+    DAFFODIL,
+    DAHLIA,
+    PEONY(2),
+    ROSE(2),
+    LILAC(2),
+    HYDRANGEA(2),
+    FOXGLOVE(2),
+    ZINNIA,
+    MUMS,
+    MARIGOLD,
+    GERANIUM,
+    AZALEA,
+    PRIMROSE,
+    ASTER,
+    CARNATION,
+    LILY,
+    YARROW,
+    PETUNIA,
+    AGAPANTHUS,
+    FUCHSIA,
+    DIANTHUS,
+    FORGET,
+    ANEMONE,
+    AQUILEGIA,
+    EDELWEISS,
+    SCABIOUS,
+    CONEFLOWER,
+    GAILLARDIA,
+    AURICULA,
+    CAMELLIA(2),
+    GOLDENROD(2),
+    ALTHEA(2),
+    PENSTEMON(2),
+    DELPHINIUM(2),
+    HOLLYHOCK(2);
 
-	protected int sections;
-	protected IIcon[] stem;
-	protected IIcon[] petal;
-	protected IIcon[] variant;
-	protected IIcon[] unflowered;
-	protected IIcon seedStem;
-	protected IIcon seedPetal;
-	protected IIcon seedVariant;
-	protected IIcon pollenStem;
-	protected IIcon pollenPetal;
-	protected IIcon pollenVariant;
-	protected IIcon blank;
+    protected int sections;
+    protected IIcon[] stem;
+    protected IIcon[] petal;
+    protected IIcon[] variant;
+    protected IIcon[] unflowered;
+    protected IIcon seedStem;
+    protected IIcon seedPetal;
+    protected IIcon seedVariant;
+    protected IIcon pollenStem;
+    protected IIcon pollenPetal;
+    protected IIcon pollenVariant;
+    protected IIcon blank;
 
-	EnumFlowerType() {
-		this(1);
-	}
+    EnumFlowerType() {
+        this(1);
+    }
 
-	EnumFlowerType(int sections) {
-		this.sections = sections;
-		stem = new IIcon[sections];
-		petal = new IIcon[sections];
-		variant = new IIcon[sections];
-		unflowered = new IIcon[sections];
-	}
+    EnumFlowerType(int sections) {
+        this.sections = sections;
+        stem = new IIcon[sections];
+        petal = new IIcon[sections];
+        variant = new IIcon[sections];
+        unflowered = new IIcon[sections];
+    }
 
-	@Override
-	public IIcon getStem(EnumFlowerStage stage, boolean flowered, int section) {
-		if (stage == EnumFlowerStage.SEED) {
-			return seedStem;
-		}
-		if (stage == EnumFlowerStage.POLLEN) {
-			return pollenStem;
-		}
-		return stem[section % sections];
-	}
+    @Override
+    public IIcon getStem(EnumFlowerStage stage, boolean flowered, int section) {
+        if (stage == EnumFlowerStage.SEED) {
+            return seedStem;
+        }
+        if (stage == EnumFlowerStage.POLLEN) {
+            return pollenStem;
+        }
+        return stem[section % sections];
+    }
 
-	@Override
-	public IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section) {
-		if (stage == EnumFlowerStage.SEED) {
-			return seedPetal;
-		}
-		if (stage == EnumFlowerStage.POLLEN){
-			return pollenPetal;
-		}
-		if (flowered) {
-			return petal[section % sections];
-		}
-		return unflowered[section % sections];
-	}
+    @Override
+    public IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section) {
+        if (stage == EnumFlowerStage.SEED) {
+            return seedPetal;
+        }
+        if (stage == EnumFlowerStage.POLLEN) {
+            return pollenPetal;
+        }
+        if (flowered) {
+            return petal[section % sections];
+        }
+        return unflowered[section % sections];
+    }
 
-	@Override
-	public IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section) {
-		if (stage == EnumFlowerStage.SEED) {
-			return seedVariant;
-		}
-		if (stage == EnumFlowerStage.POLLEN) {
-			return pollenVariant;
-		}
-		return flowered ? variant[section % sections] : blank;
-	}
+    @Override
+    public IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section) {
+        if (stage == EnumFlowerStage.SEED) {
+            return seedVariant;
+        }
+        if (stage == EnumFlowerStage.POLLEN) {
+            return pollenVariant;
+        }
+        return flowered ? variant[section % sections] : blank;
+    }
 
-	public void registerIcons(IIconRegister register) {
-		for (int i = 0; i < sections; ++i) {
-			String suf = (i == 0) ? "" : ("" + (i + 1));
-			String pre = (sections == 1) ? "" : "double/";
-			String id = pre + toString().toLowerCase() + suf;
-			stem[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".0");
-			petal[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".1");
-			variant[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".2");
-			unflowered[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".3");
-		}
+    public void registerIcons(IIconRegister register) {
+        for (int i = 0; i < sections; ++i) {
+            String suf = (i == 0) ? "" : ("" + (i + 1));
+            String pre = (sections == 1) ? "" : "double/";
+            String id = pre + toString().toLowerCase() + suf;
+            stem[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".0");
+            petal[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".1");
+            variant[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".2");
+            unflowered[i] = Botany.proxy.getIcon(register, "flowers/" + id + ".3");
+        }
 
-		blank = Botany.proxy.getIcon(register, "flowers/blank");
-		seedStem = Botany.proxy.getIcon(register, "flowers/seed.0");
-		seedPetal = Botany.proxy.getIcon(register, "flowers/seed.1");
-		seedVariant = Botany.proxy.getIcon(register, "flowers/seed.2");
-		pollenStem = Botany.proxy.getIcon(register, "flowers/pollen.0");
-		pollenPetal = Botany.proxy.getIcon(register, "flowers/pollen.1");
-		pollenVariant = Botany.proxy.getIcon(register, "flowers/pollen.2");
-	}
+        blank = Botany.proxy.getIcon(register, "flowers/blank");
+        seedStem = Botany.proxy.getIcon(register, "flowers/seed.0");
+        seedPetal = Botany.proxy.getIcon(register, "flowers/seed.1");
+        seedVariant = Botany.proxy.getIcon(register, "flowers/seed.2");
+        pollenStem = Botany.proxy.getIcon(register, "flowers/pollen.0");
+        pollenPetal = Botany.proxy.getIcon(register, "flowers/pollen.1");
+        pollenVariant = Botany.proxy.getIcon(register, "flowers/pollen.2");
+    }
 
-	@Override
-	public int getID() {
-		return ordinal();
-	}
+    @Override
+    public int getID() {
+        return ordinal();
+    }
 
-	@Override
-	public int getSections() {
-		return sections;
-	}
+    @Override
+    public int getSections() {
+        return sections;
+    }
 
-	public IIcon getBlank() {
-		return blank;
-	}
+    public IIcon getBlank() {
+        return blank;
+    }
 }

src/main/java/binnie/botany/genetics/Flower.java

@@ -15,249 +15,265 @@ import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosome;
 import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.Individual;
+import java.util.List;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import java.util.List;
-
 public class Flower extends Individual implements IFlower {
-	public IFlowerGenome genome;
-	public IFlowerGenome mate;
+    public IFlowerGenome genome;
+    public IFlowerGenome mate;
 
-	protected int age;
-	protected boolean wilting;
-	protected boolean flowered;
+    protected int age;
+    protected boolean wilting;
+    protected boolean flowered;
 
-	public Flower(NBTTagCompound nbttagcompound) {
-		age = 0;
-		wilting = false;
-		readFromNBT(nbttagcompound);
-	}
+    public Flower(NBTTagCompound nbttagcompound) {
+        age = 0;
+        wilting = false;
+        readFromNBT(nbttagcompound);
+    }
 
-	public Flower(IFlowerGenome genome, int age) {
-		this.genome = genome;
-		this.age = age;
-		wilting = false;
-		flowered = age > 0;
-	}
+    public Flower(IFlowerGenome genome, int age) {
+        this.genome = genome;
+        this.age = age;
+        wilting = false;
+        flowered = age > 0;
+    }
 
-	@Override
-	public String getDisplayName() {
-		IAlleleFlowerSpecies species = getGenome().getPrimary();
-		String name = "";
-		if (species != null) {
-			name += species.getName();
-		}
-		return name;
-	}
+    @Override
+    public String getDisplayName() {
+        IAlleleFlowerSpecies species = getGenome().getPrimary();
+        String name = "";
+        if (species != null) {
+            name += species.getName();
+        }
+        return name;
+    }
 
-	@Override
-	public void addTooltip(List<String> list) {
-		IAlleleFlowerSpecies primary = genome.getPrimary();
-		IAlleleFlowerSpecies secondary = genome.getSecondary();
-		if (!isPureBred(EnumFlowerChromosome.SPECIES)) {
-			list.add(EnumChatFormatting.BLUE + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName()));
-		}
+    @Override
+    public void addTooltip(List<String> list) {
+        IAlleleFlowerSpecies primary = genome.getPrimary();
+        IAlleleFlowerSpecies secondary = genome.getSecondary();
+        if (!isPureBred(EnumFlowerChromosome.SPECIES)) {
+            list.add(EnumChatFormatting.BLUE
+                    + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName()));
+        }
 
-		list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.age", getAge()));
-		list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.temperature", AlleleHelper.toDisplay(primary.getTemperature()), AlleleHelper.toDisplay(genome.getToleranceTemperature())));
-		list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.moisture", AlleleHelper.toDisplay(primary.getMoisture()), AlleleHelper.toDisplay(genome.getToleranceMoisture())));
-		list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.pH", AlleleHelper.toDisplay(primary.getHumidity()), AlleleHelper.toDisplay(genome.getTolerancePH())));
-		list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.fertility", genome.getFertility()));
-	}
+        list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.age", getAge()));
+        list.add(EnumChatFormatting.GREEN
+                + I18N.localise(
+                        "botany.item.tooltip.temperature",
+                        AlleleHelper.toDisplay(primary.getTemperature()),
+                        AlleleHelper.toDisplay(genome.getToleranceTemperature())));
+        list.add(EnumChatFormatting.GREEN
+                + I18N.localise(
+                        "botany.item.tooltip.moisture",
+                        AlleleHelper.toDisplay(primary.getMoisture()),
+                        AlleleHelper.toDisplay(genome.getToleranceMoisture())));
+        list.add(EnumChatFormatting.GREEN
+                + I18N.localise(
+                        "botany.item.tooltip.pH",
+                        AlleleHelper.toDisplay(primary.getHumidity()),
+                        AlleleHelper.toDisplay(genome.getTolerancePH())));
+        list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.fertility", genome.getFertility()));
+    }
 
-	@Override
-	public String getIdent() {
-		return getGenome().getPrimary().getUID();
-	}
+    @Override
+    public String getIdent() {
+        return getGenome().getPrimary().getUID();
+    }
 
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {
-		super.readFromNBT(nbttagcompound);
-		if (nbttagcompound == null) {
-			genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
-			return;
-		}
+    @Override
+    public void readFromNBT(NBTTagCompound nbttagcompound) {
+        super.readFromNBT(nbttagcompound);
+        if (nbttagcompound == null) {
+            genome = BotanyCore.getFlowerRoot()
+                    .templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
+            return;
+        }
 
-		age = nbttagcompound.getInteger("Age");
-		wilting = nbttagcompound.getBoolean("Wilt");
-		flowered = nbttagcompound.getBoolean("Flowered");
-		if (nbttagcompound.hasKey("Genome")) {
-			genome = new FlowerGenome(nbttagcompound.getCompoundTag("Genome"));
-		}
-		if (nbttagcompound.hasKey("Mate")) {
-			mate = new FlowerGenome(nbttagcompound.getCompoundTag("Mate"));
-		}
-	}
+        age = nbttagcompound.getInteger("Age");
+        wilting = nbttagcompound.getBoolean("Wilt");
+        flowered = nbttagcompound.getBoolean("Flowered");
+        if (nbttagcompound.hasKey("Genome")) {
+            genome = new FlowerGenome(nbttagcompound.getCompoundTag("Genome"));
+        }
+        if (nbttagcompound.hasKey("Mate")) {
+            mate = new FlowerGenome(nbttagcompound.getCompoundTag("Mate"));
+        }
+    }
 
-	@Override
-	public void writeToNBT(NBTTagCompound nbttagcompound) {
-		super.writeToNBT(nbttagcompound);
-		nbttagcompound.setInteger("Age", age);
-		nbttagcompound.setBoolean("Wilt", wilting);
-		nbttagcompound.setBoolean("Flowered", flowered);
+    @Override
+    public void writeToNBT(NBTTagCompound nbttagcompound) {
+        super.writeToNBT(nbttagcompound);
+        nbttagcompound.setInteger("Age", age);
+        nbttagcompound.setBoolean("Wilt", wilting);
+        nbttagcompound.setBoolean("Flowered", flowered);
 
-		if (genome != null) {
-			NBTTagCompound NBTmachine = new NBTTagCompound();
-			genome.writeToNBT(NBTmachine);
-			nbttagcompound.setTag("Genome", NBTmachine);
-		}
+        if (genome != null) {
+            NBTTagCompound NBTmachine = new NBTTagCompound();
+            genome.writeToNBT(NBTmachine);
+            nbttagcompound.setTag("Genome", NBTmachine);
+        }
 
-		if (mate != null) {
-			NBTTagCompound NBTmachine = new NBTTagCompound();
-			mate.writeToNBT(NBTmachine);
-			nbttagcompound.setTag("Mate", NBTmachine);
-		}
-	}
+        if (mate != null) {
+            NBTTagCompound NBTmachine = new NBTTagCompound();
+            mate.writeToNBT(NBTmachine);
+            nbttagcompound.setTag("Mate", NBTmachine);
+        }
+    }
 
-	public int getMetadata() {
-		return 0;
-	}
+    public int getMetadata() {
+        return 0;
+    }
 
-	@Override
-	public IFlowerGenome getGenome() {
-		return genome;
-	}
+    @Override
+    public IFlowerGenome getGenome() {
+        return genome;
+    }
 
-	@Override
-	public void mate(IFlower other) {
-		mate = new FlowerGenome(other.getGenome().getChromosomes());
-	}
+    @Override
+    public void mate(IFlower other) {
+        mate = new FlowerGenome(other.getGenome().getChromosomes());
+    }
 
-	@Override
-	public IFlowerGenome getMate() {
-		return mate;
-	}
+    @Override
+    public IFlowerGenome getMate() {
+        return mate;
+    }
 
-	@Override
-	public IFlower copy() {
-		NBTTagCompound nbttagcompound = new NBTTagCompound();
-		writeToNBT(nbttagcompound);
-		return new Flower(nbttagcompound);
-	}
+    @Override
+    public IFlower copy() {
+        NBTTagCompound nbttagcompound = new NBTTagCompound();
+        writeToNBT(nbttagcompound);
+        return new Flower(nbttagcompound);
+    }
 
-	@Override
-	public int getAge() {
-		return age;
-	}
+    @Override
+    public int getAge() {
+        return age;
+    }
 
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
+    @Override
+    public void setAge(int age) {
+        this.age = age;
+    }
 
-	@Override
-	public void age() {
-		if (age < 15) {
-			age++;
-		}
-	}
+    @Override
+    public void age() {
+        if (age < 15) {
+            age++;
+        }
+    }
 
-	@Override
-	public int getMaxAge() {
-		return getGenome().getLifespan();
-	}
+    @Override
+    public int getMaxAge() {
+        return getGenome().getLifespan();
+    }
 
-	@Override
-	public boolean isWilted() {
-		return wilting;
-	}
+    @Override
+    public boolean isWilted() {
+        return wilting;
+    }
 
-	@Override
-	public void setWilted(boolean value) {
-		wilting = value;
-	}
+    @Override
+    public void setWilted(boolean value) {
+        wilting = value;
+    }
 
-	@Override
-	public boolean hasFlowered() {
-		return flowered;
-	}
+    @Override
+    public boolean hasFlowered() {
+        return flowered;
+    }
 
-	@Override
-	public void setFlowered(boolean value) {
-		flowered = value;
-	}
+    @Override
+    public void setFlowered(boolean value) {
+        flowered = value;
+    }
 
-	@Override
-	public void removeMate() {
-		mate = null;
-	}
+    @Override
+    public void removeMate() {
+        mate = null;
+    }
 
-	@Override
-	public IFlower getOffspring(World world) {
-		IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length];
-		IChromosome[] parent1 = mutateSpecies(world, genome, mate);
-		IChromosome[] parent2 = mutateSpecies(world, mate, genome);
-		for (int i = 0; i < parent1.length; ++i) {
-			if (parent1[i] != null && parent2[i] != null) {
-				chromosomes[i] = Chromosome.inheritChromosome(world.rand, parent1[i], parent2[i]);
-			}
-		}
-		return new Flower(new FlowerGenome(chromosomes), 0);
-	}
+    @Override
+    public IFlower getOffspring(World world) {
+        IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length];
+        IChromosome[] parent1 = mutateSpecies(world, genome, mate);
+        IChromosome[] parent2 = mutateSpecies(world, mate, genome);
+        for (int i = 0; i < parent1.length; ++i) {
+            if (parent1[i] != null && parent2[i] != null) {
+                chromosomes[i] = Chromosome.inheritChromosome(world.rand, parent1[i], parent2[i]);
+            }
+        }
+        return new Flower(new FlowerGenome(chromosomes), 0);
+    }
 
-	private IChromosome[] mutateSpecies(World world, IFlowerGenome genomeOne, IFlowerGenome genomeTwo) {
-		IChromosome[] parent1 = genomeOne.getChromosomes();
-		IChromosome[] parent2 = genomeTwo.getChromosomes();
-		IAllele allele0;
-		IAllele allele2;
-		IFlowerGenome genome0;
-		IFlowerGenome genome2;
+    private IChromosome[] mutateSpecies(World world, IFlowerGenome genomeOne, IFlowerGenome genomeTwo) {
+        IChromosome[] parent1 = genomeOne.getChromosomes();
+        IChromosome[] parent2 = genomeTwo.getChromosomes();
+        IAllele allele0;
+        IAllele allele2;
+        IFlowerGenome genome0;
+        IFlowerGenome genome2;
 
-		if (world.rand.nextBoolean()) {
-			allele0 = parent1[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele();
-			allele2 = parent2[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele();
-			genome0 = genomeOne;
-			genome2 = genomeTwo;
-		} else {
-			allele0 = parent2[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele();
-			allele2 = parent1[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele();
-			genome0 = genomeTwo;
-			genome2 = genomeOne;
-		}
+        if (world.rand.nextBoolean()) {
+            allele0 = parent1[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele();
+            allele2 = parent2[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele();
+            genome0 = genomeOne;
+            genome2 = genomeTwo;
+        } else {
+            allele0 = parent2[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele();
+            allele2 = parent1[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele();
+            genome0 = genomeTwo;
+            genome2 = genomeOne;
+        }
 
-		IFlowerColor colour1 = genome0.getPrimaryColor();
-		IFlowerColor colour2 = genome2.getPrimaryColor();
-		if (colour1 != colour2) {
-			for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
-				if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-					parent1[EnumFlowerChromosome.PRIMARY.ordinal()] = new Chromosome(mutation.getResult().getAllele());
-				}
-			}
-		}
+        IFlowerColor colour1 = genome0.getPrimaryColor();
+        IFlowerColor colour2 = genome2.getPrimaryColor();
+        if (colour1 != colour2) {
+            for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+                if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
+                    parent1[EnumFlowerChromosome.PRIMARY.ordinal()] =
+                            new Chromosome(mutation.getResult().getAllele());
+                }
+            }
+        }
 
-		colour1 = genome0.getSecondaryColor();
-		colour2 = genome2.getSecondaryColor();
-		if (colour1 != colour2) {
-			for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
-				if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-					parent1[EnumFlowerChromosome.SECONDARY.ordinal()] = new Chromosome(mutation.getResult().getAllele());
-				}
-			}
-		}
+        colour1 = genome0.getSecondaryColor();
+        colour2 = genome2.getSecondaryColor();
+        if (colour1 != colour2) {
+            for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+                if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
+                    parent1[EnumFlowerChromosome.SECONDARY.ordinal()] =
+                            new Chromosome(mutation.getResult().getAllele());
+                }
+            }
+        }
 
-		colour1 = genome0.getStemColor();
-		colour2 = genome2.getStemColor();
-		if (colour1 != colour2) {
-			for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
-				if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
-					parent1[EnumFlowerChromosome.STEM.ordinal()] = new Chromosome(mutation.getResult().getAllele());
-				}
-			}
-		}
+        colour1 = genome0.getStemColor();
+        colour2 = genome2.getStemColor();
+        if (colour1 != colour2) {
+            for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+                if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) {
+                    parent1[EnumFlowerChromosome.STEM.ordinal()] =
+                            new Chromosome(mutation.getResult().getAllele());
+                }
+            }
+        }
 
-		IChromosome[] template = null;
-		for (IFlowerMutation mutation2 : BotanyCore.getFlowerRoot().getMutations(true)) {
-			float chance = mutation2.getChance(allele0, allele2, genome0, genome2);
-			if (chance > 0.0f && world.rand.nextFloat() * 100.0f < chance && template == null) {
-				template = BotanyCore.getFlowerRoot().templateAsChromosomes(mutation2.getTemplate());
-			}
-		}
+        IChromosome[] template = null;
+        for (IFlowerMutation mutation2 : BotanyCore.getFlowerRoot().getMutations(true)) {
+            float chance = mutation2.getChance(allele0, allele2, genome0, genome2);
+            if (chance > 0.0f && world.rand.nextFloat() * 100.0f < chance && template == null) {
+                template = BotanyCore.getFlowerRoot().templateAsChromosomes(mutation2.getTemplate());
+            }
+        }
 
-		if (template != null) {
-			parent1 = template;
-		}
-		return parent1;
-	}
+        if (template != null) {
+            parent1 = template;
+        }
+        return parent1;
+    }
 }

src/main/java/binnie/botany/genetics/FlowerGenome.java

@@ -19,112 +19,110 @@ import forestry.core.genetics.Genome;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class FlowerGenome extends Genome implements IFlowerGenome {
-	public FlowerGenome(NBTTagCompound nbttagcompound) {
-		super(nbttagcompound);
-	}
+    public FlowerGenome(NBTTagCompound nbttagcompound) {
+        super(nbttagcompound);
+    }
 
-	public FlowerGenome(IChromosome[] chromosomes) {
-		super(chromosomes);
-	}
+    public FlowerGenome(IChromosome[] chromosomes) {
+        super(chromosomes);
+    }
 
-	@Override
-	public IAlleleFlowerSpecies getPrimary() {
-		return (IAlleleFlowerSpecies) getChromosomes()[EnumFlowerChromosome.SPECIES.ordinal()].getPrimaryAllele();
-	}
+    @Override
+    public IAlleleFlowerSpecies getPrimary() {
+        return (IAlleleFlowerSpecies) getChromosomes()[EnumFlowerChromosome.SPECIES.ordinal()].getPrimaryAllele();
+    }
 
-	@Override
-	public IAlleleFlowerSpecies getSecondary() {
-		return (IAlleleFlowerSpecies) getChromosomes()[EnumFlowerChromosome.SPECIES.ordinal()].getSecondaryAllele();
-	}
+    @Override
+    public IAlleleFlowerSpecies getSecondary() {
+        return (IAlleleFlowerSpecies) getChromosomes()[EnumFlowerChromosome.SPECIES.ordinal()].getSecondaryAllele();
+    }
 
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return BotanyCore.getFlowerRoot();
-	}
+    @Override
+    public ISpeciesRoot getSpeciesRoot() {
+        return BotanyCore.getFlowerRoot();
+    }
 
-	@Override
-	public EnumFlowerColor getPrimaryColor() {
-		return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.PRIMARY)).getColor();
-	}
+    @Override
+    public EnumFlowerColor getPrimaryColor() {
+        return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.PRIMARY)).getColor();
+    }
 
-	@Override
-	public EnumFlowerColor getSecondaryColor() {
-		return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.SECONDARY)).getColor();
-	}
+    @Override
+    public EnumFlowerColor getSecondaryColor() {
+        return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.SECONDARY)).getColor();
+    }
 
-	@Override
-	public EnumFlowerColor getStemColor() {
-		return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.STEM)).getColor();
-	}
+    @Override
+    public EnumFlowerColor getStemColor() {
+        return ((AlleleColor) getActiveAllele(EnumFlowerChromosome.STEM)).getColor();
+    }
 
-	@Override
-	public int getFertility() {
-		return ((IAlleleInteger) getActiveAllele(EnumFlowerChromosome.FERTILITY)).getValue();
-	}
+    @Override
+    public int getFertility() {
+        return ((IAlleleInteger) getActiveAllele(EnumFlowerChromosome.FERTILITY)).getValue();
+    }
 
-	@Override
-	public int getLifespan() {
-		return ((IAlleleInteger) getActiveAllele(EnumFlowerChromosome.LIFESPAN)).getValue() / 5;
-	}
+    @Override
+    public int getLifespan() {
+        return ((IAlleleInteger) getActiveAllele(EnumFlowerChromosome.LIFESPAN)).getValue() / 5;
+    }
 
-	@Override
-	public IFlowerType getType() {
-		return getPrimary().getType();
-	}
+    @Override
+    public IFlowerType getType() {
+        return getPrimary().getType();
+    }
 
-	@Override
-	public EnumTolerance getToleranceTemperature() {
-		return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.TEMPERATURE_TOLERANCE)).getValue();
-	}
+    @Override
+    public EnumTolerance getToleranceTemperature() {
+        return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.TEMPERATURE_TOLERANCE)).getValue();
+    }
 
-	@Override
-	public EnumTolerance getToleranceMoisture() {
-		return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.HUMIDITY_TOLERANCE)).getValue();
-	}
+    @Override
+    public EnumTolerance getToleranceMoisture() {
+        return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.HUMIDITY_TOLERANCE)).getValue();
+    }
 
-	@Override
-	public EnumTolerance getTolerancePH() {
-		return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.PH_TOLERANCE)).getValue();
-	}
+    @Override
+    public EnumTolerance getTolerancePH() {
+        return ((IAlleleTolerance) getActiveAllele(EnumFlowerChromosome.PH_TOLERANCE)).getValue();
+    }
 
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {
-		super.readFromNBT(nbttagcompound);
-	}
+    @Override
+    public void readFromNBT(NBTTagCompound nbttagcompound) {
+        super.readFromNBT(nbttagcompound);
+    }
 
-	@Override
-	public float getAgeChance() {
-		return 1.0f * (float) Math.sqrt(2.0f / getLifespan());
-	}
+    @Override
+    public float getAgeChance() {
+        return 1.0f * (float) Math.sqrt(2.0f / getLifespan());
+    }
 
-	@Override
-	public float getSappiness() {
-		return ((IAlleleFloat) getActiveAllele(EnumFlowerChromosome.SAPPINESS)).getValue();
-	}
+    @Override
+    public float getSappiness() {
+        return ((IAlleleFloat) getActiveAllele(EnumFlowerChromosome.SAPPINESS)).getValue();
+    }
 
-	@Override
-	public boolean canTolerate(EnumAcidity ePH) {
-		int pH = ePH.ordinal();
-		int[] pHTol = Binnie.Genetics.getTolerance(getTolerancePH());
-		int fPH = getPrimary().getPH().ordinal();
-		return pH >= fPH + pHTol[0] && pH <= fPH + pHTol[1];
-	}
+    @Override
+    public boolean canTolerate(EnumAcidity ePH) {
+        int pH = ePH.ordinal();
+        int[] pHTol = Binnie.Genetics.getTolerance(getTolerancePH());
+        int fPH = getPrimary().getPH().ordinal();
+        return pH >= fPH + pHTol[0] && pH <= fPH + pHTol[1];
+    }
 
-	@Override
-	public boolean canTolerate(EnumMoisture eMoisture) {
-		int moisture = eMoisture.ordinal();
-		int[] moistTol = Binnie.Genetics.getTolerance(getToleranceMoisture());
-		int fMoisture = getPrimary().getMoisture().ordinal();
-		return moisture >= fMoisture + moistTol[0]
-			&& moisture <= fMoisture + moistTol[1];
-	}
+    @Override
+    public boolean canTolerate(EnumMoisture eMoisture) {
+        int moisture = eMoisture.ordinal();
+        int[] moistTol = Binnie.Genetics.getTolerance(getToleranceMoisture());
+        int fMoisture = getPrimary().getMoisture().ordinal();
+        return moisture >= fMoisture + moistTol[0] && moisture <= fMoisture + moistTol[1];
+    }
 
-	@Override
-	public boolean canTolerate(EnumTemperature eTemp) {
-		int temp = eTemp.ordinal();
-		int[] tempTol = Binnie.Genetics.getTolerance(getToleranceTemperature());
-		int fTemp = getPrimary().getTemperature().ordinal();
-		return temp >= fTemp + tempTol[0]
-			&& temp <= fTemp + tempTol[1];
-	}
+    @Override
+    public boolean canTolerate(EnumTemperature eTemp) {
+        int temp = eTemp.ordinal();
+        int[] tempTol = Binnie.Genetics.getTolerance(getToleranceTemperature());
+        int fTemp = getPrimary().getTemperature().ordinal();
+        return temp >= fTemp + tempTol[0] && temp <= fTemp + tempTol[1];
+    }
 }

src/main/java/binnie/botany/genetics/FlowerHelper.java

@@ -18,257 +18,261 @@ import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IMutation;
 import forestry.api.genetics.ISpeciesType;
 import forestry.core.genetics.SpeciesRoot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
 
 public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
-	public static int flowerSpeciesCount = -1;
-	public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
+    public static int flowerSpeciesCount = -1;
+    public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
 
-	protected static String UID = "rootFlowers";
+    protected static String UID = "rootFlowers";
 
-	private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
-	private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
+    private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
+    private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
 
-	protected Map<ItemStack, IFlower> conversions;
+    protected Map<ItemStack, IFlower> conversions;
 
-	public FlowerHelper() {
-		conversions = new HashMap<>();
-	}
+    public FlowerHelper() {
+        conversions = new HashMap<>();
+    }
 
-	@Override
-	public String getUID() {
-		return UID;
-	}
+    @Override
+    public String getUID() {
+        return UID;
+    }
 
-	@Override
-	public int getSpeciesCount() {
-		if (FlowerHelper.flowerSpeciesCount < 0) {
-			FlowerHelper.flowerSpeciesCount = 0;
-			for (Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
-				if (entry.getValue() instanceof IAlleleFlowerSpecies && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) {
-					FlowerHelper.flowerSpeciesCount++;
-				}
-			}
-		}
-		return FlowerHelper.flowerSpeciesCount;
-	}
+    @Override
+    public int getSpeciesCount() {
+        if (FlowerHelper.flowerSpeciesCount < 0) {
+            FlowerHelper.flowerSpeciesCount = 0;
+            for (Map.Entry<String, IAllele> entry :
+                    AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
+                if (entry.getValue() instanceof IAlleleFlowerSpecies
+                        && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) {
+                    FlowerHelper.flowerSpeciesCount++;
+                }
+            }
+        }
+        return FlowerHelper.flowerSpeciesCount;
+    }
 
-	@Override
-	public boolean isMember(ItemStack stack) {
-		return stack != null
-			&& getStageType(stack) != EnumFlowerStage.NONE;
-	}
+    @Override
+    public boolean isMember(ItemStack stack) {
+        return stack != null && getStageType(stack) != EnumFlowerStage.NONE;
+    }
 
-	@Override
-	public boolean isMember(ItemStack stack, int type) {
-		return getStageType(stack).ordinal() == type;
-	}
+    @Override
+    public boolean isMember(ItemStack stack, int type) {
+        return getStageType(stack).ordinal() == type;
+    }
 
-	@Override
-	public boolean isMember(IIndividual individual) {
-		return individual instanceof IFlower;
-	}
+    @Override
+    public boolean isMember(IIndividual individual) {
+        return individual instanceof IFlower;
+    }
 
-	@Override
-	public ItemStack getMemberStack(IIndividual flower, int type) {
-		if (!isMember(flower)) {
-			return null;
-		}
+    @Override
+    public ItemStack getMemberStack(IIndividual flower, int type) {
+        if (!isMember(flower)) {
+            return null;
+        }
 
-		Item flowerItem = Botany.flowerItem;
-		if (type == EnumFlowerStage.SEED.ordinal()) {
-			flowerItem = Botany.seed;
-		}
+        Item flowerItem = Botany.flowerItem;
+        if (type == EnumFlowerStage.SEED.ordinal()) {
+            flowerItem = Botany.seed;
+        }
 
-		if (type == EnumFlowerStage.POLLEN.ordinal()) {
-			flowerItem = Botany.pollen;
-		}
+        if (type == EnumFlowerStage.POLLEN.ordinal()) {
+            flowerItem = Botany.pollen;
+        }
 
-		if (flowerItem != Botany.flowerItem) {
-			((IFlower) flower).setAge(0);
-		}
+        if (flowerItem != Botany.flowerItem) {
+            ((IFlower) flower).setAge(0);
+        }
 
-		NBTTagCompound nbttagcompound = new NBTTagCompound();
-		flower.writeToNBT(nbttagcompound);
-		ItemStack flowerStack = new ItemStack(flowerItem);
-		flowerStack.setTagCompound(nbttagcompound);
-		return flowerStack;
-	}
+        NBTTagCompound nbttagcompound = new NBTTagCompound();
+        flower.writeToNBT(nbttagcompound);
+        ItemStack flowerStack = new ItemStack(flowerItem);
+        flowerStack.setTagCompound(nbttagcompound);
+        return flowerStack;
+    }
 
-	@Override
-	public EnumFlowerStage getStageType(ItemStack stack) {
-		if (stack == null) {
-			return EnumFlowerStage.NONE;
-		}
-		if (stack.getItem() == Botany.flowerItem) {
-			return EnumFlowerStage.FLOWER;
-		}
-		if (stack.getItem() == Botany.pollen) {
-			return EnumFlowerStage.POLLEN;
-		}
-		if (stack.getItem() == Botany.seed) {
-			return EnumFlowerStage.SEED;
-		}
-		return EnumFlowerStage.NONE;
-	}
+    @Override
+    public EnumFlowerStage getStageType(ItemStack stack) {
+        if (stack == null) {
+            return EnumFlowerStage.NONE;
+        }
+        if (stack.getItem() == Botany.flowerItem) {
+            return EnumFlowerStage.FLOWER;
+        }
+        if (stack.getItem() == Botany.pollen) {
+            return EnumFlowerStage.POLLEN;
+        }
+        if (stack.getItem() == Botany.seed) {
+            return EnumFlowerStage.SEED;
+        }
+        return EnumFlowerStage.NONE;
+    }
 
-	@Override
-	public IFlower getMember(ItemStack stack) {
-		if (!isMember(stack)) {
-			return null;
-		}
-		return new Flower(stack.getTagCompound());
-	}
+    @Override
+    public IFlower getMember(ItemStack stack) {
+        if (!isMember(stack)) {
+            return null;
+        }
+        return new Flower(stack.getTagCompound());
+    }
 
-	@Override
-	public IFlower getFlower(World world, IFlowerGenome genome) {
-		return new Flower(genome, 2);
-	}
+    @Override
+    public IFlower getFlower(World world, IFlowerGenome genome) {
+        return new Flower(genome, 2);
+    }
 
-	@Override
-	public IFlowerGenome templateAsGenome(IAllele[] template) {
-		return new FlowerGenome(templateAsChromosomes(template));
-	}
+    @Override
+    public IFlowerGenome templateAsGenome(IAllele[] template) {
+        return new FlowerGenome(templateAsChromosomes(template));
+    }
 
-	@Override
-	public IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) {
-		return new FlowerGenome(templateAsChromosomes(templateActive, templateInactive));
-	}
+    @Override
+    public IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) {
+        return new FlowerGenome(templateAsChromosomes(templateActive, templateInactive));
+    }
 
-	@Override
-	public IFlower templateAsIndividual(IAllele[] template) {
-		return new Flower(templateAsGenome(template), 2);
-	}
+    @Override
+    public IFlower templateAsIndividual(IAllele[] template) {
+        return new Flower(templateAsGenome(template), 2);
+    }
 
-	@Override
-	public IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) {
-		return new Flower(templateAsGenome(templateActive, templateInactive), 2);
-	}
+    @Override
+    public IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) {
+        return new Flower(templateAsGenome(templateActive, templateInactive), 2);
+    }
 
-	@Override
-	public ArrayList<IFlower> getIndividualTemplates() {
-		return FlowerHelper.flowerTemplates;
-	}
+    @Override
+    public ArrayList<IFlower> getIndividualTemplates() {
+        return FlowerHelper.flowerTemplates;
+    }
 
-	@Override
-	public void registerTemplate(IAllele[] template) {
-		registerTemplate(template[0].getUID(), template);
-	}
+    @Override
+    public void registerTemplate(IAllele[] template) {
+        registerTemplate(template[0].getUID(), template);
+    }
 
-	@Override
-	public void registerTemplate(String identifier, IAllele[] template) {
-		FlowerHelper.flowerTemplates.add(new Flower(templateAsGenome(template), 2));
-		if (!speciesTemplates.containsKey(identifier)) {
-			speciesTemplates.put(identifier, template);
-		}
-	}
+    @Override
+    public void registerTemplate(String identifier, IAllele[] template) {
+        FlowerHelper.flowerTemplates.add(new Flower(templateAsGenome(template), 2));
+        if (!speciesTemplates.containsKey(identifier)) {
+            speciesTemplates.put(identifier, template);
+        }
+    }
 
-	@Override
-	public IAllele[] getTemplate(String identifier) {
-		return speciesTemplates.get(identifier);
-	}
+    @Override
+    public IAllele[] getTemplate(String identifier) {
+        return speciesTemplates.get(identifier);
+    }
 
-	@Override
-	public IAllele[] getDefaultTemplate() {
-		return FlowerTemplates.getDefaultTemplate();
-	}
+    @Override
+    public IAllele[] getDefaultTemplate() {
+        return FlowerTemplates.getDefaultTemplate();
+    }
 
-	@Override
-	public IAllele[] getRandomTemplate(Random rand) {
-		return speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(speciesTemplates.values().size())];
-	}
+    @Override
+    public IAllele[] getRandomTemplate(Random rand) {
+        return speciesTemplates.values()
+                .toArray(new IAllele[0][])[
+                rand.nextInt(speciesTemplates.values().size())];
+    }
 
-	@Override
-	public Collection<IFlowerMutation> getMutations(boolean shuffle) {
-		if (shuffle) {
-			Collections.shuffle(FlowerHelper.flowerMutations);
-		}
-		return FlowerHelper.flowerMutations;
-	}
+    @Override
+    public Collection<IFlowerMutation> getMutations(boolean shuffle) {
+        if (shuffle) {
+            Collections.shuffle(FlowerHelper.flowerMutations);
+        }
+        return FlowerHelper.flowerMutations;
+    }
 
-	@Override
-	public void registerMutation(IMutation mutation) {
-		if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID()) ||
-			AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID()) ||
-			AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) {
-			return;
-		}
-		FlowerHelper.flowerMutations.add((IFlowerMutation) mutation);
-	}
+    @Override
+    public void registerMutation(IMutation mutation) {
+        if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())
+                || AlleleManager.alleleRegistry.isBlacklisted(
+                        mutation.getAllele0().getUID())
+                || AlleleManager.alleleRegistry.isBlacklisted(
+                        mutation.getAllele1().getUID())) {
+            return;
+        }
+        FlowerHelper.flowerMutations.add((IFlowerMutation) mutation);
+    }
 
-	@Override
-	public IBotanistTracker getBreedingTracker(World world, GameProfile player) {
-		String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId());
-		BotanistTracker tracker = (BotanistTracker) world.loadItemData(BotanistTracker.class, filename);
-		if (tracker == null) {
-			tracker = new BotanistTracker(filename);
-			world.setItemData(filename, tracker);
-		}
-		return tracker;
-	}
+    @Override
+    public IBotanistTracker getBreedingTracker(World world, GameProfile player) {
+        String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId());
+        BotanistTracker tracker = (BotanistTracker) world.loadItemData(BotanistTracker.class, filename);
+        if (tracker == null) {
+            tracker = new BotanistTracker(filename);
+            world.setItemData(filename, tracker);
+        }
+        return tracker;
+    }
 
-	@Override
-	public IIndividual getMember(NBTTagCompound compound) {
-		return new Flower(compound);
-	}
+    @Override
+    public IIndividual getMember(NBTTagCompound compound) {
+        return new Flower(compound);
+    }
 
-	@Override
-	public Class getMemberClass() {
-		return IFlower.class;
-	}
+    @Override
+    public Class getMemberClass() {
+        return IFlower.class;
+    }
 
-	@Override
-	public IChromosomeType[] getKaryotype() {
-		return EnumFlowerChromosome.values();
-	}
+    @Override
+    public IChromosomeType[] getKaryotype() {
+        return EnumFlowerChromosome.values();
+    }
 
-	@Override
-	public IChromosomeType getKaryotypeKey() {
-		return EnumFlowerChromosome.SPECIES;
-	}
+    @Override
+    public IChromosomeType getKaryotypeKey() {
+        return EnumFlowerChromosome.SPECIES;
+    }
 
-	@Override
-	public void addConversion(ItemStack stack, IAllele[] template) {
-		IFlower flower = getFlower(null, templateAsGenome(template));
-		conversions.put(stack, flower);
-	}
+    @Override
+    public void addConversion(ItemStack stack, IAllele[] template) {
+        IFlower flower = getFlower(null, templateAsGenome(template));
+        conversions.put(stack, flower);
+    }
 
-	@Override
-	public IFlower getConversion(ItemStack stack) {
-		for (Map.Entry<ItemStack, IFlower> entry : conversions.entrySet()) {
-			if (entry.getKey().isItemEqual(stack)) {
-				return (IFlower) entry.getValue().copy();
-			}
-		}
-		return null;
-	}
+    @Override
+    public IFlower getConversion(ItemStack stack) {
+        for (Map.Entry<ItemStack, IFlower> entry : conversions.entrySet()) {
+            if (entry.getKey().isItemEqual(stack)) {
+                return (IFlower) entry.getValue().copy();
+            }
+        }
+        return null;
+    }
 
-	@Override
-	public void registerColourMix(IColourMix colorMix) {
-		FlowerHelper.colourMixes.add(colorMix);
-	}
+    @Override
+    public void registerColourMix(IColourMix colorMix) {
+        FlowerHelper.colourMixes.add(colorMix);
+    }
 
-	@Override
-	public Collection<IColourMix> getColourMixes(boolean shuffle) {
-		if (shuffle) {
-			Collections.shuffle(FlowerHelper.colourMixes);
-		}
-		return FlowerHelper.colourMixes;
-	}
+    @Override
+    public Collection<IColourMix> getColourMixes(boolean shuffle) {
+        if (shuffle) {
+            Collections.shuffle(FlowerHelper.colourMixes);
+        }
+        return FlowerHelper.colourMixes;
+    }
 
-	// ??
-	@Override
-	public ISpeciesType getType(ItemStack stack) {
-		return null;
-	}
+    // ??
+    @Override
+    public ISpeciesType getType(ItemStack stack) {
+        return null;
+    }
 }

src/main/java/binnie/botany/genetics/FlowerMutation.java

@@ -6,80 +6,80 @@ import binnie.botany.core.BotanyCore;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IGenome;
 import forestry.api.genetics.ISpeciesRoot;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
 public class FlowerMutation implements IFlowerMutation {
-	protected IAlleleFlowerSpecies allele0;
-	protected IAlleleFlowerSpecies allele1;
-	protected IAllele[] template;
-	protected int chance;
+    protected IAlleleFlowerSpecies allele0;
+    protected IAlleleFlowerSpecies allele1;
+    protected IAllele[] template;
+    protected int chance;
 
-	FlowerMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] template, int chance) {
-		this.allele0 = allele0;
-		this.allele1 = allele1;
-		this.template = template;
-		this.chance = chance;
-	}
+    FlowerMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] template, int chance) {
+        this.allele0 = allele0;
+        this.allele1 = allele1;
+        this.template = template;
+        this.chance = chance;
+    }
 
-	@Override
-	public IAlleleFlowerSpecies getAllele0() {
-		return allele0;
-	}
+    @Override
+    public IAlleleFlowerSpecies getAllele0() {
+        return allele0;
+    }
 
-	@Override
-	public IAlleleFlowerSpecies getAllele1() {
-		return allele1;
-	}
+    @Override
+    public IAlleleFlowerSpecies getAllele1() {
+        return allele1;
+    }
 
-	@Override
-	public IAllele[] getTemplate() {
-		return template;
-	}
+    @Override
+    public IAllele[] getTemplate() {
+        return template;
+    }
 
-	@Override
-	public float getBaseChance() {
-		return chance;
-	}
+    @Override
+    public float getBaseChance() {
+        return chance;
+    }
 
-	@Override
-	public boolean isPartner(IAllele allele) {
-		return allele.getUID().equals(allele0.getUID())
-			|| allele.getUID().equals(allele1.getUID());
-	}
+    @Override
+    public boolean isPartner(IAllele allele) {
+        return allele.getUID().equals(allele0.getUID()) || allele.getUID().equals(allele1.getUID());
+    }
 
-	@Override
-	public IAllele getPartner(IAllele allele) {
-		return allele.getUID().equals(allele0.getUID()) ? allele1 : allele0;
-	}
+    @Override
+    public IAllele getPartner(IAllele allele) {
+        return allele.getUID().equals(allele0.getUID()) ? allele1 : allele0;
+    }
 
-	@Override
-	public boolean isSecret() {
-		return false;
-	}
+    @Override
+    public boolean isSecret() {
+        return false;
+    }
 
-	@Override
-	public float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
-		if (allele0 == null || allele1 == null) {
-			return 0.0f;
-		}
-		if (this.allele0.getUID().equals(allele0.getUID()) && this.allele1.getUID().equals(allele1.getUID())) {
-			return getBaseChance();
-		}
-		if (this.allele1.getUID().equals(allele0.getUID()) && this.allele0.getUID().equals(allele1.getUID())) {
-			return getBaseChance();
-		}
-		return 0.0f;
-	}
+    @Override
+    public float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) {
+        if (allele0 == null || allele1 == null) {
+            return 0.0f;
+        }
+        if (this.allele0.getUID().equals(allele0.getUID())
+                && this.allele1.getUID().equals(allele1.getUID())) {
+            return getBaseChance();
+        }
+        if (this.allele1.getUID().equals(allele0.getUID())
+                && this.allele0.getUID().equals(allele1.getUID())) {
+            return getBaseChance();
+        }
+        return 0.0f;
+    }
 
-	@Override
-	public ISpeciesRoot getRoot() {
-		return BotanyCore.getFlowerRoot();
-	}
+    @Override
+    public ISpeciesRoot getRoot() {
+        return BotanyCore.getFlowerRoot();
+    }
 
-	@Override
-	public Collection<String> getSpecialConditions() {
-		return new ArrayList<>();
-	}
+    @Override
+    public Collection<String> getSpecialConditions() {
+        return new ArrayList<>();
+    }
 }

src/main/java/binnie/botany/genetics/FlowerTemplates.java

@@ -7,20 +7,20 @@ import forestry.api.genetics.IAllele;
 import forestry.core.genetics.alleles.EnumAllele;
 
 public class FlowerTemplates {
-	public static IAllele[] getDefaultTemplate() {
-		IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
-		alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
-		alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
-		alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
-		alleles[EnumFlowerChromosome.FERTILITY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Fertility.NORMAL);
-		alleles[EnumFlowerChromosome.TERRITORY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Territory.AVERAGE);
-		alleles[EnumFlowerChromosome.EFFECT.ordinal()] = ModuleGenetics.alleleEffectNone;
-		alleles[EnumFlowerChromosome.LIFESPAN.ordinal()] = AlleleHelper.getAllele(EnumAllele.Lifespan.NORMAL);
-		alleles[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
-		alleles[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
-		alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
-		alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
-		alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
-		return alleles;
-	}
+    public static IAllele[] getDefaultTemplate() {
+        IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
+        alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
+        alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
+        alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
+        alleles[EnumFlowerChromosome.FERTILITY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Fertility.NORMAL);
+        alleles[EnumFlowerChromosome.TERRITORY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Territory.AVERAGE);
+        alleles[EnumFlowerChromosome.EFFECT.ordinal()] = ModuleGenetics.alleleEffectNone;
+        alleles[EnumFlowerChromosome.LIFESPAN.ordinal()] = AlleleHelper.getAllele(EnumAllele.Lifespan.NORMAL);
+        alleles[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
+        alleles[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
+        alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
+        alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
+        alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
+        return alleles;
+    }
 }

src/main/java/binnie/botany/genetics/ItemDictionary.java

@@ -6,6 +6,7 @@ import binnie.botany.core.BotanyGUI;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,54 +15,52 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import java.util.List;
-
 public class ItemDictionary extends Item {
-	protected IIcon iconMaster;
+    protected IIcon iconMaster;
 
-	public ItemDictionary() {
-		setCreativeTab(CreativeTabBotany.instance);
-		setUnlocalizedName("database");
-		setMaxStackSize(1);
-	}
+    public ItemDictionary() {
+        setCreativeTab(CreativeTabBotany.instance);
+        setUnlocalizedName("database");
+        setMaxStackSize(1);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		itemIcon = Botany.proxy.getIcon(register, "botanistDatabase");
-		iconMaster = Botany.proxy.getIcon(register, "masterBotanistDatabase");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        itemIcon = Botany.proxy.getIcon(register, "botanistDatabase");
+        iconMaster = Botany.proxy.getIcon(register, "masterBotanistDatabase");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int damage) {
-		return (damage == 0) ? itemIcon : iconMaster;
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int damage) {
+        return (damage == 0) ? itemIcon : iconMaster;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+        super.addInformation(stack, player, tooltip, advanced);
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		super.getSubItems(item, tab, list);
-		list.add(new ItemStack(item, 1, 1));
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
+        super.getSubItems(item, tab, list);
+        list.add(new ItemStack(item, 1, 1));
+    }
 
-	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-		BotanyGUI guiId = (stack.getItemDamage() == 0) ? BotanyGUI.Database : BotanyGUI.DatabaseNEI;
-		Botany.proxy.openGui(guiId, player, (int) player.posX, (int) player.posY, (int) player.posZ);
-		return stack;
-	}
+    @Override
+    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+        BotanyGUI guiId = (stack.getItemDamage() == 0) ? BotanyGUI.Database : BotanyGUI.DatabaseNEI;
+        Botany.proxy.openGui(guiId, player, (int) player.posX, (int) player.posY, (int) player.posZ);
+        return stack;
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return (stack.getItemDamage() == 0)
-			? I18N.localise("botany.item.database.0.name")
-			: I18N.localise("botany.item.database.1.name");
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return (stack.getItemDamage() == 0)
+                ? I18N.localise("botany.item.database.0.name")
+                : I18N.localise("botany.item.database.1.name");
+    }
 }

src/main/java/binnie/botany/genetics/ModuleGenetics.java

@@ -22,56 +22,63 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 public class ModuleGenetics implements IInitializable {
-	static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
+    static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
 
-	@Override
-	public void preInit() {
-		EnumFlowerColor.setupMutations();
-		Botany.flower = new BlockFlower();
-		Botany.flowerItem = new ItemFlower();
-		Botany.pollen = new ItemPollen();
-		Botany.seed = new ItemSeed();
-		AlleleManager.alleleRegistry.registerSpeciesRoot(BotanyCore.speciesRoot);
-		AlleleManager.alleleRegistry.registerAllele(ModuleGenetics.alleleEffectNone);
-		GameRegistry.registerBlock(Botany.flower, "flower");
-		BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null);
-		Botany.database = new ItemDictionary();
-	}
+    @Override
+    public void preInit() {
+        EnumFlowerColor.setupMutations();
+        Botany.flower = new BlockFlower();
+        Botany.flowerItem = new ItemFlower();
+        Botany.pollen = new ItemPollen();
+        Botany.seed = new ItemSeed();
+        AlleleManager.alleleRegistry.registerSpeciesRoot(BotanyCore.speciesRoot);
+        AlleleManager.alleleRegistry.registerAllele(ModuleGenetics.alleleEffectNone);
+        GameRegistry.registerBlock(Botany.flower, "flower");
+        BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null);
+        Botany.database = new ItemDictionary();
+    }
 
-	@Override
-	public void init() {
-		for (EnumFlowerColor color : EnumFlowerColor.values()) {
-			AlleleManager.alleleRegistry.registerAllele(color.getAllele());
-		}
+    @Override
+    public void init() {
+        for (EnumFlowerColor color : EnumFlowerColor.values()) {
+            AlleleManager.alleleRegistry.registerAllele(color.getAllele());
+        }
 
-		FlowerSpecies.setupVariants();
-		for (FlowerSpecies species : FlowerSpecies.values()) {
-			AlleleManager.alleleRegistry.registerAllele(species);
-			BotanyCore.getFlowerRoot().registerTemplate(species.getUID(), species.getTemplate());
-			for (IAllele[] variant : species.getVariants()) {
-				BotanyCore.getFlowerRoot().registerTemplate(variant);
-			}
-		}
+        FlowerSpecies.setupVariants();
+        for (FlowerSpecies species : FlowerSpecies.values()) {
+            AlleleManager.alleleRegistry.registerAllele(species);
+            BotanyCore.getFlowerRoot().registerTemplate(species.getUID(), species.getTemplate());
+            for (IAllele[] variant : species.getVariants()) {
+                BotanyCore.getFlowerRoot().registerTemplate(variant);
+            }
+        }
 
-		RendererBotany.renderID = RenderingRegistry.getNextAvailableRenderId();
-		BinnieCore.proxy.registerBlockRenderer(new RendererBotany());
-	}
+        RendererBotany.renderID = RenderingRegistry.getNextAvailableRenderId();
+        BinnieCore.proxy.registerBlockRenderer(new RendererBotany());
+    }
 
-	@Override
-	public void postInit() {
-		FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla");
-		RecipeManagers.carpenterManager.addRecipe(
-			100,
-			Binnie.Liquid.getLiquidStack("water", 2000),
-			null,
-			new ItemStack(Botany.database),
-			"X#X", "YEY", "RDR",
-			'#', Blocks.glass_pane,
-			'X', Items.gold_ingot,
-			'Y', Items.gold_nugget,
-			'R', Items.redstone,
-			'D', Items.diamond,
-			'E', Items.emerald
-		);
-	}
+    @Override
+    public void postInit() {
+        FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla");
+        RecipeManagers.carpenterManager.addRecipe(
+                100,
+                Binnie.Liquid.getLiquidStack("water", 2000),
+                null,
+                new ItemStack(Botany.database),
+                "X#X",
+                "YEY",
+                "RDR",
+                '#',
+                Blocks.glass_pane,
+                'X',
+                Items.gold_ingot,
+                'Y',
+                Items.gold_nugget,
+                'R',
+                Items.redstone,
+                'D',
+                Items.diamond,
+                'E',
+                Items.emerald);
+    }
 }

src/main/java/binnie/botany/items/BotanyItems.java

@@ -3,58 +3,57 @@ package binnie.botany.items;
 import binnie.botany.Botany;
 import binnie.core.item.IItemMisc;
 import binnie.core.util.I18N;
+import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import java.util.List;
-
 public enum BotanyItems implements IItemMisc {
-	AshPowder("powderAsh"),
-	PulpPowder("powderPulp"),
-	MulchPowder("powderMulch"),
-	SulphurPowder("powderSulphur"),
-	FertiliserPowder("powderFertiliser"),
-	CompostPowder("powderCompost"),
-	Mortar("mortar"),
-	Weedkiller("weedkiller");
+    AshPowder("powderAsh"),
+    PulpPowder("powderPulp"),
+    MulchPowder("powderMulch"),
+    SulphurPowder("powderSulphur"),
+    FertiliserPowder("powderFertiliser"),
+    CompostPowder("powderCompost"),
+    Mortar("mortar"),
+    Weedkiller("weedkiller");
 
-	protected IIcon icon;
-	protected String name;
-	protected String iconPath;
+    protected IIcon icon;
+    protected String name;
+    protected String iconPath;
 
-	BotanyItems(String name) {
-		this.name = name;
-		this.iconPath = name;
-	}
+    BotanyItems(String name) {
+        this.name = name;
+        this.iconPath = name;
+    }
 
-	@Override
-	public IIcon getIcon(ItemStack itemStack) {
-		return icon;
-	}
+    @Override
+    public IIcon getIcon(ItemStack itemStack) {
+        return icon;
+    }
 
-	@Override
-	public void registerIcons(IIconRegister register) {
-		icon = Botany.proxy.getIcon(register, iconPath);
-	}
+    @Override
+    public void registerIcons(IIconRegister register) {
+        icon = Botany.proxy.getIcon(register, iconPath);
+    }
 
-	@Override
-	public void addInformation(List data) {
-		// ignored
-	}
+    @Override
+    public void addInformation(List data) {
+        // ignored
+    }
 
-	@Override
-	public String getName(ItemStack itemStack) {
-		return I18N.localise("botany.item." + name + ".name");
-	}
+    @Override
+    public String getName(ItemStack itemStack) {
+        return I18N.localise("botany.item." + name + ".name");
+    }
 
-	@Override
-	public ItemStack get(int count) {
-		return new ItemStack(Botany.misc, count, ordinal());
-	}
+    @Override
+    public ItemStack get(int count) {
+        return new ItemStack(Botany.misc, count, ordinal());
+    }
 
-	@Override
-	public boolean isActive() {
-		return true;
-	}
+    @Override
+    public boolean isActive() {
+        return true;
+    }
 }

src/main/java/binnie/botany/items/ItemClay.java

@@ -6,6 +6,7 @@ import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,44 +14,43 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.List;
-
 public class ItemClay extends Item {
-	public ItemClay() {
-		setUnlocalizedName("clay");
-		setHasSubtypes(true);
-		setCreativeTab(CreativeTabBotany.instance);
-	}
+    public ItemClay() {
+        setUnlocalizedName("clay");
+        setHasSubtypes(true);
+        setCreativeTab(CreativeTabBotany.instance);
+    }
 
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
-	}
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+        super.addInformation(stack, player, tooltip, advanced);
+        tooltip.add(EnumChatFormatting.GRAY
+                + EnumFlowerColor.get(stack.getItemDamage()).getName());
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack stack, int index) {
-		int damage = stack.getItemDamage();
-		return EnumFlowerColor.get(damage).getColor(false);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack stack, int index) {
+        int damage = stack.getItemDamage();
+        return EnumFlowerColor.get(damage).getColor(false);
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return I18N.localise("botany.item.clay.name");
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return I18N.localise("botany.item.clay.name");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			list.add(new ItemStack(this, 1, c.ordinal()));
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            list.add(new ItemStack(this, 1, c.ordinal()));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		itemIcon = Botany.proxy.getIcon(register, "clay");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        itemIcon = Botany.proxy.getIcon(register, "clay");
+    }
 }

src/main/java/binnie/botany/items/ItemPigment.java

@@ -6,6 +6,7 @@ import binnie.botany.genetics.EnumFlowerColor;
 import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,44 +14,43 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.List;
-
 public class ItemPigment extends Item {
-	public ItemPigment() {
-		setUnlocalizedName("pigment");
-		setHasSubtypes(true);
-		setCreativeTab(CreativeTabBotany.instance);
-	}
+    public ItemPigment() {
+        setUnlocalizedName("pigment");
+        setHasSubtypes(true);
+        setCreativeTab(CreativeTabBotany.instance);
+    }
 
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
-		super.addInformation(stack, player, tooltip, advanced);
-		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName());
-	}
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) {
+        super.addInformation(stack, player, tooltip, advanced);
+        tooltip.add(EnumChatFormatting.GRAY
+                + EnumFlowerColor.get(stack.getItemDamage()).getName());
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack stack, int index) {
-		int damage = stack.getItemDamage();
-		return EnumFlowerColor.get(damage).getColor(false);
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack stack, int index) {
+        int damage = stack.getItemDamage();
+        return EnumFlowerColor.get(damage).getColor(false);
+    }
 
-	@Override
-	public String getItemStackDisplayName(ItemStack stack) {
-		return I18N.localise("botany.item.pigment.name");
-	}
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        return I18N.localise("botany.item.pigment.name");
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			list.add(new ItemStack(this, 1, c.ordinal()));
-		}
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs tab, List list) {
+        for (EnumFlowerColor c : EnumFlowerColor.values()) {
+            list.add(new ItemStack(this, 1, c.ordinal()));
+        }
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister register) {
-		itemIcon = Botany.proxy.getIcon(register, "pigment");
-	}
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister register) {
+        itemIcon = Botany.proxy.getIcon(register, "pigment");
+    }
 }

src/main/java/binnie/botany/network/MessageFlowerUpdate.java

@@ -6,45 +6,44 @@ import binnie.botany.genetics.EnumFlowerType;
 import binnie.core.network.packet.MessageBinnie;
 import binnie.core.network.packet.MessageCoordinates;
 import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;
 
 public class MessageFlowerUpdate extends MessageCoordinates {
-	public TileEntityFlower.RenderInfo render;
+    public TileEntityFlower.RenderInfo render;
 
-	public MessageFlowerUpdate(int posX, int posY, int posZ, TileEntityFlower.RenderInfo render) {
-		super(PacketID.FlowerUpdate.ordinal(), posX, posY, posZ);
-		this.render = render;
-	}
+    public MessageFlowerUpdate(int posX, int posY, int posZ, TileEntityFlower.RenderInfo render) {
+        super(PacketID.FlowerUpdate.ordinal(), posX, posY, posZ);
+        this.render = render;
+    }
 
-	public MessageFlowerUpdate(MessageBinnie message) {
-		super(message);
-	}
+    public MessageFlowerUpdate(MessageBinnie message) {
+        super(message);
+    }
 
-	@Override
-	public void writeData(ByteBuf data) throws IOException {
-		super.writeData(data);
-		data.writeByte(render.primary.getID());
-		data.writeByte(render.secondary.getID());
-		data.writeByte(render.stem.getID());
-		data.writeByte(render.type.ordinal());
-		data.writeByte(render.age);
-		data.writeByte(render.section);
-		data.writeBoolean(render.wilted);
-		data.writeBoolean(render.flowered);
-	}
+    @Override
+    public void writeData(ByteBuf data) throws IOException {
+        super.writeData(data);
+        data.writeByte(render.primary.getID());
+        data.writeByte(render.secondary.getID());
+        data.writeByte(render.stem.getID());
+        data.writeByte(render.type.ordinal());
+        data.writeByte(render.age);
+        data.writeByte(render.section);
+        data.writeBoolean(render.wilted);
+        data.writeBoolean(render.flowered);
+    }
 
-	@Override
-	public void readData(ByteBuf data) throws IOException {
-		super.readData(data);
-		render = new TileEntityFlower.RenderInfo();
-		render.primary = EnumFlowerColor.values()[data.readByte()];
-		render.secondary = EnumFlowerColor.values()[data.readByte()];
-		render.stem = EnumFlowerColor.values()[data.readByte()];
-		render.type = EnumFlowerType.values()[data.readByte()];
-		render.age = data.readByte();
-		render.section = data.readByte();
-		render.wilted = data.readBoolean();
-		render.flowered = data.readBoolean();
-	}
+    @Override
+    public void readData(ByteBuf data) throws IOException {
+        super.readData(data);
+        render = new TileEntityFlower.RenderInfo();
+        render.primary = EnumFlowerColor.values()[data.readByte()];
+        render.secondary = EnumFlowerColor.values()[data.readByte()];
+        render.stem = EnumFlowerColor.values()[data.readByte()];
+        render.type = EnumFlowerType.values()[data.readByte()];
+        render.age = data.readByte();
+        render.section = data.readByte();
+        render.wilted = data.readBoolean();
+        render.flowered = data.readBoolean();
+    }
 }

src/main/java/binnie/botany/network/PacketID.java

@@ -17,74 +17,76 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
 
 public enum PacketID implements IPacketID {
-	FieldKit,
-	FlowerUpdate;
+    FieldKit,
+    FlowerUpdate;
 
-	@Override
-	public void onMessage(MessageBinnie message, MessageContext context) {
-		if (this == PacketID.FieldKit && context.side == Side.CLIENT) {
-			onFieldKitPacket(message);
-		} else if (this == PacketID.FlowerUpdate) {
-			onFlowerUpdatePacket(message);
-		}
-	}
+    @Override
+    public void onMessage(MessageBinnie message, MessageContext context) {
+        if (this == PacketID.FieldKit && context.side == Side.CLIENT) {
+            onFieldKitPacket(message);
+        } else if (this == PacketID.FlowerUpdate) {
+            onFlowerUpdatePacket(message);
+        }
+    }
 
-	private void onFlowerUpdatePacket(MessageBinnie message) {
-		MessageFlowerUpdate packet = new MessageFlowerUpdate(message);
-		TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
-		if (tile instanceof TileEntityFlower) {
-			((TileEntityFlower) tile).setRender(packet.render);
-		}
-	}
+    private void onFlowerUpdatePacket(MessageBinnie message) {
+        MessageFlowerUpdate packet = new MessageFlowerUpdate(message);
+        TileEntity tile = packet.getTileEntity(BinnieCore.proxy.getWorld());
+        if (tile instanceof TileEntityFlower) {
+            ((TileEntityFlower) tile).setRender(packet.render);
+        }
+    }
 
-	private void onFieldKitPacket(MessageBinnie message) {
-		MessageNBT packet = new MessageNBT(message);
-		NBTTagCompound data = packet.getTagCompound();
-		EntityPlayer player = BinnieCore.proxy.getPlayer();
-		String info = "";
-		if (data.hasNoTags()) {
-			info += "Flower has not been discovered by you. Breed this flower yourself to discover.";
-		} else {
-			IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
-			IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
-			float age = data.getFloat("Age");
-			EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour"));
-			EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2"));
-			if (primary == null || secondary == null) {
-				return;
-			}
+    private void onFieldKitPacket(MessageBinnie message) {
+        MessageNBT packet = new MessageNBT(message);
+        NBTTagCompound data = packet.getTagCompound();
+        EntityPlayer player = BinnieCore.proxy.getPlayer();
+        String info = "";
+        if (data.hasNoTags()) {
+            info += "Flower has not been discovered by you. Breed this flower yourself to discover.";
+        } else {
+            IAlleleFlowerSpecies primary =
+                    (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species"));
+            IAlleleFlowerSpecies secondary =
+                    (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2"));
+            float age = data.getFloat("Age");
+            EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour"));
+            EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2"));
+            if (primary == null || secondary == null) {
+                return;
+            }
 
-			info += "A";
-			if (age == 0.0f) {
-				info += "";
-			} else if (age < 0.25f) {
-				info += " Young";
-			} else if (age < 0.75f) {
-				info += " Mature";
-			} else {
-				info += " Old";
-			}
+            info += "A";
+            if (age == 0.0f) {
+                info += "";
+            } else if (age < 0.25f) {
+                info += " Young";
+            } else if (age < 0.75f) {
+                info += " Mature";
+            } else {
+                info += " Old";
+            }
 
-			if (color1 == color2) {
-				info = info + " " + color1.getName();
-			} else {
-				info = info + " " + color1.getName() + " & " + color2.getName();
-			}
+            if (color1 == color2) {
+                info = info + " " + color1.getName();
+            } else {
+                info = info + " " + color1.getName() + " & " + color2.getName();
+            }
 
-			if (primary == secondary) {
-				info = info + " " + primary.getName();
-			} else {
-				info = info + " " + primary.getName() + "-" + secondary.getName() + " Hybrid";
-			}
+            if (primary == secondary) {
+                info = info + " " + primary.getName();
+            } else {
+                info = info + " " + primary.getName() + "-" + secondary.getName() + " Hybrid";
+            }
 
-			if (age == 0.0f) {
-				info += " Germling";
-			}
-			if (data.getBoolean("Wilting")) {
-				info += ". Shame it is Wilting!";
-			}
-		}
-		IChatComponent chat = new ChatComponentText(info);
-		player.addChatMessage(chat);
-	}
+            if (age == 0.0f) {
+                info += " Germling";
+            }
+            if (data.getBoolean("Wilting")) {
+                info += ". Shame it is Wilting!";
+            }
+        }
+        IChatComponent chat = new ChatComponentText(info);
+        player.addChatMessage(chat);
+    }
 }

src/main/java/binnie/botany/proxy/IBotanyProxy.java

@@ -2,5 +2,4 @@ package binnie.botany.proxy;
 
 import binnie.core.proxy.IProxyCore;
 
-public interface IBotanyProxy extends IProxyCore {
-}
+public interface IBotanyProxy extends IProxyCore {}

src/main/java/binnie/botany/proxy/Proxy.java

@@ -4,7 +4,7 @@ import binnie.botany.Botany;
 import binnie.core.proxy.BinnieModProxy;
 
 public class Proxy extends BinnieModProxy implements IBotanyProxy {
-	public Proxy() {
-		super(Botany.instance);
-	}
+    public Proxy() {
+        super(Botany.instance);
+    }
 }

src/main/java/binnie/botany/proxy/ProxyClient.java

@@ -1,4 +1,3 @@
 package binnie.botany.proxy;
 
-public class ProxyClient extends Proxy implements IBotanyProxy {
-}
+public class ProxyClient extends Proxy implements IBotanyProxy {}

src/main/java/binnie/botany/proxy/ProxyServer.java

@@ -1,4 +1,3 @@
 package binnie.botany.proxy;
 
-public class ProxyServer extends Proxy implements IBotanyProxy {
-}
+public class ProxyServer extends Proxy implements IBotanyProxy {}

src/main/java/binnie/core/AbstractMod.java

@@ -11,133 +11,132 @@ import binnie.core.proxy.IProxyCore;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
-import net.minecraftforge.common.MinecraftForge;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import net.minecraftforge.common.MinecraftForge;
 
 public abstract class AbstractMod implements IPacketProvider, IInitializable {
-	private SimpleNetworkWrapper wrapper;
-	private final LinkedHashSet<Field> fields;
-	protected final List<IInitializable> modules;
+    private SimpleNetworkWrapper wrapper;
+    private final LinkedHashSet<Field> fields;
+    protected final List<IInitializable> modules;
 
-	public AbstractMod() {
-		fields = new LinkedHashSet<>();
-		modules = new ArrayList<>();
-		BinnieCore.registerMod(this);
-		MinecraftForge.EVENT_BUS.register(this);
-	}
+    public AbstractMod() {
+        fields = new LinkedHashSet<>();
+        modules = new ArrayList<>();
+        BinnieCore.registerMod(this);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
 
-	public abstract boolean isActive();
+    public abstract boolean isActive();
 
-	@Override
-	public abstract String getChannel();
+    @Override
+    public abstract String getChannel();
 
-	@Override
-	public IPacketID[] getPacketIDs() {
-		return new IPacketID[0];
-	}
+    @Override
+    public IPacketID[] getPacketIDs() {
+        return new IPacketID[0];
+    }
 
-	public IBinnieGUID[] getGUIDs() {
-		return new IBinnieGUID[0];
-	}
+    public IBinnieGUID[] getGUIDs() {
+        return new IBinnieGUID[0];
+    }
 
-	public Class[] getConfigs() {
-		return new Class[0];
-	}
+    public Class[] getConfigs() {
+        return new Class[0];
+    }
 
-	public abstract IProxyCore getProxy();
+    public abstract IProxyCore getProxy();
 
-	public abstract String getModID();
+    public abstract String getModID();
 
-	public SimpleNetworkWrapper getNetworkWrapper() {
-		return wrapper;
-	}
+    public SimpleNetworkWrapper getNetworkWrapper() {
+        return wrapper;
+    }
 
-	protected abstract Class<? extends BinniePacketHandler> getPacketHandler();
+    protected abstract Class<? extends BinniePacketHandler> getPacketHandler();
 
-	@Override
-	public void preInit() {
-		if (!isActive()) {
-			return;
-		}
+    @Override
+    public void preInit() {
+        if (!isActive()) {
+            return;
+        }
 
-		if (getConfigs() != null) {
-			for (Class cls : getConfigs()) {
-				Binnie.Configuration.registerConfiguration(cls, this);
-			}
-		}
+        if (getConfigs() != null) {
+            for (Class cls : getConfigs()) {
+                Binnie.Configuration.registerConfiguration(cls, this);
+            }
+        }
 
-		getProxy().preInit();
-		for (IInitializable module : modules) {
-			module.preInit();
-		}
-		
-		// TODO what does it mean?
-		Collections.addAll(fields, getClass().getFields());
-		for (Class cls : getClass().getClasses()) {
-			Collections.addAll(fields, getClass().getFields());
-		}
-		for (IInitializable module : modules) {
-			Collections.addAll(fields, module.getClass().getFields());
-		}
-		for (Field field4 : fields) {
-			try {
-				FieldParser.preInitParse(field4, this);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
+        getProxy().preInit();
+        for (IInitializable module : modules) {
+            module.preInit();
+        }
 
-	@Override
-	public void init() {
-		if (!isActive()) {
-			return;
-		}
-		getProxy().init();
+        // TODO what does it mean?
+        Collections.addAll(fields, getClass().getFields());
+        for (Class cls : getClass().getClasses()) {
+            Collections.addAll(fields, getClass().getFields());
+        }
+        for (IInitializable module : modules) {
+            Collections.addAll(fields, module.getClass().getFields());
+        }
+        for (Field field4 : fields) {
+            try {
+                FieldParser.preInitParse(field4, this);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 
-		wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(getChannel());
-		wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT);
-		wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.SERVER);
-		for (IInitializable module : modules) {
-			module.init();
-		}
+    @Override
+    public void init() {
+        if (!isActive()) {
+            return;
+        }
+        getProxy().init();
 
-		for (Field field : fields) {
-			try {
-				FieldParser.initParse(field, this);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
+        wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(getChannel());
+        wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT);
+        wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.SERVER);
+        for (IInitializable module : modules) {
+            module.init();
+        }
 
-	@Override
-	public void postInit() {
-		if (!isActive()) {
-			return;
-		}
+        for (Field field : fields) {
+            try {
+                FieldParser.initParse(field, this);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 
-		getProxy().postInit();
-		for (IInitializable module : modules) {
-			module.postInit();
-		}
+    @Override
+    public void postInit() {
+        if (!isActive()) {
+            return;
+        }
 
-		for (Field field : fields) {
-			try {
-				FieldParser.postInitParse(field, this);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
+        getProxy().postInit();
+        for (IInitializable module : modules) {
+            module.postInit();
+        }
 
-	protected void addModule(IInitializable init) {
-		modules.add(init);
-		MinecraftForge.EVENT_BUS.register(init);
-	}
+        for (Field field : fields) {
+            try {
+                FieldParser.postInitParse(field, this);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    protected void addModule(IInitializable init) {
+        modules.add(init);
+        MinecraftForge.EVENT_BUS.register(init);
+    }
 }

src/main/java/binnie/core/BinnieCore.java

@@ -38,191 +38,199 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.ForestryEvent;
 import forestry.plugins.PluginManager;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.client.event.TextureStitchEvent;
 
-import java.util.ArrayList;
-import java.util.List;
-
-@Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true, dependencies = "after:Forestry@[4.2,)")
+@Mod(
+        modid = "BinnieCore",
+        name = "Binnie Core",
+        version = BinnieCore.VERSION,
+        useMetadata = true,
+        dependencies = "after:Forestry@[4.2,)")
 public class BinnieCore extends AbstractMod {
-	@Mod.Instance("BinnieCore")
-	public static BinnieCore instance;
-	@SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
-	public static BinnieProxy proxy;
-	public static int multipassRenderID;
-	private static List<AbstractMod> modList = new ArrayList<>();
-	public static MachineGroup packageCompartment;
-	public static ItemGenesis genesis;
-	public static ItemFieldKit fieldKit;
+    @Mod.Instance("BinnieCore")
+    public static BinnieCore instance;
 
-	@Mod.EventHandler
-	public void preInit(FMLPreInitializationEvent evt) {
-		Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
-		for (ManagerBase baseManager : Binnie.Managers) {
-			addModule(baseManager);
-		}
+    @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
+    public static BinnieProxy proxy;
 
-		addModule(new ModuleCraftGUI());
-		addModule(new ModuleStorage());
-		addModule(new ModuleItems());
-		if (Loader.isModLoaded("BuildCraft|Silicon")) {
-			addModule(new ModuleTrigger());
-		}
-		preInit();
-	}
+    public static int multipassRenderID;
+    private static List<AbstractMod> modList = new ArrayList<>();
+    public static MachineGroup packageCompartment;
+    public static ItemGenesis genesis;
+    public static ItemFieldKit fieldKit;
+    public static final String VERSION = "GRADLETOKEN_VERSION";
 
-	@Mod.EventHandler
-	public void init(FMLInitializationEvent evt) {
-		init();
-	}
+    @Mod.EventHandler
+    public void preInit(FMLPreInitializationEvent evt) {
+        Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
+        for (ManagerBase baseManager : Binnie.Managers) {
+            addModule(baseManager);
+        }
 
-	@Mod.EventHandler
-	public void postInit(FMLPostInitializationEvent evt) {
-		postInit();
-	}
+        addModule(new ModuleCraftGUI());
+        addModule(new ModuleStorage());
+        addModule(new ModuleItems());
+        if (Loader.isModLoaded("BuildCraft|Silicon")) {
+            addModule(new ModuleTrigger());
+        }
+        preInit();
+    }
 
-	@Override
-	public IBinnieGUID[] getGUIDs() {
-		return BinnieCoreGUI.values();
-	}
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent evt) {
+        init();
+    }
 
-	@Override
-	public void preInit() {
-		BinnieCore.instance = this;
-		for (FluidContainer container : FluidContainer.values()) {
-			Item item = new ItemFluidContainer(container);
-			GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
-		}
-		FieldParser.parsers.add(new ItemParser());
-		super.preInit();
-	}
+    @Mod.EventHandler
+    public void postInit(FMLPostInitializationEvent evt) {
+        postInit();
+    }
 
-	@Override
-	public void init() {
-		super.init();
-		for (AbstractMod mod : getActiveMods()) {
-			NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
-		}
+    @Override
+    public IBinnieGUID[] getGUIDs() {
+        return BinnieCoreGUI.values();
+    }
 
-		BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
-		RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
-		GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
-	}
+    @Override
+    public void preInit() {
+        instance = this;
+        for (FluidContainer container : FluidContainer.values()) {
+            Item item = new ItemFluidContainer(container);
+            GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
+        }
+        FieldParser.parsers.add(new ItemParser());
+        super.preInit();
+    }
 
-	public static boolean isLepidopteryActive() {
-		return PluginManager.Module.LEPIDOPTEROLOGY.isEnabled();
-	}
+    @Override
+    public void init() {
+        super.init();
+        for (AbstractMod mod : getActiveMods()) {
+            NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
+        }
 
-	public static boolean isApicultureActive() {
-		return PluginManager.Module.APICULTURE.isEnabled();
-	}
+        multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
+        GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
+    }
 
-	public static boolean isArboricultureActive() {
-		return PluginManager.Module.ARBORICULTURE.isEnabled();
-	}
+    public static boolean isLepidopteryActive() {
+        return PluginManager.Module.LEPIDOPTEROLOGY.isEnabled();
+    }
 
-	public static boolean isBotanyActive() {
-		return ConfigurationMods.botany;
-	}
+    public static boolean isApicultureActive() {
+        return PluginManager.Module.APICULTURE.isEnabled();
+    }
 
-	public static boolean isGeneticsActive() {
-		return ConfigurationMods.genetics;
-	}
+    public static boolean isArboricultureActive() {
+        return PluginManager.Module.ARBORICULTURE.isEnabled();
+    }
 
-	public static boolean isExtraBeesActive() {
-		return ConfigurationMods.extraBees && isApicultureActive();
-	}
+    public static boolean isBotanyActive() {
+        return ConfigurationMods.botany;
+    }
 
-	public static boolean isExtraTreesActive() {
-		return ConfigurationMods.extraTrees && isArboricultureActive();
-	}
+    public static boolean isGeneticsActive() {
+        return ConfigurationMods.genetics;
+    }
 
-	@Override
-	public void postInit() {
-		super.postInit();
-	}
+    public static boolean isExtraBeesActive() {
+        return ConfigurationMods.extraBees && isApicultureActive();
+    }
 
-	static void registerMod(AbstractMod mod) {
-		BinnieCore.modList.add(mod);
-	}
+    public static boolean isExtraTreesActive() {
+        return ConfigurationMods.extraTrees && isArboricultureActive();
+    }
 
-	private static List<AbstractMod> getActiveMods() {
-		List<AbstractMod> list = new ArrayList<>();
-		for (AbstractMod mod : BinnieCore.modList) {
-			if (mod.isActive()) {
-				list.add(mod);
-			}
-		}
-		return list;
-	}
+    @Override
+    public void postInit() {
+        super.postInit();
+    }
 
-	@SubscribeEvent
-	@SideOnly(Side.CLIENT)
-	public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
-		try {
-			EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName());
-			if (player == null) {
-				return;
-			}
-			event.tracker.synchToPlayer(player);
-			NBTTagCompound nbt = new NBTTagCompound();
-			nbt.setString("species", event.species.getUID());
-		} catch (Exception ex) {
-			// ignored
-		}
-	}
+    static void registerMod(AbstractMod mod) {
+        modList.add(mod);
+    }
 
-	@Override
-	public String getChannel() {
-		return "BIN";
-	}
+    private static List<AbstractMod> getActiveMods() {
+        List<AbstractMod> list = new ArrayList<>();
+        for (AbstractMod mod : modList) {
+            if (mod.isActive()) {
+                list.add(mod);
+            }
+        }
+        return list;
+    }
 
-	@Override
-	public IBinnieProxy getProxy() {
-		return BinnieCore.proxy;
-	}
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) {
+        try {
+            EntityPlayerMP player =
+                    MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName());
+            if (player == null) {
+                return;
+            }
+            event.tracker.synchToPlayer(player);
+            NBTTagCompound nbt = new NBTTagCompound();
+            nbt.setString("species", event.species.getUID());
+        } catch (Exception ex) {
+            // ignored
+        }
+    }
 
-	@Override
-	public String getModID() {
-		return "binniecore";
-	}
+    @Override
+    public String getChannel() {
+        return "BIN";
+    }
 
-	@Override
-	public IPacketID[] getPacketIDs() {
-		return BinnieCorePacketID.values();
-	}
+    @Override
+    public IBinnieProxy getProxy() {
+        return proxy;
+    }
 
-	@SubscribeEvent
-	@SideOnly(Side.CLIENT)
-	public void handleTextureRemap(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() == 0) {
-			Binnie.Liquid.reloadIcons(event.map);
-		}
-		Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
-	}
+    @Override
+    public String getModID() {
+        return "binniecore";
+    }
 
-	@Override
-	public Class<?>[] getConfigs() {
-		return new Class[]{ConfigurationMain.class};
-	}
+    @Override
+    public IPacketID[] getPacketIDs() {
+        return BinnieCorePacketID.values();
+    }
 
-	@Override
-	protected Class<? extends BinniePacketHandler> getPacketHandler() {
-		return PacketHandler.class;
-	}
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    public void handleTextureRemap(TextureStitchEvent.Pre event) {
+        if (event.map.getTextureType() == 0) {
+            Binnie.Liquid.reloadIcons(event.map);
+        }
+        Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
+    }
 
-	@Override
-	public boolean isActive() {
-		return true;
-	}
+    @Override
+    public Class<?>[] getConfigs() {
+        return new Class[] {ConfigurationMain.class};
+    }
 
-	public static class PacketHandler extends BinniePacketHandler {
-		public PacketHandler() {
-			super(BinnieCore.instance);
-		}
-	}
+    @Override
+    protected Class<? extends BinniePacketHandler> getPacketHandler() {
+        return PacketHandler.class;
+    }
+
+    @Override
+    public boolean isActive() {
+        return true;
+    }
+
+    public static class PacketHandler extends BinniePacketHandler {
+        public PacketHandler() {
+            super(instance);
+        }
+    }
 }

src/main/java/binnie/core/IInitializable.java

@@ -1,9 +1,9 @@
 package binnie.core;
 
 public interface IInitializable {
-	void preInit();
+    void preInit();
 
-	void init();
+    void init();
 
-	void postInit();
+    void postInit();
 }

src/main/java/binnie/core/ManagerBase.java

@@ -3,22 +3,22 @@ package binnie.core;
 import binnie.Binnie;
 
 public abstract class ManagerBase implements IInitializable {
-	public ManagerBase() {
-		Binnie.Managers.add(this);
-	}
+    public ManagerBase() {
+        Binnie.Managers.add(this);
+    }
 
-	@Override
-	public void preInit() {
-		// ignored
-	}
+    @Override
+    public void preInit() {
+        // ignored
+    }
 
-	@Override
-	public void init() {
-		// ignored
-	}
+    @Override
+    public void init() {
+        // ignored
+    }
 
-	@Override
-	public void postInit() {
-		// ignored
-	}
+    @Override
+    public void postInit() {
+        // ignored
+    }
 }

src/main/java/binnie/core/Mods.java

@@ -7,69 +7,69 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public class Mods {
-	public static Mod forestry;
-	public static Mod ic2;
-	public static Mod botania;
+    public static Mod forestry;
+    public static Mod ic2;
+    public static Mod botania;
 
-	private static Item findItem(String modId, String name) {
-		Item stack = GameRegistry.findItem(modId, name);
-		if (stack == null && modId.equals("Forestry")) {
-			throw new RuntimeException("Item not found: " + modId + ":" + name);
-		}
-		return stack;
-	}
+    private static Item findItem(String modId, String name) {
+        Item stack = GameRegistry.findItem(modId, name);
+        if (stack == null && modId.equals("Forestry")) {
+            throw new RuntimeException("Item not found: " + modId + ":" + name);
+        }
+        return stack;
+    }
 
-	private static ItemStack findItemStack(String modId, String name, int stackSize) {
-		ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
-		if (stack == null && modId.equals("Forestry")) {
-			throw new RuntimeException("Stack not found: " + modId + ":" + name);
-		}
-		return stack;
-	}
+    private static ItemStack findItemStack(String modId, String name, int stackSize) {
+        ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize);
+        if (stack == null && modId.equals("Forestry")) {
+            throw new RuntimeException("Stack not found: " + modId + ":" + name);
+        }
+        return stack;
+    }
 
-	private static Block findBlock(String modId, String name) {
-		Block stack = GameRegistry.findBlock(modId, name);
-		if (stack == null && modId.equals("Forestry")) {
-			throw new RuntimeException("Block not found: " + modId + ":" + name);
-		}
-		return stack;
-	}
+    private static Block findBlock(String modId, String name) {
+        Block stack = GameRegistry.findBlock(modId, name);
+        if (stack == null && modId.equals("Forestry")) {
+            throw new RuntimeException("Block not found: " + modId + ":" + name);
+        }
+        return stack;
+    }
 
-	static {
-		Mods.forestry = new Mod("Forestry");
-		Mods.ic2 = new Mod("IC2");
-		Mods.botania = new Mod("Botania");
-	}
+    static {
+        Mods.forestry = new Mod("Forestry");
+        Mods.ic2 = new Mod("IC2");
+        Mods.botania = new Mod("Botania");
+    }
 
-	public static class Mod {
-		private String id;
+    public static class Mod {
+        private String id;
 
-		private Mod(String id) {
-			this.id = id;
-		}
+        private Mod(String id) {
+            this.id = id;
+        }
 
-		public Item item(String name) {
-			return findItem(id, name);
-		}
+        public Item item(String name) {
+            return findItem(id, name);
+        }
 
-		public Block block(String name) {
-			return findBlock(id, name);
-		}
+        public Block block(String name) {
+            return findBlock(id, name);
+        }
 
-		public ItemStack stack(String name, int stackSize) {
-			return findItemStack(id, name, stackSize);
-		}
+        public ItemStack stack(String name, int stackSize) {
+            return findItemStack(id, name, stackSize);
+        }
 
-		public ItemStack stack(String name) {
-			return stack(name, 1);
-		}
+        public ItemStack stack(String name) {
+            return stack(name, 1);
+        }
 
-		public ItemStack stack(String string, int i, int j) {
-			return new ItemStack(item(string), i, j);
-		}
+        public ItemStack stack(String string, int i, int j) {
+            return new ItemStack(item(string), i, j);
+        }
 
-		public boolean active() {
-			return Loader.isModLoaded(id);
-		}
-	}
+        public boolean active() {
+            return Loader.isModLoaded(id);
+        }
+    }
 }

src/main/java/binnie/core/block/BlockMetadata.java

@@ -1,6 +1,8 @@
 package binnie.core.block;
 
 import binnie.core.BinnieCore;
+import java.util.ArrayList;
+import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -13,114 +15,115 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class BlockMetadata extends BlockContainer implements IBlockMetadata {
-	public BlockMetadata(Material material) {
-		super(material);
-	}
+    public BlockMetadata(Material material) {
+        super(material);
+    }
 
-	@Override
-	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
-		return getBlockDropped(this, world, x, y, z, blockMeta);
-	}
+    @Override
+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int blockMeta, int fortune) {
+        return getBlockDropped(this, world, x, y, z, blockMeta);
+    }
 
-	@Override
-	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
-		return breakBlock(this, player, world, x, y, z);
-	}
+    @Override
+    public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
+        return breakBlock(this, player, world, x, y, z);
+    }
 
-	@Override
-	public TileEntity createNewTileEntity(World world, int i) {
-		return new TileEntityMetadata();
-	}
+    @Override
+    public TileEntity createNewTileEntity(World world, int i) {
+        return new TileEntityMetadata();
+    }
 
-	@Override
-	public boolean hasTileEntity(int meta) {
-		return true;
-	}
+    @Override
+    public boolean hasTileEntity(int meta) {
+        return true;
+    }
 
-	@Override
-	public boolean onBlockEventReceived(World world, int x, int y, int z, int par5, int par6) {
-		super.onBlockEventReceived(world, x, y, z, par5, par6);
-		TileEntity tileentity = world.getTileEntity(x, y, z);
-		return tileentity != null && tileentity.receiveClientEvent(par5, par6);
-	}
+    @Override
+    public boolean onBlockEventReceived(World world, int x, int y, int z, int par5, int par6) {
+        super.onBlockEventReceived(world, x, y, z, par5, par6);
+        TileEntity tileentity = world.getTileEntity(x, y, z);
+        return tileentity != null && tileentity.receiveClientEvent(par5, par6);
+    }
 
-	@Override
-	public IIcon getIcon(IBlockAccess block, int x, int y, int z, int par5) {
-		int metadata = TileEntityMetadata.getTileMetadata(block, x, y, z);
-		return getIcon(par5, metadata);
-	}
+    @Override
+    public IIcon getIcon(IBlockAccess block, int x, int y, int z, int par5) {
+        int metadata = TileEntityMetadata.getTileMetadata(block, x, y, z);
+        return getIcon(par5, metadata);
+    }
 
-	@Override
-	public String getBlockName(ItemStack itemStack) {
-		return getLocalizedName();
-	}
+    @Override
+    public String getBlockName(ItemStack itemStack) {
+        return getLocalizedName();
+    }
 
-	@Override
-	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
-		// ignored
-	}
+    @Override
+    public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+        // ignored
+    }
 
-	@Override
-	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
-		return TileEntityMetadata.getItemDamage(itemStack);
-	}
+    @Override
+    public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+        return TileEntityMetadata.getItemDamage(itemStack);
+    }
 
-	@Override
-	public int getDroppedMeta(int blockMeta, int tileMeta) {
-		return blockMeta;
-	}
+    @Override
+    public int getDroppedMeta(int blockMeta, int tileMeta) {
+        return blockMeta;
+    }
 
-	public static ArrayList<ItemStack> getBlockDropped(IBlockMetadata block, World world, int x, int y, int z, int blockMeta) {
-		ArrayList<ItemStack> array = new ArrayList<>();
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
-		if (tile != null && !tile.hasDroppedBlock()) {
-			int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata());
-			array.add(TileEntityMetadata.getItemStack((Block) block, meta));
-		}
-		return array;
-	}
+    public static ArrayList<ItemStack> getBlockDropped(
+            IBlockMetadata block, World world, int x, int y, int z, int blockMeta) {
+        ArrayList<ItemStack> array = new ArrayList<>();
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+        if (tile != null && !tile.hasDroppedBlock()) {
+            int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata());
+            array.add(TileEntityMetadata.getItemStack((Block) block, meta));
+        }
+        return array;
+    }
 
-	public static boolean breakBlock(IBlockMetadata block, EntityPlayer player, World world, int i, int j, int k) {
-		List<ItemStack> drops = new ArrayList<>();
-		Block block2 = (Block) block;
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k);
-		if (tile != null && !tile.hasDroppedBlock()) {
-			drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0);
-		}
+    public static boolean breakBlock(IBlockMetadata block, EntityPlayer player, World world, int i, int j, int k) {
+        List<ItemStack> drops = new ArrayList<>();
+        Block block2 = (Block) block;
+        TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k);
+        if (tile != null && !tile.hasDroppedBlock()) {
+            drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0);
+        }
 
-		boolean hasBeenBroken = world.setBlockToAir(i, j, k);
-		if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				block.dropAsStack(world, i, j, k, drop);
-			}
-			tile.dropBlock();
-		}
-		return hasBeenBroken;
-	}
+        boolean hasBeenBroken = world.setBlockToAir(i, j, k);
+        if (hasBeenBroken
+                && BinnieCore.proxy.isSimulating(world)
+                && drops.size() > 0
+                && (player == null || !player.capabilities.isCreativeMode)) {
+            for (ItemStack drop : drops) {
+                block.dropAsStack(world, i, j, k, drop);
+            }
+            tile.dropBlock();
+        }
+        return hasBeenBroken;
+    }
 
-	@Override
-	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
-		dropBlockAsItem(world, x, y, z, itemStack);
-	}
+    @Override
+    public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
+        dropBlockAsItem(world, x, y, z, itemStack);
+    }
 
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
-		super.breakBlock(world, x, y, z, block, meta);
-		world.removeTileEntity(x, y, z);
-	}
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
+        super.breakBlock(world, x, y, z, block, meta);
+        world.removeTileEntity(x, y, z);
+    }
 
-	public static ItemStack getPickBlock(World world, int x, int y, int z) {
-		IBlockMetadata block = (IBlockMetadata) world.getBlock(x, y, z);
-		List<ItemStack> list = getBlockDropped(block, world, x, y, z, world.getBlockMetadata(x, y, z));
-		return list.isEmpty() ? null : list.get(0);
-	}
+    public static ItemStack getPickBlock(World world, int x, int y, int z) {
+        IBlockMetadata block = (IBlockMetadata) world.getBlock(x, y, z);
+        List<ItemStack> list = getBlockDropped(block, world, x, y, z, world.getBlockMetadata(x, y, z));
+        return list.isEmpty() ? null : list.get(0);
+    }
 
-	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
-		return getPickBlock(world, x, y, z);
-	}
+    @Override
+    public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
+        return getPickBlock(world, x, y, z);
+    }
 }