update bs+deps

* New: NEI item manager overly integration

* update buildscript

* apply spotless

* Making nei really optional

* Fix wildcard

* Stream chain simplify

* Fix: NPE when events outside the Gui

* Fix: drag and mouse event

* Fix: call mouse event

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+91bf137a94d1207f943929e0881750a1b8c4f3bf

.gitattributes

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

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

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

.github/workflows/release-tags.yml

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

.gitignore

@@ -1,12 +1,38 @@
-# IntelliJ
-.idea/
+.gradle
+.settings
+/.idea/
+/.vscode/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
-
-# folders
-.gradle/
-classes/
-build/
-run/
-out/
+src/main/resources/mixins.*([!.]).json
+*.bat
+*.DS_Store
+!gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json

.travis.yml

@@ -1,24 +0,0 @@
-sudo: required
-dist: trusty
-
-language: java
-jdk: oraclejdk8
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
-  - rm -f  $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-before_install: chmod +x gradlew
-install:
-  - ./gradlew setupCIWorkspace -S
-script:
-  - ./gradlew build
-
-notifications:
-  email: false

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

@@ -10,7 +10,7 @@ along with new features such as fully breedable flowers and genetic manipulation
 
 [Wiki](https://binnie.mods.wiki/wiki/Main_Page)
 
-[Latest Builds for 1.11 / 1.11.2](http://jenkins.ic2.player.to/job/Binnie's%201.11.2/)
+[Latest Builds for 1.7.10](https://ci.bymarcin.com/job/Binnie-Mods-MC1.7.10/)
 
 ### Mods
 
@@ -36,6 +36,9 @@ Genetics is for those who want to eschew conventional breeding, and want to ente
 
 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
 

all/build.gradle

@@ -1,10 +0,0 @@
-archivesBaseName = 'all-' + mcversion
-
-dependencies {
-	compile project(":api")
-	compile project(":botany")
-	compile project(":core")
-	compile project(":extrabees")
-	compile project(":extratrees")
-	compile project(":genetics")
-}

api/build.gradle

@@ -1 +0,0 @@
-archivesBaseName = 'api-' + mcversion

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

@@ -1,22 +0,0 @@
-package binnie.botany.api;
-
-import binnie.botany.api.gardening.IGardeningManager;
-import binnie.botany.api.genetics.IFlowerFactory;
-import binnie.botany.api.genetics.IFlowerRoot;
-
-public class BotanyAPI {
-	/**
-	 * Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers")
-	 */
-	public static IFlowerRoot flowerRoot;
-
-	/**
-	 * Used to create new flowers.
-	 */
-	public static IFlowerFactory flowerFactory;
-
-	/**
-	 * Used to manager soil.
-	 */
-	public static IGardeningManager gardening;
-}

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

@@ -1,43 +0,0 @@
-package binnie.botany.api.gardening;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
-
-public enum EnumAcidity implements IStringSerializable {
-	ACID(TextFormatting.RED),
-	NEUTRAL(null),
-	ALKALINE(TextFormatting.AQUA);
-
-	@Nullable
-	TextFormatting color;
-
-	EnumAcidity(@Nullable TextFormatting color) {
-		this.color = color;
-	}
-
-	@Override
-	public String getName() {
-		return name().toLowerCase();
-	}
-
-	public String getLocalisedName(boolean withColor) {
-		String localisedName = I18n.translateToLocal("botany.ph." + getName());
-		if (withColor && color != null) {
-			localisedName = color + localisedName;
-		}
-		return localisedName;
-	}
-
-	public static EnumAcidity getFromValue(float rawAcidity) {
-		if(rawAcidity <= -1.0f){
-			return EnumAcidity.ACID;
-		}else if(rawAcidity >= 1.0f){
-			return EnumAcidity.ALKALINE;
-		}else{
-			return EnumAcidity.NEUTRAL;
-		}
-	}
-}

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

@@ -1,5 +0,0 @@
-package binnie.botany.api.gardening;
-
-public enum EnumFertiliserType {
-	ACID, ALKALINE, NUTRIENT
-}

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

@@ -1,44 +0,0 @@
-package binnie.botany.api.gardening;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.text.TextFormatting;
-
-import net.minecraft.util.text.translation.I18n;
-
-public enum EnumMoisture implements IStringSerializable {
-	DRY(TextFormatting.YELLOW),
-	NORMAL(null),
-	DAMP(TextFormatting.DARK_BLUE);
-
-	@Nullable
-	final TextFormatting color;
-
-	EnumMoisture(@Nullable TextFormatting color) {
-		this.color = color;
-	}
-
-	@Override
-	public String getName() {
-		return name().toLowerCase();
-	}
-
-	public String getLocalisedName(boolean withColor) {
-		String localisedName = I18n.translateToLocal("botany.moisture." + getName());
-		if (withColor && color != null) {
-			localisedName = color + localisedName + TextFormatting.GRAY;
-		}
-		return localisedName;
-	}
-
-	public static EnumMoisture getFromValue(float rawMoisture) {
-		if(rawMoisture <= -1.0f){
-			return EnumMoisture.DRY;
-		}else if(rawMoisture >= 1.0f){
-			return EnumMoisture.DAMP;
-		}else{
-			return EnumMoisture.NORMAL;
-		}
-	}
-}

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

@@ -1,29 +0,0 @@
-package binnie.botany.api.gardening;
-
-import java.util.Locale;
-
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.text.TextFormatting;
-
-import net.minecraft.util.text.translation.I18n;
-
-public enum EnumSoilType implements IStringSerializable {
-	SOIL(TextFormatting.DARK_GRAY),
-	LOAM(TextFormatting.GOLD),
-	FLOWERBED(TextFormatting.LIGHT_PURPLE);
-
-	private final TextFormatting color;
-
-	EnumSoilType(TextFormatting color) {
-		this.color = color;
-	}
-
-	@Override
-	public String getName() {
-		return name().toLowerCase(Locale.ENGLISH);
-	}
-
-	public String getTranslated() {
-		return color + I18n.translateToLocal("botany.soil." + getName());
-	}
-}

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

@@ -1,22 +0,0 @@
-package binnie.botany.api.gardening;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public interface IBlockSoil {
-	EnumAcidity getPH(World world, BlockPos pos);
-
-	EnumMoisture getMoisture(World world, BlockPos pos);
-
-	EnumSoilType getType(World world, BlockPos pos);
-
-	boolean fertilise(World world, BlockPos pos, EnumSoilType soilType);
-
-	boolean degrade(World world, BlockPos pos, EnumSoilType soilType);
-
-	boolean setPH(World world, BlockPos pos, EnumAcidity acidity);
-
-	boolean setMoisture(World world, BlockPos pos, EnumMoisture moisture);
-
-	boolean resistsWeeds(World world, BlockPos pos);
-}

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

@@ -1,67 +0,0 @@
-package binnie.botany.api.gardening;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.Map;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import forestry.api.core.EnumTemperature;
-
-import binnie.botany.api.genetics.IFlower;
-
-public interface IGardeningManager {
-	default boolean isSoil(Block block) {
-		return block instanceof IBlockSoil;
-	}
-
-	boolean isSoil(Item item);
-
-	boolean isSoil(ItemStack item);
-
-	EnumMoisture getNaturalMoisture(World world, BlockPos pos);
-
-	EnumAcidity getNaturalPH(World world, BlockPos pos);
-
-	float getBiomeMoisture(World world, BlockPos pos);
-
-	float getBiomePH(World world, BlockPos pos);
-
-	IBlockState getSoil(EnumSoilType soil, boolean weedKill, EnumMoisture moisture, EnumAcidity acidity);
-
-	void plantSoil(World world, BlockPos pos, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity);
-
-	Collection<ItemStack> getFertilisers(EnumFertiliserType type);
-
-	Map<EnumFertiliserType, Map<ItemStack, Integer>> getFertilisers();
-
-	void registerFertiliser(EnumFertiliserType type, ItemStack stack, int strength);
-
-	boolean isFertiliser(EnumFertiliserType type, ItemStack stack);
-
-	int getFertiliserStrength(ItemStack stack);
-
-	boolean canTolerate(@Nullable IFlower flower, World world, BlockPos pos);
-
-	EnumSoilType getSoilType(World world, BlockPos pos);
-
-	default Block getSoilBlock(EnumSoilType type) {
-		return getSoilBlock(type, false);
-	}
-
-	Block getSoilBlock(EnumSoilType type, boolean weedKill);
-
-	boolean canTolerate(IFlower flower, EnumAcidity acidity, EnumMoisture moisture, EnumTemperature temperature);
-
-	boolean isWeedkiller(ItemStack heldItem);
-
-	boolean addWeedKiller(World world, BlockPos pos);
-
-	boolean onFertiliseSoil(ItemStack heldItem, IBlockSoil soil, World world, BlockPos pos, EntityPlayer player);
-}

api/src/main/java/binnie/botany/api/gardening/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.botany.api.gardening;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/botany/api/genetics/AlleleFlowerColor.java

@@ -1,75 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.IAlleleInteger;
-import net.minecraft.util.text.translation.I18n;
-
-// TODO: move out of API
-public class AlleleFlowerColor implements IAlleleFlowerColor {
-	private int color;
-	private String uid;
-	private boolean isDominant;
-	private String name;
-	private String unlocalizedName;
-	private int colorDis;
-	private int id;
-
-	public AlleleFlowerColor(String uid, int id, int color, int colorDis, String name, String unlocalizedName, boolean isDominant) {
-		this.color = color;
-		this.uid = uid;
-		this.isDominant = isDominant;
-		this.name = name;
-		this.unlocalizedName = unlocalizedName;
-		this.colorDis = colorDis;
-		this.id = id;
-	}
-
-	@Override
-	public int getValue() {
-		return color;
-	}
-
-	@Override
-	public String getUID() {
-		return uid;
-	}
-
-	@Override
-	public boolean isDominant() {
-		return isDominant;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public String getAlleleName() {
-		return name;
-	}
-
-	@Override
-	public String getUnlocalizedName() {
-		return unlocalizedName;
-	}
-
-	@Override
-	public int getColor(boolean dis) {
-		return dis ? colorDis : color;
-	}
-
-	@Override
-	public IAlleleInteger getAllele() {
-		return this;
-	}
-
-	@Override
-	public int getID() {
-		return id;
-	}
-
-	@Override
-	public String getColorName() {
-		return I18n.translateToLocal("botany.color." + getAlleleName());
-	}
-}

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

@@ -1,40 +0,0 @@
-package binnie.botany.api.genetics;
-
-public final class ColorMix implements IColorMix {
-	private final IFlowerColor colorFirst;
-	private final IFlowerColor colorSecond;
-	private final IFlowerColor result;
-	private final int chance;
-
-	public ColorMix(IFlowerColor colorFirst, IFlowerColor colorSecond, IFlowerColor result, int chance) {
-		this.colorFirst = colorFirst;
-		this.colorSecond = colorSecond;
-		this.result = result;
-		this.chance = chance;
-	}
-
-	@Override
-	public IFlowerColor getColorFirst() {
-		return colorFirst;
-	}
-
-	@Override
-	public IFlowerColor getColorSecond() {
-		return colorSecond;
-	}
-
-	@Override
-	public boolean isMutation(IFlowerColor colorFirst, IFlowerColor colorSecond) {
-		return (colorFirst == this.colorFirst && colorSecond == this.colorSecond) || (colorFirst == this.colorSecond && colorSecond == this.colorFirst);
-	}
-
-	@Override
-	public int getChance() {
-		return chance;
-	}
-
-	@Override
-	public IFlowerColor getResult() {
-		return result;
-	}
-}

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

@@ -1,48 +0,0 @@
-package binnie.botany.api.genetics;
-
-import java.util.Locale;
-
-import forestry.api.genetics.AlleleManager;
-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 {
-	SPECIES(IAlleleFlowerSpecies.class),
-	PRIMARY(IAlleleInteger.class),
-	SECONDARY(IAlleleInteger.class),
-	FERTILITY(IAlleleInteger.class),
-	TERRITORY(IAlleleArea.class),
-	EFFECT(IAlleleFlowerEffect.class),
-	LIFESPAN(IAlleleInteger.class),
-	TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
-	HUMIDITY_TOLERANCE(IAlleleTolerance.class),
-	PH_TOLERANCE(IAlleleTolerance.class),
-	SAPPINESS(IAlleleFloat.class),
-	STEM(IAlleleInteger.class);
-
-	private Class<? extends IAllele> cls;
-
-	EnumFlowerChromosome(Class<? extends IAllele> cls) {
-		this.cls = cls;
-	}
-
-	@Override
-	public Class<? extends IAllele> getAlleleClass() {
-		return cls;
-	}
-
-	@Override
-	public String getName() {
-		return toString().toLowerCase(Locale.ENGLISH);
-	}
-
-	@Override
-	public ISpeciesRoot getSpeciesRoot() {
-		return AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
-	}
-}

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

@@ -1,29 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.ISpeciesType;
-
-public enum EnumFlowerStage implements ISpeciesType {
-	FLOWER("Flower"),
-	SEED("Seed"),
-	POLLEN("Pollen");
-
-	public static final EnumFlowerStage[] VALUES = values();
-	String name;
-
-	EnumFlowerStage(String name) {
-		this.name = name;
-	}
-
-	public static EnumFlowerStage getStage(IFlower flower) {
-		return getStage(flower.getAge());
-	}
-
-	public static EnumFlowerStage getStage(int age) {
-		return age == 0 ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-}

api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerColor.java

@@ -1,6 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.IAlleleInteger;
-
-public interface IAlleleFlowerColor extends IFlowerColor, IAlleleInteger {
-}

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

@@ -1,10 +0,0 @@
-package binnie.botany.api.genetics;
-
-import net.minecraft.world.World;
-
-import forestry.api.genetics.IAlleleEffect;
-import forestry.api.genetics.IEffectData;
-
-public interface IAlleleFlowerEffect extends IAlleleEffect {
-	IEffectData doEffect(IFlowerGenome genome, IEffectData effect, World world, int x, int y, int z);
-}

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

@@ -1,31 +0,0 @@
-package binnie.botany.api.genetics;
-
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.Item;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IModelManager;
-import forestry.api.genetics.IAlleleProperty;
-import forestry.api.genetics.IAlleleSpecies;
-
-import binnie.botany.api.gardening.EnumAcidity;
-import binnie.botany.api.gardening.EnumMoisture;
-
-public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
-	IFlowerType getType();
-
-	EnumAcidity getPH();
-
-	EnumMoisture getMoisture();
-
-	@SideOnly(Side.CLIENT)
-	int getFlowerColor(EnumFlowerStage type, int renderPass);
-
-	@SideOnly(Side.CLIENT)
-	ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered);
-
-	@SideOnly(Side.CLIENT)
-	void registerModels(Item item, IModelManager manager, EnumFlowerStage type);
-}

api/src/main/java/binnie/botany/api/genetics/IAlleleFlowerSpeciesBuilder.java

@@ -1,15 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.IAlleleSpeciesBuilder;
-
-import binnie.botany.api.gardening.EnumAcidity;
-import binnie.botany.api.gardening.EnumMoisture;
-
-public interface IAlleleFlowerSpeciesBuilder extends IAlleleSpeciesBuilder {
-	@Override
-	IAlleleFlowerSpecies build();
-
-	IAlleleFlowerSpeciesBuilder setPH(EnumAcidity acidity);
-
-	IAlleleFlowerSpeciesBuilder setMoisture(EnumMoisture moisture);
-}

api/src/main/java/binnie/botany/api/genetics/IColorMix.java

@@ -1,13 +0,0 @@
-package binnie.botany.api.genetics;
-
-public interface IColorMix {
-	IFlowerColor getColorFirst();
-
-	IFlowerColor getColorSecond();
-
-	boolean isMutation(IFlowerColor colorFirst, IFlowerColor colorSecond);
-
-	int getChance();
-
-	IFlowerColor getResult();
-}

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

@@ -1,76 +0,0 @@
-package binnie.botany.api.genetics;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import forestry.api.genetics.IIndividual;
-
-public interface IFlower extends IIndividual {
-	/**
-	 * @return Flowers's genetic information.
-	 */
-	@Override
-	IFlowerGenome getGenome();
-
-	/**
-	 * @return Genetic information of the flower's mate, null if unmated.
-	 */
-	@Nullable
-	IFlowerGenome getMate();
-
-	/**
-	 * Mate with the given flower.
-	 *
-	 * @param flower the {@link IFlower} to mate this one with.
-	 */
-	void mate(IFlower flower);
-
-	/**
-	 * Remove the mate of the flower.
-	 */
-	void removeMate();
-
-	IFlower getOffspring(World world, BlockPos pos);
-
-	/**
-	 * @return The current age of the flower.
-	 */
-	int getAge();
-
-	/**
-	 * Set the current age of the flower.
-	 */
-	void setAge(int age);
-
-	/**
-	 * Age the flower.
-	 */
-	void age();
-
-	/**
-	 * @return Maximum age of the flower.
-	 */
-	int getMaxAge();
-
-	/**
-	 * @return true if the flower is wilted.
-	 */
-	boolean isWilted();
-
-	/**
-	 * Set that the flower is wilted.
-	 */
-	void setWilted(boolean wilted);
-
-	/**
-	 * @return true if the flower has flowered.
-	 */
-	boolean hasFlowered();
-
-	/**
-	 * Set that the flower has flowered.
-	 */
-	void setFlowered(boolean flowered);
-}

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

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

api/src/main/java/binnie/botany/api/genetics/IFlowerDefinition.java

@@ -1,15 +0,0 @@
-package binnie.botany.api.genetics;
-
-import net.minecraft.item.ItemStack;
-
-import forestry.core.genetics.IGeneticDefinition;
-
-public interface IFlowerDefinition extends IGeneticDefinition {
-	@Override
-	IFlowerGenome getGenome();
-
-	@Override
-	IFlower getIndividual();
-
-	ItemStack getMemberStack(EnumFlowerStage flowerStage);
-}

api/src/main/java/binnie/botany/api/genetics/IFlowerFactory.java

@@ -1,10 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IClassification;
-
-public interface IFlowerFactory {
-	IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType);
-
-	IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] result, int chance);
-}

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

