Merge pull request #12 from GTNewHorizons/maven

update buildscript

.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

@@ -0,0 +1,45 @@
+# 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
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+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.5 minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt
+        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
+
+    - name: Test no errors reported during server run
+      run: |
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh

.github/workflows/release-tags.yml

@@ -0,0 +1,51 @@
+# 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:
+      - '*'
+
+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
+
+      - name: Publish to Maven
+        run: ./gradlew publish
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -1,9 +1,32 @@
 .gradle
-# IntelliJ
-/build
-/run
-/out
-.idea
+.settings
+/.idea/
+/.vscode/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
-*.iws
+*.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>.

README.md

@@ -0,0 +1,59 @@
+[Binnie mods](https://minecraft.curseforge.com/projects/binnies-mods/files)
+====================================
+
+### What is it?
+Binnie’s Mods is a suite of mods designed to expand the [Forestry](https://github.com/ForestryMC/ForestryMC) mod. 
+It both extends the bee and tree breeding aspect by adding many new species with varied products,
+along with new features such as fully breedable flowers and genetic manipulation.
+
+### Homepage
+
+[Wiki](https://binnie.mods.wiki/wiki/Main_Page)
+
+[Latest Builds for 1.7.10](https://ci.bymarcin.com/job/Binnie-Mods-MC1.7.10/)
+
+### Mods
+
+[![](https://binnie.mods.wiki/w/images/binnie/9/91/Extra_Bees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Bees)
+
+Extra Bees expands upon the bee breeding of Forestry by adding 107 new bee species to forestry. These bees cover a large spectrum of different effects and products, giving you the ability to produce everything from dyes to rare metal dusts purely from bees. It also adds the Apiarist Database, a tool to keep track of discovered species, mutations and traits. There are also new alveary components which help improve and streamline bee production. 
+
+
+[![](https://binnie.mods.wiki/w/images/binnie/5/59/Extra_Trees_Header.png)](https://binnie.mods.wiki/wiki/Extra_Trees)
+
+Extra Trees both increases the number of tree species and adds many new aesthetic uses. There are 96 new tree species, such as Banana, Brazil nut and Douglas-fir. This comes with many new fruits as well as 35 new wooden planks. Extra Trees allows these, as well as Forestry and vanilla planks, to be combined to give doors, gates and various designs of fences. The woodworker allows planks to be combined to give patterned tiles, allowing you to build beautiful wooden floors, and the same can be done with stained glass. A group of machines such as the brewery and distillery allow you to use the fruits you grow to make a variety of wines, ciders and spirits.
+
+
+[![](https://binnie.mods.wiki/w/images/binnie/3/34/Botany_Header.png)](https://binnie.mods.wiki/wiki/Botany)
+
+Botany adds an entirely new breeding system to Forestry: flowers. There are 46 different species that can be bred, including both vanilla flowers and new ones such as Fuschia and Lilies. The colour of the flowers can be transferred and selectively bred, meaning that each flower can be one of a possible 80 different colours. These new flowers can be bred manually in small gardens using a trowel and fertiliser, with careful care taken to maintain the desired pH or moisture, or grown on the large scale in Forestry farms. 
+
+[![](https://binnie.mods.wiki/w/images/binnie/4/4e/Genetics_Header.png)](https://binnie.mods.wiki/wiki/Genetics)
+
+Genetics is for those who want to eschew conventional breeding, and want to enter the realm of genetic manipulation. Here, genes can be isolated, sequenced and then inoculated back into different species, making it easier to obtain the perfect genome. Bees, trees, butterflies and flowers can all be manipulated in this way. They can also be acclimatised to different environments to build tolerance to hostile climates.
+
+[![](https://binnie.mods.wiki/w/images/binnie/d/d7/Binnie_Core_Header.png)](https://binnie.mods.wiki/wiki/Binnie_Core)
+
+Binnie Core is a mod which contains a lot of the core functionality such as networking and GUI's for the other mods. The only in game features it currently contains are the Compartments
+
+### Warning
+
+Removed unused (unfinished) items and blocks: Honey Crystal, Alcohol, etc.
+
+### Building
+
+The master branch will always contain the latest released version with possibly some bug fixes for that version that will eventually be released.
+New versions will be created in branched named like {mc_version}-{mod_version}
+
+#### IntelliJ IDEA
+
+1. Execute the following gradle command to setup your workspace and create the necessary idea project files:
+
+  ```
+  ./gradlew setupDecompWorkspace idea genIntellijRuns
+  ```
+  
+2. Open the `Binnie*.ipr` project file using IntelliJ IDEA
+
+3. Select `Minecraft Client` from _Run configurations_ and press the green play button.
+Minecraft should now launch with Binnie and all of its dependencies loaded :)

build.gradle

@@ -1,53 +1,417 @@
+//version: 1644612407
+/*
+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/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+*/
+
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
     repositories {
-        mavenCentral()
         maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            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/'
+        }
+        maven {
+            name 'jitpack'
+            url 'https://jitpack.io'
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
 
+plugins {
+    id 'java-library'
+    id 'idea'
+    id 'eclipse'
+    id 'scala'
+    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 '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
+}
+
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
+}
+
+def out = services.get(StyledTextOutputFactory).create('an-output')
+
 apply plugin: 'forge'
 
-version = "1.0"
-group= "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "binnie"
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+
+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("\\.", "/")
+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("\\.", "/")
+    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()) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    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"
+    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)
+    }
+}
+
+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"
+    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)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+try {
+    'git config core.fileMode false'.execute()
+}
+catch (Exception e) {
+    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 e) {
+    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.equals(versionOverride) ) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+def arguments = []
+def jvmArguments = []
+
+if(usesMixins.toBoolean()) {
+    arguments += [
+            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    jvmArguments += [
+            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+    ]
+}
 
 minecraft {
-    version = "1.7.10-10.13.4.1558-1.7.10"
-	if (file('../run').exists()){
-		assetDir = "../run/assets"
-	}else{
-		assetDir = "assets"
-	}
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            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'
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    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/'
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
+        }
+        maven {
+            url 'https://jitpack.io'
+        }
+    }
 }
 
 dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
+    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')
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        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'
+        }
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
+    }
 }
 
-processResources
-{
+apply from: 'dependencies.gradle'
+
+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 = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+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, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+runServer {
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
@@ -55,13 +419,313 @@ processResources
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+
+        // replace modVersion and minecraftVersion
+        expand "minecraftVersion": project.minecraft.version,
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
     }
-        
-    // copy everything else, thats not the mcmod.info
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // 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)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    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")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+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")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    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
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "src"
+            }
+            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 who knows where
+            pom.withXml {
+                def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
+                                   'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
+                                   'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava',
+                                   'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j',
+                                   'org.lwjgl.lwjgl', 'tv.twitch', 'org.jetbrains.kotlin', '']
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    badPomGroup.contains(it.groupId.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 {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    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 } }
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// 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 = 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/" + String.valueOf(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 fileName) {
+    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
+    String bon2Dir = cacheDir + "forge_gradle/deobf"
+    String bon2File  = bon2Dir + "/BON2-2.5.0.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)
+    }
+
+    download.run {
+        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.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', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        workingDir bon2Dir
+        standardOutput = new ByteArrayOutputStream()
+    }
+
+    return files(deobfFile)
+}
+
+// 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/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}

changelog.mustache

@@ -0,0 +1,8 @@
+{{#tags}}
+  <h3>{{name}}</h3>
+  <ul>
+    {{#commits}}
+    <li>{{{message}}} - {{authorName}}</li>
+    {{/commits}}
+  </ul>
+{{/tags}}

dependencies.gradle

@@ -0,0 +1,9 @@
+// Add your dependencies here
+
+dependencies {
+    compile 'com.github.GTNewHorizons:ForestryMC:4.4.6:dev'
+    compileOnly 'com.github.GTNewHorizons:BuildCraft:7.1.27:api'
+
+    compileOnly 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev'
+    compileOnly 'curse.maven:cofh-lib-220333:2388748'
+}

gradle.properties

@@ -0,0 +1,64 @@
+modName = Binnie Core
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = BinnieCore
+
+modGroup = binnie
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+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 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
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = BinnieCore.java
+gradleTokenModId =
+gradleTokenModName =
+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
+# 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. It must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+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 compatibility only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+customArchiveBaseName = binnie-mods

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,47 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

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

jitpack.yml

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

repositories.gradle

@@ -0,0 +1,26 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    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

@@ -1,39 +1,22 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie;
 
-import java.util.ArrayList;
-import binnie.core.resource.ManagerResource;
-import binnie.core.item.ManagerItem;
-import binnie.core.machines.ManagerMachine;
-import binnie.core.liquid.ManagerLiquid;
-import binnie.core.mod.config.ManagerConfig;
-import binnie.core.genetics.ManagerGenetics;
-import binnie.core.language.ManagerLanguage;
 import binnie.core.ManagerBase;
+import binnie.core.genetics.ManagerGenetics;
+import binnie.core.item.ManagerItem;
+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 final List<ManagerBase> Managers;
-	public static final ManagerLanguage Language;
-	public static final ManagerGenetics Genetics;
-	public static final ManagerConfig Configuration;
-	public static final ManagerLiquid Liquid;
-	public static final ManagerMachine Machine;
-	public static final ManagerItem Item;
-	public static final ManagerResource Resource;
-
-	static {
-		Managers = new ArrayList<ManagerBase>();
-		Language = new ManagerLanguage();
-		Genetics = new ManagerGenetics();
-		Configuration = new ManagerConfig();
-		Liquid = new ManagerLiquid();
-		Machine = new ManagerMachine();
-		Item = new ManagerItem();
-		Resource = new ManagerResource();
-	}
+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();
 }

src/main/java/binnie/Constants.java

@@ -1,15 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie;
-
-public final class Constants
-{
-	public static final String LiquidJuice = "juice";
-	public static final String LiquidWater = "water";
-	public static final String LiquidSeedOil = "seedoil";
-	public static final String LiquidCreosote = "Creosote Oil";
-	public static final String LiquidEthanol = "bioethanol";
-	public static final String LiquidHoney = "for.honey";
-}

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

@@ -1,73 +1,74 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany;
 
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.eventhandler.Event;
-import net.minecraftforge.event.entity.player.BonemealEvent;
-import net.minecraft.world.IBlockAccess;
-import binnie.core.BinnieCore;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraft.block.Block;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.botany.gardening.Gardening;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import net.minecraft.item.ItemStack;
 import binnie.botany.api.IFlower;
-import net.minecraft.tileentity.TileEntity;
-import forestry.api.genetics.IIndividual;
-import binnie.botany.core.BotanyCore;
-import net.minecraft.entity.EntityLivingBase;
-import binnie.botany.flower.TileEntityFlower;
-import net.minecraft.init.Items;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import binnie.core.network.BinniePacketHandler;
-import binnie.core.proxy.IProxyCore;
-import binnie.botany.network.PacketID;
-import binnie.core.network.IPacketID;
-import binnie.botany.core.BotanyGUI;
-import binnie.core.gui.IBinnieGUID;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import binnie.botany.gardening.ModuleGardening;
-import binnie.botany.genetics.ModuleGenetics;
-import binnie.botany.core.ModuleCore;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import binnie.botany.ceramic.BlockCeramicBrick;
-import binnie.botany.ceramic.BlockStained;
-import binnie.botany.ceramic.BlockCeramicPatterned;
+import binnie.botany.api.gardening.IBlockSoil;
 import binnie.botany.ceramic.BlockCeramic;
+import binnie.botany.ceramic.BlockCeramicBrick;
+import binnie.botany.ceramic.BlockCeramicPatterned;
+import binnie.botany.ceramic.BlockStained;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.core.BotanyGUI;
+import binnie.botany.core.ModuleCore;
+import binnie.botany.flower.BlockFlower;
+import binnie.botany.flower.ItemFlower;
+import binnie.botany.flower.ItemInsulatedTube;
+import binnie.botany.flower.TileEntityFlower;
+import binnie.botany.gardening.BlockPlant;
+import binnie.botany.gardening.BlockSoil;
+import binnie.botany.gardening.Gardening;
+import binnie.botany.gardening.ItemSoilMeter;
+import binnie.botany.gardening.ItemTrowel;
+import binnie.botany.gardening.ModuleGardening;
+import binnie.botany.genetics.ItemDictionary;
+import binnie.botany.genetics.ModuleGenetics;
 import binnie.botany.items.ItemClay;
 import binnie.botany.items.ItemPigment;
-import binnie.botany.flower.ItemFlower;
-import binnie.botany.genetics.ItemEncyclopedia;
-import binnie.core.item.ItemMisc;
-import binnie.botany.gardening.ItemSoilMeter;
-import binnie.botany.flower.ItemInsulatedTube;
-import binnie.botany.gardening.BlockSoil;
-import binnie.botany.gardening.ItemTrowel;
-import binnie.botany.gardening.BlockPlant;
-import binnie.botany.genetics.ItemDictionary;
-import net.minecraft.item.Item;
-import binnie.botany.flower.BlockFlower;
-import cpw.mods.fml.common.SidedProxy;
+import binnie.botany.network.PacketID;
 import binnie.botany.proxy.Proxy;
-import cpw.mods.fml.common.Mod;
 import binnie.core.AbstractMod;
+import binnie.core.BinnieCore;
+import binnie.core.gui.IBinnieGUID;
+import binnie.core.item.ItemMisc;
+import binnie.core.network.BinniePacketHandler;
+import binnie.core.network.IPacketID;
+import binnie.core.proxy.IProxyCore;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.eventhandler.Event;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import net.minecraft.block.Block;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.player.BonemealEvent;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.world.BlockEvent;
 
-@Mod(modid = "Botany", name = "Botany", useMetadata = true, dependencies = "after:BinnieCore")
-public class Botany extends AbstractMod
-{
-	public static final float AGE_CHANCE = 0.2f;
+@Mod(
+	modid = "Botany",
+	name = "Botany",
+	version = BinnieCore.VERSION,
+	useMetadata = true,
+	dependencies = "after:BinnieCore"
+)
+public class Botany extends AbstractMod {
 	@Mod.Instance("Botany")
 	public static Botany instance;
-	@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
+
+	@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;
@@ -87,8 +88,6 @@ public class Botany extends AbstractMod
 	public static ItemInsulatedTube insulatedTube;
 	public static ItemSoilMeter soilMeter;
 	public static ItemMisc misc;
-	public static ItemEncyclopedia encyclopedia;
-	public static ItemEncyclopedia encyclopediaIron;
 	public static ItemFlower flowerItem;
 	public static ItemPigment pigment;
 	public static ItemClay clay;
@@ -97,28 +96,28 @@ public class Botany extends AbstractMod
 	public static BlockStained stained;
 	public static BlockCeramicBrick ceramicBrick;
 
-	@Mod.EventHandler
-	public void preInit(final FMLPreInitializationEvent evt) {
-		this.addModule(new ModuleCore());
-		this.addModule(new ModuleGenetics());
-		this.addModule(new ModuleGardening());
-		this.preInit();
-	}
-
-	@Mod.EventHandler
-	public void init(final FMLInitializationEvent evt) {
-		this.init();
-	}
-
-	@Mod.EventHandler
-	public void postInit(final FMLPostInitializationEvent evt) {
-		this.postInit();
-	}
-
 	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 init(FMLInitializationEvent event) {
+		init();
+	}
+
+	@Mod.EventHandler
+	public void postInit(FMLPostInitializationEvent event) {
+		postInit();
+	}
+
 	@Override
 	public IBinnieGUID[] getGUIDs() {
 		return BotanyGUI.values();
@@ -155,28 +154,30 @@ public class Botany extends AbstractMod
 	}
 
 	@SubscribeEvent
-	public void onShearFlower(final PlayerInteractEvent event) {
+	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) {
-			final TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
 			if (tile instanceof TileEntityFlower) {
-				final TileEntityFlower flower = (TileEntityFlower) tile;
+				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) {
-			final TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+			TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
 			if (tile instanceof TileEntityFlower) {
-				final TileEntityFlower flower = (TileEntityFlower) tile;
-				final IFlower pollen = BotanyCore.getFlowerRoot().getMember(event.entityPlayer.getHeldItem());
+				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) {
-						final ItemStack heldItem = event.entityPlayer.getHeldItem();
-						--heldItem.stackSize;
+						ItemStack heldItem = event.entityPlayer.getHeldItem();
+						heldItem.stackSize--;
 					}
 				}
 			}
@@ -184,113 +185,119 @@ public class Botany extends AbstractMod
 	}
 
 	@SubscribeEvent
-	public void onFertiliseSoil(final PlayerInteractEvent event) {
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+	public void onFertiliseSoil(PlayerInteractEvent event) {
+		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK || event.world == null) {
 			return;
 		}
-		if (event.world == null) {
+
+		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
 			return;
 		}
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null) {
-			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) {
+
+		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;
 			}
-			if (Gardening.isSoil(block)) {
-				final IBlockSoil soil = (IBlockSoil) block;
-				if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem()) && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) {
-					final EnumSoilType type = soil.getType(event.world, event.x, y, event.z);
-					final 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) {
-						final 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) {
-					final EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-					final 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) {
-						final 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) {
-					final EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z);
-					final 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) {
-						final 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) {
-					final ItemStack heldItem4 = event.entityPlayer.getHeldItem();
-					--heldItem4.stackSize;
-				}
+		}
+
+		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.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(final BlockEvent.PlaceEvent event) {
-		final World world = event.world;
-		final int x = event.x;
-		final int y = event.y;
-		final int z = event.z;
-		final Block block = world.getBlock(x, y - 1, z);
+	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;
 		}
-		final IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
+
+		IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.itemInHand);
 		if (flower != null) {
 			Gardening.plant(world, x, y, z, flower, event.player.getGameProfile());
 		}
 	}
 
 	@Deprecated
-	public void onPlantVanilla(final PlayerInteractEvent event) {
-		if (!BinnieCore.proxy.isSimulating(event.world)) {
+	public void onPlantVanilla(PlayerInteractEvent event) {
+		if (!BinnieCore.proxy.isSimulating(event.world) || event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
 			return;
 		}
-		if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
+		if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) {
 			return;
 		}
-		if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null) {
-			final World world = event.world;
-			final int x = event.x;
-			final int y = event.y;
-			final int z = event.z;
-			final 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) {
-				final 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) {
-					final ItemStack heldItem = event.entityPlayer.getHeldItem();
-					--heldItem.stackSize;
-				}
-			}
+
+		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;
+		}
+
+		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(final BonemealEvent event) {
-		final Block block = event.world.getBlock(event.x, event.y, event.z);
+	public void onBonemeal(BonemealEvent event) {
+		Block block = event.world.getBlock(event.x, event.y, event.z);
 		if (Gardening.isSoil(block)) {
-			final IBlockSoil soil = (IBlockSoil) block;
+			IBlockSoil soil = (IBlockSoil) block;
 			if (soil.fertilise(event.world, event.x, event.y, event.z, EnumSoilType.LOAM)) {
 				event.setResult(Event.Result.ALLOW);
 			}
 		}
-		final TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
+
+		TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z);
 		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) {
 			event.setResult(Event.Result.ALLOW);
 		}
@@ -302,8 +309,8 @@ public class Botany extends AbstractMod
 	}
 
 	@Mod.EventHandler
-	public void onIMC(final FMLInterModComms.IMCEvent event) {
-		for (final FMLInterModComms.IMCMessage message : event.getMessages()) {
+	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);
 			}
@@ -325,8 +332,7 @@ public class Botany extends AbstractMod
 		}
 	}
 