@@ -1,44 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.core.EnumTemperature;
-import forestry.api.genetics.EnumTolerance;
-import forestry.api.genetics.IGenome;
-
-import binnie.botany.api.gardening.EnumAcidity;
-import binnie.botany.api.gardening.EnumMoisture;
-
-public interface IFlowerGenome extends IGenome {
-	@Override
-	IAlleleFlowerSpecies getPrimary();
-
-	@Override
-	IAlleleFlowerSpecies getSecondary();
-
-	IFlowerColor getPrimaryColor();
-
-	IFlowerColor getSecondaryColor();
-
-	IFlowerColor getStemColor();
-
-	int getFertility();
-
-	int getLifespan();
-
-	IFlowerType getType();
-
-	EnumTolerance getToleranceTemperature();
-
-	EnumTolerance getToleranceMoisture();
-
-	EnumTolerance getTolerancePH();
-
-	float getAgeChance();
-
-	float getSappiness();
-
-	boolean canTolerate(EnumAcidity acidity);
-
-	boolean canTolerate(EnumMoisture moisture);
-
-	boolean canTolerate(EnumTemperature temperature);
-}

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

@@ -1,13 +0,0 @@
-package binnie.botany.api.genetics;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import forestry.api.genetics.IMutation;
-
-public interface IFlowerMutation extends IMutation {
-	@Override
-	IFlowerRoot getRoot();
-
-	float getChance(World world, BlockPos pos, IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IFlowerGenome genome0, IFlowerGenome genome1);
-}

api/src/main/java/binnie/botany/api/genetics/IFlowerMutationBuilder.java

@@ -1,6 +0,0 @@
-package binnie.botany.api.genetics;
-
-import forestry.api.genetics.IMutationBuilder;
-
-public interface IFlowerMutationBuilder extends IMutationBuilder {
-}

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

@@ -1,59 +0,0 @@
-package binnie.botany.api.genetics;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.ISpeciesRoot;
-
-public interface IFlowerRoot extends ISpeciesRoot {
-	@Override
-	@Nullable
-	IFlower getMember(ItemStack memberStack);
-
-	@Override
-	IFlower templateAsIndividual(IAllele[] template);
-
-	@Override
-	IFlower templateAsIndividual(IAllele[] templateFirst, IAllele[] templateSecond);
-
-	@Override
-	IFlowerGenome templateAsGenome(IAllele[] template);
-
-	@Override
-	IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
-
-	@Override
-	IBotanistTracker getBreedingTracker(World world, @Nullable GameProfile profile);
-
-	@Override
-	List<? extends IFlowerMutation> getMutations(boolean shuffle);
-
-	@Override
-	@Nullable
-	EnumFlowerStage getType(ItemStack itemStack);
-
-	IFlower getFlower(IFlowerGenome genome);
-
-	void addConversion(ItemStack memberStack, IAllele[] template);
-
-	@Nullable
-	IFlower getConversion(ItemStack memberStack);
-
-	Collection<IColorMix> getColorMixes(boolean shuffle);
-
-	void registerColourMix(IColorMix colorMix);
-
-	boolean plant(World world, BlockPos pos, IFlower flower, GameProfile owner);
-
-	void tryGrowSection(World world, BlockPos pos);
-
-	void onGrowFromSeed(World world, BlockPos pos);
-}

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

@@ -1,23 +0,0 @@
-package binnie.botany.api.genetics;
-
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.Item;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IModelManager;
-
-public interface IFlowerType<I extends IFlowerType<I>> extends Comparable<I> {
-	@SideOnly(Side.CLIENT)
-	void registerModels(Item item, IModelManager manager, EnumFlowerStage type);
-
-	@SideOnly(Side.CLIENT)
-	ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered);
-
-	String getName();
-
-	int getSections();
-
-	int ordinal();
-}

api/src/main/java/binnie/botany/api/genetics/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.botany.api.genetics;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/botany/api/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.botany.api;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/core/api/IBinnieRecipe.java

@@ -1,10 +0,0 @@
-package binnie.core.api;
-
-import java.util.Collection;
-
-public interface IBinnieRecipe {
-
-	Collection<Object> getInputs();
-
-	Collection<Object> getOutputs();
-}

api/src/main/java/binnie/core/api/ICraftingManager.java

@@ -1,24 +0,0 @@
-package binnie.core.api;
-
-import java.util.Collection;
-
-public interface ICraftingManager<T extends IBinnieRecipe> {
-	/**
-	 * Add a new recipe to the crafting provider.
-	 *
-	 * @return <tt>true</tt> if this collection changed as a result of the call
-	 */
-	boolean addRecipe(T recipe);
-
-	/**
-	 * Remove a specific recipe from the crafting provider.
-	 *
-	 * @return <tt>true</tt> if an element was removed as a result of this call
-	 */
-	boolean removeRecipe(T recipe);
-
-	/**
-	 * @return an unmodifiable collection of all recipes registered to the crafting provider.
-	 */
-	Collection<T> recipes();
-}

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

@@ -1,107 +0,0 @@
-package binnie.core.api.block;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-// TODO: move out of API
-public class BlockMetadata extends BlockContainer implements IBlockMetadata {
-	public BlockMetadata(final Material material) {
-		super(material);
-	}
-
-	public static ItemStack getBlockDropped(IBlockMetadata block, IBlockAccess world, BlockPos pos) {
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
-		if (tile != null && !tile.hasDroppedBlock()) {
-			int meta = block.getDroppedMeta(world.getBlockState(pos), tile.getTileMetadata());
-			return TileEntityMetadata.getItemStack((Block) block, meta);
-		}
-		return ItemStack.EMPTY;
-	}
-
-	public static void getDrops(NonNullList<ItemStack> drops, IBlockMetadata block, IBlockAccess world, BlockPos pos) {
-		ItemStack drop = getBlockDropped(block, world, pos);
-		if (!drop.isEmpty()) {
-			drops.add(drop);
-		}
-	}
-
-	public static boolean breakBlock(IBlockMetadata blockMetadata, @Nullable EntityPlayer player, World world, BlockPos pos) {
-		List<ItemStack> drops = new ArrayList<>();
-		Block block = (Block) blockMetadata;
-		TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos);
-		if (tile != null && !tile.hasDroppedBlock()) {
-			drops = block.getDrops(world, pos, world.getBlockState(pos), 0);
-		}
-		boolean hasBeenBroken = world.setBlockToAir(pos);
-		if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				spawnAsEntity(world, pos, drop);
-			}
-			if (tile != null) {
-				tile.dropBlock();
-			}
-		}
-		return hasBeenBroken;
-	}
-
-	public static ItemStack getPickBlock(World world, BlockPos pos) {
-		Block block = world.getBlockState(pos).getBlock();
-		return getBlockDropped((IBlockMetadata) block, world, pos);
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-		getDrops(drops, this, world, pos);
-	}
-
-	@Override
-	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
-		return breakBlock(this, player, world, pos);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(final World var1, final int i) {
-		return new TileEntityMetadata();
-	}
-
-	@Override
-	public boolean hasTileEntity(IBlockState state) {
-		return true;
-	}
-
-	@Override
-	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
-		return getPickBlock(world, pos);
-	}
-
-	/* IBLOCKMETADATA */
-	@Override
-	public String getDisplayName(final ItemStack itemStack) {
-		return this.getLocalizedName();
-	}
-
-	@Override
-	public int getPlacedMeta(final ItemStack item, final World world, final BlockPos pos, final EnumFacing clickedBlock) {
-		return TileEntityMetadata.getItemDamage(item);
-	}
-
-	@Override
-	public int getDroppedMeta(IBlockState state, int tileMetadata) {
-		return getMetaFromState(state);
-	}
-}

api/src/main/java/binnie/core/api/block/IBlockMetadata.java

@@ -1,17 +0,0 @@
-package binnie.core.api.block;
-
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-// TODO: move out of API
-public interface IBlockMetadata extends ITileEntityProvider {
-	int getPlacedMeta(ItemStack itemStack, World world, BlockPos pos, EnumFacing facing);
-
-	int getDroppedMeta(IBlockState state, int tileMetadata);
-
-	String getDisplayName(ItemStack itemStack);
-}

api/src/main/java/binnie/core/api/block/TileEntityMetadata.java

@@ -1,125 +0,0 @@
-package binnie.core.api.block;
-
-import com.google.common.base.Preconditions;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.SPacketUpdateTileEntity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-
-// TODO: move out of API
-public class TileEntityMetadata extends TileEntity {
-	private int meta;
-	private boolean droppedBlock;
-
-	public TileEntityMetadata() {
-		this.droppedBlock = false;
-	}
-
-	@Nullable
-	public static TileEntityMetadata getTile(final IBlockAccess world, final BlockPos pos) {
-		final TileEntity tile = world.getTileEntity(pos);
-		if (!(tile instanceof TileEntityMetadata)) {
-			return null;
-		}
-		return (TileEntityMetadata) tile;
-	}
-
-	public static ItemStack getItemStack(final Block block, final int damage) {
-		final Item item = Item.getItemFromBlock(block);
-		Preconditions.checkNotNull(item, "Could not get item for block %s", block);
-		final ItemStack itemStack = new ItemStack(item, 1, 0);
-		setItemDamage(itemStack, damage);
-		return itemStack;
-	}
-
-	public static void setItemDamage(final ItemStack item, final int i) {
-		item.setItemDamage((i < 16387) ? i : 16387);
-		final NBTTagCompound tag = new NBTTagCompound();
-		tag.setInteger("meta", i);
-		item.setTagCompound(tag);
-	}
-
-	public static int getItemDamage(final ItemStack item) {
-		if (item.hasTagCompound() && item.getTagCompound().hasKey("meta")) {
-			return item.getTagCompound().getInteger("meta");
-		}
-		return item.getItemDamage();
-	}
-
-	public static int getTileMetadata(final IBlockAccess world, final BlockPos pos) {
-		final TileEntityMetadata tile = getTile(world, pos);
-		return (tile == null) ? 0 : tile.getTileMetadata();
-	}
-
-	@Override
-	public boolean receiveClientEvent(final int id, final int type) {
-		if (id == 42) {
-			this.meta = type;
-			markDirty();
-		}
-		return true;
-	}
-
-	@Override
-	public NBTTagCompound getUpdateTag() {
-		return writeToNBT(new NBTTagCompound());
-	}
-
-	@Override
-	public void readFromNBT(final NBTTagCompound nbt) {
-		super.readFromNBT(nbt);
-		if(world!=null)
-			setTileMetadata(nbt.getInteger("meta"), world.isRemote);
-		else
-			this.meta = nbt.getInteger("meta");
-	}
-
-	@Override
-	public NBTTagCompound writeToNBT(final NBTTagCompound nbt) {
-		super.writeToNBT(nbt);
-		nbt.setInteger("meta", this.meta);
-		return nbt;
-	}
-
-	public int getTileMetadata() {
-		return this.meta;
-	}
-
-	public void setTileMetadata(final int meta, final boolean notify) {
-		if (this.meta != meta) {
-			this.meta = meta;
-			if (notify) {
-				IBlockState state = world.getBlockState(pos);
-				world.notifyBlockUpdate(pos, state, state, 3);
-			}
-		}
-	}
-
-	@Override
-	public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) {
-		super.onDataPacket(net, pkt);
-		readFromNBT(pkt.getNbtCompound());
-	}
-
-	@Override
-	public SPacketUpdateTileEntity getUpdatePacket() {
-		return new SPacketUpdateTileEntity(pos, 0, getUpdateTag());
-	}
-
-	public boolean hasDroppedBlock() {
-		return this.droppedBlock;
-	}
-
-	public void dropBlock() {
-		this.droppedBlock = true;
-	}
-}

api/src/main/java/binnie/core/api/genetics/IBreedingSystem.java

@@ -1,148 +0,0 @@
-package binnie.core.api.genetics;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-import java.util.TreeSet;
-
-import com.mojang.authlib.GameProfile;
-import forestry.api.core.ForestryEvent;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IAlleleSpecies;
-import forestry.api.genetics.IBreedingTracker;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.IClassification;
-import forestry.api.genetics.IIndividual;
-import forestry.api.genetics.IMutation;
-import forestry.api.genetics.ISpeciesRoot;
-import forestry.api.genetics.ISpeciesType;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public interface IBreedingSystem {
-	ISpeciesRoot getSpeciesRoot();
-
-	Collection<IAlleleSpecies> getAllSpecies();
-
-	Collection<IAlleleSpecies> getDiscoveredSpecies(World world, GameProfile player);
-
-	List<IClassification> getAllBranches();
-
-	Collection<IClassification> getDiscoveredBranches(World world, GameProfile player);
-
-	List<IMutation> getDiscoveredMutations(World world, GameProfile player);
-
-	List<IMutation> getResultantMutations(final IAlleleSpecies species);
-
-	List<IMutation> getFurtherMutations(final IAlleleSpecies species);
-
-	boolean isMutationDiscovered(IMutation mutation, World world, GameProfile name);
-
-	float getChance(IMutation mutation, EntityPlayer player, IAlleleSpecies firstSpecies, IAlleleSpecies secondSpecies);
-
-	String getAlleleName(final IChromosomeType chromosome, final IAllele allele);
-
-	String getChromosomeName(final IChromosomeType chromo);
-
-	String getChromosomeShortName(final IChromosomeType chromo);
-
-	@Nullable
-	IIndividual getConversion(final ItemStack stack);
-
-	ItemStack getConversionStack(final ItemStack stack);
-
-	@Nullable
-	IIndividual getIndividual(String uid);
-
-	void calculateArrays();
-
-	void addExtraAlleles(final IChromosomeType p0, final TreeSet<IAllele> p1);
-
-	String getDescriptor();
-
-	String getIdent();
-
-	ItemStack getItemStackRepresentitive();
-
-	int getColour();
-
-	int getDiscoveredSpeciesCount();
-
-	int getTotalSpeciesCount();
-
-	float getDiscoveredSpeciesPercentage();
-
-	int getTotalSecretCount();
-
-	int getDiscoveredSecretCount();
-
-	float getDiscoveredBranchPercentage();
-
-	int getTotalBranchCount();
-
-	int getDiscoveredBranchCount();
-
-	String getEpitome();
-
-	String getEpitome(float discoveredPercentage);
-
-	Collection<IMutation> getAllMutations();
-
-	void calculateAlleles(ISpeciesRoot speciesRoot);
-
-	void calculateBranches(ISpeciesRoot speciesRoot);
-
-	void calculateMutations(ISpeciesRoot speciesRoot);
-
-	boolean isBlacklisted(IAllele allele);
-
-	boolean isMutationDiscovered(IMutation mutation, IBreedingTracker tracker);
-
-	boolean isSpeciesDiscovered(IAlleleSpecies species, World world, GameProfile name);
-
-	boolean isSpeciesDiscovered(IAlleleSpecies species, IBreedingTracker tracker);
-
-	boolean isSecret(IAlleleSpecies species);
-
-	boolean isSecret(IClassification branch);
-
-	Collection<IClassification> getDiscoveredBranches(IBreedingTracker tracker);
-
-	Collection<IAlleleSpecies> getDiscoveredSpecies(IBreedingTracker tracker);
-
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getUndiscoveredIcon();
-
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getDiscoveredIcon();
-
-	Class<? extends IBreedingTracker> getTrackerClass();
-
-	@SubscribeEvent
-	void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event);
-
-	void syncTracker(IBreedingTracker tracker);
-
-	void onSyncBreedingTracker(IBreedingTracker tracker);
-
-	String getName();
-
-	boolean isDNAManipulable(ItemStack stack);
-
-	boolean isDNAManipulable(ISpeciesType type);
-
-	IIndividual getDefaultIndividual();
-
-	ISpeciesType getDefaultType();
-
-	ISpeciesType[] getActiveTypes();
-
-	Collection<IChromosomeType> getActiveKaryotype();
-
-	ItemStack getDefaultMember(String uid);
-}

api/src/main/java/binnie/core/api/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.core.api;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/extrabees/api/ExtraBeesAPI.java

@@ -1,7 +0,0 @@
-package binnie.extrabees.api;
-
-import binnie.core.api.genetics.IBreedingSystem;
-
-public class ExtraBeesAPI {
-	public static IBreedingSystem beeBreedingSystem;
-}

api/src/main/java/binnie/extratrees/api/CarpentryManager.java

@@ -1,5 +0,0 @@
-package binnie.extratrees.api;
-
-public class CarpentryManager {
-	public static ICarpentryInterface carpentryInterface;
-}

api/src/main/java/binnie/extratrees/api/ICarpentryInterface.java

@@ -1,30 +0,0 @@
-package binnie.extratrees.api;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-
-public interface ICarpentryInterface {
-	boolean registerCarpentryWood(final int index, final IDesignMaterial material);
-
-	int getCarpentryWoodIndex(final IDesignMaterial material);
-
-	IDesignMaterial getWoodMaterial(final int p0);
-
-	boolean registerDesign(final int p0, final IDesign p1);
-
-	int getDesignIndex(final IDesign p0);
-
-	IDesign getDesign(final int p0);
-
-	@Nullable
-	IDesignMaterial getWoodMaterial(final ItemStack stack);
-
-	boolean registerDesignCategory(final IDesignCategory p0);
-
-	Collection<IDesignCategory> getAllDesignCategories();
-
-	List<IDesign> getSortedDesigns();
-}

api/src/main/java/binnie/extratrees/api/IDesign.java

@@ -1,17 +0,0 @@
-package binnie.extratrees.api;
-
-public interface IDesign {
-	String getName();
-
-	ILayout getTopPattern();
-
-	ILayout getBottomPattern();
-
-	ILayout getNorthPattern();
-
-	ILayout getEastPattern();
-
-	ILayout getSouthPattern();
-
-	ILayout getWestPattern();
-}

api/src/main/java/binnie/extratrees/api/IDesignCategory.java

@@ -1,13 +0,0 @@
-package binnie.extratrees.api;
-
-import java.util.List;
-
-public interface IDesignCategory {
-	String getName();
-
-	List<IDesign> getDesigns();
-
-	void addDesign(final IDesign p0);
-
-	String getId();
-}

api/src/main/java/binnie/extratrees/api/IDesignMaterial.java

@@ -1,13 +0,0 @@
-package binnie.extratrees.api;
-
-import net.minecraft.item.ItemStack;
-
-public interface IDesignMaterial {
-	ItemStack getStack();
-
-	ItemStack getStack(boolean fireproof);
-
-	String getDesignMaterialName();
-
-	int getColour();
-}

api/src/main/java/binnie/extratrees/api/IDesignSystem.java

@@ -1,36 +0,0 @@
-package binnie.extratrees.api;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public interface IDesignSystem {
-	@Nullable
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getPrimarySprite(final IPattern pattern);
-
-	@Nullable
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getSecondarySprite(final IPattern pattern);
-
-	@SideOnly(Side.CLIENT)
-	void registerSprites();
-
-	IDesignMaterial getDefaultMaterial();
-
-	@Nullable
-	IDesignMaterial getMaterial(final int p0);
-
-	int getMaterialIndex(final IDesignMaterial p0);
-
-	IDesignMaterial getDefaultMaterial2();
-
-	ItemStack getAdhesive();
-
-	@Nullable
-	IDesignMaterial getMaterial(final ItemStack p0);
-}

api/src/main/java/binnie/extratrees/api/ILayout.java

@@ -1,28 +0,0 @@
-package binnie.extratrees.api;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public interface ILayout {
-	IPattern getPattern();
-
-	boolean isInverted();
-
-	ILayout rotateRight();
-
-	ILayout rotateLeft();
-
-	ILayout flipHorizontal();
-
-	ILayout flipVertical();
-
-	ILayout invert();
-
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getPrimarySprite(IDesignSystem system);
-
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getSecondarySprite(IDesignSystem system);
-}

api/src/main/java/binnie/extratrees/api/IPattern.java

@@ -1,22 +0,0 @@
-package binnie.extratrees.api;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.ISpriteRegister;
-
-public interface IPattern extends ISpriteRegister {
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getPrimarySprite(IDesignSystem system);
-
-	@SideOnly(Side.CLIENT)
-	TextureAtlasSprite getSecondarySprite(IDesignSystem system);
-
-	ILayout getRotation();
-
-	ILayout getHorizontalFlip();
-
-	int getIndex();
-}

api/src/main/java/binnie/extratrees/api/IToolHammer.java

@@ -1,10 +0,0 @@
-package binnie.extratrees.api;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public interface IToolHammer {
-	boolean isActive(final ItemStack p0);
-
-	void onHammerUsed(final ItemStack p0, final EntityPlayer p1);
-}

api/src/main/java/binnie/extratrees/api/carpentry/DesignerManager.java

@@ -1,29 +0,0 @@
-package binnie.extratrees.api.carpentry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import binnie.extratrees.api.IDesignSystem;
-
-public final class DesignerManager {
-	public static DesignerManager instance = new DesignerManager();
-
-	private final List<IDesignSystem> systems;
-
-	private DesignerManager() {
-		this.systems = new ArrayList<>();
-	}
-
-	public void registerDesignSystem(final IDesignSystem system) {
-		this.systems.add(system);
-	}
-
-	public Collection<IDesignSystem> getDesignSystems() {
-		return this.systems;
-	}
-
-	public void addDesignSystem(final IDesignSystem system) {
-		this.systems.add(system);
-	}
-}

api/src/main/java/binnie/extratrees/api/carpentry/EnumPattern.java