-	public static class PacketHandler extends BinniePacketHandler
-	{
+	public static class PacketHandler extends BinniePacketHandler {
 		public PacketHandler() {
 			super(Botany.instance);
 		}

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

@@ -1,39 +1,34 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany;
 
-import net.minecraft.item.Item;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
-public class CreativeTabBotany extends CreativeTabs
-{
-	public static CreativeTabs instance;
-
-	@Override
-	public ItemStack getIconItemStack() {
-		return new ItemStack(Blocks.red_flower, 1, 5);
-	}
+public class CreativeTabBotany extends CreativeTabs {
+	public static CreativeTabs instance = new CreativeTabBotany();
 
 	public CreativeTabBotany() {
 		super("Botany");
 	}
 
+	@Override
+	public ItemStack getIconItemStack() {
+		return new ItemStack(Blocks.red_flower, 1, 5);
+	}
+
 	@Override
 	public String getTranslatedTabLabel() {
-		return this.getTabLabel();
+		return getTabLabel();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
 	public String getTabLabel() {
-		return Botany.proxy.localise("tab.botany");
+		return I18N.localise("botany.tab.botany");
 	}
 
 	@Override
@@ -41,8 +36,4 @@ public class CreativeTabBotany extends CreativeTabs
 	public Item getTabIconItem() {
 		return Item.getItemFromBlock(Blocks.yellow_flower);
 	}
-
-	static {
-		CreativeTabBotany.instance = new CreativeTabBotany();
-	}
 }

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

@@ -1,16 +1,11 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-public enum EnumAcidity
-{
-	Acid,
-	Neutral,
-	Alkaline;
+public enum EnumAcidity {
+	ACID,
+	NEUTRAL,
+	ALKALINE;
 
 	public String getID() {
-		return this.name().toLowerCase();
+		return name().toLowerCase();
 	}
 }

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

@@ -1,20 +1,15 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-import forestry.api.genetics.IAlleleFloat;
-import forestry.api.genetics.IAlleleTolerance;
-import forestry.api.genetics.IAlleleArea;
-import forestry.api.genetics.IAlleleInteger;
 import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.ISpeciesRoot;
 import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleArea;
+import forestry.api.genetics.IAlleleFloat;
+import forestry.api.genetics.IAlleleInteger;
+import forestry.api.genetics.IAlleleTolerance;
 import forestry.api.genetics.IChromosomeType;
+import forestry.api.genetics.ISpeciesRoot;
 
-public enum EnumFlowerChromosome implements IChromosomeType
-{
+public enum EnumFlowerChromosome implements IChromosomeType {
 	SPECIES(IAlleleFlowerSpecies.class),
 	PRIMARY(IAlleleInteger.class),
 	SECONDARY(IAlleleInteger.class),
@@ -30,18 +25,18 @@ public enum EnumFlowerChromosome implements IChromosomeType
 
 	private Class<? extends IAllele> cls;
 
-	private EnumFlowerChromosome(final Class<? extends IAllele> cls) {
+	EnumFlowerChromosome(Class<? extends IAllele> cls) {
 		this.cls = cls;
 	}
 
 	@Override
 	public Class<? extends IAllele> getAlleleClass() {
-		return this.cls;
+		return cls;
 	}
 
 	@Override
 	public String getName() {
-		return this.toString().toLowerCase();
+		return toString().toLowerCase();
 	}
 
 	@Override

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

@@ -1,28 +1,18 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-public enum EnumFlowerStage
-{
+public enum EnumFlowerStage {
 	FLOWER("Flower"),
 	SEED("Seed"),
 	POLLEN("Pollen"),
 	NONE("NONE");
 
-	public static final EnumFlowerStage[] VALUES;
-	String name;
+	protected String name;
 
-	private EnumFlowerStage(final String name) {
+	EnumFlowerStage(String name) {
 		this.name = name;
 	}
 
 	public String getName() {
-		return this.name;
-	}
-
-	static {
-		VALUES = values();
+		return name;
 	}
 }

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

@@ -1,16 +1,11 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-public enum EnumMoisture
-{
-	Dry,
-	Normal,
-	Damp;
+public enum EnumMoisture {
+	DRY,
+	NORMAL,
+	DAMP;
 
 	public String getID() {
-		return this.name().toLowerCase();
+		return name().toLowerCase();
 	}
 }

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

@@ -1,16 +1,11 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-public enum EnumSoilType
-{
+public enum EnumSoilType {
 	SOIL,
 	LOAM,
 	FLOWERBED;
 
 	public String getID() {
-		return this.name().toLowerCase();
+		return name().toLowerCase();
 	}
 }

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

@@ -1,14 +1,9 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-import net.minecraft.world.World;
-import forestry.api.genetics.IEffectData;
 import forestry.api.genetics.IAlleleEffect;
+import forestry.api.genetics.IEffectData;
+import net.minecraft.world.World;
 
-public interface IAlleleFlowerEffect extends IAlleleEffect
-{
-	IEffectData doEffect(final IFlowerGenome p0, final IEffectData p1, final World p2, final int p3, final int p4, final int p5);
+public interface IAlleleFlowerEffect extends IAlleleEffect {
+	IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
 }

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

@@ -1,13 +1,8 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
 import forestry.api.genetics.IAlleleSpecies;
 
-public interface IAlleleFlowerSpecies extends IAlleleSpecies
-{
+public interface IAlleleFlowerSpecies extends IAlleleSpecies {
 	IFlowerType getType();
 
 	EnumAcidity getPH();

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

@@ -1,11 +1,6 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 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,18 +1,13 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-public interface IColourMix
-{
-	IFlowerColour getColour1();
+public interface IColourMix {
+	IFlowerColor getColor1();
 
-	IFlowerColour getColour2();
+	IFlowerColor getColor2();
 
-	boolean isMutation(final IFlowerColour p0, final IFlowerColour p1);
+	boolean isMutation(IFlowerColor color1, IFlowerColor color2);
 
 	int getChance();
 
-	IFlowerColour getResult();
+	IFlowerColor getResult();
 }

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

@@ -1,38 +1,33 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-import net.minecraft.world.World;
 import forestry.api.genetics.IIndividual;
+import net.minecraft.world.World;
 
-public interface IFlower extends IIndividual
-{
+public interface IFlower extends IIndividual {
 	@Override
 	IFlowerGenome getGenome();
 
 	IFlowerGenome getMate();
 
-	void mate(final IFlower p0);
+	void mate(IFlower other);
 
 	int getAge();
 
+	void setAge(int age);
+
 	void age();
 
-	void setAge(final int p0);
-
-	IFlower getOffspring(final World p0);
+	IFlower getOffspring(World world);
 
 	int getMaxAge();
 
 	boolean isWilted();
 
-	void setWilted(final boolean p0);
+	void setWilted(boolean value);
 
 	boolean hasFlowered();
 
-	void setFlowered(final boolean p0);
+	void setFlowered(boolean value);
 
 	void removeMate();
 }

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

@@ -1,14 +1,9 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
 import forestry.api.genetics.IAlleleInteger;
 
-public interface IFlowerColour
-{
-	int getColor(final boolean p0);
+public interface IFlowerColor {
+	int getColor(boolean dis);
 
 	IAlleleInteger getAllele();
 

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

@@ -1,26 +1,21 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IGenome;
 
-public interface IFlowerGenome extends IGenome
-{
+public interface IFlowerGenome extends IGenome {
 	@Override
 	IAlleleFlowerSpecies getPrimary();
 
 	@Override
 	IAlleleFlowerSpecies getSecondary();
 
-	IFlowerColour getPrimaryColor();
+	IFlowerColor getPrimaryColor();
 
-	IFlowerColour getSecondaryColor();
+	IFlowerColor getSecondaryColor();
 
-	IFlowerColour getStemColor();
+	IFlowerColor getStemColor();
 
 	int getFertility();
 
@@ -38,9 +33,9 @@ public interface IFlowerGenome extends IGenome
 
 	float getSappiness();
 
-	boolean canTolerate(final EnumAcidity p0);
+	boolean canTolerate(EnumAcidity pH);
 
-	boolean canTolerate(final EnumMoisture p0);
+	boolean canTolerate(EnumMoisture moisture);
 
-	boolean canTolerate(final EnumTemperature p0);
+	boolean canTolerate(EnumTemperature temp);
 }

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

@@ -1,14 +1,9 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
-import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IGenome;
 import forestry.api.genetics.IMutation;
 
-public interface IFlowerMutation extends IMutation
-{
-	float getChance(final IAllele p0, final IAllele p1, final IGenome p2, final IGenome p3);
+public interface IFlowerMutation extends IMutation {
+	float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
 }

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

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

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

@@ -1,18 +1,13 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api;
 
 import net.minecraft.util.IIcon;
 
-public interface IFlowerType
-{
-	IIcon getStem(final EnumFlowerStage p0, final boolean p1, final int p2);
+public interface IFlowerType {
+	IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
 
-	IIcon getPetalIcon(final EnumFlowerStage p0, final boolean p1, final int p2);
+	IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
 
-	IIcon getVariantIcon(final EnumFlowerStage p0, final boolean p1, final int p2);
+	IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
 
 	int getID();
 

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

@@ -1,29 +1,24 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.api.gardening;
 
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.EnumMoisture;
 import binnie.botany.api.EnumAcidity;
+import binnie.botany.api.EnumMoisture;
+import binnie.botany.api.EnumSoilType;
 import net.minecraft.world.World;
 
-public interface IBlockSoil
-{
-	EnumAcidity getPH(final World p0, final int p1, final int p2, final int p3);
+public interface IBlockSoil {
+	EnumAcidity getPH(World world, int x, int y, int z);
 
-	EnumMoisture getMoisture(final World p0, final int p1, final int p2, final int p3);
+	EnumMoisture getMoisture(World world, int x, int y, int z);
 
-	EnumSoilType getType(final World p0, final int p1, final int p2, final int p3);
+	EnumSoilType getType(World world, int x, int y, int z);
 
-	boolean fertilise(final World p0, final int p1, final int p2, final int p3, final EnumSoilType p4);
+	boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
 
-	boolean degrade(final World p0, final int p1, final int p2, final int p3, final EnumSoilType p4);
+	boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
 
-	boolean setPH(final World p0, final int p1, final int p2, final int p3, final EnumAcidity p4);
+	boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
 
-	boolean setMoisture(final World p0, final int p1, final int p2, final int p3, final EnumMoisture p4);
+	boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
 
-	boolean resistsWeeds(final World p0, final int p1, final int p2, final int p3);
+	boolean resistsWeeds(World world, int x, int y, int z);
 }

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

@@ -1,147 +1,146 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
-import net.minecraft.util.MovingObjectPosition;
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.BlockMetadata;
+import binnie.core.block.IBlockMetadata;
+import binnie.core.block.TileEntityMetadata;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import java.util.List;
-import binnie.botany.genetics.EnumFlowerColor;
-import net.minecraftforge.common.util.ForgeDirection;
-import binnie.core.block.TileEntityMetadata;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import binnie.core.block.BlockMetadata;
-import net.minecraft.item.ItemStack;
-import java.util.ArrayList;
-import net.minecraft.world.World;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.block.material.Material;
-import binnie.core.block.IBlockMetadata;
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockCeramic extends Block implements IBlockMetadata
-{
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockCeramic extends Block implements IBlockMetadata {
 	public BlockCeramic() {
 		super(Material.rock);
-		this.setHardness(1.0f);
-		this.setResistance(5.0f);
-		this.setBlockName("ceramic");
-		this.setCreativeTab(CreativeTabBotany.instance);
+		setHardness(1.0f);
+		setResistance(5.0f);
+		setBlockName("ceramic");
+		setCreativeTab(CreativeTabBotany.instance);
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
+	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(final World world, final EntityPlayer player, final int x, final int y, final int z) {
+	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(final World var1, final int i) {
+	public TileEntity createNewTileEntity(World var1, int i) {
 		return new TileEntityMetadata();
 	}
 
 	@Override
-	public boolean hasTileEntity(final int meta) {
+	public boolean hasTileEntity(int meta) {
 		return true;
 	}
 
 	@Override
-	public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) {
-		super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
-		final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
-		return tileentity != null && tileentity.receiveClientEvent(par5, par6);
+	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(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
-		return TileEntityMetadata.getItemDamage(stack);
+	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+		return TileEntityMetadata.getItemDamage(itemStack);
 	}
 
 	@Override
-	public int getDroppedMeta(final int blockMeta, final int tileMeta) {
+	public int getDroppedMeta(int blockMeta, int tileMeta) {
 		return tileMeta;
 	}
 
 	@Override
-	public String getBlockName(final ItemStack par1ItemStack) {
-		final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
-		return EnumFlowerColor.get(meta).getName() + " Ceramic Block";
+	public String getBlockName(ItemStack itemStack) {
+		return I18N.localise("botany.ceramicBlock");
 	}
 
 	@Override
-	public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
+	public void addBlockTooltip(ItemStack stack, List tooltip) {
+		int meta = TileEntityMetadata.getItemDamage(stack);
+		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
 	}
 
 	@Override
-	public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
-		this.dropBlockAsItem(world, x, y, z, drop);
+	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
+		dropBlockAsItem(world, x, y, z, itemStack);
 	}
 
 	@Override
-	public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
-		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
+	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(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	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 this.getIcon(side, tile.getTileMetadata());
+			return getIcon(side, tile.getTileMetadata());
 		}
 		return super.getIcon(world, x, y, z, side);
 	}
 
 	@Override
-	public IIcon getIcon(final int side, final int meta) {
-		return this.blockIcon;
+	public IIcon getIcon(int side, int meta) {
+		return blockIcon;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister register) {
-		this.blockIcon = Botany.proxy.getIcon(register, "ceramic");
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = Botany.proxy.getIcon(register, "ceramic");
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
 		if (tile != null) {
-			return this.getRenderColor(tile.getTileMetadata());
+			return getRenderColor(tile.getTileMetadata());
 		}
-		return 16777215;
+		return 0xffffff;
 	}
 
 	@Override
-	public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
-		par1World.removeTileEntity(par2, par3, par4);
+	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(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
+	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(final int meta) {
+	public int getRenderColor(int meta) {
 		return EnumFlowerColor.get(meta).getColor(false);
 	}
 }

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

@@ -1,138 +1,140 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
 import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
-import net.minecraft.util.MovingObjectPosition;
-import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import binnie.core.block.BlockMetadata;
+import binnie.core.block.IBlockMetadata;
+import binnie.core.block.IMultipassBlock;
 import binnie.core.block.MultipassBlockRenderer;
+import binnie.core.block.TileEntityMetadata;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import binnie.botany.genetics.EnumFlowerColor;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import java.util.List;
-import net.minecraftforge.common.util.ForgeDirection;
-import binnie.core.block.TileEntityMetadata;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import binnie.core.block.BlockMetadata;
-import net.minecraft.item.ItemStack;
-import java.util.ArrayList;
-import net.minecraft.world.World;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.block.material.Material;
-import binnie.core.block.IMultipassBlock;
-import binnie.core.block.IBlockMetadata;
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock
-{
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock {
 	public BlockCeramicBrick() {
 		super(Material.rock);
-		this.setHardness(1.0f);
-		this.setResistance(5.0f);
-		this.setBlockName("ceramicBrick");
-		this.setCreativeTab(CreativeTabBotany.instance);
+		setHardness(1.0f);
+		setResistance(5.0f);
+		setBlockName("ceramicBrick");
+		setCreativeTab(CreativeTabBotany.instance);
 	}
 
-	private static BlockType getType(final int meta) {
+	private static BlockType getType(int meta) {
 		return new BlockType(meta);
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
+	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(final World world, final EntityPlayer player, final int x, final int y, final int z) {
+	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) {
 		return BlockMetadata.breakBlock(this, player, world, x, y, z);
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(final World var1, final int i) {
+	public TileEntity createNewTileEntity(World var1, int i) {
 		return new TileEntityMetadata();
 	}
 
 	@Override
-	public boolean hasTileEntity(final int meta) {
+	public boolean hasTileEntity(int meta) {
 		return true;
 	}
 
 	@Override
-	public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) {
-		super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
-		final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
-		return tileentity != null && tileentity.receiveClientEvent(par5, par6);
+	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(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
-		return TileEntityMetadata.getItemDamage(stack);
+	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+		return TileEntityMetadata.getItemDamage(itemStack);
 	}
 
 	@Override
-	public int getDroppedMeta(final int blockMeta, final int tileMeta) {
+	public int getDroppedMeta(int blockMeta, int tileMeta) {
 		return tileMeta;
 	}
 
 	@Override
-	public String getBlockName(final ItemStack par1ItemStack) {
-		final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
+	public String getBlockName(ItemStack itemStack) {
+		int meta = TileEntityMetadata.getItemDamage(itemStack);
 		return getType(meta).getName();
 	}
 
 	@Override
-	public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
+	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+		int meta = TileEntityMetadata.getItemDamage(itemStack);
+		getType(meta).addTooltip(tooltip);
 	}
 
 	@Override
-	public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
-		this.dropBlockAsItem(world, x, y, z, drop);
+	public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) {
+		dropBlockAsItem(world, x, y, z, itemStack);
 	}
 
 	@Override
-	public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
-		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
-			final BlockType type = new BlockType(c, c, TileType.Tile);
+	public void getSubBlocks(Item item, CreativeTabs tab, List itemList) {
+		for (EnumFlowerColor c : EnumFlowerColor.values()) {
+			BlockType type = new BlockType(c, c, TileType.Tile);
 			itemList.add(TileEntityMetadata.getItemStack(this, type.ordinal()));
 		}
-		for (final TileType type2 : TileType.values()) {
+
+		for (TileType type2 : TileType.values()) {
 			if (type2.canDouble()) {
-				itemList.add(new BlockType(EnumFlowerColor.Brown, EnumFlowerColor.Gold, type2).getStack(1));
+				itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
 			}
 		}
-		itemList.add(new BlockType(EnumFlowerColor.Gold, EnumFlowerColor.Gold, TileType.Split).getStack(1));
-		itemList.add(new BlockType(EnumFlowerColor.Brown, EnumFlowerColor.Brown, TileType.Chequered).getStack(1));
-		itemList.add(new BlockType(EnumFlowerColor.Gold, EnumFlowerColor.Brown, TileType.LargeBrick).getStack(1));
+
+		itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.GOLD, TileType.Split).getStack(1));
+		itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.BROWN, TileType.Chequered).getStack(1));
+		itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.BROWN, TileType.LargeBrick).getStack(1));
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	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 this.getIcon(side, tile.getTileMetadata());
+			return getIcon(side, tile.getTileMetadata());
 		}
 		return super.getIcon(world, x, y, z, side);
 	}
 
 	@Override
-	public IIcon getIcon(final int side, final int meta) {
+	public IIcon getIcon(int side, int meta) {
 		return getType(meta).getIcon(MultipassBlockRenderer.getLayer());
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister register) {
-		for (final TileType type : TileType.values()) {
+	public void registerBlockIcons(IIconRegister register) {
+		for (TileType type : TileType.values()) {
 			for (int i = 0; i < 3; ++i) {
 				type.icons[i] = Botany.proxy.getIcon(register, "ceramic." + type.id + "." + i);
 			}
@@ -141,29 +143,29 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
 		if (tile != null) {
-			return this.getRenderColor(tile.getTileMetadata());
+			return getRenderColor(tile.getTileMetadata());
 		}
-		return 16777215;
+		return 0xffffff;
 	}
 
 	@Override
-	public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
-		par1World.removeTileEntity(par2, par3, par4);
+	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(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
+	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
 		return BlockMetadata.getPickBlock(world, x, y, z);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getRenderColor(final int meta) {
-		return this.colorMultiplier(meta);
+	public int getRenderColor(int meta) {
+		return colorMultiplier(meta);
 	}
 
 	@Override
@@ -172,10 +174,10 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 	}
 
 	@Override
-	public int colorMultiplier(final int meta) {
-		final BlockType type = getType(meta);
+	public int colorMultiplier(int meta) {
+		BlockType type = getType(meta);
 		if (MultipassBlockRenderer.getLayer() == 0) {
-			return 16777215;
+			return 0xffffff;
 		}
 		if (MultipassBlockRenderer.getLayer() == 1) {
 			return type.color1.getColor(false);
@@ -188,30 +190,29 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 		return BinnieCore.multipassRenderID;
 	}
 
-	public enum TileType
-	{
-		Tile("tile", "Ceramic Tile"),
-		Brick("brick", "Ceramic Bricks"),
-		StripeBrick("brickstripe", "Striped Ceramic Bricks"),
-		LargeBrick("bricklarge", "Large Ceramic Bricks"),
-		Split("split", "Split Ceramic Tile"),
-		Chequered("cheque", "Chequered Ceramic Tile"),
-		Mixed("mixed", "Mixed Ceramic Tile"),
-		VerticalBrick("verticalbrick", "Vertical Ceramic Bricks"),
-		VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks"),
-		VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks");
+	public enum TileType {
+		Tile("tile", "ceramicTile"),
+		Brick("brick", "ceramicBricks"),
+		StripeBrick("brickstripe", "strippedCeramicBricks"),
+		LargeBrick("bricklarge", "largeCeramicBricks"),
+		Split("split", "splitCeramicTile"),
+		Chequered("cheque", "chequeredCeramicTile"),
+		Mixed("mixed", "mixedCeramicTile"),
+		VerticalBrick("verticalbrick", "verticalCeramicBricks"),
+		VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"),
+		VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks");
 
-		String id;
-		String name;
-		IIcon[] icons;
+		protected String id;
+		protected String name;
+		protected IIcon[] icons;
 
-		private TileType(final String id, final String name) {
-			this.icons = new IIcon[3];
+		TileType(String id, String name) {
+			icons = new IIcon[3];
 			this.id = id;
 			this.name = name;
 		}
 
-		public static TileType get(final int id) {
+		public static TileType get(int id) {
 			return values()[id % values().length];
 		}
 
@@ -219,311 +220,334 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 			return this != TileType.Tile;
 		}
 
-		public ItemStack getRecipe(final List<ItemStack> stacks) {
+		public ItemStack getRecipe(List<ItemStack> stacks) {
 			switch (this) {
-			case Tile: {
-				if (stacks.size() != 4) {
-					return null;
-				}
-				int mortars = 0;
-				int blocks = 0;
-				int blockColor = -1;
-				for (final ItemStack stack : stacks) {
-					if (this.isMortar(stack)) {
-						++mortars;
-					}
-					else {
-						if (stack.getItem() != Item.getItemFromBlock(Botany.ceramic)) {
-							return null;
-						}
-						++blocks;
-						final int color = TileEntityMetadata.getItemDamage(stack);
-						if (blockColor == -1) {
-							blockColor = color;
-						}
-						else {
-							if (blockColor != color) {
-								return null;
-							}
-							continue;
-						}
-					}
-				}
-				if (mortars != 1) {
-					return null;
-				}
-				final EnumFlowerColor c = EnumFlowerColor.get(blockColor);
-				return new BlockType(c, c, TileType.Tile).getStack(3);
-			}
-			case Split: {
-				if (stacks.size() != 4) {
-					return null;
-				}
-				final int[] colors = { -1, -1 };
-				int altCounter = 0;
-				for (final ItemStack stack2 : stacks) {
-					final int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
-					if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-						return null;
-					}
-					final BlockType type = new BlockType(stack2);
-					if (type.type != TileType.Tile) {
-						return null;
-					}
-					final int color2 = type.color1.ordinal();
-					if (colors[alt] == -1) {
-						colors[alt] = color2;
-					}
-					else if (colors[alt] != color2) {
-						return null;
-					}
-					++altCounter;
-				}
-				return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Split).getStack(4);
-			}
-			case Chequered: {
-				if (stacks.size() != 4) {
-					return null;
-				}
-				final int[] colors = { -1, -1 };
-				for (final ItemStack stack2 : stacks) {
-					if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-						return null;
-					}
-					final BlockType type2 = new BlockType(stack2);
-					if (type2.type != TileType.Split) {
-						return null;
-					}
-					final int color3 = type2.color1.ordinal();
-					final int color4 = type2.color2.ordinal();
-					if (colors[0] == -1) {
-						colors[0] = color3;
-						colors[1] = color4;
-					}
-					else {
-						if (colors[0] != color3 || colors[1] != color4) {
-							return null;
-						}
-						continue;
-					}
-				}
-				return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Chequered).getStack(4);
-			}
-			case Mixed: {
-				if (stacks.size() != 4) {
-					return null;
-				}
-				final int[] colors = { -1, -1 };
-				for (int index = 0; index < stacks.size(); ++index) {
-					final ItemStack stack2 = stacks.get(index);
-					if (stack2.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-						return null;
-					}
-					final BlockType type2 = new BlockType(stack2);
-					if (type2.isTwoColors()) {
-						return null;
-					}
-					final int color3 = type2.color1.ordinal();
-					if (type2.type == TileType.Split) {
-						if (colors[1] != -1) {
-							return null;
-						}
-						colors[1] = color3;
-					}
-					else {
-						if (type2.type != TileType.Chequered) {
-							return null;
-						}
-						if (colors[0] == -1) {
-							colors[0] = color3;
-						}
-						else if (colors[0] != color3) {
-							return null;
-						}
-					}
-					final int color4 = type2.color2.ordinal();
-				}
-				if (colors[0] == -1 || colors[1] == -1) {
-					return null;
-				}
-				return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Mixed).getStack(4);
-			}
-			case LargeBrick: {
-				if (stacks.size() == 1) {
-					final ItemStack stack3 = stacks.get(0);
-					final BlockType type3 = new BlockType(stack3);
-					if (type3.type == TileType.VerticalLargeBrick) {
-						type3.type = this;
-						return type3.getStack(1);
-					}
-					return null;
-				}
-				else {
-					if (stacks.size() != 3) {
-						return null;
-					}
-					final int[] colors = { -1, -1 };
-					int a = 0;
-					int b = 0;
-					for (int index2 = 0; index2 < stacks.size(); ++index2) {
-						final ItemStack stack4 = stacks.get(index2);
-						if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-							return null;
-						}
-						final BlockType type4 = new BlockType(stack4);
-						if (type4.type != TileType.Tile) {
-							return null;
-						}
-						final int color5 = type4.color1.ordinal();
-						if (colors[0] == -1) {
-							colors[0] = color5;
-							++a;
-						}
-						else if (colors[0] == color5) {
-							++a;
-						}
-						else if (colors[1] == -1) {
-							colors[1] = color5;
-							++b;
-						}
-						else {
-							if (colors[1] != color5) {
-								return null;
-							}
-							++b;
-						}
-					}
-					if (colors[1] == -1) {
-						colors[1] = colors[0];
-					}
-					return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.LargeBrick).getStack(3);
-				}
-			}
-			case Brick:
-			case StripeBrick: {
-				if (stacks.size() == 1) {
-					final ItemStack stack5 = stacks.get(0);
-					final BlockType type = new BlockType(stack5);
-					if (type.type == TileType.VerticalBrick) {
-						type.type = this;
-						return type.getStack(1);
-					}
-					if (type.type == TileType.StripeBrick) {
-						type.type = this;
-						return type.getStack(1);
-					}
-					return null;
-				}
-				else {
-					if (stacks.size() != 4) {
-						return null;
-					}
-					final int[] colors = { -1, -1 };
-					for (int index2 = 0; index2 < stacks.size(); ++index2) {
-						final ItemStack stack4 = stacks.get(index2);
-						if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
-							return null;
-						}
-						final BlockType type4 = new BlockType(stack4);
-						if (type4.type != TileType.LargeBrick) {
-							return null;
-						}
-						final int color5 = type4.color1.ordinal();
-						final int color6 = type4.color2.ordinal();
-						int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0;
-						if (this == TileType.StripeBrick) {
-							alt2 = 0;
-						}
-						if (colors[alt2] == -1) {
-							colors[alt2] = color5;
-							colors[1 - alt2] = color6;
-						}
-						else if (colors[alt2] != color5 || colors[1 - alt2] != color6) {
-							return null;
-						}
-					}
-					return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), this).getStack(4);
-				}
-			}
-			case VerticalLargeBrick:
-			case VerticalBrick:
-			case VerticalStripeBrick: {
-				if (stacks.size() != 1) {
-					return null;
-				}
-				final ItemStack stack5 = stacks.get(0);
-				final BlockType type = new BlockType(stack5);
-				if (type.type == TileType.LargeBrick) {
-					type.type = TileType.VerticalLargeBrick;
-					return type.getStack(1);
-				}
-				if (type.type == TileType.Brick) {
-					type.type = TileType.VerticalBrick;
-					return type.getStack(1);
-				}
-				if (type.type == TileType.StripeBrick) {
-					type.type = TileType.VerticalStripeBrick;
-					return type.getStack(1);
-				}
-				return null;
-			}
-			default: {
-				return null;
-			}
+				case Tile:
+					return getTileRecipe(stacks);
+
+				case Split:
+					return getSplitRecipe(stacks);
+
+				case Chequered:
+					return getChequeredRecipe(stacks);
+
+				case Mixed:
+					return getMixedRecipe(stacks);
+
+				case LargeBrick:
+					return getLargeBrickRecipe(stacks);
+
+				case Brick:
+				case StripeBrick:
+					return getBrickRecipe(stacks);
+
+				case VerticalLargeBrick:
+				case VerticalBrick:
+				case VerticalStripeBrick:
+					return getVerticalBrickRecipe(stacks);
 			}
+			return null;
 		}
 
-		private boolean isMortar(final ItemStack stack) {
-			return stack.getItem() == Botany.misc && stack.getItemDamage() == BotanyItems.Mortar.ordinal();
+		private ItemStack getTileRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return null;
+			}
+
+			int mortars = 0;
+			int blockColor = -1;
+			for (ItemStack stack : stacks) {
+				if (isMortar(stack)) {
+					mortars++;
+				} else {
+					if (stack.getItem() != Item.getItemFromBlock(Botany.ceramic)) {
+						return null;
+					}
+
+					int color = TileEntityMetadata.getItemDamage(stack);
+					if (blockColor == -1) {
+						blockColor = color;
+					} else if (blockColor != color) {
+						return null;
+					}
+				}
+			}
+
+			if (mortars != 1) {
+				return null;
+			}
+			EnumFlowerColor c = EnumFlowerColor.get(blockColor);
+			return new BlockType(c, c, TileType.Tile).getStack(3);
+		}
+
+		private ItemStack getSplitRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return null;
+			}
+
+			int[] colors = {-1, -1};
+			int altCounter = 0;
+			for (ItemStack stack : stacks) {
+				int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
+				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return null;
+				}
+
+				BlockType type = new BlockType(stack);
+				if (type.type != TileType.Tile) {
+					return null;
+				}
+
+				int color2 = type.color1.ordinal();
+				if (colors[alt] == -1) {
+					colors[alt] = color2;
+				} else if (colors[alt] != color2) {
+					return null;
+				}
+				altCounter++;
+			}
+			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Split).getStack(4);
+		}
+
+		private ItemStack getChequeredRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return null;
+			}
+
+			int[] colors = {-1, -1};
+			for (ItemStack stack : stacks) {
+				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return null;
+				}
+
+				BlockType type2 = new BlockType(stack);
+				if (type2.type != TileType.Split) {
+					return null;
+				}
+
+				int color1 = type2.color1.ordinal();
+				int color2 = type2.color2.ordinal();
+				if (colors[0] == -1) {
+					colors[0] = color1;
+					colors[1] = color2;
+				} else if (colors[0] != color1 || colors[1] != color2) {
+					return null;
+				}
+			}
+			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Chequered).getStack(4);
+		}
+
+		private ItemStack getMixedRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 4) {
+				return null;
+			}
+
+			int[] colors = {-1, -1};
+			for (ItemStack stack : stacks) {
+				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return null;
+				}
+
+				BlockType type2 = new BlockType(stack);
+				if (type2.isTwoColors()) {
+					return null;
+				}
+
+				int color3 = type2.color1.ordinal();
+				if (type2.type == TileType.Split) {
+					if (colors[1] != -1) {
+						return null;
+					}
+					colors[1] = color3;
+				} else {
+					if (type2.type != TileType.Chequered) {
+						return null;
+					}
+
+					if (colors[0] == -1) {
+						colors[0] = color3;
+					} else if (colors[0] != color3) {
+						return null;
+					}
+				}
+			}
+
+			if (colors[0] == -1 || colors[1] == -1) {
+				return null;
+			}
+			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.Mixed).getStack(4);
+		}
+
+		private ItemStack getLargeBrickRecipe(List<ItemStack> stacks) {
+			if (stacks.size() == 1) {
+				ItemStack stack3 = stacks.get(0);
+				BlockType type3 = new BlockType(stack3);
+				if (type3.type == TileType.VerticalLargeBrick) {
+					type3.type = this;
+					return type3.getStack(1);
+				}
+				return null;
+			}
+
+			if (stacks.size() != 3) {
+				return null;
+			}
+
+			int[] colors = {-1, -1};
+			for (ItemStack stack4 : stacks) {
+				if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return null;
+				}
+
+				BlockType type4 = new BlockType(stack4);
+				if (type4.type != TileType.Tile) {
+					return null;
+				}
+
+				int color5 = type4.color1.ordinal();
+				if (colors[0] == -1) {
+					colors[0] = color5;
+				} else if (colors[1] == -1) {
+					colors[1] = color5;
+				} else if (colors[1] != color5) {
+					return null;
+				}
+			}
+
+			if (colors[1] == -1) {
+				colors[1] = colors[0];
+			}
+			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), TileType.LargeBrick).getStack(3);
+		}
+
+		private ItemStack getBrickRecipe(List<ItemStack> stacks) {
+			if (stacks.size() == 1) {
+				ItemStack stack = stacks.get(0);
+				BlockType type = new BlockType(stack);
+				if (type.type == TileType.VerticalBrick) {
+					type.type = this;
+					return type.getStack(1);
+				}
+
+				if (type.type == TileType.StripeBrick) {
+					type.type = this;
+					return type.getStack(1);
+				}
+				return null;
+			}
+
+			if (stacks.size() != 4) {
+				return null;
+			}
+
+			int[] colors = {-1, -1};
+			for (int index2 = 0; index2 < stacks.size(); ++index2) {
+				ItemStack stack = stacks.get(index2);
+				if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) {
+					return null;
+				}
+
+				BlockType type = new BlockType(stack);
+				if (type.type != TileType.LargeBrick) {
+					return null;
+				}
+
+				int color5 = type.color1.ordinal();
+				int color6 = type.color2.ordinal();
+				int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0;
+				if (this == TileType.StripeBrick) {
+					alt2 = 0;
+				}
+
+				if (colors[alt2] == -1) {
+					colors[alt2] = color5;
+					colors[1 - alt2] = color6;
+				} else if (colors[alt2] != color5 || colors[1 - alt2] != color6) {
+					return null;
+				}
+			}
+			return new BlockType(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), this).getStack(4);
+		}
+
+		private ItemStack getVerticalBrickRecipe(List<ItemStack> stacks) {
+			if (stacks.size() != 1) {
+				return null;
+			}
+
+			ItemStack stack5 = stacks.get(0);
+			BlockType type = new BlockType(stack5);
+			if (type.type == TileType.LargeBrick) {
+				type.type = TileType.VerticalLargeBrick;
+				return type.getStack(1);
+			}
+
+			if (type.type == TileType.Brick) {
+				type.type = TileType.VerticalBrick;
+				return type.getStack(1);
+			}
+
+			if (type.type == TileType.StripeBrick) {
+				type.type = TileType.VerticalStripeBrick;
+				return type.getStack(1);
+			}
+			return null;
+		}
+
+		private boolean isMortar(ItemStack stack) {
+			return stack.getItem() == Botany.misc
+				&& stack.getItemDamage() == BotanyItems.Mortar.ordinal();
 		}
 	}
 
-	public static class BlockType
-	{
-		EnumFlowerColor color1;
-		EnumFlowerColor color2;
-		TileType type;
+	public static class BlockType {
+		protected EnumFlowerColor color1;
+		protected EnumFlowerColor color2;
+		protected TileType type;
 
-		private BlockType(final EnumFlowerColor color1, final EnumFlowerColor color2, final TileType type) {
+		private BlockType(EnumFlowerColor color1, EnumFlowerColor color2, TileType type) {
 			this.color1 = color1;
 			this.color2 = color2;
 			this.type = type;
 		}
 
 		public boolean isTwoColors() {
-			return this.type.canDouble() && this.color2 != this.color1;
+			return type.canDouble() && color2 != color1;
 		}
 
-		public BlockType(final ItemStack stack) {
+		public BlockType(ItemStack stack) {
 			this(TileEntityMetadata.getItemDamage(stack));
 		}
 
-		public ItemStack getStack(final int i) {
-			final ItemStack s = TileEntityMetadata.getItemStack(Botany.ceramicBrick, this.ordinal());
-			s.stackSize = i;
-			return s;
+		public ItemStack getStack(int stackSize) {
+			ItemStack stack = TileEntityMetadata.getItemStack(Botany.ceramicBrick, ordinal());
+			stack.stackSize = stackSize;
+			return stack;
 		}
 
-		public BlockType(final int id) {
-			this.color1 = EnumFlowerColor.get(id & 0xFF);
-			this.color2 = EnumFlowerColor.get(id >> 8 & 0xFF);
-			this.type = TileType.get(id >> 16 & 0xFF);
+		public BlockType(int id) {
+			color1 = EnumFlowerColor.get(id & 0xFF);
+			color2 = EnumFlowerColor.get(id >> 8 & 0xFF);
+			type = TileType.get(id >> 16 & 0xFF);
 		}
 
 		public String getName() {
-			String name = this.color1.getName();
-			if (this.type.canDouble() && this.color2 != this.color1) {
-				name = name + " & " + this.color2.getName();
+			return I18N.localise("botany." + type.name);
+		}
+
+		public void addTooltip(List tooltip) {
+			String name = color1.getName();
+			if (type.canDouble() && color2 != color1) {
+				name = I18N.localise("botany.colour.double", name, color2.getName());
 			}
-			return name + " " + this.type.name;
+			tooltip.add(EnumChatFormatting.GRAY + name);
 		}
 
 		public int ordinal() {
-			return this.color1.ordinal() + this.color2.ordinal() * 256 + this.type.ordinal() * 256 * 256;
+			return color1.ordinal() + color2.ordinal() * 256 + type.ordinal() * 65536;
 		}
 
-		public IIcon getIcon(final int layer) {
-			return this.type.icons[layer];
+		public IIcon getIcon(int layer) {
+			return type.icons[layer];
 		}
 	}
 }

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

@@ -1,35 +1,42 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
+import binnie.botany.CreativeTabBotany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.block.TileEntityMetadata;
+import binnie.core.util.I18N;
+import binnie.extratrees.api.IDesign;
+import binnie.extratrees.carpentry.BlockDesign;
 import binnie.extratrees.carpentry.DesignBlock;
 import binnie.extratrees.carpentry.ModuleCarpentry;
-import binnie.botany.genetics.EnumFlowerColor;
-import net.minecraft.item.ItemStack;
-import binnie.extratrees.api.IDesign;
-import binnie.botany.CreativeTabBotany;
 import net.minecraft.block.material.Material;
-import binnie.extratrees.carpentry.BlockDesign;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
-public class BlockCeramicPatterned extends BlockDesign
-{
+import java.util.List;
+
+public class BlockCeramicPatterned extends BlockDesign {
 	public BlockCeramicPatterned() {
 		super(CeramicDesignSystem.instance, Material.rock);
-		this.setHardness(1.0f);
-		this.setResistance(5.0f);
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setBlockName("ceramicPattern");
+		setHardness(1.0f);
+		setResistance(5.0f);
+		setCreativeTab(CreativeTabBotany.instance);
+		setBlockName("ceramicPattern");
 	}
 
 	@Override
-	public ItemStack getCreativeStack(final IDesign design) {
-		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
+	public ItemStack getCreativeStack(IDesign design) {
+		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
 	}
 
 	@Override
-	public String getBlockName(final DesignBlock design) {
-		return design.getDesign().getName() + " Ceramic Block";
+	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());
 	}
 }

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

@@ -1,46 +1,43 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
-import net.minecraft.util.MovingObjectPosition;
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import java.util.List;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.genetics.EnumFlowerColor;
-import net.minecraftforge.common.util.ForgeDirection;
-import binnie.core.block.TileEntityMetadata;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.entity.player.EntityPlayer;
 import binnie.core.block.BlockMetadata;
-import net.minecraft.item.ItemStack;
-import java.util.ArrayList;
-import net.minecraft.world.World;
+import binnie.core.block.IBlockMetadata;
+import binnie.core.block.TileEntityMetadata;
+import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
-import net.minecraft.util.Facing;
-import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import java.util.Random;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.block.material.Material;
-import binnie.core.block.IBlockMetadata;
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockStained extends Block implements IBlockMetadata
-{
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public class BlockStained extends Block implements IBlockMetadata {
 	public BlockStained() {
 		super(Material.glass);
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setBlockName("stained");
+		setCreativeTab(CreativeTabBotany.instance);
+		setBlockName("stained");
 	}
 
 	@Override
-	public int quantityDropped(final Random p_149745_1_) {
+	public int quantityDropped(Random rand) {
 		return 0;
 	}
 
@@ -62,136 +59,139 @@ public class BlockStained extends Block implements IBlockMetadata
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(final IBlockAccess p_149646_1_, final int p_149646_2_, final int p_149646_3_, final int p_149646_4_, final int p_149646_5_) {
-		final Block block2 = p_149646_1_.getBlock(p_149646_2_ - Facing.offsetsXForSide[p_149646_5_], p_149646_3_ - Facing.offsetsYForSide[p_149646_5_], p_149646_4_ - Facing.offsetsZForSide[p_149646_5_]);
-		final Block block3 = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_);
-		return block3 != this && block3 != ExtraTrees.blockStained && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
+	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(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
+	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(final World world, final EntityPlayer player, final int x, final int y, final int z) {
+	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(final World var1, final int i) {
+	public TileEntity createNewTileEntity(World var1, int i) {
 		return new TileEntityMetadata();
 	}
 
 	@Override
-	public boolean hasTileEntity(final int meta) {
+	public boolean hasTileEntity(int meta) {
 		return true;
 	}
 
 	@Override
-	public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) {
-		super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
-		final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
-		return tileentity != null && tileentity.receiveClientEvent(par5, par6);
+	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(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) {
-		return TileEntityMetadata.getItemDamage(stack);
+	public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) {
+		return TileEntityMetadata.getItemDamage(itemStack);
 	}
 
 	@Override
-	public int getDroppedMeta(final int blockMeta, final int tileMeta) {
+	public int getDroppedMeta(int blockMeta, int tileMeta) {
 		return tileMeta;
 	}
 
 	@Override
-	public String getBlockName(final ItemStack par1ItemStack) {
-		final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
-		return EnumFlowerColor.get(meta).getName() + " Pigmented Glass";
+	public String getBlockName(ItemStack itemStack) {
+		return I18N.localise("botany.pigmentedGlass");
 	}
 
 	@Override
-	public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) {
+	public void addBlockTooltip(ItemStack itemStack, List tooltip) {
+		int meta = TileEntityMetadata.getItemDamage(itemStack);
+		tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(meta).getName());
 	}
 
 	@Override
-	public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) {
-		this.dropBlockAsItem(world, x, y, z, drop);
+	public void dropAsStack(World world, int x, int y, int z, ItemStack stack) {
+		dropBlockAsItem(world, x, y, z, stack);
 	}
 
 	@Override
-	public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
-		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
+	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(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	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 this.getIcon(side, tile.getTileMetadata());
+			return getIcon(side, tile.getTileMetadata());
 		}
 		return super.getIcon(world, x, y, z, side);
 	}
 
 	@Override
-	public IIcon getIcon(final int side, final int meta) {
-		return this.blockIcon;
+	public IIcon getIcon(int side, int meta) {
+		return blockIcon;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister register) {
-		this.blockIcon = Botany.proxy.getIcon(register, "stained");
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = Botany.proxy.getIcon(register, "stained");
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) {
-		final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
+	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+		TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z);
 		if (tile != null) {
-			return this.getRenderColor(tile.getTileMetadata());
+			return getRenderColor(tile.getTileMetadata());
 		}
-		return 16777215;
+		return 0xffffff;
 	}
 
 	@Override
-	public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) {
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
-		par1World.removeTileEntity(par2, par3, par4);
+	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(final IBlockAccess world, final int x, final int y, final int z) {
+	public boolean isWood(IBlockAccess world, int x, int y, int z) {
 		return true;
 	}
 
 	@Override
-	public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
+	public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
 		return 20;
 	}
 
 	@Override
-	public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
+	public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
 		return true;
 	}
 
 	@Override
-	public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) {
+	public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) {
 		return 5;
 	}
 
 	@Override
-	public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) {
+	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(final int meta) {
+	public int getRenderColor(int meta) {
 		return EnumFlowerColor.get(meta).getColor(false);
 	}
 }

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

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

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

@@ -1,56 +1,52 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import binnie.botany.items.BotanyItems;
-import net.minecraft.item.ItemStack;
 import binnie.botany.Botany;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.botany.items.BotanyItems;
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import binnie.extratrees.carpentry.EnumPattern;
-import binnie.extratrees.api.IPattern;
-import binnie.botany.genetics.EnumFlowerColor;
 import binnie.extratrees.api.IDesignMaterial;
-import binnie.extratrees.carpentry.DesignerManager;
-import java.util.HashMap;
-import net.minecraft.util.IIcon;
-import java.util.Map;
 import binnie.extratrees.api.IDesignSystem;
+import binnie.extratrees.api.IPattern;
+import binnie.extratrees.carpentry.DesignerManager;
+import binnie.extratrees.carpentry.EnumPattern;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
-public class CeramicDesignSystem implements IDesignSystem
-{
-	public static CeramicDesignSystem instance;
-	Map<Integer, IIcon> primary;
-	Map<Integer, IIcon> secondary;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CeramicDesignSystem implements IDesignSystem {
+	public static CeramicDesignSystem instance = new CeramicDesignSystem();
+
+	protected Map<Integer, IIcon> primary;
+	protected Map<Integer, IIcon> secondary;
 
 	CeramicDesignSystem() {
-		this.primary = new HashMap<Integer, IIcon>();
-		this.secondary = new HashMap<Integer, IIcon>();
+		primary = new HashMap<>();
+		secondary = new HashMap<>();
 		DesignerManager.instance.registerDesignSystem(this);
 	}
 
 	@Override
 	public IDesignMaterial getDefaultMaterial() {
-		return CeramicColor.get(EnumFlowerColor.White);
+		return CeramicColor.get(EnumFlowerColor.WHITE);
 	}
 
 	@Override
 	public IDesignMaterial getDefaultMaterial2() {
-		return CeramicColor.get(EnumFlowerColor.Black);
+		return CeramicColor.get(EnumFlowerColor.BLACK);
 	}
 
 	@Override
-	public IDesignMaterial getMaterial(final int id) {
+	public IDesignMaterial getMaterial(int id) {
 		return CeramicColor.get(EnumFlowerColor.get(id));
 	}
 
 	@Override
-	public int getMaterialIndex(final IDesignMaterial id) {
+	public int getMaterialIndex(IDesignMaterial id) {
 		return ((CeramicColor) id).color.ordinal();
 	}
 
@@ -59,26 +55,26 @@ public class CeramicDesignSystem implements IDesignSystem
 	}
 
 	@Override
-	public IIcon getPrimaryIcon(final IPattern pattern) {
+	public IIcon getPrimaryIcon(IPattern pattern) {
 		if (pattern instanceof EnumPattern) {
-			return this.primary.get(((EnumPattern) pattern).ordinal());
+			return primary.get(((EnumPattern) pattern).ordinal());
 		}
 		return null;
 	}
 
 	@Override
-	public IIcon getSecondaryIcon(final IPattern pattern) {
+	public IIcon getSecondaryIcon(IPattern pattern) {
 		if (pattern instanceof EnumPattern) {
-			return this.secondary.get(((EnumPattern) pattern).ordinal());
+			return secondary.get(((EnumPattern) pattern).ordinal());
 		}
 		return null;
 	}
 
 	@Override
-	public void registerIcons(final IIconRegister register) {
-		for (final EnumPattern pattern : EnumPattern.values()) {
-			this.primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"));
-			this.secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"));
+	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"));
 		}
 	}
 
@@ -92,11 +88,7 @@ public class CeramicDesignSystem implements IDesignSystem
 	}
 
 	@Override
-	public IDesignMaterial getMaterial(final ItemStack itemStack) {
-		return (itemStack.getItem() == Item.getItemFromBlock(Botany.ceramic)) ? this.getMaterial(itemStack.getItemDamage()) : null;
-	}
-
-	static {
-		CeramicDesignSystem.instance = new CeramicDesignSystem();
+	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,43 +1,39 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
-import java.util.List;
-import java.util.ArrayList;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import binnie.botany.Botany;
-import net.minecraft.world.World;
 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;
 
-public class CeramicTileRecipe implements IRecipe
-{
-	ItemStack cached;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CeramicTileRecipe implements IRecipe {
+	protected ItemStack cached;
 
 	@Override
-	public boolean matches(final InventoryCrafting inv, final World world) {
-		this.cached = this.getCraftingResult(inv);
-		return this.cached != null;
+	public boolean matches(InventoryCrafting crafting, World world) {
+		cached = getCraftingResult(crafting);
+		return cached != null;
 	}
 
 	@Override
-	public ItemStack getCraftingResult(final InventoryCrafting inv) {
-		final Item ceramicBlock = Item.getItemFromBlock(Botany.ceramic);
-		final Item ceramicTile = Item.getItemFromBlock(Botany.ceramicTile);
-		final Item ceramicBrick = Item.getItemFromBlock(Botany.ceramicBrick);
-		final Item mortar = Botany.misc;
-		final List<ItemStack> stacks = new ArrayList<ItemStack>();
+	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) {
-			final ItemStack stack = inv.getStackInSlot(i);
+			ItemStack stack = inv.getStackInSlot(i);
 			if (stack != null) {
-				final int x = i / 3;
-				final int y = i % 3;
+				int x = i / 3;
+				int y = i % 3;
 				if (ix == -1) {
 					ix = x;
 					iy = y;
@@ -45,14 +41,17 @@ public class CeramicTileRecipe implements IRecipe
 				if (x - ix >= 2 || y - iy >= 2 || y < iy || x < ix) {
 					return null;
 				}
-				if (stack.getItem() != ceramicBlock && stack.getItem() != ceramicTile && stack.getItem() != ceramicBrick && stack.getItem() != mortar) {
+				
+				Item item = stack.getItem();
+				if (item != ceramicBlock && item != ceramicTile && item != ceramicBrick && item != mortar) {
 					return null;
 				}
 				stacks.add(stack);
 			}
 		}
-		for (final BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
-			final ItemStack stack2 = type.getRecipe(stacks);
+
+		for (BlockCeramicBrick.TileType type : BlockCeramicBrick.TileType.values()) {
+			ItemStack stack2 = type.getRecipe(stacks);
 			if (stack2 != null) {
 				return stack2;
 			}
@@ -67,6 +66,6 @@ public class CeramicTileRecipe implements IRecipe
 
 	@Override
 	public ItemStack getRecipeOutput() {
-		return this.cached;
+		return cached;
 	}
 }

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

@@ -1,24 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie.botany.ceramic;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.ItemStack;
-import net.minecraft.block.Block;
-import binnie.core.block.ItemMetadata;
-
-public class ItemCeramic extends ItemMetadata
-{
-	public ItemCeramic(final Block block) {
-		super(block);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(final ItemStack stack, final int p_82790_2_) {
-		return 16711935;
-	}
-}

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

@@ -1,42 +1,37 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.ceramic;
 
-import binnie.botany.api.IFlower;
-import net.minecraft.item.Item;
-import binnie.botany.Botany;
 import binnie.Binnie;
-import net.minecraft.world.World;
+import binnie.botany.Botany;
+import binnie.botany.api.IFlower;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.world.World;
 
-public class PigmentRecipe implements IRecipe
-{
-	private final ItemStack unknown;
-	ItemStack cached;
+public class PigmentRecipe implements IRecipe {
+	protected ItemStack cached;
+
+	private ItemStack unknown;
 
 	public PigmentRecipe() {
-		this.unknown = null;
+		unknown = null;
 	}
 
 	@Override
-	public boolean matches(final InventoryCrafting crafting, final World world) {
-		return this.getCraftingResult(crafting) != null;
+	public boolean matches(InventoryCrafting crafting, World world) {
+		return getCraftingResult(crafting) != null;
 	}
 
 	@Override
 	public ItemStack getRecipeOutput() {
-		if (this.cached != null) {
-			return this.cached;
+		if (cached != null) {
+			return cached;
 		}
-		return this.unknown;
+		return unknown;
 	}
 
 	@Override
-	public ItemStack getCraftingResult(final InventoryCrafting crafting) {
+	public ItemStack getCraftingResult(InventoryCrafting crafting) {
 		int n = 0;
 		ItemStack stack = null;
 		for (int i = 0; i < crafting.getSizeInventory(); ++i) {
@@ -44,11 +39,13 @@ public class PigmentRecipe implements IRecipe
 				if (++n > 1) {
 					return null;
 				}
-				if (Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) {
-					final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i));
-					if (flower.getAge() >= 1) {
-						stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID());
-					}
+				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());
 				}
 			}
 		}

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

@@ -1,22 +1,12 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.core;
 
-import binnie.botany.genetics.FlowerHelper;
 import binnie.botany.api.IFlowerRoot;
+import binnie.botany.genetics.FlowerHelper;
 
-public class BotanyCore
-{
-	public static final int CHANCE_INTERPOLLINATION = 20;
-	public static IFlowerRoot speciesRoot;
+public class BotanyCore {
+	public static IFlowerRoot speciesRoot = new FlowerHelper();
 
 	public static IFlowerRoot getFlowerRoot() {
 		return BotanyCore.speciesRoot;
 	}
-
-	static {
-		BotanyCore.speciesRoot = new FlowerHelper();
-	}
 }

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

@@ -1,37 +1,25 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.core;
 
-import net.minecraft.tileentity.TileEntity;
-import binnie.craftgui.botany.WindowBotanistDatabase;
-import net.minecraft.inventory.IInventory;
-import binnie.craftgui.minecraft.Window;
-import cpw.mods.fml.relauncher.Side;
-import net.minecraft.world.World;
-import net.minecraft.entity.player.EntityPlayer;
+import binnie.botany.craftgui.WindowBotanistDatabase;
+import binnie.core.craftgui.minecraft.Window;
 import binnie.core.gui.IBinnieGUID;
+import cpw.mods.fml.relauncher.Side;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
 
-public enum BotanyGUI implements IBinnieGUID
-{
+public enum BotanyGUI implements IBinnieGUID {
 	Database,
 	DatabaseNEI;
 
 	@Override
-	public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
+	public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) {
 		Window window = null;
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
-		IInventory object = null;
-		if (tileEntity instanceof IInventory) {
-			object = (IInventory) tileEntity;
-		}
 		switch (this) {
-		case Database:
-		case DatabaseNEI: {
-			window = WindowBotanistDatabase.create(player, side, this != BotanyGUI.Database);
-			break;
-		}
+			case Database:
+			case DatabaseNEI: {
+				window = WindowBotanistDatabase.create(player, side, this != BotanyGUI.Database);
+				break;
+			}
 		}
 		return window;
 	}

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

@@ -1,28 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie.botany.core;
-
-import binnie.extrabees.ExtraBees;
-import binnie.Binnie;
-import binnie.core.resource.BinnieResource;
-import binnie.core.resource.ResourceType;
-import binnie.core.resource.IBinnieTexture;
-
-public enum BotanyTexture implements IBinnieTexture
-{
-	;
-	String texture;
-	ResourceType type;
-
-	private BotanyTexture(final ResourceType base, final String texture) {
-		this.texture = texture;
-		this.type = base;
-	}
-
-	@Override
-	public BinnieResource getTexture() {
-		return Binnie.Resource.getPNG(ExtraBees.instance, this.type, this.texture);
-	}
-}

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

@@ -1,36 +1,20 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.core;
 
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.EnumMoisture;
-import binnie.botany.Botany;
-import binnie.Binnie;
-import binnie.botany.api.EnumAcidity;
 import binnie.core.IInitializable;
 
-public class ModuleCore implements IInitializable
-{
+public class ModuleCore implements IInitializable {
 	@Override
 	public void preInit() {
-		for (final EnumAcidity pH : EnumAcidity.values()) {
-			Binnie.Language.addObjectName(pH, Binnie.Language.unlocalised(Botany.instance, "ph." + pH.getID()));
-		}
-		for (final EnumMoisture pH2 : EnumMoisture.values()) {
-			Binnie.Language.addObjectName(pH2, Binnie.Language.unlocalised(Botany.instance, "moisture." + pH2.getID()));
-		}
-		for (final EnumSoilType pH3 : EnumSoilType.values()) {
-			Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getID()));
-		}
+		// ignored
 	}
 
 	@Override
 	public void init() {
+		// ignored
 	}
 
 	@Override
 	public void postInit() {
+		// ignored
 	}
 }

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

@@ -0,0 +1,43 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IFlowerColor;
+import binnie.core.craftgui.CraftGUI;
+import binnie.core.craftgui.ITooltip;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.Tooltip;
+import binnie.core.craftgui.WidgetAttribute;
+import binnie.core.craftgui.controls.core.Control;
+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;
+
+	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 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 getTooltip(Tooltip tooltip) {
+		super.getTooltip(tooltip);
+		tooltip.add(value.getName());
+	}
+}

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

@@ -0,0 +1,24 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.listbox.ControlListBox;
+
+public class ControlColorMixBox extends ControlListBox<IColourMix> {
+	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;
+	}
+
+	@Override
+	public IWidget createOption(IColourMix value, int y) {
+		return new ControlColorMixItem(getContent(), value, y);
+	}
+
+	enum Type {
+		Resultant,
+		Further
+	}
+}

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

@@ -0,0 +1,30 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+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;
+
+	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());
+		}
+	}
+}

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

@@ -0,0 +1,28 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IFlowerColor;
+import binnie.core.craftgui.CraftGUI;
+import binnie.core.craftgui.WidgetAttribute;
+import binnie.core.craftgui.controls.listbox.ControlList;
+import binnie.core.craftgui.controls.listbox.ControlTextOption;
+import binnie.core.craftgui.geometry.CraftGUIUtil;
+import binnie.core.craftgui.geometry.IPoint;
+
+public class ControlColorOption extends ControlTextOption<IFlowerColor> {
+	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);
+	}
+}

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

@@ -0,0 +1,52 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.core.craftgui.CraftGUI;
+import binnie.core.craftgui.ITooltip;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.Tooltip;
+import binnie.core.craftgui.WidgetAttribute;
+import binnie.core.craftgui.controls.core.Control;
+import binnie.core.craftgui.geometry.IPoint;
+import binnie.core.craftgui.resource.Texture;
+import binnie.core.craftgui.resource.minecraft.CraftGUITextureSheet;
+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 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);
+	}
+
+	@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);
+	}
+
+	@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

@@ -0,0 +1,36 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.botany.api.IFlowerColor;
+import binnie.botany.core.BotanyCore;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.ControlText;
+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;
+
+	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);
+	}
+}

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

@@ -0,0 +1,36 @@
+package binnie.botany.craftgui;
+
+import binnie.botany.api.IColourMix;
+import binnie.botany.api.IFlowerColor;
+import binnie.botany.core.BotanyCore;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.ControlText;
+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;
+
+	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);
+	}
+}

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

@@ -0,0 +1,108 @@
+package binnie.botany.craftgui;
+
+import binnie.Binnie;
+import binnie.botany.api.EnumFlowerChromosome;
+import binnie.botany.api.EnumFlowerStage;
+import binnie.botany.api.IAlleleFlowerSpecies;
+import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerGenome;
+import binnie.botany.core.BotanyCore;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.ControlText;
+import binnie.core.craftgui.controls.core.Control;
+import binnie.core.craftgui.controls.scroll.ControlScrollableContent;
+import binnie.core.craftgui.database.DatabaseTab;
+import binnie.core.craftgui.database.PageSpecies;
+import binnie.core.craftgui.geometry.IArea;
+import binnie.core.craftgui.geometry.IPoint;
+import binnie.core.craftgui.geometry.TextJustification;
+import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
+import binnie.core.util.I18N;
+import binnie.genetics.genetics.AlleleHelper;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IAlleleSpecies;
+import forestry.api.genetics.IIndividual;
+import net.minecraft.item.ItemStack;
+
+public class PageSpeciesFlowerGenome extends PageSpecies {
+	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;
+		}
+
+		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;
+
+		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;
+
+		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.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;
+
+		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 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

@@ -0,0 +1,91 @@
+package binnie.botany.craftgui;
+
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.botany.api.IFlowerColor;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.core.AbstractMod;
+import binnie.core.craftgui.IWidget;
+import binnie.core.craftgui.controls.listbox.ControlListBox;
+import binnie.core.craftgui.database.DatabaseTab;
+import binnie.core.craftgui.database.IDatabaseMode;
+import binnie.core.craftgui.database.PageBranchOverview;
+import binnie.core.craftgui.database.PageBranchSpecies;
+import binnie.core.craftgui.database.PageBreeder;
+import binnie.core.craftgui.database.PageSpeciesClassification;
+import binnie.core.craftgui.database.PageSpeciesMutations;
+import binnie.core.craftgui.database.PageSpeciesOverview;
+import binnie.core.craftgui.database.PageSpeciesResultant;
+import binnie.core.craftgui.database.WindowAbstractDatabase;
+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;
+
+public class WindowBotanistDatabase extends WindowAbstractDatabase {
+	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);
+	}
+
+	@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 String getName() {
+		return I18N.localise("botany.gui.database.name");
+	}
+
+	enum FlowerMode implements IDatabaseMode {
+		COLOR;
+
+		@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);
+		}
+
+		@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

@@ -1,67 +1,74 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.farm;
 
-import net.minecraft.item.ItemStack;
-
-import forestry.api.circuits.ChipsetManager;
-import forestry.api.farming.FarmDirection;
-import forestry.api.farming.IFarmHousing;
-import forestry.api.farming.IFarmLogic;
-import binnie.Binnie;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.core.circuits.BinnieCircuit;
+import binnie.core.util.I18N;
+import forestry.api.circuits.ChipsetManager;
+import forestry.api.farming.FarmDirection;
+import forestry.api.farming.IFarmHousing;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
-public class CircuitGarden extends BinnieCircuit
-{
-	private Class<? extends FarmLogic> logicClass;
+public class CircuitGarden extends BinnieCircuit {
 	private boolean isManual;
 	private boolean isFertilised;
 	private ItemStack icon;
 	private EnumMoisture moisture;
 	private EnumAcidity acidity;
 
-	public CircuitGarden(final EnumMoisture moisture, final EnumAcidity ph, final boolean manual, final boolean fertilised, final ItemStack recipe, final ItemStack icon) {
+	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.isManual = false;
-		this.isFertilised = false;
-		this.isManual = manual;
-		this.isFertilised = fertilised;
 		this.moisture = moisture;
-		this.acidity = ph;
 		this.icon = icon;
+		isManual = manual;
+		isFertilised = fertilised;
+		acidity = ph;
 		String info = "";
-		if (moisture == EnumMoisture.Dry) {
-			info += "§eDry§f";
+
+		if (moisture == EnumMoisture.DRY) {
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.moisture.dry")
+				+ EnumChatFormatting.RESET;
 		}
-		if (moisture == EnumMoisture.Damp) {
-			info += "§9Damp§f";
+
+		if (moisture == EnumMoisture.DAMP) {
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.moisture.damp")
+				+ EnumChatFormatting.RESET;
 		}
-		if (this.acidity == EnumAcidity.Acid) {
+
+		if (acidity == EnumAcidity.ACID) {
 			if (info.length() > 0) {
 				info += ", ";
 			}
-			info += "§cAcidic§f";
+			info += EnumChatFormatting.RED
+				+ I18N.localise("botany.ph.acid")
+				+ EnumChatFormatting.RESET;
 		}
-		if (this.acidity == EnumAcidity.Neutral) {
+
+		if (acidity == EnumAcidity.NEUTRAL) {
 			if (info.length() > 0) {
 				info += ", ";
 			}
-			info += "§aNeutral§f";
+			info += EnumChatFormatting.GREEN
+				+ I18N.localise("botany.ph.neutral")
+				+ EnumChatFormatting.RESET;
 		}
-		if (this.acidity == EnumAcidity.Alkaline) {
+
+		if (acidity == EnumAcidity.ALKALINE) {
 			if (info.length() > 0) {
 				info += ", ";
 			}
-			info += "§bAlkaline§f";
+			info += EnumChatFormatting.AQUA
+				+ I18N.localise("botany.ph.alkaline")
+				+ EnumChatFormatting.RESET;
 		}
+
 		if (info.length() > 0) {
-			info = " (" + info + "§f)";
+			info = " (" + info + EnumChatFormatting.RESET + ")";
 		}
-		this.addTooltipString("Flowers" + info);
+		addTooltipString(I18N.localise("botany.circuit.flowers") + info);
 	}
 
 	@Override
@@ -71,22 +78,23 @@ public class CircuitGarden extends BinnieCircuit
 
 	@Override
 	public void onInsertion(int slot, Object tile) {
-		if (!this.isCircuitable(tile)) {
+		if (!isCircuitable(tile)) {
 			return;
 		}
-		final GardenLogic logic = new GardenLogic((IFarmHousing) tile);
-		logic.setData(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.Language.localise(this.getName()));
+
+		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) {
-		this.onInsertion(slot, tile);
+		onInsertion(slot, tile);
 	}
 
 	@Override
 	public void onRemoval(int slot, Object tile) {
-		if (!this.isCircuitable(tile)) {
+		if (!isCircuitable(tile)) {
 			return;
 		}
 		((IFarmHousing) tile).resetFarmLogic(FarmDirection.values()[slot]);
@@ -94,6 +102,6 @@ public class CircuitGarden extends BinnieCircuit
 
 	@Override
 	public void onTick(int arg0, Object arg1) {
+		// ignored
 	}
-
 }

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

@@ -1,61 +1,58 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.farm;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-
 import forestry.api.farming.FarmDirection;
 import forestry.api.farming.IFarmHousing;
-
+import forestry.api.farming.IFarmLogic;
+import forestry.core.utils.vect.Vect;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import forestry.api.farming.IFarmLogic;
+public abstract class FarmLogic implements IFarmLogic {
+	protected World world;
+	protected IFarmHousing housing;
+	protected boolean isManual;
 
-public abstract class FarmLogic implements IFarmLogic
-{
-	World world;
-	IFarmHousing housing;
-	boolean isManual;
-
-	public FarmLogic(final IFarmHousing housing) {
+	public FarmLogic(IFarmHousing housing) {
 		this.housing = housing;
 	}
 
 	@Override
-	public IFarmLogic setManual(final boolean flag) {
-		this.isManual = flag;
+	public IFarmLogic setManual(boolean flag) {
+		isManual = flag;
 		return this;
 	}
 
-	protected final boolean isAirBlock(final Vect position) {
-		return this.world.isAirBlock(position.x, position.y, position.z);
+	protected boolean isAirBlock(Vect position) {
+		return world.isAirBlock(position.x, position.y, position.z);
 	}
 
-	protected final boolean isWaterBlock(final Vect position) {
-		return this.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 final Block getBlock(final Vect position) {
-		return this.world.getBlock(position.x, position.y, position.z);
+	protected Block getBlock(Vect position) {
+		return world.getBlock(position.x, position.y, position.z);
 	}
 
-	protected final int getBlockMeta(final Vect position) {
-		return this.world.getBlockMetadata(position.x, position.y, position.z);
+	protected int getBlockMeta(Vect position) {
+		return world.getBlockMetadata(position.x, position.y, position.z);
 	}
 
-	protected final ItemStack getAsItemStack(final Vect position) {
-		return new ItemStack(this.getBlock(position), 1, this.getBlockMeta(position));
+	protected ItemStack getAsItemStack(Vect position) {
+		return new ItemStack(getBlock(position), 1, getBlockMeta(position));
 	}
 
-	protected final Vect translateWithOffset(final int x, final int y, final int z, final FarmDirection direction, final 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 final void setBlock(final Vect position, final Block block, final int meta) {
-		this.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

@@ -1,46 +1,41 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.farm;
 
-import binnie.botany.api.IFlower;
-import binnie.botany.gardening.Gardening;
-import net.minecraft.entity.player.EntityPlayer;
-import binnie.botany.api.EnumFlowerStage;
-import binnie.botany.core.BotanyCore;
-import net.minecraft.item.ItemStack;
-import forestry.api.farming.ICrop;
 import binnie.botany.Botany;
-import net.minecraft.world.World;
+import binnie.botany.api.EnumFlowerStage;
+import binnie.botany.api.IFlower;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.gardening.Gardening;
+import forestry.api.farming.ICrop;
 import forestry.api.farming.IFarmable;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 
-public class FarmableFlower implements IFarmable
-{
+public class FarmableFlower implements IFarmable {
 	@Override
-	public boolean isSaplingAt(final World world, final int x, final int y, final int z) {
+	public boolean isSaplingAt(World world, int x, int y, int z) {
 		return world.getBlock(x, y, z) == Botany.flower;
 	}
 
 	@Override
-	public ICrop getCropAt(final World world, final int x, final int y, final int z) {
+	public ICrop getCropAt(World world, int x, int y, int z) {
 		return null;
 	}
 
 	@Override
-	public boolean isGermling(final ItemStack itemstack) {
-		final EnumFlowerStage stage = BotanyCore.speciesRoot.getStageType(itemstack);
+	public boolean isGermling(ItemStack itemstack) {
+		EnumFlowerStage stage = BotanyCore.speciesRoot.getStageType(itemstack);
 		return stage == EnumFlowerStage.FLOWER || stage == EnumFlowerStage.SEED;
 	}
 
 	@Override
-	public boolean isWindfall(final ItemStack itemstack) {
+	public boolean isWindfall(ItemStack itemstack) {
 		return false;
 	}
 
 	@Override
-	public boolean plantSaplingAt(final EntityPlayer player, final ItemStack germling, final World world, final int x, final int y, final int z) {
-		final IFlower flower = BotanyCore.getFlowerRoot().getMember(germling);
+	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

@@ -1,26 +1,21 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.farm;
 
 import binnie.botany.api.IFlower;
-import binnie.botany.gardening.Gardening;
-import net.minecraft.world.World;
-import net.minecraft.entity.player.EntityPlayer;
 import binnie.botany.core.BotanyCore;
+import binnie.botany.gardening.Gardening;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 
-public class FarmableVanillaFlower extends FarmableFlower
-{
+public class FarmableVanillaFlower extends FarmableFlower {
 	@Override
-	public boolean isGermling(final ItemStack itemstack) {
+	public boolean isGermling(ItemStack itemstack) {
 		return BotanyCore.getFlowerRoot().getConversion(itemstack) != null;
 	}
 
 	@Override
-	public boolean plantSaplingAt(final EntityPlayer player, final ItemStack germling, final World world, final int x, final int y, final int z) {
-		final IFlower flower = BotanyCore.getFlowerRoot().getConversion(germling);
+	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

@@ -1,167 +1,174 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.farm;
 
-import net.minecraft.tileentity.TileEntity;
-
-import com.mojang.authlib.GameProfile;
-
-import binnie.core.Mods;
-import binnie.botany.flower.TileEntityFlower;
-import forestry.core.access.IOwnable;
-
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.util.ResourceLocation;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.util.IIcon;
-
-import forestry.api.farming.ICrop;
-
-import net.minecraftforge.fluids.FluidStack;
-
 import binnie.Binnie;
-
-import net.minecraft.item.ItemBlock;
-import net.minecraft.world.IBlockAccess;
-
 import binnie.botany.Botany;
-import binnie.botany.api.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-
-import java.util.Collection;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.init.Blocks;
-
-import binnie.botany.gardening.Gardening;
-import forestry.api.farming.FarmDirection;
-import forestry.api.farming.IFarmHousing;
-import forestry.api.farming.IFarmable;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-
-import java.util.ArrayList;
-
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.gardening.IBlockSoil;
+import binnie.botany.flower.TileEntityFlower;
+import binnie.botany.gardening.Gardening;
+import com.mojang.authlib.GameProfile;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.farming.FarmDirection;
+import forestry.api.farming.ICrop;
+import forestry.api.farming.IFarmHousing;
+import forestry.api.farming.IFarmable;
+import forestry.core.access.IOwnable;
+import forestry.core.utils.vect.Vect;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+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;
 
-public class GardenLogic extends FarmLogic
-{
-	EnumMoisture moisture;
-	EnumAcidity acidity;
-	boolean fertilised;
-	String name;
-	ArrayList<ItemStack> produce;
 	private ItemStack icon;
-	List<IFarmable> farmables;
 
-	public GardenLogic(final IFarmHousing housing) {
+	public GardenLogic(IFarmHousing housing) {
 		super(housing);
-		this.produce = new ArrayList<ItemStack>();
-		(this.farmables = new ArrayList<IFarmable>()).add(new FarmableFlower());
-		this.farmables.add(new FarmableVanillaFlower());
+		produce = new ArrayList<>();
+		farmables = new ArrayList<>();
+		farmables.add(new FarmableFlower());
+		farmables.add(new FarmableVanillaFlower());
 	}
 
 	@Override
 	public int getFertilizerConsumption() {
-		return this.fertilised ? 8 : 2;
+		return fertilised ? 8 : 2;
 	}
 
 	@Override
-	public int getWaterConsumption(final float hydrationModifier) {
-		return (int) (this.moisture.ordinal() * 40 * hydrationModifier);
+	public int getWaterConsumption(float hydrationModifier) {
+		return (int) (moisture.ordinal() * 40 * hydrationModifier);
 	}
 
 	@Override
-	public boolean isAcceptedResource(final ItemStack itemstack) {
-		return Gardening.isSoil(itemstack.getItem()) || itemstack.getItem() == Item.getItemFromBlock(Blocks.sand) || itemstack.getItem() == Item.getItemFromBlock(Blocks.dirt) || Gardening.isAcidFertiliser(itemstack) || Gardening.isAlkalineFertiliser(itemstack);
+	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() {
-		final Collection<ItemStack> products = this.produce;
-		this.produce = new ArrayList<ItemStack>();
+		Collection<ItemStack> products = produce;
+		produce = new ArrayList<>();
 		return products;
 	}
 
 	@Override
-	public boolean cultivate(final int x, final int y, final int z, final FarmDirection direction, final int extent) {
-		this.world = this.housing.getWorld();
-		return this.maintainSoil(x, y, z, direction, extent) || (!this.isManual && this.maintainWater(x, y, z, direction, extent)) || this.maintainCrops(x, y + 1, z, direction, extent);
+	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(final ItemStack stack) {
+	private boolean isWaste(ItemStack stack) {
 		return stack.getItem() == Item.getItemFromBlock(Blocks.dirt);
 	}
 
-	private boolean maintainSoil(final int x2, final int y2, final int z2, final FarmDirection direction, final int extent) {
+	private boolean maintainSoil(int x, int y, int z, FarmDirection direction, int extent) {
 		for (int i = 0; i < extent; ++i) {
-			final Vect position = this.translateWithOffset(x2, y2, z2, direction, i);
-			if (this.fertilised && Gardening.isSoil(this.world.getBlock(position.x, position.y, position.z))) {
-				final IBlockSoil soil = (IBlockSoil) this.world.getBlock(position.x, position.y, position.z);
-				if (soil.fertilise(this.world, position.x, position.y, position.z, EnumSoilType.FLOWERBED)) {
+			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);
+				}
+			}
+
+			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 (this.world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
-				this.world.setBlockToAir(position.x, position.y + 1, position.z);
+
+			if (world.getBlock(position.x, position.y + 1, position.z) == Botany.plant) {
+				world.setBlockToAir(position.x, position.y + 1, position.z);
+				continue;
 			}
-			else {
-				if (this.acidity != null && Gardening.isSoil(this.world.getBlock(position.x, position.y, position.z))) {
-					final IBlockSoil soil = (IBlockSoil) this.world.getBlock(position.x, position.y, position.z);
-					final EnumAcidity pH = soil.getPH(this.world, position.x, position.y, position.z);
-					if (pH.ordinal() < this.acidity.ordinal()) {
-						final ItemStack stack = this.getAvailableAlkaline();
-						if (stack != null && soil.setPH(this.world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) {
-							this.housing.getFarmInventory().removeResources(new ItemStack[] { stack });
-							continue;
-						}
-					}
-					if (pH.ordinal() > this.acidity.ordinal()) {
-						final ItemStack stack = this.getAvailableAcid();
-						if (stack != null && soil.setPH(this.world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) {
-							this.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 (!this.isAirBlock(position) && !this.world.getBlock(position.x, position.y, position.z).isReplaceable(this.world, position.x, position.y, position.z)) {
-					final ItemStack block = this.getAsItemStack(position);
-					final ItemStack loam = this.getAvailableLoam();
-					if (this.isWaste(block) && loam != null) {
-						this.produce.addAll(Blocks.dirt.getDrops(this.world, position.x, position.y, position.z, block.getItemDamage(), 0));
-						this.setBlock(position, Blocks.air, 0);
-						return this.trySetSoil(position, loam);
+
+				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;
 					}
 				}
-				else if (!this.isManual) {
-					if (!this.isWaterBlock(position)) {
-						if (i % 2 == 0) {
-							return this.trySetSoil(position);
-						}
-						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;
-						}
-						final Vect previous = this.translateWithOffset(position.x, position.y, position.z, cclock, 1);
-						final ItemStack soil2 = this.getAsItemStack(previous);
-						if (!Gardening.isSoil(soil2.getItem())) {
-							this.trySetSoil(position);
-						}
+			}
+
+			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);
+					}
+
+					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;
+					}
+
+					Vect previous = translateWithOffset(position.x, position.y, position.z, cclock, 1);
+					ItemStack soil2 = getAsItemStack(previous);
+					if (!Gardening.isSoil(soil2.getItem())) {
+						trySetSoil(position);
 					}
 				}
 			}
@@ -169,29 +176,31 @@ public class GardenLogic extends FarmLogic
 		return false;
 	}
 
-	private boolean maintainWater(final int x, final int y, final int z, final FarmDirection direction, final int extent) {
+	private boolean maintainWater(int x, int y, int z, FarmDirection direction, int extent) {
 		for (int i = 0; i < extent; ++i) {
-			final Vect position = this.translateWithOffset(x, y, z, direction, i);
-			if (this.isAirBlock(position) || this.world.getBlock(x, y, z).isReplaceable(this.world, position.x, position.y, position.z)) {
-				if (!this.isWaterBlock(position)) {
-					boolean isEnclosed = true;
-					if (this.world.isAirBlock(position.x + 1, position.y, position.z)) {
-						isEnclosed = false;
-					}
-					else if (this.world.isAirBlock(position.x - 1, position.y, position.z)) {
-						isEnclosed = false;
-					}
-					else if (this.world.isAirBlock(position.x, position.y, position.z + 1)) {
-						isEnclosed = false;
-					}
-					else if (this.world.isAirBlock(position.x, position.y, position.z - 1)) {
-						isEnclosed = false;
-					}
-					isEnclosed = (isEnclosed || this.moisture != EnumMoisture.Damp);
-					if (isEnclosed) {
-						return this.trySetWater(position);
-					}
-				}
+			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;
+			}
+
+			if (isWaterBlock(position)) {
+				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;
+			}
+
+			isEnclosed = (isEnclosed || moisture != EnumMoisture.DAMP);
+			if (isEnclosed) {
+				return trySetWater(position);
 			}
 		}
 		return false;
@@ -199,82 +208,108 @@ public class GardenLogic extends FarmLogic
 
 	private ItemStack getAvailableLoam() {
 		EnumMoisture[] moistures;
-		if (this.moisture == EnumMoisture.Damp) {
-			moistures = new EnumMoisture[] { EnumMoisture.Damp, EnumMoisture.Normal, EnumMoisture.Dry };
+		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
+			};
 		}
-		else if (this.moisture == EnumMoisture.Damp) {
-			moistures = new EnumMoisture[] { EnumMoisture.Dry, EnumMoisture.Damp, EnumMoisture.Dry };
-		}
-		else {
-			moistures = new EnumMoisture[] { EnumMoisture.Dry, EnumMoisture.Normal, EnumMoisture.Damp };
-		}
-		final EnumAcidity[] acidities = { EnumAcidity.Neutral, EnumAcidity.Acid, EnumAcidity.Alkaline };
-		for (final EnumMoisture moist : moistures) {
-			for (final EnumAcidity acid : acidities) {
-				for (final Block type : new Block[] { Botany.flowerbed, Botany.loam, Botany.soil }) {
-					final int meta = acid.ordinal() * 3 + moist.ordinal();
-					final ItemStack[] resource = { new ItemStack(type, 1, meta) };
-					if (this.housing.getFarmInventory().hasResources(resource)) {
+
+		EnumAcidity[] acidities = {
+			EnumAcidity.NEUTRAL,
+			EnumAcidity.ACID,
+			EnumAcidity.ALKALINE
+		};
+
+		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];
 					}
 				}
 			}
 		}
-		if (this.housing.getFarmInventory().hasResources(new ItemStack[] { new ItemStack(Blocks.dirt) })) {
+
+		if (housing.getFarmInventory().hasResources(new ItemStack[]{new ItemStack(Blocks.dirt)})) {
 			return new ItemStack(Blocks.dirt);
 		}
 		return null;
 	}
 
-	private boolean trySetSoil(final Vect position) {
-		return this.trySetSoil(position, this.getAvailableLoam());
+	private boolean trySetSoil(Vect position) {
+		return trySetSoil(position, getAvailableLoam());
 	}
 
-	private boolean trySetSoil(final Vect position, ItemStack loam) {
+	private boolean trySetSoil(Vect position, ItemStack loam) {
 		ItemStack copy = loam;
-		if (loam != null) {
-			if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) {
-				loam = new ItemStack(Botany.soil, 0, 4);
-			}
-			this.setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
-			this.housing.getFarmInventory().removeResources(new ItemStack[] { copy });
-			return true;
+		if (loam == null) {
+			return false;
 		}
-		return false;
+
+		if (loam.getItem() == Item.getItemFromBlock(Blocks.dirt)) {
+			loam = new ItemStack(Botany.soil, 0, 4);
+		}
+
+		setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage());
+		housing.getFarmInventory().removeResources(new ItemStack[]{copy});
+		return true;
 	}
 
-	private boolean trySetWater(final Vect position) {
-		final FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
-		if (this.moisture == EnumMoisture.Damp) {
-			if (!this.housing.hasLiquid(water)) {
+	private boolean trySetWater(Vect position) {
+		FluidStack water = Binnie.Liquid.getLiquidStack("water", 1000);
+		if (moisture == EnumMoisture.DAMP) {
+			if (!housing.hasLiquid(water)) {
 				return false;
 			}
-			this.setBlock(position, Blocks.water, 0);
-			this.housing.removeLiquid(water);
+
+			setBlock(position, Blocks.water, 0);
+			housing.removeLiquid(water);
 			return true;
 		}
-		else {
-			if (this.moisture != EnumMoisture.Dry) {
-				return this.trySetSoil(position);
-			}
-			final ItemStack[] sand = { new ItemStack(Blocks.sand, 1) };
-			if (!this.housing.getFarmInventory().hasResources(sand)) {
-				return false;
-			}
-			this.setBlock(position, Blocks.sand, 0);
-			this.housing.getFarmInventory().removeResources(sand);
-			return true;
+
+		if (moisture != EnumMoisture.DRY) {
+			return trySetSoil(position);
 		}
+
+		ItemStack[] sand = {new ItemStack(Blocks.sand, 1)};
+		if (!housing.getFarmInventory().hasResources(sand)) {
+			return false;
+		}
+
+		setBlock(position, Blocks.sand, 0);
+		housing.getFarmInventory().removeResources(sand);
+		return true;
 	}
 
-	public void setIcon(final ItemStack icon) {
-		this.icon = icon;
+	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 boolean isAcceptedGermling(final ItemStack itemstack) {
-		for (final IFarmable farmable : this.farmables) {
-			if (farmable.isGermling(itemstack)) {
+	public boolean isAcceptedGermling(ItemStack stack) {
+		for (IFarmable farmable : farmables) {
+			if (farmable.isGermling(stack)) {
 				return true;
 			}
 		}
@@ -282,14 +317,18 @@ public class GardenLogic extends FarmLogic
 	}
 
 	@Override
-	public Collection<ICrop> harvest(final int x, final int y, final int z, final FarmDirection direction, final int extent) {
+	public Collection<ICrop> harvest(int x, int y, int z, FarmDirection direction, int extent) {
 		return null;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon() {
-		return this.icon.getIconIndex();
+		return icon.getIconIndex();
+	}
+
+	public void setIcon(ItemStack icon) {
+		this.icon = icon;
 	}
 
 	@Override
@@ -299,50 +338,49 @@ public class GardenLogic extends FarmLogic
 
 	@Override
 	public String getName() {
-		return this.name;
+		return name;
 	}
 
-	protected boolean maintainCrops(final int x, final int y, final int z, final FarmDirection direction, final int extent) {
+	protected boolean maintainCrops(int x, int y, int z, FarmDirection direction, int extent) {
 		for (int i = 0; i < extent; ++i) {
-			final Vect position = this.translateWithOffset(x, y, z, direction, i);
-			if (this.isAirBlock(position) || this.world.getBlock(x, y, z).isReplaceable(this.world, position.x, position.y, position.z)) {
-				final ItemStack below = this.getAsItemStack(position.add(new Vect(0, -1, 0)));
+			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 this.trySetCrop(position);
+					return trySetCrop(position);
 				}
 			}
 		}
 		return false;
 	}
 
-	private boolean trySetCrop(final Vect position) {
-		for (final IFarmable farmable : this.farmables) {
-			final boolean success = this.housing.plantGermling(farmable, this.world, position.x, position.y, position.z);
-			if (success && this.housing instanceof IOwnable) {
-				final TileEntity tile = this.housing.getWorld().getTileEntity(position.x, position.y, position.z);
-				if (tile instanceof TileEntityFlower) {
-					try {
-						final IOwnable housing2 = (IOwnable) this.housing;
-						GameProfile prof = null;
-						if (Mods.Forestry.dev()) {
-							prof = (GameProfile) IOwnable.class.getMethod("getOwner", new Class[0]).invoke(housing2, new Object[0]);
-						}
-						else {
-							prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2, new Object[0]);
-						}
-						((TileEntityFlower) tile).setOwner(prof);
-					} catch (Exception ex) {
-					}
-				}
+	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;
+			}
+
+			TileEntity tile = housing.getWorld().getTileEntity(position.x, position.y, position.z);
+			if (!(tile instanceof TileEntityFlower)) {
 				return true;
 			}
+
+			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 getAvailableAcid() {
-		for (final ItemStack stack : Gardening.getAcidFertilisers()) {
-			if (stack != null && stack.getItem() != null && this.housing.getFarmInventory().hasResources(new ItemStack[] { stack })) {
+		for (ItemStack stack : Gardening.getAcidFertilisers()) {
+			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
 				return stack;
 			}
 		}
@@ -350,21 +388,20 @@ public class GardenLogic extends FarmLogic
 	}
 
 	public ItemStack getAvailableAlkaline() {
-		for (final ItemStack stack : Gardening.getAlkalineFertilisers()) {
-			if (stack != null && stack.getItem() != null && this.housing.getFarmInventory().hasResources(new ItemStack[] { stack })) {
+		for (ItemStack stack : Gardening.getAlkalineFertilisers()) {
+			if (stack != null && stack.getItem() != null && housing.getFarmInventory().hasResources(new ItemStack[]{stack})) {
 				return stack;
 			}
 		}
 		return null;
 	}
 
-	public void setData(final EnumMoisture moisture2, final EnumAcidity acidity2, final boolean isManual, final boolean isFertilised, final ItemStack icon2, final String name2) {
-		this.moisture = moisture2;
-		this.acidity = acidity2;
+	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 = isFertilised;
-		this.icon = icon2;
-		this.name = name2;
+		this.fertilised = fertilised;
+		this.icon = icon;
+		this.name = name;
 	}
-
 }

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

@@ -1,79 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie.botany.farm;
-
-public class Vect
-{
-	public int x;
-	public int y;
-	public int z;
-
-	public Vect(final int[] dim) {
-		if (dim.length != 3) {
-			throw new RuntimeException("Cannot instantiate a vector with less or more than 3 points.");
-		}
-		this.x = dim[0];
-		this.y = dim[1];
-		this.z = dim[2];
-	}
-
-	public Vect(final int x, final int y, final int z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-
-	public Vect add(final Vect other) {
-		final Vect vect;
-		final Vect result = vect = new Vect(this.x, this.y, this.z);
-		vect.x += other.x;
-		final Vect vect2 = result;
-		vect2.y += other.y;
-		final Vect vect3 = result;
-		vect3.z += other.z;
-		return result;
-	}
-
-	public Vect multiply(final float factor) {
-		final Vect vect;
-		final Vect result = vect = new Vect(this.x, this.y, this.z);
-		vect.x *= (int) factor;
-		final Vect vect2 = result;
-		vect2.y *= (int) factor;
-		final Vect vect3 = result;
-		vect3.z *= (int) factor;
-		return result;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("%sx%sx%s;", this.x, this.y, this.z);
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = 31 * result + this.x;
-		result = 31 * result + this.y;
-		result = 31 * result + this.z;
-		return result;
-	}
-
-	@Override
-	public boolean equals(final Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (this.getClass() != obj.getClass()) {
-			return false;
-		}
-		final Vect other = (Vect) obj;
-		return this.x == other.x && this.y == other.y && this.z == other.z;
-	}
-}

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

@@ -1,39 +1,49 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Random;
 import binnie.botany.Botany;
-import net.minecraft.init.Blocks;
-import net.minecraft.block.Block;
-import binnie.botany.api.IFlowerType;
 import binnie.botany.api.EnumFlowerStage;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import com.mojang.authlib.GameProfile;
 import binnie.botany.api.IFlower;
-import binnie.botany.gardening.Gardening;
-import net.minecraft.entity.player.EntityPlayer;
+import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
+import binnie.botany.gardening.Gardening;
+import binnie.botany.genetics.EnumFlowerType;
 import binnie.core.BinnieCore;
-import net.minecraft.item.ItemStack;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraft.block.material.Material;
+import com.mojang.authlib.GameProfile;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import binnie.botany.genetics.EnumFlowerType;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+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);
+	}
+
+	@Override
+	public String getUnlocalizedName() {
+		return "botany.flower";
+	}
 
-public class BlockFlower extends BlockContainer
-{
 	@Override
 	public int getRenderType() {
 		return RendererBotany.renderID;
@@ -41,27 +51,19 @@ public class BlockFlower extends BlockContainer
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister par1IconRegister) {
-		for (final EnumFlowerType type : EnumFlowerType.values()) {
-			type.registerIcons(par1IconRegister);
+	public void registerBlockIcons(IIconRegister register) {
+		for (EnumFlowerType type : EnumFlowerType.values()) {
+			type.registerIcons(register);
 		}
 	}
 
-	public BlockFlower() {
-		super(Material.plants);
-		final float f = 0.2f;
-		this.setBlockBounds(0.5f - f, 0.0f, 0.5f - f, 0.5f + f, f * 3.0f, 0.5f + f);
-		this.setTickRandomly(true);
-		this.setBlockName("flower");
-	}
-
 	@Override
-	public TileEntity createNewTileEntity(final World var1, final int i) {
+	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileEntityFlower();
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(final World par1World, final int par2, final int par3, final int par4) {
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
 		return null;
 	}
 
@@ -76,23 +78,23 @@ public class BlockFlower extends BlockContainer
 	}
 
 	@Override
-	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase living, final ItemStack stack) {
-		super.onBlockPlacedBy(world, x, y, z, living, stack);
-		final TileEntity flower = world.getTileEntity(x, y, z);
+	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) {
-				final IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
+				IFlower f = BotanyCore.getFlowerRoot().getMember(stack);
 				((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
 			}
 			return;
 		}
-		final TileEntity below = world.getTileEntity(x, y - 1, 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 {
-				final GameProfile owner = (living instanceof EntityPlayer) ? ((EntityPlayer) living).getGameProfile() : null;
+			} else {
+				GameProfile owner = (entity instanceof EntityPlayer) ? ((EntityPlayer) entity).getGameProfile() : null;
 				((TileEntityFlower) flower).create(stack, owner);
 			}
 		}
@@ -101,86 +103,108 @@ public class BlockFlower extends BlockContainer
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		final TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			final TileEntityFlower f = (TileEntityFlower) tile;
-			final EnumFlowerStage stage = (f.getAge() == 0) ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
-			final IFlowerType flower = f.getType();
-			final int section = f.getRenderSection();
-			final boolean flowered = f.isFlowered();
-			return (RendererBotany.pass == 0) ? flower.getStem(stage, flowered, section) : ((RendererBotany.pass == 1) ? flower.getPetalIcon(stage, flowered, section) : flower.getVariantIcon(stage, flowered, section));
+	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);
 		}
-		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);
+		}
+
+		return (RendererBotany.pass == 1) ?
+			flower.getPetalIcon(stage, flowered, section) :
+			flower.getVariantIcon(stage, flowered, section);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) {
-		final TileEntity tile = world.getTileEntity(x, y, z);
+	public int colorMultiplier(IBlockAccess world, int x, int y, int z) {
+		TileEntity tile = world.getTileEntity(x, y, z);
 		if (tile instanceof TileEntityFlower) {
-			final TileEntityFlower f = (TileEntityFlower) tile;
-			return (RendererBotany.pass == 0) ? f.getStemColour() : ((RendererBotany.pass == 1) ? f.getPrimaryColour() : f.getSecondaryColour());
-		}
-		return 16777215;
-	}
-
-	@Override
-	public boolean canPlaceBlockAt(final World world, final int x, final int y, final int z) {
-		return super.canPlaceBlockAt(world, x, y, z) && this.canBlockStay(world, x, y, z);
-	}
-
-	protected boolean canPlaceBlockOn(final Block block) {
-		return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || Gardening.isSoil(block);
-	}
-
-	@Override
-	public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block block) {
-		super.onNeighborBlockChange(world, x, y, z, block);
-		this.checkAndDropBlock(world, x, y, z);
-		final TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			final 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) {
-				this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-				world.setBlockToAir(x, y, z);
+			TileEntityFlower f = (TileEntityFlower) tile;
+			if (RendererBotany.pass == 0) {
+				return f.getStemColour();
 			}
+			return (RendererBotany.pass == 1) ?
+				f.getPrimaryColor() :
+				f.getSecondaryColor();
 		}
+		return 0xffffff;
 	}
 
 	@Override
-	public void updateTick(final World world, final int x, final int y, final int z, final Random rand) {
-		final TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower) {
-			((TileEntityFlower) tile).randomUpdate(rand);
-			this.checkAndDropBlock(world, x, y, z);
+	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);
+	}
+
+	@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;
 		}
-		world.setBlockToAir(x, y, z);
-	}
 
-	protected void checkAndDropBlock(final World world, final int x, final int y, final int z) {
-		if (!this.canBlockStay(world, x, y, z)) {
-			this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+		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 boolean canBlockStay(final World world, final int x, final int y, final int z) {
-		final TileEntity tile = world.getTileEntity(x, y, z);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
-			return world.getBlock(x, y - 1, z) == Botany.flower;
+	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);
 		}
-		return this.canPlaceBlockOn(world.getBlock(x, y - 1, z));
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) {
-		final ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
-		final TileEntity tile = world.getTileEntity(x, y, z);
+	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) {
-			final ItemStack flower = ((TileEntityFlower) tile).getItemStack();
+			ItemStack flower = ((TileEntityFlower) tile).getItemStack();
 			if (flower != null) {
 				drops.add(flower);
 			}
@@ -189,14 +213,20 @@ public class BlockFlower extends BlockContainer
 	}
 
 	@Override
-	public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) {
-		final List<ItemStack> drops = this.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
-		final boolean hasBeenBroken = world.setBlockToAir(x, y, z);
+	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 (final ItemStack drop : drops) {
-				this.dropBlockAsItem(world, x, y, z, drop);
+			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);
+	}
 }

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

@@ -1,55 +1,50 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.block.Block;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.entity.Entity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.init.Blocks;
-import binnie.botany.Botany;
-import forestry.api.genetics.IPollinatable;
 import binnie.Binnie;
-import binnie.botany.api.EnumFlowerStage;
-import net.minecraft.world.World;
-import binnie.botany.api.IFlowerType;
-import binnie.botany.genetics.EnumFlowerType;
-import net.minecraft.util.IIcon;
-import forestry.core.config.Config;
-import net.minecraft.creativetab.CreativeTabs;
-import binnie.botany.api.EnumFlowerChromosome;
-import binnie.botany.core.BotanyCore;
-import binnie.botany.api.IAlleleFlowerSpecies;
-import binnie.botany.genetics.Flower;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import binnie.core.BinnieCore;
-import binnie.botany.api.IFlower;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import forestry.api.genetics.IIndividual;
-import net.minecraft.item.ItemStack;
+import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
+import binnie.botany.api.EnumFlowerStage;
+import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerColor;
+import binnie.botany.api.IFlowerGenome;
+import binnie.botany.api.IFlowerType;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.genetics.EnumFlowerType;
+import binnie.botany.genetics.Flower;
+import binnie.core.BinnieCore;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IPollinatable;
+import forestry.core.config.Config;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+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 abstract class ItemBotany extends Item
-{
 	@Override
 	@SideOnly(Side.CLIENT)
 	public int getSpriteNumber() {
 		return 0;
 	}
 
-	public ItemBotany(final String name) {
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setUnlocalizedName(name);
-		this.hasSubtypes = true;
-	}
-
 	@Override
 	public boolean isDamageable() {
 		return false;
@@ -66,85 +61,103 @@ public abstract class ItemBotany extends Item
 	}
 
 	@Override
-	public boolean hasEffect(final ItemStack itemstack) {
-		if (!itemstack.hasTagCompound()) {
+	public boolean hasEffect(ItemStack stack, int pass) {
+		if (!stack.hasTagCompound()) {
 			return false;
 		}
-		final IIndividual individual = this.getIndividual(itemstack);
-		return individual != null && individual.getGenome() != null && individual.hasEffect();
+
+		IIndividual individual = getIndividual(stack);
+		return individual != null
+			&& individual.getGenome() != null
+			&& individual.hasEffect();
 	}
 
 	@Override
-	public void addInformation(final ItemStack itemstack, final EntityPlayer player, final List list, final boolean flag) {
+	public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean flag) {
 		if (!itemstack.hasTagCompound()) {
 			return;
 		}
-		final IFlower individual = (IFlower) this.getIndividual(itemstack);
+		IFlower individual = (IFlower) getIndividual(itemstack);
 		if (individual == null) {
-			list.add("This item is bugged. Destroy it!");
+			tooltip.add(I18N.localise("botany.item.tooltip.bugged"));
 			return;
 		}
-		list.add("§e" + individual.getGenome().getPrimaryColor().getName() + ((individual.getGenome().getPrimaryColor() == individual.getGenome().getSecondaryColor()) ? "" : (" and " + individual.getGenome().getSecondaryColor().getName())) + ", " + individual.getGenome().getStemColor().getName() + " Stem");
+
+		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 (individual.isAnalyzed()) {
 			if (BinnieCore.proxy.isShiftDown()) {
-				individual.addTooltip(list);
+				individual.addTooltip(tooltip);
+			} else {
+				tooltip.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.holdMore"));
 			}
-			else {
-				list.add("§o<Hold shift for details>");
-			}
-		}
-		else {
-			list.add("<Unknown>");
+		} else {
+			tooltip.add(I18N.localise("botany.item.tooltip.unknownGenome"));
 		}
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(final IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister par1IconRegister) {
 	}
 
-	protected IIndividual getIndividual(final ItemStack itemstack) {
+	protected IIndividual getIndividual(ItemStack itemstack) {
 		return new Flower(itemstack.getTagCompound());
 	}
 
-	private IAlleleFlowerSpecies getPrimarySpecies(final ItemStack itemstack) {
-		final IFlower tree = BotanyCore.speciesRoot.getMember(itemstack);
-		if (tree == null) {
-			return (IAlleleFlowerSpecies) BotanyCore.speciesRoot.getDefaultTemplate()[EnumFlowerChromosome.SPECIES.ordinal()];
-		}
-		return tree.getGenome().getPrimary();
-	}
-
 	@Override
-	public String getItemStackDisplayName(final ItemStack itemstack) {
+	public String getItemStackDisplayName(ItemStack itemstack) {
 		if (!itemstack.hasTagCompound()) {
-			return "Unknown";
+			return I18N.localise("botany.item.tooltip.unknown");
 		}
-		final IIndividual individual = this.getIndividual(itemstack);
-		return (individual != null && individual.getGenome() != null) ? (individual.getDisplayName() + this.getTag()) : "Corrupted Flower";
+
+		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(final Item item, final CreativeTabs par2CreativeTabs, final List itemList) {
-		this.addCreativeItems(itemList, true);
+	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+		addCreativeItems(itemList, true);
 	}
 
-	public void addCreativeItems(final List itemList, final boolean hideSecrets) {
-		for (final IIndividual individual : BotanyCore.speciesRoot.getIndividualTemplates()) {
+	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(), this.getStage().ordinal()));
+			itemList.add(BotanyCore.speciesRoot.getMemberStack(individual.copy(), getStage().ordinal()));
 		}
 	}
 
 	@Override
-	public int getColorFromItemStack(final ItemStack itemstack, final int renderPass) {
-		final IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+	public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
+		IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
 		if (flower == null || flower.getGenome() == null) {
-			return 16777215;
+			return 0xffffff;
 		}
-		return (renderPass == 0) ? flower.getGenome().getStemColor().getColor(flower.isWilted()) : ((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
@@ -153,131 +166,119 @@ public abstract class ItemBotany extends Item
 	}
 
 	@Override
-	public int getRenderPasses(final int metadata) {
+	public int getRenderPasses(int metadata) {
 		return 3;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final ItemStack itemstack, final int renderPass) {
-		final IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
+	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();
+			return EnumFlowerType.ALLIUM.getBlank();
 		}
-		final IFlowerType type = flower.getGenome().getPrimary().getType();
+
+		IFlowerType type = flower.getGenome().getPrimary().getType();
 		if (renderPass == 0) {
-			return type.getStem(this.getStage(), flower.hasFlowered(), type.getSections() - 1);
+			return type.getStem(getStage(), flower.hasFlowered(), type.getSections() - 1);
 		}
 		if (renderPass == 1) {
-			return type.getPetalIcon(this.getStage(), flower.hasFlowered(), type.getSections() - 1);
+			return type.getPetalIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
 		}
-		return type.getVariantIcon(this.getStage(), flower.hasFlowered(), type.getSections() - 1);
+		return type.getVariantIcon(getStage(), flower.hasFlowered(), type.getSections() - 1);
 	}
 
 	@Override
-	public boolean onItemUse(final ItemStack itemstack, final EntityPlayer player, final World world, int x, int y, int z, int side, final float px, final float py, final float pz) {
-		if (this.getStage() == EnumFlowerStage.POLLEN) {
-			final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack);
-			final TileEntity target = world.getTileEntity(x, y, z);
+	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;
 			}
-			final IPollinatable pollinatable = (IPollinatable) target;
+			IPollinatable pollinatable = (IPollinatable) target;
 			if (!pollinatable.canMateWith(flower)) {
 				return false;
 			}
 			pollinatable.mateWith(flower);
 			if (!player.capabilities.isCreativeMode) {
-				--itemstack.stackSize;
+				itemstack.stackSize--;
 			}
 			return true;
 		}
-		else {
-			final Block blockFlower = Botany.flower;
-			final 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;
-				}
-				if (side == 1) {
-					++y;
-				}
-				if (side == 2) {
-					--z;
-				}
-				if (side == 3) {
-					++z;
-				}
-				if (side == 4) {
-					--x;
-				}
-				if (side == 5) {
-					++x;
-				}
-			}
-			if (itemstack.stackSize == 0) {
-				return false;
-			}
-			if (!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)) {
-				final int i1 = this.getMetadata(itemstack.getItemDamage());
-				final int j1 = blockFlower.onBlockPlaced(world, x, y, z, side, px, py, pz, i1);
-				if (this.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;
+
+		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 (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(final World p_150936_1_, int p_150936_2_, int p_150936_3_, int p_150936_4_, int p_150936_5_, final EntityPlayer p_150936_6_, final ItemStack p_150936_7_) {
-		final Block field_150939_a = Botany.flower;
-		final Block block = p_150936_1_.getBlock(p_150936_2_, p_150936_3_, p_150936_4_);
+	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) {
-			p_150936_5_ = 1;
-		}
-		else if (block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(p_150936_1_, p_150936_2_, p_150936_3_, p_150936_4_)) {
-			if (p_150936_5_ == 0) {
-				--p_150936_3_;
-			}
-			if (p_150936_5_ == 1) {
-				++p_150936_3_;
-			}
-			if (p_150936_5_ == 2) {
-				--p_150936_4_;
-			}
-			if (p_150936_5_ == 3) {
-				++p_150936_4_;
-			}
-			if (p_150936_5_ == 4) {
-				--p_150936_2_;
-			}
-			if (p_150936_5_ == 5) {
-				++p_150936_2_;
+			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 p_150936_1_.canPlaceEntityOnSide(field_150939_a, p_150936_2_, p_150936_3_, p_150936_4_, false, p_150936_5_, (Entity) null, p_150936_7_);
+		return world.canPlaceEntityOnSide(field_150939_a, x, y, z, false, side, null, stack);
 	}
 
-	public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata) {
-		final Block field_150939_a = Botany.flower;
-		if (!world.setBlock(x, y, z, field_150939_a, metadata, 3)) {
+	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) == field_150939_a) {
-			field_150939_a.onBlockPlacedBy(world, x, y, z, player, stack);
-			field_150939_a.onPostBlockPlaced(world, x, y, z, metadata);
+
+		if (world.getBlock(x, y, z) == block) {
+			block.onBlockPlacedBy(world, x, y, z, player, stack);
+			block.onPostBlockPlaced(world, x, y, z, metadata);
 		}
 		return true;
 	}

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

@@ -1,13 +1,8 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
 import binnie.botany.api.EnumFlowerStage;
 
-public class ItemFlower extends ItemBotany
-{
+public class ItemFlower extends ItemBotany {
 	public ItemFlower() {
 		super("itemFlower");
 	}

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

@@ -1,71 +1,84 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.entity.player.EntityPlayer;
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import binnie.botany.CreativeTabBotany;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.ItemStack;
-import java.util.List;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.util.IIcon;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
-public class ItemInsulatedTube extends Item
-{
+import java.util.List;
+
+public class ItemInsulatedTube extends Item {
 	IIcon[] icons;
 
+	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();
+	}
+
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubItems(final Item p_150895_1_, final CreativeTabs p_150895_2_, final List p_150895_3_) {
-		for (final Material mat : Material.values()) {
-			for (final Insulate ins : Insulate.values()) {
-				p_150895_3_.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128));
+	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(final IIconRegister p_94581_1_) {
+	public void registerIcons(IIconRegister register) {
 		for (int i = 0; i < 3; ++i) {
-			this.icons[i] = Botany.proxy.getIcon(p_94581_1_, "insulatedTube." + i);
+			icons[i] = Botany.proxy.getIcon(register, "insulatedTube." + i);
 		}
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(final ItemStack stack, final int pass) {
-		return (pass == 0) ? 16777215 : ((pass == 1) ? Material.get(stack.getItemDamage()).getColor() : Insulate.get(stack.getItemDamage()).getColor());
+	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(final ItemStack p_77624_1_, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) {
-		super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
-		p_77624_3_.add(Insulate.get(p_77624_1_.getItemDamage()).getName());
+	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(final ItemStack p_77653_1_) {
-		return Material.get(p_77653_1_.getItemDamage()).getName() + " Insulated Tube";
+	public String getItemStackDisplayName(ItemStack stack) {
+		return Material.get(stack.getItemDamage()).getName() + " "
+			+ I18N.localise("botany.tube.name");
 	}
 
 	@Override
-	public int getRenderPasses(final int metadata) {
+	public int getRenderPasses(int metadata) {
 		return 3;
 	}
 
 	@Override
-	public IIcon getIcon(final ItemStack stack, final int pass) {
-		return this.icons[pass % 3];
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return icons[pass % 3];
 	}
 
 	@Override
@@ -73,101 +86,82 @@ public class ItemInsulatedTube extends Item
 		return true;
 	}
 
-	public ItemInsulatedTube() {
-		this.icons = new IIcon[3];
-		this.setUnlocalizedName("insulatedTube");
-		this.setCreativeTab(CreativeTabBotany.instance);
-	}
+	enum Material {
+		Copper(0xe3b78e, "cooper"),
+		Tin(0xe1eef4, "tin"),
+		Bronze(0xddc276, "bronze"),
+		Iron(0xd8d8d8, "iron");
 
-	public static String getInsulate(final ItemStack stack) {
-		return Insulate.get(stack.getItemDamage()).getName();
-	}
+		protected int color;
+		protected String name;
 
-	public static ItemStack getInsulateStack(final ItemStack stack) {
-		return Insulate.get(stack.getItemDamage()).getStack();
-	}
-
-	enum Material
-	{
-		Copper(14923662, "Copper"),
-		Tin(14806772, "Tin"),
-		Bronze(14533238, "Bronze"),
-		Iron(14211288, "Iron");
-
-		int color;
-		String name;
-
-		public int getColor() {
-			return this.color;
-		}
-
-		public String getName() {
-			return this.name;
-		}
-
-		private Material(final int color, final String name) {
+		Material(int color, String name) {
 			this.color = color;
 			this.name = name;
 		}
 
-		public static Material get(final int i) {
+		public static Material get(int i) {
 			return values()[i % values().length];
 		}
-	}
-
-	enum Insulate
-	{
-		Clay(10595020, "Clay"),
-		Cobble(8092539, "Cobblestone"),
-		Sand(15723189, "Sand"),
-		HardenedClay(9657411, "Hardened Clay"),
-		Stone(7171437, "Smooth Stone"),
-		Sandstone(12695945, "Sandstone");
-
-		int color;
-		String name;
 
 		public int getColor() {
-			return this.color;
+			return color;
 		}
 
 		public String getName() {
-			return this.name;
+			return I18N.localise("botany.tube." + name);
 		}
+	}
 
-		private Insulate(final int color, final String name) {
+	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;
+
+		Insulate(int color, String name) {
 			this.color = color;
 			this.name = name;
 		}
 
-		public static Insulate get(final int i) {
+		public static Insulate get(int i) {
 			return values()[i / 128 % values().length];
 		}
 
+		public int getColor() {
+			return color;
+		}
+
+		public String getName() {
+			return I18N.localise("botany.tube.insulate." + name);
+		}
+
 		public ItemStack getStack() {
 			switch (this) {
-			case Clay: {
-				return new ItemStack(Blocks.clay);
-			}
-			case Cobble: {
-				return new ItemStack(Blocks.cobblestone);
-			}
-			case HardenedClay: {
-				return new ItemStack(Blocks.hardened_clay);
-			}
-			case Sand: {
-				return new ItemStack(Blocks.sand);
-			}
-			case Sandstone: {
-				return new ItemStack(Blocks.sandstone);
-			}
-			case Stone: {
-				return new ItemStack(Blocks.stone);
-			}
-			default: {
-				return null;
-			}
+				case Clay:
+					return new ItemStack(Blocks.clay);
+
+				case Cobble:
+					return new ItemStack(Blocks.cobblestone);
+
+				case HardenedClay:
+					return new ItemStack(Blocks.hardened_clay);
+
+				case Sand:
+					return new ItemStack(Blocks.sand);
+
+				case Sandstone:
+					return new ItemStack(Blocks.sandstone);
+
+				case Stone:
+					return new ItemStack(Blocks.stone);
 			}
+			return null;
 		}
 	}
 }

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

@@ -1,13 +1,9 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
 import binnie.botany.api.EnumFlowerStage;
+import binnie.core.util.I18N;
 
-public class ItemPollen extends ItemBotany
-{
+public class ItemPollen extends ItemBotany {
 	public ItemPollen() {
 		super("pollen");
 	}
@@ -19,6 +15,6 @@ public class ItemPollen extends ItemBotany
 
 	@Override
 	public String getTag() {
-		return " Pollen";
+		return I18N.localise("botany.item.pollen.tag.name");
 	}
 }

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

@@ -1,13 +1,9 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
 import binnie.botany.api.EnumFlowerStage;
+import binnie.core.util.I18N;
 
-public class ItemSeed extends ItemBotany
-{
+public class ItemSeed extends ItemBotany {
 	public ItemSeed() {
 		super("seed");
 	}
@@ -19,6 +15,6 @@ public class ItemSeed extends ItemBotany
 
 	@Override
 	public String getTag() {
-		return " Germling";
+		return I18N.localise("botany.item.germling.tag.name");
 	}
 }

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

@@ -1,61 +1,55 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.flower;
 
-import net.minecraft.util.IIcon;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.block.Block;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 
-public class RendererBotany implements ISimpleBlockRenderingHandler
-{
+public class RendererBotany implements ISimpleBlockRenderingHandler {
 	public static int renderID;
 	public static int pass;
 
 	@Override
-	public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) {
+	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
+		// ignored
 	}
 
 	@Override
-	public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) {
-		final Tessellator tessellator = Tessellator.instance;
+	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;
-		final double d2 = y;
+		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;
-		final int rot = (int) (i1 % 4L);
+
 		for (int j = 0; j < 3; ++j) {
 			RendererBotany.pass = j;
-			final int l = block.colorMultiplier(renderer.blockAccess, x, y, z);
+			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) {
-				final float f4 = (f * 30.0f + f2 * 59.0f + f3 * 11.0f) / 100.0f;
-				final float f5 = (f * 30.0f + f2 * 70.0f) / 100.0f;
-				final float f6 = (f * 30.0f + f3 * 70.0f) / 100.0f;
-				f = f4;
-				f2 = f5;
-				f3 = f6;
+				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);
-			final IIcon iicon = block.getIcon(world, x, y, z, 0);
+			IIcon iicon = block.getIcon(world, x, y, z, 0);
 			renderer.drawCrossedSquares(iicon, d1, d2, d3, 1.0f);
 		}
 		return false;
 	}
 
 	@Override
-	public boolean shouldRender3DInInventory(final int i) {
+	public boolean shouldRender3DInInventory(int i) {
 		return false;
 	}
 

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

@@ -1,156 +1,157 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import net.minecraft.world.IBlockAccess;
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumSoilType;
 import binnie.botany.api.gardening.IBlockSoil;
-import java.util.Random;
-import java.util.List;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.util.IIcon;
-import net.minecraft.block.Block;
-import binnie.botany.CreativeTabBotany;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import java.util.ArrayList;
-import net.minecraft.world.World;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+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 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;
+	}
 
-public class BlockPlant extends BlockBush
-{
 	@Override
-	public ArrayList<ItemStack> getDrops(final World world, final int x, final int y, final int z, final int metadata, final int fortune) {
-		return new ArrayList<ItemStack>();
+	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(final IIconRegister p_149651_1_) {
-		for (final Type t : Type.values()) {
-			t.icon = Botany.proxy.getIcon(p_149651_1_, t.name().toLowerCase());
+	public void registerBlockIcons(IIconRegister register) {
+		for (Type t : Type.values()) {
+			t.icon = Botany.proxy.getIcon(register, t.name().toLowerCase());
 		}
 	}
 
-	public BlockPlant() {
-		this.setBlockName("plant");
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setTickRandomly(true);
-	}
-
 	@Override
-	protected boolean canPlaceBlockOn(final Block p_149854_1_) {
-		return super.canPlaceBlockOn(p_149854_1_) || Gardening.isSoil(p_149854_1_);
+	protected boolean canPlaceBlockOn(Block block) {
+		return super.canPlaceBlockOn(block) || Gardening.isSoil(block);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final int side, final int meta) {
+	public IIcon getIcon(int side, int meta) {
 		return Type.values()[meta % Type.values().length].icon;
 	}
 
 	@Override
-	public int damageDropped(final int p_149692_1_) {
-		return p_149692_1_;
+	public int damageDropped(int damage) {
+		return damage;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(final Item p_149666_1_, final CreativeTabs p_149666_2_, final List p_149666_3_) {
-		for (final Type type : Type.values()) {
-			p_149666_3_.add(type.get());
+	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+		for (Type type : Type.values()) {
+			list.add(type.get());
 		}
 	}
 
 	@Override
-	public void updateTick(final World world, final int x, final int y, final int z, final Random random) {
-		final Type type = Type.get(world.getBlockMetadata(x, y, z));
+	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) {
+			} else if (type == Type.WeedsLong) {
 				world.setBlockMetadataWithNotify(x, y, z, Type.WeedsVeryLong.ordinal(), 2);
-			}
-			else if (type == Type.DeadFlower) {
+			} else if (type == Type.DeadFlower) {
 				world.setBlockMetadataWithNotify(x, y, z, Type.DecayingFlower.ordinal(), 2);
-			}
-			else if (type == Type.DecayingFlower) {
+			} 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) {
+			} else if (type == Type.WeedsLong) {
 				world.setBlockMetadataWithNotify(x, y, z, Type.Weeds.ordinal(), 2);
-			}
-			else if (type == Type.WeedsVeryLong) {
+			} else if (type == Type.WeedsVeryLong) {
 				world.setBlockMetadataWithNotify(x, y, z, Type.WeedsLong.ordinal(), 2);
 			}
 		}
-		final Block below = world.getBlock(x, y - 1, z);
-		if (Gardening.isSoil(below)) {
-			final IBlockSoil soil = (IBlockSoil) below;
-			if (random.nextInt(3) == 0) {
-				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);
-				}
+
+		Block below = world.getBlock(x, y - 1, z);
+		if (!Gardening.isSoil(below)) {
+			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);
 		}
 	}
 
 	@Override
-	public boolean isReplaceable(final IBlockAccess world, final int x, final int y, final int z) {
+	public boolean isReplaceable(IBlockAccess world, int x, int y, int z) {
 		return true;
 	}
 
-	public static boolean isWeed(final IBlockAccess world, final int x, final int y, final int z) {
-		if (!(world.getBlock(x, y, z) instanceof BlockPlant)) {
-			return false;
-		}
-		final Type type = Type.get(world.getBlockMetadata(x, y, z));
-		return type == Type.Weeds || type == Type.WeedsLong || type == Type.WeedsVeryLong;
-	}
-
-	public enum Type
-	{
-		Weeds("Weeds"),
-		WeedsLong("Long Weeds"),
-		WeedsVeryLong("Very Long Weeds"),
-		DeadFlower("Dead Flower"),
-		DecayingFlower("Decaying Flower");
+	public enum Type {
+		Weeds("weeds"),
+		WeedsLong("longWeeds"),
+		WeedsVeryLong("veryLongWeeds"),
+		DeadFlower("deadFlower"),
+		DecayingFlower("decayingFlower");
 
 		public IIcon icon;
-		String name;
 
-		private Type(final String name) {
+		protected String name;
+
+		Type(String name) {
 			this.name = name;
 		}
 
-		public ItemStack get() {
-			return new ItemStack(Botany.plant, 1, this.ordinal());
-		}
-
-		public static Type get(final int id) {
+		public static Type get(int id) {
 			return values()[id % values().length];
 		}
 
+		public ItemStack get() {
+			return new ItemStack(Botany.plant, 1, ordinal());
+		}
+
 		public String getName() {
-			return this.name;
+			return I18N.localise("botany.plant." + name);
 		}
 	}
 }

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

@@ -1,127 +1,129 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import net.minecraftforge.common.IPlantable;
-import binnie.Binnie;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraft.util.AxisAlignedBB;
-import java.util.Random;
-import net.minecraft.world.World;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.block.material.Material;
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.init.Blocks;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
-import net.minecraft.world.IBlockAccess;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.gardening.IBlockSoil;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.ItemStack;
-import java.util.List;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import binnie.botany.api.EnumSoilType;
-import net.minecraft.util.IIcon;
-import binnie.botany.api.gardening.IBlockSoil;
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.IPlantable;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockSoil extends Block implements IBlockSoil
-{
-	boolean weedKilled;
-	IIcon[] iconsTop;
-	IIcon[] iconsSide;
-	IIcon[] iconsNoWeed;
-	EnumSoilType type;
+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;
+
+	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();
+	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
 		for (int i = 0; i < 9; ++i) {
-			par3List.add(new ItemStack(this, 1, i));
+			list.add(new ItemStack(this, 1, i));
 		}
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) {
-		return this.getIcon(side, world.getBlockMetadata(x, y, z));
+	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(final int side, int meta) {
+	public IIcon getIcon(int side, int meta) {
 		meta = ((meta >= 9) ? 8 : meta);
-		final EnumMoisture moisture = EnumMoisture.values()[meta % 3];
-		final EnumAcidity acidity = EnumAcidity.values()[meta / 3];
-		return (side == 1) ? (this.weedKilled ? this.iconsNoWeed[meta] : this.iconsTop[meta]) : ((side == 0) ? Blocks.dirt.getIcon(side, 0) : this.iconsSide[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(final IIconRegister register) {
-		for (final EnumMoisture moisture : EnumMoisture.values()) {
-			for (final EnumAcidity pH : EnumAcidity.values()) {
-				this.iconsTop[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".0");
-				this.iconsSide[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".1");
-				this.iconsNoWeed[moisture.ordinal() + pH.ordinal() * 3] = Botany.proxy.getIcon(register, "soil/" + this.getType().getID() + "." + pH.getID() + "." + moisture.getID() + ".2");
+	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 this.type;
-	}
-
-	public BlockSoil(final EnumSoilType type, final String blockName, final boolean weedKilled) {
-		super(Material.ground);
-		this.weedKilled = false;
-		this.iconsTop = new IIcon[9];
-		this.iconsSide = new IIcon[9];
-		this.iconsNoWeed = new IIcon[9];
-		this.weedKilled = weedKilled;
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setBlockName(blockName);
-		this.setTickRandomly(true);
-		this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.9375f, 1.0f);
-		this.setLightOpacity(255);
-		this.setHardness(0.5f);
-		this.setStepSound(Block.soundTypeGravel);
-		this.type = type;
+		return type;
 	}
 
 	@Override
-	public int damageDropped(final int p_149692_1_) {
-		return p_149692_1_;
+	public int damageDropped(int damage) {
+		return damage;
 	}
 
 	@Override
-	public void updateTick(final World world, final int x, final int y, final int z, final Random random) {
-		final int meta = world.getBlockMetadata(x, y, z);
+	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];
-		final EnumAcidity acidity = EnumAcidity.values()[meta / 3];
-		final EnumMoisture desiredMoisture = Gardening.getNaturalMoisture(world, x, y, z);
+		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);
+			moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
 		}
 		if (desiredMoisture.ordinal() < moisture.ordinal()) {
-			moisture = ((moisture == EnumMoisture.Damp) ? EnumMoisture.Normal : EnumMoisture.Dry);
+			moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
 		}
-		final int meta2 = getMeta(acidity, moisture);
+
+		int meta2 = getMeta(acidity, moisture);
 		if (meta != meta2) {
 			world.setBlockMetadataWithNotify(x, y, z, meta2, 2);
 		}
-		if (!this.weedKilled && random.nextInt(5 - this.getType(world, x, y, z).ordinal()) == 0 && world.getBlock(x, y + 1, z) == Blocks.air) {
+		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(final World p_149668_1_, final int p_149668_2_, final int p_149668_3_, final int p_149668_4_) {
-		return AxisAlignedBB.getBoundingBox(p_149668_2_ + 0, p_149668_3_ + 0, p_149668_4_ + 0, p_149668_2_ + 1, p_149668_3_ + 1, p_149668_4_ + 1);
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+		return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
 	}
 
 	@Override
@@ -135,86 +137,78 @@ public class BlockSoil extends Block implements IBlockSoil
 	}
 
 	@Override
-	public EnumAcidity getPH(final World world, final int x, final int y, final int z) {
+	public EnumAcidity getPH(World world, int x, int y, int z) {
 		return EnumAcidity.values()[world.getBlockMetadata(x, y, z) / 3];
 	}
 
 	@Override
-	public EnumMoisture getMoisture(final World world, final int x, final int y, final int z) {
+	public EnumMoisture getMoisture(World world, int x, int y, int z) {
 		return EnumMoisture.values()[world.getBlockMetadata(x, y, z) % 3];
 	}
 
 	@Override
-	public EnumSoilType getType(final World world, final int x, final int y, final int z) {
-		return this.type;
+	public EnumSoilType getType(World world, int x, int y, int z) {
+		return type;
 	}
 
 	@Override
-	public boolean fertilise(final World world, final int x, final int y, final int z, final EnumSoilType maxLevel) {
-		final EnumSoilType type = this.getType(world, x, y, z);
+	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;
 		}
-		final int meta = world.getBlockMetadata(x, y, z);
-		return world.setBlock(x, y, z, Gardening.getSoilBlock(maxLevel, this.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(final World world, final int x, final int y, final int z, final EnumSoilType minLevel) {
-		final EnumSoilType type = this.getType(world, x, y, z);
+	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;
 		}
-		final int meta = world.getBlockMetadata(x, y, z);
-		return world.setBlock(x, y, z, Gardening.getSoilBlock(minLevel, this.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(final World world, final int x, final int y, final int z, final EnumAcidity pH) {
-		final int meta = getMeta(pH, this.getMoisture(world, x, y, z));
+	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(final World world, final int x, final int y, final int z, final EnumMoisture moisture) {
-		final int meta = getMeta(this.getPH(world, x, y, z), moisture);
+	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);
 	}
 
-	public static int getMeta(final EnumAcidity acid, final EnumMoisture moisture) {
-		return acid.ordinal() * 3 + moisture.ordinal();
-	}
-
 	@Override
-	public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block p_149695_5_) {
-		super.onNeighborBlockChange(world, x, y, z, p_149695_5_);
+	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);
 		}
 	}
 
-	public static String getPH(final ItemStack stack) {
-		return Binnie.Language.localise(EnumAcidity.values()[stack.getItemDamage() / 3]);
-	}
-
-	public static String getMoisture(final ItemStack stack) {
-		return Binnie.Language.localise(EnumMoisture.values()[stack.getItemDamage() % 3]);
-	}
-
 	@Override
-	public boolean canSustainPlant(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection direction, final IPlantable plantable) {
-		final Block plant = plantable.getPlant(world, x, y + 1, z);
+	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 !this.weedKilled || !BlockPlant.isWeed(world, x, y, z);
+			return !weedKilled || !BlockPlant.isWeed(world, x, y, z);
 		}
-		return world instanceof World && Blocks.dirt.canSustainPlant(world, x, y, z, direction, plantable);
+		return world instanceof World
+			&& Blocks.dirt.canSustainPlant(world, x, y, z, direction, plantable);
 	}
 
 	@Override
-	public boolean resistsWeeds(final World world, final int x, final int y, final int z) {
-		return this.weedKilled;
+	public boolean resistsWeeds(World world, int x, int y, int z) {
+		return weedKilled;
 	}
 }

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

@@ -1,68 +1,61 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import java.util.LinkedHashMap;
-import net.minecraft.world.IBlockAccess;
-import binnie.botany.items.BotanyItems;
-import forestry.api.core.EnumTemperature;
-import java.util.Collection;
-import binnie.core.BinnieCore;
-import net.minecraft.tileentity.TileEntity;
-import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.Botany;
-import com.mojang.authlib.GameProfile;
-import binnie.botany.api.IFlower;
-import binnie.botany.api.EnumSoilType;
-import net.minecraft.world.biome.BiomeGenBase;
 import binnie.botany.api.EnumAcidity;
-import net.minecraft.init.Blocks;
 import binnie.botany.api.EnumMoisture;
-import net.minecraft.world.World;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.Item;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.api.IFlower;
 import binnie.botany.api.gardening.IBlockSoil;
+import binnie.botany.flower.TileEntityFlower;
+import binnie.botany.items.BotanyItems;
+import binnie.core.BinnieCore;
+import com.mojang.authlib.GameProfile;
+import forestry.api.core.EnumTemperature;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+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;
-	public static Map<ItemStack, Integer> fertiliserAlkaline;
-	public static Map<ItemStack, Integer> fertiliserNutrient;
+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 boolean isSoil(final Block block) {
+	public static boolean isSoil(Block block) {
 		return block instanceof IBlockSoil;
 	}
 
-	public static boolean isSoil(final 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 boolean isSoil(final ItemStack item) {
-		return isSoil(item.getItem());
-	}
-
-	public static EnumMoisture getNaturalMoisture(final World world, final int x, final int y, final int z) {
+	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) {
+					} 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;
 		}
+
 		for (int dx = -1; dx < 2; ++dx) {
 			for (int dz = -1; dz < 2; ++dz) {
 				if (dx != 0 || dz != 0) {
@@ -72,70 +65,89 @@ public class Gardening
 				}
 			}
 		}
-		return (bias <= -1.0f) ? EnumMoisture.Dry : ((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(final World world, final int x, final int y, final int z) {
-		final float bias = getBiomePH(world.getBiomeGenForCoords(x, z), y);
-		return (bias <= -1.0f) ? EnumAcidity.Acid : ((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(final BiomeGenBase biome, final int H) {
-		final double R = biome.rainfall;
-		final double T = biome.temperature;
-		final 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);
-		return (float) ((m == 0.0) ? m : ((m < 0.0) ? (-Math.sqrt(m * m)) : 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(final BiomeGenBase biome, final int H) {
-		final double R = biome.rainfall;
-		final double T = biome.temperature;
+	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(final World world, final int x, final int y, final int z, final EnumSoilType soil, final EnumMoisture moisture, final EnumAcidity acidity) {
-		final int meta = moisture.ordinal() + acidity.ordinal() * 3;
+	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(final World world, final int x, final int y, final int z, final IFlower flower, final GameProfile owner) {
-		final boolean set = world.setBlock(x, y, z, Botany.flower, 0, 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;
 		}
-		final TileEntity tileFlower = world.getTileEntity(x, y, z);
-		final TileEntity below = world.getTileEntity(x, y - 1, z);
+
+		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 {
+			} else {
 				((TileEntityFlower) tileFlower).create(flower, owner);
 			}
 		}
+
 		tryGrowSection(world, x, y, z);
 		return true;
 	}
 
-	public static void tryGrowSection(final World world, final int x, final int y, final int z) {
+	public static void tryGrowSection(World world, int x, int y, int z) {
 		if (!BinnieCore.proxy.isSimulating(world)) {
 			return;
 		}
-		final TileEntity flower = world.getTileEntity(x, y, z);
-		if (flower != null && flower instanceof TileEntityFlower) {
-			final IFlower iflower = ((TileEntityFlower) flower).getFlower();
-			final int section = ((TileEntityFlower) flower).getSection();
-			if (iflower != null && section < iflower.getGenome().getPrimary().getType().getSections() - 1 && iflower.getAge() > 0) {
-				world.setBlock(x, y + 1, z, Botany.flower, 0, 2);
-				final TileEntity tileFlower = world.getTileEntity(x, y + 1, z);
-				if (tileFlower != null && tileFlower instanceof TileEntityFlower) {
-					((TileEntityFlower) tileFlower).setSection(section + 1);
-				}
-			}
+
+		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;
+		}
+
+		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(final World world, final int x, final int y, final int z) {
+	public static void onGrowFromSeed(World world, int x, int y, int z) {
 		tryGrowSection(world, x, y, z);
 	}
 
@@ -151,8 +163,8 @@ public class Gardening
 		return Gardening.fertiliserNutrient.keySet();
 	}
 
-	public static boolean isAcidFertiliser(final ItemStack itemstack) {
-		for (final ItemStack stack : getAcidFertilisers()) {
+	public static boolean isAcidFertiliser(ItemStack itemstack) {
+		for (ItemStack stack : getAcidFertilisers()) {
 			if (stack != null && stack.isItemEqual(itemstack)) {
 				return true;
 			}
@@ -160,8 +172,8 @@ public class Gardening
 		return false;
 	}
 
-	public static boolean isAlkalineFertiliser(final ItemStack itemstack) {
-		for (final ItemStack stack : getAlkalineFertilisers()) {
+	public static boolean isAlkalineFertiliser(ItemStack itemstack) {
+		for (ItemStack stack : getAlkalineFertilisers()) {
 			if (stack != null && stack.isItemEqual(itemstack)) {
 				return true;
 			}
@@ -169,8 +181,8 @@ public class Gardening
 		return false;
 	}
 
-	public static boolean isNutrientFertiliser(final ItemStack itemstack) {
-		for (final ItemStack stack : getNutrientFertilisers()) {
+	public static boolean isNutrientFertiliser(ItemStack itemstack) {
+		for (ItemStack stack : getNutrientFertilisers()) {
 			if (stack != null && stack.isItemEqual(itemstack)) {
 				return true;
 			}
@@ -178,21 +190,24 @@ public class Gardening
 		return false;
 	}
 
-	public static int getFertiliserStrength(final ItemStack stack) {
+	public static int getFertiliserStrength(ItemStack stack) {
 		if (stack == null) {
 			return 1;
 		}
-		for (final Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAcid.entrySet()) {
+
+		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAcid.entrySet()) {
 			if (entry.getKey().isItemEqual(stack)) {
 				return entry.getValue();
 			}
 		}
-		for (final Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAlkaline.entrySet()) {
+
+		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserAlkaline.entrySet()) {
 			if (entry.getKey().isItemEqual(stack)) {
 				return entry.getValue();
 			}
 		}
-		for (final Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserNutrient.entrySet()) {
+
+		for (Map.Entry<ItemStack, Integer> entry : Gardening.fertiliserNutrient.entrySet()) {
 			if (entry.getKey().isItemEqual(stack)) {
 				return entry.getValue();
 			}
@@ -200,65 +215,60 @@ public class Gardening
 		return 1;
 	}
 
-	public static boolean canTolerate(final IFlower flower, final World world, final int x, final int y, final int z) {
+	public static boolean canTolerate(IFlower flower, World world, int x, int y, int z) {
 		if (flower == null || flower.getGenome() == null) {
 			return false;
 		}
-		final Block soil = world.getBlock(x, y - 1, z);
-		final int soilMeta = world.getBlockMetadata(x, y - 1, z);
-		final BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
+
+		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(final World world, final int x, final int y, final int z) {
+	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(final EnumSoilType type) {
+	public static Block getSoilBlock(EnumSoilType type) {
 		return getSoilBlock(type, false);
 	}
 
-	public static Block getSoilBlock(final EnumSoilType type, final boolean weedkill) {
+	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;
-		}
-		default: {
-			return weedkill ? Botany.soilNoWeed : Botany.soil;
-		}
+			case FLOWERBED:
+				return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed;
+
+			case LOAM:
+				return weedkill ? Botany.loamNoWeed : Botany.loam;
 		}
+		return weedkill ? Botany.soilNoWeed : Botany.soil;
 	}
 
-	public static boolean canTolerate(final IFlower flower, final EnumAcidity ePH, final EnumMoisture eMoisture, final 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(final 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(final World world, final int x, final int y, final int z) {
+	public static boolean addWeedKiller(World world, int x, int y, int z) {
 		if (!(world.getBlock(x, y, z) instanceof IBlockSoil)) {
 			return false;
 		}
-		final EnumSoilType type = getSoilType(world, x, y, z);
-		final Block block = getSoilBlock(type, true);
-		final boolean done = world.setBlock(x, y, z, block, world.getBlockMetadata(x, y, z), 2);
+
+		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;
 	}
-
-	static {
-		Gardening.fertiliserAcid = new LinkedHashMap<ItemStack, Integer>();
-		Gardening.fertiliserAlkaline = new LinkedHashMap<ItemStack, Integer>();
-		Gardening.fertiliserNutrient = new LinkedHashMap<ItemStack, Integer>();
-	}
 }

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

@@ -1,72 +1,86 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import net.minecraft.block.Block;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import binnie.botany.api.EnumSoilType;
+import binnie.core.util.I18N;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+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;
 
-public class ItemSoil extends ItemBlock
-{
-	EnumSoilType type;
 	private boolean noWeed;
 
+	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(final ItemStack stack, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) {
-		super.addInformation(stack, p_77624_2_, p_77624_3_, p_77624_4_);
-		final EnumMoisture moisture = EnumMoisture.values()[stack.getItemDamage() % 3];
-		final EnumAcidity acidity = EnumAcidity.values()[stack.getItemDamage() / 3];
+	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 += "§eDry§f";
+
+		if (moisture == EnumMoisture.DRY) {
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.moisture.dry")
+				+ EnumChatFormatting.RESET;
 		}
-		if (moisture == EnumMoisture.Damp) {
-			info += "§9Damp§f";
+		if (moisture == EnumMoisture.DAMP) {
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.moisture.damp")
+				+ EnumChatFormatting.RESET;
 		}
-		if (acidity == EnumAcidity.Acid) {
+
+		if (acidity == EnumAcidity.ACID) {
 			if (info.length() > 0) {
 				info += ", ";
 			}
-			info += "§cAcidic§f";
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.ph.acid")
+				+ EnumChatFormatting.RESET;
 		}
-		if (acidity == EnumAcidity.Alkaline) {
+
+		if (acidity == EnumAcidity.ALKALINE) {
 			if (info.length() > 0) {
 				info += ", ";
 			}
-			info += "§bAlkaline§f";
+			info += EnumChatFormatting.YELLOW
+				+ I18N.localise("botany.ph.alkaline")
+				+ EnumChatFormatting.RESET;
 		}
+
 		if (info.length() > 0) {
-			p_77624_3_.add(info);
+			tooltip.add(info);
 		}
-		if (this.noWeed) {
-			p_77624_3_.add("Weedkiller");
+
+		if (noWeed) {
+			tooltip.add(I18N.localise("botany.soil.weedkiller"));
 		}
 	}
 
-	public ItemSoil(final Block p_i45328_1_) {
-		super(p_i45328_1_);
-		this.type = ((BlockSoil) this.field_150939_a).getType();
-		this.noWeed = ((BlockSoil) this.field_150939_a).weedKilled;
-		this.hasSubtypes = true;
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		String soilName = type.name().toLowerCase(Locale.ENGLISH);
+		return I18N.localise("botany.soil." + soilName);
 	}
 
 	@Override
-	public String getItemStackDisplayName(final ItemStack stack) {
-		return this.type.name().substring(0, 1) + this.type.name().toLowerCase().substring(1);
-	}
-
-	@Override
-	public int getMetadata(final int p_77647_1_) {
-		return p_77647_1_;
+	public int getMetadata(int meta) {
+		return meta;
 	}
 }

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

@@ -1,68 +1,84 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import binnie.botany.CreativeTabBotany;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IChatComponent;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
 import binnie.botany.api.EnumSoilType;
-import net.minecraft.block.Block;
-import net.minecraft.util.ChatComponentText;
-import binnie.Binnie;
 import binnie.botany.api.gardening.IBlockSoil;
 import binnie.core.BinnieCore;
-import net.minecraft.world.World;
+import binnie.core.util.I18N;
+import binnie.genetics.genetics.AlleleHelper;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+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 class ItemSoilMeter extends Item
-{
 	@Override
-	public boolean onItemUse(final ItemStack stack, final EntityPlayer player, final World world, final int x, int y, final int z, final int p_77648_7_, final float p_77648_8_, final float p_77648_9_, final float p_77648_10_) {
+	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;
+			y--;
 			block = world.getBlock(x, y, z);
 		}
+
 		if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) {
-			final IBlockSoil soil = (IBlockSoil) block;
-			final EnumSoilType type = soil.getType(world, x, y, z);
-			final EnumMoisture moisture = soil.getMoisture(world, x, y, z);
-			final EnumAcidity pH = soil.getPH(world, x, y, z);
-			String info = "Type: ";
-			info = info + "§" + (new char[] { '8', '6', 'd' })[type.ordinal()] + Binnie.Language.localise(type) + "§f";
-			info += ", Moisture: ";
-			info = info + "§" + (new char[] { 'e', '7', '9' })[moisture.ordinal()] + Binnie.Language.localise(moisture) + "§f";
-			info += ", pH: ";
-			info = info + "§" + (new char[] { 'c', 'a', 'b' })[pH.ordinal()] + Binnie.Language.localise(pH) + "§f";
-			final IChatComponent chat = new ChatComponentText(info);
+			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;
+
+			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, p_77648_7_, p_77648_8_, p_77648_9_, p_77648_10_);
+		return super.onItemUse(stack, player, world, x, y, z, side, blockX, blockY, blockZ);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(final IIconRegister register) {
-		this.itemIcon = Botany.proxy.getIcon(register, "soilMeter");
-	}
-
-	public ItemSoilMeter() {
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setUnlocalizedName("soilMeter");
-		this.setMaxStackSize(1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = Botany.proxy.getIcon(register, "soilMeter");
 	}
 
 	@Override
-	public String getItemStackDisplayName(final ItemStack i) {
-		return "Soil Meter";
+	public String getItemStackDisplayName(ItemStack stack) {
+		return I18N.localise("botany.item.soilMeter.name");
 	}
 }

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

@@ -1,62 +1,59 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
 import binnie.botany.api.EnumSoilType;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import binnie.botany.Botany;
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import binnie.botany.CreativeTabBotany;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 
-public class ItemTrowel extends Item
-{
+public class ItemTrowel extends Item {
 	protected Item.ToolMaterial theToolMaterial;
 	String locName;
 
-	public ItemTrowel(final Item.ToolMaterial p_i45343_1_, final String material) {
-		this.theToolMaterial = p_i45343_1_;
-		this.maxStackSize = 1;
-		this.setMaxDamage(p_i45343_1_.getMaxUses());
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setUnlocalizedName("trowel" + material);
-		this.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(final IIconRegister p_94581_1_) {
-		this.itemIcon = Botany.proxy.getIcon(p_94581_1_, "tools/" + this.locName);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = Botany.proxy.getIcon(register, "tools/" + locName);
 	}
 
 	@Override
-	public boolean onItemUse(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int p_77648_7_, final float p_77648_8_, final float p_77648_9_, final float p_77648_10_) {
-		if (!player.canPlayerEdit(x, y, z, p_77648_7_, stack)) {
+	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;
 		}
-		final Block block = world.getBlock(x, y, z);
-		if (p_77648_7_ == 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)) {
+		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;
 		}
-		final Block block2 = Botany.soil;
+
+		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;
 		}
-		final EnumMoisture moisture = Gardening.getNaturalMoisture(world, x, y, z);
-		final EnumAcidity acidity = Gardening.getNaturalPH(world, x, y, z);
+
+		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;
@@ -67,8 +64,4 @@ public class ItemTrowel extends Item
 	public boolean isFull3D() {
 		return true;
 	}
-
-	public String getToolMaterialName() {
-		return this.theToolMaterial.toString();
-	}
 }

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

@@ -1,37 +1,32 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.util.IIcon;
-import net.minecraft.item.ItemStack;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
-public class ItemWeed extends ItemBlock
-{
-	public ItemWeed(final Block p_i45328_1_) {
-		super(p_i45328_1_);
-		this.setHasSubtypes(true);
-		this.hasSubtypes = true;
+public class ItemWeed extends ItemBlock {
+	public ItemWeed(Block block) {
+		super(block);
+		setHasSubtypes(true);
+		hasSubtypes = true;
 	}
 
 	@Override
-	public String getItemStackDisplayName(final ItemStack stack) {
+	public String getItemStackDisplayName(ItemStack stack) {
 		return BlockPlant.Type.values()[stack.getItemDamage()].getName();
 	}
 
 	@Override
-	public int getMetadata(final int p_77647_1_) {
-		return p_77647_1_;
+	public int getMetadata(int meta) {
+		return meta;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(final int p_77617_1_) {
-		return this.field_150939_a.getIcon(2, p_77617_1_);
+	public IIcon getIconFromDamage(int damage) {
+		return field_150939_a.getIcon(2, damage);
 	}
 }

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

@@ -1,70 +1,71 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.gardening;
 
-import binnie.core.block.TileEntityMetadata;
-import java.util.Map;
-import binnie.botany.genetics.EnumFlowerColor;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
-import net.minecraft.init.Items;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import binnie.core.Mods;
-import net.minecraft.item.crafting.IRecipe;
+import binnie.Binnie;
+import binnie.botany.Botany;
+import binnie.botany.CreativeTabBotany;
 import binnie.botany.api.EnumAcidity;
-import binnie.botany.farm.CircuitGarden;
 import binnie.botany.api.EnumMoisture;
-import net.minecraft.init.Blocks;
-import binnie.botany.ceramic.PigmentRecipe;
-import net.minecraftforge.oredict.RecipeSorter;
-import binnie.botany.ceramic.CeramicTileRecipe;
-import binnie.core.block.MultipassItemRenderer;
+import binnie.botany.api.EnumSoilType;
+import binnie.botany.ceramic.BlockCeramic;
 import binnie.botany.ceramic.BlockCeramicBrick;
 import binnie.botany.ceramic.BlockCeramicPatterned;
-import net.minecraftforge.client.IItemRenderer;
-import binnie.core.block.ItemMetadataRenderer;
-import binnie.core.BinnieCore;
-import binnie.core.block.ItemMetadata;
 import binnie.botany.ceramic.BlockStained;
-import binnie.botany.ceramic.BlockCeramic;
-import net.minecraftforge.oredict.OreDictionary;
+import binnie.botany.ceramic.CeramicTileRecipe;
+import binnie.botany.ceramic.PigmentRecipe;
+import binnie.botany.farm.CircuitGarden;
+import binnie.botany.flower.ItemInsulatedTube;
+import binnie.botany.genetics.EnumFlowerColor;
+import binnie.botany.items.BotanyItems;
 import binnie.botany.items.ItemClay;
 import binnie.botany.items.ItemPigment;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.items.BotanyItems;
-import binnie.Binnie;
-import net.minecraft.item.Item;
-import binnie.botany.flower.ItemInsulatedTube;
-import net.minecraft.block.Block;
-import cpw.mods.fml.common.registry.GameRegistry;
-import binnie.botany.Botany;
-import binnie.botany.api.EnumSoilType;
-import net.minecraft.item.ItemStack;
-import java.util.HashMap;
+import binnie.core.BinnieCore;
 import binnie.core.IInitializable;
+import binnie.core.Mods;
+import binnie.core.block.ItemMetadata;
+import binnie.core.block.ItemMetadataRenderer;
+import binnie.core.block.MultipassItemRenderer;
+import binnie.core.block.TileEntityMetadata;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.RecipeSorter;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-public class ModuleGardening implements IInitializable
-{
-	public static HashMap<ItemStack, Integer> queuedAcidFertilisers;
-	public static HashMap<ItemStack, Integer> queuedAlkalineFertilisers;
-	public static HashMap<ItemStack, Integer> queuedNutrientFertilisers;
+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<>();
 
 	@Override
 	public void preInit() {
+		Botany.plant = new BlockPlant();
+		GameRegistry.registerBlock(Botany.plant, ItemWeed.class, "plant");
+
 		Botany.soil = new BlockSoil(EnumSoilType.SOIL, "soil", false);
-		Botany.loam = new BlockSoil(EnumSoilType.LOAM, "loam", false);
-		Botany.flowerbed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed", false);
-		Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true);
-		Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true);
-		Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true);
-		GameRegistry.registerBlock(Botany.plant = new BlockPlant(), ItemWeed.class, "plant");
 		GameRegistry.registerBlock(Botany.soil, ItemSoil.class, "soil");
+
+		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.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.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");
@@ -75,17 +76,21 @@ public class ModuleGardening implements IInitializable
 		Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
 		Botany.pigment = new ItemPigment();
 		Botany.clay = new ItemClay();
+
 		Botany.ceramic = new BlockCeramic();
-		Botany.stained = new BlockStained();
 		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.ceramicTile = new BlockCeramicPatterned();
-		Botany.ceramicBrick = new BlockCeramicBrick();
 		GameRegistry.registerBlock(Botany.ceramicTile, ItemMetadata.class, "ceramicPattern");
-		GameRegistry.registerBlock(Botany.ceramicBrick, ItemMetadata.class, "ceramicBrick");
 		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());
 	}
 
@@ -94,21 +99,22 @@ public class ModuleGardening implements IInitializable
 		OreDictionary.registerOre("pigment", Botany.pigment);
 		RecipeSorter.register("botany:ceramictile", CeramicTileRecipe.class, RecipeSorter.Category.SHAPED, "");
 		RecipeSorter.register("botany:pigment", PigmentRecipe.class, RecipeSorter.Category.SHAPED, "");
-		final ItemStack yellow = new ItemStack(Blocks.yellow_flower, 1);
-		final ItemStack red = new ItemStack(Blocks.red_flower, 1);
-		final ItemStack blue = new ItemStack(Blocks.red_flower, 1, 7);
-		for (final boolean manual : new boolean[] { true, false }) {
-			for (final boolean fertilised : new boolean[] { true, false }) {
-				for (final EnumMoisture moist : EnumMoisture.values()) {
-					final ItemStack icon = (moist == EnumMoisture.Dry) ? yellow : ((moist == EnumMoisture.Normal) ? red : blue);
+		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, 0 + 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);
+					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);
 				}
 			}
 		}
@@ -119,32 +125,109 @@ public class ModuleGardening implements IInitializable
 		GameRegistry.addRecipe(new CeramicTileRecipe());
 		for (int mat = 0; mat < 4; ++mat) {
 			for (int insulate = 0; insulate < 6; ++insulate) {
-				final ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate);
-				final ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes);
-				final ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, mat);
-				GameRegistry.addShapelessRecipe(tubes, new Object[] { forestryTube, forestryTube, insulateStack });
+				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.addRecipe(new ShapedOreRecipe((Item) Botany.trowelWood, new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe((Item) Botany.trowelStone, new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe((Item) Botany.trowelIron, new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe((Item) Botany.trowelGold, new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe((Item) Botany.trowelDiamond, new Object[] { "d  ", " x ", "  s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond" }));
-		GameRegistry.addRecipe(new ShapedOreRecipe((Item) Botany.soilMeter, new Object[] { " gg", " rg", "i  ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" }));
-		GameRegistry.addShapelessRecipe(BotanyItems.Weedkiller.get(4), new Object[] { 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), new Object[] { Mods.Forestry.stack("ash") });
-		GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), new Object[] { Mods.Forestry.stack("mulch") });
-		GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), new Object[] { Mods.Forestry.stack("fertilizerBio") });
-		GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), new Object[] { Mods.Forestry.stack("fertilizerCompound") });
-		GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), new Object[] { 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.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.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"
+			}
+		));
+
 		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 (final ItemStack stack : OreDictionary.getOres("dustSulfur")) {
+
+		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);
@@ -153,50 +236,67 @@ public class ModuleGardening implements IInitializable
 		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 (final Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAcidFertilisers.entrySet()) {
-			this.addAcidFertiliser(entry.getKey(), entry.getValue());
+
+		for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAcidFertilisers.entrySet()) {
+			addAcidFertiliser(entry.getKey(), entry.getValue());
 		}
-		for (final Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAlkalineFertilisers.entrySet()) {
-			this.addAlkalineFertiliser(entry.getKey(), entry.getValue());
+
+		for (Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedAlkalineFertilisers.entrySet()) {
+			addAlkalineFertiliser(entry.getKey(), entry.getValue());
 		}
-		for (final Map.Entry<ItemStack, Integer> entry : ModuleGardening.queuedNutrientFertilisers.entrySet()) {
-			this.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), new Object[] { " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel });
-		for (final EnumFlowerColor c : EnumFlowerColor.values()) {
-			final ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal());
-			final ItemStack pigment = new ItemStack(Botany.pigment, 1, c.ordinal());
-			GameRegistry.addShapelessRecipe(clay, new Object[] { Items.clay_ball, Items.clay_ball, Items.clay_ball, pigment });
+
+		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);
-			final ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal());
+			ItemStack glass = TileEntityMetadata.getItemStack(Botany.stained, c.ordinal());
 			glass.stackSize = 4;
-			GameRegistry.addShapedRecipe(glass, new Object[] { " g ", "gpg", " g ", 'g', Blocks.glass, 'p', pigment });
+			GameRegistry.addShapedRecipe(
+				glass,
+				" g ", "gpg", " g ",
+				'g', Blocks.glass,
+				'p', pigment
+			);
 		}
+
 		GameRegistry.addRecipe(new PigmentRecipe());
 	}
 
-	private ItemStack getStack(final int type, final int pH, final int 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(final ItemStack stack, final int strengthMax) {
+	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) {
-						final ItemStack start = this.getStack(type, pH, moisture);
-						final ItemStack end = this.getStack(type, pH - strength, moisture);
+						ItemStack start = getStack(type, pH, moisture);
+						ItemStack end = getStack(type, pH - strength, moisture);
 						if (end != null) {
 							end.stackSize = numOfBlocks;
-							final Object[] stacks = new Object[numOfBlocks + 1];
+							Object[] stacks = new Object[numOfBlocks + 1];
 							for (int i = 0; i < numOfBlocks; ++i) {
 								stacks[i] = start;
 							}
@@ -210,21 +310,22 @@ public class ModuleGardening implements IInitializable
 		}
 	}
 
-	private void addAlkalineFertiliser(final ItemStack stack, final int strengthMax) {
+	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) {
-						final ItemStack start = this.getStack(type, pH, moisture);
-						final ItemStack end = this.getStack(type, pH + strength, moisture);
+						ItemStack start = getStack(type, pH, moisture);
+						ItemStack end = getStack(type, pH + strength, moisture);
 						if (end != null) {
 							end.stackSize = numOfBlocks;
-							final Object[] stacks = new Object[numOfBlocks + 1];
+							Object[] stacks = new Object[numOfBlocks + 1];
 							for (int i = 0; i < numOfBlocks; ++i) {
 								stacks[i] = start;
 							}
@@ -238,21 +339,22 @@ public class ModuleGardening implements IInitializable
 		}
 	}
 
-	private void addNutrientFertiliser(final ItemStack stack, final int strengthMax) {
+	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) {
-						final ItemStack start = this.getStack(type, pH, moisture);
-						final ItemStack end = this.getStack(type + strength, pH, moisture);
+						ItemStack start = getStack(type, pH, moisture);
+						ItemStack end = getStack(type + strength, pH, moisture);
 						if (end != null) {
 							end.stackSize = numOfBlocks;
-							final Object[] stacks = new Object[numOfBlocks + 1];
+							Object[] stacks = new Object[numOfBlocks + 1];
 							for (int i = 0; i < numOfBlocks; ++i) {
 								stacks[i] = start;
 							}
@@ -265,10 +367,4 @@ public class ModuleGardening implements IInitializable
 			}
 		}
 	}
-
-	static {
-		ModuleGardening.queuedAcidFertilisers = new HashMap<ItemStack, Integer>();
-		ModuleGardening.queuedAlkalineFertilisers = new HashMap<ItemStack, Integer>();
-		ModuleGardening.queuedNutrientFertilisers = new HashMap<ItemStack, Integer>();
-	}
 }

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

@@ -1,52 +1,45 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
 import forestry.api.genetics.IAlleleInteger;
 
-public class AlleleColor implements IAlleleInteger
-{
-	String uid;
-	boolean dominant;
-	String name;
-	int value;
-	EnumFlowerColor color;
+public class AlleleColor implements IAlleleInteger {
+	private String uid;
+	private int value;
+	private EnumFlowerColor color;
+	private boolean dominant = true;
 
-	public AlleleColor(final EnumFlowerColor color, final String uid, final String name, final int value) {
+	public AlleleColor(EnumFlowerColor color, String uid, int value) {
 		this.color = color;
 		this.uid = uid;
-		this.name = name;
 		this.value = value;
 	}
 
 	@Override
 	public String getUID() {
-		return this.uid;
+		return uid;
 	}
 
 	@Override
 	public boolean isDominant() {
-		return true;
+		return dominant;
 	}
 
 	@Override
 	public String getName() {
-		return this.color.getName();
+		return color.getName();
 	}
 
 	@Override
 	public int getValue() {
-		return this.value;
+		return value;
 	}
 
 	public EnumFlowerColor getColor() {
-		return this.color;
+		return color;
 	}
 
 	@Override
 	public String getUnlocalizedName() {
-		return this.getUID();
+		return getUID();
 	}
 }

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

@@ -1,23 +1,19 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
-import net.minecraft.world.World;
-import binnie.botany.api.IFlowerGenome;
-import forestry.api.genetics.IEffectData;
 import binnie.botany.api.IAlleleFlowerEffect;
+import binnie.botany.api.IFlowerGenome;
+import binnie.core.util.I18N;
+import forestry.api.genetics.IEffectData;
+import net.minecraft.world.World;
 
-public class AlleleEffectNone implements IAlleleFlowerEffect
-{
+public class AlleleEffectNone implements IAlleleFlowerEffect {
 	@Override
 	public boolean isCombinable() {
 		return true;
 	}
 
 	@Override
-	public IEffectData validateStorage(final IEffectData storedData) {
+	public IEffectData validateStorage(IEffectData storedData) {
 		return storedData;
 	}
 
@@ -33,16 +29,16 @@ public class AlleleEffectNone implements IAlleleFlowerEffect
 
 	@Override
 	public String getName() {
-		return "None";
+		return I18N.localise("forestry.allele.effect.none");
 	}
 
 	@Override
-	public IEffectData doEffect(final IFlowerGenome genome, final IEffectData storedData, final World world, final int x, final int y, final int z) {
+	public IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z) {
 		return storedData;
 	}
 
 	@Override
 	public String getUnlocalizedName() {
-		return this.getUID();
+		return getUID();
 	}
 }

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

@@ -1,31 +1,26 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
 import binnie.Binnie;
-import forestry.api.genetics.IBreedingTracker;
-
-import net.minecraft.entity.player.EntityPlayer;
-import forestry.api.genetics.IIndividual;
-
 import binnie.botany.api.IBotanistTracker;
+import forestry.api.genetics.IBreedingTracker;
+import forestry.api.genetics.IIndividual;
 import forestry.core.genetics.BreedingTracker;
+import net.minecraft.entity.player.EntityPlayer;
 
-public class BotanistTracker extends BreedingTracker implements IBotanistTracker
-{
-	public BotanistTracker(final String s) {
+public class BotanistTracker extends BreedingTracker implements IBotanistTracker {
+	public BotanistTracker(String s) {
 		super(s);
 	}
 
 	@Override
-	public void registerPickup(final IIndividual individual) {
+	public void registerPickup(IIndividual individual) {
+		// ignored
 	}
 
 	@Override
-	protected IBreedingTracker getBreedingTracker(final EntityPlayer player) {
-		return Binnie.Genetics.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile());
+	protected IBreedingTracker getBreedingTracker(EntityPlayer player) {
+		return Binnie.Genetics.getFlowerRoot()
+			.getBreedingTracker(player.worldObj, player.getGameProfile());
 	}
 
 	@Override

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

@@ -0,0 +1,44 @@
+package binnie.botany.genetics;
+
+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;
+
+	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 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 int getChance() {
+		return chance;
+	}
+
+	@Override
+	public IFlowerColor getResult() {
+		return result;
+	}
+}

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

@@ -1,48 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie.botany.genetics;
-
-import binnie.botany.api.IFlowerColour;
-import binnie.botany.api.IColourMix;
-
-public class ColourMix implements IColourMix
-{
-	IFlowerColour colour1;
-	IFlowerColour colour2;
-	IFlowerColour result;
-	int chance;
-
-	@Override
-	public IFlowerColour getColour1() {
-		return this.colour1;
-	}
-
-	@Override
-	public IFlowerColour getColour2() {
-		return this.colour2;
-	}
-
-	@Override
-	public boolean isMutation(final IFlowerColour a, final IFlowerColour b) {
-		return (a == this.colour1 && b == this.colour2) || (a == this.colour2 && b == this.colour1);
-	}
-
-	@Override
-	public int getChance() {
-		return this.chance;
-	}
-
-	@Override
-	public IFlowerColour getResult() {
-		return this.result;
-	}
-
-	public ColourMix(final IFlowerColour colour1, final IFlowerColour colour2, final IFlowerColour result, final int chance) {
-		this.colour1 = colour1;
-		this.colour2 = colour2;
-		this.result = result;
-		this.chance = chance;
-	}
-}

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

@@ -1,135 +1,152 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
 import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import binnie.botany.api.EnumFlowerStage;
-import net.minecraft.util.IIcon;
 import binnie.botany.api.IFlowerType;
+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);
+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);
 
-	int sections;
-	IIcon[] stem;
-	IIcon[] petal;
-	IIcon[] variant;
-	IIcon[] unflowered;
-	IIcon seedStem;
-	IIcon seedPetal;
-	IIcon seedVariant;
-	IIcon pollenStem;
-	IIcon pollenPetal;
-	IIcon pollenVariant;
-	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;
 
-	private EnumFlowerType() {
+	EnumFlowerType() {
 		this(1);
 	}
 
-	private EnumFlowerType(final int sections) {
-		this.sections = 1;
+	EnumFlowerType(int sections) {
 		this.sections = sections;
-		this.stem = new IIcon[sections];
-		this.petal = new IIcon[sections];
-		this.variant = new IIcon[sections];
-		this.unflowered = new IIcon[sections];
+		stem = new IIcon[sections];
+		petal = new IIcon[sections];
+		variant = new IIcon[sections];
+		unflowered = new IIcon[sections];
 	}
 
 	@Override
-	public IIcon getStem(final EnumFlowerStage stage, final boolean flowered, final int section) {
-		return (stage == EnumFlowerStage.SEED) ? this.seedStem : ((stage == EnumFlowerStage.POLLEN) ? this.pollenStem : this.stem[section % this.sections]);
-	}
-
-	@Override
-	public IIcon getPetalIcon(final EnumFlowerStage stage, final boolean flowered, final int section) {
-		return (stage == EnumFlowerStage.SEED) ? this.seedPetal : ((stage == EnumFlowerStage.POLLEN) ? this.pollenPetal : (flowered ? this.petal[section % this.sections] : this.unflowered[section % this.sections]));
-	}
-
-	@Override
-	public IIcon getVariantIcon(final EnumFlowerStage stage, final boolean flowered, final int section) {
-		return (stage == EnumFlowerStage.SEED) ? this.seedVariant : ((stage == EnumFlowerStage.POLLEN) ? this.pollenVariant : (flowered ? this.variant[section % this.sections] : this.blank));
-	}
-
-	public void registerIcons(final IIconRegister register) {
-		for (int i = 0; i < this.sections; ++i) {
-			final String suf = (i == 0) ? "" : ("" + (i + 1));
-			final String pre = (this.sections == 1) ? "" : "double/";
-			this.stem[i] = Botany.proxy.getIcon(register, "flowers/" + pre + this.toString().toLowerCase() + suf + ".0");
-			this.petal[i] = Botany.proxy.getIcon(register, "flowers/" + pre + this.toString().toLowerCase() + suf + ".1");
-			this.variant[i] = Botany.proxy.getIcon(register, "flowers/" + pre + this.toString().toLowerCase() + suf + ".2");
-			this.unflowered[i] = Botany.proxy.getIcon(register, "flowers/" + pre + this.toString().toLowerCase() + suf + ".3");
+	public IIcon getStem(EnumFlowerStage stage, boolean flowered, int section) {
+		if (stage == EnumFlowerStage.SEED) {
+			return seedStem;
 		}
-		this.blank = Botany.proxy.getIcon(register, "flowers/blank");
-		this.seedStem = Botany.proxy.getIcon(register, "flowers/seed.0");
-		this.seedPetal = Botany.proxy.getIcon(register, "flowers/seed.1");
-		this.seedVariant = Botany.proxy.getIcon(register, "flowers/seed.2");
-		this.pollenStem = Botany.proxy.getIcon(register, "flowers/pollen.0");
-		this.pollenPetal = Botany.proxy.getIcon(register, "flowers/pollen.1");
-		this.pollenVariant = Botany.proxy.getIcon(register, "flowers/pollen.2");
+		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 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");
+		}
+
+		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 this.ordinal();
+		return ordinal();
 	}
 
 	@Override
 	public int getSections() {
-		return this.sections;
+		return sections;
 	}
 
 	public IIcon getBlank() {
-		return this.blank;
+		return blank;
 	}
 }

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

@@ -1,121 +1,112 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
-import binnie.botany.api.IFlowerColour;
-import forestry.api.genetics.IGenome;
-import binnie.botany.api.IFlowerMutation;
-import binnie.botany.api.IColourMix;
-import forestry.api.arboriculture.EnumTreeChromosome;
-import net.minecraft.world.World;
-import forestry.api.genetics.IAllele;
-import forestry.core.genetics.Chromosome;
-import forestry.api.genetics.IChromosome;
-import java.util.Random;
-import net.minecraft.nbt.NBTBase;
-import binnie.botany.core.BotanyCore;
-import forestry.api.genetics.IChromosomeType;
 import binnie.botany.api.EnumFlowerChromosome;
-import java.util.List;
 import binnie.botany.api.IAlleleFlowerSpecies;
-import net.minecraft.nbt.NBTTagCompound;
-import binnie.botany.api.IFlowerGenome;
+import binnie.botany.api.IColourMix;
 import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerColor;
+import binnie.botany.api.IFlowerGenome;
+import binnie.botany.api.IFlowerMutation;
+import binnie.botany.core.BotanyCore;
+import binnie.core.util.I18N;
+import binnie.genetics.genetics.AlleleHelper;
+import forestry.api.arboriculture.EnumTreeChromosome;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosome;
+import forestry.core.genetics.Chromosome;
 import forestry.core.genetics.Individual;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
 
-public class Flower extends Individual implements IFlower
-{
+import java.util.List;
+
+public class Flower extends Individual implements IFlower {
 	public IFlowerGenome genome;
 	public IFlowerGenome mate;
-	int age;
-	boolean wilting;
-	boolean flowered;
 
-	public Flower(final NBTTagCompound nbttagcompound) {
-		this.age = 0;
-		this.wilting = false;
-		this.readFromNBT(nbttagcompound);
+	protected int age;
+	protected boolean wilting;
+	protected boolean flowered;
+
+	public Flower(NBTTagCompound nbttagcompound) {
+		age = 0;
+		wilting = false;
+		readFromNBT(nbttagcompound);
 	}
 
-	public Flower(final IFlowerGenome genome, final int age) {
-		this.age = 0;
-		this.wilting = false;
+	public Flower(IFlowerGenome genome, int age) {
 		this.genome = genome;
 		this.age = age;
-		if (age > 0) {
-			this.flowered = true;
-		}
-		else {
-			this.flowered = false;
-		}
+		wilting = false;
+		flowered = age > 0;
 	}
 
 	@Override
 	public String getDisplayName() {
-		final IAlleleFlowerSpecies species = this.getGenome().getPrimary();
+		IAlleleFlowerSpecies species = getGenome().getPrimary();
 		String name = "";
 		if (species != null) {
 			name += species.getName();
 		}
-		if (this.age == 0) {
-			name += "";
-		}
 		return name;
 	}
 
 	@Override
-	public void addTooltip(final List<String> list) {
-		final IAlleleFlowerSpecies primary = this.genome.getPrimary();
-		final IAlleleFlowerSpecies secondary = this.genome.getSecondary();
-		if (!this.isPureBred(EnumFlowerChromosome.SPECIES)) {
-			list.add("§9" + primary.getName() + "-" + secondary.getName() + " Hybrid");
+	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("§6Age: " + this.getAge());
-		list.add("§6T: " + this.getGenome().getPrimary().getTemperature() + " / " + this.getGenome().getToleranceTemperature());
-		list.add("§6M: " + this.getGenome().getPrimary().getMoisture() + " / " + this.getGenome().getToleranceMoisture());
-		list.add("§6pH: " + this.getGenome().getPrimary().getHumidity() + " / " + this.getGenome().getTolerancePH());
-		list.add("§6Fert: " + this.getGenome().getFertility() + "x");
+
+		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 this.getGenome().getPrimary().getUID();
+		return getGenome().getPrimary().getUID();
 	}
 
 	@Override
-	public void readFromNBT(final NBTTagCompound nbttagcompound) {
+	public void readFromNBT(NBTTagCompound nbttagcompound) {
 		super.readFromNBT(nbttagcompound);
 		if (nbttagcompound == null) {
-			this.genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
+			genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate());
 			return;
 		}
-		this.age = nbttagcompound.getInteger("Age");
-		this.wilting = nbttagcompound.getBoolean("Wilt");
-		this.flowered = nbttagcompound.getBoolean("Flowered");
+
+		age = nbttagcompound.getInteger("Age");
+		wilting = nbttagcompound.getBoolean("Wilt");
+		flowered = nbttagcompound.getBoolean("Flowered");
 		if (nbttagcompound.hasKey("Genome")) {
-			this.genome = new FlowerGenome(nbttagcompound.getCompoundTag("Genome"));
+			genome = new FlowerGenome(nbttagcompound.getCompoundTag("Genome"));
 		}
 		if (nbttagcompound.hasKey("Mate")) {
-			this.mate = new FlowerGenome(nbttagcompound.getCompoundTag("Mate"));
+			mate = new FlowerGenome(nbttagcompound.getCompoundTag("Mate"));
 		}
 	}
 
 	@Override
-	public void writeToNBT(final NBTTagCompound nbttagcompound) {
+	public void writeToNBT(NBTTagCompound nbttagcompound) {
 		super.writeToNBT(nbttagcompound);
-		nbttagcompound.setInteger("Age", this.age);
-		nbttagcompound.setBoolean("Wilt", this.wilting);
-		nbttagcompound.setBoolean("Flowered", this.flowered);
-		if (this.genome != null) {
-			final NBTTagCompound NBTmachine = new NBTTagCompound();
-			this.genome.writeToNBT(NBTmachine);
+		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 (this.mate != null) {
-			final NBTTagCompound NBTmachine = new NBTTagCompound();
-			this.mate.writeToNBT(NBTmachine);
+
+		if (mate != null) {
+			NBTTagCompound NBTmachine = new NBTTagCompound();
+			mate.writeToNBT(NBTmachine);
 			nbttagcompound.setTag("Mate", NBTmachine);
 		}
 	}
@@ -126,101 +117,78 @@ public class Flower extends Individual implements IFlower
 
 	@Override
 	public IFlowerGenome getGenome() {
-		return this.genome;
-	}
-
-	private IChromosome inheritChromosome(final Random rand, final IChromosome parent1, final IChromosome parent2) {
-		IAllele choice1;
-		if (rand.nextBoolean()) {
-			choice1 = parent1.getPrimaryAllele();
-		}
-		else {
-			choice1 = parent1.getSecondaryAllele();
-		}
-		IAllele choice2;
-		if (rand.nextBoolean()) {
-			choice2 = parent2.getPrimaryAllele();
-		}
-		else {
-			choice2 = parent2.getSecondaryAllele();
-		}
-		if (rand.nextBoolean()) {
-			return new Chromosome(choice1, choice2);
-		}
-		return new Chromosome(choice2, choice1);
+		return genome;
 	}
 
 	@Override
-	public void mate(final IFlower other) {
-		this.mate = new FlowerGenome(other.getGenome().getChromosomes());
+	public void mate(IFlower other) {
+		mate = new FlowerGenome(other.getGenome().getChromosomes());
 	}
 
 	@Override
 	public IFlowerGenome getMate() {
-		return this.mate;
+		return mate;
 	}
 
 	@Override
 	public IFlower copy() {
-		final NBTTagCompound nbttagcompound = new NBTTagCompound();
-		this.writeToNBT(nbttagcompound);
+		NBTTagCompound nbttagcompound = new NBTTagCompound();
+		writeToNBT(nbttagcompound);
 		return new Flower(nbttagcompound);
 	}
 
 	@Override
 	public int getAge() {
-		return this.age;
+		return age;
+	}
+
+	@Override
+	public void setAge(int age) {
+		this.age = age;
 	}
 
 	@Override
 	public void age() {
-		if (this.age < 15) {
-			++this.age;
+		if (age < 15) {
+			age++;
 		}
 	}
 
-	@Override
-	public void setAge(final int i) {
-		this.age = i;
-	}
-
 	@Override
 	public int getMaxAge() {
-		return this.getGenome().getLifespan();
+		return getGenome().getLifespan();
 	}
 
 	@Override
 	public boolean isWilted() {
-		return this.wilting;
+		return wilting;
 	}
 
 	@Override
-	public void setWilted(final boolean wilted) {
-		this.wilting = wilted;
+	public void setWilted(boolean value) {
+		wilting = value;
 	}
 
 	@Override
 	public boolean hasFlowered() {
-		return this.flowered;
+		return flowered;
 	}
 
 	@Override
-	public void setFlowered(final boolean flowered) {
-		this.flowered = flowered;
+	public void setFlowered(boolean value) {
+		flowered = value;
 	}
 
 	@Override
 	public void removeMate() {
-		this.mate = null;
+		mate = null;
 	}
 
 	@Override
-	public IFlower getOffspring(final World world) {
-		final IChromosome[] chromosomes = new IChromosome[this.genome.getChromosomes().length];
-		IChromosome[] parent1 = this.genome.getChromosomes();
-		IChromosome[] parent2 = this.mate.getChromosomes();
-		parent1 = this.mutateSpecies(world, this.genome, this.mate);
-		parent2 = this.mutateSpecies(world, this.mate, this.genome);
+	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]);
@@ -229,59 +197,64 @@ public class Flower extends Individual implements IFlower
 		return new Flower(new FlowerGenome(chromosomes), 0);
 	}
 
-	private IChromosome[] mutateSpecies(final World world, final IFlowerGenome genomeOne, final IFlowerGenome genomeTwo) {
+	private IChromosome[] mutateSpecies(World world, IFlowerGenome genomeOne, IFlowerGenome genomeTwo) {
 		IChromosome[] parent1 = genomeOne.getChromosomes();
-		final IChromosome[] parent2 = genomeTwo.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 {
+		} else {
 			allele0 = parent2[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele();
 			allele2 = parent1[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele();
 			genome0 = genomeTwo;
 			genome2 = genomeOne;
 		}
-		IFlowerColour colour1 = genome0.getPrimaryColor();
-		IFlowerColour colour2 = genome2.getPrimaryColor();
+
+		IFlowerColor colour1 = genome0.getPrimaryColor();
+		IFlowerColor colour2 = genome2.getPrimaryColor();
 		if (colour1 != colour2) {
-			for (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+			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 (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+			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 (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) {
+			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 (final IFlowerMutation mutation2 : BotanyCore.getFlowerRoot().getMutations(true)) {
-			final float chance = mutation2.getChance(allele0, allele2, genome0, genome2);
+		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;
 		}

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

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

@@ -1,80 +1,62 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
-import forestry.api.genetics.ISpeciesType;
-import binnie.botany.api.EnumFlowerChromosome;
-import forestry.api.genetics.IChromosomeType;
-
-import net.minecraft.world.WorldSavedData;
-
-import binnie.botany.api.IBotanistTracker;
-
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IMutation;
-
-import java.util.Collections;
-import java.util.Collection;
-import java.util.Random;
-
-import binnie.botany.api.IFlowerGenome;
-
-import net.minecraft.world.World;
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-
 import binnie.botany.Botany;
-import forestry.api.genetics.IIndividual;
+import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
-
 import binnie.botany.api.IAlleleFlowerSpecies;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.AlleleManager;
-
-import java.util.HashMap;
-
+import binnie.botany.api.IBotanistTracker;
 import binnie.botany.api.IColourMix;
-
-import net.minecraft.item.ItemStack;
-
-import java.util.Map;
-
-import binnie.botany.api.IFlowerMutation;
 import binnie.botany.api.IFlower;
+import binnie.botany.api.IFlowerGenome;
+import binnie.botany.api.IFlowerMutation;
+import binnie.botany.api.IFlowerRoot;
+import com.mojang.authlib.GameProfile;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.genetics.IChromosomeType;
+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 binnie.botany.api.IFlowerRoot;
-import forestry.core.genetics.SpeciesRoot;
+public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
+	public static int flowerSpeciesCount = -1;
+	public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
 
-public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
-{
-	public static int flowerSpeciesCount;
-	static final String UID = "rootFlowers";
-	public static ArrayList<IFlower> flowerTemplates;
-	private static ArrayList<IFlowerMutation> flowerMutations;
-	Map<ItemStack, IFlower> conversions;
-	private static ArrayList<IColourMix> colourMixes;
+	protected static String UID = "rootFlowers";
+
+	private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
+	private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
+
+	protected Map<ItemStack, IFlower> conversions;
 
 	public FlowerHelper() {
-		this.conversions = new HashMap<ItemStack, IFlower>();
+		conversions = new HashMap<>();
 	}
 
 	@Override
 	public String getUID() {
-		return "rootFlowers";
+		return UID;
 	}
 
 	@Override
 	public int getSpeciesCount() {
 		if (FlowerHelper.flowerSpeciesCount < 0) {
 			FlowerHelper.flowerSpeciesCount = 0;
-			for (final Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
+			for (Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
 				if (entry.getValue() instanceof IAlleleFlowerSpecies && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) {
-					++FlowerHelper.flowerSpeciesCount;
+					FlowerHelper.flowerSpeciesCount++;
 				}
 			}
 		}
@@ -82,78 +64,95 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public boolean isMember(final ItemStack stack) {
-		return stack != null && this.getStageType(stack) != EnumFlowerStage.NONE;
+	public boolean isMember(ItemStack stack) {
+		return stack != null
+			&& getStageType(stack) != EnumFlowerStage.NONE;
 	}
 
 	@Override
-	public boolean isMember(final ItemStack stack, final int type) {
-		return this.getStageType(stack).ordinal() == type;
+	public boolean isMember(ItemStack stack, int type) {
+		return getStageType(stack).ordinal() == type;
 	}
 
 	@Override
-	public boolean isMember(final IIndividual individual) {
+	public boolean isMember(IIndividual individual) {
 		return individual instanceof IFlower;
 	}
 
 	@Override
-	public ItemStack getMemberStack(final IIndividual flower, final int type) {
-		if (!this.isMember(flower)) {
+	public ItemStack getMemberStack(IIndividual flower, int type) {
+		if (!isMember(flower)) {
 			return null;
 		}
+
 		Item flowerItem = Botany.flowerItem;
 		if (type == EnumFlowerStage.SEED.ordinal()) {
 			flowerItem = Botany.seed;
 		}
+
 		if (type == EnumFlowerStage.POLLEN.ordinal()) {
 			flowerItem = Botany.pollen;
 		}
+
 		if (flowerItem != Botany.flowerItem) {
 			((IFlower) flower).setAge(0);
 		}
-		final NBTTagCompound nbttagcompound = new NBTTagCompound();
+
+		NBTTagCompound nbttagcompound = new NBTTagCompound();
 		flower.writeToNBT(nbttagcompound);
-		final ItemStack flowerStack = new ItemStack(flowerItem);
+		ItemStack flowerStack = new ItemStack(flowerItem);
 		flowerStack.setTagCompound(nbttagcompound);
 		return flowerStack;
 	}
 
 	@Override
-	public EnumFlowerStage getStageType(final ItemStack stack) {
-		return (stack == null) ? EnumFlowerStage.NONE : ((stack.getItem() == Botany.flowerItem) ? EnumFlowerStage.FLOWER : ((stack.getItem() == Botany.pollen) ? EnumFlowerStage.POLLEN : ((stack.getItem() == Botany.seed) ? EnumFlowerStage.SEED : EnumFlowerStage.NONE)));
+	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(final ItemStack stack) {
-		if (!this.isMember(stack)) {
+	public IFlower getMember(ItemStack stack) {
+		if (!isMember(stack)) {
 			return null;
 		}
 		return new Flower(stack.getTagCompound());
 	}
 
 	@Override
-	public IFlower getFlower(final World world, final IFlowerGenome genome) {
+	public IFlower getFlower(World world, IFlowerGenome genome) {
 		return new Flower(genome, 2);
 	}
 
 	@Override
-	public IFlowerGenome templateAsGenome(final IAllele[] template) {
-		return new FlowerGenome(this.templateAsChromosomes(template));
+	public IFlowerGenome templateAsGenome(IAllele[] template) {
+		return new FlowerGenome(templateAsChromosomes(template));
 	}
 
 	@Override
-	public IFlowerGenome templateAsGenome(final IAllele[] templateActive, final IAllele[] templateInactive) {
-		return new FlowerGenome(this.templateAsChromosomes(templateActive, templateInactive));
+	public IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) {
+		return new FlowerGenome(templateAsChromosomes(templateActive, templateInactive));
 	}
 
 	@Override
-	public IFlower templateAsIndividual(final IAllele[] template) {
-		return new Flower(this.templateAsGenome(template), 2);
+	public IFlower templateAsIndividual(IAllele[] template) {
+		return new Flower(templateAsGenome(template), 2);
 	}
 
 	@Override
-	public IFlower templateAsIndividual(final IAllele[] templateActive, final IAllele[] templateInactive) {
-		return new Flower(this.templateAsGenome(templateActive, templateInactive), 2);
+	public IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) {
+		return new Flower(templateAsGenome(templateActive, templateInactive), 2);
 	}
 
 	@Override
@@ -162,21 +161,21 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public void registerTemplate(final IAllele[] template) {
-		this.registerTemplate(template[0].getUID(), template);
+	public void registerTemplate(IAllele[] template) {
+		registerTemplate(template[0].getUID(), template);
 	}
 
 	@Override
-	public void registerTemplate(final String identifier, final IAllele[] template) {
-		FlowerHelper.flowerTemplates.add(new Flower(this.templateAsGenome(template), 2));
-		if (!this.speciesTemplates.containsKey(identifier)) {
-			this.speciesTemplates.put(identifier, template);
+	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(final String identifier) {
-		return this.speciesTemplates.get(identifier);
+	public IAllele[] getTemplate(String identifier) {
+		return speciesTemplates.get(identifier);
 	}
 
 	@Override
@@ -185,12 +184,12 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public IAllele[] getRandomTemplate(final Random rand) {
-		return this.speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(this.speciesTemplates.values().size())];
+	public IAllele[] getRandomTemplate(Random rand) {
+		return speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(speciesTemplates.values().size())];
 	}
 
 	@Override
-	public Collection<IFlowerMutation> getMutations(final boolean shuffle) {
+	public Collection<IFlowerMutation> getMutations(boolean shuffle) {
 		if (shuffle) {
 			Collections.shuffle(FlowerHelper.flowerMutations);
 		}
@@ -198,22 +197,18 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public void registerMutation(final IMutation mutation) {
-		if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())) {
-			return;
-		}
-		if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())) {
-			return;
-		}
-		if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) {
+	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(final World world, final GameProfile player) {
-		final String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId());
+	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);
@@ -223,7 +218,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public IIndividual getMember(final NBTTagCompound compound) {
+	public IIndividual getMember(NBTTagCompound compound) {
 		return new Flower(compound);
 	}
 
@@ -243,15 +238,15 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public void addConversion(final ItemStack itemstack, final IAllele[] template) {
-		final IFlower flower = this.getFlower(null, this.templateAsGenome(template));
-		this.conversions.put(itemstack, flower);
+	public void addConversion(ItemStack stack, IAllele[] template) {
+		IFlower flower = getFlower(null, templateAsGenome(template));
+		conversions.put(stack, flower);
 	}
 
 	@Override
-	public IFlower getConversion(final ItemStack itemstack) {
-		for (final Map.Entry<ItemStack, IFlower> entry : this.conversions.entrySet()) {
-			if (entry.getKey().isItemEqual(itemstack)) {
+	public IFlower getConversion(ItemStack stack) {
+		for (Map.Entry<ItemStack, IFlower> entry : conversions.entrySet()) {
+			if (entry.getKey().isItemEqual(stack)) {
 				return (IFlower) entry.getValue().copy();
 			}
 		}
@@ -259,28 +254,21 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
 	}
 
 	@Override
-	public void registerColourMix(final IColourMix colourMix) {
-		FlowerHelper.colourMixes.add(colourMix);
+	public void registerColourMix(IColourMix colorMix) {
+		FlowerHelper.colourMixes.add(colorMix);
 	}
 
 	@Override
-	public Collection<IColourMix> getColourMixes(final boolean shuffle) {
+	public Collection<IColourMix> getColourMixes(boolean shuffle) {
 		if (shuffle) {
 			Collections.shuffle(FlowerHelper.colourMixes);
 		}
 		return FlowerHelper.colourMixes;
 	}
 
-	static {
-		FlowerHelper.flowerSpeciesCount = -1;
-		FlowerHelper.flowerTemplates = new ArrayList<IFlower>();
-		FlowerHelper.flowerMutations = new ArrayList<IFlowerMutation>();
-		FlowerHelper.colourMixes = new ArrayList<IColourMix>();
-	}
-
 	// ??
 	@Override
-	public ISpeciesType getType(ItemStack itemstack) {
+	public ISpeciesType getType(ItemStack stack) {
 		return null;
 	}
 }

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

@@ -1,27 +1,22 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
+import binnie.botany.api.IAlleleFlowerSpecies;
+import binnie.botany.api.IFlowerMutation;
+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;
 
-import binnie.botany.core.BotanyCore;
-import forestry.api.genetics.ISpeciesRoot;
-import forestry.api.genetics.IGenome;
-import forestry.api.genetics.IAllele;
-import binnie.botany.api.IAlleleFlowerSpecies;
-import binnie.botany.api.IFlowerMutation;
+public class FlowerMutation implements IFlowerMutation {
+	protected IAlleleFlowerSpecies allele0;
+	protected IAlleleFlowerSpecies allele1;
+	protected IAllele[] template;
+	protected int chance;
 
-public class FlowerMutation implements IFlowerMutation
-{
-	IAlleleFlowerSpecies allele0;
-	IAlleleFlowerSpecies allele1;
-	IAllele[] template;
-	int chance;
-
-	FlowerMutation(final IAlleleFlowerSpecies allele0, final IAlleleFlowerSpecies allele1, final IAllele[] template, final int chance) {
+	FlowerMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] template, int chance) {
 		this.allele0 = allele0;
 		this.allele1 = allele1;
 		this.template = template;
@@ -30,32 +25,33 @@ public class FlowerMutation implements IFlowerMutation
 
 	@Override
 	public IAlleleFlowerSpecies getAllele0() {
-		return this.allele0;
+		return allele0;
 	}
 
 	@Override
 	public IAlleleFlowerSpecies getAllele1() {
-		return this.allele1;
+		return allele1;
 	}
 
 	@Override
 	public IAllele[] getTemplate() {
-		return this.template;
+		return template;
 	}
 
 	@Override
 	public float getBaseChance() {
-		return this.chance;
+		return chance;
 	}
 
 	@Override
-	public boolean isPartner(final IAllele allele) {
-		return allele.getUID().equals(this.allele0.getUID()) || allele.getUID().equals(this.allele1.getUID());
+	public boolean isPartner(IAllele allele) {
+		return allele.getUID().equals(allele0.getUID())
+			|| allele.getUID().equals(allele1.getUID());
 	}
 
 	@Override
-	public IAllele getPartner(final IAllele allele) {
-		return allele.getUID().equals(this.allele0.getUID()) ? this.allele1 : this.allele0;
+	public IAllele getPartner(IAllele allele) {
+		return allele.getUID().equals(allele0.getUID()) ? allele1 : allele0;
 	}
 
 	@Override
@@ -64,15 +60,15 @@ public class FlowerMutation implements IFlowerMutation
 	}
 
 	@Override
-	public float getChance(final IAllele allele0, final IAllele allele1, final IGenome genome0, final IGenome genome1) {
+	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 this.getBaseChance();
+			return getBaseChance();
 		}
 		if (this.allele1.getUID().equals(allele0.getUID()) && this.allele0.getUID().equals(allele1.getUID())) {
-			return this.getBaseChance();
+			return getBaseChance();
 		}
 		return 0.0f;
 	}
@@ -84,6 +80,6 @@ public class FlowerMutation implements IFlowerMutation
 
 	@Override
 	public Collection<String> getSpecialConditions() {
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}
 }

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

@@ -1,29 +1,26 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
-import forestry.api.genetics.AlleleManager;
 import binnie.botany.api.EnumFlowerChromosome;
+import binnie.genetics.genetics.AlleleHelper;
+import forestry.api.genetics.EnumTolerance;
 import forestry.api.genetics.IAllele;
+import forestry.core.genetics.alleles.EnumAllele;
 
-public class FlowerTemplates
-{
+public class FlowerTemplates {
 	public static IAllele[] getDefaultTemplate() {
-		final IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
-		alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.Poppy;
-		alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = EnumFlowerColor.Red.getAllele();
-		alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = EnumFlowerColor.Red.getAllele();
-		alleles[EnumFlowerChromosome.FERTILITY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.fertilityNormal");
-		alleles[EnumFlowerChromosome.TERRITORY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.territoryDefault");
+		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()] = AlleleManager.alleleRegistry.getAllele("forestry.lifespanNormal");
-		alleles[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
-		alleles[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
-		alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
-		alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.sappinessAverage");
-		alleles[EnumFlowerChromosome.STEM.ordinal()] = EnumFlowerColor.Green.getAllele();
+		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

@@ -1,72 +1,67 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
-import binnie.botany.core.BotanyGUI;
-import net.minecraft.world.World;
+import binnie.botany.Botany;
 import binnie.botany.CreativeTabBotany;
-import net.minecraft.creativetab.CreativeTabs;
-import java.util.List;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
+import binnie.botany.core.BotanyGUI;
+import binnie.core.util.I18N;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import binnie.botany.Botany;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
 
-public class ItemDictionary extends Item
-{
-	IIcon iconMaster;
+import java.util.List;
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(final IIconRegister register) {
-		this.itemIcon = Botany.proxy.getIcon(register, "botanistDatabase");
-		this.iconMaster = Botany.proxy.getIcon(register, "masterBotanistDatabase");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(final int par1) {
-		return (par1 == 0) ? this.itemIcon : this.iconMaster;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) {
-		super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) {
-		super.getSubItems(par1, par2CreativeTabs, par3List);
-		par3List.add(new ItemStack(par1, 1, 1));
-	}
+public class ItemDictionary extends Item {
+	protected IIcon iconMaster;
 
 	public ItemDictionary() {
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setUnlocalizedName("database");
-		this.setMaxStackSize(1);
+		setCreativeTab(CreativeTabBotany.instance);
+		setUnlocalizedName("database");
+		setMaxStackSize(1);
 	}
 
 	@Override
-	public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) {
-		if (itemstack.getItemDamage() == 0) {
-			Botany.proxy.openGui(BotanyGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ);
-		}
-		else {
-			Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ);
-		}
-		return itemstack;
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister register) {
+		itemIcon = Botany.proxy.getIcon(register, "botanistDatabase");
+		iconMaster = Botany.proxy.getIcon(register, "masterBotanistDatabase");
 	}
 
 	@Override
-	public String getItemStackDisplayName(final ItemStack i) {
-		return (i.getItemDamage() == 0) ? "Botanist Database" : "Master Botanist Database";
+	@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 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 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/ItemEncyclopedia.java

@@ -1,45 +0,0 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
-package binnie.botany.genetics;
-
-import net.minecraft.item.ItemStack;
-import binnie.botany.CreativeTabBotany;
-import net.minecraft.util.IIcon;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import binnie.botany.Botany;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
-
-public class ItemEncyclopedia extends Item
-{
-	boolean reinforced;
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(final IIconRegister register) {
-		this.itemIcon = Botany.proxy.getIcon(register, "encylopedia" + (this.reinforced ? "Iron" : ""));
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(final int par1) {
-		return this.itemIcon;
-	}
-
-	public ItemEncyclopedia(final boolean reinforced) {
-		this.reinforced = false;
-		this.reinforced = reinforced;
-		this.setCreativeTab(CreativeTabBotany.instance);
-		this.setUnlocalizedName("encylopedia" + (reinforced ? "Iron" : ""));
-		this.setMaxStackSize(1);
-		this.setMaxDamage(reinforced ? 480 : 120);
-	}
-
-	@Override
-	public String getItemStackDisplayName(final ItemStack i) {
-		return (this.reinforced ? "Reinforced " : "") + "Florist's Encyclopaedia";
-	}
-}

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

@@ -1,39 +1,28 @@
-// 
-// Decompiled by Procyon v0.5.30
-// 
-
 package binnie.botany.genetics;
 
 import binnie.Binnie;
-import forestry.api.recipes.RecipeManagers;
-import forestry.api.apiculture.FlowerManager;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraft.init.Items;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
+import binnie.botany.Botany;
+import binnie.botany.core.BotanyCore;
+import binnie.botany.flower.BlockFlower;
+import binnie.botany.flower.ItemFlower;
+import binnie.botany.flower.ItemPollen;
+import binnie.botany.flower.ItemSeed;
 import binnie.botany.flower.RendererBotany;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.core.BinnieCore;
-import net.minecraft.block.Block;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-import binnie.botany.core.BotanyCore;
-import forestry.api.genetics.AlleleManager;
-import binnie.botany.flower.ItemSeed;
-import binnie.botany.flower.ItemPollen;
-import binnie.botany.flower.ItemFlower;
-import binnie.botany.Botany;
-import binnie.botany.flower.BlockFlower;
 import binnie.core.IInitializable;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.api.apiculture.FlowerManager;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.recipes.RecipeManagers;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 
-public class ModuleGenetics implements IInitializable
-{
-	static AlleleEffectNone alleleEffectNone;
+public class ModuleGenetics implements IInitializable {
+	static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
 
 	@Override
 	public void preInit() {
@@ -47,38 +36,42 @@ public class ModuleGenetics implements IInitializable
 		GameRegistry.registerBlock(Botany.flower, "flower");
 		BinnieCore.proxy.registerTileEntity(TileEntityFlower.class, "botany.tile.flower", null);
 		Botany.database = new ItemDictionary();
-		Botany.encyclopedia = new ItemEncyclopedia(false);
-		Botany.encyclopediaIron = new ItemEncyclopedia(true);
 	}
 
 	@Override
 	public void init() {
-		for (final EnumFlowerColor color : EnumFlowerColor.values()) {
+		for (EnumFlowerColor color : EnumFlowerColor.values()) {
 			AlleleManager.alleleRegistry.registerAllele(color.getAllele());
 		}
+
 		FlowerSpecies.setupVariants();
-		for (final FlowerSpecies species : FlowerSpecies.values()) {
+		for (FlowerSpecies species : FlowerSpecies.values()) {
 			AlleleManager.alleleRegistry.registerAllele(species);
 			BotanyCore.getFlowerRoot().registerTemplate(species.getUID(), species.getTemplate());
-			for (final IAllele[] variant : species.getVariants()) {
+			for (IAllele[] variant : species.getVariants()) {
 				BotanyCore.getFlowerRoot().registerTemplate(variant);
 			}
 		}
+
 		RendererBotany.renderID = RenderingRegistry.getNextAvailableRenderId();
 		BinnieCore.proxy.registerBlockRenderer(new RendererBotany());
 	}
 
 	@Override
 	public void postInit() {
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Botany.encyclopedia), new Object[] { "fff", "fbf", "fff", 'f', new ItemStack(Blocks.red_flower, 1, 32767), 'b', Items.book }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Botany.encyclopedia), new Object[] { "fff", "fbf", "fff", 'f', new ItemStack(Blocks.yellow_flower, 1, 32767), 'b', Items.book }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Botany.encyclopedia), new Object[] { "fff", "fbf", "fff", 'f', new ItemStack(Botany.flower, 1, 32767), 'b', Items.book }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Botany.encyclopediaIron), new Object[] { new ItemStack(Botany.encyclopedia), "ingotIron" }));
-		FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, new String[] { "flowersVanilla" });
-		RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), (ItemStack) null, new ItemStack(Botany.database), new Object[] { "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', Items.gold_nugget, 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald });
-	}
-
-	static {
-		ModuleGenetics.alleleEffectNone = new AlleleEffectNone();
+		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
+		);
 	}
 }