@@ -1,415 +0,0 @@
-package binnie.extratrees.api.carpentry;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.ITextureManager;
-
-import binnie.extratrees.api.IDesignSystem;
-import binnie.extratrees.api.ILayout;
-import binnie.extratrees.api.IPattern;
-
-// TODO: move out of API
-public enum EnumPattern implements IPattern {
-	Blank,
-	Octagon,
-	Diamond,
-	Ringed,
-	Squared,
-	Multiply,
-	Circle,
-	Plus,
-	Creeper,
-	Creeper2,
-	Creeper3,
-	Creeper4,
-	Halved,
-	Halved2,
-	Striped,
-	Striped2,
-	ThinStriped,
-	ThinStriped2,
-	Chequered,
-	Tiled,
-	VeryThinCorner,
-	VeryThinCorner2,
-	VeryThinCorner3,
-	VeryThinCorner4,
-	ThinCorner,
-	ThinCorner2,
-	ThinCorner3,
-	ThinCorner4,
-	Corner,
-	Corner2,
-	Corner3,
-	Corner4,
-	ThickCorner,
-	ThickCorner2,
-	ThickCorner3,
-	ThickCorner4,
-	ThinCurvedCorner,
-	ThinCurvedCorner2,
-	ThinCurvedCorner3,
-	ThinCurvedCorner4,
-	CurvedCorner,
-	CurvedCorner2,
-	CurvedCorner3,
-	CurvedCorner4,
-	Edged,
-	Edged2,
-	Edged3,
-	Edged4,
-	ThinEdged,
-	ThinEdged2,
-	ThinEdged3,
-	ThinEdged4,
-	ThinBarred,
-	ThinBarred2,
-	Barred,
-	Barred2,
-	ThickBarred,
-	ThickBarred2,
-	BarredEnd,
-	BarredEnd2,
-	BarredEnd3,
-	BarredEnd4,
-	OrnateBarred,
-	OrnateBarred2,
-	OrnateThinBarred,
-	OrnateThinBarred2,
-	SplitBarred,
-	SplitBarred2,
-	SplitBarredCorner,
-	SplitBarredCorner2,
-	SplitBarredCorner3,
-	SplitBarredCorner4,
-	SplitBarredTSection,
-	SplitBarredTSection2,
-	SplitBarredTSection3,
-	SplitBarredTSection4,
-	SplitCrossed,
-	SplitBarredEnd,
-	SplitBarredEnd2,
-	SplitBarredEnd3,
-	SplitBarredEnd4,
-	Diagonal,
-	Diagonal2,
-	ThickDiagonal,
-	ThickDiagonal2,
-	DiagonalCorner,
-	DiagonalCorner2,
-	DiagonalCorner3,
-	DiagonalCorner4,
-	DiagonalTSection,
-	DiagonalTSection2,
-	DiagonalTSection3,
-	DiagonalTSection4,
-	DiagonalCurvedCorner,
-	DiagonalCurvedCorner2,
-	DiagonalCurvedCorner3,
-	DiagonalCurvedCorner4,
-	DiagonalCurvedTSection,
-	DiagonalCurvedTSection2,
-	DiagonalCurvedTSection3,
-	DiagonalCurvedTSection4,
-	DiagonalStriped,
-	DiagonalStriped2,
-	ThinDiagonalStriped,
-	ThinDiagonalStriped2,
-	ThinSaltire,
-	Saltire,
-	ThickSaltire,
-	ThinCrossed,
-	Crossed,
-	ThickCrossed,
-	ThinCurvedCrossed,
-	ThinTSection,
-	ThinTSection2,
-	ThinTSection3,
-	ThinTSection4,
-	TSection,
-	TSection2,
-	TSection3,
-	TSection4,
-	ThickTSection,
-	ThickTSection2,
-	ThickTSection3,
-	ThickTSection4,
-	ThinCurvedTSection,
-	ThinCurvedTSection2,
-	ThinCurvedTSection3,
-	ThinCurvedTSection4,
-	CurvedTSection,
-	CurvedTSection2,
-	CurvedTSection3,
-	CurvedTSection4,
-	ThinBarredCorner,
-	ThinBarredCorner2,
-	ThinBarredCorner3,
-	ThinBarredCorner4,
-	BarredCorner,
-	BarredCorner2,
-	BarredCorner3,
-	BarredCorner4,
-	ThickBarredCorner,
-	ThickBarredCorner2,
-	ThickBarredCorner3,
-	ThickBarredCorner4,
-	ThinCurvedBarredCorner,
-	ThinCurvedBarredCorner2,
-	ThinCurvedBarredCorner3,
-	ThinCurvedBarredCorner4,
-	BarredCurvedCorner,
-	BarredCurvedCorner2,
-	BarredCurvedCorner3,
-	BarredCurvedCorner4,
-	ThinStripedCorner,
-	ThinStripedCorner2,
-	ThinStripedCorner3,
-	ThinStripedCorner4,
-	StripedCorner,
-	StripedCorner2,
-	StripedCorner3,
-	StripedCorner4,
-	OrnateStripedCorner,
-	OrnateStripedCorner2,
-	OrnateStripedCorner3,
-	OrnateStripedCorner4,
-	Emblem1,
-	Emblem2,
-	Emblem3,
-	Emblem4,
-	Emblem5,
-	LetterA,
-	LetterA2,
-	LetterA3,
-	LetterA4,
-	LetterB,
-	LetterB2,
-	LetterB3,
-	LetterB4,
-	LetterF,
-	LetterF2,
-	LetterF3,
-	LetterF4,
-	LetterS,
-	LetterS2,
-	LetterS3,
-	LetterS4,
-	LetterT,
-	LetterT2,
-	LetterT3,
-	LetterT4,
-	DiagonalHalved,
-	DiagonalHalved2,
-	Diagonal1Edged,
-	Diagonal1Edged2,
-	Diagonal1Edged3,
-	Diagonal1Edged4,
-	Diagonal2Edged,
-	Diagonal2Edged2,
-	ThickDiagonal1Edged,
-	ThickDiagonal1Edged2,
-	ThickDiagonal1Edged3,
-	ThickDiagonal1Edged4,
-	ThinBarredEnd,
-	ThinBarredEnd2,
-	ThinBarredEnd3,
-	ThinBarredEnd4,
-	ThickBarredEnd,
-	ThickBarredEnd2,
-	ThickBarredEnd3,
-	ThickBarredEnd4,
-	OverlappedSplitBarred,
-	OverlappedSplitBarred2,
-	OverlappedBarred,
-	OverlappedBarred2;
-
-	static {
-		setupStripedPattern(EnumPattern.ThinStriped, EnumPattern.ThinStriped2);
-		setupStripedPattern(EnumPattern.Striped, EnumPattern.Striped2);
-		setupStripedPattern(EnumPattern.Halved, EnumPattern.Halved2);
-		setupChequeredPattern(EnumPattern.Chequered);
-		setupChequeredPattern(EnumPattern.Tiled);
-		setupCornerPattern(EnumPattern.VeryThinCorner, EnumPattern.VeryThinCorner2, EnumPattern.VeryThinCorner3, EnumPattern.VeryThinCorner4);
-		setupCornerPattern(EnumPattern.ThinCorner, EnumPattern.ThinCorner2, EnumPattern.ThinCorner3, EnumPattern.ThinCorner4);
-		setupCornerPattern(EnumPattern.Corner, EnumPattern.Corner2, EnumPattern.Corner3, EnumPattern.Corner4);
-		setupCornerPattern(EnumPattern.ThickCorner, EnumPattern.ThickCorner2, EnumPattern.ThickCorner3, EnumPattern.ThickCorner4);
-		setupCornerPattern(EnumPattern.ThinCurvedCorner, EnumPattern.ThinCurvedCorner2, EnumPattern.ThinCurvedCorner3, EnumPattern.ThinCurvedCorner4);
-		setupCornerPattern(EnumPattern.CurvedCorner, EnumPattern.CurvedCorner2, EnumPattern.CurvedCorner3, EnumPattern.CurvedCorner4);
-		setupBarredPattern(EnumPattern.BarredEnd, EnumPattern.BarredEnd2, EnumPattern.BarredEnd3, EnumPattern.BarredEnd4);
-		setupEdgedPattern(EnumPattern.ThinEdged, EnumPattern.ThinEdged2, EnumPattern.ThinEdged3, EnumPattern.ThinEdged4);
-		setupEdgedPattern(EnumPattern.Edged, EnumPattern.Edged2, EnumPattern.Edged3, EnumPattern.Edged4);
-		setupBarredPattern(EnumPattern.ThinBarred, EnumPattern.ThinBarred2);
-		setupBarredPattern(EnumPattern.Barred, EnumPattern.Barred2);
-		setupBarredPattern(EnumPattern.ThickBarred, EnumPattern.ThickBarred2);
-		setupDiagonalPattern(EnumPattern.Diagonal, EnumPattern.Diagonal2);
-		setupDiagonalPattern(EnumPattern.ThickDiagonal, EnumPattern.ThickDiagonal2);
-		setupTSectionPattern(EnumPattern.ThinTSection, EnumPattern.ThinTSection2, EnumPattern.ThinTSection3, EnumPattern.ThinTSection4);
-		setupTSectionPattern(EnumPattern.TSection, EnumPattern.TSection2, EnumPattern.TSection3, EnumPattern.TSection4);
-		setupTSectionPattern(EnumPattern.ThickTSection, EnumPattern.ThickTSection2, EnumPattern.ThickTSection3, EnumPattern.ThickTSection4);
-		setupTSectionPattern(EnumPattern.ThinCurvedTSection, EnumPattern.ThinCurvedTSection2, EnumPattern.ThinCurvedTSection3, EnumPattern.ThinCurvedTSection4);
-		setupTSectionPattern(EnumPattern.CurvedTSection, EnumPattern.CurvedTSection2, EnumPattern.CurvedTSection3, EnumPattern.CurvedTSection4);
-		setupCornerPattern(EnumPattern.ThinBarredCorner, EnumPattern.ThinBarredCorner2, EnumPattern.ThinBarredCorner3, EnumPattern.ThinBarredCorner4);
-		setupCornerPattern(EnumPattern.BarredCorner, EnumPattern.BarredCorner2, EnumPattern.BarredCorner3, EnumPattern.BarredCorner4);
-		setupCornerPattern(EnumPattern.ThickBarredCorner, EnumPattern.ThickBarredCorner2, EnumPattern.ThickBarredCorner3, EnumPattern.ThickBarredCorner4);
-		setupCornerPattern(EnumPattern.ThinCurvedBarredCorner, EnumPattern.ThinCurvedBarredCorner2, EnumPattern.ThinCurvedBarredCorner3, EnumPattern.ThinCurvedBarredCorner4);
-		setupCornerPattern(EnumPattern.BarredCurvedCorner, EnumPattern.BarredCurvedCorner2, EnumPattern.BarredCurvedCorner3, EnumPattern.BarredCurvedCorner4);
-		setupCornerPattern(EnumPattern.ThinStripedCorner, EnumPattern.ThinStripedCorner2, EnumPattern.ThinStripedCorner3, EnumPattern.ThinStripedCorner4);
-		setupCornerPattern(EnumPattern.StripedCorner, EnumPattern.StripedCorner2, EnumPattern.StripedCorner3, EnumPattern.StripedCorner4);
-		setupCornerPattern(EnumPattern.OrnateStripedCorner, EnumPattern.OrnateStripedCorner2, EnumPattern.OrnateStripedCorner3, EnumPattern.OrnateStripedCorner4);
-		setupRotation(EnumPattern.LetterA, EnumPattern.LetterA2, EnumPattern.LetterA3, EnumPattern.LetterA4);
-		setupRotation(EnumPattern.LetterB, EnumPattern.LetterB2, EnumPattern.LetterB3, EnumPattern.LetterB4);
-		setupRotation(EnumPattern.LetterF, EnumPattern.LetterF2, EnumPattern.LetterF3, EnumPattern.LetterF4);
-		setupRotation(EnumPattern.LetterS, EnumPattern.LetterS2, EnumPattern.LetterS3, EnumPattern.LetterS4);
-		setupRotation(EnumPattern.LetterT, EnumPattern.LetterT2, EnumPattern.LetterT3, EnumPattern.LetterT4);
-		setupEdgedPattern(EnumPattern.DiagonalCorner, EnumPattern.DiagonalCorner2, EnumPattern.DiagonalCorner3, EnumPattern.DiagonalCorner4);
-		setupCornerPattern(EnumPattern.DiagonalTSection, EnumPattern.DiagonalTSection2, EnumPattern.DiagonalTSection3, EnumPattern.DiagonalTSection4);
-		setupEdgedPattern(EnumPattern.DiagonalCurvedCorner, EnumPattern.DiagonalCurvedCorner2, EnumPattern.DiagonalCurvedCorner3, EnumPattern.DiagonalCurvedCorner4);
-		setupCornerPattern(EnumPattern.DiagonalCurvedTSection, EnumPattern.DiagonalCurvedTSection2, EnumPattern.DiagonalCurvedTSection3, EnumPattern.DiagonalCurvedTSection4);
-		setupBarredPattern(EnumPattern.OrnateBarred, EnumPattern.OrnateBarred2);
-		setupBarredPattern(EnumPattern.OrnateThinBarred, EnumPattern.OrnateThinBarred2);
-		setupBarredPattern(EnumPattern.SplitBarred, EnumPattern.SplitBarred2);
-		setupCornerPattern(EnumPattern.SplitBarredCorner, EnumPattern.SplitBarredCorner2, EnumPattern.SplitBarredCorner3, EnumPattern.SplitBarredCorner4);
-		setupTSectionPattern(EnumPattern.SplitBarredTSection, EnumPattern.SplitBarredTSection2, EnumPattern.SplitBarredTSection3, EnumPattern.SplitBarredTSection4);
-		setupBarredPattern(EnumPattern.SplitBarredEnd, EnumPattern.SplitBarredEnd2, EnumPattern.SplitBarredEnd3, EnumPattern.SplitBarredEnd4);
-		setupRotation(EnumPattern.Creeper, EnumPattern.Creeper2, EnumPattern.Creeper3, EnumPattern.Creeper4);
-		setupDiagonalPattern(EnumPattern.DiagonalStriped, EnumPattern.DiagonalStriped2);
-		setupDiagonalPattern(EnumPattern.ThinDiagonalStriped, EnumPattern.ThinDiagonalStriped2);
-		setupCornerPattern(EnumPattern.Diagonal1Edged, EnumPattern.Diagonal1Edged2, EnumPattern.Diagonal1Edged3, EnumPattern.Diagonal1Edged4);
-		setupCornerPattern(EnumPattern.ThickDiagonal1Edged, EnumPattern.ThickDiagonal1Edged2, EnumPattern.ThickDiagonal1Edged3, EnumPattern.ThickDiagonal1Edged4);
-		setupInvert2Rot(EnumPattern.DiagonalHalved, EnumPattern.DiagonalHalved2);
-		set2Rotation(EnumPattern.Diagonal2Edged, EnumPattern.Diagonal2Edged2);
-		setupBarredPattern(EnumPattern.ThinBarredEnd, EnumPattern.ThinBarredEnd2, EnumPattern.ThinBarredEnd3, EnumPattern.ThinBarredEnd4);
-		setupBarredPattern(EnumPattern.ThickBarredEnd, EnumPattern.ThickBarredEnd2, EnumPattern.ThickBarredEnd3, EnumPattern.ThickBarredEnd4);
-		EnumPattern.OverlappedBarred.setLeftRotation(EnumPattern.OverlappedBarred2, false);
-		EnumPattern.OverlappedBarred2.setLeftRotation(EnumPattern.OverlappedBarred, false);
-		EnumPattern.OverlappedSplitBarred.setLeftRotation(EnumPattern.OverlappedSplitBarred2, false);
-		EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false);
-	}
-
-	ILayout leftRotation;
-	ILayout horizontalFlip;
-
-	EnumPattern() {
-		this.leftRotation = Layout.get(this, false);
-		this.horizontalFlip = Layout.get(this, false);
-	}
-
-	static void setupStripedPattern(final EnumPattern vert, final EnumPattern hori) {
-		vert.setLeftRotation(hori, true);
-		hori.setLeftRotation(vert, false);
-		vert.setHorizontalFlip(vert, true);
-	}
-
-	static void setupChequeredPattern(final EnumPattern cheq) {
-		cheq.setLeftRotation(cheq, true);
-		cheq.setHorizontalFlip(cheq, true);
-	}
-
-	static void setupCornerPattern(final EnumPattern tl, final EnumPattern tr, final EnumPattern br, final EnumPattern bl) {
-		tl.setLeftRotation(bl, false);
-		tr.setLeftRotation(tl, false);
-		br.setLeftRotation(tr, false);
-		bl.setLeftRotation(br, false);
-		tl.setHorizontalFlip(tr, false);
-		bl.setHorizontalFlip(br, false);
-	}
-
-	static void setupInvert2Rot(final EnumPattern a, final EnumPattern b) {
-		a.setLeftRotation(b, true);
-		b.setLeftRotation(a, false);
-		a.setHorizontalFlip(b, false);
-	}
-
-	static void set2Rotation(final EnumPattern a, final EnumPattern b) {
-		a.setLeftRotation(b, false);
-		b.setLeftRotation(a, false);
-		a.setHorizontalFlip(b, false);
-	}
-
-	static void setupBarredPattern(final EnumPattern vert, final EnumPattern hori) {
-		vert.setLeftRotation(hori, false);
-		hori.setLeftRotation(vert, false);
-	}
-
-	static void setupEdgedPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) {
-		l.setLeftRotation(b, false);
-		t.setLeftRotation(l, false);
-		r.setLeftRotation(t, false);
-		b.setLeftRotation(r, false);
-		l.setHorizontalFlip(r, false);
-	}
-
-	static void setupDiagonalPattern(final EnumPattern a, final EnumPattern b) {
-		a.setLeftRotation(b, false);
-		b.setLeftRotation(a, false);
-		a.setHorizontalFlip(b, false);
-	}
-
-	static void setupBarredPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) {
-		l.setLeftRotation(b, false);
-		t.setLeftRotation(l, false);
-		r.setLeftRotation(t, false);
-		b.setLeftRotation(r, false);
-		l.setHorizontalFlip(r, false);
-	}
-
-	static void setupTSectionPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) {
-		setupEdgedPattern(l, t, r, b);
-	}
-
-	private static void setupRotation(final EnumPattern t, final EnumPattern r, final EnumPattern b, final EnumPattern l) {
-		setupEdgedPattern(l, t, r, b);
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public TextureAtlasSprite getPrimarySprite(IDesignSystem system) {
-		return system.getPrimarySprite(this);
-	}
-
-	private void setHorizontalFlip(final EnumPattern pattern, final boolean inverted) {
-		this.horizontalFlip = Layout.get(pattern, inverted);
-		pattern.horizontalFlip = Layout.get(this, inverted);
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public TextureAtlasSprite getSecondarySprite(IDesignSystem system) {
-		return system.getSecondarySprite(this);
-	}
-
-	@Override
-	public ILayout getRotation() {
-		return this.leftRotation;
-	}
-
-	@Override
-	public ILayout getHorizontalFlip() {
-		return this.horizontalFlip;
-	}
-
-	@Override
-	public int getIndex() {
-		return ordinal();
-	}
-
-	protected void setLeftRotation(final EnumPattern pattern, final boolean inverted) {
-		this.leftRotation = Layout.get(pattern, inverted);
-	}
-
-	@Override
-	public void registerSprites(ITextureManager manager) {
-	}
-
-	public ILayout layout() {
-		return this.layout(false);
-	}
-
-	public ILayout layout(final boolean invert) {
-		return Layout.get(this, invert);
-	}
-}

api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesign.java

@@ -1,7 +0,0 @@
-package binnie.extratrees.api.carpentry;
-
-import binnie.extratrees.api.IDesignSystem;
-
-public interface IBlockDesign {
-	IDesignSystem getDesignSystem();
-}

api/src/main/java/binnie/extratrees/api/carpentry/IBlockDesignProperties.java

@@ -1,4 +0,0 @@
-package binnie.extratrees.api.carpentry;
-
-public interface IBlockDesignProperties {
-}

api/src/main/java/binnie/extratrees/api/carpentry/Layout.java

@@ -1,79 +0,0 @@
-package binnie.extratrees.api.carpentry;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import binnie.extratrees.api.IDesignSystem;
-import binnie.extratrees.api.ILayout;
-import binnie.extratrees.api.IPattern;
-
-public class Layout implements ILayout {
-	IPattern pattern;
-	boolean inverted;
-
-	private Layout(final IPattern pattern, final boolean inverted) {
-		this.pattern = pattern;
-		this.inverted = inverted;
-	}
-
-	public static ILayout get(final IPattern pattern, final boolean inverted) {
-		return new Layout(pattern, inverted);
-	}
-
-	public static ILayout get(final IPattern pattern) {
-		return new Layout(pattern, false);
-	}
-
-	@Override
-	public IPattern getPattern() {
-		return this.pattern;
-	}
-
-	@Override
-	public boolean isInverted() {
-		return this.inverted;
-	}
-
-	ILayout newLayout(final ILayout newLayout) {
-		return new Layout(newLayout.getPattern(), this.inverted ^ newLayout.isInverted());
-	}
-
-	@Override
-	public ILayout rotateRight() {
-		return this.rotateLeft().rotateLeft().rotateLeft();
-	}
-
-	@Override
-	public ILayout rotateLeft() {
-		return this.newLayout(this.pattern.getRotation());
-	}
-
-	@Override
-	public ILayout flipHorizontal() {
-		return this.newLayout(this.pattern.getHorizontalFlip());
-	}
-
-	@Override
-	public ILayout flipVertical() {
-		return this.newLayout(this.pattern.getHorizontalFlip().rotateLeft().rotateLeft());
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public TextureAtlasSprite getPrimarySprite(IDesignSystem system) {
-		return this.inverted ? this.pattern.getSecondarySprite(system) : this.pattern.getPrimarySprite(system);
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public TextureAtlasSprite getSecondarySprite(IDesignSystem system) {
-		return this.inverted ? this.pattern.getPrimarySprite(system) : this.pattern.getSecondarySprite(system);
-	}
-
-	@Override
-	public ILayout invert() {
-		return new Layout(this.pattern, !this.inverted);
-	}
-}

api/src/main/java/binnie/extratrees/api/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.extratrees.api;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java

@@ -1,15 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import javax.annotation.Nullable;
-
-public class ExtraTreesRecipeManager {
-
-	@Nullable
-	public static IBreweryManager breweryManager;
-	@Nullable
-	public static ILumbermillManager lumbermillManager;
-	@Nullable
-	public static IFruitPressManager fruitPressManager;
-	@Nullable
-	public static IDistilleryManager distilleryManager;
-}

api/src/main/java/binnie/extratrees/api/recipes/IBreweryCrafting.java

@@ -1,22 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-public interface IBreweryCrafting {
-
-	@Nullable
-	FluidStack getInputFluid();
-
-	@Nullable
-	ItemStack[] getInputGrains();
-
-	ItemStack getIngredient();
-
-	ItemStack getYeast();
-
-	boolean hasInputGrainsEmpty();
-}

api/src/main/java/binnie/extratrees/api/recipes/IBreweryManager.java

@@ -1,22 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.ICraftingManager;
-
-public interface IBreweryManager extends ICraftingManager<IBreweryRecipe> {
-
-	void addRecipe(FluidStack input, FluidStack output);
-
-	void addRecipe(FluidStack input, FluidStack output, ItemStack yeast);
-
-	void addGrainRecipe(String grainOreName, FluidStack output);
-
-	void addGrainRecipe(String grainOreName, FluidStack output, String ingredientOreName);
-
-	void addGrainRecipe(String grainOreName, FluidStack output, @Nullable String ingredientOreName, ItemStack yeast);
-}

api/src/main/java/binnie/extratrees/api/recipes/IBreweryRecipe.java

@@ -1,29 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import javax.annotation.Nullable;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.IBinnieRecipe;
-
-public interface IBreweryRecipe extends IBinnieRecipe {
-	@Nullable
-	FluidStack getOutput(IBreweryCrafting crafting);
-
-	FluidStack getInput();
-
-	FluidStack getOutput();
-
-	boolean isIngredient(ItemStack itemStack);
-
-	List<ItemStack> getIngredients();
-
-	boolean isGrain(ItemStack itemStack);
-
-	List<ItemStack> getGrains();
-
-	ItemStack getYeast();
-}

api/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java

@@ -1,14 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import java.util.Collection;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.ICraftingManager;
-
-public interface IDistilleryManager extends ICraftingManager<IDistilleryRecipe> {
-
-	void addRecipe(FluidStack input, FluidStack output, int level);
-
-	Collection<IDistilleryRecipe> recipes(int level);
-}

api/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java

@@ -1,14 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.IBinnieRecipe;
-
-public interface IDistilleryRecipe extends IBinnieRecipe {
-
-	FluidStack getInput();
-
-	FluidStack getOutput();
-	
-	int getLevel();
-}

api/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java

@@ -1,12 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.ICraftingManager;
-
-public interface IFruitPressManager extends ICraftingManager<IFruitPressRecipe> {
-
-	void addRecipe(ItemStack input, FluidStack output);
-}

api/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java

@@ -1,14 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import binnie.core.api.IBinnieRecipe;
-
-public interface IFruitPressRecipe extends IBinnieRecipe {
-
-	ItemStack getInput();
-
-	FluidStack getOutput();
-}

api/src/main/java/binnie/extratrees/api/recipes/ILumbermillManager.java

@@ -1,10 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import net.minecraft.item.ItemStack;
-
-import binnie.core.api.ICraftingManager;
-
-public interface ILumbermillManager extends ICraftingManager<ILumbermillRecipe> {
-
-	void addRecipe(ItemStack input, ItemStack output);
-}

api/src/main/java/binnie/extratrees/api/recipes/ILumbermillRecipe.java

@@ -1,12 +0,0 @@
-package binnie.extratrees.api.recipes;
-
-import net.minecraft.item.ItemStack;
-
-import binnie.core.api.IBinnieRecipe;
-
-public interface ILumbermillRecipe extends IBinnieRecipe {
-
-	ItemStack getOutput();
-
-	ItemStack getInput();
-}

api/src/main/java/binnie/extratrees/api/recipes/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.extratrees.api.recipes;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

api/src/main/java/binnie/genetics/api/IGene.java

@@ -1,21 +0,0 @@
-package binnie.genetics.api;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-import forestry.api.core.INbtReadable;
-import forestry.api.core.INbtWritable;
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IChromosomeType;
-import forestry.api.genetics.ISpeciesRoot;
-
-public interface IGene extends INbtReadable, INbtWritable {
-	IChromosomeType getChromosome();
-
-	String getName();
-
-	ISpeciesRoot getSpeciesRoot();
-
-	IAllele getAllele();
-
-	NBTTagCompound getNBTTagCompound();
-}

api/src/main/java/binnie/genetics/api/IItemAnalysable.java

@@ -1,12 +0,0 @@
-package binnie.genetics.api;
-
-import net.minecraft.item.ItemStack;
-
-public interface IItemAnalysable {
-	boolean isAnalysed(ItemStack stack);
-
-	ItemStack analyse(ItemStack stack);
-
-	@Deprecated
-	float getAnalyseTimeMult(ItemStack stack);
-}

api/src/main/java/binnie/genetics/api/IItemChargeable.java

@@ -1,16 +0,0 @@
-package binnie.genetics.api;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-
-import forestry.api.genetics.ISpeciesRoot;
-
-public interface IItemChargeable {
-	int getCharges(ItemStack stack);
-
-	int getMaxCharges(ItemStack stack);
-
-	@Nullable
-	ISpeciesRoot getSpeciesRoot(ItemStack stack);
-}

api/src/main/java/binnie/genetics/api/IItemSerum.java

@@ -1,14 +0,0 @@
-package binnie.genetics.api;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.item.ItemStack;
-
-public interface IItemSerum extends IItemChargeable {
-	IGene[] getGenes(ItemStack stack);
-
-	@Nullable
-	IGene getGene(ItemStack stack, int chromosome);
-
-	ItemStack addGene(ItemStack stack, IGene gene);
-}

api/src/main/java/binnie/genetics/api/package-info.java

@@ -1,7 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-package binnie.genetics.api;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import mcp.MethodsReturnNonnullByDefault;

botany/build.gradle

@@ -1,9 +0,0 @@
-archivesBaseName = 'botany-' + mcversion
-
-dependencies {
-	compile project(":api")
-	compile project(":core")
-
-	// TODO: remove
-	compile project(":extratrees")
-}

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

@@ -1,105 +0,0 @@
-package binnie.botany;
-
-import binnie.botany.genetics.FlowerBreedingSystem;
-import binnie.core.Binnie;
-import binnie.core.api.genetics.IBreedingSystem;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.SidedProxy;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-
-import binnie.core.Constants;
-import binnie.botany.gui.BotanyGUI;
-import binnie.botany.network.PacketID;
-import binnie.botany.proxy.Proxy;
-import binnie.core.BinnieCore;
-import binnie.core.gui.IBinnieGUID;
-import binnie.core.network.BinniePacketHandler;
-import binnie.core.network.IPacketID;
-import binnie.core.proxy.IProxyCore;
-import binnie.core.modules.BlankModuleContainer;
-
-@Mod(
-	modid = Constants.BOTANY_MOD_ID,
-	name = "Binnie's Botany",
-	dependencies = "required-after:" + Constants.CORE_MOD_ID
-)
-public class Botany extends BlankModuleContainer {
-	public static final float AGE_CHANCE = 0.2f;
-
-	@SuppressWarnings("NullableProblems")
-	@Mod.Instance(Constants.BOTANY_MOD_ID)
-	public static Botany instance;
-	@SuppressWarnings("NullableProblems")
-	@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
-	public static Proxy proxy;
-	public static IBreedingSystem flowerBreedingSystem;
-
-	@Mod.EventHandler
-	public void preInit(FMLPreInitializationEvent evt) {
-		super.preInit(evt);
-		flowerBreedingSystem = new FlowerBreedingSystem();
-		Binnie.GENETICS.registerBreedingSystem(flowerBreedingSystem);
-	}
-
-	@Mod.EventHandler
-	public void init(FMLInitializationEvent evt) {
-		super.init(evt);
-	}
-
-	@Mod.EventHandler
-	public void postInit(FMLPostInitializationEvent evt) {
-		super.postInit(evt);
-	}
-
-	@Override
-	protected void registerModules() {
-	}
-
-	@Override
-	public IBinnieGUID[] getGUIDs() {
-		return BotanyGUI.values();
-	}
-
-	@Override
-	public Class<?>[] getConfigs() {
-		return new Class[0];
-	}
-
-	@Override
-	public IPacketID[] getPacketIDs() {
-		return PacketID.values();
-	}
-
-	@Override
-	public IProxyCore getProxy() {
-		return Botany.proxy;
-	}
-
-	@Override
-	public String getChannel() {
-		return "BOT";
-	}
-
-	@Override
-	public String getModID() {
-		return Constants.BOTANY_MOD_ID;
-	}
-
-	@Override
-	protected Class<? extends BinniePacketHandler> getPacketHandler() {
-		return PacketHandler.class;
-	}
-
-	@Override
-	public boolean isAvailable() {
-		return BinnieCore.isBotanyActive();
-	}
-
-	public static class PacketHandler extends BinniePacketHandler {
-		public PacketHandler() {
-			super(Botany.instance);
-		}
-	}
-}

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

@@ -1,36 +0,0 @@
-package binnie.botany;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import binnie.core.util.I18N;
-
-public class CreativeTabBotany extends CreativeTabs {
-	public static CreativeTabs instance = new CreativeTabBotany();
-
-	public CreativeTabBotany() {
-		super("Botany");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getTranslatedTabLabel() {
-		return getTabLabel();
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getTabLabel() {
-		return I18N.localise("botany.tab.botany");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ItemStack getTabIconItem() {
-		return new ItemStack(Blocks.RED_FLOWER, 1, 5);
-	}
-}

botany/src/main/java/binnie/botany/GardeningManager.java

@@ -1,274 +0,0 @@
-package binnie.botany;
-
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-
-import forestry.api.climate.IClimateInfo;
-import forestry.api.core.EnumTemperature;
-import forestry.api.core.ForestryAPI;
-
-import binnie.botany.api.gardening.EnumAcidity;
-import binnie.botany.api.gardening.EnumFertiliserType;
-import binnie.botany.api.gardening.EnumMoisture;
-import binnie.botany.api.gardening.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.botany.api.gardening.IGardeningManager;
-import binnie.botany.api.genetics.IFlower;
-import binnie.botany.api.genetics.IFlowerGenome;
-import binnie.botany.blocks.BlockPlant;
-import binnie.botany.blocks.BlockSoil;
-import binnie.botany.modules.ModuleGardening;
-import binnie.core.util.OreDictionaryUtil;
-
-public class GardeningManager implements IGardeningManager {
-	private final Map<EnumFertiliserType, Map<ItemStack, Integer>> fertilisers = new LinkedHashMap<>();
-
-	public GardeningManager() {
-		for(EnumFertiliserType type : EnumFertiliserType.values()){
-			fertilisers.put(type, new LinkedHashMap<>());
-		}
-	}
-
-	@Override
-	public boolean isSoil(Block block) {
-		return block instanceof IBlockSoil;
-	}
-
-	@Override
-	public boolean isSoil(Item item) {
-		return item instanceof ItemBlock && isSoil(((ItemBlock) item).getBlock());
-	}
-
-	@Override
-	public boolean isSoil(ItemStack item) {
-		return isSoil(item.getItem());
-	}
-
-	@Override
-	public EnumMoisture getNaturalMoisture(World world, BlockPos pos) {
-		float moisture = getBiomeMoisture(world, pos);
-
-		for (int offsetX = -1; offsetX < 2; ++offsetX) {
-			for (int offsetY = -1; offsetY < 2; ++offsetY) {
-				if (offsetX != 0 || offsetY != 0) {
-					Block block = world.getBlockState(pos.add(offsetX, 0, offsetY)).getBlock();
-					if (block == Blocks.SAND) {
-						moisture -= 1.5;
-					} else if (block == Blocks.WATER) {
-						moisture += 1.5;
-					}
-				}
-			}
-		}
-
-		if (world.isRainingAt(pos.up())) {
-			moisture += 1.5;
-		}
-
-		for (int offsetX = -1; offsetX < 2; ++offsetX) {
-			for (int offsetY = -1; offsetY < 2; ++offsetY) {
-				if (offsetX != 0 || offsetY != 0) {
-					Block block = world.getBlockState(pos.add(offsetX, 0, offsetY)).getBlock();
-					if (block == Blocks.GRAVEL && moisture > 0.0f) {
-						moisture *= 0.4f;
-					}
-				}
-			}
-		}
-		return EnumMoisture.getFromValue(moisture);
-	}
-
-	@Override
-	public EnumAcidity getNaturalPH(World world, BlockPos pos) {
-		float acidity = getBiomePH(world, pos);
-		return EnumAcidity.getFromValue(acidity);
-	}
-
-	@Override
-	public float getBiomeMoisture(World world, BlockPos pos) {
-		IClimateInfo info = ForestryAPI.climateManager.getInfo(world, pos);
-		double humidity = info.getHumidity();
-		double temperature = info.getTemperature();
-		double moisture = 3.2 * (humidity - 0.5) - 0.4 * (1.0 + temperature + 0.5 * temperature * temperature) + 1.1 - 1.6 * (temperature - 0.9) * (temperature - 0.9) - 0.002 * (pos.getY() - 64);
-		return (float) ((moisture == 0.0) ? moisture : ((moisture < 0.0) ? (-Math.sqrt(moisture * moisture)) : Math.sqrt(moisture * moisture)));
-	}
-
-	@Override
-	public float getBiomePH(World world, BlockPos pos) {
-		IClimateInfo info = ForestryAPI.climateManager.getInfo(world, pos);
-		double humidity = info.getHumidity();
-		double temperature = info.getTemperature();
-		return (float) (-3.0 * (humidity - 0.5) + 0.5 * (temperature - 0.699999988079071) * (temperature - 0.699999988079071) + 0.02f * (pos.getY() - 64) - 0.15000000596046448);
-	}
-
-	@Override
-	public IBlockState getSoil(EnumSoilType soil, boolean weedKill, EnumMoisture moisture, EnumAcidity acidity) {
-		IBlockState blockState = getSoilBlock(soil, weedKill).getDefaultState();
-		return blockState.withProperty(BlockSoil.MOISTURE, moisture).withProperty(BlockSoil.ACIDITY, acidity);
-	}
-
-	@Override
-	public void plantSoil(World world, BlockPos pos, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity) {
-		IBlockState blockState = getSoil(soil, false, moisture, acidity);
-		world.setBlockState(pos, blockState, 2);
-	}
-
-	public Map<EnumFertiliserType, Map<ItemStack, Integer>> getFertilisers() {
-		return fertilisers;
-	}
-
-	@Override
-	public Collection<ItemStack> getFertilisers(EnumFertiliserType type) {
-	Set<ItemStack> items = fertilisers.get(type).keySet();
-		return Collections.unmodifiableSet(items);
-	}
-
-	@Override
-	public boolean isFertiliser(EnumFertiliserType type, ItemStack stack) {
-		Collection<ItemStack> fertilisers = getFertilisers(type);
-		for (ItemStack fertiliser : fertilisers) {
-			if (!fertiliser.isEmpty() && fertiliser.isItemEqual(stack)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public void registerFertiliser(EnumFertiliserType type, ItemStack stack, int strength) {
-		fertilisers.get(type).put(stack, strength);
-	}
-
-	@Override
-	public int getFertiliserStrength(ItemStack stack) {
-		for(EnumFertiliserType type : EnumFertiliserType.values()) {
-			for (Map.Entry<ItemStack, Integer> entry : fertilisers.get(type).entrySet()) {
-				if (entry.getKey().isItemEqual(stack)) {
-					return entry.getValue();
-				}
-			}
-		}
-		return 1;
-	}
-
-	@Override
-	public boolean onFertiliseSoil(ItemStack heldItem, IBlockSoil soil, World world, BlockPos pos, EntityPlayer player) {
-		int fertiliserStrength = getFertiliserStrength(heldItem);
-		if (isFertiliser(EnumFertiliserType.NUTRIENT, heldItem) && soil.getType(world, pos) != EnumSoilType.FLOWERBED) {
-			EnumSoilType type = soil.getType(world, pos);
-			int next = Math.min(type.ordinal() + fertiliserStrength, 2);
-			if (soil.fertilise(world, pos, EnumSoilType.values()[next])) {
-				if(!player.capabilities.isCreativeMode) {
-					heldItem.shrink(1);
-				}
-				return true;
-			}
-		}
-
-		if (isFertiliser(EnumFertiliserType.ACID, heldItem) && soil.getPH(world, pos) != EnumAcidity.ACID) {
-			EnumAcidity pH = soil.getPH(world, pos);
-			int next = Math.max(pH.ordinal() - fertiliserStrength, 0);
-			if (soil.setPH(world, pos, EnumAcidity.values()[next])) {
-				if(!player.capabilities.isCreativeMode) {
-					heldItem.shrink(1);
-				}
-				return true;
-			}
-		}
-
-		if (isFertiliser(EnumFertiliserType.ALKALINE, heldItem) && soil.getPH(world, pos) != EnumAcidity.ALKALINE) {
-			EnumAcidity pH = soil.getPH(world, pos);
-			int next = Math.min(pH.ordinal() + fertiliserStrength, 2);
-			if (soil.setPH(world, pos, EnumAcidity.values()[next])) {
-				if(!player.capabilities.isCreativeMode) {
-					heldItem.shrink(1);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canTolerate(@Nullable IFlower flower, World world, BlockPos pos) {
-		if (flower == null) {
-			return false;
-		}
-		IBlockState soil = world.getBlockState(pos.down());
-		Biome biome = world.getBiome(pos);
-		EnumAcidity acidity = soil.getValue(BlockSoil.ACIDITY);
-		EnumMoisture moisture = soil.getValue(BlockSoil.MOISTURE);
-		EnumTemperature temperature = EnumTemperature.getFromValue(biome.getTemperature());
-		return canTolerate(flower, acidity, moisture, temperature);
-	}
-
-	@Override
-	public EnumSoilType getSoilType(World world, BlockPos pos) {
-		IBlockState blockState = world.getBlockState(pos);
-		if (blockState.getBlock() instanceof IBlockSoil) {
-			IBlockSoil soil = ((IBlockSoil) blockState.getBlock());
-			return soil.getType(world, pos);
-		}
-		return EnumSoilType.SOIL;
-	}
-
-	@Override
-	public Block getSoilBlock(EnumSoilType type) {
-		return getSoilBlock(type, false);
-	}
-
-	@Override
-	public Block getSoilBlock(EnumSoilType type, boolean weedKill) {
-		switch (type) {
-			case FLOWERBED:
-				return weedKill ? ModuleGardening.flowerbedNoWeed : ModuleGardening.flowerbed;
-
-			case LOAM:
-				return weedKill ? ModuleGardening.loamNoWeed : ModuleGardening.loam;
-			default:
-				return weedKill ? ModuleGardening.soilNoWeed : ModuleGardening.soil;
-		}
-	}
-
-	@Override
-	public boolean canTolerate(IFlower flower, EnumAcidity acidity, EnumMoisture moisture, EnumTemperature temperature) {
-		IFlowerGenome genome = flower.getGenome();
-		return genome.canTolerate(acidity) && genome.canTolerate(moisture) && genome.canTolerate(temperature);
-	}
-
-	@Override
-	public boolean isWeedkiller(ItemStack heldItem) {
-		return OreDictionaryUtil.hasOreName(heldItem, "weedkiller");
-	}
-
-	@Override
-	public boolean addWeedKiller(World world, BlockPos pos) {
-		IBlockState oldState = world.getBlockState(pos);
-		if (!(oldState.getBlock() instanceof IBlockSoil)) {
-			return false;
-		}
-
-		EnumSoilType type = getSoilType(world, pos);
-		IBlockState newState = getSoil(type, true,  oldState.getValue(BlockSoil.MOISTURE), oldState.getValue(BlockSoil.ACIDITY));
-		boolean done = world.setBlockState(pos, newState, 2);
-		if (done && BlockPlant.isWeed(world, pos.up())) {
-			world.setBlockToAir(pos.up());
-		}
-		return done;
-	}
-}

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

@@ -1,118 +0,0 @@
-package binnie.botany.blocks;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-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.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-import forestry.core.blocks.IColoredBlock;
-
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.tile.TileCeramic;
-import binnie.core.util.TileUtil;
-
-public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegister {
-	public BlockCeramic() {
-		super(Material.ROCK);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setRegistryName("ceramic");
-		setCreativeTab(CreativeTabBotany.instance);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerModel(Item item, IModelManager manager) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			manager.registerItemModel(item, c.ordinal());
-		}
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-
-	}
-
-	@Override
-	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, @Nullable EntityPlayer player, boolean willHarvest) {
-		List<ItemStack> drops = new ArrayList<>();
-		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
-		if (ceramic != null) {
-			drops = Collections.singletonList(ceramic.getStack());
-		}
-		boolean hasBeenBroken = world.setBlockToAir(pos);
-		if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				spawnAsEntity(world, pos, drop);
-			}
-		}
-		return hasBeenBroken;
-	}
-
-	@Override
-	public TileEntity createTileEntity(World world, IBlockState state) {
-		return new TileCeramic();
-	}
-
-	@Override
-	public boolean hasTileEntity(IBlockState state) {
-		return true;
-	}
-
-	@Override
-	public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
-		TileCeramic ceramic = TileUtil.getTile(worldIn, pos, TileCeramic.class);
-		if (ceramic != null) {
-			ceramic.setColor(EnumFlowerColor.VALUES[stack.getItemDamage()]);
-		}
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			itemList.add(new ItemStack(this, 1, c.getFlowerColorAllele().getID()));
-		}
-	}
-
-	@Override
-	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
-		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
-		if (ceramic != null) {
-			return ceramic.getStack();
-		}
-		return super.getPickBlock(state, target, world, pos, player);
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
-		if (world != null && pos != null) {
-			TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
-			if (ceramic != null) {
-				return ceramic.getColor().getFlowerColorAllele().getColor(false);
-			}
-		}
-		return EnumFlowerColor.get(0).getFlowerColorAllele().getColor(false);
-	}
-}

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

@@ -1,265 +0,0 @@
-package binnie.botany.blocks;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLivingBase;
-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.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.common.property.ExtendedBlockState;
-import net.minecraftforge.common.property.IExtendedBlockState;
-import net.minecraftforge.common.property.IUnlistedProperty;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-import forestry.api.core.ISpriteRegister;
-import forestry.api.core.IStateMapperRegister;
-import forestry.api.core.ITextureManager;
-import forestry.core.blocks.IColoredBlock;
-import forestry.core.blocks.properties.UnlistedBlockAccess;
-import forestry.core.blocks.properties.UnlistedBlockPos;
-import forestry.core.models.BlockModelEntry;
-
-import binnie.core.Constants;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.ceramic.brick.CeramicBrickPair;
-import binnie.botany.ceramic.brick.CeramicBrickType;
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.tile.TileCeramic;
-import binnie.botany.tile.TileCeramicBrick;
-import binnie.core.block.IMultipassBlock;
-import binnie.core.models.DefaultStateMapper;
-import binnie.core.models.ModelManager;
-import binnie.core.models.ModelMutlipass;
-import binnie.core.util.TileUtil;
-
-public class BlockCeramicBrick extends Block implements IMultipassBlock<CeramicBrickPair>, IColoredBlock, ISpriteRegister, IStateMapperRegister, IItemModelRegister {
-	private static final PropertyEnum<CeramicBrickType> TYPE = PropertyEnum.create("type", CeramicBrickType.class);
-
-	public BlockCeramicBrick() {
-		super(Material.ROCK);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setRegistryName("ceramicBrick");
-		setCreativeTab(CreativeTabBotany.instance);
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-
-	}
-
-	@Override
-	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, @Nullable EntityPlayer player, boolean willHarvest) {
-		List<ItemStack> drops = new ArrayList<>();
-		TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class);
-		if (ceramic != null) {
-			drops = Collections.singletonList(ceramic.getStack());
-		}
-		boolean hasBeenBroken = world.setBlockToAir(pos);
-		if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				spawnAsEntity(world, pos, drop);
-			}
-		}
-		return hasBeenBroken;
-	}
-
-	@Override
-	public TileEntity createTileEntity(World world, IBlockState state) {
-		return new TileCeramicBrick();
-	}
-
-	@Override
-	public boolean hasTileEntity(IBlockState state) {
-		return true;
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
-		for (EnumFlowerColor color : EnumFlowerColor.values()) {
-			itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.TILE).getStack(1));
-		}
-		for (CeramicBrickType type : CeramicBrickType.VALUES) {
-			if (type.canDouble()) {
-				itemList.add(new CeramicBrickPair(EnumFlowerColor.Brown, EnumFlowerColor.Gold, type).getStack(1));
-			}
-		}
-		itemList.add(new CeramicBrickPair(EnumFlowerColor.Gold, EnumFlowerColor.Gold, CeramicBrickType.SPLIT).getStack(1));
-		itemList.add(new CeramicBrickPair(EnumFlowerColor.Brown, EnumFlowerColor.Brown, CeramicBrickType.CHEQUERED).getStack(1));
-		itemList.add(new CeramicBrickPair(EnumFlowerColor.Gold, EnumFlowerColor.Brown, CeramicBrickType.LARGE_BRICK).getStack(1));
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerStateMapper() {
-		ResourceLocation resourceLocation = new ResourceLocation(Constants.BOTANY_MOD_ID, "ceramicBrick");
-		ModelLoader.setCustomStateMapper(this, new DefaultStateMapper(resourceLocation));
-		ModelManager.registerCustomBlockModel(new BlockModelEntry(
-				new ModelResourceLocation(resourceLocation, "normal"),
-				new ModelResourceLocation(resourceLocation, "inventory"),
-				new ModelMutlipass<>(BlockCeramicBrick.class),
-				this
-		));
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerModel(Item item, IModelManager manager) {
-		manager.registerItemModel(item, new CeramicBrickMeshDefinition());
-	}
-
-	@Override
-	protected BlockStateContainer createBlockState() {
-		return new ExtendedBlockState(
-				this,
-				new IProperty[]{TYPE},
-				new IUnlistedProperty[]{
-						UnlistedBlockPos.POS,
-						UnlistedBlockAccess.BLOCKACCESS
-				}
-		);
-	}
-
-	@Override
-	public IBlockState getStateFromMeta(int meta) {
-		return getDefaultState().withProperty(TYPE, CeramicBrickType.VALUES[meta]);
-	}
-
-	@Override
-	public int getMetaFromState(IBlockState state) {
-		return state.getValue(TYPE).ordinal();
-	}
-
-	@Override
-	public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
-		return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world);
-	}
-
-	@Override
-	public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
-		ItemStack stack = placer.getHeldItem(hand);
-		CeramicBrickPair pair = new CeramicBrickPair(stack);
-		return getDefaultState().withProperty(TYPE, pair.type);
-	}
-
-	@Override
-	public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
-		TileCeramicBrick ceramic = TileUtil.getTile(worldIn, pos, TileCeramicBrick.class);
-		if (ceramic != null) {
-			CeramicBrickPair pair = new CeramicBrickPair(stack);
-			ceramic.setColors(pair.colorFirst, pair.colorSecond);
-		}
-	}
-
-	@Override
-	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
-		TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
-		if (ceramic != null) {
-			return ceramic.pair().getStack(0);
-		}
-		return super.getPickBlock(state, target, world, pos, player);
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
-		if (world != null && pos != null) {
-			TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
-			if (ceramic != null) {
-				if (tintIndex == 1) {
-					return ceramic.getColorFirst().getFlowerColorAllele().getColor(false);
-				} else if (tintIndex == 2) {
-					return ceramic.getColorSecond().getFlowerColorAllele().getColor(false);
-				}
-			}
-		}
-		return 0xffffff;
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public BlockRenderLayer getBlockLayer() {
-		return BlockRenderLayer.CUTOUT;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderPasses() {
-		return 3;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public CeramicBrickPair getInventoryKey(ItemStack stack) {
-		return new CeramicBrickPair(stack);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public CeramicBrickPair getWorldKey(IBlockState state) {
-		IExtendedBlockState extendedState = (IExtendedBlockState) state;
-		IBlockAccess world = extendedState.getValue(UnlistedBlockAccess.BLOCKACCESS);
-		BlockPos pos = extendedState.getValue(UnlistedBlockPos.POS);
-		TileCeramicBrick ceramic = TileUtil.getTile(world, pos, TileCeramicBrick.class);
-		if (ceramic != null) {
-			return ceramic.pair();
-		}
-		return CeramicBrickPair.EMPTY;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public TextureAtlasSprite getSprite(CeramicBrickPair type, @Nullable EnumFacing facing, int pass) {
-		return type.getSprite(pass);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerSprites(ITextureManager manager) {
-		TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
-		for (CeramicBrickType type : CeramicBrickType.VALUES) {
-			type.sprites = new TextureAtlasSprite[3];
-			for (int i = 0; i < 3; ++i) {
-				type.sprites[i] = textureMap.registerSprite(new ResourceLocation(Constants.BOTANY_MOD_ID + ":blocks/ceramic." + type.id + "." + i));
-			}
-		}
-	}
-
-	private class CeramicBrickMeshDefinition implements ItemMeshDefinition {
-		@Override
-		public ModelResourceLocation getModelLocation(ItemStack stack) {
-			return new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":ceramicBrick", "inventory");
-		}
-	}
-}

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

@@ -1,32 +0,0 @@
-package binnie.botany.blocks;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemStack;
-
-import binnie.botany.ceramic.CeramicColor;
-import binnie.botany.ceramic.CeramicDesignSystem;
-import binnie.botany.api.genetics.EnumFlowerColor;
-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;
-
-public class BlockCeramicPatterned extends BlockDesign {
-	public BlockCeramicPatterned() {
-		super(CeramicDesignSystem.instance, Material.ROCK);
-		setHardness(1.0f);
-		setResistance(5.0f);
-		setRegistryName("ceramicPattern");
-	}
-
-	@Override
-	public ItemStack getCreativeStack(IDesign design) {
-		return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
-	}
-
-	@Override
-	public String getBlockName(DesignBlock design) {
-		return I18N.localise("botany.ceramic.block.name", design.getDesign().getName());
-	}
-}

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

@@ -1,310 +0,0 @@
-package binnie.botany.blocks;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
-
-import net.minecraftforge.client.model.ModelLoader;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IStateMapperRegister;
-import forestry.core.blocks.IColoredBlock;
-
-import binnie.botany.Botany;
-import binnie.botany.api.genetics.IFlower;
-import binnie.botany.api.genetics.IFlowerGenome;
-import binnie.botany.api.genetics.IFlowerRoot;
-import binnie.botany.api.genetics.IFlowerType;
-import binnie.botany.blocks.properties.PropertyFlower;
-import binnie.botany.core.BotanyCore;
-import binnie.botany.genetics.EnumFlowerType;
-import binnie.botany.genetics.FlowerDefinition;
-import binnie.botany.models.StateMapperFlower;
-import binnie.botany.modules.ModuleFlowers;
-import binnie.botany.network.PacketID;
-import binnie.botany.tile.TileEntityFlower;
-import binnie.core.BinnieCore;
-import binnie.core.network.packet.MessageNBT;
-import binnie.core.util.TileUtil;
-
-public class BlockFlower extends BlockContainer implements IColoredBlock, IStateMapperRegister {
-	public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D);
-	/* PROPERTIES */
-	public static final PropertyFlower FLOWER = new PropertyFlower("flower", IFlowerType.class);
-	public static final PropertyInteger SECTION = PropertyInteger.create("section", 0, EnumFlowerType.highestSection - 1);
-	public static final PropertyBool FLOWERED = PropertyBool.create("flowered");
-	public static final PropertyBool SEED = PropertyBool.create("seed");
-
-	public BlockFlower() {
-		super(Material.PLANTS);
-		setTickRandomly(true);
-		setRegistryName("flower");
-		setSoundType(SoundType.PLANT);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntityFlower();
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerStateMapper() {
-		ModelLoader.setCustomStateMapper(this, new StateMapperFlower());
-	}
-
-	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-		ItemStack heldItem = player.getHeldItemMainhand();
-		if (heldItem.isEmpty() || heldItem.getItem() != BinnieCore.getFieldKit() || !player.isSneaking()) {
-			return false;
-		}
-		if (world.isRemote) {
-			return true;
-		}
-
-		TileEntity tile = world.getTileEntity(pos);
-		if (!(tile instanceof TileEntityFlower)) {
-			return true;
-		}
-
-		TileEntityFlower tileFlower = (TileEntityFlower) tile;
-		IFlower flower = tileFlower.getFlower();
-		if (flower == null) {
-			return true;
-		}
-
-		IFlowerGenome flowerGenome = flower.getGenome();
-		NBTTagCompound info = new NBTTagCompound();
-		info.setString("Species", flowerGenome.getPrimary().getUID());
-		info.setString("Species2", flowerGenome.getSecondary().getUID());
-		info.setFloat("Age", flower.getAge() / flowerGenome.getLifespan());
-		info.setShort("Colour", (short) flowerGenome.getPrimaryColor().getID());
-		info.setShort("Colour2", (short) flowerGenome.getSecondaryColor().getID());
-		info.setBoolean("Wilting", flower.isWilted());
-		info.setBoolean("Flowered", flower.hasFlowered());
-		Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FIELDKIT.ordinal(), info), player);
-		heldItem.damageItem(1, player);
-		return true;
-	}
-
-	@Override
-	@Nullable
-	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
-		return null;
-	}
-
-	@Override
-	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-		TileEntity tile = source.getTileEntity(pos);
-		if (tile instanceof TileEntityFlower) {
-			TileEntityFlower flower = (TileEntityFlower) tile;
-			if (flower.getType().getSections() > 1) {
-				return FULL_BLOCK_AABB;
-			}
-		}
-		return FLOWER_BLOCK_AABB.offset(getOffset(state, source, pos));
-	}
-
-	@Override
-	public boolean isOpaqueCube(IBlockState state) {
-		return false;
-	}
-
-	@Override
-	public boolean isFullCube(IBlockState state) {
-		return false;
-	}
-
-	@Override
-	public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
-		super.onBlockPlacedBy(world, pos, state, placer, stack);
-		IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
-		TileEntity flower = world.getTileEntity(pos);
-		if (!!world.isRemote) {
-			if (flower != null && flower instanceof TileEntityFlower) {
-				IFlower f = flowerRoot.getMember(stack);
-				if (f != null) {
-					((TileEntityFlower) flower).setRender(new TileEntityFlower.RenderInfo(f, (TileEntityFlower) flower));
-				}
-			}
-			return;
-		}
-
-		TileEntity below = world.getTileEntity(pos.down());
-		if (flower != null && flower instanceof TileEntityFlower) {
-			if (below instanceof TileEntityFlower) {
-				((TileEntityFlower) flower).setSection(((TileEntityFlower) below).getSection());
-			} else {
-				GameProfile owner = (placer instanceof EntityPlayer) ? ((EntityPlayer) placer).getGameProfile() : null;
-				((TileEntityFlower) flower).create(stack, owner);
-			}
-		}
-		flowerRoot.tryGrowSection(world, pos);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess world, @Nullable BlockPos pos, int tintIndex) {
-		if (world != null && pos != null) {
-			TileEntity tile = world.getTileEntity(pos);
-			if (tile instanceof TileEntityFlower) {
-				TileEntityFlower flower = (TileEntityFlower) tile;
-				if (tintIndex == 0) {
-					return flower.getStemColour();
-				} else if (tintIndex == 1) {
-					return flower.getPrimaryColour();
-				}
-				return flower.getSecondaryColour();
-			}
-		}
-		return 0xffffff;
-	}
-
-	@Override
-	public boolean canPlaceBlockAt(World world, BlockPos pos) {
-		return super.canPlaceBlockAt(world, pos) && canBlockStay(world, pos);
-	}
-
-	public boolean canBlockStay(World world, BlockPos pos) {
-		TileEntity tile = world.getTileEntity(pos);
-		IBlockState downState = world.getBlockState(pos.down());
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() > 0) {
-			return downState.getBlock() == ModuleFlowers.flower;
-		}
-		return canPlaceBlockOn(downState.getBlock());
-	}
-
-	protected boolean canPlaceBlockOn(Block block) {
-		return block == Blocks.GRASS
-				|| block == Blocks.DIRT
-				|| block == Blocks.FARMLAND
-				|| BotanyCore.getGardening().isSoil(block);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public EnumBlockRenderType getRenderType(IBlockState state) {
-		return EnumBlockRenderType.MODEL;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public EnumOffsetType getOffsetType() {
-		return EnumOffsetType.XZ;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
-		TileEntityFlower flower = TileUtil.getTile(world, pos, TileEntityFlower.class);
-		if (flower != null && flower.getType() != null) {
-			state = state.withProperty(FLOWER, flower.getType());
-			state = state.withProperty(FLOWERED, flower.isFlowered());
-			state = state.withProperty(SECTION, flower.getRenderSection());
-			state = state.withProperty(SEED, flower.getAge() == 0);
-		} else {
-			state = state.withProperty(FLOWER, FlowerDefinition.Dandelion.getSpecies().getType());
-			state = state.withProperty(FLOWERED, false);
-			state = state.withProperty(SEED, false);
-		}
-		return state;
-	}
-
-	@Override
-	protected BlockStateContainer createBlockState() {
-		return new BlockStateContainer(this, FLOWER, FLOWERED, SECTION, SEED);
-	}
-
-	@Override
-	public int getMetaFromState(IBlockState state) {
-		return 0;
-	}
-
-	@Override
-	public BlockRenderLayer getBlockLayer() {
-		return BlockRenderLayer.CUTOUT;
-	}
-
-	@Override
-	public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) {
-		checkAndDropBlock(worldIn, pos);
-		TileEntity tile = worldIn.getTileEntity(pos);
-		if (tile instanceof TileEntityFlower) {
-			TileEntityFlower flower = (TileEntityFlower) tile;
-			if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && worldIn.getBlockState(pos.up()).getBlock() != ModuleFlowers.flower) {
-				dropBlockAsItem(worldIn, pos, worldIn.getBlockState(pos), 0);
-				worldIn.setBlockToAir(pos);
-			}
-		}
-	}
-
-	@Override
-	public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-		TileEntity tile = world.getTileEntity(pos);
-		if (tile instanceof TileEntityFlower) {
-			((TileEntityFlower) tile).randomUpdate(rand);
-			checkAndDropBlock(world, pos);
-			return;
-		}
-		world.setBlockToAir(pos);
-	}
-
-	protected void checkAndDropBlock(World world, BlockPos pos) {
-		if (!canBlockStay(world, pos)) {
-			dropBlockAsItem(world, pos, world.getBlockState(pos), 0);
-			world.setBlockToAir(pos);
-		}
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-		TileEntity tile = world.getTileEntity(pos);
-		if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).getSection() == 0) {
-			ItemStack flower = ((TileEntityFlower) tile).getItemStack();
-			if (!flower.isEmpty()) {
-				drops.add(flower);
-			}
-		}
-	}
-
-	@Override
-	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
-		List<ItemStack> drops = getDrops(world, pos, world.getBlockState(pos), 0);
-		boolean hasBeenBroken = world.setBlockToAir(pos);
-		if (hasBeenBroken && !world.isRemote && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) {
-			for (ItemStack drop : drops) {
-				spawnAsEntity(world, pos, drop);
-			}
-		}
-		return hasBeenBroken;
-	}
-}

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

@@ -1,150 +0,0 @@
-package binnie.botany.blocks;
-
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockBush;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.gardening.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.botany.core.BotanyCore;
-
-public class BlockPlant extends BlockBush implements IItemModelRegister {
-	public static final PropertyEnum<PlantType> PLANT_TYPE = PropertyEnum.create("plant_type", PlantType.class);
-
-	public BlockPlant() {
-		setRegistryName("plant");
-		setCreativeTab(CreativeTabBotany.instance);
-		setTickRandomly(true);
-		setSoundType(SoundType.PLANT);
-	}
-
-	public static boolean isWeed(IBlockAccess world, BlockPos pos) {
-		IBlockState blockState = world.getBlockState(pos);
-		if (!(blockState.getBlock() instanceof BlockPlant)) {
-			return false;
-		}
-
-		PlantType type = blockState.getValue(PLANT_TYPE);
-		return type.isWeed();
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerModel(Item item, IModelManager manager) {
-		for (int i = 0;i < PlantType.values().length;i++) {
-			PlantType type = PlantType.getType(i);
-			manager.registerItemModel(item, i, type.getName());
-		}
-	}
-
-	@Override
-	protected BlockStateContainer createBlockState() {
-		return new BlockStateContainer(this, PLANT_TYPE);
-	}
-
-	@Override
-	public int getMetaFromState(IBlockState state) {
-		return state.getValue(PLANT_TYPE).ordinal();
-	}
-
-	@Override
-	public IBlockState getStateFromMeta(int meta) {
-		return getDefaultState().withProperty(PLANT_TYPE, PlantType.getType(meta));
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-
-	}
-
-	@Override
-	public boolean canPlaceBlockAt(World worldIn, BlockPos pos) {
-		return super.canPlaceBlockAt(worldIn, pos) || BotanyCore.getGardening().isSoil(worldIn.getBlockState(pos).getBlock());
-	}
-
-	@Override
-	public int damageDropped(IBlockState state) {
-		return getMetaFromState(state);
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs p_149666_2_, NonNullList<ItemStack> subBlocks) {
-		for (PlantType type : PlantType.values()) {
-			subBlocks.add(type.get());
-		}
-	}
-
-	@Override
-	public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-		PlantType type = state.getValue(PLANT_TYPE);
-		if (rand.nextInt(4) == 0) {
-			if (type == PlantType.WEEDS) {
-				world.setBlockState(pos, state.withProperty(PLANT_TYPE, PlantType.WEEDS_LONG), 2);
-			} else if (type == PlantType.WEEDS_LONG) {
-				world.setBlockState(pos, state.withProperty(PLANT_TYPE, PlantType.WEEDS_VERY_LONG), 2);
-			} else if (type == PlantType.DEAD_FLOWER) {
-				world.setBlockState(pos, state.withProperty(PLANT_TYPE, PlantType.DECAYING_FLOWER), 2);
-			} else if (type == PlantType.DECAYING_FLOWER) {
-				world.setBlockToAir(pos);
-				return;
-			}
-		}
-
-		if (rand.nextInt(6) == 0) {
-			if (type == PlantType.WEEDS) {
-				world.setBlockToAir(pos);
-			} else if (type == PlantType.WEEDS_LONG) {
-				world.setBlockState(pos, state.withProperty(PLANT_TYPE, PlantType.WEEDS), 2);
-			} else if (type == PlantType.WEEDS_VERY_LONG) {
-				world.setBlockState(pos, state.withProperty(PLANT_TYPE, PlantType.WEEDS_LONG), 2);
-			}
-		}
-
-		Block below = world.getBlockState(pos.down()).getBlock();
-		if (!BotanyCore.getGardening().isSoil(below)) {
-			return;
-		}
-
-		IBlockSoil soil = (IBlockSoil) below;
-		if (rand.nextInt(3) != 0) {
-			return;
-		}
-
-		if (type.isWeed()) {
-			if (!soil.degrade(world, pos.down(), EnumSoilType.LOAM)) {
-				soil.degrade(world, pos.down(), EnumSoilType.SOIL);
-			}
-		} else if (type == PlantType.DECAYING_FLOWER && !soil.fertilise(world, pos.down(), EnumSoilType.LOAM)) {
-			soil.fertilise(world, pos.down(), EnumSoilType.FLOWERBED);
-		}
-	}
-
-	@Override
-	public boolean isReplaceable(IBlockAccess worldIn, BlockPos pos) {
-		return true;
-	}
-
-	@Override
-	public EnumOffsetType getOffsetType() {
-		return EnumOffsetType.XZ;
-	}
-}

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

@@ -1,322 +0,0 @@
-package binnie.botany.blocks;
-
-import javax.annotation.Nullable;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.common.IPlantable;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-
-import binnie.core.Constants;
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.gardening.EnumAcidity;
-import binnie.botany.api.gardening.EnumMoisture;
-import binnie.botany.api.gardening.EnumSoilType;
-import binnie.botany.api.gardening.IBlockSoil;
-import binnie.botany.core.BotanyCore;
-import binnie.core.modules.BotanyModuleUIDs;
-import binnie.botany.modules.ModuleFlowers;
-import binnie.botany.modules.ModuleGardening;
-import binnie.core.util.I18N;
-import binnie.core.modules.ModuleManager;
-
-public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
-	public static final PropertyEnum<EnumMoisture> MOISTURE = PropertyEnum.create("moisture", EnumMoisture.class);
-	public static final PropertyEnum<EnumAcidity> ACIDITY = PropertyEnum.create("acidity", EnumAcidity.class);
-	public static final AxisAlignedBB SOIL_BLOCK_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.9375D, 1.0D);
-	private final boolean weedKilled;
-	private final EnumSoilType type;
-
-	public BlockSoil(EnumSoilType type, String blockName, boolean weedKilled) {
-		super(Material.GROUND);
-		this.type = type;
-		this.weedKilled = weedKilled;
-		setUnlocalizedName("botany.soil." + type.getName());
-		setCreativeTab(CreativeTabBotany.instance);
-		setRegistryName(blockName);
-		setTickRandomly(true);
-		setLightOpacity(255);
-		setHardness(0.5f);
-		setSoundType(SoundType.GROUND);
-	}
-
-	public static int getMeta(EnumAcidity acid, EnumMoisture moisture) {
-		return acid.ordinal() * 3 + moisture.ordinal();
-	}
-
-	public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) {
-		EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3];
-		if (byNeutralNone) {
-			if (ph == EnumAcidity.NEUTRAL) {
-				return "";
-			}
-		}
-		return TextFormatting.GRAY + I18N.localise("botany.ph") + ": " + ph.getLocalisedName(withColor);
-	}
-
-	public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) {
-		EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3];
-		if (byNormalNone) {
-			if (moisure == EnumMoisture.NORMAL) {
-				return "";
-			}
-		}
-		return TextFormatting.GRAY + I18N.localise("botany.moisture") + ": " + moisure.getLocalisedName(withColor);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
-		switch (side) {
-			case UP:
-				return true;
-
-			case NORTH:
-			case SOUTH:
-			case WEST:
-			case EAST:
-				IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side));
-				Block block = iblockstate.getBlock();
-				return !iblockstate.isOpaqueCube() && block != Blocks.FARMLAND && block != Blocks.GRASS_PATH && block != this;
-		}
-		return super.shouldSideBeRendered(blockState, blockAccess, pos, side);
-	}
-
-	/**
-	 * Used to determine ambient occlusion and culling when rebuilding chunks for render
-	 */
-	@Override
-	public boolean isOpaqueCube(IBlockState state) {
-		return false;
-	}
-
-	@Override
-	public boolean isFullCube(IBlockState state) {
-		return false;
-	}
-
-	@Override
-	public String getUnlocalizedName() {
-		return super.getUnlocalizedName().replaceFirst("tile.", "");
-	}
-
-	@Override
-	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-		return SOIL_BLOCK_AABB;
-	}
-
-	@Nullable
-	@Override
-	public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
-		return SOIL_BLOCK_AABB;
-	}
-
-	@Override
-	public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
-		return SOIL_BLOCK_AABB;
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
-		for (int i = 0; i < 9; ++i) {
-			list.add(new ItemStack(this, 1, i));
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerModel(Item item, IModelManager manager) {
-		for (EnumAcidity acidity : EnumAcidity.values()) {
-			for (EnumMoisture moisture : EnumMoisture.values()) {
-				String modelName = "";
-				if (acidity != EnumAcidity.NEUTRAL) {
-					modelName += acidity.getName();
-				}
-
-				if (moisture != EnumMoisture.NORMAL) {
-					if (!modelName.isEmpty()) {
-						modelName += "_";
-					}
-					modelName += moisture.getName();
-				}
-
-				if (modelName.isEmpty()) {
-					modelName = "normal";
-				}
-
-				String identifier;
-				if (weedKilled) {
-					identifier = type.getName() + "_no_weed/" + modelName;
-				} else {
-					identifier = type.getName() + "/" + modelName;
-				}
-				manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, identifier);
-			}
-		}
-	}
-
-	@Override
-	protected BlockStateContainer createBlockState() {
-		return new BlockStateContainer(this, MOISTURE, ACIDITY);
-	}
-
-	@Override
-	public int getMetaFromState(IBlockState state) {
-		return getMeta(state.getValue(ACIDITY), state.getValue(MOISTURE));
-	}
-
-	@Override
-	public IBlockState getStateFromMeta(int meta) {
-		EnumMoisture moisture = EnumMoisture.values()[meta % 3];
-		EnumAcidity acidity = EnumAcidity.values()[meta / 3];
-		return getDefaultState().withProperty(MOISTURE, moisture).withProperty(ACIDITY, acidity);
-	}
-
-	public EnumSoilType getType() {
-		return type;
-	}
-
-	@Override
-	public int damageDropped(IBlockState state) {
-		return getMetaFromState(state);
-	}
-
-	@Override
-	public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-		EnumMoisture moisture = state.getValue(MOISTURE);
-		EnumMoisture desiredMoisture = BotanyCore.getGardening().getNaturalMoisture(world, pos);
-		if (desiredMoisture.ordinal() > moisture.ordinal()) {
-			moisture = ((moisture == EnumMoisture.DRY) ? EnumMoisture.NORMAL : EnumMoisture.DAMP);
-		} else if (desiredMoisture.ordinal() < moisture.ordinal()) {
-			moisture = ((moisture == EnumMoisture.DAMP) ? EnumMoisture.NORMAL : EnumMoisture.DRY);
-		}
-
-		IBlockState blockState = state.withProperty(MOISTURE, moisture);
-		if (state != blockState) {
-			world.setBlockState(pos, blockState, 2);
-		}
-
-		if (!weedKilled) {
-			if (rand.nextInt(5 - getType(world, pos).ordinal()) != 0) {
-				return;
-			}
-			pos = pos.up();
-			if (!world.isAirBlock(pos)) {
-				return;
-			}
-			world.setBlockState(pos, ModuleGardening.plant.getStateFromMeta(PlantType.WEEDS.ordinal()), 2);
-		}
-	}
-
-	@Override
-	public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) {
-		super.neighborChanged(state, worldIn, pos, blockIn, fromPos);
-
-		if (worldIn.getBlockState(pos.up()).getMaterial().isSolid()) {
-			worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
-		}
-	}
-
-	@Override
-	public EnumAcidity getPH(World world, BlockPos pos) {
-		return world.getBlockState(pos).getValue(ACIDITY);
-	}
-
-	@Override
-	public EnumMoisture getMoisture(World world, BlockPos pos) {
-		return world.getBlockState(pos).getValue(MOISTURE);
-	}
-
-	@Override
-	public EnumSoilType getType(World world, BlockPos pos) {
-		return type;
-	}
-
-	@Override
-	public boolean fertilise(World world, BlockPos pos, EnumSoilType maxLevel) {
-		EnumSoilType type = getType(world, pos);
-		if (type.ordinal() >= maxLevel.ordinal()) {
-			return false;
-		}
-		IBlockState old = world.getBlockState(pos);
-		IBlockState newState = BotanyCore.getGardening().getSoil(maxLevel, weedKilled, old.getValue(MOISTURE), old.getValue(ACIDITY));
-		return world.setBlockState(pos, newState, 2);
-	}
-
-	@Override
-	public boolean degrade(World world, BlockPos pos, EnumSoilType minLevel) {
-		EnumSoilType type = getType(world, pos);
-		if (type.ordinal() <= minLevel.ordinal()) {
-			return false;
-		}
-		IBlockState old = world.getBlockState(pos);
-		IBlockState newState = BotanyCore.getGardening().getSoil(minLevel, weedKilled, old.getValue(MOISTURE), old.getValue(ACIDITY));
-		return world.setBlockState(pos, newState, 2);
-	}
-
-	@Override
-	public boolean setPH(World world, BlockPos pos, EnumAcidity pH) {
-		IBlockState blockState = world.getBlockState(pos);
-		return world.setBlockState(pos, blockState.withProperty(ACIDITY, pH));
-	}
-
-	@Override
-	public boolean setMoisture(World world, BlockPos pos, EnumMoisture moisture) {
-		IBlockState blockState = world.getBlockState(pos);
-		return world.setBlockState(pos, blockState.withProperty(MOISTURE, moisture));
-	}
-
-	@Override
-	public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) {
-		super.onNeighborChange(world, pos, neighbor);
-		if (world.isSideSolid(pos.up(), EnumFacing.DOWN, false)) {
-			((World) world).setBlockState(pos, Blocks.DIRT.getDefaultState(), 2);
-		}
-	}
-
-	@Override
-	public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) {
-		IBlockState plant = plantable.getPlant(world, pos.up());
-		if(ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.FLOWERS)) {
-			if (plant.getBlock() == ModuleFlowers.flower) {
-				return true;
-			}
-		}
-
-		if (plant.getBlock() == ModuleGardening.plant) {
-			return !weedKilled || !BlockPlant.isWeed(world, pos);
-		}
-		return world instanceof World && Blocks.DIRT.canSustainPlant(state, world, pos, direction, plantable);
-	}
-
-	@Override
-	public boolean resistsWeeds(World world, BlockPos pos) {
-		return weedKilled;
-	}
-
-	public boolean isWeedKilled() {
-		return weedKilled;
-	}
-}

botany/src/main/java/binnie/botany/blocks/BlockStainedGlass.java

@@ -1,184 +0,0 @@
-package binnie.botany.blocks;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Enchantments;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.event.ForgeEventFactory;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import forestry.api.core.IItemModelRegister;
-import forestry.api.core.IModelManager;
-import forestry.core.blocks.IColoredBlock;
-
-import binnie.botany.CreativeTabBotany;
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.core.api.block.BlockMetadata;
-import binnie.core.api.block.IBlockMetadata;
-import binnie.core.api.block.TileEntityMetadata;
-import binnie.core.util.I18N;
-
-public class BlockStainedGlass extends Block implements IBlockMetadata, IColoredBlock, IItemModelRegister {
-	public BlockStainedGlass() {
-		super(Material.GLASS);
-		setCreativeTab(CreativeTabBotany.instance);
-		setRegistryName("stained");
-		setSoundType(SoundType.GLASS);
-		setHardness(0.3F);
-	}
-
-	@Override
-	public int quantityDropped(Random rand) {
-		return 0;
-	}
-
-	@Override
-	public boolean isOpaqueCube(IBlockState state) {
-		return false;
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public BlockRenderLayer getBlockLayer() {
-		return BlockRenderLayer.TRANSLUCENT;
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerModel(Item item, IModelManager manager) {
-		for (EnumFlowerColor color : EnumFlowerColor.values()) {
-			manager.registerItemModel(item, color.getFlowerColorAllele().getID());
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
-		IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side));
-		Block block = iblockstate.getBlock();
-		return block != this;
-	}
-
-	@Override
-	public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) {
-		player.addStat(StatList.getBlockStats(this));
-		player.addExhaustion(0.005F);
-
-		if (EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0 && te instanceof TileEntityMetadata) {
-			List<ItemStack> items = new ArrayList<>();
-			TileEntityMetadata tile = (TileEntityMetadata) te;
-			int damage = getDroppedMeta(state, tile.getTileMetadata());
-			ItemStack itemstack = TileEntityMetadata.getItemStack(this, damage);
-
-			if (!itemstack.isEmpty()) {
-				items.add(itemstack);
-			}
-
-			ForgeEventFactory.fireBlockHarvesting(items, worldIn, pos, state, 0, 1.0f, true, player);
-			for (ItemStack item : items) {
-				spawnAsEntity(worldIn, pos, item);
-			}
-		}
-	}
-
-	@Override
-	public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World var1, int i) {
-		return new TileEntityMetadata();
-	}
-
-	@Override
-	public boolean hasTileEntity(IBlockState state) {
-		return true;
-	}
-
-	@Override
-	public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) {
-		TileEntity tileentity = worldIn.getTileEntity(pos);
-		return tileentity != null && tileentity.receiveClientEvent(id, param);
-	}
-
-	@Override
-	public int getPlacedMeta(ItemStack stack, World world, BlockPos pos, EnumFacing clickedBlock) {
-		return TileEntityMetadata.getItemDamage(stack);
-	}
-
-	@Override
-	public int getDroppedMeta(IBlockState state, int tileMetadata) {
-		return tileMetadata;
-	}
-
-	@Override
-	public String getDisplayName(ItemStack itemStack) {
-		EnumFlowerColor color = EnumFlowerColor.get(TileEntityMetadata.getItemDamage(itemStack));
-		return I18N.localise("botany.pigmented.glass.name", color.getDisplayName());
-	}
-
-	@Override
-	public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> itemList) {
-		for (EnumFlowerColor color : EnumFlowerColor.values()) {
-			itemList.add(TileEntityMetadata.getItemStack(this, color.ordinal()));
-		}
-	}
-
-	@Override
-	public boolean isWood(IBlockAccess world, BlockPos pos) {
-		return true;
-	}
-
-	@Override
-	public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) {
-		return 20;
-	}
-
-	@Override
-	public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) {
-		return true;
-	}
-
-	@Override
-	public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) {
-		return 5;
-	}
-
-	@Override
-	public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
-		return BlockMetadata.getPickBlock(world, pos);
-	}
-
-	@Override
-	public int colorMultiplier(IBlockState state, @Nullable IBlockAccess worldIn, @Nullable BlockPos pos, int tintIndex) {
-		if (worldIn == null || pos == null) {
-			return 0;
-		}
-		EnumFlowerColor color = EnumFlowerColor.get(TileEntityMetadata.getTileMetadata(worldIn, pos));
-		return color.getFlowerColorAllele().getColor(false);
-	}
-}

botany/src/main/java/binnie/botany/blocks/PlantType.java

@@ -1,46 +0,0 @@
-package binnie.botany.blocks;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IStringSerializable;
-
-import binnie.botany.modules.ModuleGardening;
-
-public enum PlantType implements IStringSerializable {
-	WEEDS("weeds", true),
-	WEEDS_LONG("weeds_long", true),
-	WEEDS_VERY_LONG("weeds_very_long", true),
-	DEAD_FLOWER("dead_flower"),
-	DECAYING_FLOWER("decaying_flower");
-
-	String name;
-	boolean isWeed;
-
-	PlantType(String name) {
-		this(name, false);
-	}
-
-	PlantType(String name, boolean isWeed) {
-		this.name = name;
-		this.isWeed = isWeed;
-	}
-
-	public static PlantType getType(int meta){
-		if(meta >= values().length){
-			meta = values().length-1;
-		}
-		return values()[meta];
-	}
-
-	public ItemStack get() {
-		return new ItemStack(ModuleGardening.plant, 1, ordinal());
-	}
-
-	public boolean isWeed() {
-		return isWeed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-}

botany/src/main/java/binnie/botany/blocks/package-info.java

@@ -1,9 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@FieldsAreNonnullByDefault
-package binnie.botany.blocks;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import binnie.core.util.FieldsAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;

botany/src/main/java/binnie/botany/blocks/properties/PropertyFlower.java

@@ -1,53 +0,0 @@
-package binnie.botany.blocks.properties;
-
-import com.google.common.base.Optional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import net.minecraft.block.properties.PropertyHelper;
-
-import forestry.api.genetics.AlleleManager;
-import forestry.api.genetics.IAllele;
-
-import binnie.botany.api.genetics.IAlleleFlowerSpecies;
-import binnie.botany.api.genetics.IFlowerType;
-
-public class PropertyFlower<I extends IFlowerType<I>> extends PropertyHelper<I> {
-	public PropertyFlower(String name, Class<I> flowerTypeClass) {
-		super(name, flowerTypeClass);
-	}
-
-	@Override
-	public List<I> getAllowedValues() {
-		List<I> flowerTypes = new ArrayList<>();
-		for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
-			if (allele instanceof IAlleleFlowerSpecies) {
-				IFlowerType flowerType = ((IAlleleFlowerSpecies) allele).getType();
-				if (!flowerTypes.contains(flowerType)) {
-					flowerTypes.add((I) flowerType);
-				}
-			}
-		}
-		return flowerTypes;
-	}
-
-	/**
-	 * Get the name for the given value.
-	 */
-	@Override
-	public String getName(IFlowerType value) {
-		return value.getName().toLowerCase(Locale.ENGLISH);
-	}
-
-	@Override
-	public Optional<I> parseValue(String value) {
-		IAllele allele = AlleleManager.alleleRegistry.getAllele(value);
-		if (IAlleleFlowerSpecies.class.isInstance(allele)) {
-			IAlleleFlowerSpecies alleleValue = IAlleleFlowerSpecies.class.cast(allele);
-			return Optional.of((I) alleleValue.getType());
-		}
-		return Optional.absent();
-	}
-}

botany/src/main/java/binnie/botany/blocks/properties/package-info.java

@@ -1,9 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@FieldsAreNonnullByDefault
-package binnie.botany.blocks.properties;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import binnie.core.util.FieldsAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;

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

@@ -1,51 +0,0 @@
-package binnie.botany.ceramic;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import net.minecraft.item.ItemStack;
-
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.modules.ModuleCeramic;
-import binnie.core.api.block.TileEntityMetadata;
-import binnie.extratrees.api.IDesignMaterial;
-
-public class CeramicColor implements IDesignMaterial {
-	private final static Map<EnumFlowerColor, CeramicColor> map = new LinkedHashMap<>();
-
-	static {
-		for (EnumFlowerColor c : EnumFlowerColor.values()) {
-			CeramicColor.map.put(c, new CeramicColor(c));
-		}
-	}
-
-	EnumFlowerColor color;
-
-	CeramicColor(EnumFlowerColor color) {
-		this.color = color;
-	}
-
-	public static CeramicColor get(EnumFlowerColor c) {
-		return CeramicColor.map.get(c);
-	}
-
-	@Override
-	public ItemStack getStack() {
-		return TileEntityMetadata.getItemStack(ModuleCeramic.ceramic, color.ordinal());
-	}
-
-	@Override
-	public ItemStack getStack(boolean fireproof) {
-		return getStack();
-	}
-
-	@Override
-	public String getDesignMaterialName() {
-		return color.getName();
-	}
-
-	@Override
-	public int getColour() {
-		return color.getFlowerColorAllele().getColor(false);
-	}
-}

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

@@ -1,113 +0,0 @@
-package binnie.botany.ceramic;
-
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-
-import binnie.extratrees.api.carpentry.DesignerManager;
-import binnie.extratrees.api.carpentry.EnumPattern;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import binnie.botany.Botany;
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.items.CeramicItems;
-import binnie.botany.modules.ModuleCeramic;
-import binnie.core.AbstractMod;
-import binnie.extratrees.api.IDesignMaterial;
-import binnie.extratrees.api.IDesignSystem;
-import binnie.extratrees.api.IPattern;
-
-public class CeramicDesignSystem implements IDesignSystem {
-	public static CeramicDesignSystem instance = new CeramicDesignSystem();
-	Map<Integer, TextureAtlasSprite> primary;
-	Map<Integer, TextureAtlasSprite> secondary;
-
-	CeramicDesignSystem() {
-		primary = new HashMap<>();
-		secondary = new HashMap<>();
-		DesignerManager.instance.registerDesignSystem(this);
-	}
-
-	@Override
-	public IDesignMaterial getDefaultMaterial() {
-		return CeramicColor.get(EnumFlowerColor.White);
-	}
-
-	@Override
-	public IDesignMaterial getDefaultMaterial2() {
-		return CeramicColor.get(EnumFlowerColor.Black);
-	}
-
-	@Override
-	public IDesignMaterial getMaterial(int id) {
-		return CeramicColor.get(EnumFlowerColor.get(id));
-	}
-
-	@Override
-	public int getMaterialIndex(IDesignMaterial id) {
-		return ((CeramicColor) id).color.ordinal();
-	}
-
-	public String getTexturePath() {
-		return "blocks/ceramic";
-	}
-
-	@Override
-	@Nullable
-	@SideOnly(Side.CLIENT)
-	public TextureAtlasSprite getPrimarySprite(IPattern pattern) {
-		int index = pattern.getIndex();
-		if (index > 0 && index < primary.size()) {
-			return primary.get(index);
-		}
-		return null;
-	}
-
-	@Override
-	@Nullable
-	@SideOnly(Side.CLIENT)
-	public TextureAtlasSprite getSecondarySprite(IPattern pattern) {
-		int index = pattern.getIndex();
-		if (index > 0 && index < secondary.size()) {
-			return secondary.get(index);
-		}
-		return null;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerSprites() {
-		TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
-		for (EnumPattern pattern : EnumPattern.values()) {
-			ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0");
-			ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1");
-			primary.put(pattern.getIndex(), textureMap.registerSprite(primaryLocation));
-			secondary.put(pattern.getIndex(), textureMap.registerSprite(secondaryLocation));
-		}
-	}
-
-	public AbstractMod getMod() {
-		return Botany.instance;
-	}
-
-	@Override
-	public ItemStack getAdhesive() {
-		return CeramicItems.MORTAR.get(1);
-	}
-
-	@Override
-	@Nullable
-	public IDesignMaterial getMaterial(ItemStack itemStack) {
-		return (itemStack.getItem() == Item.getItemFromBlock(ModuleCeramic.ceramic))
-				? getMaterial(itemStack.getItemDamage())
-				: null;
-	}
-}

botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickPair.java

@@ -1,90 +0,0 @@
-package binnie.botany.ceramic.brick;
-
-import com.google.common.base.Preconditions;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagInt;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.modules.ModuleCeramic;
-import binnie.core.util.I18N;
-
-public class CeramicBrickPair {
-	public static final CeramicBrickPair EMPTY = new CeramicBrickPair(EnumFlowerColor.DarkSeaGreen, EnumFlowerColor.DarkSeaGreen, CeramicBrickType.TILE);
-
-	public final EnumFlowerColor colorFirst;
-	public final EnumFlowerColor colorSecond;
-
-	public CeramicBrickType type;
-	public int ordinal;
-
-	public CeramicBrickPair(EnumFlowerColor colorFirst, EnumFlowerColor colorSecond, CeramicBrickType type) {
-		this.colorFirst = colorFirst;
-		this.colorSecond = colorSecond;
-		this.type = type;
-		ordinal = colorFirst.ordinal() + colorSecond.ordinal() * 256 + type.ordinal() * 256 * 256;
-	}
-
-	public CeramicBrickPair(ItemStack stack) {
-		this(getId(stack));
-	}
-
-	public CeramicBrickPair(int id) {
-		colorFirst = EnumFlowerColor.get(id & 0xFF);
-		colorSecond = EnumFlowerColor.get(id >> 8 & 0xFF);
-		type = CeramicBrickType.get(id >> 16 & 0xFF);
-	}
-
-	public boolean isTwoColors() {
-		return type.canDouble() && colorSecond != colorFirst;
-	}
-
-	public static int getId(ItemStack stack){
-		if(!stack.hasTagCompound()){
-			return EMPTY.ordinal();
-		}
-		NBTTagCompound nbtTagCompound = stack.getTagCompound();
-		return nbtTagCompound.getInteger("id");
-	}
-
-	public ItemStack getStack(int i) {
-		ItemStack stack = new ItemStack(ModuleCeramic.ceramicBrick, i);
-		stack.setTagInfo("id", new NBTTagInt(ordinal()));
-		return stack;
-	}
-
-	public String getName() {
-		String name = colorFirst.getFlowerColorAllele().getColorName();
-		if (type.canDouble() && colorSecond != colorFirst) {
-			name = name + " & " + colorSecond.getFlowerColorAllele().getColorName();
-		}
-		return I18N.localise("botany.ceramic.type." + type.id + ".name", name);
-	}
-
-	public int ordinal() {
-		return ordinal;
-	}
-
-	@SideOnly(Side.CLIENT)
-	public TextureAtlasSprite getSprite(int pass) {
-		TextureAtlasSprite[] sprites = type.sprites;
-		Preconditions.checkState(sprites != null, "Sprites have not been registered.");
-		return sprites[pass];
-	}
-
-	@Override
-	public int hashCode() {
-		return Integer.hashCode(type.ordinal());
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return obj instanceof CeramicBrickPair
-				&& ((CeramicBrickPair) obj).type == type;
-	}
-}

botany/src/main/java/binnie/botany/ceramic/brick/CeramicBrickType.java

@@ -1,329 +0,0 @@
-package binnie.botany.ceramic.brick;
-
-import javax.annotation.Nullable;
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IStringSerializable;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import binnie.botany.api.genetics.EnumFlowerColor;
-import binnie.botany.items.CeramicItems;
-import binnie.botany.modules.ModuleCeramic;
-import binnie.core.api.block.TileEntityMetadata;
-
-public enum CeramicBrickType implements IStringSerializable {
-	TILE("tile") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return ItemStack.EMPTY;
-			}
-			int mortars = 0;
-			int blocks = 0;
-			int blockColor = -1;
-			for (ItemStack stack : stacks) {
-				if (isMortar(stack)) {
-					++mortars;
-				} else {
-					if (stack.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramic)) {
-						return ItemStack.EMPTY;
-					}
-					++blocks;
-					int color = TileEntityMetadata.getItemDamage(stack);
-					if (blockColor == -1) {
-						blockColor = color;
-					} else {
-						if (blockColor != color) {
-							return ItemStack.EMPTY;
-						}
-					}
-				}
-			}
-			if (mortars != 1) {
-				return ItemStack.EMPTY;
-			}
-			EnumFlowerColor c = EnumFlowerColor.get(blockColor);
-			return new CeramicBrickPair(c, c, CeramicBrickType.TILE).getStack(3);
-		}
-	},
-	BRICK("brick") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			return getBrickRecipe(this, stacks);
-		}
-	},
-	STRIPE_BRICK("brickstripe") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			return getBrickRecipe(this, stacks);
-		}
-	},
-	LARGE_BRICK("bricklarge") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			if (stacks.size() == 1) {
-				ItemStack stack3 = stacks.get(0);
-				CeramicBrickPair type3 = new CeramicBrickPair(stack3);
-				if (type3.type == CeramicBrickType.VERTICAL_LARGE_BRICK) {
-					type3.type = this;
-					return type3.getStack(1);
-				}
-				return ItemStack.EMPTY;
-			} else {
-				if (stacks.size() != 3) {
-					return ItemStack.EMPTY;
-				}
-				int[] colors = {-1, -1};
-				int a = 0;
-				int b = 0;
-				for (ItemStack stack4 : stacks) {
-					if (stack4.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramicBrick)) {
-						return ItemStack.EMPTY;
-					}
-					CeramicBrickPair type4 = new CeramicBrickPair(stack4);
-					if (type4.type != CeramicBrickType.TILE) {
-						return ItemStack.EMPTY;
-					}
-					int color5 = type4.colorFirst.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 ItemStack.EMPTY;
-						}
-						b++;
-					}
-				}
-				if (colors[1] == -1) {
-					colors[1] = colors[0];
-				}
-				return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.LARGE_BRICK).getStack(3);
-			}
-		}
-	},
-	SPLIT("split") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return ItemStack.EMPTY;
-			}
-			int[] colors = {-1, -1};
-			int altCounter = 0;
-			for (ItemStack stack2 : stacks) {
-				int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0;
-				if (stack2.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramicBrick)) {
-					return ItemStack.EMPTY;
-				}
-				CeramicBrickPair type = new CeramicBrickPair(stack2);
-				if (type.type != CeramicBrickType.TILE) {
-					return ItemStack.EMPTY;
-				}
-				int color2 = type.colorFirst.ordinal();
-				if (colors[alt] == -1) {
-					colors[alt] = color2;
-				} else if (colors[alt] != color2) {
-					return ItemStack.EMPTY;
-				}
-				++altCounter;
-			}
-			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.SPLIT).getStack(4);
-		}
-	},
-	CHEQUERED("cheque") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return ItemStack.EMPTY;
-			}
-			int[] colors = {-1, -1};
-			for (ItemStack stack2 : stacks) {
-				if (stack2.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramicBrick)) {
-					return ItemStack.EMPTY;
-				}
-				CeramicBrickPair type2 = new CeramicBrickPair(stack2);
-				if (type2.type != CeramicBrickType.SPLIT) {
-					return ItemStack.EMPTY;
-				}
-				int color3 = type2.colorFirst.ordinal();
-				int color4 = type2.colorSecond.ordinal();
-				if (colors[0] == -1) {
-					colors[0] = color3;
-					colors[1] = color4;
-				} else {
-					if (colors[0] != color3 || colors[1] != color4) {
-						return ItemStack.EMPTY;
-					}
-				}
-			}
-			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.CHEQUERED).getStack(4);
-		}
-	},
-	MIXED("mixed") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			if (stacks.size() != 4) {
-				return ItemStack.EMPTY;
-			}
-			int[] colors = {-1, -1};
-			for (ItemStack stack2 : stacks) {
-				if (stack2.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramicBrick)) {
-					return ItemStack.EMPTY;
-				}
-				CeramicBrickPair type2 = new CeramicBrickPair(stack2);
-				if (type2.isTwoColors()) {
-					return ItemStack.EMPTY;
-				}
-				int color3 = type2.colorFirst.ordinal();
-				if (type2.type == CeramicBrickType.SPLIT) {
-					if (colors[1] != -1) {
-						return ItemStack.EMPTY;
-					}
-					colors[1] = color3;
-				} else {
-					if (type2.type != CeramicBrickType.CHEQUERED) {
-						return ItemStack.EMPTY;
-					}
-					if (colors[0] == -1) {
-						colors[0] = color3;
-					} else if (colors[0] != color3) {
-						return ItemStack.EMPTY;
-					}
-				}
-				int color4 = type2.colorSecond.ordinal();
-			}
-			if (colors[0] == -1 || colors[1] == -1) {
-				return ItemStack.EMPTY;
-			}
-			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.MIXED).getStack(4);
-		}
-	},
-	VERTICAL_BRICK("verticalbrick") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			return getVerticalBrickRecipe(stacks);
-		}
-	},
-	VERTICAL_STRIPE_BRICK("verticalbrickstripe") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			return getVerticalBrickRecipe(stacks);
-		}
-	},
-	VERTICAL_LARGE_BRICK("verticalbricklarge") {
-		@Override
-		public ItemStack getRecipe(List<ItemStack> stacks) {
-			return getVerticalBrickRecipe(stacks);
-		}
-	};
-
-	public static final CeramicBrickType[] VALUES = values();
-
-	public String id;
-
-	@SideOnly(Side.CLIENT)
-	@Nullable
-	public TextureAtlasSprite[] sprites;
-
-	CeramicBrickType(String id) {
-		this.id = id;
-	}
-
-	public static CeramicBrickType get(int id) {
-		return VALUES[id % VALUES.length];
-	}
-
-	public boolean canDouble() {
-		return this != CeramicBrickType.TILE;
-	}
-
-	public abstract ItemStack getRecipe(List<ItemStack> stacks);
-
-	protected ItemStack getVerticalBrickRecipe(List<ItemStack> stacks) {
-		if (stacks.size() != 1) {
-			return ItemStack.EMPTY;
-		}
-		ItemStack stack5 = stacks.get(0);
-		CeramicBrickPair type = new CeramicBrickPair(stack5);
-		if (type.type == CeramicBrickType.LARGE_BRICK) {
-			type.type = CeramicBrickType.VERTICAL_LARGE_BRICK;
-			return type.getStack(1);
-		}
-
-		if (type.type == CeramicBrickType.BRICK) {
-			type.type = CeramicBrickType.VERTICAL_BRICK;
-			return type.getStack(1);
-		}
-
-		if (type.type == CeramicBrickType.STRIPE_BRICK) {
-			type.type = CeramicBrickType.VERTICAL_STRIPE_BRICK;
-			return type.getStack(1);
-		}
-		return ItemStack.EMPTY;
-	}
-
-	protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List<ItemStack> stacks) {
-		if (stacks.size() == 1) {
-			ItemStack stack5 = stacks.get(0);
-			CeramicBrickPair type = new CeramicBrickPair(stack5);
-			if (type.type == CeramicBrickType.VERTICAL_BRICK) {
-				type.type = ceramicType;
-				return type.getStack(1);
-			}
-
-			if (type.type == CeramicBrickType.STRIPE_BRICK) {
-				type.type = ceramicType;
-				return type.getStack(1);
-			}
-			return ItemStack.EMPTY;
-		} else if (stacks.size() == 4) {
-			int[] colors = {-1, -1};
-			for (int index2 = 0; index2 < stacks.size(); ++index2) {
-				ItemStack stack4 = stacks.get(index2);
-				if (stack4.getItem() != Item.getItemFromBlock(ModuleCeramic.ceramicBrick)) {
-					return ItemStack.EMPTY;
-				}
-
-				CeramicBrickPair type4 = new CeramicBrickPair(stack4);
-				if (type4.type != CeramicBrickType.LARGE_BRICK) {
-					return ItemStack.EMPTY;
-				}
-
-				int color5 = type4.colorFirst.ordinal();
-				int color6 = type4.colorSecond.ordinal();
-				int alt2 = (index2 != 0 && index2 != 3) ? 1 : 0;
-				if (ceramicType == CeramicBrickType.STRIPE_BRICK) {
-					alt2 = 0;
-				}
-
-				if (colors[alt2] == -1) {
-					colors[alt2] = color5;
-					colors[1 - alt2] = color6;
-				} else if (colors[alt2] != color5 || colors[1 - alt2] != color6) {
-					return ItemStack.EMPTY;
-				}
-			}
-			return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), ceramicType).getStack(4);
-		}
-		return ItemStack.EMPTY;
-	}
-
-	protected boolean isMortar(ItemStack stack) {
-		return stack.getItem() == ModuleCeramic.misc && stack.getItemDamage() == CeramicItems.MORTAR.ordinal();
-	}
-
-	@Override
-	public String getName() {
-		return id;
-	}
-}

botany/src/main/java/binnie/botany/ceramic/brick/package-info.java

@@ -1,9 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@FieldsAreNonnullByDefault
-package binnie.botany.ceramic.brick;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import binnie.core.util.FieldsAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;

botany/src/main/java/binnie/botany/ceramic/package-info.java

@@ -1,9 +0,0 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@FieldsAreNonnullByDefault
-package binnie.botany.ceramic;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import binnie.core.util.FieldsAreNonnullByDefault;
-import mcp.MethodsReturnNonnullByDefault;